Assorted spelling fixes.

dlls/crypt32/crypt32.rc

@@ -77,7 +77,7 @@ STRINGTABLE
     IDS_TITLE "Title"
     IDS_GIVEN_NAME "Given Name"
     IDS_INITIALS "Initials"
-    IDS_SUR_NAME "Sur Name"
+    IDS_SUR_NAME "Surname"
     IDS_DOMAIN_COMPONENT "Domain Component"
     IDS_STREET_ADDRESS "Street Address"
     IDS_SERIAL_NUMBER "Serial Number"

dlls/dxerr8/errors.h

@@ -811,8 +811,8 @@ static const WCHAR name270W[] = { 'D','D','E','R','R','_','N','O','O','V','E','R
 static const CHAR description270A[] = "returned when GetOverlayPosition is called on a overlay that UpdateOverlay has never been called on to establish a destination.";
 static const WCHAR description270W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a',' ','o','v','e','r','l','a','y',' ','t','h','a','t',' ','U','p','d','a','t','e','O','v','e','r','l','a','y',' ','h','a','s',' ','n','e','v','e','r',' ','b','e','e','n',' ','c','a','l','l','e','d',' ','o','n',' ','t','o',' ','e','s','t','a','b','l','i','s','h',' ','a',' ','d','e','s','t','i','o','n','a','t','i','o','n','.',0 };
 static const WCHAR name271W[] = { 'D','D','E','R','R','_','I','N','V','A','L','I','D','P','O','S','I','T','I','O','N',0 };
-static const CHAR description271A[] = "returned when the position of the overlay on the destination is no longer legal for that destionation.";
+static const CHAR description271A[] = "returned when the position of the overlay on the destination is no longer legal for that destination.";
-static const WCHAR description271W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','t','h','e',' ','p','o','s','i','t','i','o','n',' ','o','f',' ','t','h','e',' ','o','v','e','r','l','a','y',' ','o','n',' ','t','h','e',' ','d','e','s','t','i','o','n','a','t','i','o','n',' ','i','s',' ','n','o',' ','l','o','n','g','e','r',' ','l','e','g','a','l',' ','f','o','r',' ','t','h','a','t',' ','d','e','s','t','i','o','n','a','t','i','o','n','.',0 };
+static const WCHAR description271W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','t','h','e',' ','p','o','s','i','t','i','o','n',' ','o','f',' ','t','h','e',' ','o','v','e','r','l','a','y',' ','o','n',' ','t','h','e',' ','d','e','s','t','i','o','n','a','t','i','o','n',' ','i','s',' ','n','o',' ','l','o','n','g','e','r',' ','l','e','g','a','l',' ','f','o','r',' ','t','h','a','t',' ','d','e','s','t','i','n','a','t','i','o','n','.',0 };
 static const WCHAR name272W[] = { 'D','D','E','R','R','_','N','O','T','A','O','V','E','R','L','A','Y','S','U','R','F','A','C','E',0 };
 static const CHAR description272A[] = "returned when an overlay member is called for a non-overlay surface";
 static const WCHAR description272W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','a','n',' ','o','v','e','r','l','a','y',' ','m','e','m','b','e','r',' ','i','s',' ','c','a','l','l','e','d',' ','f','o','r',' ','a',' ','n','o','n','-','o','v','e','r','l','a','y',' ','s','u','r','f','a','c','e',0 };

dlls/dxerr9/errors.h

@@ -1051,8 +1051,8 @@ static const WCHAR name350W[] = { 'D','D','E','R','R','_','N','O','O','V','E','R
 static const CHAR description350A[] = "returned when GetOverlayPosition is called on a overlay that UpdateOverlay has never been called on to establish a destination.";
 static const WCHAR description350W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','G','e','t','O','v','e','r','l','a','y','P','o','s','i','t','i','o','n',' ','i','s',' ','c','a','l','l','e','d',' ','o','n',' ','a',' ','o','v','e','r','l','a','y',' ','t','h','a','t',' ','U','p','d','a','t','e','O','v','e','r','l','a','y',' ','h','a','s',' ','n','e','v','e','r',' ','b','e','e','n',' ','c','a','l','l','e','d',' ','o','n',' ','t','o',' ','e','s','t','a','b','l','i','s','h',' ','a',' ','d','e','s','t','i','o','n','a','t','i','o','n','.',0 };
 static const WCHAR name351W[] = { 'D','D','E','R','R','_','I','N','V','A','L','I','D','P','O','S','I','T','I','O','N',0 };
-static const CHAR description351A[] = "returned when the position of the overlay on the destination is no longer legal for that destionation.";
+static const CHAR description351A[] = "returned when the position of the overlay on the destination is no longer legal for that destination.";
-static const WCHAR description351W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','t','h','e',' ','p','o','s','i','t','i','o','n',' ','o','f',' ','t','h','e',' ','o','v','e','r','l','a','y',' ','o','n',' ','t','h','e',' ','d','e','s','t','i','o','n','a','t','i','o','n',' ','i','s',' ','n','o',' ','l','o','n','g','e','r',' ','l','e','g','a','l',' ','f','o','r',' ','t','h','a','t',' ','d','e','s','t','i','o','n','a','t','i','o','n','.',0 };
+static const WCHAR description351W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','t','h','e',' ','p','o','s','i','t','i','o','n',' ','o','f',' ','t','h','e',' ','o','v','e','r','l','a','y',' ','o','n',' ','t','h','e',' ','d','e','s','t','i','o','n','a','t','i','o','n',' ','i','s',' ','n','o',' ','l','o','n','g','e','r',' ','l','e','g','a','l',' ','f','o','r',' ','t','h','a','t',' ','d','e','s','t','i','n','a','t','i','o','n','.',0 };
 static const WCHAR name352W[] = { 'D','D','E','R','R','_','N','O','T','A','O','V','E','R','L','A','Y','S','U','R','F','A','C','E',0 };
 static const CHAR description352A[] = "returned when an overlay member is called for a non-overlay surface";
 static const WCHAR description352W[] = { 'r','e','t','u','r','n','e','d',' ','w','h','e','n',' ','a','n',' ','o','v','e','r','l','a','y',' ','m','e','m','b','e','r',' ','i','s',' ','c','a','l','l','e','d',' ','f','o','r',' ','a',' ','n','o','n','-','o','v','e','r','l','a','y',' ','s','u','r','f','a','c','e',0 };

dlls/gameux/gamestatistics.c

@@ -306,13 +306,13 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats)
 }
 /*******************************************************************************
  * GAMEUX_buildStatisticsFilePath
- * Creates path to file contaning statistics of game with given id.
+ * Creates path to file containing statistics of game with given id.
  *
  * Parameters:
  *  lpApplicationId                         [I]     application id of game,
  *                                                  as string
  *  lpStatisticsFile                        [O]     array where path will be
- *                                                  stored. It's size must be
+ *                                                  stored. Its size must be
  *                                                  at least MAX_PATH
  */
 static HRESULT GAMEUX_buildStatisticsFilePath(

dlls/gdi32/tests/palette.c

@@ -53,7 +53,7 @@ static void test_DIB_PAL_COLORS(void) {
     COLORREF setColor, chkColor, getColor;
     int i;
 
-    /* Initalize the logical palette with a few colours */
+    /* Initialize the logical palette with a few colours */
     logpalette->palVersion = 0x300;
     logpalette->palNumEntries = 8;
     memcpy( logpalette->palPalEntry, logpalettedata, sizeof(logpalettedata) );
@@ -129,7 +129,7 @@ static void test_palette_entries(void)
     PALETTEENTRY palEntry = { 0x1, 0x2, 0x3, 0xff };
     PALETTEENTRY getEntryResult;
 
-    /* Initalize the logical palette with a few colours */
+    /* Initialize the logical palette with a few colours */
     logpalette->palVersion = 0x300;
     logpalette->palNumEntries = 8;
     memcpy( logpalette->palPalEntry, logpalettedata, sizeof(logpalettedata) );

dlls/ieframe/navigate.c

@@ -755,7 +755,7 @@ static HRESULT async_doc_navigate(DocHost *This, LPCWSTR url, LPCWSTR headers, P
 
         on_before_navigate2(This, task->url, task->post_data, task->headers, &cancel);
         if(cancel) {
-            TRACE("Navigation calnceled\n");
+            TRACE("Navigation canceled\n");
             doc_navigate_task_destr(&task->header);
             return S_OK;
         }

dlls/jscript/tests/api.js

@@ -752,7 +752,7 @@ arr[2] = "aa";
 arr.sort = Array.prototype.sort;
 tmp = arr.sort();
 ok(arr === tmp, "tmp !== arr");
-ok(arr[0]===1 && arr[1]==="aa" && arr[2]===undefined, "arr is sorted incorectly");
+ok(arr[0]===1 && arr[1]==="aa" && arr[2]===undefined, "arr is sorted incorrectly");
 
 tmp = [["bb","aa"],["ab","aa"]].sort().toString();
 ok(tmp === "ab,aa,bb,aa", "sort() = " + tmp);

dlls/msctf/documentmgr.c

@@ -344,7 +344,7 @@ HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumen
 }
 
 /**************************************************
- * IEnumTfContexts implementaion
+ * IEnumTfContexts implementation
  **************************************************/
 static void EnumTfContext_Destructor(EnumTfContext *This)
 {

dlls/msctf/inputprocessor.c

@@ -782,7 +782,7 @@ HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut
 }
 
 /**************************************************
- * IEnumGUID implementaion for ITfInputProcessorProfiles::EnumInputProcessorInfo
+ * IEnumGUID implementation for ITfInputProcessorProfiles::EnumInputProcessorInfo
  **************************************************/
 static void ProfilesEnumGuid_Destructor(ProfilesEnumGuid *This)
 {
@@ -932,7 +932,7 @@ static HRESULT ProfilesEnumGuid_Constructor(IEnumGUID **ppOut)
 }
 
 /**************************************************
- * IEnumTfLanguageProfiles implementaion
+ * IEnumTfLanguageProfiles implementation
  **************************************************/
 static void EnumTfLanguageProfiles_Destructor(EnumTfLanguageProfiles *This)
 {

dlls/msctf/threadmgr.c

@@ -1313,7 +1313,7 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut)
 }
 
 /**************************************************
- * IEnumTfDocumentMgrs implementaion
+ * IEnumTfDocumentMgrs implementation
  **************************************************/
 static void EnumTfDocumentMgr_Destructor(EnumTfDocumentMgr *This)
 {

dlls/riched20/tests/txtsrv.c

@@ -459,7 +459,7 @@ static void WINAPI ITextHostImpl_TxImmReleaseContext(ITextHost *iface, HIMC himc
 }
 
 /* This function must set the variable pointed to by *lSelBarWidth.
-   Otherwise an uninitalized value will be used to calculate
+   Otherwise an uninitialized value will be used to calculate
    positions and sizes even if E_NOTIMPL is returned. */
 static HRESULT WINAPI ITextHostImpl_TxGetSelectionBarWidth(ITextHost *iface,
                                                            LONG *lSelBarWidth)

dlls/rpcrt4/ndr_stubless.c

@@ -806,7 +806,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma
                 }
             }
 
