From 5d216c66c809e6f72951350470bca08ad77e1240 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 18 Jan 2007 12:31:23 +0000 Subject: [PATCH] NIM string tables Update the string tables for NIM so that they are consistent. Always use "Kerberos v5" or "Kerberos v4". Refer to credentials instead of tickets. Do not abbreviate "Network Identity Manager". Etc. ticket: new tags: pullup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19066 dc483132-0cff-0310-8789-dd5450dbe970 --- src/windows/identity/nidmgrdll/nidmgrdll.rc | 2 +- .../plugins/krb4/lang/en_us/langres.rc | 38 ++++---- src/windows/identity/plugins/krb4/version.rc | 4 +- .../plugins/krb5/lang/en_us/langres.rc | 86 +++++++++---------- src/windows/identity/plugins/krb5/version.rc | 4 +- src/windows/identity/ui/appver.rc | 2 +- src/windows/identity/ui/lang/en_us/khapp.rc | 34 ++++---- 7 files changed, 85 insertions(+), 85 deletions(-) diff --git a/src/windows/identity/nidmgrdll/nidmgrdll.rc b/src/windows/identity/nidmgrdll/nidmgrdll.rc index 26aeaa691..b091bdbfa 100644 --- a/src/windows/identity/nidmgrdll/nidmgrdll.rc +++ b/src/windows/identity/nidmgrdll/nidmgrdll.rc @@ -46,7 +46,7 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", KH_VERSTR_COMPANY_1033 - VALUE "FileDescription", "NetIDMgr API" + VALUE "FileDescription", "Network Identity Manager API" VALUE "FileVersion", KH_VERSION_STRING VALUE "InternalName", "nidmgr32" VALUE "LegalCopyright", KH_VERSTR_COPYRIGHT_1033 diff --git a/src/windows/identity/plugins/krb4/lang/en_us/langres.rc b/src/windows/identity/plugins/krb4/lang/en_us/langres.rc index cd46a8d9f..865f01039 100644 --- a/src/windows/identity/plugins/krb4/lang/en_us/langres.rc +++ b/src/windows/identity/plugins/krb4/lang/en_us/langres.rc @@ -57,11 +57,11 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "Kerberos 4 Ticket Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11 - CONTROL "Obtain Kerberos 4 tickets",IDC_NCK4_OBTAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,26,97,10 - GROUPBOX "Obtain Kerberos 4 tickets using",IDC_STATIC,7,43,286,72,WS_GROUP + CONTROL "Kerberos v4 Ticket Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11 + CONTROL "Obtain Kerberos v4 credentials",IDC_NCK4_OBTAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,26,97,10 + GROUPBOX "Obtain Kerberos v4 credentials using",IDC_STATIC,7,43,286,72,WS_GROUP CONTROL "Automatically determine method",IDC_NCK4_AUTO,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,23,58,119,10 - CONTROL "Kerberos 5 to 4 translation",IDC_NCK4_K524,"Button",BS_AUTORADIOBUTTON,23,76,101,10 + CONTROL "Kerberos v5 to v4 translation",IDC_NCK4_K524,"Button",BS_AUTORADIOBUTTON,23,76,101,10 CONTROL "Password",IDC_NCK4_PWD,"Button",BS_AUTORADIOBUTTON,23,94,47,10 END @@ -70,7 +70,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Ticket cache location",IDC_CFG_LBL_CACHE,7,10,67,8 + LTEXT "Credential cache location",IDC_CFG_LBL_CACHE,7,10,67,8 EDITTEXT IDC_CFG_CACHE,83,7,165,14,ES_AUTOHSCROLL LTEXT "Config file path",IDC_CFG_LBL_CFGFILE,7,30,50,8 EDITTEXT IDC_CFG_CFGPATH,83,27,165,14,ES_AUTOHSCROLL | ES_READONLY @@ -85,8 +85,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "Obtain Kerberos 4 tickets",IDC_CFG_GETTIX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,17 - LTEXT "Note that, if enabled, Kerberos 4 tickets will be acquired during initial credential acquisition and during credential renewals.\n\nHowever, currently Kerberos 4 tickets can only be obtained for the default identity.",IDC_STATIC,7,91,221,53,SS_SUNKEN + CONTROL "Obtain Kerberos v4 credentials",IDC_CFG_GETTIX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,17 + LTEXT "Note that, if enabled, Kerberos v4 credentials will be acquired during initial credential acquisition and during credential renewals.\n\nHowever, currently Kerberos v4 credentials can only be obtained for the default identity.",IDC_STATIC,7,91,221,53,SS_SUNKEN END IDD_CFG_ID_KRB4 DIALOGEX 0, 0, 235, 151 @@ -94,7 +94,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "Obtain Kerberos 4 tickets for this identity",IDC_CFG_GETTIX, + CONTROL "Obtain Kerberos v4 credentials for this identity",IDC_CFG_GETTIX, "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,7,147,10 END @@ -161,30 +161,30 @@ IDI_PLUGIN ICON "..\\..\\images\\plugin.ico" STRINGTABLE BEGIN - IDS_PLUGIN_DESC "Kerberos 4 Credentials Provider" - IDS_NC_K4_SHORT "Kerberos 4" - IDS_ERR_REALM "Could not resolve realm" + IDS_PLUGIN_DESC "Kerberos v4 Credentials Provider" + IDS_NC_K4_SHORT "Kerberos v4" + IDS_ERR_REALM "Could not resolve Kerberos v4 realm" IDS_ERR_PRINCIPAL "Invalid principal" IDS_ERR_INVINST "Invalid instance" - IDS_ERR_PWINTKT "Could not get Kerberos 4 tickets" + IDS_ERR_PWINTKT "Could not obtain Kerberos v4 credentials" IDS_CT_DISABLED "

