From 537196d267571d50f0321122bbf49107865415bd Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Thu, 16 Sep 2004 18:33:39 +0000 Subject: [PATCH] Fix misspellings of "transferring" in the tree. Bug 258874, patch by Chris Thomas (CTho) , r=bsmedberg, spelling fix rs=brendan git-svn-id: svn://10.0.0.236/trunk@162468 18797224-902f-48f8-a5cc-f745e15eee43 --- .../browser/activex/src/plugin/LegacyPlugin.cpp | 2 +- .../embedding/browser/photon/tests/TestPhEmbed.cpp | 2 +- .../components/ui/progressDlg/nsProgressDialog.js | 4 ++-- .../resources/content/transfer/progressDialog.js | 6 +++--- .../sroaming/resources/content/transfer/transfer.js | 2 +- .../resources/locale/en-US/progressDialog.dtd | 2 +- .../resources/locale/en-US/transfer.properties | 12 ++++++------ mozilla/uriloader/base/nsIDownload.idl | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/mozilla/embedding/browser/activex/src/plugin/LegacyPlugin.cpp b/mozilla/embedding/browser/activex/src/plugin/LegacyPlugin.cpp index cbb8f5d3633..73e1872d256 100644 --- a/mozilla/embedding/browser/activex/src/plugin/LegacyPlugin.cpp +++ b/mozilla/embedding/browser/activex/src/plugin/LegacyPlugin.cpp @@ -1122,7 +1122,7 @@ NPP_SetWindow(NPP instance, NPWindow* window) // that the plugin doesn't handle streaming and can only deal with the object as // a complete disk file. It will still call the write functions but it will also // pass the filename of the cached file in a later NPE_StreamAsFile call when it -// is done transfering the file. +// is done transferring the file. // // If a plugin handles the data in a streaming manner, it should set streamtype to // NPNormal (e.g. *streamtype = NPNormal)...the NPE_StreamAsFile function will diff --git a/mozilla/embedding/browser/photon/tests/TestPhEmbed.cpp b/mozilla/embedding/browser/photon/tests/TestPhEmbed.cpp index 6277749f1c9..833c201b354 100644 --- a/mozilla/embedding/browser/photon/tests/TestPhEmbed.cpp +++ b/mozilla/embedding/browser/photon/tests/TestPhEmbed.cpp @@ -325,7 +325,7 @@ int moz_progress_cb(PtWidget_t *widget, void *data, PtCallbackInfo_t *cbinfo) percent = (c->cur*100)/c->max; //if ( i->statusMessage != NULL ) //sprintf(message, "%s (%d%% complete, %d bytes of %d loaded)", i->statusMessage, percent, c->cur, c->max); - sprintf(message, "%s (%d%% complete, %d bytes of %d loaded)", "Transfering", percent, c->cur, c->max); + sprintf(message, "%s (%d%% complete, %d bytes of %d loaded)", "Transferring", percent, c->cur, c->max); } #if 0 printf ("Progress: %d\n",(int)percent); diff --git a/mozilla/embedding/components/ui/progressDlg/nsProgressDialog.js b/mozilla/embedding/components/ui/progressDlg/nsProgressDialog.js index 877735ec739..9b6553f0017 100644 --- a/mozilla/embedding/components/ui/progressDlg/nsProgressDialog.js +++ b/mozilla/embedding/components/ui/progressDlg/nsProgressDialog.js @@ -187,7 +187,7 @@ nsProgressDialog.prototype = { if ( aStateFlags & nsIWebProgressListener.STATE_STOP ) { // if we are downloading, then just wait for the first STATE_STOP if ( this.targetFile != null ) { - // we are done transfering... + // we are done transferring... this.completed = true; return; } @@ -197,7 +197,7 @@ nsProgressDialog.prototype = { try { var chan = aRequest.QueryInterface(nsIChannel); if (chan.URI.equals(this.target)) { - // we are done transfering... + // we are done transferring... this.completed = true; } } diff --git a/mozilla/extensions/sroaming/resources/content/transfer/progressDialog.js b/mozilla/extensions/sroaming/resources/content/transfer/progressDialog.js index 5a815519476..6451e9f5b79 100644 --- a/mozilla/extensions/sroaming/resources/content/transfer/progressDialog.js +++ b/mozilla/extensions/sroaming/resources/content/transfer/progressDialog.js @@ -86,7 +86,7 @@ function Startup() document.getElementById("TransferToFromSite").value = directionString.replace(/%site%/, gTransfer.sitename); - // Show transfering destination URL + // Show transferring destination URL document.getElementById("TransferUrl").value = gTransfer.remoteDir; // Add the files to the UI as quickly as possible @@ -224,7 +224,7 @@ function SetProgressStatus(filenr) //ddump(filename + ", " + status + ", " + NameForStatusCode(file.statusCode)); if (status == "busy") - SetStatusMessage(GetString("Transfering")); + SetStatusMessage(GetString("Transferring")); // update file listbox // if we already have this file's item, just set attribute for status icon @@ -406,5 +406,5 @@ function SetListingTransfer(on) { gDialog.ListingProgress.setAttribute("hidden", on ? "false" : "true"); //gDialog.ListingProgress.setAttribute("value", on ? "1" : "0"); - SetStatusMessage(on ? GetString("TransferingListing") : null); + SetStatusMessage(on ? GetString("TransferringListing") : null); } diff --git a/mozilla/extensions/sroaming/resources/content/transfer/transfer.js b/mozilla/extensions/sroaming/resources/content/transfer/transfer.js index 3dc6b92c14d..19fd63b6d0e 100644 --- a/mozilla/extensions/sroaming/resources/content/transfer/transfer.js +++ b/mozilla/extensions/sroaming/resources/content/transfer/transfer.js @@ -1304,7 +1304,7 @@ TransferProgressListener.prototype = // Update any data that the user supplied in a prompt dialog updateUsernamePasswordFromPrompt : function(username, password,savePassword) { - // Set flag to save login data after transfering, if it changed in + // Set flag to save login data after transferring, if it changed in // dialog and the "SavePassword" checkbox was checked this.transfer.saveLogin = (username != this.transfer.username || password != this.transfer.password) diff --git a/mozilla/extensions/sroaming/resources/locale/en-US/progressDialog.dtd b/mozilla/extensions/sroaming/resources/locale/en-US/progressDialog.dtd index 2a0dcb4d8ce..c42c4742006 100644 --- a/mozilla/extensions/sroaming/resources/locale/en-US/progressDialog.dtd +++ b/mozilla/extensions/sroaming/resources/locale/en-US/progressDialog.dtd @@ -40,7 +40,7 @@ - + diff --git a/mozilla/extensions/sroaming/resources/locale/en-US/transfer.properties b/mozilla/extensions/sroaming/resources/locale/en-US/transfer.properties index 3520a49658f..7a7d6662638 100644 --- a/mozilla/extensions/sroaming/resources/locale/en-US/transfer.properties +++ b/mozilla/extensions/sroaming/resources/locale/en-US/transfer.properties @@ -5,7 +5,7 @@ PasswordTitle=Password for file transfer EnterPasswordForUserAt=Enter password for user %username% at %realm% SavePassword=Save password -# Transfering error strings: +# Transferring error strings: NSOK=%file% succeeded FileNotFound="%file%" not found. SubdirDoesNotExist=The subdirectory "%dir%" doesn't exist on this site or the filename "%file%" is already in use by another subdirectory. @@ -27,17 +27,17 @@ FTPCWD=File or directory of "%file%" cannot be found. MalformedURI=The Base URL is malformed. NoFilesSelected=You did not select any files to be transfered. NoUsername=No username given. -# End-Transfering error strings +# End-Transferring error strings #ProgressDialog.js TransferProgressCaption=Roaming transfer: %title% -TransferToSite=Transfering to site: %site% -TransferFromSite=Transfering from site: %site% +TransferToSite=Transferring to site: %site% +TransferFromSite=Transferring from site: %site% Close=Close TransferFailed=Transfer failed TransferCompleted=Transfer completed successfully -Transfering=Transfering... -TransferingListing=Transfering listing file +Transferring=Transferring... +TransferringListing=Transferring listing file TransferErrorsTitle=Transfer Errors FatalError=Fatal error while trying to transfer files diff --git a/mozilla/uriloader/base/nsIDownload.idl b/mozilla/uriloader/base/nsIDownload.idl index 6373e0360e4..2714058182a 100644 --- a/mozilla/uriloader/base/nsIDownload.idl +++ b/mozilla/uriloader/base/nsIDownload.idl @@ -119,7 +119,7 @@ interface nsITransfer : nsISupports { readonly attribute nsIMIMEInfo MIMEInfo; /** - * Optional; transfering information is passed to this listener and used to + * Optional; transferring information is passed to this listener and used to * update client UI. */ attribute nsIWebProgressListener listener;