-            /* convert strings, floating point values and endianess into our
+            /* convert strings, floating point values and endianness into our
              * preferred format */
             if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION)
                 NdrConvert(&stubMsg, pFormat);
@@ -1337,7 +1337,7 @@ LONG WINAPI NdrStubCall2(
                                     NdrCorrCache, sizeof(NdrCorrCache), &number_of_params );
     }
 
-    /* convert strings, floating point values and endianess into our
+    /* convert strings, floating point values and endianness into our
      * preferred format */
     if ((pRpcMsg->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION)
         NdrConvert(&stubMsg, pFormat);

dlls/rsaenh/handle.c

@@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(handle);
  * Initializes the HANDLETABLE structure pointed to by lpTable
  *
  * PARAMS
- *  lpTable [I] Pointer to the HANDLETABLE structure, which is to be initalized.
+ *  lpTable [I] Pointer to the HANDLETABLE structure, which is to be initialized.
  *
  * NOTES
  *  You have to call destroy_handle_table when you don't need the table

dlls/rsaenh/rsaenh.c

@@ -1804,7 +1804,7 @@ BOOL WINAPI RSAENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer,
 /******************************************************************************
  * CPCreateHash (RSAENH.@)
  *
- * CPCreateHash creates and initalizes a new hash object.
+ * CPCreateHash creates and initializes a new hash object.
  *
  * PARAMS
  *  hProv   [I] Handle to the key container to which the new hash will belong.
@@ -1932,7 +1932,7 @@ BOOL WINAPI RSAENH_CPCreateHash(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey,
 /******************************************************************************
  * CPDestroyHash (RSAENH.@)
  * 
- * Releases the handle to a hash object. The object is destroyed if it's reference
+ * Releases the handle to a hash object. The object is destroyed if its reference
  * count reaches zero.
  *
  * PARAMS
@@ -1965,7 +1965,7 @@ BOOL WINAPI RSAENH_CPDestroyHash(HCRYPTPROV hProv, HCRYPTHASH hHash)
 /******************************************************************************
  * CPDestroyKey (RSAENH.@)
  *
- * Releases the handle to a key object. The object is destroyed if it's reference
+ * Releases the handle to a key object. The object is destroyed if its reference
  * count reaches zero.
  *
  * PARAMS
@@ -1998,7 +1998,7 @@ BOOL WINAPI RSAENH_CPDestroyKey(HCRYPTPROV hProv, HCRYPTKEY hKey)
 /******************************************************************************
  * CPDuplicateHash (RSAENH.@)
  *
- * Clones a hash object including it's current state.
+ * Clones a hash object including its current state.
  *
  * PARAMS
  *  hUID        [I] Handle to the key container the hash belongs to.
@@ -2054,7 +2054,7 @@ BOOL WINAPI RSAENH_CPDuplicateHash(HCRYPTPROV hUID, HCRYPTHASH hHash, DWORD *pdw
 /******************************************************************************
  * CPDuplicateKey (RSAENH.@)
  *
- * Clones a key object including it's current state.
+ * Clones a key object including its current state.
  *
  * PARAMS
  *  hUID        [I] Handle to the key container the hash belongs to.

dlls/shell32/dde.c

@@ -144,7 +144,7 @@ static HDDEDATA CALLBACK DdeCallback(
  * can use them.
  *
  * PARAMS
- *  bInit [I] TRUE to initialize the services, FALSE to uninitalize.
+ *  bInit [I] TRUE to initialize the services, FALSE to uninitialize.
  *
  * RETURNS
  *  Nothing.

dlls/shlwapi/path.c

@@ -2416,7 +2416,7 @@ BOOL WINAPI PathCanonicalizeW(LPWSTR lpszBuf, LPCWSTR lpszPath)
       else if (lpszSrc[1] == '.' && (lpszDst == lpszBuf || lpszDst[-1] == '\\'))
       {
         /* \.. backs up a directory, over the root if it has no \ following X:.
-         * .. is ignored if it would remove a UNC server name or inital \\
+         * .. is ignored if it would remove a UNC server name or initial \\
          */
         if (lpszDst != lpszBuf)
         {

dlls/user32/dde_server.c

@@ -718,7 +718,7 @@ static	WDML_QUEUE_STATE WDML_ServerHandleUnadvise(WDML_CONV* pConv, WDML_XACT* p
 			  pXAct->hszItem, TRUE, pXAct->wFmt);
     if (pLink == NULL)
     {
-	ERR("Couln'd find link for %p, dropping request\n", pXAct->hszItem);
+	ERR("Couldn't find link for %p, dropping request\n", pXAct->hszItem);
 	FreeDDElParam(WM_DDE_UNADVISE, pXAct->lParam);
 	return WDML_QS_ERROR;
     }

dlls/usp10/tests/usp10.c

@@ -1760,7 +1760,7 @@ static void test_ScriptTextOut3(HDC hdc)
     ABC             pABC[256];
     RECT            rect;
 
-    /* This is to ensure that non existing glyphs are translated into a valid glyph number */
+    /* This is to ensure that nonexistent glyphs are translated into a valid glyph number */
     cInChars = 2;
     cMaxItems = 255;
     hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems);
@@ -2065,7 +2065,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc)
             hr = ScriptStringCPtoX(ssa, Cp, FALSE, &lead);
             ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr);
             if (rtl[Cp])