Krb4: Disabled (click here to enable)

" - IDS_CT_TGTFOR "

Krb4: Tickets for realm %s

" + IDS_CT_TGTFOR "

Krb4: Credentials for realm %s

" IDS_METHOD_AUTO "Automatically determined method" END STRINGTABLE BEGIN - IDS_KRB4_SHORT_DESC "Kerberos 4 tickets" - IDS_KRB4_LONG_DESC "Kerberos 4 tickets" - IDS_CFG_KRB4_LONG "Kerberos 4 Configuration" - IDS_CFG_KRB4_SHORT "Kerberos 4" + IDS_KRB4_SHORT_DESC "Kerberos v4" + IDS_KRB4_LONG_DESC "Kerberos v4" + IDS_CFG_KRB4_LONG "Kerberos v4 Configuration" + IDS_CFG_KRB4_SHORT "Kerberos v4" END STRINGTABLE BEGIN IDS_METHOD_PWD "Password" - IDS_METHOD_K524 "Kerberos 5 to 4 translation" - IDS_CFG_IDS_KRB4_SHORT "Kerberos 4" + IDS_METHOD_K524 "Kerberos v5 to v4 translation" + IDS_CFG_IDS_KRB4_SHORT "Kerberos v4" END #endif // English (U.S.) resources diff --git a/src/windows/identity/plugins/krb4/version.rc b/src/windows/identity/plugins/krb4/version.rc index 90105f827..929e0d09d 100644 --- a/src/windows/identity/plugins/krb4/version.rc +++ b/src/windows/identity/plugins/krb4/version.rc @@ -28,7 +28,7 @@ #ifndef LANGVER -#define STR_FILEDESC "Kerberos 4 Plugin for NetIDMgr" +#define STR_FILEDESC "Kerberos v4 Plugin for Network Identity Manager" #define STR_INTNAME "krb4cred" #define STR_ORIGNAME "krb4cred.dll" @@ -68,7 +68,7 @@ VALUE "InternalName", STR_INTNAME VALUE "LegalCopyright", KH_VERSTR_COPYRIGHT_1033 VALUE "OriginalFilename", STR_ORIGNAME - VALUE "ProductName", "NetIDMgr" + VALUE "ProductName", "Network Identity Manager" VALUE "ProductVersion", KH_VERSTR_PRODUCT_1033 #ifdef KH_VERSTR_COMMENT_1033 VALUE "Comment", KH_VERSTR_COMMENT_1033 diff --git a/src/windows/identity/plugins/krb5/lang/en_us/langres.rc b/src/windows/identity/plugins/krb5/lang/en_us/langres.rc index fca26a1eb..d93b4415e 100644 --- a/src/windows/identity/plugins/krb5/lang/en_us/langres.rc +++ b/src/windows/identity/plugins/krb5/lang/en_us/langres.rc @@ -57,7 +57,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CL EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "Kerberos 5 Ticket Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11 + CONTROL "Kerberos v5 Credential Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11 LTEXT "Realm",IDC_STATIC,7,25,52,13 COMBOBOX IDC_NCK5_REALM,60,25,233,51,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Specify &additional realms ...",IDC_NCK5_ADD_REALMS,181,43,112,16,BS_NOTIFY | NOT WS_VISIBLE | WS_DISABLED @@ -74,14 +74,14 @@ END IDD_PP_KRB5C DIALOGEX 0, 0, 235, 156 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Kerberos 5" +CAPTION "Kerberos v5" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Name",IDC_STATIC,7,7,19,8 LTEXT "Valid till",IDC_STATIC,7,39,24,8 LTEXT "Renewable till",IDC_STATIC,7,55,45,12 LTEXT "Issued on",IDC_STATIC,7,23,32,8 - LTEXT "Ticket flags",IDC_STATIC,7,75,37,8 + LTEXT "Credential flags",IDC_STATIC,7,75,37,8 EDITTEXT IDC_PPK5_NAME,72,7,156,12,ES_AUTOHSCROLL | ES_READONLY EDITTEXT IDC_PPK5_ISSUE,72,23,156,12,ES_AUTOHSCROLL | ES_READONLY EDITTEXT IDC_PPK5_VALID,72,39,156,12,ES_AUTOHSCROLL | ES_READONLY @@ -91,7 +91,7 @@ END IDD_PP_KRB5 DIALOGEX 0, 0, 235, 156 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Kerberos 5" +CAPTION "Kerberos v5" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Default realm",IDC_STATIC,7,7,44,8 @@ -101,7 +101,7 @@ BEGIN LTEXT "Renewable lifetime",IDC_STATIC,7,67,61,8 LTEXT "Min. Renewable lifetime",IDC_STATIC,7,82,76,8 LTEXT "Max. Renewable lifetime",IDC_STATIC,7,97,79,8 - GROUPBOX "Default ticket flags",IDC_STATIC,7,113,221,36 + GROUPBOX "Default credential flags",IDC_STATIC,7,113,221,36 CONTROL "Proxiable",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,129,45,10 CONTROL "Renewable",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,129,51,10 CONTROL "Forwardable",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,129,56,10 @@ -124,18 +124,18 @@ BEGIN CONTROL "Include all configured realms in New Credentials realm list",IDC_CFG_INCREALMS, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,76,26,166,22 PUSHBUTTON "Configure Realms ...",IDC_CFG_CFGREALMS,76,46,84,14,NOT WS_VISIBLE | WS_DISABLED - GROUPBOX "Keberos Configuration File",IDC_CFG_CFGFILEGRP,7,59,241,47 + GROUPBOX "Configuration File",IDC_CFG_CFGFILEGRP,7,59,241,47 LTEXT "Location",IDC_CFG_LBL_CFGFILE,13,74,28,8 EDITTEXT IDC_CFG_CFGFILE,76,71,166,14,ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "Browse...",IDC_CFG_BROWSE,145,89,44,14,NOT WS_VISIBLE CONTROL "Create file if missing",IDC_CFG_CREATECONFIG,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,76,93,80,10 PUSHBUTTON "Load into realm editor ...",IDC_CFG_BROWSE2,26,89,100,14,NOT WS_VISIBLE - GROUPBOX "Windows® Options",IDC_CFG_WINGRP,7,110,241,65 + GROUPBOX "Microsoft Windows® Options",IDC_CFG_WINGRP,7,110,241,65 LTEXT "Hostname",IDC_CFG_LBL_HOSTNAME,13,123,33,8 EDITTEXT IDC_CFG_HOSTNAME,76,120,166,14,ES_AUTOHSCROLL | ES_READONLY LTEXT "Domain",IDC_CFG_LBL_DOMAIN,13,141,24,8 EDITTEXT IDC_CFG_DOMAIN,76,138,166,14,ES_AUTOHSCROLL | ES_READONLY - LTEXT "Import tickets",IDC_LBL_IMPORT,13,158,45,8 + LTEXT "Import credentials",IDC_LBL_IMPORT,13,158,45,8 COMBOBOX IDC_CFG_IMPORT,76,156,166,51,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -145,8 +145,8 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "",IDC_CFG_REALMS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_EDITLABELS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_TABSTOP,7,19,81,148 - GROUPBOX "Kerberos Servers",IDC_CFG_SERVERSGRP,93,7,155,91 - GROUPBOX "Domain mappings",IDC_CFG_DOMAINGRP,93,101,155,74 + GROUPBOX "Kerberos v5 Servers",IDC_CFG_SERVERSGRP,93,7,155,91 + GROUPBOX "Domain to Realm mappings",IDC_CFG_DOMAINGRP,93,101,155,74 CONTROL "",IDC_CFG_KDC,"SysListView32",LVS_REPORT | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_TABSTOP,99,19,143,72 CONTROL "",IDC_CFG_DMAP,"SysListView32",LVS_REPORT | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_TABSTOP,99,111,143,56 END @@ -156,16 +156,16 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Ticket lifetime",IDC_CFG_LBL_DEFLIFE,7,10,44,8 + LTEXT "Credential lifetime",IDC_CFG_LBL_DEFLIFE,7,10,44,8 EDITTEXT IDC_CFG_DEFLIFE,91,7,137,14,ES_AUTOHSCROLL - LTEXT "Ticket renewable lifetime",IDC_CFG_LBL_DEFRLIFE,7,29,80,8 + LTEXT "Credential renewable lifetime",IDC_CFG_LBL_DEFRLIFE,7,29,80,8 EDITTEXT IDC_CFG_DEFRLIFE,91,26,137,14,ES_AUTOHSCROLL - GROUPBOX "Ticket lifetime range",IDC_CFG_LIFEGRP,7,43,221,49 + GROUPBOX "Credential lifetime range",IDC_CFG_LIFEGRP,7,43,221,49 LTEXT "Minimum",IDC_STATIC,13,56,28,8 EDITTEXT IDC_CFG_LRNG_MIN,91,53,131,14,ES_AUTOHSCROLL LTEXT "Maximum",IDC_STATIC,13,75,30,8 EDITTEXT IDC_CFG_LRNG_MAX,91,72,131,14,ES_AUTOHSCROLL - GROUPBOX "Ticket renewable lifetime range",IDC_STATIC,7,95,221,49 + GROUPBOX "Credential renewable lifetime range",IDC_STATIC,7,95,221,49 LTEXT "Minimum",IDC_STATIC,13,108,28,8 EDITTEXT IDC_CFG_RLRNG_MIN,91,105,131,14,ES_AUTOHSCROLL LTEXT "Maximum",IDC_STATIC,13,128,30,8 @@ -177,7 +177,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Ticket lifetime",IDC_CFG_LBL_DEFLIFE,7,10,44,8 + LTEXT "Credential lifetime",IDC_CFG_LBL_DEFLIFE,7,10,44,8 EDITTEXT IDC_CFG_DEFLIFE,91,7,137,14,ES_AUTOHSCROLL CONTROL "Renewable for",IDC_CFG_RENEW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,41,63,10 EDITTEXT IDC_CFG_DEFRLIFE,91,39,137,14,ES_AUTOHSCROLL @@ -186,7 +186,7 @@ BEGIN CONTROL "Addressless",IDC_CFG_ADDRESSLESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,77,54,10 LTEXT "Additional IP address",IDC_STATIC,91,78,68,8,NOT WS_VISIBLE CONTROL "",IDC_CFG_PUBLICIP,"SysIPAddress32",NOT WS_VISIBLE | WS_TABSTOP,128,89,100,15 - LTEXT "Credentials cache",IDC_STATIC,7,132,58,8 + LTEXT "Credential cache",IDC_STATIC,7,132,58,8 EDITTEXT IDC_CFG_CCACHE,91,130,137,14,ES_AUTOHSCROLL END @@ -195,7 +195,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "Kerberos 5 Change Password Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11 + CONTROL "Kerberos v5 Change Password Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11 LTEXT "Realm",IDC_STATIC,7,25,52,13 COMBOBOX IDC_NCK5_REALM,60,25,233,51,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Specify &additional realms ...",IDC_NCK5_ADD_REALMS,181,43,112,16,BS_NOTIFY | WS_DISABLED @@ -206,7 +206,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - GROUPBOX "File Caches",IDC_CFG_FCGRP,7,26,241,149 + GROUPBOX "File-based Credential Caches",IDC_CFG_FCGRP,7,26,241,149 CONTROL "",IDC_CFG_FCLIST,"SysListView32",LVS_REPORT | LVS_SORTASCENDING | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,13,37,229,97 EDITTEXT IDC_CFG_FCNAME,13,139,173,14,ES_AUTOHSCROLL PUSHBUTTON "&Browse ...",IDC_CFG_BROWSE,192,139,50,14 @@ -339,11 +339,11 @@ STRINGTABLE BEGIN IDS_UNK_ADDR_FMT "Unknown address type %d" IDS_KRB5_CREDTEXT_0 "

