GNOME.org
 

[gftp] Fixed bug #509934

commit f91cc35567fff9782a3b3cd082c1b5668dcdb7e4
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Tue Mar 20 12:56:32 2012 +0100

    Fixed bug #509934

 docs/USERS-GUIDE        |   16 ++++++++--------
 docs/rfcs/rfc959.txt    |    4 ++--
 docs/sample.gftp/gftprc |   12 ++++++------
 lib/gftp.h              |    8 ++++----
 lib/options.h           |    8 ++++----
 lib/rfc959.c            |    4 ++--
 6 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/docs/USERS-GUIDE b/docs/USERS-GUIDE
index a3aa250..3e66e6f 100644
--- a/docs/USERS-GUIDE
+++ b/docs/USERS-GUIDE
@@ -12,7 +12,7 @@ console.  Some of the gFTP features are:
 
     * Downloading files
     * Uploading files
-    * Transfering files between 2 remote servers
+    * Transferring files between 2 remote servers
     * Downloading multiple files in one run
     * Downloading entire directories and subdirectories
     * Simultaneous downloads using multithreading
@@ -56,7 +56,7 @@ better, and easier to read.
    3.3. Uploading a single file
    3.4. Uploading multiple files
    3.5. Passive and non passive file transfers
-4. Transfering files between remote sites (FXP)
+4. Transferring files between remote sites (FXP)
    4.1. Connecting to the receiving site
    4.2. Selecting the receiving directory
    4.3. Working with the receiving file tree
@@ -441,7 +441,7 @@ the Passive file transfers button to toggle passive file transfers on and off.
 passive transfers is:  Cannot create a data connection: Connection refused
 
 
-4. Transfering files between remote sites (FXP)
+4. Transferring files between remote sites (FXP)
 
    The File Transfer Protocol has a subsection called File eXchange Protocol.
 gFTP can use FXP to transfer files between two remote sites.  gFTP will set up a
@@ -515,7 +515,7 @@ tree as you are allowed to go.
 
    If you want to specify several files to transfer one after the other then you
 must first throw the "Start file transfer" toggle off by clicking on
-FTP->Options->Start file transfers->Apply->OK.  If you are only transfering a
+FTP->Options->Start file transfers->Apply->OK.  If you are only transferring a
 single file then you can ignore the "Start file transfer" toggle.
 
    To transfer a file double click on the file name in the left directory
@@ -821,9 +821,9 @@ then start it again you will have an empty queue.
 
    The right hand side of the transfer window shows the status of the
 transfer(s) in progress.  gFTP shows the % completion of the entire queue, the
-size of the file currently being transfered, how many bytes of the current file
-have already been transferred, which files are finished transfering, and which
-files are waiting to begin transfering.  The progress report also shows the
+size of the file currently being transferred, how many bytes of the current file
+have already been transferred, which files are finished transferring, and which
+files are waiting to begin transferring.  The progress report also shows the
 current transfer rate and gives an estimated length of time until the entire
 queue is transferred.  Your milage may vary.
 
@@ -1011,7 +1011,7 @@ Or
 14. SSH protocol
 
    SSH (Secure SHell) is a protocol which provides a high level of security
-for transfering files from one computer to another across the Internet.  gFTP
+for transferring files from one computer to another across the Internet.  gFTP
 implements the SSH protocol by calling upon an SSH program to wrap a layer of
 security around what would otherwise be an ordinary FTP tansfer.  In effect
 FTP "tunnels" through a secure SSH connection.
diff --git a/docs/rfcs/rfc959.txt b/docs/rfcs/rfc959.txt
index 5c9f11a..b0f8cae 100644
--- a/docs/rfcs/rfc959.txt
+++ b/docs/rfcs/rfc959.txt
@@ -78,7 +78,7 @@ File Transfer Protocol
       RFC 354 obsoleted RFCs 264 and 265.  The File Transfer Protocol
       was now defined as a protocol for file transfer between HOSTs on
       the ARPANET, with the primary function of FTP defined as
-      transfering files efficiently and reliably among hosts and
+      transferring files efficiently and reliably among hosts and
       allowing the convenient use of remote file storage capabilities.
       RFC 385 further commented on errors, emphasis points, and
       additions to the protocol, while RFC 414 provided a status report
@@ -1068,7 +1068,7 @@ File Transfer Protocol
       Reuse of the Data Connection:  When using the stream mode of data
       transfer the end of the file must be indicated by closing the
       connection.  This causes a problem if multiple files are to be
-      transfered in the session, due to need for TCP to hold the
+      transferred in the session, due to need for TCP to hold the
       connection record for a time out period to guarantee the reliable
       communication.  Thus the connection can not be reopened at once.
 
diff --git a/docs/sample.gftp/gftprc b/docs/sample.gftp/gftprc
index ac7bad2..9ac09b0 100644
--- a/docs/sample.gftp/gftprc
+++ b/docs/sample.gftp/gftprc
@@ -33,13 +33,13 @@ one_transfer=1
 # Overwrite files by default or set to resume file transfers
 overwrite_default=0
 
-# Preserve file permissions of transfered files
+# Preserve file permissions of transferred files
 preserve_permissions=1
 
-# Preserve file times of transfered files
+# Preserve file times of transferred files
 preserve_time=1
 
