summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/BasicHistory/res/BasicHistory.rc2
-rw-r--r--plugins/BasicHistory/src/HistoryWindow.cpp2
-rw-r--r--plugins/BasicHistory/src/Options.cpp2
-rwxr-xr-xplugins/New_GPG/src/main.cpp4
-rw-r--r--protocols/Xfire/res/Kopie von resource.rc2
-rw-r--r--protocols/Xfire/res/resource.rc2
-rw-r--r--protocols/Xfire/src/main.cpp2
7 files changed, 8 insertions, 8 deletions
diff --git a/plugins/BasicHistory/res/BasicHistory.rc b/plugins/BasicHistory/res/BasicHistory.rc
index d0874095cc..7c7c93b00c 100644
--- a/plugins/BasicHistory/res/BasicHistory.rc
+++ b/plugins/BasicHistory/res/BasicHistory.rc
@@ -135,7 +135,7 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,51,270,10
CONTROL "Match Whole Word",IDC_MATCHWHOLE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,65,270,10
- CONTROL "Only Incomming Messages",IDC_ONLYIN,
+ CONTROL "Only Incoming Messages",IDC_ONLYIN,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,79,270,10
CONTROL "Only Outgoing Messages",IDC_ONLYOUT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,93,270,10
diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp
index a4dbf94e35..3f8b61adeb 100644
--- a/plugins/BasicHistory/src/HistoryWindow.cpp
+++ b/plugins/BasicHistory/src/HistoryWindow.cpp
@@ -1841,7 +1841,7 @@ void HistoryWindow::FindToolbarClicked(LPNMTOOLBAR lpnmTB)
AppendMenu(hPopupMenu, MFT_SEPARATOR, 0, NULL);
AppendMenu(hPopupMenu, searcher.IsMatchCase() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_MATCHCASE, TranslateT("Match Case"));
AppendMenu(hPopupMenu, searcher.IsMatchWholeWords() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_MATCHWHOLE, TranslateT("Match Whole Word"));
- AppendMenu(hPopupMenu, searcher.IsOnlyIn() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ONLYIN, TranslateT("Only Incomming Messages"));
+ AppendMenu(hPopupMenu, searcher.IsOnlyIn() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ONLYIN, TranslateT("Only Incoming Messages"));
AppendMenu(hPopupMenu, searcher.IsOnlyOut() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ONLYOUT, TranslateT("Only Outgoing Messages"));
AppendMenu(hPopupMenu, searcher.IsOnlyGroup() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ONLYGROUP, TranslateT("Only Selected Group"));
AppendMenu(hPopupMenu, searcher.IsAllUsers() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ALLUSERS, TranslateT("All Contacts"));
diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp
index 59042a3385..8a96797e6a 100644
--- a/plugins/BasicHistory/src/Options.cpp
+++ b/plugins/BasicHistory/src/Options.cpp
@@ -211,7 +211,7 @@ static HotkeyOptionsList g_HotkeyOptionsList[] = {
{ "basichistory_hot_matchcase", LPGENT("Switch Match Case"), LPGENT("History"), 0, 0, HISTORY_HK_MATCHCASE },
{ "basichistory_hot_matchwhole", LPGENT("Switch Match Whole Word"), LPGENT("History"), 0, 0, HISTORY_HK_MATCHWHOLE },
{ "basichistory_hot_showcontacts", LPGENT("Show/Hide Contacts"), LPGENT("History"), 0, 0, HISTORY_HK_SHOWCONTACTS },
- { "basichistory_hot_onlyin", LPGENT("Switch Only Incomming Messages"), LPGENT("History"), 0, 0, HISTORY_HK_ONLYIN },
+ { "basichistory_hot_onlyin", LPGENT("Switch Only Incoming Messages"), LPGENT("History"), 0, 0, HISTORY_HK_ONLYIN },
{ "basichistory_hot_onlyout", LPGENT("Switch Only Outgoing Messages"), LPGENT("History"), 0, 0, HISTORY_HK_ONLYOUT },
{ "basichistory_hot_onlygroup", LPGENT("Switch Only Selected Group"), LPGENT("History"), 0, 0, HISTORY_HK_ONLYGROUP },
{ "basichistory_hot_allcontacts", LPGENT("Switch All Contacts"), LPGENT("History"), 0, 0, HISTORY_HK_ALLCONTACTS },
diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp
index 9aa42f44d2..04c514edf7 100755
--- a/plugins/New_GPG/src/main.cpp
+++ b/plugins/New_GPG/src/main.cpp
@@ -1020,7 +1020,7 @@ static INT_PTR CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
}
else
{
- MessageBox(0, TranslateT("please choose gpg binary location"), TranslateT("Warning"), MB_OK);
+ MessageBox(0, TranslateT("Please choose GPG binary location"), TranslateT("Warning"), MB_OK);
break;
}
{
@@ -1098,7 +1098,7 @@ static INT_PTR CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
}
else
{
- MessageBox(0, TranslateT("please choose gpg binary location"), TranslateT("Warning"), MB_OK);
+ MessageBox(0, TranslateT("Please choose GPG binary location"), TranslateT("Warning"), MB_OK);
break;
}
{
diff --git a/protocols/Xfire/res/Kopie von resource.rc b/protocols/Xfire/res/Kopie von resource.rc
index 1fda2a30a4..aa4cfad1e9 100644
--- a/protocols/Xfire/res/Kopie von resource.rc
+++ b/protocols/Xfire/res/Kopie von resource.rc
@@ -67,7 +67,7 @@ BEGIN
CONTROL "",IDC_LOGIN,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_AUTOHSCROLL,66,12,100,13,WS_EX_CLIENTEDGE
CONTROL "",IDC_PASSWORD,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_AUTOHSCROLL|ES_PASSWORD,66,31,100,13,WS_EX_CLIENTEDGE
CONTROL "Password:",IDC_STATIC,"Static",WS_CHILD|WS_VISIBLE|WS_GROUP|SS_RIGHT,8,33,56,9
- CONTROL "Loginname:",IDC_STATIC,"Static",WS_CHILD|WS_VISIBLE|WS_GROUP|SS_RIGHT,16,14,48,9
+ CONTROL "Login name:",IDC_STATIC,"Static",WS_CHILD|WS_VISIBLE|WS_GROUP|SS_RIGHT,16,14,48,9
CONTROL "XFire",IDC_GROUPMAIN,"Button",WS_CHILD|WS_VISIBLE|WS_GROUP|BS_GROUPBOX,2,1,300,46
CONTROL "Nick:",IDC_STC1,"Static",WS_CHILD|WS_VISIBLE|WS_GROUP|SS_RIGHT,8,88,58,9
CONTROL "",IDC_NICK,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_AUTOHSCROLL,68,86,100,13,WS_EX_CLIENTEDGE
diff --git a/protocols/Xfire/res/resource.rc b/protocols/Xfire/res/resource.rc
index bbff829ab7..22a12d16a9 100644
--- a/protocols/Xfire/res/resource.rc
+++ b/protocols/Xfire/res/resource.rc
@@ -79,7 +79,7 @@ BEGIN
EDITTEXT IDC_LOGIN,66,12,100,13,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE
EDITTEXT IDC_PASSWORD,66,31,100,13,ES_PASSWORD | ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE
RTEXT "Password:",IDC_STATIC,8,33,56,9
- RTEXT "Loginname:",IDC_STATIC,8,14,56,9
+ RTEXT "Login name:",IDC_STATIC,8,14,56,9
GROUPBOX "XFire",IDC_GROUPMAIN,2,1,300,46,WS_GROUP
RTEXT "Nick:",IDC_STC1,8,88,58,9
EDITTEXT IDC_NICK,68,86,100,13,ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_CLIENTEDGE
diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index 1b1c48147a..e495cc5a07 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -1565,7 +1565,7 @@ INT_PTR SetStatus(WPARAM wParam,LPARAM lParam)
if(db_get(NULL,protocolname,"login",&dbv))
{
- MSGBOXE(Translate("No Loginname is set!"));
+ MSGBOXE(Translate("No Login name is set!"));
wParam=ID_STATUS_OFFLINE;
}
else if(db_get(NULL,protocolname,"password",&dbv2))