Krb5: Creds for realm %s

" - IDS_KRB5_CCNAME_SHORT_DESC "Krb5 CCache" - IDS_KEY_ENCTYPE_SHORT_DESC "Key EncType" - IDS_TKT_ENCTYPE_SHORT_DESC "Ticket EncType" + IDS_KRB5_CCNAME_SHORT_DESC "Kerberos v5 CCache" + IDS_KEY_ENCTYPE_SHORT_DESC "Session EncType" + IDS_TKT_ENCTYPE_SHORT_DESC "Service EncType" IDS_KEY_ENCTYPE_LONG_DESC "Session Key Encryption Type" - IDS_TKT_ENCTYPE_LONG_DESC "Ticket Encryption Type" + IDS_TKT_ENCTYPE_LONG_DESC "Service Encryption Type" IDS_ADDR_LIST_SHORT_DESC "Addresses" IDS_ADDR_LIST_LONG_DESC "Address List" IDS_ETYPE_NULL "NULL" @@ -366,53 +366,53 @@ BEGIN IDS_ETYPE_UNKNOWN "(Unknown)" IDS_ETYPE_LOCAL_DES3_HMAC_SHA1 "LOCAL-DES3-HMAC-SHA1" IDS_ETYPE_LOCAL_RC4_MD4 "LOCAL-RC4-MD4" - IDS_KRB5_SHORT_DESC "Kerberos 5 tickets" - IDS_KRB5_LONG_DESC "Kerberos 5 tickets" + IDS_KRB5_SHORT_DESC "Kerberos v5 credentials" + IDS_KRB5_LONG_DESC "Kerberos v5 credentials" END STRINGTABLE BEGIN - IDS_KRB4_SHORT_DESC "Kerberos 4" - IDS_KRB4_LONG_DESC "Kerberos 4 tickets" - IDS_KRB5_FLAGS_SHORT_DESC "Krb5 Flags" + IDS_KRB4_SHORT_DESC "Kerberos v4" + IDS_KRB4_LONG_DESC "Kerberos v4 credentials" + IDS_KRB5_FLAGS_SHORT_DESC "Kerberos v5 Flags" IDS_RENEW_TILL_SHORT_DESC "Renew Till" IDS_RENEW_TILL_LONG_DESC "Renewable Till" IDS_RENEW_FOR_SHORT_DESC "Renew for" IDS_RENEW_FOR_LONG_DESC "Renewable for" - IDS_KRB5_CCNAME_LONG_DESC "Krb5 Primary Credentials Cache" + IDS_KRB5_CCNAME_LONG_DESC "Kerberos v5 Primary Credentials Cache" IDS_NC_USERNAME "Username" IDS_NC_REALM "Realm" - IDS_KRB5_WARNING "Kerberos 5 Warning" + IDS_KRB5_WARNING "Kerberos v5 Warning" IDS_K5ERR_NAME_EXPIRED "