-                ok(lead > trail, "Leading values should be after trialing for rtl characters(%i)\n",Cp);
+                ok(lead > trail, "Leading values should be after trailing for rtl characters(%i)\n",Cp);
             else
                 ok(lead < trail, "Trailing values should be after leading for ltr characters(%i)\n",Cp);
 

include/mapitags.h

@@ -345,7 +345,7 @@
 #define PR_MINI_ICON PROP_TAG(PT_BINARY,0x0FFC)
 #define PR_STORE_ENTRYID PROP_TAG(PT_BINARY,0x0FFB)
 #define PR_STORE_RECORD_KEY PROP_TAG(PT_BINARY,0x0FFA)
-/* Binary identifer for an individual object */
+/* Binary identifier for an individual object */
 #define PR_RECORD_KEY PROP_TAG(PT_BINARY,0x0FF9)
 #define PR_MAPPING_SIGNATURE PROP_TAG(PT_BINARY,0x0FF8)
 #define PR_ACCESS_LEVEL PROP_TAG(PT_I4,0x0FF7)

include/wincrypt.h

@@ -4215,9 +4215,9 @@ BOOL WINAPI CertGetEnhancedKeyUsage(PCCERT_CONTEXT pCertContext, DWORD dwFlags,
 BOOL WINAPI CertSetEnhancedKeyUsage(PCCERT_CONTEXT pCertContext,
  PCERT_ENHKEY_USAGE pUsage);
 BOOL WINAPI CertAddEnhancedKeyUsageIdentifier(PCCERT_CONTEXT pCertContext,
- LPCSTR pszUsageIdentifer);
+ LPCSTR pszUsageIdentifier);
 BOOL WINAPI CertRemoveEnhancedKeyUsageIdentifier(PCCERT_CONTEXT pCertContext,
- LPCSTR pszUsageIdentifer);
+ LPCSTR pszUsageIdentifier);
 BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts,
  int *cNumOIDs, LPSTR *rghOIDs, DWORD *pcbOIDs);
 