-# Refresh the listbox after each file is transfered
+# Refresh the listbox after each file is transferred
 refresh_files=0
 
 # Put the directories first then the files
@@ -75,7 +75,7 @@ sleep_time=30
 # The maximum KB/s a file transfer can get. (Set to 0 to disable)
 maxkbs=0.00
 
-# 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.
 trans_blksize=20480
 
@@ -237,9 +237,9 @@ passive_transfer=1
 # option to LIST
 resolve_symlinks=1
 
-# 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.
 ascii_transfers=0
diff --git a/lib/gftp.h b/lib/gftp.h
index f910d34..db3e94b 100644
--- a/lib/gftp.h
+++ b/lib/gftp.h
@@ -251,8 +251,8 @@ struct gftp_file_tag
   unsigned int selected : 1,	/* Is this file selected? */
                was_sel : 1,	/* Was this file selected before  */
                shown : 1,	/* Is this file shown? */
-               done_view : 1,	/* View the file when done transfering? */
-               done_edit : 1,	/* Edit the file when done transfering? */
+               done_view : 1,	/* View the file when done transferring? */
+               done_edit : 1,	/* Edit the file when done transferring? */
                done_rm : 1,	/* Remove the file when done */
                transfer_done : 1, /* Is current file transfer done? */
                retry_transfer : 1, /* Is current file transfer done? */
@@ -532,11 +532,11 @@ typedef struct gftp_transfer_tag
        current_file_number,
        current_file_retries;
 
-  off_t curtrans,		/* Current transfered bytes for this file */
+  off_t curtrans,		/* Current transferred bytes for this file */
         tot_file_trans,		/* Total number of bytes in the file being
                                    transferred */
         curresumed,		/* Resumed bytes for this file */
-        trans_bytes,		/* Amount of data transfered for entire 
+        trans_bytes,		/* Amount of data transferred for entire 
 				   transfer */
         total_bytes, 		/* Grand total bytes for whole transfer */
         resumed_bytes;		/* Grand total of resumed bytes for whole 
diff --git a/lib/options.h b/lib/options.h
index 97611a0..a145873 100644
--- a/lib/options.h
+++ b/lib/options.h
@@ -77,17 +77,17 @@ gftp_config_vars gftp_global_config_vars[] =
   {"preserve_permissions", N_("Preserve file permissions"), 
    gftp_option_type_checkbox, GINT_TO_POINTER(1), NULL, 
    GFTP_CVARS_FLAGS_SHOW_BOOKMARK,
-   N_("Preserve file permissions of transfered files"), GFTP_PORT_ALL,
+   N_("Preserve file permissions of transferred files"), GFTP_PORT_ALL,
    NULL},
   {"preserve_time", N_("Preserve file time"), 
    gftp_option_type_checkbox, GINT_TO_POINTER(1), NULL, 
    GFTP_CVARS_FLAGS_SHOW_BOOKMARK,
-   N_("Preserve file times of transfered files"), GFTP_PORT_ALL,
+   N_("Preserve file times of transferred files"), GFTP_PORT_ALL,
    NULL},
   {"refresh_files", N_("Refresh after each file transfer"), 
    gftp_option_type_checkbox, GINT_TO_POINTER(0), NULL, 
    GFTP_CVARS_FLAGS_SHOW_BOOKMARK,
-   N_("Refresh the listbox after each file is transfered"), GFTP_PORT_GTK,
+   N_("Refresh the listbox after each file is transferred"), GFTP_PORT_GTK,
    NULL},
   {"sort_dirs_first", N_("Sort directories first"), 
    gftp_option_type_checkbox, GINT_TO_POINTER(1), NULL, 
@@ -141,7 +141,7 @@ gftp_config_vars gftp_global_config_vars[] =
   {"trans_blksize", N_("Transfer Block Size:"), 
    gftp_option_type_int, GINT_TO_POINTER(20480), NULL, 
    GFTP_CVARS_FLAGS_SHOW_BOOKMARK,
-   N_("The block size that is used when transfering files. This should be a multiple of 1024."),  
+   N_("The block size that is used when transferring files. This should be a multiple of 1024."),  
    GFTP_PORT_ALL, NULL},
 
   {"default_protocol", N_("Default Protocol:"),
diff --git a/lib/rfc959.c b/lib/rfc959.c
index 57faeea..7eddf28 100644
--- a/lib/rfc959.c
+++ b/lib/rfc959.c
@@ -84,7 +84,7 @@ static gftp_config_vars config_vars[] =
   {"ascii_transfers", N_("Transfer files in ASCII mode"), 
    gftp_option_type_checkbox, GINT_TO_POINTER(0), NULL, 
    GFTP_CVARS_FLAGS_SHOW_BOOKMARK,
-   N_("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."), 
+   N_("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."), 
    GFTP_PORT_ALL, NULL},
 
   {NULL, NULL, 0, NULL, NULL, 0, NULL, 0, NULL}
@@ -1497,7 +1497,7 @@ rfc959_put_next_file_chunk (gftp_request * request, char *buf, size_t size)
       tempstr = buf;
     }
 
-  /* I need to ensure that the entire buffer has been transfered properly due
+  /* I need to ensure that the entire buffer has been transferred properly due
      to the ascii conversion that may occur. 
      FIXME - the ascii conversion doesn't occur properly when the \n occurs
      at the beginning of the buffer. I need to remember the last character
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]