From 79a5720cf40a5568784fa30052bea8d4c20cbbb3 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 6 Jul 2013 15:42:08 +0000 Subject: - translation fixes (patch from dartraiden) git-svn-id: http://svn.miranda-ng.org/main/trunk@5247 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/res/resource.rc | 2 +- plugins/Clist_nicer/res/resource.rc | 4 ++-- plugins/CryptoPP/src/GPGw/gpg.rc | 4 ++-- plugins/MetaContacts/res/MetaContacts.rc | 2 +- plugins/MetaContacts/src/edit.cpp | 2 +- plugins/New_GPG/res/new_gpg.rc | 4 ++-- plugins/SecureIM/res/resource.rc | 2 +- plugins/SendScreenshotPlus/src/mir_icolib.cpp | 2 +- plugins/StatusPlugins/resource.rc | 2 +- plugins/TabSRMM/res/resource.rc | 2 +- plugins/UserInfoEx/res/resource.rc | 10 +++++----- plugins/UserInfoEx/src/mir_icolib.cpp | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc index db176538f0..9a92d07b1c 100644 --- a/plugins/Clist_modern/res/resource.rc +++ b/plugins/Clist_modern/res/resource.rc @@ -240,7 +240,7 @@ BEGIN CONTROL "Show contacts in groups",IDC_USEGROUPS,"Button",BS_AUTO3STATE | WS_TABSTOP,12,178,122,11 GROUPBOX "Include status modes",IDC_STATIC4,171,105,130,89,0,WS_EX_TRANSPARENT CONTROL "",IDC_STATUSMODES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,175,116,121,73 - PUSHBUTTON "Ok",IDOK,106,275,62,16 + PUSHBUTTON "OK",IDOK,106,275,62,16 PUSHBUTTON "Cancel",IDCANCEL,172,275,62,16 PUSHBUTTON "Apply",IDC_APPLY,242,275,62,16 CONTROL "",IDC_CLIST,"CListControl",0x24a,12,31,286,199,WS_EX_CLIENTEDGE diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc index dbc176531f..a5526d7de8 100644 --- a/plugins/Clist_nicer/res/resource.rc +++ b/plugins/Clist_nicer/res/resource.rc @@ -385,7 +385,7 @@ BEGIN CONTROL "",IDC_GROUPS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,12,116,122,73 GROUPBOX "Include status modes",IDC_STATIC4,171,105,130,89,0,WS_EX_TRANSPARENT CONTROL "",IDC_STATUSMODES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_AUTOARRANGE | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,175,116,121,73 - PUSHBUTTON "Ok",IDOK,106,275,62,16 + PUSHBUTTON "OK",IDOK,106,275,62,16 PUSHBUTTON "Cancel",IDCANCEL,172,275,62,16 PUSHBUTTON "Apply",IDC_APPLY,242,275,62,16 CONTROL "",IDC_CLIST,"CListControl",0x24a,12,31,286,199,WS_EX_CLIENTEDGE @@ -490,7 +490,7 @@ BEGIN LTEXT "Show 2nd line:",IDC_STATIC,225,54,94,11 COMBOBOX IDC_SECONDLINEMODE,219,64,127,56,CBS_DROPDOWNLIST | CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_IGN_ADDPERMANENTLY,"MButtonClass",WS_TABSTOP,95,202,106,15,WS_EX_NOACTIVATE | 0x10000000L - PUSHBUTTON "Ok",IDOK,211,228,65,14 + PUSHBUTTON "OK",IDOK,211,228,65,14 PUSHBUTTON "Cancel",IDCANCEL,284,228,65,14 CONTROL "Draw overlay icon on avatar",IDC_OVERLAYICON,"Button",BS_AUTO3STATE | WS_TABSTOP,219,82,127,10 CONTROL "Show local time",IDC_SHOWLOCALTIME1,"Button",BS_AUTO3STATE | WS_TABSTOP,219,94,127,10 diff --git a/plugins/CryptoPP/src/GPGw/gpg.rc b/plugins/CryptoPP/src/GPGw/gpg.rc index 313dad2701..95791b28b9 100644 --- a/plugins/CryptoPP/src/GPGw/gpg.rc +++ b/plugins/CryptoPP/src/GPGw/gpg.rc @@ -34,7 +34,7 @@ BEGIN LTEXT "Enter passphrase for the secret key of user:", IDC_STATIC,6,4,168,8 LTEXT "User ID",IDC_USERID,6,14,168,8 EDITTEXT IDC_PASSPHRASE,6,24,168,12,ES_PASSWORD | ES_AUTOHSCROLL - DEFPUSHBUTTON "Ok",IDOK,181,7,50,14 + DEFPUSHBUTTON "OK",IDOK,181,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,181,24,50,14 END @@ -46,7 +46,7 @@ BEGIN CONTROL "",IDC_KEYLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,7,258,174 PUSHBUTTON "Refresh",IDC_REFRESH,7,187,50,14 - DEFPUSHBUTTON "Ok",IDOK,154,187,50,14 + DEFPUSHBUTTON "OK",IDOK,154,187,50,14 PUSHBUTTON "Cancel",IDCANCEL,215,187,50,14 END diff --git a/plugins/MetaContacts/res/MetaContacts.rc b/plugins/MetaContacts/res/MetaContacts.rc index e463679067..3b8c65ca91 100644 --- a/plugins/MetaContacts/res/MetaContacts.rc +++ b/plugins/MetaContacts/res/MetaContacts.rc @@ -101,7 +101,7 @@ CAPTION "Add to Existing MetaContact" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CTEXT "Please select a MetaContact:",IDC_STATIC,27,11,201,14 - DEFPUSHBUTTON "&Ok",IDOK,73,238,48,14 + DEFPUSHBUTTON "&OK",IDOK,73,238,48,14 PUSHBUTTON "&Cancel",IDCANCEL,133,238,48,14 LISTBOX IDC_METALIST,44,28,168,168,LBS_NOINTEGRALHEIGHT | WS_VSCROLL CONTROL "Sort Alphabetically",IDC_CHK_SRT,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,78,210,124,13 diff --git a/plugins/MetaContacts/src/edit.cpp b/plugins/MetaContacts/src/edit.cpp index a826e0f046..f3f23c39b9 100644 --- a/plugins/MetaContacts/src/edit.cpp +++ b/plugins/MetaContacts/src/edit.cpp @@ -320,7 +320,7 @@ INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR case WM_COMMAND: switch(HIWORD(wParam)) { - case BN_CLICKED: // A button ('Remove', 'Ok', 'Cancel' or 'Apply', normally) has been clicked + case BN_CLICKED: // A button ('Remove', 'OK', 'Cancel' or 'Apply', normally) has been clicked switch(LOWORD(wParam)) { case IDC_VALIDATE: // Apply changes, if there is still one contact attached to the metacontact. if (changes.num_contacts == 0) { // Otherwise, delete the metacontact. diff --git a/plugins/New_GPG/res/new_gpg.rc b/plugins/New_GPG/res/new_gpg.rc index 452c9aff7a..82f733c77f 100644 --- a/plugins/New_GPG/res/new_gpg.rc +++ b/plugins/New_GPG/res/new_gpg.rc @@ -192,7 +192,7 @@ CAPTION "Choose which keys to export" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN GROUPBOX "Static",IDC_STATIC,7,7,267,63 - PUSHBUTTON "Ok",IDC_OK,7,71,50,14 + PUSHBUTTON "OK",IDC_OK,7,71,50,14 PUSHBUTTON "Cancel",IDC_CANCEL,224,71,50,14 CONTROL "Export public keys (only set for contacts)",IDC_PUBLIC, "Button",BS_AUTORADIOBUTTON,15,23,248,10 @@ -210,7 +210,7 @@ BEGIN EDITTEXT IDC_NEW_PASSWD2,81,50,157,14,ES_PASSWORD | ES_AUTOHSCROLL LTEXT "Current password:",IDC_STATIC,7,17,61,8 LTEXT "New password twice:",IDC_STATIC,7,32,69,8 - PUSHBUTTON "Ok",IDC_OK,7,55,50,14 + PUSHBUTTON "OK",IDC_OK,7,55,50,14 END IDD_OPT_GPG DIALOGEX 0, 0, 286, 214 diff --git a/plugins/SecureIM/res/resource.rc b/plugins/SecureIM/res/resource.rc index fd8239eac8..546e489903 100644 --- a/plugins/SecureIM/res/resource.rc +++ b/plugins/SecureIM/res/resource.rc @@ -192,7 +192,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Enter passphrase for the secret key:",IDC_STATIC,8,8,168,8 EDITTEXT IDC_PASSPHRASE,6,24,168,12,ES_PASSWORD | ES_AUTOHSCROLL - DEFPUSHBUTTON "Ok",IDOK,181,7,50,14 + DEFPUSHBUTTON "OK",IDOK,181,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,181,24,50,14 END diff --git a/plugins/SendScreenshotPlus/src/mir_icolib.cpp b/plugins/SendScreenshotPlus/src/mir_icolib.cpp index 8ac3c67e8c..2523aa196c 100644 --- a/plugins/SendScreenshotPlus/src/mir_icolib.cpp +++ b/plugins/SendScreenshotPlus/src/mir_icolib.cpp @@ -63,7 +63,7 @@ static ICODESC icoDesc[] = { ICO_PLUG_ARROWR, LPGEN("Next"), SECT_BUTTONS, IDI_PLUG_ARROWR, 0 }, { ICO_PLUG_UPDATE, LPGEN("Update"), SECT_BUTTONS, IDI_PLUG_UPDATE, 0 }, - { ICO_PLUG_OK, LPGEN("Ok"), SECT_BUTTONS, IDI_PLUG_OK, 0 }, + { ICO_PLUG_OK, LPGEN("OK"), SECT_BUTTONS, IDI_PLUG_OK, 0 }, { ICO_PLUG_CANCEL, LPGEN("Cancel"), SECT_BUTTONS, IDI_PLUG_CLOSE, 0 }, { ICO_PLUG_APPLY, LPGEN("Apply"), SECT_BUTTONS, IDI_PLUG_APPLY, 0 }, { ICO_PLUG_EDIT, LPGEN("Edit"), SECT_BUTTONS, IDI_PLUG_EDIT, 0 }, diff --git a/plugins/StatusPlugins/resource.rc b/plugins/StatusPlugins/resource.rc index e6f02e5283..7d87659a3e 100644 --- a/plugins/StatusPlugins/resource.rc +++ b/plugins/StatusPlugins/resource.rc @@ -161,7 +161,7 @@ BEGIN LTEXT "ms",IDC_STATIC,88,37,13,8 LTEXT "Set after",IDC_STATIC,26,37,28,8 EDITTEXT IDC_DLGTIMEOUT,57,86,28,14,ES_AUTOHSCROLL | ES_NUMBER - LTEXT "Timeout",IDC_STATIC,26,89,26,8 + LTEXT "Timeout",IDC_STATIC,26,89,30,8 LTEXT "s",IDC_STATIC,88,89,12,8 CONTROL "Set window location",IDC_SETWINLOCATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,209,82,80,10 EDITTEXT IDC_XPOS,209,94,30,14,ES_AUTOHSCROLL | ES_NUMBER diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc index 4ccd20ab10..97fde999a7 100644 --- a/plugins/TabSRMM/res/resource.rc +++ b/plugins/TabSRMM/res/resource.rc @@ -574,7 +574,7 @@ CAPTION "Dialog" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "",IDC_OPTIONSTAB,"SysTabControl32",0x0,2,5,323,284 - PUSHBUTTON "Ok",IDOK,124,296,71,16 + PUSHBUTTON "OK",IDOK,124,296,71,16 PUSHBUTTON "Cancel",IDCANCEL,201,296,71,16 END diff --git a/plugins/UserInfoEx/res/resource.rc b/plugins/UserInfoEx/res/resource.rc index 16c5d416a7..afba0e9cb3 100644 --- a/plugins/UserInfoEx/res/resource.rc +++ b/plugins/UserInfoEx/res/resource.rc @@ -37,7 +37,7 @@ BEGIN CONTROL "",STATIC_TREE,"SysTreeView32",TVS_LINESATROOT | TVS_SHOWSELALWAYS | TVS_NOTOOLTIPS | TVS_FULLROWSELECT | NOT WS_VISIBLE | WS_HSCROLL | WS_TABSTOP,0,25,100,189 CONTROL "&Update",BTN_UPDATE,"UInfoButtonClass",WS_DISABLED | WS_TABSTOP,4,220,65,14,WS_EX_NOACTIVATE | 0x10000000L CTEXT "Updating",TXT_UPDATING,114,222,95,8,SS_NOPREFIX | SS_CENTERIMAGE | NOT WS_VISIBLE - CONTROL "Ok",IDOK,"UInfoButtonClass",WS_TABSTOP,213,220,52,14,WS_EX_NOACTIVATE | 0x10000000L + CONTROL "OK",IDOK,"UInfoButtonClass",WS_TABSTOP,213,220,52,14,WS_EX_NOACTIVATE | 0x10000000L CONTROL "Cancel",IDCANCEL,"UInfoButtonClass",WS_TABSTOP,269,220,60,14,WS_EX_NOACTIVATE | 0x10000000L CONTROL "Apply",IDAPPLY,"UInfoButtonClass",WS_DISABLED | WS_TABSTOP,333,220,64,14,WS_EX_NOACTIVATE | 0x10000000L CONTROL "",STATIC_LINE2,"Static",SS_ETCHEDHORZ,0,214,408,1 @@ -156,7 +156,7 @@ BEGIN "Static",SS_SIMPLE | WS_GROUP,5,86,200,9 EDITTEXT EDIT_PHONE,21,96,215,12,ES_AUTOHSCROLL CONTROL "Phone can receive SMS text messages",CHECK_SMS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,112,200,10,WS_EX_TRANSPARENT - CONTROL "Ok",IDOK,"UInfoButtonClass",WS_TABSTOP,105,132,63,14,WS_EX_NOACTIVATE | 0x10000000L + CONTROL "OK",IDOK,"UInfoButtonClass",WS_TABSTOP,105,132,63,14,WS_EX_NOACTIVATE | 0x10000000L CONTROL "Cancel",IDCANCEL,"UInfoButtonClass",WS_TABSTOP,175,132,63,14,WS_EX_NOACTIVATE | 0x10000000L END @@ -173,7 +173,7 @@ BEGIN EDITTEXT EDIT_CATEGORY,9,42,190,13,ES_AUTOHSCROLL CONTROL "Enter the e-mail address here.",IDC_STATIC,"Static",SS_SIMPLE | WS_GROUP,3,64,203,8 EDITTEXT EDIT_EMAIL,9,75,190,13,ES_AUTOHSCROLL - CONTROL "Ok",IDOK,"UInfoButtonClass",WS_TABSTOP,72,101,63,14,WS_EX_NOACTIVATE | 0x10000000L + CONTROL "OK",IDOK,"UInfoButtonClass",WS_TABSTOP,72,101,63,14,WS_EX_NOACTIVATE | 0x10000000L CONTROL "Cancel",IDCANCEL,"UInfoButtonClass",WS_TABSTOP,141,101,63,14,WS_EX_NOACTIVATE | 0x10000000L END @@ -291,7 +291,7 @@ BEGIN CONTROL "Enter a name for the anniversary here please:",IDC_STATIC, "Static",SS_SIMPLE | WS_GROUP,3,31,178,8 EDITTEXT EDIT_CATEGORY,26,44,133,12,ES_AUTOHSCROLL - CONTROL "Ok",IDOK,"UInfoButtonClass",WS_TABSTOP,47,69,63,14,WS_EX_NOACTIVATE | 0x10000000L + CONTROL "OK",IDOK,"UInfoButtonClass",WS_TABSTOP,47,69,63,14,WS_EX_NOACTIVATE | 0x10000000L CONTROL "Cancel",IDCANCEL,"UInfoButtonClass",WS_TABSTOP,117,69,63,14,WS_EX_NOACTIVATE | 0x10000000L END @@ -517,7 +517,7 @@ BEGIN CONTROL "Contact Information",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,33,140,10 CONTROL "Contact History",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,48,140,10 CONTROL "",STATIC_LINE2,"Static",SS_ETCHEDHORZ,0,64,160,1 - CONTROL "Ok",IDOK,"UInfoButtonClass",WS_TABSTOP,16,70,65,14 + CONTROL "OK",IDOK,"UInfoButtonClass",WS_TABSTOP,16,70,65,14 CONTROL "Cancel",IDCANCEL,"UInfoButtonClass",WS_TABSTOP,87,70,66,14 END diff --git a/plugins/UserInfoEx/src/mir_icolib.cpp b/plugins/UserInfoEx/src/mir_icolib.cpp index 5b81b5071e..5ad36cfeba 100644 --- a/plugins/UserInfoEx/src/mir_icolib.cpp +++ b/plugins/UserInfoEx/src/mir_icolib.cpp @@ -78,7 +78,7 @@ static ICODESC icoDesc[] = { ICO_BTN_UPDATE, LPGEN("Update"), SECT_BUTTONS, IDI_BTN_UPDATE, 0 }, { ICO_BTN_IMPORT, LPGEN("Import"), SECT_BUTTONS, IDI_IMPORT, 0 }, { ICO_BTN_EXPORT, LPGEN("Export"), SECT_BUTTONS, IDI_EXPORT, 0 }, - { ICO_BTN_OK, LPGEN("Ok"), SECT_BUTTONS, IDI_BTN_OK, 0 }, + { ICO_BTN_OK, LPGEN("OK"), SECT_BUTTONS, IDI_BTN_OK, 0 }, { ICO_BTN_CANCEL, LPGEN("Cancel"), SECT_BUTTONS, IDI_BTN_CLOSE, 0 }, { ICO_BTN_APPLY, LPGEN("Apply"), SECT_BUTTONS, IDI_BTN_APPLY, 0 }, { ICO_BTN_GOTO, LPGEN("Goto"), SECT_BUTTONS, IDI_BTN_GOTO, 0 }, -- cgit v1.2.3