Krb5: The selected principal name has expired.

Please contact your system administrator.

" IDS_K5ERR_KEY_EXPIRED "

Krb5: The password for the selected identity has expired.

Click here to change the password

" - IDS_KRB5_WARN_FMT "Kerberos 5: %s\n\n%s" + IDS_KRB5_WARN_FMT "Kerberos v5: %s\n\n%s" IDS_K5ERR_FMT "

Krb5: %s

" - IDS_K5CFG_SHORT_DESC "Kerberos 5" + IDS_K5CFG_SHORT_DESC "Kerberos v5" END STRINGTABLE BEGIN - IDS_K5CFG_LONG_DESC "Kerberos 5 Configuration" + IDS_K5CFG_LONG_DESC "Kerberos v5 Configuration" IDS_K5RLM_SHORT_DESC "Realms" IDS_K5RLM_LONG_DESC "Kerberos Realm Configuration" - IDS_K5CFG_IDS_SHORT_DESC "Kerberos 5" - IDS_K5CFG_IDS_LONG_DESC "Kerberos 5 options for all identities" - IDS_K5CFG_ID_SHORT_DESC "Kerberos 5" - IDS_K5CFG_ID_LONG_DESC "Kerberos 5 options for this identity" - IDS_PLUGIN_DESC "Kerberos 5 Credentials Provider" - IDS_NC_PWD_BANNER "Changing Kerberos 5 Password" + IDS_K5CFG_IDS_SHORT_DESC "Kerberos v5" + IDS_K5CFG_IDS_LONG_DESC "Kerberos v5 options for all identities" + IDS_K5CFG_ID_SHORT_DESC "Kerberos v5" + IDS_K5CFG_ID_LONG_DESC "Kerberos v5 options for this identity" + IDS_PLUGIN_DESC "Kerberos v5 Credentials Provider" + IDS_NC_PWD_BANNER "Changing Kerberos v5 Password" IDS_NC_PWD_PWD "Current Password" IDS_NC_PWD_NPWD "New Password" IDS_NC_PWD_NPWD_AGAIN "New Password again" IDS_KRB5_CREDTEXT_P0 "