libs/wpp/ppl.l

@@ -680,7 +680,7 @@ void pp_writestring(const char *format, ...)
 <pp_iqs,pp_dqs,pp_sqs>\n	{
 		newline(1);
 		add_string(ppy_text, ppy_leng);
-		ppy_warning("Newline in string constant encounterd (started line %d)", string_start());
+		ppy_warning("Newline in string constant encountered (started line %d)", string_start());
 	}
 
 	/*

po/ar.po

@@ -793,7 +793,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -9903,7 +9903,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/bg.po

@@ -806,7 +806,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -10111,7 +10111,8 @@ msgid "Drives"
 msgstr "Устройства"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Изберете Unix директория"
 
 #: winecfg.rc:43

po/ca.po

@@ -776,7 +776,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -9794,7 +9794,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/cs.po

@@ -822,7 +822,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -10547,7 +10547,8 @@ msgid "Drives"
 msgstr "Disky"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Vyberte prosím unixový cílový adresář."
 
 #: winecfg.rc:43

po/da.po

@@ -831,8 +831,9 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr ""
+msgid "Surname"
+msgstr "Brugernavn"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10632,7 +10633,8 @@ msgid "Drives"
 msgstr "Enheder"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Vælg venlight en unix folder."
 
 #: winecfg.rc:43

po/de.po

@@ -800,8 +800,9 @@ msgid "Initials"
 msgstr "Initialen"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr "Nachname"
+msgid "Surname"
+msgstr "Benutzername"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10489,7 +10490,8 @@ msgid "Drives"
 msgstr "Laufwerke"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Bitte wählen Sie das Ziel-Unix-Verzeichnis."
 
 #: winecfg.rc:43

po/el.po

@@ -797,7 +797,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -9934,7 +9934,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/en.po

@@ -778,8 +778,8 @@ msgid "Initials"
 msgstr "Initials"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
-msgstr "Sur Name"
+msgstr "Surname"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10147,7 +10147,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/en_US.po

@@ -802,8 +802,8 @@ msgid "Initials"
 msgstr "Initials"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
-msgstr "Sur Name"
+msgstr "Surname"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10285,8 +10285,8 @@ msgid "Drives"
 msgstr "Drives"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
-msgstr "Select the unix target directory, please."
+msgstr "Select the Unix target directory, please."
 
 #: winecfg.rc:43
 msgid "Show &Advanced"

po/eo.po

@@ -811,7 +811,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -10106,7 +10106,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/es.po

@@ -816,7 +816,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -10808,7 +10808,8 @@ msgid "Drives"
 msgstr "Unidades"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Por favor, seleccione el directorio unix."
 
 #: winecfg.rc:43

po/fa.po

@@ -793,7 +793,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -9906,7 +9906,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/fi.po

@@ -798,7 +798,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -10211,7 +10211,8 @@ msgid "Drives"
 msgstr "Asemat"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Valitse unix-kohdekansio."
 
 #: winecfg.rc:43

po/fr.po

@@ -807,8 +807,9 @@ msgid "Initials"
 msgstr "Initiales"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr "Nom de famille"
+msgid "Surname"
+msgstr "Utilisateur"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10414,7 +10415,8 @@ msgid "Drives"
 msgstr "Lecteurs"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Veuillez sélectionner le répertoire Unix cible."
 
 #: winecfg.rc:43

po/he.po

@@ -809,8 +809,9 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr ""
+msgid "Surname"
+msgstr "שם משתמש"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10085,7 +10086,7 @@ msgstr "כוננים"
 
 #: winecfg.rc:41
 #, fuzzy
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr "נא לבחור את תיקיית היעד בלינוקס בבקשה."
 
 #: winecfg.rc:43

po/hi.po

@@ -777,7 +777,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -9779,7 +9779,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/hu.po

@@ -834,8 +834,8 @@ msgid "Initials"
 msgstr "Aláírások"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
-msgstr "Vezetéknév"
+msgstr ""
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10461,7 +10461,8 @@ msgid "Drives"
 msgstr "Meghajtók"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Kérem válasszon unix célkönyvtárat."
 
 #: winecfg.rc:43

po/it.po

@@ -839,8 +839,9 @@ msgid "Initials"
 msgstr "Initiali"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr "Cognome"
+msgid "Surname"
+msgstr "Nome utente"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10729,7 +10730,8 @@ msgid "Drives"
 msgstr "Unità"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Seleziona la cartella Unix desiderata, prego."
 
 #: winecfg.rc:43

po/ja.po

@@ -803,8 +803,9 @@ msgid "Initials"
 msgstr "Initials"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr "Sur Name"
+msgid "Surname"
+msgstr "ユーザー名"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10290,7 +10291,8 @@ msgid "Drives"
 msgstr "ドライブ"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "unix の対象ディレクトリを選択してください。"
 
 #: winecfg.rc:43

po/ko.po

@@ -802,8 +802,9 @@ msgid "Initials"
 msgstr "머릿글자"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr "성"
+msgid "Surname"
+msgstr "사용자 이름"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10245,7 +10246,8 @@ msgid "Drives"
 msgstr "드라이브"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "유닉스 목적 폴더를 선택하십시오."
 
 #: winecfg.rc:43

po/lt.po

@@ -808,8 +808,9 @@ msgid "Initials"
 msgstr "Inicialai"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr "Pavardė"
+msgid "Surname"
+msgstr "Naudotojas"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10310,7 +10311,8 @@ msgid "Drives"
 msgstr "Diskai"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Prašome išsirinkti unix paskirties aplanką."
 
 #: winecfg.rc:43

po/ml.po

@@ -777,7 +777,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -9779,7 +9779,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/nb_NO.po

@@ -824,8 +824,9 @@ msgid "Initials"
 msgstr "Initialer"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr "Etternavn"
+msgid "Surname"
+msgstr "Brukernavn"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10604,7 +10605,8 @@ msgid "Drives"
 msgstr "Stasjoner"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Velg Unix-målkatalogen."
 
 #: winecfg.rc:43

po/nl.po

@@ -808,8 +808,9 @@ msgid "Initials"
 msgstr "Initialen"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr "Achternaam"
+msgid "Surname"
+msgstr "Gebruikersnaam"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10479,7 +10480,8 @@ msgid "Drives"
 msgstr "Stations"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Selecteer a.u.b. de Unix map."
 
 #: winecfg.rc:43

po/or.po

@@ -777,7 +777,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -9779,7 +9779,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/pa.po

@@ -777,7 +777,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -9779,7 +9779,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/pl.po

@@ -804,8 +804,9 @@ msgid "Initials"
 msgstr "Inicjały"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr "Nazwisko"
+msgid "Surname"
+msgstr "Nazwa użytkownika"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10324,7 +10325,8 @@ msgid "Drives"
 msgstr "Dyski"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Proszę wybrać docelowy katalog Uniksowy."
 
 #: winecfg.rc:43

po/pt_BR.po

@@ -820,8 +820,9 @@ msgid "Initials"
 msgstr "Iniciais"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr "Apelido"
+msgid "Surname"
+msgstr "Nome de Usuário"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10679,7 +10680,8 @@ msgid "Drives"
 msgstr "Unidades"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Por favor, selecione o diretório unix alvo."
 
 #: winecfg.rc:43

po/pt_PT.po

@@ -831,8 +831,9 @@ msgid "Initials"
 msgstr "Iniciais"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr "Apelido"
+msgid "Surname"
+msgstr "Nome de Utilizador"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10733,7 +10734,8 @@ msgid "Drives"
 msgstr "Unidades"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Seleccione o directório de destino unix."
 
 #: winecfg.rc:43

po/rm.po

@@ -785,7 +785,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -9854,7 +9854,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/ro.po

@@ -868,8 +868,9 @@ msgid "Initials"
 msgstr "Inițiale"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr "Nume"
+msgid "Surname"
+msgstr "Nume utilizator"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10967,7 +10968,8 @@ msgid "Drives"
 msgstr "Dispozitive"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Selectați vă rog dosarul unix destinație."
 
 #: winecfg.rc:43

po/ru.po

@@ -802,8 +802,9 @@ msgid "Initials"
 msgstr "Инициалы"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr "Фамилия"
+msgid "Surname"
+msgstr "Имя пользователя"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10308,7 +10309,8 @@ msgid "Drives"
 msgstr "Диски"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Выберите целевой каталог в системе:"
 
 #: winecfg.rc:43

po/sk.po

@@ -797,7 +797,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -10104,7 +10104,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/sl.po

@@ -808,8 +808,9 @@ msgid "Initials"
 msgstr "Začetnice"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr "Priimek"
+msgid "Surname"
+msgstr "Uporabniško ime"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10358,7 +10359,8 @@ msgid "Drives"
 msgstr "Pogoni"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Izberite ciljno mapo unix."
 
 #: winecfg.rc:43

po/sr_RS@cyrillic.po

@@ -815,8 +815,9 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr ""
+msgid "Surname"
+msgstr "Назив домаћина"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10280,7 +10281,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/sr_RS@latin.po

@@ -829,8 +829,9 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr ""
+msgid "Surname"
+msgstr "Naziv domaćina"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10360,7 +10361,8 @@ msgid "Drives"
 msgstr "Drajvovi"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Izaberite unix glavni direktorijum, molim."
 
 #: winecfg.rc:43

po/sv.po

@@ -807,8 +807,9 @@ msgid "Initials"
 msgstr "Initialer"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr "Efternamn"
+msgid "Surname"
+msgstr "Användare"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10327,7 +10328,8 @@ msgid "Drives"
 msgstr "Enheter"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Välj unix-målkatalog, tack."
 
 #: winecfg.rc:43

po/te.po

@@ -777,7 +777,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -9779,7 +9779,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/th.po

@@ -795,7 +795,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -9957,7 +9957,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/tr.po

@@ -812,7 +812,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -10743,7 +10743,8 @@ msgid "Drives"
 msgstr "Sürücüler"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Lütfen haritalanacak unix dizinini seçin."
 
 #: winecfg.rc:43

po/uk.po

@@ -801,8 +801,9 @@ msgid "Initials"
 msgstr "Ініціали"
 
 #: crypt32.rc:80
-msgid "Sur Name"
+#, fuzzy
-msgstr "Прізвище"
+msgid "Surname"
+msgstr "Ім'я користувача"
 
 #: crypt32.rc:81
 msgid "Domain Component"
@@ -10295,7 +10296,8 @@ msgid "Drives"
 msgstr "Диски"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "Виберіть цільову теку в системі."
 
 #: winecfg.rc:43

po/wa.po

@@ -797,7 +797,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -9930,7 +9930,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/wine.pot

@@ -773,7 +773,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -9752,7 +9752,7 @@ msgid "Drives"
 msgstr ""
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+msgid "Select the Unix target directory, please."
 msgstr ""
 
 #: winecfg.rc:43

po/zh_CN.po

@@ -809,7 +809,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -10258,7 +10258,8 @@ msgid "Drives"
 msgstr "驱动器"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "请选择目标 unix 文件夹。"
 
 #: winecfg.rc:43

po/zh_TW.po

@@ -816,7 +816,7 @@ msgid "Initials"
 msgstr ""
 
 #: crypt32.rc:80
-msgid "Sur Name"
+msgid "Surname"
 msgstr ""
 
 #: crypt32.rc:81
@@ -10320,7 +10320,8 @@ msgid "Drives"
 msgstr "儲存槽"
 
 #: winecfg.rc:41
-msgid "Select the unix target directory, please."
+#, fuzzy
+msgid "Select the Unix target directory, please."
 msgstr "請選擇 unix 資料夾。"
 
 #: winecfg.rc:43

programs/start/start.c

@@ -46,8 +46,9 @@ static void output(const WCHAR *message)
 
 	res = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), message, wlen, &count, NULL);
 
-	/* If writing to console fails, assume its file
+	/* If writing to console fails, assume it's file
-	i/o so convert to OEM codepage and output                  */
+         * i/o so convert to OEM codepage and output
+         */
 	if (!res)
 	{
 		DWORD len;

programs/winecfg/winecfg.rc

@@ -38,7 +38,7 @@ BEGIN
     IDS_TAB_APPLICATIONS    "Applications"
     IDS_TAB_DLLS            "Libraries"
     IDS_TAB_DRIVES          "Drives"
-    IDS_CHOOSE_PATH         "Select the unix target directory, please."
+    IDS_CHOOSE_PATH         "Select the Unix target directory, please."
     IDS_HIDE_ADVANCED       "Hide &Advanced"
     IDS_SHOW_ADVANCED       "Show &Advanced"
     IDS_NOTHEME             "(No Theme)"

programs/winefile/winefile.c

@@ -3176,7 +3176,7 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi
 
 	col++;
 
-	/* ouput file name */
+	/* output file name */
 	if (calcWidthCol == -1)
 		output_text(pane, dis, col, entry->data.cFileName, 0);
 	else if (calcWidthCol==col || calcWidthCol==COLUMNS)

programs/wordpad/wordpad.c

@@ -1251,7 +1251,7 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr)
         flags = FR_DOWN | (pFr->Flags & (FR_MATCHCASE | FR_WHOLEWORD));
         ft.lpstrText = pFr->lpstrFindWhat;
 
-        /* Only replace existing selectino if it is an exact match. */
+        /* Only replace the existing selection if it is an exact match. */
         if (sel.cpMin != sel.cpMax &&
             (pFr->Flags & FR_REPLACE || pFr->Flags & FR_REPLACEALL))
         {

programs/xcopy/xcopy.c

@@ -1100,13 +1100,13 @@ int XCOPY_wprintf(const WCHAR *format, ...) {
       return 0;
     }
 
-    /* Try to write as unicode all the time we think its a console */
+    /* Try to write as unicode whenever we think it's a console */
     if (toConsole) {
       res = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE),
                           output_bufW, len, &nOut, NULL);
     }
 
-    /* If writing to console has failed (ever) we assume its file
+    /* If writing to console has failed (ever) we assume it's file
        i/o so convert to OEM codepage and output                  */
     if (!res) {
       BOOL usedDefaultChar = FALSE;