- cosmetic patches from dartraiden

git-svn-id: http://svn.miranda-ng.org/main/trunk@5160 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 16 insertions, 15 deletions

diff --git a/langpacks/russian/Plugins/Skype.txt b/langpacks/russian/Plugins/Skype.txt
index 866309bc0d..b9fe6f6025 100644
--- a/langpacks/russian/Plugins/Skype.txt
+++ b/langpacks/russian/Plugins/Skype.txt
@@ -183,6 +183,7 @@ SkypeKit не запустился.
 [Protocols]

 Протоколы

 [SkypeKit will only permit you to login to one account at a time. Adding multiple instances of SkypeKit is prohibited in the licence agreement and standard distribution terms.]

+SkypeKit не позволяет одновременно входить более чем в одну учестную запись. Запуск нескольких копий SkypeKit запрещен лицензионным соглашением и условиями распространения.

 ;file \protocols\Skype\src\skype_menus.cpp

 [Hi! I'd like to add you to my contact list]

 Привет! Я хотел бы добавить Вас в свой список контактов

diff --git a/plugins/TabSRMM/res/chat.rc b/plugins/TabSRMM/res/chat.rc
index 05dacf3be7..20167bf0e6 100644
--- a/plugins/TabSRMM/res/chat.rc
+++ b/plugins/TabSRMM/res/chat.rc
@@ -99,7 +99,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

     GROUPBOX        "Options",IDC_STATIC,3,0,300,229

     CONTROL         "",IDC_CHECKBOXES,"SysTreeView32",TVS_HASBUTTONS | TVS_DISABLEDRAGDROP | TVS_FULLROWSELECT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,6,9,286,192

-    LTEXT           "Add new rooms to group:",IDC_STATIC_ADD,10,208,133,8

+    LTEXT           "Add new rooms to group:",IDC_STATIC_ADD,10,209,133,10

     EDITTEXT        IDC_GROUP,152,208,142,14,ES_AUTOHSCROLL

     LTEXT           "Chat integration is disabled. You can enable it here, and then you to NEED RESTART Miranda after making this change.\n\nYou MUST disable the standard chat plugin when you enable the group chat support here. Otherwise no group chat at all may work.",IDC_STATIC_MESSAGE,21,52,256,74

 END

diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc
index 4e206d54b0..f8e5ac4b55 100644
--- a/plugins/TabSRMM/res/resource.rc
+++ b/plugins/TabSRMM/res/resource.rc
@@ -76,11 +76,11 @@ BEGIN
     LTEXT           "Message send timeout",IDC_STATIC,11,155,161,11

     EDITTEXT        IDC_SECONDS,187,152,35,12,ES_AUTOHSCROLL

     CONTROL         "",IDC_TIMEOUTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,226,153,11,11

-    LTEXT           "seconds.",IDC_STATIC,243,154,36,8

+    LTEXT           "seconds.",IDC_STATIC,229,154,36,8

     LTEXT           "Input history size",IDC_STATIC,11,168,162,10

     EDITTEXT        IDC_HISTORYSIZE,187,167,35,12,ES_AUTOHSCROLL

     CONTROL         "",IDC_HISTORYSIZESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,225,166,11,13

-    LTEXT           "entries",IDC_STATIC,243,169,28,10

+    LTEXT           "entries",IDC_STATIC,229,169,28,10

     LTEXT           "Options marked with an asterisk (*) will only take effect after Miranda has been restarted.",IDC_STATIC,11,188,283,18

     CONTROL         "More about advanced tweaks",IDC_PLUS_HELP,"Hyperlink",WS_TABSTOP | 0x1,11,210,158,9

     PUSHBUTTON      "Revert to (safe) defaults",IDC_PLUS_REVERT,180,207,111,14

@@ -188,7 +188,7 @@ BEGIN
     CONTROL         "Always trim message log to",IDC_ALWAYSTRIM2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,214,163,12

     EDITTEXT        IDC_TRIM,178,213,33,12,ES_RIGHT | ES_NUMBER | WS_DISABLED

     CONTROL         "",IDC_TRIMSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,213,207,10,14

-    LTEXT           "Events",IDC_STATIC,240,215,64,8

+    LTEXT           "Events",IDC_STATIC,215,215,64,8

 END

 

 IDD_CONTAINEROPTIONS DIALOGEX 0, 0, 428, 258

@@ -284,7 +284,7 @@ BEGIN
     LTEXT           "Maximum display height (pixels)",IDC_STATIC,10,170,160,10

     EDITTEXT        IDC_MAXAVATARHEIGHT,174,169,35,12,ES_AUTOHSCROLL | ES_NUMBER

     CONTROL         "",IDC_AVATARSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,209,166,9,11

-    LTEXT           "(0 = no limit)",IDC_STATIC,224,170,75,11

+    LTEXT           "(0 = no limit)",IDC_STATIC,216,171,79,10

     CONTROL         "Try to keep original size",IDC_PRESERVEAVATARSIZE,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,184,285,9

     CONTROL         "Help on this",IDC_HELP_GENERAL,"Hyperlink",WS_TABSTOP | 0x1,4,209,67,9

@@ -318,8 +318,8 @@ BEGIN
     CONTROL         "Spin1",IDC_LOADTIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,200,196,10,14

     EDITTEXT        IDC_TRIM,164,211,39,12,ES_RIGHT | ES_NUMBER | WS_DISABLED

     CONTROL         "",IDC_TRIMSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,200,209,10,14

-    LTEXT           "Events",IDC_STATIC,215,212,82,8

-    LTEXT           "minutes old",IDC_STMINSOLD,215,200,83,8,WS_DISABLED

+    LTEXT           "Events",IDC_STATIC,210,212,82,8

+    LTEXT           "minutes old",IDC_STMINSOLD,210,200,83,8,WS_DISABLED

     GROUPBOX        "Global message log display",IDC_STMSGLOGGROUP3,149,107,147,29

     COMBOBOX        IDC_MSGLOGDIDSPLAY,155,117,135,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

     LTEXT           "Static",IDC_EXPLAINMSGLOGSETTINGS,31,25,240,59

@@ -361,8 +361,8 @@ BEGIN
     CONTROL         "Limit nicknames on tabs to",IDC_CUT_TABTITLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,210,152,10

     EDITTEXT        IDC_CUT_TITLEMAX,166,208,30,12,ES_AUTOHSCROLL

     CONTROL         "",IDC_CUT_TITLEMAXSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,191,208,11,13

-    LTEXT           "characters",IDC_STATIC,208,210,88,9

-    LTEXT           "ESC key behavior",IDC_STATIC,38,161,135,9

+    LTEXT           "characters",IDC_STATIC,202,210,88,9

+    LTEXT           "ESC key behavior",IDC_STATIC,8,161,135,9

     COMBOBOX        IDC_ESCMODE,8,172,291,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

 END

 

@@ -419,11 +419,11 @@ BEGIN
     LTEXT           "Flash containers",IDC_STATIC,8,107,133,11

     EDITTEXT        IDC_NRFLASH,150,106,34,12,ES_AUTOHSCROLL

     CONTROL         "",IDC_NRFLASHSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,182,107,11,11

-    LTEXT           "times",IDC_STATIC,213,108,79,11

+    LTEXT           "times",IDC_STATIC,190,108,79,11

     LTEXT           "Flash interval",IDC_STATIC,8,120,135,11

     EDITTEXT        IDC_FLASHINTERVAL,150,119,34,12,ES_AUTOHSCROLL

     CONTROL         "",IDC_FLASHINTERVALSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,185,122,11,10

-    LTEXT           "milliseconds",IDC_STATIC,213,121,79,12

+    LTEXT           "milliseconds",IDC_STATIC,190,121,79,12

     CONTROL         "Help on containers",IDC_HELP_CONTAINERS,"Hyperlink",WS_TABSTOP | 0x1,21,200,262,9

     GROUPBOX        "Windows Aero settings",IDC_STATIC,4,140,294,42

     CONTROL         "Use Aero UI elements(only when not using a custom skin)",IDC_USEAERO,

@@ -525,7 +525,7 @@ BEGIN
     CONTROL         "",IDC_TABBORDERSPINOUTERTOP,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,259,98,11,13

     EDITTEXT        IDC_TABBORDEROUTERBOTTOM,232,104,28,13,ES_AUTOHSCROLL

     CONTROL         "",IDC_TABBORDERSPINOUTERBOTTOM,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,259,104,11,13

-    GROUPBOX        "Tab layout tweaks",IDC_STATIC,3,35,297,137

+    GROUPBOX        "Tab layout tweaks",IDC_STATIC,3,35,297,118

 END

 

 IDD_ABOUT DIALOGEX 0, 0, 228, 140

@@ -547,7 +547,7 @@ IDD_OPT_SKIN DIALOGEX 0, 0, 303, 224
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    LTEXT           "Static",IDC_SKINROOTFOLDER,10,8,284,25

+    LTEXT           "Static",IDC_SKINROOTFOLDER,10,10,284,25

     GROUPBOX        "Selected skin",IDC_STATIC,7,39,289,29

     COMBOBOX        IDC_SKINNAME,12,50,183,14,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

     PUSHBUTTON      "Rescan",IDC_RESCANSKIN,202,50,90,14

@@ -683,8 +683,8 @@ BEGIN
     CONTROL         "",IDC_LOADTIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,200,175,10,14

     EDITTEXT        IDC_TRIM,164,190,39,12,ES_RIGHT | ES_NUMBER | WS_DISABLED

     CONTROL         "",IDC_TRIMSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,200,189,10,14

-    LTEXT           "Events",IDC_STATIC,215,192,82,8

-    LTEXT           "minutes old",IDC_STMINSOLD,215,179,83,8,WS_DISABLED

+    LTEXT           "Events",IDC_STATIC,206,192,82,8

+    LTEXT           "minutes old",IDC_STMINSOLD,206,179,83,8,WS_DISABLED

     LTEXT           "Notifications:",IDC_TXT_TITLE3,184,64,183,8

     CONTROL         "Don't announce when dialog is open",IDC_NOOPENNOTIFY,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,77,173,10