diff --git a/daemon/daemon.c b/daemon/daemon.c
index d7467ffb2..01c4f1520 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -86,7 +86,7 @@ getUsage( void )
static const struct tr_option options[] =
{
- { 'a', "allowed", "Allowed IP addresses. (Default: " TR_DEFAULT_RPC_WHITELIST ")", "a", 1, "<list>" },
+ { 'a', "allowed", "Allowed IP addresses. (Default: " TR_DEFAULT_RPC_WHITELIST ")", "a", 1, "<list>" },
{ 'b', "blocklist", "Enable peer blocklists", "b", 0, NULL },
{ 'B', "no-blocklist", "Disable peer blocklists", "B", 0, NULL },
{ 'c', "watch-dir", "Where to watch for new .torrent files", "c", 1, "<directory>" },
diff --git a/daemon/remote.c b/daemon/remote.c
index bc4400522..195992a40 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -297,7 +297,7 @@ static tr_option opts[] =
{ 'U', "no-uplimit", "Disable max upload speed for the current torrent(s) or globally", "U", 0, NULL },
{ 'v', "verify", "Verify the current torrent(s)", "v", 0, NULL },
{ 'V', "version", "Show version number and exit", "V", 0, NULL },
- { 'w', "download-dir", "When adding a new torrent, set its download folder. Otherwise, set the default download folder", "w", 1, "<path>" },
+ { 'w', "download-dir", "When adding a new torrent, set its download folder. Otherwise, set the default download folder", "w", 1, "<path>" },
{ 'x', "pex", "Enable peer exchange (PEX)", "x", 0, NULL },
{ 'X', "no-pex", "Disable peer exchange (PEX)", "X", 0, NULL },
{ 'y', "lpd", "Enable local peer discovery (LPD)", "y", 0, NULL },
@@ -1732,9 +1732,9 @@ flush( const char * rpcurl, tr_benc ** benc )
status |= processResponse( rpcurl, (const char*) evbuffer_pullup( buf, -1 ), evbuffer_get_length( buf ) );
break;
case 409:
- /* session id failed. our curl header func has already
- * pulled the new session id from this response's headers,
- * build a new CURL* and try again */
+ /* Session id failed. Our curl header func has already
+ * pulled the new session id from this response's headers,
+ * build a new CURL* and try again */
curl_easy_cleanup( curl );
curl = NULL;
flush( rpcurl, benc );
diff --git a/daemon/watch.h b/daemon/watch.h
index cc74000c2..949bb6dc3 100644
--- a/daemon/watch.h
+++ b/daemon/watch.h
@@ -4,7 +4,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/actions.c b/gtk/actions.c
index f2a8571be..3333542cf 100644
--- a/gtk/actions.c
+++ b/gtk/actions.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/actions.h b/gtk/actions.h
index 88782966f..d7f7f33de 100644
--- a/gtk/actions.h
+++ b/gtk/actions.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/add-dialog.c b/gtk/add-dialog.c
index 4d5756d2e..b6aaf9541 100644
--- a/gtk/add-dialog.c
+++ b/gtk/add-dialog.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/add-dialog.h b/gtk/add-dialog.h
index d660496c0..61c7678db 100644
--- a/gtk/add-dialog.h
+++ b/gtk/add-dialog.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/details.c b/gtk/details.c
index 75d0693c8..c78d67de7 100644
--- a/gtk/details.c
+++ b/gtk/details.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/details.h b/gtk/details.h
index 90b5b905f..3c177eece 100644
--- a/gtk/details.h
+++ b/gtk/details.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/favicon.c b/gtk/favicon.c
index 4d5f2663b..ed9c4b9a4 100644
--- a/gtk/favicon.c
+++ b/gtk/favicon.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/favicon.h b/gtk/favicon.h
index 2ccebdb0e..eff52e85e 100644
--- a/gtk/favicon.h
+++ b/gtk/favicon.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/file-list.c b/gtk/file-list.c
index f5d8cf0d3..22ae49248 100644
--- a/gtk/file-list.c
+++ b/gtk/file-list.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -126,7 +126,7 @@ refreshFilesForeach( GtkTreeModel * model,
if( (priority!=old_priority) || (enabled!=old_enabled) || (have!=old_have) || (prog!=old_prog) )
{
/* Changing a value in the sort column can trigger a resort
- * which breaks this foreach() call. (See #3529)
+ * which breaks this foreach() call. (See #3529)
* As a workaround: if that's about to happen, temporarily disable
* sorting until we finish walking the tree. */
if( !refresh_data->resort_needed )
diff --git a/gtk/file-list.h b/gtk/file-list.h
index 129d1c744..eb292935e 100644
--- a/gtk/file-list.h
+++ b/gtk/file-list.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/filter.c b/gtk/filter.c
index e95014a4b..73d69752b 100644
--- a/gtk/filter.c
+++ b/gtk/filter.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -137,8 +137,8 @@ category_filter_model_update( GtkTreeStore * store )
g_object_steal_data( o, DIRTY_KEY );
- /* walk through all the torrents, tallying how many matches there are
- * for the various categories. also make a sorted list of all tracker
+ /* Walk through all the torrents, tallying how many matches there are
+ * for the various categories. Also make a sorted list of all tracker
* hosts s.t. we can merge it with the existing list */
if( gtk_tree_model_get_iter_first( tmodel, &iter )) do
{
diff --git a/gtk/filter.h b/gtk/filter.h
index 7912c4831..29b2c5475 100644
--- a/gtk/filter.h
+++ b/gtk/filter.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/hig.c b/gtk/hig.c
index 2fcc3b666..d2bf6a411 100644
--- a/gtk/hig.c
+++ b/gtk/hig.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/hig.h b/gtk/hig.h
index 71728e352..af2c95df4 100644
--- a/gtk/hig.h
+++ b/gtk/hig.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/main.c b/gtk/main.c
index 31542da33..f459e57ef 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -76,7 +76,7 @@ static const char * LICENSE =
"The OS X client, CLI client, and parts of libtransmission are licensed under the terms of the MIT license.\n\n"
"The Transmission daemon, GTK+ client, Qt client, Web client, and most of libtransmission are licensed under the terms of the GNU GPL version 2, with two special exceptions:\n\n"
"1. The MIT-licensed portions of Transmission listed above are exempt from GPLv2 clause 2(b) and may retain their MIT license.\n\n"
-"2. Permission is granted to link the code in this release with the OpenSSL project's 'OpenSSL' library and to distribute the linked executables. Works derived from Transmission may, at their authors' discretion, keep or delete this exception.";
+"2. Permission is granted to link the code in this release with the OpenSSL project's 'OpenSSL' library and to distribute the linked executables. Works derived from Transmission may, at their authors' discretion, keep or delete this exception.";
#endif
struct cbdata
@@ -437,7 +437,7 @@ signal_handler( int sig )
{
case SIGINT:
case SIGTERM:
- g_message( _( "Got signal %d; trying to shut down cleanly. Do it again if it gets stuck." ), sig );
+ g_message( _( "Got signal %d; trying to shut down cleanly. Do it again if it gets stuck." ), sig );
gtr_actions_handler( "quit", sighandler_cbdata );
break;
@@ -588,7 +588,7 @@ applyDesktopProxySettings( CURL * easy, GConfClient * client, const char * host_
/* Both libcurl and GNOME have hooks for proxy support.
* If someone has set the http_proxy environment variable,
- * don't apply the GNOME settings here. That way libcurl can override GNOME. */
+ * don't apply the GNOME settings here. That way libcurl can override GNOME. */
if( !env_checked ) {
const char * str = g_getenv( "http_proxy" );
env_set = str && *str;
@@ -807,7 +807,7 @@ main( int argc, char ** argv )
* so tell it to present its window to the user */
err = NULL;
if( !gtr_dbus_present_window( ) )
- err = g_strdup( _( "Transmission is already running, but is not responding. To start a new session, you must first close the existing Transmission process." ) );
+ err = g_strdup( _( "Transmission is already running, but is not responding. To start a new session, you must first close the existing Transmission process." ) );
}
if( didlock && ( didinit || cf_init( configDir, &err ) ) )
@@ -945,7 +945,7 @@ appsetup( TrWindow * wind,
GTK_MESSAGE_INFO,
GTK_BUTTONS_NONE,
"%s",
- _( "Transmission is a file-sharing program. When you run a torrent, its data will be made available to others by means of upload. You and you alone are fully responsible for exercising proper judgement and abiding by your local laws." ) );
+ _( "Transmission is a file-sharing program. When you run a torrent, its data will be made available to others by means of upload. You and you alone are fully responsible for exercising proper judgement and abiding by your local laws." ) );
gtk_dialog_add_button( GTK_DIALOG( w ), GTK_STOCK_QUIT, GTK_RESPONSE_REJECT );
gtk_dialog_add_button( GTK_DIALOG( w ), _( "I _Accept" ), GTK_RESPONSE_ACCEPT );
gtk_dialog_set_default_response( GTK_DIALOG( w ), GTK_RESPONSE_ACCEPT );
diff --git a/gtk/makemeta-ui.c b/gtk/makemeta-ui.c
index 046b3a56c..54767b285 100644
--- a/gtk/makemeta-ui.c
+++ b/gtk/makemeta-ui.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/makemeta-ui.h b/gtk/makemeta-ui.h
index 8854a0e7a..c028a5099 100644
--- a/gtk/makemeta-ui.h
+++ b/gtk/makemeta-ui.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/msgwin.c b/gtk/msgwin.c
index e43d1300e..f20b48570 100644
--- a/gtk/msgwin.c
+++ b/gtk/msgwin.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -232,11 +232,11 @@ appendColumn( GtkTreeView * view,
case COL_SEQUENCE:
title = _( "Time" ); break;
- /* noun. column title for a list */
+ /* noun. column title for a list */
case COL_NAME:
title = _( "Name" ); break;
- /* noun. column title for a list */
+ /* noun. column title for a list */
case COL_MESSAGE:
title = _( "Message" ); break;
diff --git a/gtk/msgwin.h b/gtk/msgwin.h
index 35487a25a..7f4c13c39 100644
--- a/gtk/msgwin.h
+++ b/gtk/msgwin.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/notify.c b/gtk/notify.c
index 577b4ae39..3ac3c6bb0 100644
--- a/gtk/notify.c
+++ b/gtk/notify.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/notify.h b/gtk/notify.h
index 6cf7543a7..6a1441d36 100644
--- a/gtk/notify.h
+++ b/gtk/notify.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/relocate.c b/gtk/relocate.c
index 4e3d29ee8..406af815d 100644
--- a/gtk/relocate.c
+++ b/gtk/relocate.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/relocate.h b/gtk/relocate.h
index dea3ec7cf..b366ecd1d 100644
--- a/gtk/relocate.h
+++ b/gtk/relocate.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/stats.c b/gtk/stats.c
index 527d3a6f2..1e2c87809 100644
--- a/gtk/stats.c
+++ b/gtk/stats.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -105,7 +105,7 @@ dialogResponse( GtkDialog * dialog,
if( response == TR_RESPONSE_RESET )
{
const char * primary = _( "Reset your statistics?" );
- const char * secondary = _( "These statistics are for your information only. "
+ const char * secondary = _( "These statistics are for your information only. "
"Resetting them doesn't affect the statistics logged by your BitTorrent trackers." );
const int flags = GTK_DIALOG_DESTROY_WITH_PARENT
| GTK_DIALOG_MODAL;
diff --git a/gtk/stats.h b/gtk/stats.h
index 1e2c35c01..082910719 100644
--- a/gtk/stats.h
+++ b/gtk/stats.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/torrent-cell-renderer.c b/gtk/torrent-cell-renderer.c
index 94ef0064c..fc0d3ae10 100644
--- a/gtk/torrent-cell-renderer.c
+++ b/gtk/torrent-cell-renderer.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -332,8 +332,8 @@ struct TorrentCellRendererPrivate
GtkCellRenderer * icon_renderer;
int bar_height;
- /* use this instead of tr_stat.pieceUploadSpeed so that the model can
- control when the speed displays get updated. this is done to keep
+ /* Use this instead of tr_stat.pieceUploadSpeed so that the model can
+ control when the speed displays get updated. This is done to keep
the individual torrents' speeds and the status bar's overall speed
in sync even if they refresh at slightly different times */
double upload_speed_KBps;
diff --git a/gtk/torrent-cell-renderer.h b/gtk/torrent-cell-renderer.h
index 5836eadc2..f6dcef5b7 100644
--- a/gtk/torrent-cell-renderer.h
+++ b/gtk/torrent-cell-renderer.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/tr-icon.c b/gtk/tr-icon.c
index 943c73d16..6eac543aa 100644
--- a/gtk/tr-icon.c
+++ b/gtk/tr-icon.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/tr-icon.h b/gtk/tr-icon.h
index d247dbaaf..afa1f9466 100644
--- a/gtk/tr-icon.h
+++ b/gtk/tr-icon.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/tr-prefs.c b/gtk/tr-prefs.c
index 1543ba052..1b7a3d8d0 100644
--- a/gtk/tr-prefs.c
+++ b/gtk/tr-prefs.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/tr-prefs.h b/gtk/tr-prefs.h
index 108cb2513..724b0a623 100644
--- a/gtk/tr-prefs.h
+++ b/gtk/tr-prefs.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/gtk/tr-window.c b/gtk/tr-window.c
index 289834dc8..bcb48a630 100644
--- a/gtk/tr-window.c
+++ b/gtk/tr-window.c
@@ -175,7 +175,7 @@ prefsChanged( TrCore * core UNUSED,
{
g_object_set( p->renderer, "compact", gtr_pref_flag_get( key ), NULL );
/* since the cell size has changed, we need gtktreeview to revalidate
- * its fixed-height mode values. Unfortunately there's not an API call
+ * its fixed-height mode values. Unfortunately there's not an API call
* for that, but it *does* revalidate when it thinks the style's been tweaked */
g_signal_emit_by_name( p->view, "style-set", NULL, NULL );
}
@@ -784,7 +784,7 @@ updateStats( PrivateData * p )
tr_sessionGetStats( session, &stats );
tr_strlsize( up, stats.uploadedBytes, sizeof( up ) );
tr_strlsize( down, stats.downloadedBytes, sizeof( down ) );
- /* Translators: "size|" is here for disambiguation. Please remove it from your translation.
+ /* Translators: "size|" is here for disambiguation. Please remove it from your translation.
%1$s is the size of the data we've downloaded
%2$s is the size of the data we've uploaded */
g_snprintf( buf, sizeof( buf ), Q_(
@@ -795,7 +795,7 @@ updateStats( PrivateData * p )
tr_sessionGetCumulativeStats( session, &stats );
tr_strlsize( up, stats.uploadedBytes, sizeof( up ) );
tr_strlsize( down, stats.downloadedBytes, sizeof( down ) );
- /* Translators: "size|" is here for disambiguation. Please remove it from your translation.
+ /* Translators: "size|" is here for disambiguation. Please remove it from your translation.
%1$s is the size of the data we've downloaded
%2$s is the size of the data we've uploaded */
g_snprintf( buf, sizeof( buf ), Q_(
diff --git a/gtk/transmission-gtk.1 b/gtk/transmission-gtk.1
index e85ca30ce..9559a38ac 100644
--- a/gtk/transmission-gtk.1
+++ b/gtk/transmission-gtk.1
@@ -62,7 +62,7 @@ is already running, the torrents will be added to the running instance.
.It Ev TRANSMISSION_HOME
Sets the default config-dir.
.It Ev http_proxy
-libcurl uses this environment variable when performing tracker announces. If set, this overrides the GNOME proxy preferences.
+libcurl uses this environment variable when performing tracker announces. If set, this overrides the GNOME proxy preferences.
.El
.Sh FILES
.Bl -tag -width Ds -compact
diff --git a/gtk/util.c b/gtk/util.c
index fa188a602..8f838e4b6 100644
--- a/gtk/util.c
+++ b/gtk/util.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -905,7 +905,7 @@ gtr_unrecognized_url_dialog( GtkWidget * parent, const char * url )
if( gtr_is_magnet_link( url ) && ( strstr( url, xt ) == NULL ) )
{
g_string_append_printf( gstr, "\n \n" );
- g_string_append_printf( gstr, _( "This magnet link appears to be intended for something other than BitTorrent. BitTorrent magnet links have a section containing \"%s\"." ), xt );
+ g_string_append_printf( gstr, _( "This magnet link appears to be intended for something other than BitTorrent. BitTorrent magnet links have a section containing \"%s\"." ), xt );
}
gtk_message_dialog_format_secondary_text( GTK_MESSAGE_DIALOG( w ), "%s", gstr->str );
diff --git a/gtk/util.h b/gtk/util.h
index 33f89dcfe..03857f89f 100644
--- a/gtk/util.h
+++ b/gtk/util.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/ConvertUTF.c b/libtransmission/ConvertUTF.c
index 0e8c8569c..235376349 100644
--- a/libtransmission/ConvertUTF.c
+++ b/libtransmission/ConvertUTF.c
@@ -193,7 +193,7 @@ static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080
/*
* Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
- * into the first byte, depending on how many bytes follow. There are
+ * into the first byte, depending on how many bytes follow. There are
* as many entries in this table as there are UTF-8 sequence types.
* (I.e., one byte sequence, two byte... etc.). Remember that sequencs
* for *legal* UTF-8 will be 4 or fewer bytes total.
@@ -289,7 +289,7 @@ ConversionResult ConvertUTF16toUTF8 (
* length = trailingBytesForUTF8[*source]+1;
* and the sequence is illegal right away if there aren't that many bytes
* available.
- * If presented with a length > 4, this returns false. The Unicode
+ * If presented with a length > 4, this returns false. The Unicode
* definition of UTF-8 goes up to 4-byte sequences.
*/
@@ -587,7 +587,7 @@ ConversionResult ConvertUTF8toUTF32 (
Note A.
The fall-through switches in UTF-8 reading code save a
- temp variable, some decrements & conditionals. The switches
+ temp variable, some decrements & conditionals. The switches
are equivalent to the following loop:
{
int tmpBytesToRead = extraBytesToRead+1;
diff --git a/libtransmission/ConvertUTF.h b/libtransmission/ConvertUTF.h
index 3fb616506..59cc9dbb6 100644
--- a/libtransmission/ConvertUTF.h
+++ b/libtransmission/ConvertUTF.h
@@ -29,14 +29,14 @@
/* ---------------------------------------------------------------------
- Conversions between UTF32, UTF-16, and UTF-8. Header file.
+ Conversions between UTF32, UTF-16, and UTF-8. Header file.
Several funtions are included here, forming a complete set of
- conversions between the three formats. UTF-7 is not included
+ conversions between the three formats. UTF-7 is not included
here, but is handled in a separate source file.
Each of these routines takes pointers to input buffers and output
- buffers. The input buffers are const.
+ buffers. The input buffers are const.
Each routine converts the text between *sourceStart and sourceEnd,
putting the result into the buffer between *targetStart and
@@ -61,7 +61,7 @@
These conversion functions take a ConversionFlags argument. When this
flag is set to strict, both irregular sequences and isolated surrogates
- will cause an error. When the flag is set to lenient, both irregular
+ will cause an error. When the flag is set to lenient, both irregular
sequences and isolated surrogates are converted.
Whether the flag is strict or lenient, all illegal sequences will cause
@@ -75,10 +75,10 @@
Output parameters:
The value "sourceIllegal" is returned from some routines if the input
- sequence is malformed. When "sourceIllegal" is returned, the source
+ sequence is malformed. When "sourceIllegal" is returned, the source
value will point to the illegal value that caused the problem. E.g.,
in UTF-8 when a sequence is malformed, it points to the start of the
- malformed sequence.
+ malformed sequence.
Author: Mark E. Davis, 1994.
Rev History: Rick McGowan, fixes & updates May 2001.
diff --git a/libtransmission/JSON_parser.h b/libtransmission/JSON_parser.h
index 39ed569ec..95b3f15ac 100644
--- a/libtransmission/JSON_parser.h
+++ b/libtransmission/JSON_parser.h
@@ -65,7 +65,7 @@ typedef struct JSON_parser_struct* JSON_parser;
/*! \brief JSON parser callback
\param ctx The pointer passed to new_JSON_parser.
- \param type An element of JSON_type but not JSON_T_NONE.
+ \param type An element of JSON_type but not JSON_T_NONE.
\param value A representation of the parsed value. This parameter is NULL for
JSON_T_ARRAY_BEGIN, JSON_T_ARRAY_END, JSON_T_OBJECT_BEGIN, JSON_T_OBJECT_END,
JSON_T_NULL, JSON_T_TRUE, and SON_T_FALSE. String values are always returned
diff --git a/libtransmission/announcer.c b/libtransmission/announcer.c
index 53f03399b..8fcf01b2a 100644
--- a/libtransmission/announcer.c
+++ b/libtransmission/announcer.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -771,7 +771,7 @@ createAnnounceURL( const tr_announcer * announcer,
and once over IPv6.
To be safe, we should do both: add the "ipv6=" parameter and
- announce twice. At any rate, we're already computing our IPv6
+ announce twice. At any rate, we're already computing our IPv6
address (for the LTEP handshake), so this comes for free. */
ipv6 = tr_globalIPv6( );
@@ -1451,7 +1451,7 @@ onAnnounceDone( tr_session * session,
else if( ( responseCode == 404 ) || ( 500 <= responseCode && responseCode <= 599 ) )
{
/* 404: The requested resource could not be found but may be
- * available again in the future. Subsequent requests by
+ * available again in the future. Subsequent requests by
* the client are permissible. */
/* 5xx: indicate cases in which the server is aware that it
@@ -1889,7 +1889,7 @@ fprintf( stderr, "[%s] announce.c has %d requests ready to send (announce: %d, s
int rc;
rc = tr_dhtAnnounce(tor, AF_INET, 1);
if(rc == 0)
- /* The DHT is not ready yet. Try again soon. */
+ /* The DHT is not ready yet. Try again soon. */
tor->dhtAnnounceAt = now + 5 + tr_cryptoWeakRandInt( 5 );
else
/* We should announce at least once every 30 minutes. */
diff --git a/libtransmission/announcer.h b/libtransmission/announcer.h
index 49288edff..83c41581c 100644
--- a/libtransmission/announcer.h
+++ b/libtransmission/announcer.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -49,7 +49,7 @@ typedef struct
const uint8_t * compact;
int compactLen;
- /* [0...100] for probability a peer is a seed. calculated by the leecher/seeder ratio */
+ /* [0...100] for probability a peer is a seed. calculated by the leecher/seeder ratio */
int8_t seedProbability;
}
tr_tracker_event;
diff --git a/libtransmission/bandwidth.c b/libtransmission/bandwidth.c
index b3098e843..a433c6406 100644
--- a/libtransmission/bandwidth.c
+++ b/libtransmission/bandwidth.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -205,9 +205,9 @@ phaseOne( tr_ptrArray * peerArray, tr_direction dir )
int peerCount = tr_ptrArraySize( peerArray );
struct tr_peerIo ** peers = (struct tr_peerIo**) tr_ptrArrayBase( peerArray );
- /* First phase of IO. Tries to distribute bandwidth fairly to keep faster
- * peers from starving the others. Loop through the peers, giving each a
- * small chunk of bandwidth. Keep looping until we run out of bandwidth
+ /* First phase of IO. Tries to distribute bandwidth fairly to keep faster
+ * peers from starving the others. Loop through the peers, giving each a
+ * small chunk of bandwidth. Keep looping until we run out of bandwidth
* and/or peers that can use it */
n = peerCount;
dbgmsg( "%d peers to go round-robin for %s", n, (dir==TR_UP?"upload":"download") );
@@ -267,15 +267,15 @@ tr_bandwidthAllocate( tr_bandwidth * b,
}
}
- /* First phase of IO. Tries to distribute bandwidth fairly to keep faster
- * peers from starving the others. Loop through the peers, giving each a
- * small chunk of bandwidth. Keep looping until we run out of bandwidth
+ /* First phase of IO. Tries to distribute bandwidth fairly to keep faster
+ * peers from starving the others. Loop through the peers, giving each a
+ * small chunk of bandwidth. Keep looping until we run out of bandwidth
* and/or peers that can use it */
phaseOne( &high, dir );
phaseOne( &normal, dir );
phaseOne( &low, dir );
- /* Second phase of IO. To help us scale in high bandwidth situations,
+ /* Second phase of IO. To help us scale in high bandwidth situations,
* enable on-demand IO for peers with bandwidth left to burn.
* This on-demand IO is enabled until (1) the peer runs out of bandwidth,
* or (2) the next tr_bandwidthAllocate() call, when we start over again. */
diff --git a/libtransmission/bandwidth.h b/libtransmission/bandwidth.h
index c78ec54d4..7dd3f356a 100644
--- a/libtransmission/bandwidth.h
+++ b/libtransmission/bandwidth.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -74,19 +74,19 @@ struct tr_band
* Underneath those are per-peer bandwidth objects owned by tr_peer.
*
* tr_session also owns a tr_handshake's bandwidths, so that the handshake
- * I/O can be counted in the global raw totals. When the handshake is done,
+ * I/O can be counted in the global raw totals. When the handshake is done,
* the bandwidth's ownership passes to a tr_peer.
*
* MEASURING
*
* When you ask a bandwidth object for its speed, it gives the speed of the
- * subtree underneath it as well. So you can get Transmission's overall
+ * subtree underneath it as well. So you can get Transmission's overall
* speed by quering tr_session's bandwidth, per-torrent speeds by asking
* tr_torrent's bandwidth, and per-peer speeds by asking tr_peer's bandwidth.
*
* CONSTRAINING
*
- * Call tr_bandwidthAllocate() periodically. tr_bandwidth knows its current
+ * Call tr_bandwidthAllocate() periodically. tr_bandwidth knows its current
* speed and will decide how many bytes to make available over the
* user-specified period to reach the user-specified desired speed.
* If appropriate, it notifies its peer-ios that new bandwidth is available.
diff --git a/libtransmission/bencode.c b/libtransmission/bencode.c
index 14004db6a..ed6bcf3c2 100644
--- a/libtransmission/bencode.c
+++ b/libtransmission/bencode.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/bencode.h b/libtransmission/bencode.h
index 6d114f8f9..3c7db2df4 100644
--- a/libtransmission/bencode.h
+++ b/libtransmission/bencode.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -27,7 +27,7 @@ struct evbuffer;
* An object that acts like a union for
* integers, strings, lists, dictionaries, booleans, and floating-point numbers.
* The structure is named tr_benc due to the historical reason that it was
- * originally tightly coupled with bencoded data. It currently supports
+ * originally tightly coupled with bencoded data. It currently supports
* being parsed from, and serialized to, both bencoded notation and json notation.
*
* @{
@@ -248,7 +248,7 @@ int tr_bencParseStr( const uint8_t * buf,
***
**/
-/* this is only quasi-supported. don't rely on it too heavily outside of libT */
+/* this is only quasi-supported. don't rely on it too heavily outside of libT */
void tr_bencMergeDicts( tr_benc * target, const tr_benc * source );
/* @} */
diff --git a/libtransmission/bitfield.c b/libtransmission/bitfield.c
index 7e46d4fdb..dfe441f26 100644
--- a/libtransmission/bitfield.c
+++ b/libtransmission/bitfield.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/bitfield.h b/libtransmission/bitfield.h
index 508d51eb6..097b7bb63 100644
--- a/libtransmission/bitfield.h
+++ b/libtransmission/bitfield.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -64,7 +64,7 @@ size_t tr_bitfieldCountTrueBits( const tr_bitfield* );
tr_bitfield* tr_bitfieldOr( tr_bitfield*, const tr_bitfield* );
/** A stripped-down version of bitfieldHas to be used
- for speed when you're looping quickly. This version
+ for speed when you're looping quickly. This version
has none of tr_bitfieldHas()'s safety checks, so you
need to call tr_bitfieldTestFast() first before you
start looping. */
diff --git a/libtransmission/bitset.h b/libtransmission/bitset.h
index c3246c2f2..a2889e3ae 100644
--- a/libtransmission/bitset.h
+++ b/libtransmission/bitset.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/blocklist.c b/libtransmission/blocklist.c
index 1f66dec3d..967e59d77 100644
--- a/libtransmission/blocklist.c
+++ b/libtransmission/blocklist.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/blocklist.h b/libtransmission/blocklist.h
index c2bdb42df..f89b82000 100644
--- a/libtransmission/blocklist.h
+++ b/libtransmission/blocklist.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/cache.c b/libtransmission/cache.c
index 063b31d06..88be6337d 100644
--- a/libtransmission/cache.c
+++ b/libtransmission/cache.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/cache.h b/libtransmission/cache.h
index 36277dcc7..9ba36c4c0 100644
--- a/libtransmission/cache.h
+++ b/libtransmission/cache.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/clients.c b/libtransmission/clients.c
index d64530646..469467f43 100644
--- a/libtransmission/clients.c
+++ b/libtransmission/clients.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/clients.h b/libtransmission/clients.h
index 9a8401dc5..86aa5dad7 100644
--- a/libtransmission/clients.h
+++ b/libtransmission/clients.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/completion.c b/libtransmission/completion.c
index acf858a0c..e4c713ef2 100644
--- a/libtransmission/completion.c
+++ b/libtransmission/completion.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/completion.h b/libtransmission/completion.h
index 0f033d9c4..3340e435a 100644
--- a/libtransmission/completion.h
+++ b/libtransmission/completion.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/crypto.c b/libtransmission/crypto.c
index 81c11371d..8904017fd 100644
--- a/libtransmission/crypto.c
+++ b/libtransmission/crypto.c
@@ -1,6 +1,6 @@
/* * This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/crypto.h b/libtransmission/crypto.h
index 1f93c14c4..12d874705 100644
--- a/libtransmission/crypto.h
+++ b/libtransmission/crypto.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/fdlimit.c b/libtransmission/fdlimit.c
index 9329c6dab..3f6ac0b9f 100644
--- a/libtransmission/fdlimit.c
+++ b/libtransmission/fdlimit.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -425,7 +425,7 @@ TrOpenFile( tr_session * session,
* 1. Enable readahead for reasons described above w/POSIX_FADV_SEQUENTIAL.
*
* 2. Disable OS-level caching due to user reports of adverse effects of
- * excessive inactive memory. However this is experimental because
+ * excessive inactive memory. However this is experimental because
* previous attempts at this have *also* had adverse effects (see r8198)
*
* It's okay for this to fail silently, so don't let it affect errno
@@ -550,7 +550,7 @@ tr_fdFileCheckout( tr_session * session,
break;
}
- dbgmsg( "it's not already open. looking for an open slot or an old file." );
+ dbgmsg( "it's not already open. looking for an open slot or an old file." );
while( winner < 0 )
{
time_t date = tr_time( ) + 1;
diff --git a/libtransmission/fdlimit.h b/libtransmission/fdlimit.h
index 27b03848d..271179d6b 100644
--- a/libtransmission/fdlimit.h
+++ b/libtransmission/fdlimit.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/handshake.c b/libtransmission/handshake.c
index 772616346..f67b83f25 100644
--- a/libtransmission/handshake.c
+++ b/libtransmission/handshake.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -615,7 +615,7 @@ readHandshake( tr_handshake * handshake,
handshake->haveReadAnythingFromPeer = TRUE;
- pstrlen = evbuffer_pullup( inbuf, 1 )[0]; /* peek, don't read. We may be
+ pstrlen = evbuffer_pullup( inbuf, 1 )[0]; /* peek, don't read. We may be
handing inbuf to AWAITING_YA */
if( pstrlen == 19 ) /* unencrypted */
diff --git a/libtransmission/handshake.h b/libtransmission/handshake.h
index c56a70cb7..167783872 100644
--- a/libtransmission/handshake.h
+++ b/libtransmission/handshake.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/history.c b/libtransmission/history.c
index b6d8a19e1..963345b8d 100644
--- a/libtransmission/history.c
+++ b/libtransmission/history.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/history.h b/libtransmission/history.h
index 843f9cd5f..bb2e2f980 100644
--- a/libtransmission/history.h
+++ b/libtransmission/history.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/inout.c b/libtransmission/inout.c
index 977a8c29b..a9d2fa131 100644
--- a/libtransmission/inout.c
+++ b/libtransmission/inout.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/inout.h b/libtransmission/inout.h
index e06da02ff..5ed35178c 100644
--- a/libtransmission/inout.h
+++ b/libtransmission/inout.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/json.c b/libtransmission/json.c
index 4d19c8065..006e27942 100644
--- a/libtransmission/json.c
+++ b/libtransmission/json.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/json.h b/libtransmission/json.h
index 7b79b25d9..7a7fc9c34 100644
--- a/libtransmission/json.h
+++ b/libtransmission/json.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -17,7 +17,7 @@ extern "C" {
#endif
/** @ingroup tr_benc */
-int tr_jsonParse( const char * source, /* such as a filename. only when logging an error */
+int tr_jsonParse( const char * source, /* Such as a filename. Only when logging an error */
const void * vbuf,
size_t len,
struct tr_benc * setme_benc,
diff --git a/libtransmission/list.c b/libtransmission/list.c
index baab247a0..28c27e7b9 100644
--- a/libtransmission/list.c
+++ b/libtransmission/list.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/list.h b/libtransmission/list.h
index 59719d753..a6f03d085 100644
--- a/libtransmission/list.h
+++ b/libtransmission/list.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -82,7 +82,7 @@ void* tr_list_remove_data( tr_list ** list, const void * data );
* @brief remove the list's node that compares equal to "b" when compared with "compare_func"
* @param list pointer to the list
* @param b the comparison key
- * @param compare_func the comparison function. The arguments passed to it will be the list's pointers and the comparison key "b"
+ * @param compare_func the comparison function. The arguments passed to it will be the list's pointers and the comparison key "b"
* @return the removed data pointer, or NULL if no match was found
*/
void* tr_list_remove( tr_list ** list,
@@ -93,7 +93,7 @@ void* tr_list_remove( tr_list ** list,
* @brief find the list node whose data that compares equal to "b" when compared with "compare_func"
* @param list pointer to the list
* @param b the comparison key
- * @param compare_func the comparison function. The arguments passed to it will be the list's pointers and the comparison key "b"
+ * @param compare_func the comparison function. The arguments passed to it will be the list's pointers and the comparison key "b"
* @return the matching list node, or NULL if not match was found
*/
tr_list* tr_list_find( tr_list * list,
diff --git a/libtransmission/magnet.c b/libtransmission/magnet.c
index 493ae9e1c..07d1e028b 100644
--- a/libtransmission/magnet.c
+++ b/libtransmission/magnet.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -24,7 +24,7 @@
***/
/* this base32 code converted from code by Robert Kaye and Gordon Mohr
- * and is public domain. see http://bitzi.com/publicdomain for more info */
+ * and is public domain. see http://bitzi.com/publicdomain for more info */
static const int base32Lookup[] =
{
diff --git a/libtransmission/magnet.h b/libtransmission/magnet.h
index 1acbec1ba..9ff7769cd 100644
--- a/libtransmission/magnet.h
+++ b/libtransmission/magnet.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/makemeta.c b/libtransmission/makemeta.c
index bdf9a3432..56d49e466 100644
--- a/libtransmission/makemeta.c
+++ b/libtransmission/makemeta.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/makemeta.h b/libtransmission/makemeta.h
index 9cd92ccf2..1c913ae71 100644
--- a/libtransmission/makemeta.h
+++ b/libtransmission/makemeta.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/metainfo.c b/libtransmission/metainfo.c
index 5b86c13e4..1c1bff5f9 100644
--- a/libtransmission/metainfo.c
+++ b/libtransmission/metainfo.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -255,7 +255,7 @@ tr_convertAnnounceToScrape( const char * announce )
* If the text immediately following that '/' isn't 'announce'
* it will be taken as a sign that that tracker doesn't support
* the scrape convention. If it does, substitute 'scrape' for
- * 'announce' to find the scrape page. */
+ * 'announce' to find the scrape page. */
if( ( ( s = strrchr( announce, '/' ) ) ) && !strncmp( ++s, "announce", 8 ) )
{
const char * prefix = announce;
diff --git a/libtransmission/metainfo.h b/libtransmission/metainfo.h
index 79092b3ab..172b4bb0d 100644
--- a/libtransmission/metainfo.h
+++ b/libtransmission/metainfo.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/natpmp.c b/libtransmission/natpmp.c
index 1cf7dabcb..6406f2df4 100644
--- a/libtransmission/natpmp.c
+++ b/libtransmission/natpmp.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -71,7 +71,7 @@ logVal( const char * func,
else
tr_ndbg(
getKey( ),
- "%s failed. natpmp returned %d (%s); errno is %d (%s)",
+ "%s failed. Natpmp returned %d (%s); errno is %d (%s)",
func, ret, strnatpmperr( ret ), errno, tr_strerror( errno ) );
}
diff --git a/libtransmission/natpmp.h b/libtransmission/natpmp.h
index 905d479bf..017164235 100644
--- a/libtransmission/natpmp.h
+++ b/libtransmission/natpmp.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/net.c b/libtransmission/net.c
index 25cb7ce95..cb8471871 100644
--- a/libtransmission/net.c
+++ b/libtransmission/net.c
@@ -483,7 +483,7 @@ tr_netClose( tr_session * session, int s )
Please feel free to copy them into your software if it can help
unbreaking the double-stack Internet. */
-/* Get the source address used for a given destination address. Since
+/* Get the source address used for a given destination address. Since
there is no official interface to get this information, we create
a connected UDP socket (connected UDP... hmm...) and check its source
address. */
@@ -668,7 +668,7 @@ isMartianAddr( const struct tr_address * a )
(memcmp(address, zeroes, 15) == 0 &&
(address[15] == 0 || address[15] == 1)) ||
/* Addresses outside of 2000::/3 are currently reserved,
- but might be allocated at some future time. Since
+ but might be allocated at some future time. Since
there are a lot of buggy peers pushing around such
addresses over PEX, we reject them until the end of
the 13th Baktun. */
diff --git a/libtransmission/peer-common.h b/libtransmission/peer-common.h
index ee6b6d884..1eae05882 100644
--- a/libtransmission/peer-common.h
+++ b/libtransmission/peer-common.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/peer-io.c b/libtransmission/peer-io.c
index 133ed637c..bfe303ab6 100644
--- a/libtransmission/peer-io.c
+++ b/libtransmission/peer-io.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/peer-io.h b/libtransmission/peer-io.h
index 383fbe8c9..7885430f8 100644
--- a/libtransmission/peer-io.h
+++ b/libtransmission/peer-io.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index 8481a0b71..54d5f2014 100644
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -112,7 +112,7 @@ enum
/**
* Peer information that should be kept even before we've connected and
- * after we've disconnected. These are kept in a pool of peer_atoms to decide
+ * after we've disconnected. These are kept in a pool of peer_atoms to decide
* which ones would make good candidates for connecting to, and to watch out
* for banned peers.
*
@@ -524,7 +524,7 @@ tr_peerMgrFree( tr_peerMgr * manager )
deleteTimers( manager );
- /* free the handshakes. Abort invokes handshakeDoneCB(), which removes
+ /* free the handshakes. Abort invokes handshakeDoneCB(), which removes
* the item from manager->handshakes, so this is a little roundabout... */
while( !tr_ptrArrayEmpty( &manager->incomingHandshakes ) )
tr_handshakeAbort( tr_ptrArrayNth( &manager->incomingHandshakes, 0 ) );
@@ -640,7 +640,7 @@ tr_peerMgrPeerIsSeed( const tr_torrent * tor,
*** for too long and (b) avoiding duplicate requests before endgame.
***
*** 2. Torrent::pieces, an array of "struct weighted_piece" which lists the
-*** pieces that we want to request. It's used to decide which blocks to
+*** pieces that we want to request. It's used to decide which blocks to
*** return next when tr_peerMgrGetBlockRequests() is called.
**/
@@ -1477,7 +1477,7 @@ peerCallbackFunc( tr_peer * peer, const tr_peer_event * e, void * vt )
tr_file_index_t fileIndex;
/* only add this to downloadedCur if we got it from a peer --
- * webseeds shouldn't count against our ratio. As one tracker
+ * webseeds shouldn't count against our ratio. As one tracker
* admin put it, "Those pieces are downloaded directly from the
* content distributor, not the peers, it is the tracker's job
* to manage the swarms, not the web server and does not fit
@@ -2094,7 +2094,7 @@ stopTorrent( Torrent * t )
peerDestructor( t, tr_ptrArrayNth( &t->peers, i ) );
tr_ptrArrayClear( &t->peers );
- /* disconnect the handshakes. handshakeAbort calls handshakeDoneCB(),
+ /* disconnect the handshakes. handshakeAbort calls handshakeDoneCB(),
* which removes the handshake from t->outgoingHandshakes... */
while( !tr_ptrArrayEmpty( &t->outgoingHandshakes ) )
tr_handshakeAbort( tr_ptrArrayNth( &t->outgoingHandshakes, 0 ) );
@@ -2960,7 +2960,7 @@ closePeer( Torrent * t, tr_peer * peer )
atom = peer->atom;
/* if we transferred piece data, then they might be good peers,
- so reset their `numFails' weight to zero. otherwise we connected
+ so reset their `numFails' weight to zero. otherwise we connected
to them fruitlessly, so mark it as another fail */
if( atom->piece_data_time ) {
tordbg( t, "resetting atom %s numFails to 0", tr_atomAddrStr(atom) );
@@ -3374,7 +3374,7 @@ isPeerCandidate( const tr_torrent * tor, struct peer_atom * atom, const time_t n
if( atomIsSeed( atom ) || ( atom->uploadOnly == UPLOAD_ONLY_YES ) )
return FALSE;
- /* not if we've already got a connection to them... */
+ /* not if we've already got a connection to them... */
if( peerIsInUse( tor->torrentPeers, atom ) )
return FALSE;
diff --git a/libtransmission/peer-mgr.h b/libtransmission/peer-mgr.h
index e98895e8a..9c9026bb7 100644
--- a/libtransmission/peer-mgr.h
+++ b/libtransmission/peer-mgr.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/peer-msgs.c b/libtransmission/peer-msgs.c
index 58c1dbdf9..f8b5425ee 100644
--- a/libtransmission/peer-msgs.c
+++ b/libtransmission/peer-msgs.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -224,7 +224,7 @@ struct tr_peermsgs
struct tr_incoming incoming;
/* if the peer supports the Extension Protocol in BEP 10 and
- supplied a reqq argument, it's stored here. otherwise the
+ supplied a reqq argument, it's stored here. Otherwise, the
value is zero and should be ignored. */
int64_t reqq;
@@ -1907,10 +1907,14 @@ fillOutputBuffer( tr_peermsgs * msgs, time_t now )
iovec[0].iov_len = req.length;
evbuffer_commit_space( out, iovec, 1 );
+ /* if we couldn't load a piece we thought we could load... */
+ if( err )
+ tr_torrentSetLocalError( msgs->torrent, _( "Couldn't read piece #%zu from disk! Please Verify Local Data." ), (size_t)req.index );
+
/* check the piece if it needs checking... */
if( !err && tr_torrentPieceNeedsCheck( msgs->torrent, req.index ) )
if(( err = !tr_torrentCheckPiece( msgs->torrent, req.index )))
- tr_torrentSetLocalError( msgs->torrent, _( "Piece #%zu is corrupt! Please Verify Local Data." ), (size_t)req.index );
+ tr_torrentSetLocalError( msgs->torrent, _( "Piece #%zu is corrupt! Please Verify Local Data." ), (size_t)req.index );
if( err )
{
diff --git a/libtransmission/peer-msgs.h b/libtransmission/peer-msgs.h
index 33a613e1d..2a14b7a25 100644
--- a/libtransmission/peer-msgs.h
+++ b/libtransmission/peer-msgs.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/platform.c b/libtransmission/platform.c
index 77ae70a34..9f1309732 100644
--- a/libtransmission/platform.c
+++ b/libtransmission/platform.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/platform.h b/libtransmission/platform.h
index 71ff16edc..17f546728 100644
--- a/libtransmission/platform.h
+++ b/libtransmission/platform.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/port-forwarding.c b/libtransmission/port-forwarding.c
index 6f0a099f0..278e82b60 100644
--- a/libtransmission/port-forwarding.c
+++ b/libtransmission/port-forwarding.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -111,12 +111,12 @@ set_evtimer_from_status( tr_shared * s )
break;
case TR_PORT_ERROR:
- /* some kind of an error. wait 60 seconds and retry */
+ /* some kind of an error. wait 60 seconds and retry */
sec = 60;
break;
default:
- /* in progress. pulse frequently. */
+ /* in progress. pulse frequently. */
msec = 333000;
break;
}
diff --git a/libtransmission/port-forwarding.h b/libtransmission/port-forwarding.h
index 9e9b8d584..fd387ba69 100644
--- a/libtransmission/port-forwarding.h
+++ b/libtransmission/port-forwarding.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/ptrarray.c b/libtransmission/ptrarray.c
index 2cb892d47..6d517768c 100644
--- a/libtransmission/ptrarray.c
+++ b/libtransmission/ptrarray.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/ptrarray.h b/libtransmission/ptrarray.h
index a2273cf8d..13ecf9ea5 100644
--- a/libtransmission/ptrarray.h
+++ b/libtransmission/ptrarray.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/resume.c b/libtransmission/resume.c
index a1bccc2bc..f285f02fd 100644
--- a/libtransmission/resume.c
+++ b/libtransmission/resume.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -221,7 +221,7 @@ loadDND( tr_benc * dict,
{
tr_tordbg(
tor,
- "Couldn't load DND flags. dnd list (%p) has %zu children; torrent has %d files",
+ "Couldn't load DND flags. DND list (%p) has %zu children; torrent has %d files",
list, tr_bencListSize( list ), (int)n );
}
diff --git a/libtransmission/resume.h b/libtransmission/resume.h
index 0e8cab7bd..a1d6abede 100644
--- a/libtransmission/resume.h
+++ b/libtransmission/resume.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c
index 96253fe5a..52eeacc0c 100644
--- a/libtransmission/rpc-server.c
+++ b/libtransmission/rpc-server.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -616,7 +616,7 @@ handle_request( struct evhttp_request * req, void * arg )
"<p>Unauthorized IP Address.</p>"
"<p>Either disable the IP address whitelist or add your address to it.</p>"
"<p>If you're editing settings.json, see the 'rpc-whitelist' and 'rpc-whitelist-enabled' entries.</p>"
- "<p>If you're still using ACLs, use a whitelist instead. See the transmission-daemon manpage for details.</p>" );
+ "<p>If you're still using ACLs, use a whitelist instead. See the transmission-daemon manpage for details.</p>" );
}
else if( server->isPasswordEnabled
&& ( !pass || !user || strcmp( server->username, user )
diff --git a/libtransmission/rpc-server.h b/libtransmission/rpc-server.h
index 6d9bc176d..cd22a130c 100644
--- a/libtransmission/rpc-server.h
+++ b/libtransmission/rpc-server.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/rpcimpl.c b/libtransmission/rpcimpl.c
index b32677275..cf01300b5 100644
--- a/libtransmission/rpcimpl.c
+++ b/libtransmission/rpcimpl.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -455,7 +455,7 @@ addPeers( const tr_torrent * tor,
tr_torrentPeersFree( peers, peerCount );
}
-/* faster-than-strcmp() optimization. this is kind of clumsy,
+/* faster-than-strcmp() optimization. This is kind of clumsy,
but addField() was in the profiler's top 10 list, and this
makes it 4x faster... */
#define tr_streq(a,alen,b) ((alen+1==sizeof(b)) && !memcmp(a,b,alen))
diff --git a/libtransmission/rpcimpl.h b/libtransmission/rpcimpl.h
index 6df46f894..d3d81338d 100644
--- a/libtransmission/rpcimpl.h
+++ b/libtransmission/rpcimpl.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/session.c b/libtransmission/session.c
index 06d0a5b92..c6b163032 100644
--- a/libtransmission/session.c
+++ b/libtransmission/session.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -457,7 +457,7 @@ tr_sessionSaveSettings( tr_session * session,
/**
* Periodically save the .resume files of any torrents whose
- * status has recently changed. This prevents loss of metadata
+ * status has recently changed. This prevents loss of metadata
* in the case of a crash, unclean shutdown, clumsy user, etc.
*/
static void
@@ -1676,7 +1676,7 @@ sessionCloseImpl( void * vsession )
tr_sharedClose( session );
tr_rpcClose( &session->rpcServer );
- /* close the torrents. get the most active ones first so that
+ /* Close the torrents. Get the most active ones first so that
* if we can't get them all closed in a reasonable amount of time,
* at least we get the most important ones first. */
tor = NULL;
diff --git a/libtransmission/session.h b/libtransmission/session.h
index 03329eb63..b644c3f4f 100644
--- a/libtransmission/session.h
+++ b/libtransmission/session.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/stats.c b/libtransmission/stats.c
index fe4e4ba5c..b32caf7ad 100644
--- a/libtransmission/stats.c
+++ b/libtransmission/stats.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/stats.h b/libtransmission/stats.h
index e88cc75f5..a983c859d 100644
--- a/libtransmission/stats.h
+++ b/libtransmission/stats.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/torrent-ctor.c b/libtransmission/torrent-ctor.c
index 68d7bdb7c..da5006b3f 100644
--- a/libtransmission/torrent-ctor.c
+++ b/libtransmission/torrent-ctor.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/torrent-magnet.c b/libtransmission/torrent-magnet.c
index 1b69f2202..f8463651c 100644
--- a/libtransmission/torrent-magnet.c
+++ b/libtransmission/torrent-magnet.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/torrent-magnet.h b/libtransmission/torrent-magnet.h
index c19e2ed0b..ad54f8d21 100644
--- a/libtransmission/torrent-magnet.h
+++ b/libtransmission/torrent-magnet.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
index 6a9105656..0ee7bcbf9 100644
--- a/libtransmission/torrent.c
+++ b/libtransmission/torrent.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -652,7 +652,7 @@ tr_torrentInitFilePieces( tr_torrent * tor )
static void torrentStart( tr_torrent * tor );
/**
- * Decide on a block size. constraints:
+ * Decide on a block size. Constraints:
* (1) most clients decline requests over 16 KiB
* (2) pieceSize must be a multiple of block size
*/
@@ -765,7 +765,7 @@ setLocalErrorIfFilesDisappeared( tr_torrent * tor )
if( disappeared )
{
tr_tordbg( tor, "%s", "[LAZY] uh oh, the files disappeared" );
- tr_torrentSetLocalError( tor, "%s", _( "No data found! Ensure your drives are connected or use \"Set Location\". To re-download, remove the torrent and re-add it." ) );
+ tr_torrentSetLocalError( tor, "%s", _( "No data found! Ensure your drives are connected or use \"Set Location\". To re-download, remove the torrent and re-add it." ) );
}
return disappeared;
diff --git a/libtransmission/torrent.h b/libtransmission/torrent.h
index 649b27dc8..838055edb 100644
--- a/libtransmission/torrent.h
+++ b/libtransmission/torrent.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/tr-dht.c b/libtransmission/tr-dht.c
index e220a145c..9732d14fd 100644
--- a/libtransmission/tr-dht.c
+++ b/libtransmission/tr-dht.c
@@ -13,7 +13,7 @@ all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
@@ -182,7 +182,7 @@ dht_bootstrap(void *closure)
}
/* Our DHT code is able to take up to 9 nodes in a row without
- dropping any. After that, it takes some time to split buckets.
+ dropping any. After that, it takes some time to split buckets.
So ping the first 8 nodes quickly, then slow down. */
if(i < 8)
nap(2);
@@ -265,7 +265,7 @@ rebind_ipv6(tr_bool force)
int one = 1;
/* We currently have no way to enable or disable IPv6 once the DHT has
- been initialised. Oh, well. */
+ been initialised. Oh, well. */
if(ipv6 == NULL || (!force && dht6_socket < 0)) {
if(last_bound) {
free(last_bound);
@@ -283,7 +283,7 @@ rebind_ipv6(tr_bool force)
#ifdef IPV6_V6ONLY
/* Since we always open an IPv4 socket on the same port, this
- shouldn't matter. But I'm superstitious. */
+ shouldn't matter. But I'm superstitious. */
setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one));
#endif
@@ -710,7 +710,7 @@ event_callback(int s, short type, void *ignore UNUSED )
}
}
- /* Only do this once in a while. Counting rather than measuring time
+ /* Only do this once in a while. Counting rather than measuring time
avoids a system call. */
count++;
if(count >= 20) {
diff --git a/libtransmission/tr-dht.h b/libtransmission/tr-dht.h
index d78e40912..623db969d 100644
--- a/libtransmission/tr-dht.h
+++ b/libtransmission/tr-dht.h
@@ -13,7 +13,7 @@ all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
diff --git a/libtransmission/tr-getopt.c b/libtransmission/tr-getopt.c
index a53363169..99e59747f 100644
--- a/libtransmission/tr-getopt.c
+++ b/libtransmission/tr-getopt.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/tr-getopt.h b/libtransmission/tr-getopt.h
index d73cc7e1f..ae49ce766 100644
--- a/libtransmission/tr-getopt.h
+++ b/libtransmission/tr-getopt.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/tr-lpd.c b/libtransmission/tr-lpd.c
index c6306eb48..f18524b68 100644
--- a/libtransmission/tr-lpd.c
+++ b/libtransmission/tr-lpd.c
@@ -13,7 +13,7 @@ all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
@@ -61,7 +61,7 @@ THE SOFTWARE.
* @file tr-lpd.c
*
* This module implements the Local Peer Discovery (LPD) protocol as supported by the
-* uTorrent client application. A typical LPD datagram is 119 bytes long.
+* uTorrent client application. A typical LPD datagram is 119 bytes long.
*
* $Id$
*/
@@ -414,7 +414,7 @@ static inline void lpd_consistencyCheck( void )
* @return Returns TRUE on success
*
* Send a query for torrent t out to the LPD multicast group (or the LAN, for that
-* matter). A listening client on the same network might react by adding us to his
+* matter). A listening client on the same network might react by adding us to his
* peer pool for torrent t.
*/
tr_bool tr_lpdSendAnnounce( const tr_torrent* t )
@@ -471,7 +471,7 @@ tr_bool tr_lpdSendAnnounce( const tr_torrent* t )
* the peer in/out parameter.
*
* @note The port information gets added to the peer structure if tr_lpdConsiderAnnounce
-* is able to extract the necessary information from the announce message. That is, if
+* is able to extract the necessary information from the announce message. That is, if
* return != 0, the caller may retrieve the value from the passed structure.
*/
static int tr_lpdConsiderAnnounce( tr_pex* peer, const char* const msg )
diff --git a/libtransmission/tr-lpd.h b/libtransmission/tr-lpd.h
index b279ed8b0..549b52827 100644
--- a/libtransmission/tr-lpd.h
+++ b/libtransmission/tr-lpd.h
@@ -13,7 +13,7 @@ all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index 060dfe4d9..7499fe95d 100644
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -108,7 +108,7 @@ tr_encryption_mode;
*
* A libtransmission session is created by calling tr_sessionInit().
* libtransmission creates a thread for itself so that it can operate
- * independently of the caller's event loop. The session will continue
+ * independently of the caller's event loop. The session will continue
* until tr_sessionClose() is called.
*
* @{
@@ -317,7 +317,7 @@ void tr_sessionClose( tr_session * );
* @brief Return the session's configuration directory.
*
* This is where transmission stores its .torrent files, .resume files,
- * blocklists, etc. It's set in tr_transmissionInit() and is immutable
+ * blocklists, etc. It's set in tr_transmissionInit() and is immutable
* during the session.
*/
const char * tr_sessionGetConfigDir( const tr_session * );
@@ -445,7 +445,7 @@ const char* tr_sessionGetRPCUrl( const tr_session * session );
* @brief Specify a whitelist for remote RPC access
*
* The whitelist is a comma-separated list of dotted-quad IP addresses
- * to be allowed. Wildmat notation is supported, meaning that
+ * to be allowed. Wildmat notation is supported, meaning that
* '?' is interpreted as a single-character wildcard and
* '*' is interprted as a multi-character wildcard.
*/
@@ -503,7 +503,7 @@ typedef enum
TR_RPC_OK = 0,
/* indicates to the caller that the client will take care of
- * removing the torrent itself. For example the client may
+ * removing the torrent itself. For example the client may
* need to keep the torrent alive long enough to cleanly close
* some resources in another thread. */
TR_RPC_NOREMOVE = ( 1 << 1 )
@@ -841,7 +841,7 @@ const char * tr_blocklistGetURL ( const tr_session * );
@{
Instantiating a tr_torrent had gotten more complicated as features were
- added. At one point there were four functions to check metainfo and five
+ added. At one point there were four functions to check metainfo and five
to create tr_torrent.
To remedy this, a Torrent Constructor (struct tr_ctor) has been introduced:
@@ -854,7 +854,7 @@ const char * tr_blocklistGetURL ( const tr_session * );
an error number, or zero if no error occurred.
You must call one of the SetMetainfo() functions before creating
- a torrent with a tr_ctor. The other functions are optional.
+ a torrent with a tr_ctor. The other functions are optional.
You can reuse a single tr_ctor to create a batch of torrents --
just call one of the SetMetainfo() functions between each
@@ -876,7 +876,7 @@ tr_ctorMode;
struct tr_benc;
/** @brief Create a new torrent constructor object used to instantiate a tr_torrent
- @param session the tr_session. NULL is allowed if you're only calling tr_torrentParse() rather than tr_torrentNew()
+ @param session the tr_session. NULL is allowed if you're only calling tr_torrentParse() rather than tr_torrentNew()
@see tr_torrentNew(), tr_torrentParse() */
tr_ctor* tr_ctorNew( const tr_session * session_or_NULL );
@@ -1028,7 +1028,7 @@ tr_torrent * tr_torrentNew( const tr_ctor * ctor,
@{ */
/** @brief Frees memory allocated by tr_torrentNew().
- Running torrents are stopped first. */
+ Running torrents are stopped first. */
void tr_torrentFree( tr_torrent * torrent );
typedef int tr_fileFunc( const char * filename );
@@ -1071,7 +1071,7 @@ uint64_t tr_torrentGetBytesLeftToAllocate( const tr_torrent * torrent );
* @brief Returns this torrent's unique ID.
*
* IDs are good as simple lookup keys, but are not persistent
- * between sessions. If you need that, use tr_info.hash or
+ * between sessions. If you need that, use tr_info.hash or
* tr_info.hashString.
*/
int tr_torrentId( const tr_torrent * torrent );
@@ -1219,7 +1219,7 @@ const char * tr_torrentGetDownloadDir( const tr_torrent * torrent );
/**
* Returns the root directory of where the torrent is.
*
- * This will usually be the downloadDir. However if the torrent
+ * This will usually be the downloadDir. However if the torrent
* has an incompleteDir enabled and hasn't finished downloading
* yet, that will be returned instead.
*/
@@ -1296,7 +1296,7 @@ typedef void ( tr_torrent_idle_limit_hit_func )( tr_torrent * torrent,
/**
* Register to be notified whenever a torrent's "completeness"
- * changes. This will be called, for example, when a torrent
+ * changes. This will be called, for example, when a torrent
* finishes downloading and changes from TR_LEECH to
* either TR_SEED or TR_PARTIAL_SEED.
*
@@ -1742,7 +1742,7 @@ typedef struct tr_stat
/** When tr_stat.activity is TR_STATUS_CHECK or TR_STATUS_CHECK_WAIT,
this is the percentage of how much of the files has been
- verified. When it gets to 1, the verify process is done.
+ verified. When it gets to 1, the verify process is done.
Range is [0..1]
@see tr_stat.activity */
double recheckProgress;
@@ -1757,7 +1757,7 @@ typedef struct tr_stat
Range is [0..1] */
double metadataPercentComplete;
- /** How much has been downloaded of the files the user wants. This differs
+ /** How much has been downloaded of the files the user wants. This differs
from percentComplete if the user wants only some of the torrent's files.
Range is [0..1]
@see tr_stat.leftUntilDone */
@@ -1812,13 +1812,13 @@ typedef struct tr_stat
int webseedsSendingToUs;
/** Byte count of all the piece data we'll have downloaded when we're done,
- whether or not we have it yet. This may be less than tr_info.totalSize
+ whether or not we have it yet. This may be less than tr_info.totalSize
if only some of the torrent's files are wanted.
[0...tr_info.totalSize] */
uint64_t sizeWhenDone;
/** Byte count of how much data is left to be downloaded until we've got
- all the pieces that we want. [0...tr_info.sizeWhenDone] */
+ all the pieces that we want. [0...tr_info.sizeWhenDone] */
uint64_t leftUntilDone;
/** Byte count of all the piece data we want and don't have yet,
@@ -1826,7 +1826,7 @@ typedef struct tr_stat
uint64_t desiredAvailable;
/** Byte count of all the corrupt data you've ever downloaded for
- this torrent. If you're on a poisoned torrent, this number can
+ this torrent. If you're on a poisoned torrent, this number can
grow very large. */
uint64_t corruptEver;
@@ -1834,7 +1834,7 @@ typedef struct tr_stat
uint64_t uploadedEver;
/** Byte count of all the non-corrupt data you've ever downloaded
- for this torrent. If you deleted the files and downloaded a second
+ for this torrent. If you deleted the files and downloaded a second
time, this will be 2*totalSize.. */
uint64_t downloadedEver;
@@ -1886,12 +1886,12 @@ typedef struct tr_stat
tr_stat;
/** Return a pointer to an tr_stat structure with updated information
- on the torrent. This is typically called by the GUI clients every
+ on the torrent. This is typically called by the GUI clients every
second or so to get a new snapshot of the torrent's status. */
const tr_stat * tr_torrentStat( tr_torrent * torrent );
/** Like tr_torrentStat(), but only recalculates the statistics if it's
- been longer than a second since they were last calculated. This can
+ been longer than a second since they were last calculated. This can
reduce the CPU load if you're calling tr_torrentStat() frequently. */
const tr_stat * tr_torrentStatCached( tr_torrent * torrent );
diff --git a/libtransmission/trevent.c b/libtransmission/trevent.c
index ef58021a5..c62e5173a 100644
--- a/libtransmission/trevent.c
+++ b/libtransmission/trevent.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/trevent.h b/libtransmission/trevent.h
index 9899378bc..0681edc14 100644
--- a/libtransmission/trevent.h
+++ b/libtransmission/trevent.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/upnp.c b/libtransmission/upnp.c
index 00e8e7745..e12cd4a2a 100644
--- a/libtransmission/upnp.c
+++ b/libtransmission/upnp.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -196,8 +196,7 @@ tr_upnpPulse( tr_upnp * handle,
handle->isMapped = !err;
}
tr_ninf( getKey( ),
- _(
- "Port forwarding through \"%s\", service \"%s\". (local address: %s:%d)" ),
+ _( "Port forwarding through \"%s\", service \"%s\". (local address: %s:%d)" ),
handle->urls.controlURL, handle->data.first.servicetype,
handle->lanaddr, port );
if( handle->isMapped )
diff --git a/libtransmission/upnp.h b/libtransmission/upnp.h
index 9a7df9739..525b7d314 100644
--- a/libtransmission/upnp.h
+++ b/libtransmission/upnp.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/utils-test.c b/libtransmission/utils-test.c
index c07d2fe64..debe72435 100644
--- a/libtransmission/utils-test.c
+++ b/libtransmission/utils-test.c
@@ -270,7 +270,7 @@ test_lowerbound( void )
const int pos = tr_lowerBound( &i, A, N, sizeof(int), compareInts, &exact );
#if 0
- fprintf( stderr, "searching for %d. ", i );
+ fprintf( stderr, "searching for %d. ", i );
fprintf( stderr, "result: index = %d, ", pos );
if( pos != N )
fprintf( stderr, "A[%d] == %d\n", pos, A[pos] );
diff --git a/libtransmission/utils.c b/libtransmission/utils.c
index 7e6e6a38d..d29c6f1d0 100644
--- a/libtransmission/utils.c
+++ b/libtransmission/utils.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -678,7 +678,7 @@ tr_buildPath( const char *first_element, ... )
}
va_end( vl );
- /* terminate the string. if nonempty, eat the unwanted trailing slash */
+ /* terminate the string. if nonempty, eat the unwanted trailing slash */
if( pch != buf )
--pch;
*pch++ = '\0';
@@ -899,14 +899,12 @@ tr_snprintf( char * buf, size_t buflen, const char * fmt, ... )
}
/*
- * Copy src to string dst of size siz. At most siz-1 characters
- * will be copied. Always NUL terminates (unless siz == 0).
+ * Copy src to string dst of size siz. At most siz-1 characters
+ * will be copied. Always NUL terminates (unless siz == 0).
* Returns strlen(src); if retval >= siz, truncation occurred.
*/
size_t
-tr_strlcpy( char * dst,
- const void * src,
- size_t siz )
+tr_strlcpy( char * dst, const void * src, size_t siz )
{
#ifdef HAVE_STRLCPY
return strlcpy( dst, src, siz );
diff --git a/libtransmission/utils.h b/libtransmission/utils.h
index 232fc2965..08908e5a9 100644
--- a/libtransmission/utils.h
+++ b/libtransmission/utils.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2009-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -272,7 +272,7 @@ void tr_wait_msec( long int delay_milliseconds );
* @brief make a copy of 'str' whose non-utf8 content has been corrected or stripped
* @return a newly-allocated string that must be freed with tr_free()
* @param str the string to make a clean copy of
- * @param len the length of the string to copy. If -1, the entire string is used.
+ * @param len the length of the string to copy. If -1, the entire string is used.
*/
char* tr_utf8clean( const char * str, int len ) TR_GNUC_MALLOC;
@@ -331,7 +331,7 @@ void* tr_valloc( size_t bufLen );
/**
* @brief make a newly-allocated copy of a substring
* @param in is a void* so that callers can pass in both signed & unsigned without a cast
- * @param len length of the substring to copy. if a length less than zero is passed in, strlen( len ) is used
+ * @param len length of the substring to copy. if a length less than zero is passed in, strlen( len ) is used
* @return a newly-allocated copy of `in' that can be freed with tr_free()
*/
char* tr_strndup( const void * in, int len ) TR_GNUC_MALLOC;
@@ -540,7 +540,7 @@ extern time_t transmission_now;
* This function returns a second counter that is updated once per second.
* If something blocks the libtransmission thread for more than a second,
* that counter may be thrown off, so this function is not guaranteed
- * to always be accurate. However, it is *much* faster when 100% accuracy
+ * to always be accurate. However, it is *much* faster when 100% accuracy
* isn't needed
*/
static inline time_t tr_time( void ) { return transmission_now; }
diff --git a/libtransmission/verify.c b/libtransmission/verify.c
index 2f7c773f6..72ccf772f 100644
--- a/libtransmission/verify.c
+++ b/libtransmission/verify.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
@@ -147,7 +147,7 @@ verifyTorrent( tr_torrent * tor, tr_bool * stopFlag )
/* stopwatch */
end = tr_time( );
- tr_tordbg( tor, "Verification is done. It took %d seconds to verify %"PRIu64" bytes (%"PRIu64" bytes per second)",
+ tr_tordbg( tor, "Verification is done. It took %d seconds to verify %"PRIu64" bytes (%"PRIu64" bytes per second)",
(int)(end-begin), tor->info.totalSize,
(uint64_t)(tor->info.totalSize/(1+(end-begin))) );
diff --git a/libtransmission/verify.h b/libtransmission/verify.h
index d4eb822d4..eac79a672 100644
--- a/libtransmission/verify.h
+++ b/libtransmission/verify.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2007-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/web.c b/libtransmission/web.c
index 259b47777..8fcbd0499 100644
--- a/libtransmission/web.c
+++ b/libtransmission/web.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/web.h b/libtransmission/web.h
index 88fb64581..252595cd5 100644
--- a/libtransmission/web.h
+++ b/libtransmission/web.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/webseed.c b/libtransmission/webseed.c
index 23790cd50..d64f1da54 100644
--- a/libtransmission/webseed.c
+++ b/libtransmission/webseed.c
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/webseed.h b/libtransmission/webseed.h
index 7f51624dd..a69e75745 100644
--- a/libtransmission/webseed.h
+++ b/libtransmission/webseed.h
@@ -1,7 +1,7 @@
/*
* This file Copyright (C) 2008-2010 Mnemosyne LLC
*
- * This file is licensed by the GPL version 2. Works owned by the
+ * This file is licensed by the GPL version 2. Works owned by the
* Transmission project are granted a special exemption to clause 2(b)
* so that the bulk of its code can remain under the MIT license.
* This exemption does not extend to derived works not owned by
diff --git a/libtransmission/wildmat.c b/libtransmission/wildmat.c
index 08dd04e4e..1e95839f9 100644
--- a/libtransmission/wildmat.c
+++ b/libtransmission/wildmat.c
@@ -3,7 +3,7 @@
**
** Do shell-style pattern matching for ?, \, [], and * characters.
** Might not be robust in face of malformed patterns; e.g., "foo[a-"
-** could cause a segmentation violation. It is 8bit clean.
+** could cause a segmentation violation. It is 8bit clean.
**
** Written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986.
** Rich $alz is now <rsalz@bbn.com>.
@@ -11,28 +11,28 @@
** for the star character.
**
** Special thanks to Lars Mathiesen <thorinn@diku.dk> for the ABORT code.
-** This can greatly speed up failing wildcard patterns. For example:
+** This can greatly speed up failing wildcard patterns. For example:
** pattern: -*-*-*-*-*-*-12-*-*-*-m-*-*-*
** text 1: -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1
** text 2: -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1
-** Text 1 matches with 51 calls, while text 2 fails with 54 calls. Without
-** the ABORT, then it takes 22310 calls to fail. Ugh. The following
+** Text 1 matches with 51 calls, while text 2 fails with 54 calls. Without
+** the ABORT, then it takes 22310 calls to fail. Ugh. The following
** explanation is from Lars:
** The precondition that must be fulfilled is that DoMatch will consume
-** at least one character in text. This is true if *p is neither '*' nor
+** at least one character in text. This is true if *p is neither '*' nor
** '\0'.) The last return has ABORT instead of FALSE to avoid quadratic
-** behaviour in cases like pattern "*a*b*c*d" with text "abcxxxxx". With
+** behaviour in cases like pattern "*a*b*c*d" with text "abcxxxxx". With
** FALSE, each star-loop has to run to the end of the text; with ABORT
** only the last one does.
**
** Once the control of one instance of DoMatch enters the star-loop, that
** instance will return either TRUE or ABORT, and any calling instance
** will therefore return immediately after (without calling recursively
-** again). In effect, only one star-loop is ever active. It would be
+** again). In effect, only one star-loop is ever active. It would be
** possible to modify the code to maintain this context explicitly,
** eliminating all recursive calls at the cost of some complication and
** loss of clarity (and the ABORT stuff seems to be unclear enough by
-** itself). I think it would be unwise to try to get this into a
+** itself). I think it would be unwise to try to get this into a
** released version unless you have a good test data base to try it out
** on.
*/
@@ -110,7 +110,7 @@ DoMatch( const char * text, const char * p )
/*
-** User-level routine. Returns TRUE or FALSE.
+** User-level routine. Returns TRUE or FALSE.
*/
int
tr_wildmat(const char * text, const char * p )