Krb5: Changing password for %s

" IDS_K5CFG_IMPORT_OPTIONS "Never,Always,Only when the principal matches" - IDS_IDENTPRO_DESC "Kerberos 5 Identity Provider" - IDS_K5CCC_SHORT_DESC "Credentials Caches" + IDS_IDENTPRO_DESC "Kerberos v5 Identity Provider" + IDS_K5CCC_SHORT_DESC "Credential Caches" END STRINGTABLE BEGIN - IDS_K5CCC_LONG_DESC "Kerberos 5 Credentials Caches" + IDS_K5CCC_LONG_DESC "Kerberos v5 Credential Caches" IDS_CFG_FCTITLE "File based Credential Caches" IDS_CFG_FCN_WARNING "Warning:" IDS_CFG_FCN_W_NOTFOUND "The credentials cache you specified does not exist." @@ -438,7 +438,7 @@ BEGIN IDS_FLG_OK_DELEGATE "Approved for delegation" IDS_FLG_ANONYMOUS "Anonymous" IDS_K5ERR_CANTWRITEPROFILE - "The Kerberos 5 profile file could not be written" + "The Kerberos v5 profile file could not be written" IDS_K5ERR_PROFNOWRITE "The file %s could not be opened as a profile file for writing." IDS_K5ERR_PROFUSETEMP "The file %s could not be opened for writing. The current changes will be saved to %s temporarily." IDS_K5ERR_PROFSUGGEST "This may be due to not having privileges to modify the configuration file. Please contact your system administrator to resolve the issue." @@ -460,7 +460,7 @@ BEGIN IDS_NO "No" IDS_CFG_RE_NEWSERVER "" IDS_CFG_RE_NEWDMAP "" - IDS_KRB5_NC_NAME "Kerberos 5" + IDS_KRB5_NC_NAME "Kerberos v5" IDS_NCERR_IDENT_TOO_LONG "The identity name is too long." IDS_NCERR_IDENT_INVALID "The identity name is invalid." IDS_NCERR_IDENT_UNKNOWN "An unknown error occurred while validating the identity name." diff --git a/src/windows/identity/plugins/krb5/version.rc b/src/windows/identity/plugins/krb5/version.rc index ec58aa90b..135b08e25 100644 --- a/src/windows/identity/plugins/krb5/version.rc +++ b/src/windows/identity/plugins/krb5/version.rc @@ -28,7 +28,7 @@ #ifndef LANGVER -#define STR_FILEDESC "Kerberos 5 Plugin for NetIDMgr" +#define STR_FILEDESC "Kerberos v5 Plugin for Network Identity Manager" #define STR_INTNAME "krb5cred" #define STR_ORIGNAME "krb5cred.dll" @@ -67,7 +67,7 @@ VALUE "InternalName", STR_INTNAME VALUE "LegalCopyright", KH_VERSTR_COPYRIGHT_1033 VALUE "OriginalFilename", STR_ORIGNAME - VALUE "ProductName", "NetIDMgr" + VALUE "ProductName", "Network Identity Manager" VALUE "ProductVersion", KH_VERSTR_PRODUCT_1033 #ifdef KH_VERSTR_COMMENT_1033 VALUE "Comment", KH_VERSTR_COMMENT_1033 diff --git a/src/windows/identity/ui/appver.rc b/src/windows/identity/ui/appver.rc index 9d2dbc4eb..58a69a472 100644 --- a/src/windows/identity/ui/appver.rc +++ b/src/windows/identity/ui/appver.rc @@ -26,7 +26,7 @@ BEGIN VALUE "InternalName", "NetIDMgr" VALUE "LegalCopyright", KH_VERSTR_COPYRIGHT_1033 VALUE "OriginalFilename", "netidmgr.exe" - VALUE "ProductName", "NetIDMgr" + VALUE "ProductName", "Network Identity Manager" VALUE "ProductVersion", KH_VERSTR_PRODUCT_1033 #ifdef KH_VERSTR_COMMENT_1033 VALUE "Comment", KH_VERSTR_COMMENT_1033 diff --git a/src/windows/identity/ui/lang/en_us/khapp.rc b/src/windows/identity/ui/lang/en_us/khapp.rc index 48f577684..96e8de6a5 100644 --- a/src/windows/identity/ui/lang/en_us/khapp.rc +++ b/src/windows/identity/ui/lang/en_us/khapp.rc @@ -225,7 +225,7 @@ END IDD_CFG_MAIN DIALOGEX 0, 0, 357, 222 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_CONTEXTHELP -CAPTION "NetIDMgr Configuration" +CAPTION "Network Identity Manager Configuration" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Title",IDC_CFG_TITLE,0,0,357,20,SS_CENTERIMAGE @@ -252,11 +252,11 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,22,196,10 CONTROL "&Destroy all credentials on exit",IDC_CFG_DESTROYALL, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,39,111,10 - CONTROL "&Start NetIDMgr during Windows logon",IDC_CFG_AUTOSTART, + CONTROL "&Start Network Identity Manager during Windows logon",IDC_CFG_AUTOSTART, "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,16,48,135,10 GROUPBOX "Other",IDC_CFG_OTHER,7,63,241,85 - CONTROL "&Run NetIDMgr in system tray after window close",IDC_CFG_KEEPRUNNING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,78,170,10 + CONTROL "&Run Network Identity Manager in system tray after window close",IDC_CFG_KEEPRUNNING, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,78,230,10 CONTROL "Monitor network connectivity",IDC_CFG_NETDETECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,96,106,10 CONTROL "Log trace events to trace log at the following location:",IDC_CFG_LOGTOFILE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,113,225,10 @@ -356,7 +356,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "OK",IDOK,211,7,50,14 LTEXT "Productname",IDC_PRODUCT,41,7,163,13,NOT WS_GROUP - LTEXT "© 2005-2006 Massachusetts Institute of Technology\n© 2006 Secure Endpoints Inc.",IDC_COPYRIGHT,41,23,220,18,NOT WS_GROUP + LTEXT "© 2005-2007 Massachusetts Institute of Technology\n© 2006-2007 Secure Endpoints Inc.",IDC_COPYRIGHT,41,23,220,18,NOT WS_GROUP LTEXT "BuildInfo",IDC_BUILDINFO,41,43,220,15,NOT WS_GROUP ICON IDI_MAIN_APP,IDC_STATIC,6,7,20,20 CONTROL "",IDC_MODULES,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,41,72,220,91 @@ -588,7 +588,7 @@ BEGIN IDS_ACTION_HELP_CTX "Help Index" IDS_ACTION_HELP_CONTENTS "Contents ..." IDS_ACTION_HELP_INDEX "Index ..." - IDS_ACTION_HELP_ABOUT "About NetIDMgr ..." + IDS_ACTION_HELP_ABOUT "About Network Identity Manager ..." IDS_CFG_GENERAL_LONG "General options" IDS_SAMPLE_STRING "Wxy" IDS_NO_CREDS "
You currently have no credentials.Click here to obtain new credentials.
" @@ -610,7 +610,7 @@ BEGIN IDS_ACTION_DESTROY_CRED "De&stroy credentials ..." IDS_DEFAULT_FONT "MS Shell Dlg" IDS_NC_CREDTEXT_TABS "" - IDS_NOTIFY_PREFIX "NetIDMgr - " + IDS_NOTIFY_PREFIX "Network Identity Manager - " IDS_NOTIFY_READY "Ready" IDS_NOTIFY_ATTENTION "Attention" IDS_ALERT_DEFAULT "Alert" @@ -629,7 +629,7 @@ BEGIN IDS_PROP_COL_VALUE "Value" IDS_NC_NEW_IDENT "( New identity ... )" IDS_NC_CREDTEXT_ID_CHECKING "%s (Checking...)" - IDS_ACTION_OPEN_APP "Open NetIDMgr ..." + IDS_ACTION_OPEN_APP "Open Network Identity Manager ..." IDS_CTX_NEW_IDENT "Obaining new identity" IDS_CTX_NEW_CREDS "Obtaining new credentials" IDS_CTX_RENEW_CREDS "Renewing credentials" @@ -640,7 +640,7 @@ STRINGTABLE BEGIN IDS_CTX_PROC_NEW_CREDS "Obtaining new credentials for %1!s!" IDS_CTX_PROC_RENEW_CREDS "Renewing credentials for %1!s!" - IDS_ACTION_CLOSE_APP "Close NetIDMgr window" + IDS_ACTION_CLOSE_APP "Close Network Identity Manager window" IDS_NC_FAILED_TITLE "Failed to acquire credentials" IDS_CFG_IDENTITIES_SHORT "Identities" IDS_CFG_IDENTITIES_LONG "Global Identity settings" @@ -661,8 +661,8 @@ BEGIN IDS_WARN_EXPIRED "Some of your credentials have expired." IDS_WARN_EXPIRE_ID "Credentials for %.180s will expire in %s" IDS_WARN_EXPIRED_ID "Credentials for %.220s have expired" - IDS_WARN_WM_TITLE "NetIDMgr is still running" - IDS_WARN_WM_MSG "Click the NetIDMgr icon below to open the application.\n\nOr right click the icon to access the NetIDMgr menu." + IDS_WARN_WM_TITLE "Network Identity Manager is still running" + IDS_WARN_WM_MSG "Click the Network Identity Manager icon below to open the application.\n\nOr right click the icon to access the Network Identity Manager menu." IDS_CFG_ID_TAB_SHORT "General" IDS_CFG_ID_TAB_LONG "General options for this identity" IDS_CFG_IDS_TAB_SHORT "General" @@ -691,7 +691,7 @@ BEGIN IDS_WTPOST_PASSWORD " - Changing password" IDS_CTX_PROC_PASSWORD "Changing password for %1!s!" IDS_NC_PWD_FAILED_TITLE "Failed to change password" - IDS_CMDLINE_HELP "Command line options for NetIDMgr are :\n\n-a or --autoinit: Auto initialize credentials\n-i or --kinit: Obtain new credentials\n-d or --destroy: Destroy default identity\n-r or --renew: Renew all credentials" + IDS_CMDLINE_HELP "Command line options for Network Identity Manager are :\n\n-a or --autoinit: Auto initialize credentials\n-i or --kinit: Obtain new credentials\n-d or --destroy: Destroy default identity\n-r or --renew: Renew all credentials" IDS_PACTION_NEXT "Next alert..." IDS_ERR_TITLE_NO_IDENTPRO "Cannot proceed without identity provider" END @@ -724,15 +724,15 @@ BEGIN IDS_CFG_IT_NONE "No changes" IDS_CFG_NODESC "(Description for plugin %s is not available)" IDS_CFG_P_DELCNFT "About to disable plugin %s" - IDS_CFG_P_DELCNFM "Are you sure you want to disable plugin %s ?\n\nOnce disabled, the services provided by the plugin will no longer be available. In addition, any other plugins that depend on this plugin will also become non functional.\n\nNetIDMgr will need to be restarted for the plugin to be deactivated." + IDS_CFG_P_DELCNFM "Are you sure you want to disable plugin %s ?\n\nOnce disabled, the services provided by the plugin will no longer be available. In addition, any other plugins that depend on this plugin will also become non functional.\n\nNetwork Identity Manager will need to be restarted for the plugin to be deactivated." IDS_CFG_P_DELCNFS "The following plugins depend on this plugin : %s" IDS_CFG_P_DELNDEP "No other plugins depend on this plugin." IDS_CFG_P_ENBCNFT "About to enable plugin %s" - IDS_CFG_P_ENBCNFM "The plugin %s will be marked as enabled. The plugin will be come active the next time NetIDMgr is started." + IDS_CFG_P_ENBCNFM "The plugin %s will be marked as enabled. The plugin will be come active the next time Network Identity Manager is started." IDS_PISTATE_FAILINIT "Failed to initialize" IDS_CFG_P_UNRCNFT "Unregistering plugin %s" - IDS_CFG_P_UNRCNFM "Are you sure you want to unregister plugin %s? In addition to this plugin, any other plugins that are provided by the same module will also be unregistered.\n\nThe plugin will no longer be loaded for subsequent sessions of NetIDMgr." - IDS_CFG_P_UNRCNFS "Note that if the plugin was registered by a seprate installer, it should be unregistered by the same installer and not through NetIDMgr.\n\nThe following plugins will be unregistered: %s" + IDS_CFG_P_UNRCNFM "Are you sure you want to unregister plugin %s? In addition to this plugin, any other plugins that are provided by the same module will also be unregistered.\n\nThe plugin will no longer be loaded for subsequent sessions of Network Identity Manager." + IDS_CFG_P_UNRCNFS "Note that if the plugin was registered by a seprate installer, it should be unregistered by the same installer and not through Network Identity Manager.\n\nThe following plugins will be unregistered: %s" IDS_ACTION_LAYOUT_CUST "Custom" IDS_APR_HEADER_TEXT "Header text" END @@ -768,7 +768,7 @@ BEGIN IDS_ACTIONT_VIEW_REFRESH "Re-obtain information about credentials and refresh the credentials display" IDS_ACTIONT_OPT_IDENTS "Change options for identities" - IDS_ACTIONT_OPT_KHIM "Change general application settings for NetIDMgr" + IDS_ACTIONT_OPT_KHIM "Change general application settings for Network Identity Manager" IDS_ACTIONT_OPT_NOTIF "Change notification options" IDS_ACTIONT_OPT_PLUGINS "Change options for plug-ins and modules" IDS_ACTIONT_OPT_APPEAR "Change appearance and display settings" -- 2.26.2