summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2013-10-05 08:55:00 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2013-10-05 08:55:00 +0000
commit2196c4c62d9a97e21703836fe41152dc4f14bc48 (patch)
tree3163bc5f7430bca3f8425b138c2e17356a7948da
parentadaea748fbc44b9f0889c48bc75f29d794da3351 (diff)
spelling correction (thanks RMN)
git-svn-id: http://svn.miranda-ng.org/main/trunk@6343 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--langpacks/english/=CORE=.txt4
-rw-r--r--langpacks/english/Plugins/BasicHistory.txt6
-rw-r--r--langpacks/english/Plugins/Clist_modern.txt14
-rw-r--r--langpacks/english/Plugins/Clist_mw.txt2
-rw-r--r--langpacks/english/Plugins/Facebook.txt2
-rw-r--r--langpacks/english/Plugins/FileAsMessage.txt4
-rw-r--r--langpacks/english/Plugins/GG.txt2
-rw-r--r--langpacks/english/Plugins/IEView.txt2
-rw-r--r--langpacks/english/Plugins/MRA.txt2
-rw-r--r--langpacks/english/Plugins/Msg_Export.txt2
-rw-r--r--langpacks/english/Plugins/NewXstatusNotify.txt1
-rw-r--r--langpacks/english/Plugins/New_GPG.txt10
-rw-r--r--langpacks/english/Plugins/NimContact.txt2
-rw-r--r--langpacks/english/Plugins/PluginUpdater.txt2
-rw-r--r--langpacks/english/Plugins/Sessions.txt2
-rw-r--r--langpacks/english/Plugins/TabSRMM.txt2
-rw-r--r--langpacks/english/Plugins/Xfire.txt22
-rw-r--r--plugins/BasicHistory/src/HistoryWindow.cpp8
-rw-r--r--plugins/Clist_modern/res/resource.rc2
-rw-r--r--plugins/Clist_modern/src/modern_clc.cpp14
-rw-r--r--plugins/Clist_mw/res/resource.rc2
-rw-r--r--plugins/FileAsMessage/src/dialog.cpp4
-rw-r--r--plugins/IEView/src/IEView.cpp2
-rwxr-xr-xplugins/Msg_Export/src/utils.cpp2
-rwxr-xr-xplugins/New_GPG/src/main.cpp2
-rwxr-xr-xplugins/New_GPG/src/messages.cpp6
-rwxr-xr-xplugins/New_GPG/src/options.cpp4
-rwxr-xr-xplugins/New_GPG/src/utilities.cpp2
-rw-r--r--plugins/Non-IM Contact/res/resource.rc2
-rw-r--r--plugins/PluginUpdater/src/DlgListNew.cpp2
-rw-r--r--plugins/Sessions/Src/Main.cpp2
-rw-r--r--plugins/TabSRMM/src/sendqueue.cpp2
-rw-r--r--plugins/Watrack/status/i_opt_3.inc2
-rw-r--r--protocols/FacebookRM/src/contacts.cpp2
-rw-r--r--protocols/Gadu-Gadu/src/groupchat.cpp2
-rw-r--r--protocols/MRA/res/resource.rc2
-rw-r--r--protocols/Xfire/res/Kopie von resource.rc8
-rw-r--r--protocols/Xfire/res/resource.rc8
-rw-r--r--protocols/Xfire/src/addgamedialog.cpp2
-rw-r--r--protocols/Xfire/src/main.cpp2
-rw-r--r--protocols/Xfire/src/options.cpp10
41 files changed, 87 insertions, 88 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 559463d33b..f43cb4e0b3 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1068,7 +1068,7 @@
[&Rename]
[&Add permanently to list]
;file \src\modules\clist\contacts.cpp
-[My custom name (not moveable)]
+[My custom name (not movable)]
[Nick]
[FirstName]
[E-mail]
@@ -1076,7 +1076,7 @@
[Username]
[FirstName LastName]
[LastName FirstName]
-['(Unknown Contact)' (not moveable)]
+['(Unknown Contact)' (not movable)]
['(Unknown Contact)']
[Contact names]
;file \src\modules\clist\genmenu.cpp
diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt
index 7bdf244f2f..d28a8877de 100644
--- a/langpacks/english/Plugins/BasicHistory.txt
+++ b/langpacks/english/Plugins/BasicHistory.txt
@@ -105,7 +105,7 @@
;file \plugins\BasicHistory\src\HistoryWindow.cpp
[This operation will PERMANENTLY REMOVE all history for this contact.\nAre you sure you want to do this?]
[Are You sure?]
-[Do you want delete all imported messages for this contact?\nNote that next scheduler task import this messages again.]
+[Do you want to delete all imported messages for this contact?\nNote that next scheduler task import this messages again.]
[Open in &new window]
[&Open in existing window]
[&Copy link]
@@ -126,8 +126,8 @@
[Dat (mContacts)]
[Save window position as default]
[Save window position for all contacts]
-[Do you want save imported messages to local profile?]
-[File contain history for different contact. Do you want to change contact and import?]
+[Do you want to save imported messages to local profile?]
+[File contains history for different contact. Do you want to change contact and import?]
[Error]
[Number of history items to delete: %d.\nAre you sure you want to do this?]
;file \plugins\BasicHistory\src\Options.cpp
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index bcf4f8391b..e580e0bd8d 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -125,7 +125,7 @@
[Hide empty groups]
[Disable groups]
[Ask before deleting contacts]
-[Dont move offline user to bottom]
+[Don't move offline user to bottom]
[Contact List]
[Contact List Sorting]
[Place offline users out of groups]
@@ -336,17 +336,17 @@
[Avatar Overlay]
[Status Overlay]
[Contact List smileys]
-[Do You want contact '%s' to be converted to MetaContact and '%s' be added to it?]
+[Do you want contact '%s' to be converted to MetaContact and '%s' be added to it?]
[Converting to MetaContact]
-[Do You want contact '%s' to be converted to MetaContact and '%s' be added to it (remove it from '%s')?]
+[Do you want contact '%s' to be converted to MetaContact and '%s' be added to it (remove it from '%s')?]
[Converting to MetaContact (Moving)]
-[Do you want to contact '%s' be added to metacontact '%s'?]
+[Do you want contact '%s' to be added to metacontact '%s'?]
[Adding contact to MetaContact]
-[Do You want contact '%s' to be default ?]
+[Do you want contact '%s' to be default ?]
[Set default contact]
-[Do You want contact '%s' to be removed from MetaContact '%s' and added to '%s'?]
+[Do you want contact '%s' to be removed from MetaContact '%s' and added to '%s'?]
[Changing MetaContacts (Moving)]
-[Do You want contact '%s' to be added to MetaContact '%s'?]
+[Do you want contact '%s' to be added to MetaContact '%s'?]
;file \plugins\Clist_modern\src\modern_clcopts.cpp
[Contact names]
[Row Items]
diff --git a/langpacks/english/Plugins/Clist_mw.txt b/langpacks/english/Plugins/Clist_mw.txt
index e0cccfba7d..6cdde4c627 100644
--- a/langpacks/english/Plugins/Clist_mw.txt
+++ b/langpacks/english/Plugins/Clist_mw.txt
@@ -57,7 +57,7 @@
[System tray icon]
[System tray icon when using multiple protocols]
[Contact List Sorting]
-[Dont move offline user to bottom]
+[Don't move offline user to bottom]
[Pin to desktop]
[Rows]
[Row height:]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 7b3d5b39b5..d628c5601c 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -86,7 +86,7 @@
[Request for friendship was sent.]
[Error occured when requesting friendship.]
[Request for friendship was canceled.]
-[Error occured when canceling friendship request.]
+[Error occurred when canceling friendship request.]
;file \protocols\FacebookRM\src\dialogs.cpp
[Default]
[<< Contacts]
diff --git a/langpacks/english/Plugins/FileAsMessage.txt b/langpacks/english/Plugins/FileAsMessage.txt
index af46ae34e8..9243544f61 100644
--- a/langpacks/english/Plugins/FileAsMessage.txt
+++ b/langpacks/english/Plugins/FileAsMessage.txt
@@ -33,9 +33,9 @@
[Receiving...]
[Sent successfully]
[Unknown command for "File As Message" was received]
-[Incoming file request. Do you want proceed?]
+[Incoming file request. Do you want to proceed?]
[Cancelled by remote user]
-[New incoming file request. Do you want proceed?]
+[New incoming file request. Do you want to proceed?]
[Paused, 'coz connection dropped]
[Failed on file initialization]
[Paused...]
diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index 1aed2da12a..f04b579301 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -149,7 +149,7 @@
;file \protocols\Gadu-Gadu\src\groupchat.cpp
[Open &conference...]
[&Clear ignored conferences]
-[%s has initiated conference with %d participants (%d unknowns).\nDo you want do participate ?]
+[%s has initiated conference with %d participants (%d unknowns).\nDo you want to participate ?]
[%s initiated the conference.]
[This is my own conference.]
[Participants]
diff --git a/langpacks/english/Plugins/IEView.txt b/langpacks/english/Plugins/IEView.txt
index f94bb20ba8..9f3356fc39 100644
--- a/langpacks/english/Plugins/IEView.txt
+++ b/langpacks/english/Plugins/IEView.txt
@@ -53,7 +53,7 @@
[IID_IOleInPlaceObject failed.]
[Failed to Advise]
[C++ Event Sink]
-[OleInitialize failed.]
+[Ole Initialize failed.]
[ERROR]
;file \plugins\IEView\src\MUCCHTMLBuilder.cpp
[%s has joined.]
diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index ff4e244827..1775ff038a 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -64,7 +64,7 @@
[Example: Petrov_Ivan@mail.ru]
[Create a new Mail.ru account using the Mail.ru website]
[Retrieve a lost password]
-[Leave empty if you dont want change password]
+[Leave empty if you don't want to change password]
[Popup type]
[Popup settings]
[Enable]
diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index 4f764efad5..9fac929e38 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -140,5 +140,5 @@
[Failed to write SMS to the file :\n]
[Unknown event type %d, size %d]
[Failed to write Unknown event to the file :\n]
-[User has been deleted do you want to delete the file?]
+[User has been deleted. Do you want to delete the file?]
[Failed to delete the file]
diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index a9deeb80d3..23f300f766 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -32,7 +32,6 @@
[Extra status]
[Open]
[Status message]
-[IndSndList]
[Change]
[Preview]
[Delete]
diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index c4469792f9..e55a092454 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -147,13 +147,13 @@
[ expired and will not work\nDo you want to set another key ?]
[You didn't set a private key.\nWould you like to set it now?]
[Own private key warning]
-[Do you want load key for all subcontacts ?]
+[Do you want to load key for all subcontacts ?]
[Metacontact detected]
;file \plugins\New_GPG\src\messages.cpp
-[We received encrypted message from contact with encryption turned off.\nDo you want turn on encryption for this contact ?]
-[Do you want try to decrypt encrypted message ?]
+[We received encrypted message from contact with encryption turned off.\nDo you want to turn on encryption for this contact ?]
+[Do you want to try to decrypt encrypted message ?]
[failed to decrypt message, GPG returned error, turn on debug log for more details]
-[We trying to encrypt with untrusted key, do you want to trust this key permanently ?]
+[We're trying to encrypt with untrusted key. Do you want to trust this key permanently ?]
[failed o encrypt message, GPG returned error, turn on debug log for more details]
[Something wrong, gpg does not understand us, aborting encryption.]
;file \plugins\New_GPG\src\options.cpp
@@ -165,7 +165,7 @@
[Contact]
[Key ID]
[Protocol]
-[This key not used by any contact, do you want to remove it from public keyring ?]
+[This key is not used by any contact. Do you want to remove it from public keyring ?]
[Key info]
[we have secret key for this public key, do not removing from GPG keyring]
[info]
diff --git a/langpacks/english/Plugins/NimContact.txt b/langpacks/english/Plugins/NimContact.txt
index 4807fd4f90..4194cb0362 100644
--- a/langpacks/english/Plugins/NimContact.txt
+++ b/langpacks/english/Plugins/NimContact.txt
@@ -15,7 +15,7 @@
[URL]
[Update URL every]
[Intervals]
-[If the protocol timer is disabled web pages wont be updated]
+[If the protocol timer is disabled web pages won't be updated]
[contact display info]
[Contacts display name]
[Contacts Tooltip]
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 845d10929b..ed76e59026 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -58,7 +58,7 @@
[Succeeded.]
[Plugin Updater]
[Download complete]
-[Download complete. Do you want go to plugins option page?]
+[Download complete. Do you want to go to plugins option page?]
[Component Name]
[State]
[Plugins]
diff --git a/langpacks/english/Plugins/Sessions.txt b/langpacks/english/Plugins/Sessions.txt
index 5d8056a98d..b8b50e9ea7 100644
--- a/langpacks/english/Plugins/Sessions.txt
+++ b/langpacks/english/Plugins/Sessions.txt
@@ -53,7 +53,7 @@
[Last Sessions is empty]
[No contacts to open]
[This Session already opened]
-[This Session already opened(but probably hidden)\nDo you want to show hidden contacts?]
+[This Session already opened (but probably hidden).\nDo you want to show hidden contacts?]
[Open Sessions Manager]
[Show Favorite Sessions Menu]
[Restore last Session]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 33eb6c2aa1..7facfbe68f 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -800,7 +800,7 @@
[The message cannot be sent delayed or to multiple contacts, because it exceeds the maximum allowed message length of %d bytes]
[A message delivery has failed.\nClick to open the message window.]
[A message delivery has failed after the contacts chat window was closed. You may want to resend the last message]
-[There are unsent messages waiting for confirmation.\nWhen you close the window now, Miranda will try to send them but may be unable to inform you about possible delivery errors.\nDo you really want to close the Window(s)?]
+[There are unsent messages waiting for confirmation.\nIf you close the window now, Miranda will try to send them but may be unable to inform you about possible delivery errors.\nDo you really want to close the window(s)?]
[Message window warning]
[Message successfully queued for later delivery.\nIt will be sent as soon as possible and a popup will inform you about the result.]
[The send later feature is not available on this protocol.]
diff --git a/langpacks/english/Plugins/Xfire.txt b/langpacks/english/Plugins/Xfire.txt
index 169c4b1920..aca280f9b1 100644
--- a/langpacks/english/Plugins/Xfire.txt
+++ b/langpacks/english/Plugins/Xfire.txt
@@ -34,7 +34,7 @@
[This list contains all your blocked Xfire users. You can remove one, if you wanna allow him to send you a friend request.]
[You can simply block someone, if you right click on his friend request in clist and choose Block User ...]
[This file is used for the game search, game detection and gameid resolving. It contains all xfire supported games.]
-[This file contains all original game icons. You can also activate the option for icon downloading, if you dont have it.]
+[This file contains all original game icons. You can also activate the option for icon downloading, if you don't have it.]
[Be sure you put these files in following folder:]
[Status Message]
[Enable]
@@ -46,12 +46,12 @@
[Prefer dnd when it is available]
[Games]
[Game:]
-[Dont detect this game as running]
+[Don't detect this game as running]
[Apply]
-[Dont set status message for other protocols]
+[Don't set status message for other protocols]
[Add new game]
[Remove]
-[Dont show in start menu]
+[Don't show in start menu]
[(manual added)]
[Extra Command Line Parameters:]
[Edit ...]
@@ -99,7 +99,7 @@
[Please enter a game id.]
[Please enter a game id above 1.]
[This game id is already in use.]
-[Please select a game exe. Note: If you dont select a launcher exe, the game exe will be used in the game start menu.]
+[Please select a game exe. Note: If you don't select a launcher exe, the game exe will be used in the game start menu.]
[Supported Games]
[Custom game]
;file \protocols\Xfire\src\all_statusmsg.cpp
@@ -164,29 +164,29 @@
[%s is playing %s.]
[%s is playing %s on server %d.%d.%d.%d:%d.]
[Playing]
-[Do you really want delete your friend %s?]
+[Do you really want to delete your friend %s?]
[Confirm Delete]
[Block this user from ever contacting you again?]
[Block Confirmation]
;file \protocols\Xfire\src\options.cpp
[Avatars]
[Disable avatars]
-[Dont download avatars of clan members]
+[Don't download avatars of clan members]
[Use alternate way for Avatar download]
[General]
[Use UTF8 for messaging and nick's (beta)]
[Automatically reconnect on protocol version changes]
[No Ip/Port in StatusMsg]
[Use Online status for unsupported global statuses]
-[Dont move friends to clan groups]
+[Don't move friends to clan groups]
[GameServerQuery support]
[No custom away message]
[Remove friend of friend buddies from database]
[Hide yourself in buddylist]
-[Dont display game search results]
-[Dont display game search status window]
+[Don't display game search results]
+[Don't display game search status window]
[Display popup, if someone start a game]
-[Dont automatically create clan groups]
+[Don't automatically create clan groups]
[Enable MBot support]
[Gamedetection]
[Disable game detection]
diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp
index 589265cab1..a4dbf94e35 100644
--- a/plugins/BasicHistory/src/HistoryWindow.cpp
+++ b/plugins/BasicHistory/src/HistoryWindow.cpp
@@ -484,7 +484,7 @@ INT_PTR HistoryWindow::DeleteAllUserHistory(WPARAM wParam, LPARAM)
CallService(MS_DB_SETSAFETYMODE, TRUE, 0);
if (EventList::IsImportedHistory(hContact)) {
- TCHAR *message = TranslateT("Do you want delete all imported messages for this contact?\nNote that next scheduler task import this messages again.");
+ TCHAR *message = TranslateT("Do you want to delete all imported messages for this contact?\nNote that next scheduler task import this messages again.");
if (MessageBox(hWnd, message, TranslateT("Are You sure?"), MB_YESNO | MB_ICONERROR) == IDYES)
EventList::DeleteImporter(hContact);
}
@@ -2039,7 +2039,7 @@ void HistoryWindow::DoImport(IImport::ImportType type)
{
bool differentContact = false;
if (exp.Import(type, messages, &err, &differentContact, &contacts)) {
- int act = MessageBox(hWnd, TranslateT("Do you want save imported messages to local profile?"), TranslateT("Import"), MB_ICONQUESTION | MB_YESNOCANCEL | MB_DEFBUTTON2);
+ int act = MessageBox(hWnd, TranslateT("Do you want to save imported messages to local profile?"), TranslateT("Import"), MB_ICONQUESTION | MB_YESNOCANCEL | MB_DEFBUTTON2);
if (act == IDYES) {
MargeMessages(messages);
if (!changeContact)
@@ -2053,7 +2053,7 @@ void HistoryWindow::DoImport(IImport::ImportType type)
}
else if (differentContact)
{
- int act = MessageBox(hWnd, TranslateT("File contain history for different contact. Do you want to change contact and import?"), TranslateT("Error"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON2);
+ int act = MessageBox(hWnd, TranslateT("File contains history for different contact. Do you want to change contact and import?"), TranslateT("Error"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON2);
if (act == IDYES) {
changeContact = true;
hContact = exp.hContact;
@@ -2154,7 +2154,7 @@ void HistoryWindow::Delete(int what)
rebuild = (start == 0 && end == currentGroup.size());
if (areImpMessages) {
- TCHAR *message = TranslateT("Do you want delete all imported messages for this contact?\nNote that next scheduler task import this messages again.");
+ TCHAR *message = TranslateT("Do you want to delete all imported messages for this contact?\nNote that next scheduler task import this messages again.");
if (MessageBox(hWnd, message, TranslateT("Are You sure?"), MB_YESNO | MB_ICONERROR) == IDYES) {
EventList::DeleteImporter(hContact);
rebuild = true;
diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index 567bcc7c50..52441d36a9 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -364,7 +364,7 @@ BEGIN
CONTROL "Hide empty groups",IDC_HIDEEMPTYGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,37,124,10
CONTROL "Disable groups",IDC_DISABLEGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,49,124,10
CONTROL "Ask before deleting contacts",IDC_CONFIRMDELETE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,61,124,10
- CONTROL "Dont move offline user to bottom",IDC_NOOFFLINEMOVE,
+ CONTROL "Don't move offline user to bottom",IDC_NOOFFLINEMOVE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,77,141,10
GROUPBOX "Contact List",IDC_STCLISTGROUP,2,8,142,84
GROUPBOX "Contact List Sorting",IDC_STATIC,146,8,154,84,WS_GROUP
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index f34a72bb0d..6606caf54b 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1265,7 +1265,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
if (g_szMetaModuleName && mir_strcmp(contSour->proto,g_szMetaModuleName)) {
if ( !contSour->isSubcontact) {
HANDLE hDest = contDest->hContact;
- mir_sntprintf(Wording,SIZEOF(Wording),TranslateT("Do You want contact '%s' to be converted to MetaContact and '%s' be added to it?"),contDest->szText, contSour->szText);
+ mir_sntprintf(Wording,SIZEOF(Wording),TranslateT("Do you want contact '%s' to be converted to MetaContact and '%s' be added to it?"),contDest->szText, contSour->szText);
res = MessageBox(hwnd,Wording,TranslateT("Converting to MetaContact"),MB_OKCANCEL|MB_ICONQUESTION);
if (res == 1) {
handle = (HANDLE)CallService(MS_MC_CONVERTTOMETA,(WPARAM)hDest,0);
@@ -1277,7 +1277,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
HANDLE hcontact = contSour->hContact;
HANDLE hfrom = contSour->subcontacts->hContact;
HANDLE hdest = contDest->hContact;
- mir_sntprintf(Wording,SIZEOF(Wording),TranslateT("Do You want contact '%s' to be converted to MetaContact and '%s' be added to it (remove it from '%s')?"), contDest->szText,contSour->szText,contSour->subcontacts->szText);
+ mir_sntprintf(Wording,SIZEOF(Wording),TranslateT("Do you want contact '%s' to be converted to MetaContact and '%s' be added to it (remove it from '%s')?"), contDest->szText,contSour->szText,contSour->subcontacts->szText);
res = MessageBox(hwnd,Wording,TranslateT("Converting to MetaContact (Moving)"),MB_OKCANCEL|MB_ICONQUESTION);
if (res == 1) {
HANDLE handle = (HANDLE)CallService(MS_MC_CONVERTTOMETA,(WPARAM)hdest,0);
@@ -1305,7 +1305,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
HANDLE handle,hcontact;
hcontact = contSour->hContact;
handle = contDest->hContact;
- mir_sntprintf(Wording,SIZEOF(Wording),TranslateT("Do you want to contact '%s' be added to metacontact '%s'?"),contSour->szText, contDest->szText);
+ mir_sntprintf(Wording,SIZEOF(Wording),TranslateT("Do you want contact '%s' to be added to metacontact '%s'?"),contSour->szText, contDest->szText);
res = MessageBox(hwnd,Wording,TranslateT("Adding contact to MetaContact"),MB_OKCANCEL|MB_ICONQUESTION);
if (res == 1) {
if ( !handle) return 0;
@@ -1316,7 +1316,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
if (contSour->subcontacts == contDest) {
HANDLE hsour;
hsour = contSour->hContact;
- mir_sntprintf(Wording,SIZEOF(Wording),TranslateT("Do You want contact '%s' to be default ?"),contSour->szText);
+ mir_sntprintf(Wording,SIZEOF(Wording),TranslateT("Do you want contact '%s' to be default ?"),contSour->szText);
res = MessageBox(hwnd,Wording,TranslateT("Set default contact"),MB_OKCANCEL|MB_ICONQUESTION);
if (res == 1)
CallService(MS_MC_SETDEFAULTCONTACT,(WPARAM)contDest->hContact,(LPARAM)hsour);
@@ -1325,7 +1325,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
HANDLE hcontact = contSour->hContact;
HANDLE hfrom = contSour->subcontacts->hContact;
HANDLE handle = contDest->hContact;
- mir_sntprintf(Wording,SIZEOF(Wording),TranslateT("Do You want contact '%s' to be removed from MetaContact '%s' and added to '%s'?"), contSour->szText,contSour->subcontacts->szText,contDest->szText);
+ mir_sntprintf(Wording,SIZEOF(Wording),TranslateT("Do you want contact '%s' to be removed from MetaContact '%s' and added to '%s'?"), contSour->szText,contSour->subcontacts->szText,contDest->szText);
res = MessageBox(hwnd,Wording,TranslateT("Changing MetaContacts (Moving)"),MB_OKCANCEL|MB_ICONQUESTION);
if (res == 1) {
if ( !handle) return 0;
@@ -1350,7 +1350,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
if ( !contSour->isSubcontact) {
HANDLE hcontact = contSour->hContact;
HANDLE handle = contDest->subcontacts->hContact;
- mir_sntprintf(Wording,SIZEOF(Wording),TranslateT("Do You want contact '%s' to be added to MetaContact '%s'?"), contSour->szText,contDest->subcontacts->szText);
+ mir_sntprintf(Wording,SIZEOF(Wording),TranslateT("Do you want contact '%s' to be added to MetaContact '%s'?"), contSour->szText,contDest->subcontacts->szText);
int res = MessageBox(hwnd,Wording,TranslateT("Changing MetaContacts (Moving)"),MB_OKCANCEL|MB_ICONQUESTION);
if (res == 1) {
if ( !handle) return 0;
@@ -1362,7 +1362,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
hcontact = contSour->hContact;
hfrom = contSour->subcontacts->hContact;
handle = contDest->subcontacts->hContact;
- mir_sntprintf(Wording,SIZEOF(Wording),TranslateT("Do You want contact '%s' to be removed from MetaContact '%s' and added to '%s'?"), contSour->szText,contSour->subcontacts->szText,contDest->subcontacts->szText);
+ mir_sntprintf(Wording,SIZEOF(Wording),TranslateT("Do you want contact '%s' to be removed from MetaContact '%s' and added to '%s'?"), contSour->szText,contSour->subcontacts->szText,contDest->subcontacts->szText);
int res = MessageBox(hwnd,Wording,TranslateT("Changing MetaContacts (Moving)"),MB_OKCANCEL|MB_ICONQUESTION);
if (res == 1) {
if ( !handle) return 0;
diff --git a/plugins/Clist_mw/res/resource.rc b/plugins/Clist_mw/res/resource.rc
index 03f9c7d27c..7e136ef259 100644
--- a/plugins/Clist_mw/res/resource.rc
+++ b/plugins/Clist_mw/res/resource.rc
@@ -153,7 +153,7 @@ BEGIN
GROUPBOX "System tray icon when using multiple protocols",IDC_STATIC,2,142,310,57
GROUPBOX "Contact List Sorting",IDC_STATIC,143,2,169,69,WS_GROUP
CONTROL "Spin5",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,177,109,11,12
- CONTROL "Dont move offline user to bottom",IDC_NOOFFLINEMOVE,
+ CONTROL "Don't move offline user to bottom",IDC_NOOFFLINEMOVE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,26,142,10
CONTROL "Pin to desktop",IDC_ONDESKTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,120,125,15
CONTROL "Disable icon blinking",IDC_ICONBLINK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,84,97,10
diff --git a/plugins/FileAsMessage/src/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp
index 282e491235..156e58e4ca 100644
--- a/plugins/FileAsMessage/src/dialog.cpp
+++ b/plugins/FileAsMessage/src/dialog.cpp
@@ -795,7 +795,7 @@ void FILEECHO::perform(char *str)
switch(msgId)
{
case CMD_REQ:
- if(MessageBox(hDlg, Translate("Incoming file request. Do you want proceed?"),
+ if(MessageBox(hDlg, Translate("Incoming file request. Do you want to proceed?"),
Translate(SERVICE_TITLE), MB_YESNO | MB_ICONWARNING) == IDYES)
{
SetDlgItemText(hDlg, IDC_STATUS, "");
@@ -843,7 +843,7 @@ void FILEECHO::perform(char *str)
case CMD_REQ:
if(chunkCount)
{
- if(MessageBox(hDlg, Translate("New incoming file request. Do you want proceed?"),
+ if(MessageBox(hDlg, Translate("New incoming file request. Do you want to proceed?"),
Translate(SERVICE_TITLE), MB_YESNO | MB_ICONWARNING) != IDYES)
break;
//sendCmd(0, CMD_CANCEL, "", NULL);
diff --git a/plugins/IEView/src/IEView.cpp b/plugins/IEView/src/IEView.cpp
index 1925a59f98..a229e406bf 100644
--- a/plugins/IEView/src/IEView.cpp
+++ b/plugins/IEView/src/IEView.cpp
@@ -350,7 +350,7 @@ void IEView::init()
isInited = true;
InitializeCriticalSection(&mutex);
if (FAILED(OleInitialize(NULL)))
- MessageBox(NULL, TranslateT("OleInitialize failed."), TranslateT("ERROR"), MB_OK);
+ MessageBox(NULL, TranslateT("Ole Initialize failed."), TranslateT("ERROR"), MB_OK);
}
void IEView::release()
diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp
index 66c0ee9a20..7ee94d423d 100755
--- a/plugins/Msg_Export/src/utils.cpp
+++ b/plugins/Msg_Export/src/utils.cpp
@@ -1615,7 +1615,7 @@ int nContactDeleted(WPARAM wparam,LPARAM /*lparam*/)
TCHAR szTemp[500];
mir_sntprintf(szTemp, SIZEOF(szTemp), _T("%s\r\n%s"),
- TranslateT("User has been deleted do you want to delete the file?"), sFilePath.c_str());
+ TranslateT("User has been deleted. Do you want to delete the file?"), sFilePath.c_str());
if (enDeleteAction == eDAAutomatic ||
MessageBox(NULL, szTemp, MSG_BOX_TITEL, MB_YESNO) == IDYES )
diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp
index 39879537c1..41418f8058 100755
--- a/plugins/New_GPG/src/main.cpp
+++ b/plugins/New_GPG/src/main.cpp
@@ -2322,7 +2322,7 @@ void ImportKey()
new_key_hcnt_mutex.unlock();
bool for_all_sub = false;
if(metaIsProtoMetaContacts(hContact))
- if(MessageBox(0, TranslateT("Do you want load key for all subcontacts ?"), TranslateT("Metacontact detected"), MB_YESNO) == IDYES)
+ if(MessageBox(0, TranslateT("Do you want to load key for all subcontacts ?"), TranslateT("Metacontact detected"), MB_YESNO) == IDYES)
for_all_sub = true;
if(metaIsProtoMetaContacts(hContact))
{
diff --git a/plugins/New_GPG/src/messages.cpp b/plugins/New_GPG/src/messages.cpp
index a311d542f8..69aa97086d 100755
--- a/plugins/New_GPG/src/messages.cpp
+++ b/plugins/New_GPG/src/messages.cpp
@@ -42,7 +42,7 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
{
if(bDebugLog)
debuglog<<std::string(time_str()+": info: received encrypted message from: "+toUTF8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR))+" with turned off encryption");
- if(MessageBox(0, TranslateT("We received encrypted message from contact with encryption turned off.\nDo you want turn on encryption for this contact ?"), TranslateT("Warning"), MB_YESNO) == IDYES)
+ if(MessageBox(0, TranslateT("We received encrypted message from contact with encryption turned off.\nDo you want to turn on encryption for this contact ?"), TranslateT("Warning"), MB_YESNO) == IDYES)
{
if(!isContactHaveKey(hContact))
{
@@ -66,7 +66,7 @@ void RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags,
setClistIcon(hContact);
}
}
- else if(MessageBox(0, TranslateT("Do you want try to decrypt encrypted message ?"), TranslateT("Warning"), MB_YESNO) == IDNO)
+ else if(MessageBox(0, TranslateT("Do you want to try to decrypt encrypted message ?"), TranslateT("Warning"), MB_YESNO) == IDNO)
{
HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
@@ -690,7 +690,7 @@ void SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
if(out.find("There is no assurance this key belongs to the named user") != string::npos)
{
out.clear();
- if(MessageBox(0, TranslateT("We trying to encrypt with untrusted key, do you want to trust this key permanently ?"), TranslateT("Warning"), MB_YESNO) == IDYES)
+ if(MessageBox(0, TranslateT("We're trying to encrypt with untrusted key. Do you want to trust this key permanently ?"), TranslateT("Warning"), MB_YESNO) == IDYES)
{
db_set_b(hContact, szGPGModuleName, "bAlwaysTrust", 1);
std::vector<std::wstring> tmp;
diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp
index f04aeca6ae..c30afcfa67 100755
--- a/plugins/New_GPG/src/options.cpp
+++ b/plugins/New_GPG/src/options.cpp
@@ -227,7 +227,7 @@ static INT_PTR CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
}
}
if(!keep)
- if(MessageBox(0, TranslateT("This key not used by any contact, do you want to remove it from public keyring ?"), TranslateT("Key info"), MB_YESNO) == IDYES)
+ if(MessageBox(0, TranslateT("This key is not used by any contact. Do you want to remove it from public keyring ?"), TranslateT("Key info"), MB_YESNO) == IDYES)
{
std::vector<wstring> cmd;
string output;
@@ -895,7 +895,7 @@ static INT_PTR CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam
if(metaIsProtoMetaContacts(hContact))
{
HANDLE hcnt = NULL;
- if(MessageBox(0, TranslateT("Do you want load key for all subcontacts ?"), TranslateT("Metacontact detected"), MB_YESNO) == IDYES)
+ if(MessageBox(0, TranslateT("Do you want to load key for all subcontacts ?"), TranslateT("Metacontact detected"), MB_YESNO) == IDYES)
{
allsubcontacts = true;
int count = metaGetContactsNum(hContact);
diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index 219a11fd99..52ccac9e3f 100755
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
@@ -524,7 +524,7 @@ std::wstring encrypt_file(HANDLE hContact, TCHAR *filename)
if(out.find("There is no assurance this key belongs to the named user") != string::npos)
{
out.clear();
- if(MessageBox(0, TranslateT("We trying to encrypt with untrusted key, do you want to trust this key permanently ?"), TranslateT("Warning"), MB_YESNO) == IDYES)
+ if(MessageBox(0, TranslateT("We're trying to encrypt with untrusted key. Do you want to trust this key permanently ?"), TranslateT("Warning"), MB_YESNO) == IDYES)
{
db_set_b(hcnt, szGPGModuleName, "bAlwaysTrust", 1);
std::vector<std::wstring> tmp;
diff --git a/plugins/Non-IM Contact/res/resource.rc b/plugins/Non-IM Contact/res/resource.rc
index a21eb06175..c1841d6777 100644
--- a/plugins/Non-IM Contact/res/resource.rc
+++ b/plugins/Non-IM Contact/res/resource.rc
@@ -41,7 +41,7 @@ BEGIN
LTEXT "URL",IDC_STATIC,4,22,41,8
LTEXT "Update URL every",IDC_STATIC,4,39,75,8
LTEXT "Intervals",IDC_STATIC,117,39,33,8
- LTEXT "If the protocol timer is disabled web pages wont be updated",IDC_STATIC,4,52,188,8
+ LTEXT "If the protocol timer is disabled web pages won't be updated",IDC_STATIC,4,52,188,8
END
IDD_CONTACT_INFO DIALOG 0, 0, 283, 190
diff --git a/plugins/PluginUpdater/src/DlgListNew.cpp b/plugins/PluginUpdater/src/DlgListNew.cpp
index 1cac297395..839093393c 100644
--- a/plugins/PluginUpdater/src/DlgListNew.cpp
+++ b/plugins/PluginUpdater/src/DlgListNew.cpp
@@ -110,7 +110,7 @@ static void ApplyDownloads(void *param)
PopupDataText temp;
temp.Title = TranslateT("Plugin Updater");
temp.Text = tszBuff;
- lstrcpyn(tszBuff, TranslateT("Download complete. Do you want go to plugins option page?"), SIZEOF(tszBuff));
+ lstrcpyn(tszBuff, TranslateT("Download complete. Do you want to go to plugins option page?"), SIZEOF(tszBuff));
int rc = MessageBox(hDlg, temp.Text, temp.Title, MB_YESNO | MB_ICONQUESTION);
if (rc == IDYES)
CallFunctionAsync(OpenPluginOptions, 0);
diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp
index de2455ef84..636da73672 100644
--- a/plugins/Sessions/Src/Main.cpp
+++ b/plugins/Sessions/Src/Main.cpp
@@ -654,7 +654,7 @@ int LoadSession(WPARAM wparam,LPARAM lparam)
}
else if (g_bWarnOnHidden)
{
- if (MessageBox(NULL, TranslateT("This Session already opened(but probably hidden)\nDo you want to show hidden contacts?"), TranslateT("Sessions Manager"), MB_YESNO|MB_ICONQUESTION) == IDYES)
+ if (MessageBox(NULL, TranslateT("This Session already opened (but probably hidden).\nDo you want to show hidden contacts?"), TranslateT("Sessions Manager"), MB_YESNO|MB_ICONQUESTION) == IDYES)
{
j=0;
while(hidden[j]!=0)
diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp
index 1fb5b3dcdc..c0b57d9540 100644
--- a/plugins/TabSRMM/src/sendqueue.cpp
+++ b/plugins/TabSRMM/src/sendqueue.cpp
@@ -789,7 +789,7 @@ inform_and_discard:
LRESULT SendQueue::WarnPendingJobs(unsigned int uNrMessages)
{
return MessageBox(0,
- TranslateT("There are unsent messages waiting for confirmation.\nWhen you close the window now, Miranda will try to send them but may be unable to inform you about possible delivery errors.\nDo you really want to close the Window(s)?"),
+ TranslateT("There are unsent messages waiting for confirmation.\nIf you close the window now, Miranda will try to send them but may be unable to inform you about possible delivery errors.\nDo you really want to close the window(s)?"),
TranslateT("Message window warning"), MB_YESNO | MB_ICONHAND);
}
diff --git a/plugins/Watrack/status/i_opt_3.inc b/plugins/Watrack/status/i_opt_3.inc
index 3defc68b54..423b7c22c1 100644
--- a/plugins/Watrack/status/i_opt_3.inc
+++ b/plugins/Watrack/status/i_opt_3.inc
@@ -19,7 +19,7 @@ begin
'changed next time.');
CheckDlgButton(Dialog,IDC_SIMPLEMODE,SimpleMode);
MakeHint(Dialog,IDC_INDEPENDED,
- 'If this option is "ON", XStatus doesn''t depend of protocol status.');
+ 'If this option is "ON", XStatus doesn''t depend on protocol status.');
CheckDlgButton(Dialog,IDC_INDEPENDED,XIndepended);
MakeHint(Dialog,IDC_USESTATUS,
'If this option is "ON", status text will be replaced by music info.');
diff --git a/protocols/FacebookRM/src/contacts.cpp b/protocols/FacebookRM/src/contacts.cpp
index 0ba4986f1a..cade7bb6de 100644
--- a/protocols/FacebookRM/src/contacts.cpp
+++ b/protocols/FacebookRM/src/contacts.cpp
@@ -303,7 +303,7 @@ void FacebookProto::CancelFriendsRequest(void *data)
setByte(hContact, FACEBOOK_KEY_CONTACT_TYPE, CONTACT_NONE);
NotifyEvent(m_tszUserName, TranslateT("Request for friendship was canceled."), NULL, FACEBOOK_EVENT_OTHER);
}
- else facy.client_notify(TranslateT("Error occured when canceling friendship request."));
+ else facy.client_notify(TranslateT("Error occurred when canceling friendship request."));
if (resp.code != HTTP_CODE_OK)
facy.handle_error("CancelFriendsRequest");
diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp
index 4c9354ec61..8fc929f1cb 100644
--- a/protocols/Gadu-Gadu/src/groupchat.cpp
+++ b/protocols/Gadu-Gadu/src/groupchat.cpp
@@ -295,7 +295,7 @@ TCHAR* GGPROTO::gc_getchat(uin_t sender, uin_t *recipients, int recipients_count
TCHAR *senderName = unknownSender ?
TranslateT("Unknown") : pcli->pfnGetContactDisplayName(getcontact(sender, 0, 0, NULL), 0);
TCHAR error[256];
- mir_sntprintf(error, SIZEOF(error), TranslateT("%s has initiated conference with %d participants (%d unknowns).\nDo you want do participate ?"),
+ mir_sntprintf(error, SIZEOF(error), TranslateT("%s has initiated conference with %d participants (%d unknowns).\nDo you want to participate ?"),
senderName, recipients_count + 1, unknown);
chat->ignore = MessageBox(NULL, error, m_tszUserName, MB_OKCANCEL | MB_ICONEXCLAMATION) != IDOK;
}
diff --git a/protocols/MRA/res/resource.rc b/protocols/MRA/res/resource.rc
index fc9125b748..d1df59f0c3 100644
--- a/protocols/MRA/res/resource.rc
+++ b/protocols/MRA/res/resource.rc
@@ -204,7 +204,7 @@ BEGIN
CONTROL "Create a new Mail.ru account using the Mail.ru website",IDC_NEW_ACCOUNT_LINK,
"Hyperlink",WS_TABSTOP,18,72,258,9
CONTROL "Retrieve a lost password",IDC_LOOKUPLINK,"Hyperlink",WS_TABSTOP,18,85,258,9
- LTEXT "Leave empty if you dont want change password",IDC_STATIC,72,48,212,8
+ LTEXT "Leave empty if you don't want to change password",IDC_STATIC,72,48,212,8
END
IDD_OPT_POPUPS DIALOGEX 0, 0, 295, 150
diff --git a/protocols/Xfire/res/Kopie von resource.rc b/protocols/Xfire/res/Kopie von resource.rc
index f94085600b..1fda2a30a4 100644
--- a/protocols/Xfire/res/Kopie von resource.rc
+++ b/protocols/Xfire/res/Kopie von resource.rc
@@ -125,7 +125,7 @@ BEGIN
CONTROL "This list contains all your blocked Xfire users. You can remove one, if you wanna allow him to send you a friend request.",IDC_STC9,"Static",WS_CHILD|WS_VISIBLE,160,12,136,74
CONTROL "You can simply block someone, if you right click on his friend request in clist and choose Block User ...",IDC_STC19,"Static",WS_CHILD|WS_VISIBLE,160,48,130,39
CONTROL "This file is used for the game search, game detection and gameid resolving. It contains all xfire supported games.",IDC_STC20,"Static",WS_CHILD|WS_VISIBLE,92,105,206,28
- CONTROL "This file contains all original game icons. You can also activate the option for icon downloading, if you dont have it.",IDC_STC21,"Static",WS_CHILD|WS_VISIBLE,92,136,206,26
+ CONTROL "This file contains all original game icons. You can also activate the option for icon downloading, if you don't have it.",IDC_STC21,"Static",WS_CHILD|WS_VISIBLE,92,136,206,26
CONTROL "Be sure you put these files in following folder:",IDC_STC24,"Static",WS_CHILD|WS_VISIBLE,8,168,290,9
CONTROL "",IDC_FILESSHOULDBE,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_READONLY,8,179,290,13,WS_EX_CLIENTEDGE
END
@@ -156,15 +156,15 @@ BEGIN
CONTROL "Games",IDC_GRP10,"Button",WS_CHILD|WS_VISIBLE|BS_GROUPBOX,2,0,300,233
CONTROL "Game:",IDC_STC27,"Static",WS_CHILD|WS_VISIBLE,162,11,136,9
CONTROL "",IDC_GAMENAME,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_READONLY|ES_AUTOHSCROLL,162,20,136,11
- CONTROL "Dont detect this game as running",IDC_DONTDETECT,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,142,55,152,9
+ CONTROL "Don't detect this game as running",IDC_DONTDETECT,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,142,55,152,9
CONTROL "",IDC_GAMEICO,"Static",WS_CHILD|WS_VISIBLE|SS_CENTERIMAGE|SS_ICON,138,11,22,19
CONTROL "Options",IDC_GRP11,"Button",WS_CHILD|WS_VISIBLE|BS_GROUPBOX,138,40,160,187
CONTROL "Apply",IDC_APPLY,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP,142,206,72,17
- CONTROL "Dont set status message for other protocols",IDC_NOSTATUSMSG,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,142,68,152,9
+ CONTROL "Don't set status message for other protocols",IDC_NOSTATUSMSG,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,142,68,152,9
CONTROL "",IDC_TEXTSTATUS,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_READONLY|ES_AUTOHSCROLL|ES_CENTER,142,192,152,11
CONTROL "Add new game",IDC_ADDGAME,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP,6,212,66,15
CONTROL "Remove",IDC_REMOVE,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP,74,212,60,15
- CONTROL "Dont show in start menu",IDC_NOTINSTARTMENU,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,142,81,152,9
+ CONTROL "Don't show in start menu",IDC_NOTINSTARTMENU,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,142,81,152,9
CONTROL "(manual added)",IDC_MANADDED,"Static",NOT WS_VISIBLE|WS_CHILD,162,31,134,9
CONTROL "Extra Command Line Parameters:",IDC_STC15,"Static",WS_CHILD|WS_VISIBLE,142,99,150,9
CONTROL "",IDC_EXTRAPARAMS,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_AUTOHSCROLL,142,110,152,13,WS_EX_CLIENTEDGE
diff --git a/protocols/Xfire/res/resource.rc b/protocols/Xfire/res/resource.rc
index 6f7f4d6825..bbff829ab7 100644
--- a/protocols/Xfire/res/resource.rc
+++ b/protocols/Xfire/res/resource.rc
@@ -135,7 +135,7 @@ BEGIN
LTEXT "This list contains all your blocked Xfire users. You can remove one, if you wanna allow him to send you a friend request.",IDC_STC9,160,12,136,74,NOT WS_GROUP
LTEXT "You can simply block someone, if you right click on his friend request in clist and choose Block User ...",IDC_STC19,160,48,130,39,NOT WS_GROUP
LTEXT "This file is used for the game search, game detection and gameid resolving. It contains all xfire supported games.",IDC_STC20,92,105,206,28,NOT WS_GROUP
- LTEXT "This file contains all original game icons. You can also activate the option for icon downloading, if you dont have it.",IDC_STC21,92,136,206,30,NOT WS_GROUP
+ LTEXT "This file contains all original game icons. You can also activate the option for icon downloading, if you don't have it.",IDC_STC21,92,136,206,30,NOT WS_GROUP
LTEXT "Be sure you put these files in following folder:",IDC_STC24,7,171,290,9,NOT WS_GROUP
EDITTEXT IDC_FILESSHOULDBE,7,183,290,13,ES_READONLY | NOT WS_BORDER,WS_EX_CLIENTEDGE
END
@@ -167,16 +167,16 @@ BEGIN
GROUPBOX "Games",IDC_GRP10,2,0,300,225
LTEXT "Game:",IDC_STC27,162,11,136,9,NOT WS_GROUP
EDITTEXT IDC_GAMENAME,162,20,136,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
- CONTROL "Dont detect this game as running",IDC_DONTDETECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,142,55,152,9
+ CONTROL "Don't detect this game as running",IDC_DONTDETECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,142,55,152,9
ICON "",IDC_GAMEICO,138,11,21,20,SS_CENTERIMAGE
GROUPBOX "Options",IDC_GRP11,138,40,160,181
PUSHBUTTON "Apply",IDC_APPLY,142,199,72,17
- CONTROL "Dont set status message for other protocols",IDC_NOSTATUSMSG,
+ CONTROL "Don't set status message for other protocols",IDC_NOSTATUSMSG,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,142,68,152,9
EDITTEXT IDC_TEXTSTATUS,142,186,152,12,ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER
PUSHBUTTON "Add new game",IDC_ADDGAME,6,201,66,15
PUSHBUTTON "Remove",IDC_REMOVE,74,202,60,15
- CONTROL "Dont show in start menu",IDC_NOTINSTARTMENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,142,81,152,9
+ CONTROL "Don't show in start menu",IDC_NOTINSTARTMENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,142,81,152,9
LTEXT "(manual added)",IDC_MANADDED,162,31,134,9,NOT WS_VISIBLE | NOT WS_GROUP
LTEXT "Extra Command Line Parameters:",IDC_STC15,142,99,150,9,NOT WS_GROUP
EDITTEXT IDC_EXTRAPARAMS,142,110,152,13,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE
diff --git a/protocols/Xfire/src/addgamedialog.cpp b/protocols/Xfire/src/addgamedialog.cpp
index 0ea63d9219..af55def988 100644
--- a/protocols/Xfire/src/addgamedialog.cpp
+++ b/protocols/Xfire/src/addgamedialog.cpp
@@ -698,7 +698,7 @@ INT_PTR CALLBACK DlgAddGameProc2 (HWND hwndDlg,
if(!strlen(temp))
{
if(!editgame) delete newgame;
- return MessageBoxA(hwndDlg, Translate("Please select a game exe. Note: If you dont select a launcher exe, the game exe will be used in the game start menu."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION);
+ return MessageBoxA(hwndDlg, Translate("Please select a game exe. Note: If you don't select a launcher exe, the game exe will be used in the game start menu."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION);
}
else
{
diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index f75e74f5e7..b1249b8b69 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -3449,7 +3449,7 @@ INT_PTR RemoveFriend(WPARAM wParam,LPARAM lParam) {
if(!db_get_s((HANDLE)wParam, protocolname, "Username",&dbv))
{
- mir_snprintf(temp, SIZEOF(temp), Translate("Do you really want delete your friend %s?"), dbv.pszVal);
+ mir_snprintf(temp, SIZEOF(temp), Translate("Do you really want to delete your friend %s?"), dbv.pszVal);
if(MessageBoxA(NULL,temp,Translate("Confirm Delete"),MB_YESNO|MB_ICONQUESTION)==IDYES)
{
if(myClient!=NULL)
diff --git a/protocols/Xfire/src/options.cpp b/protocols/Xfire/src/options.cpp
index b7a6ee094d..8b1359cd8b 100644
--- a/protocols/Xfire/src/options.cpp
+++ b/protocols/Xfire/src/options.cpp
@@ -68,23 +68,23 @@ xfireconfigitem xfireconfigitems[XFIRE_RECVPREFSPACKET_SUPPORTEDONFIGS] = {
static mytreeitem mytree[] = {
{LPGEN("Avatars"),"",1,0},
{LPGEN("Disable avatars"),"noavatars",0,0},
- {LPGEN("Dont download avatars of clan members"),"noclanavatars",0,0},
+ {LPGEN("Don't download avatars of clan members"),"noclanavatars",0,0},
{LPGEN("Use alternate way for Avatar download"),"specialavatarload",0,0},
{LPGEN("General"),"",1,0},
{LPGEN("Use UTF8 for messaging and nick's (beta)"),"useutf8",0,0},
{LPGEN("Automatically reconnect on protocol version changes"),"recprotoverchg",0,0},
{LPGEN("No Ip/Port in StatusMsg"),"noipportinstatus",0,0},
{LPGEN("Use Online status for unsupported global statuses"),"oninsteadafk",0,0},
- {LPGEN("Dont move friends to clan groups"),"skipfriendsgroups",0,0},
+ {LPGEN("Don't move friends to clan groups"),"skipfriendsgroups",0,0},
{LPGEN("GameServerQuery support"),"gsqsupport",0,0},
{LPGEN("No custom away message"),"nocustomaway",0,0},
{LPGEN("Remove friend of friend buddies from database"),"fofdbremove",0,0},
/*{"Show usernames only","onlyusername",0},*/
{LPGEN("Hide yourself in buddylist"),"skipmyself",0,0},
- {LPGEN("Dont display game search results"),"dontdisresults",0,0},
- {LPGEN("Dont display game search status window"),"dontdissstatus",0,0},
+ {LPGEN("Don't display game search results"),"dontdisresults",0,0},
+ {LPGEN("Don't display game search status window"),"dontdissstatus",0,0},
{LPGEN("Display popup, if someone start a game"),"gamepopup",0,0},
- {LPGEN("Dont automatically create clan groups"),"noclangroups",0,0},
+ {LPGEN("Don't automatically create clan groups"),"noclangroups",0,0},
{LPGEN("Enable MBot support"),"mbotsupport",0,0},
{LPGEN("Gamedetection"),"",1,0},
/*{"Scan for games on every Miranda start","scanalways",0},*/