summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Weimer <wishmaster51@googlemail.com>2013-11-08 19:43:25 +0000
committerTobias Weimer <wishmaster51@googlemail.com>2013-11-08 19:43:25 +0000
commit0829927dddd3277bf0159fac6750d00a84a805c6 (patch)
tree83ec3150d9a86a29d6d570d37cb2980dee6b7aa8
parent9fca921c9a8e330df2a1b9042eb10a8853fe75d2 (diff)
minor cosmetics
git-svn-id: http://svn.miranda-ng.org/main/trunk@6827 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/WinterSpeak/res/Speak.rc12
-rw-r--r--protocols/SkypeClassic/res/Resource.rc2
-rw-r--r--protocols/SkypeClassic/src/skype.cpp2
3 files changed, 8 insertions, 8 deletions
diff --git a/plugins/WinterSpeak/res/Speak.rc b/plugins/WinterSpeak/res/Speak.rc
index 939dd3b2aa..7d558d2518 100644
--- a/plugins/WinterSpeak/res/Speak.rc
+++ b/plugins/WinterSpeak/res/Speak.rc
@@ -55,10 +55,10 @@ BEGIN
CONTROL "Offline",IDC_STATUS_OFFLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,19,85,10
CONTROL "Online",IDC_STATUS_ONLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,85,10
CONTROL "Away",IDC_STATUS_AWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,41,85,10
- CONTROL "Do not Disturb",IDC_STATUS_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,52,85,10
- CONTROL "Not Available",IDC_STATUS_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,63,85,10
+ CONTROL "DND",IDC_STATUS_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,52,85,10
+ CONTROL "NA",IDC_STATUS_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,63,85,10
CONTROL "Occupied",IDC_STATUS_OCCUPIED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,74,85,10
- CONTROL "Free for Chat",IDC_STATUS_FREEFORCHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,85,85,10
+ CONTROL "Free for chat",IDC_STATUS_FREEFORCHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,85,85,10
CONTROL "Invisible",IDC_STATUS_INVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,96,85,10
GROUPBOX "Occurring Events",IDC_STATIC,7,117,99,74
CONTROL "Incoming Message",IDC_EVENT_MESSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,131,85,10
@@ -87,10 +87,10 @@ BEGIN
GROUPBOX "Active Modes",IDC_STATIC,0,0,85,240
CONTROL "Online",IDC_ACTIVE_ONLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,13,75,10
CONTROL "Away",IDC_ACTIVE_AWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,24,75,10
- CONTROL "Do not Disturb",IDC_ACTIVE_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,35,75,10
- CONTROL "Not Available",IDC_ACTIVE_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,46,75,10
+ CONTROL "DND",IDC_ACTIVE_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,35,75,10
+ CONTROL "NA",IDC_ACTIVE_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,46,75,10
CONTROL "Occupied",IDC_ACTIVE_OCCUPIED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,57,75,10
- CONTROL "Free for Chat",IDC_ACTIVE_FREEFORCHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,68,75,10
+ CONTROL "Free for chat",IDC_ACTIVE_FREEFORCHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,68,75,10
CONTROL "Invisible",IDC_ACTIVE_INVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,79,75,10
GROUPBOX "Active Users",IDC_STATIC,95,0,210,240
LTEXT "The following events are being ignored:",IDC_STATIC,100,10,200,8
diff --git a/protocols/SkypeClassic/res/Resource.rc b/protocols/SkypeClassic/res/Resource.rc
index 51eb9c7cf7..fcf58a3055 100644
--- a/protocols/SkypeClassic/res/Resource.rc
+++ b/protocols/SkypeClassic/res/Resource.rc
@@ -186,7 +186,7 @@ BEGIN
CONTROL "Enable Skype menu options (currently: Find/Add user)",
IDC_ENABLEMENU,"Button",BS_AUTOCHECKBOX | WS_GROUP |
WS_TABSTOP,10,4,290,9
- CONTROL "Use popup plugin for displaying messages ",IDC_USEPOPUP,
+ CONTROL "Use popup plugin for displaying messages",IDC_USEPOPUP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,19,290,9
CONTROL "Suppress all error messages (not recommended, but if it annoys you... ;)",
IDC_NOERRORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,34,
diff --git a/protocols/SkypeClassic/src/skype.cpp b/protocols/SkypeClassic/src/skype.cpp
index 26bafd6ad3..9803ef549f 100644
--- a/protocols/SkypeClassic/src/skype.cpp
+++ b/protocols/SkypeClassic/src/skype.cpp
@@ -3238,7 +3238,7 @@ extern "C" int __declspec(dllexport) Load(void)
if (!db_get_b(NULL, SKYPE_PROTONAME, "FirstRun", 0)) {
db_set_b(NULL, SKYPE_PROTONAME, "FirstRun", 1);
if (AnySkypeusers()==0) // First run, it seems :)
- if (MessageBox(NULL, TranslateT("This seems to be the first time that you're running the Skype protocol plugin. Do you want to enable the protocol for this Miranda profile? (If you chose NO, you can always enable it in the plugin options later."), _T("Welcome!"), MB_ICONQUESTION|MB_YESNO)==IDNO) {
+ if (MessageBox(NULL, TranslateT("This seems to be the first time that you're running the Skype protocol plugin. Do you want to enable the protocol for this Miranda profile? If you chose NO, you can always enable it in the plugin options later."), _T("Welcome!"), MB_ICONQUESTION|MB_YESNO)==IDNO) {
char path[MAX_PATH], *filename;
GetModuleFileNameA(hInst, path, sizeof(path));
if (filename = strrchr(path,'\\')+1)