NIM string tables
authorJeffrey Altman <jaltman@secure-endpoints.com>
Thu, 18 Jan 2007 12:31:23 +0000 (12:31 +0000)
committerJeffrey Altman <jaltman@secure-endpoints.com>
Thu, 18 Jan 2007 12:31:23 +0000 (12:31 +0000)
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
src/windows/identity/plugins/krb4/lang/en_us/langres.rc
src/windows/identity/plugins/krb4/version.rc
src/windows/identity/plugins/krb5/lang/en_us/langres.rc
src/windows/identity/plugins/krb5/version.rc
src/windows/identity/ui/appver.rc
src/windows/identity/ui/lang/en_us/khapp.rc

index 26aeaa691124c3f8edcab068ff1a4f2237d736c4..b091bdbfa6bf12cbcb3a59adf9b03e1731db9cc2 100644 (file)
@@ -46,7 +46,7 @@ BEGIN
         BLOCK "040904b0"\r
         BEGIN\r
             VALUE "CompanyName", KH_VERSTR_COMPANY_1033\r
-            VALUE "FileDescription", "NetIDMgr API"\r
+            VALUE "FileDescription", "Network Identity Manager API"\r
             VALUE "FileVersion", KH_VERSION_STRING\r
             VALUE "InternalName", "nidmgr32"\r
             VALUE "LegalCopyright", KH_VERSTR_COPYRIGHT_1033\r
index cd46a8d9fd8cc2e0e093c3adc5fb0c8fd53ba65a..865f01039d74834070403091fac0b529c7faed0b 100644 (file)
@@ -57,11 +57,11 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT\r
 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
 BEGIN\r
-    CONTROL         "Kerberos 4 Ticket Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11\r
-    CONTROL         "Obtain Kerberos 4 tickets",IDC_NCK4_OBTAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,26,97,10\r
-    GROUPBOX        "Obtain Kerberos 4 tickets using",IDC_STATIC,7,43,286,72,WS_GROUP\r
+    CONTROL         "Kerberos v4 Ticket Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11\r
+    CONTROL         "Obtain Kerberos v4 credentials",IDC_NCK4_OBTAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,26,97,10\r
+    GROUPBOX        "Obtain Kerberos v4 credentials using",IDC_STATIC,7,43,286,72,WS_GROUP\r
     CONTROL         "Automatically determine method",IDC_NCK4_AUTO,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,23,58,119,10\r
-    CONTROL         "Kerberos 5 to 4 translation",IDC_NCK4_K524,"Button",BS_AUTORADIOBUTTON,23,76,101,10\r
+    CONTROL         "Kerberos v5 to v4 translation",IDC_NCK4_K524,"Button",BS_AUTORADIOBUTTON,23,76,101,10\r
     CONTROL         "Password",IDC_NCK4_PWD,"Button",BS_AUTORADIOBUTTON,23,94,47,10\r
 END\r
 \r
@@ -70,7 +70,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT\r
 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
 BEGIN\r
-    LTEXT           "Ticket cache location",IDC_CFG_LBL_CACHE,7,10,67,8\r
+    LTEXT           "Credential cache location",IDC_CFG_LBL_CACHE,7,10,67,8\r
     EDITTEXT        IDC_CFG_CACHE,83,7,165,14,ES_AUTOHSCROLL\r
     LTEXT           "Config file path",IDC_CFG_LBL_CFGFILE,7,30,50,8\r
     EDITTEXT        IDC_CFG_CFGPATH,83,27,165,14,ES_AUTOHSCROLL | ES_READONLY\r
@@ -85,8 +85,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT\r
 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
 BEGIN\r
-    CONTROL         "Obtain Kerberos 4 tickets",IDC_CFG_GETTIX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,17\r
-    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\r
+    CONTROL         "Obtain Kerberos v4 credentials",IDC_CFG_GETTIX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,221,17\r
+    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\r
 END\r
 \r
 IDD_CFG_ID_KRB4 DIALOGEX 0, 0, 235, 151\r
@@ -94,7 +94,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT\r
 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
 BEGIN\r
-    CONTROL         "Obtain Kerberos 4 tickets for this identity",IDC_CFG_GETTIX,\r
+    CONTROL         "Obtain Kerberos v4 credentials for this identity",IDC_CFG_GETTIX,\r
                     "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,7,147,10\r
 END\r
 \r
@@ -161,30 +161,30 @@ IDI_PLUGIN              ICON                    "..\\..\\images\\plugin.ico"
 \r
 STRINGTABLE \r
 BEGIN\r
-    IDS_PLUGIN_DESC         "Kerberos 4 Credentials Provider"\r
-    IDS_NC_K4_SHORT         "Kerberos 4"\r
-    IDS_ERR_REALM           "Could not resolve realm"\r
+    IDS_PLUGIN_DESC         "Kerberos v4 Credentials Provider"\r
+    IDS_NC_K4_SHORT         "Kerberos v4"\r
+    IDS_ERR_REALM           "Could not resolve Kerberos v4 realm"\r
     IDS_ERR_PRINCIPAL       "Invalid principal"\r
     IDS_ERR_INVINST         "Invalid instance"\r
-    IDS_ERR_PWINTKT         "Could not get Kerberos 4 tickets"\r
+    IDS_ERR_PWINTKT         "Could not obtain Kerberos v4 credentials"\r
     IDS_CT_DISABLED         "<p><a id=""SwitchPanel"" param=""Krb4Cred""><b>Krb4</b></a><tab>: Disabled  (click <a id=""Krb4Cred:Enable"">here</a> to enable)</p>"\r
-    IDS_CT_TGTFOR           "<p><a id=""SwitchPanel"" param=""Krb4Cred""><b>Krb4</b></a><tab>: Tickets for realm %s</p>"\r
+    IDS_CT_TGTFOR           "<p><a id=""SwitchPanel"" param=""Krb4Cred""><b>Krb4</b></a><tab>: Credentials for realm %s</p>"\r
     IDS_METHOD_AUTO         "Automatically determined method"\r
 END\r
 \r
 STRINGTABLE \r
 BEGIN\r
-    IDS_KRB4_SHORT_DESC     "Kerberos 4 tickets"\r
-    IDS_KRB4_LONG_DESC      "Kerberos 4 tickets"\r
-    IDS_CFG_KRB4_LONG       "Kerberos 4 Configuration"\r
-    IDS_CFG_KRB4_SHORT      "Kerberos 4"\r
+    IDS_KRB4_SHORT_DESC     "Kerberos v4"\r
+    IDS_KRB4_LONG_DESC      "Kerberos v4"\r
+    IDS_CFG_KRB4_LONG       "Kerberos v4 Configuration"\r
+    IDS_CFG_KRB4_SHORT      "Kerberos v4"\r
 END\r
 \r
 STRINGTABLE \r
 BEGIN\r
     IDS_METHOD_PWD          "Password"\r
-    IDS_METHOD_K524         "Kerberos 5 to 4 translation"\r
-    IDS_CFG_IDS_KRB4_SHORT  "Kerberos 4"\r
+    IDS_METHOD_K524         "Kerberos v5 to v4 translation"\r
+    IDS_CFG_IDS_KRB4_SHORT  "Kerberos v4"\r
 END\r
 \r
 #endif    // English (U.S.) resources\r
index 90105f82727416b64e2ab9a6f388a8161bfcfadb..929e0d09dd8a84bef120443e1af503c5fa06c514 100644 (file)
@@ -28,7 +28,7 @@
 \r
 #ifndef LANGVER\r
 \r
-#define STR_FILEDESC "Kerberos 4 Plugin for NetIDMgr"\r
+#define STR_FILEDESC "Kerberos v4 Plugin for Network Identity Manager"\r
 #define STR_INTNAME  "krb4cred"\r
 #define STR_ORIGNAME "krb4cred.dll"\r
 \r
@@ -68,7 +68,7 @@
         VALUE "InternalName",    STR_INTNAME\r
         VALUE "LegalCopyright",  KH_VERSTR_COPYRIGHT_1033\r
         VALUE "OriginalFilename", STR_ORIGNAME\r
-        VALUE "ProductName",     "NetIDMgr"\r
+        VALUE "ProductName",     "Network Identity Manager"\r
         VALUE "ProductVersion",  KH_VERSTR_PRODUCT_1033\r
 #ifdef KH_VERSTR_COMMENT_1033\r
         VALUE "Comment", KH_VERSTR_COMMENT_1033\r
index fca26a1eba0a5ee4d87d79080c0143c986ab7e5a..d93b4415e480e4d9e9beeb6d54d90c3c0465ff63 100644 (file)
@@ -57,7 +57,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CL
 EXSTYLE WS_EX_CONTROLPARENT\r
 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
 BEGIN\r
-    CONTROL         "Kerberos 5 Ticket Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11\r
+    CONTROL         "Kerberos v5 Credential Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11\r
     LTEXT           "Realm",IDC_STATIC,7,25,52,13\r
     COMBOBOX        IDC_NCK5_REALM,60,25,233,51,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
     PUSHBUTTON      "Specify &additional realms ...",IDC_NCK5_ADD_REALMS,181,43,112,16,BS_NOTIFY | NOT WS_VISIBLE | WS_DISABLED\r
@@ -74,14 +74,14 @@ END
 \r
 IDD_PP_KRB5C DIALOGEX 0, 0, 235, 156\r
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-CAPTION "Kerberos 5"\r
+CAPTION "Kerberos v5"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x0\r
 BEGIN\r
     LTEXT           "Name",IDC_STATIC,7,7,19,8\r
     LTEXT           "Valid till",IDC_STATIC,7,39,24,8\r
     LTEXT           "Renewable till",IDC_STATIC,7,55,45,12\r
     LTEXT           "Issued on",IDC_STATIC,7,23,32,8\r
-    LTEXT           "Ticket flags",IDC_STATIC,7,75,37,8\r
+    LTEXT           "Credential flags",IDC_STATIC,7,75,37,8\r
     EDITTEXT        IDC_PPK5_NAME,72,7,156,12,ES_AUTOHSCROLL | ES_READONLY\r
     EDITTEXT        IDC_PPK5_ISSUE,72,23,156,12,ES_AUTOHSCROLL | ES_READONLY\r
     EDITTEXT        IDC_PPK5_VALID,72,39,156,12,ES_AUTOHSCROLL | ES_READONLY\r
@@ -91,7 +91,7 @@ END
 \r
 IDD_PP_KRB5 DIALOGEX 0, 0, 235, 156\r
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION\r
-CAPTION "Kerberos 5"\r
+CAPTION "Kerberos v5"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x0\r
 BEGIN\r
     LTEXT           "Default realm",IDC_STATIC,7,7,44,8\r
@@ -101,7 +101,7 @@ BEGIN
     LTEXT           "Renewable lifetime",IDC_STATIC,7,67,61,8\r
     LTEXT           "Min. Renewable lifetime",IDC_STATIC,7,82,76,8\r
     LTEXT           "Max. Renewable lifetime",IDC_STATIC,7,97,79,8\r
-    GROUPBOX        "Default ticket flags",IDC_STATIC,7,113,221,36\r
+    GROUPBOX        "Default credential flags",IDC_STATIC,7,113,221,36\r
     CONTROL         "Proxiable",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,129,45,10\r
     CONTROL         "Renewable",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,129,51,10\r
     CONTROL         "Forwardable",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,129,56,10\r
@@ -124,18 +124,18 @@ BEGIN
     CONTROL         "Include all configured realms in New Credentials realm list",IDC_CFG_INCREALMS,\r
                     "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,76,26,166,22\r
     PUSHBUTTON      "Configure Realms ...",IDC_CFG_CFGREALMS,76,46,84,14,NOT WS_VISIBLE | WS_DISABLED\r
-    GROUPBOX        "Keberos Configuration File",IDC_CFG_CFGFILEGRP,7,59,241,47\r
+    GROUPBOX        "Configuration File",IDC_CFG_CFGFILEGRP,7,59,241,47\r
     LTEXT           "Location",IDC_CFG_LBL_CFGFILE,13,74,28,8\r
     EDITTEXT        IDC_CFG_CFGFILE,76,71,166,14,ES_AUTOHSCROLL | ES_READONLY\r
     PUSHBUTTON      "Browse...",IDC_CFG_BROWSE,145,89,44,14,NOT WS_VISIBLE\r
     CONTROL         "Create file if missing",IDC_CFG_CREATECONFIG,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,76,93,80,10\r
     PUSHBUTTON      "Load into realm editor ...",IDC_CFG_BROWSE2,26,89,100,14,NOT WS_VISIBLE\r
-    GROUPBOX        "Windows® Options",IDC_CFG_WINGRP,7,110,241,65\r
+    GROUPBOX        "Microsoft Windows® Options",IDC_CFG_WINGRP,7,110,241,65\r
     LTEXT           "Hostname",IDC_CFG_LBL_HOSTNAME,13,123,33,8\r
     EDITTEXT        IDC_CFG_HOSTNAME,76,120,166,14,ES_AUTOHSCROLL | ES_READONLY\r
     LTEXT           "Domain",IDC_CFG_LBL_DOMAIN,13,141,24,8\r
     EDITTEXT        IDC_CFG_DOMAIN,76,138,166,14,ES_AUTOHSCROLL | ES_READONLY\r
-    LTEXT           "Import tickets",IDC_LBL_IMPORT,13,158,45,8\r
+    LTEXT           "Import credentials",IDC_LBL_IMPORT,13,158,45,8\r
     COMBOBOX        IDC_CFG_IMPORT,76,156,166,51,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP\r
 END\r
 \r
@@ -145,8 +145,8 @@ EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
 BEGIN\r
     CONTROL         "",IDC_CFG_REALMS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_EDITLABELS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_TABSTOP,7,19,81,148\r
-    GROUPBOX        "Kerberos Servers",IDC_CFG_SERVERSGRP,93,7,155,91\r
-    GROUPBOX        "Domain mappings",IDC_CFG_DOMAINGRP,93,101,155,74\r
+    GROUPBOX        "Kerberos v5 Servers",IDC_CFG_SERVERSGRP,93,7,155,91\r
+    GROUPBOX        "Domain to Realm mappings",IDC_CFG_DOMAINGRP,93,101,155,74\r
     CONTROL         "",IDC_CFG_KDC,"SysListView32",LVS_REPORT | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_TABSTOP,99,19,143,72\r
     CONTROL         "",IDC_CFG_DMAP,"SysListView32",LVS_REPORT | LVS_EDITLABELS | LVS_ALIGNLEFT | WS_TABSTOP,99,111,143,56\r
 END\r
@@ -156,16 +156,16 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT\r
 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
 BEGIN\r
-    LTEXT           "Ticket lifetime",IDC_CFG_LBL_DEFLIFE,7,10,44,8\r
+    LTEXT           "Credential lifetime",IDC_CFG_LBL_DEFLIFE,7,10,44,8\r
     EDITTEXT        IDC_CFG_DEFLIFE,91,7,137,14,ES_AUTOHSCROLL\r
-    LTEXT           "Ticket renewable lifetime",IDC_CFG_LBL_DEFRLIFE,7,29,80,8\r
+    LTEXT           "Credential renewable lifetime",IDC_CFG_LBL_DEFRLIFE,7,29,80,8\r
     EDITTEXT        IDC_CFG_DEFRLIFE,91,26,137,14,ES_AUTOHSCROLL\r
-    GROUPBOX        "Ticket lifetime range",IDC_CFG_LIFEGRP,7,43,221,49\r
+    GROUPBOX        "Credential lifetime range",IDC_CFG_LIFEGRP,7,43,221,49\r
     LTEXT           "Minimum",IDC_STATIC,13,56,28,8\r
     EDITTEXT        IDC_CFG_LRNG_MIN,91,53,131,14,ES_AUTOHSCROLL\r
     LTEXT           "Maximum",IDC_STATIC,13,75,30,8\r
     EDITTEXT        IDC_CFG_LRNG_MAX,91,72,131,14,ES_AUTOHSCROLL\r
-    GROUPBOX        "Ticket renewable lifetime range",IDC_STATIC,7,95,221,49\r
+    GROUPBOX        "Credential renewable lifetime range",IDC_STATIC,7,95,221,49\r
     LTEXT           "Minimum",IDC_STATIC,13,108,28,8\r
     EDITTEXT        IDC_CFG_RLRNG_MIN,91,105,131,14,ES_AUTOHSCROLL\r
     LTEXT           "Maximum",IDC_STATIC,13,128,30,8\r
@@ -177,7 +177,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT\r
 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
 BEGIN\r
-    LTEXT           "Ticket lifetime",IDC_CFG_LBL_DEFLIFE,7,10,44,8\r
+    LTEXT           "Credential lifetime",IDC_CFG_LBL_DEFLIFE,7,10,44,8\r
     EDITTEXT        IDC_CFG_DEFLIFE,91,7,137,14,ES_AUTOHSCROLL\r
     CONTROL         "Renewable for",IDC_CFG_RENEW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,41,63,10\r
     EDITTEXT        IDC_CFG_DEFRLIFE,91,39,137,14,ES_AUTOHSCROLL\r
@@ -186,7 +186,7 @@ BEGIN
     CONTROL         "Addressless",IDC_CFG_ADDRESSLESS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,77,54,10\r
     LTEXT           "Additional IP address",IDC_STATIC,91,78,68,8,NOT WS_VISIBLE\r
     CONTROL         "",IDC_CFG_PUBLICIP,"SysIPAddress32",NOT WS_VISIBLE | WS_TABSTOP,128,89,100,15\r
-    LTEXT           "Credentials cache",IDC_STATIC,7,132,58,8\r
+    LTEXT           "Credential cache",IDC_STATIC,7,132,58,8\r
     EDITTEXT        IDC_CFG_CCACHE,91,130,137,14,ES_AUTOHSCROLL\r
 END\r
 \r
@@ -195,7 +195,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT\r
 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
 BEGIN\r
-    CONTROL         "Kerberos 5 Change Password Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11\r
+    CONTROL         "Kerberos v5 Change Password Options",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP,7,7,286,11\r
     LTEXT           "Realm",IDC_STATIC,7,25,52,13\r
     COMBOBOX        IDC_NCK5_REALM,60,25,233,51,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
     PUSHBUTTON      "Specify &additional realms ...",IDC_NCK5_ADD_REALMS,181,43,112,16,BS_NOTIFY | WS_DISABLED\r
@@ -206,7 +206,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT\r
 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
 BEGIN\r
-    GROUPBOX        "File Caches",IDC_CFG_FCGRP,7,26,241,149\r
+    GROUPBOX        "File-based Credential Caches",IDC_CFG_FCGRP,7,26,241,149\r
     CONTROL         "",IDC_CFG_FCLIST,"SysListView32",LVS_REPORT | LVS_SORTASCENDING | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,13,37,229,97\r
     EDITTEXT        IDC_CFG_FCNAME,13,139,173,14,ES_AUTOHSCROLL\r
     PUSHBUTTON      "&Browse ...",IDC_CFG_BROWSE,192,139,50,14\r
@@ -339,11 +339,11 @@ STRINGTABLE
 BEGIN\r
     IDS_UNK_ADDR_FMT        "Unknown address type %d"\r
     IDS_KRB5_CREDTEXT_0     "<p><a id=""SwitchPanel"" param=""Krb5Cred""><b>Krb5</b></a><tab>: Creds for realm %s</p>"\r
-    IDS_KRB5_CCNAME_SHORT_DESC "Krb5 CCache"\r
-    IDS_KEY_ENCTYPE_SHORT_DESC "Key EncType"\r
-    IDS_TKT_ENCTYPE_SHORT_DESC "Ticket EncType"\r
+    IDS_KRB5_CCNAME_SHORT_DESC "Kerberos v5 CCache"\r
+    IDS_KEY_ENCTYPE_SHORT_DESC "Session EncType"\r
+    IDS_TKT_ENCTYPE_SHORT_DESC "Service EncType"\r
     IDS_KEY_ENCTYPE_LONG_DESC "Session Key Encryption Type"\r
-    IDS_TKT_ENCTYPE_LONG_DESC "Ticket Encryption Type"\r
+    IDS_TKT_ENCTYPE_LONG_DESC "Service Encryption Type"\r
     IDS_ADDR_LIST_SHORT_DESC "Addresses"\r
     IDS_ADDR_LIST_LONG_DESC "Address List"\r
     IDS_ETYPE_NULL          "NULL"\r
@@ -366,53 +366,53 @@ BEGIN
     IDS_ETYPE_UNKNOWN       "(Unknown)"\r
     IDS_ETYPE_LOCAL_DES3_HMAC_SHA1 "LOCAL-DES3-HMAC-SHA1"\r
     IDS_ETYPE_LOCAL_RC4_MD4 "LOCAL-RC4-MD4"\r
-    IDS_KRB5_SHORT_DESC     "Kerberos 5 tickets"\r
-    IDS_KRB5_LONG_DESC      "Kerberos 5 tickets"\r
+    IDS_KRB5_SHORT_DESC     "Kerberos v5 credentials"\r
+    IDS_KRB5_LONG_DESC      "Kerberos v5 credentials"\r
 END\r
 \r
 STRINGTABLE \r
 BEGIN\r
-    IDS_KRB4_SHORT_DESC     "Kerberos 4"\r
-    IDS_KRB4_LONG_DESC      "Kerberos 4 tickets"\r
-    IDS_KRB5_FLAGS_SHORT_DESC "Krb5 Flags"\r
+    IDS_KRB4_SHORT_DESC     "Kerberos v4"\r
+    IDS_KRB4_LONG_DESC      "Kerberos v4 credentials"\r
+    IDS_KRB5_FLAGS_SHORT_DESC "Kerberos v5 Flags"\r
     IDS_RENEW_TILL_SHORT_DESC "Renew Till"\r
     IDS_RENEW_TILL_LONG_DESC "Renewable Till"\r
     IDS_RENEW_FOR_SHORT_DESC "Renew for"\r
     IDS_RENEW_FOR_LONG_DESC "Renewable for"\r
-    IDS_KRB5_CCNAME_LONG_DESC "Krb5 Primary Credentials Cache"\r
+    IDS_KRB5_CCNAME_LONG_DESC "Kerberos v5 Primary Credentials Cache"\r
     IDS_NC_USERNAME         "Username"\r
     IDS_NC_REALM            "Realm"\r
-    IDS_KRB5_WARNING        "Kerberos 5 Warning"\r
+    IDS_KRB5_WARNING        "Kerberos v5 Warning"\r
     IDS_K5ERR_NAME_EXPIRED  "<p><a id=""SwitchPanel"" param=""Krb5Cred""><b>Krb5</b></a><tab>: The selected principal name has expired.</p><p><tab>  Please contact your system administrator.</p>"\r
     IDS_K5ERR_KEY_EXPIRED   "<p><a id=""SwitchPanel"" param=""Krb5Cred""><b>Krb5</b></a><tab>: The password for the selected identity has expired.</p><p><tab>  Click <a id=""Krb5Cred:!Passwd"">here</a> to change the password</p>"\r
-    IDS_KRB5_WARN_FMT       "Kerberos 5: %s\n\n%s"\r
+    IDS_KRB5_WARN_FMT       "Kerberos v5: %s\n\n%s"\r
     IDS_K5ERR_FMT           "<p><a id=""SwitchPanel"" param=""Krb5Cred""><b>Krb5</b></a><tag>: %s</p>"\r
-    IDS_K5CFG_SHORT_DESC    "Kerberos 5"\r
+    IDS_K5CFG_SHORT_DESC    "Kerberos v5"\r
 END\r
 \r
 STRINGTABLE \r
 BEGIN\r
-    IDS_K5CFG_LONG_DESC     "Kerberos 5 Configuration"\r
+    IDS_K5CFG_LONG_DESC     "Kerberos v5 Configuration"\r
     IDS_K5RLM_SHORT_DESC    "Realms"\r
     IDS_K5RLM_LONG_DESC     "Kerberos Realm Configuration"\r
-    IDS_K5CFG_IDS_SHORT_DESC "Kerberos 5"\r
-    IDS_K5CFG_IDS_LONG_DESC "Kerberos 5 options for all identities"\r
-    IDS_K5CFG_ID_SHORT_DESC "Kerberos 5"\r
-    IDS_K5CFG_ID_LONG_DESC  "Kerberos 5 options for this identity"\r
-    IDS_PLUGIN_DESC         "Kerberos 5 Credentials Provider"\r
-    IDS_NC_PWD_BANNER       "Changing Kerberos 5 Password"\r
+    IDS_K5CFG_IDS_SHORT_DESC "Kerberos v5"\r
+    IDS_K5CFG_IDS_LONG_DESC "Kerberos v5 options for all identities"\r
+    IDS_K5CFG_ID_SHORT_DESC "Kerberos v5"\r
+    IDS_K5CFG_ID_LONG_DESC  "Kerberos v5 options for this identity"\r
+    IDS_PLUGIN_DESC         "Kerberos v5 Credentials Provider"\r
+    IDS_NC_PWD_BANNER       "Changing Kerberos v5 Password"\r
     IDS_NC_PWD_PWD          "Current Password"\r
     IDS_NC_PWD_NPWD         "New Password"\r
     IDS_NC_PWD_NPWD_AGAIN   "New Password again"\r
     IDS_KRB5_CREDTEXT_P0    "<p><a id=""SwitchPanel"" param=""Krb5Cred""><b>Krb5</b></a><tab>: Changing password for %s</p>"\r
     IDS_K5CFG_IMPORT_OPTIONS "Never,Always,Only when the principal matches"\r
-    IDS_IDENTPRO_DESC       "Kerberos 5 Identity Provider"\r
-    IDS_K5CCC_SHORT_DESC    "Credentials Caches"\r
+    IDS_IDENTPRO_DESC       "Kerberos v5 Identity Provider"\r
+    IDS_K5CCC_SHORT_DESC    "Credential Caches"\r
 END\r
 \r
 STRINGTABLE \r
 BEGIN\r
-    IDS_K5CCC_LONG_DESC     "Kerberos 5 Credentials Caches"\r
+    IDS_K5CCC_LONG_DESC     "Kerberos v5 Credential Caches"\r
     IDS_CFG_FCTITLE         "File based Credential Caches"\r
     IDS_CFG_FCN_WARNING     "Warning:"\r
     IDS_CFG_FCN_W_NOTFOUND  "The credentials cache you specified does not exist."\r
@@ -438,7 +438,7 @@ BEGIN
     IDS_FLG_OK_DELEGATE     "Approved for delegation"\r
     IDS_FLG_ANONYMOUS       "Anonymous"\r
     IDS_K5ERR_CANTWRITEPROFILE \r
-                            "The Kerberos 5 profile file could not be written"\r
+                            "The Kerberos v5 profile file could not be written"\r
     IDS_K5ERR_PROFNOWRITE   "The file %s could not be opened as a profile file for writing."\r
     IDS_K5ERR_PROFUSETEMP   "The file %s could not be opened for writing.  The current changes will be saved to %s temporarily."\r
     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."\r
@@ -460,7 +460,7 @@ BEGIN
     IDS_NO                  "No"\r
     IDS_CFG_RE_NEWSERVER    "<New server...>"\r
     IDS_CFG_RE_NEWDMAP      "<New domain mapping...>"\r
-    IDS_KRB5_NC_NAME        "Kerberos 5"\r
+    IDS_KRB5_NC_NAME        "Kerberos v5"\r
     IDS_NCERR_IDENT_TOO_LONG "The identity name is too long."\r
     IDS_NCERR_IDENT_INVALID "The identity name is invalid."\r
     IDS_NCERR_IDENT_UNKNOWN "An unknown error occurred while validating the identity name."\r
index ec58aa90b63587d3736a8046cad330484be03dd6..135b08e25f68d70e4c54b9797b32673c0f75abe0 100644 (file)
@@ -28,7 +28,7 @@
 \r
 #ifndef LANGVER\r
 \r
-#define STR_FILEDESC "Kerberos 5 Plugin for NetIDMgr"\r
+#define STR_FILEDESC "Kerberos v5 Plugin for Network Identity Manager"\r
 #define STR_INTNAME  "krb5cred"\r
 #define STR_ORIGNAME "krb5cred.dll"\r
 \r
@@ -67,7 +67,7 @@
         VALUE "InternalName",    STR_INTNAME\r
         VALUE "LegalCopyright",  KH_VERSTR_COPYRIGHT_1033\r
         VALUE "OriginalFilename", STR_ORIGNAME\r
-        VALUE "ProductName",     "NetIDMgr"\r
+        VALUE "ProductName",     "Network Identity Manager"\r
         VALUE "ProductVersion",  KH_VERSTR_PRODUCT_1033\r
 #ifdef KH_VERSTR_COMMENT_1033\r
         VALUE "Comment", KH_VERSTR_COMMENT_1033\r
index 9d2dbc4eba58e7986e05bda17a198ea6ce228039..58a69a472337dd082d05ae1b827e5ecdbc228c2f 100644 (file)
@@ -26,7 +26,7 @@ BEGIN
             VALUE "InternalName", "NetIDMgr"\r
             VALUE "LegalCopyright", KH_VERSTR_COPYRIGHT_1033\r
             VALUE "OriginalFilename", "netidmgr.exe"\r
-            VALUE "ProductName", "NetIDMgr"\r
+            VALUE "ProductName", "Network Identity Manager"\r
             VALUE "ProductVersion", KH_VERSTR_PRODUCT_1033\r
 #ifdef KH_VERSTR_COMMENT_1033\r
             VALUE "Comment", KH_VERSTR_COMMENT_1033\r
index 48f577684a7451fa9c3db2046f33ec330e63c54a..96e8de6a5205807ef018ab33d537fbfdedcefed1 100644 (file)
@@ -225,7 +225,7 @@ END
 IDD_CFG_MAIN DIALOGEX 0, 0, 357, 222\r
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 EXSTYLE WS_EX_CONTEXTHELP\r
-CAPTION "NetIDMgr Configuration"\r
+CAPTION "Network Identity Manager Configuration"\r
 FONT 8, "MS Shell Dlg", 400, 0, 0x1\r
 BEGIN\r
     LTEXT           "Title",IDC_CFG_TITLE,0,0,357,20,SS_CENTERIMAGE\r
@@ -252,11 +252,11 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,22,196,10\r
     CONTROL         "&Destroy all credentials on exit",IDC_CFG_DESTROYALL,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,39,111,10\r
-    CONTROL         "&Start NetIDMgr during Windows logon",IDC_CFG_AUTOSTART,\r
+    CONTROL         "&Start Network Identity Manager during Windows logon",IDC_CFG_AUTOSTART,\r
                     "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,16,48,135,10\r
     GROUPBOX        "Other",IDC_CFG_OTHER,7,63,241,85\r
-    CONTROL         "&Run NetIDMgr in system tray after window close",IDC_CFG_KEEPRUNNING,\r
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,78,170,10\r
+    CONTROL         "&Run Network Identity Manager in system tray after window close",IDC_CFG_KEEPRUNNING,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,78,230,10\r
     CONTROL         "Monitor network connectivity",IDC_CFG_NETDETECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,96,106,10\r
     CONTROL         "Log trace events to trace log at the following location:",IDC_CFG_LOGTOFILE,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,113,225,10\r
@@ -356,7 +356,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN\r
     DEFPUSHBUTTON   "OK",IDOK,211,7,50,14\r
     LTEXT           "Productname",IDC_PRODUCT,41,7,163,13,NOT WS_GROUP\r
-    LTEXT           "© 2005-2006 Massachusetts Institute of Technology\n© 2006 Secure Endpoints Inc.",IDC_COPYRIGHT,41,23,220,18,NOT WS_GROUP\r
+    LTEXT           "© 2005-2007 Massachusetts Institute of Technology\n© 2006-2007 Secure Endpoints Inc.",IDC_COPYRIGHT,41,23,220,18,NOT WS_GROUP\r
     LTEXT           "BuildInfo",IDC_BUILDINFO,41,43,220,15,NOT WS_GROUP\r
     ICON            IDI_MAIN_APP,IDC_STATIC,6,7,20,20\r
     CONTROL         "",IDC_MODULES,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,41,72,220,91\r
@@ -588,7 +588,7 @@ BEGIN
     IDS_ACTION_HELP_CTX     "Help Index"\r
     IDS_ACTION_HELP_CONTENTS "Contents ..."\r
     IDS_ACTION_HELP_INDEX   "Index ..."\r
-    IDS_ACTION_HELP_ABOUT   "About NetIDMgr ..."\r
+    IDS_ACTION_HELP_ABOUT   "About Network Identity Manager ..."\r
     IDS_CFG_GENERAL_LONG    "General options"\r
     IDS_SAMPLE_STRING       "Wxy"\r
     IDS_NO_CREDS            "<large><center>You currently have no credentials.Click <a id=""NewCreds"">here</a> to obtain new credentials.</center></large>"\r
@@ -610,7 +610,7 @@ BEGIN
     IDS_ACTION_DESTROY_CRED "De&stroy credentials ..."\r
     IDS_DEFAULT_FONT        "MS Shell Dlg"\r
     IDS_NC_CREDTEXT_TABS    "<settab pos=""15""><settab pos=""30""><settab pos=""45"">"\r
-    IDS_NOTIFY_PREFIX       "NetIDMgr - "\r
+    IDS_NOTIFY_PREFIX       "Network Identity Manager - "\r
     IDS_NOTIFY_READY        "Ready"\r
     IDS_NOTIFY_ATTENTION    "Attention"\r
     IDS_ALERT_DEFAULT       "Alert"\r
@@ -629,7 +629,7 @@ BEGIN
     IDS_PROP_COL_VALUE      "Value"\r
     IDS_NC_NEW_IDENT        "( New identity ... )"\r
     IDS_NC_CREDTEXT_ID_CHECKING "<font color=""grey"">%s (Checking...)</font>"\r
-    IDS_ACTION_OPEN_APP     "Open NetIDMgr ..."\r
+    IDS_ACTION_OPEN_APP     "Open Network Identity Manager ..."\r
     IDS_CTX_NEW_IDENT       "Obaining new identity"\r
     IDS_CTX_NEW_CREDS       "Obtaining new credentials"\r
     IDS_CTX_RENEW_CREDS     "Renewing credentials"\r
@@ -640,7 +640,7 @@ STRINGTABLE
 BEGIN\r
     IDS_CTX_PROC_NEW_CREDS  "Obtaining new credentials for %1!s!"\r
     IDS_CTX_PROC_RENEW_CREDS "Renewing credentials for %1!s!"\r
-    IDS_ACTION_CLOSE_APP    "Close NetIDMgr window"\r
+    IDS_ACTION_CLOSE_APP    "Close Network Identity Manager window"\r
     IDS_NC_FAILED_TITLE     "Failed to acquire credentials"\r
     IDS_CFG_IDENTITIES_SHORT "Identities"\r
     IDS_CFG_IDENTITIES_LONG "Global Identity settings"\r
@@ -661,8 +661,8 @@ BEGIN
     IDS_WARN_EXPIRED        "Some of your credentials have expired."\r
     IDS_WARN_EXPIRE_ID      "Credentials for %.180s will expire in %s"\r
     IDS_WARN_EXPIRED_ID     "Credentials for %.220s have expired"\r
-    IDS_WARN_WM_TITLE       "NetIDMgr is still running"\r
-    IDS_WARN_WM_MSG         "Click the NetIDMgr icon below to open the application.\n\nOr right click the icon to access the NetIDMgr menu."\r
+    IDS_WARN_WM_TITLE       "Network Identity Manager is still running"\r
+    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."\r
     IDS_CFG_ID_TAB_SHORT    "General"\r
     IDS_CFG_ID_TAB_LONG     "General options for this identity"\r
     IDS_CFG_IDS_TAB_SHORT   "General"\r
@@ -691,7 +691,7 @@ BEGIN
     IDS_WTPOST_PASSWORD     "  - Changing password"\r
     IDS_CTX_PROC_PASSWORD   "Changing password for %1!s!"\r
     IDS_NC_PWD_FAILED_TITLE "Failed to change password"\r
-    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"\r
+    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"\r
     IDS_PACTION_NEXT        "Next alert..."\r
     IDS_ERR_TITLE_NO_IDENTPRO "Cannot proceed without identity provider"\r
 END\r
@@ -724,15 +724,15 @@ BEGIN
     IDS_CFG_IT_NONE         "No changes"\r
     IDS_CFG_NODESC          "(Description for plugin %s is not available)"\r
     IDS_CFG_P_DELCNFT       "About to disable plugin %s"\r
-    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."\r
+    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."\r
     IDS_CFG_P_DELCNFS       "The following plugins depend on this plugin : %s"\r
     IDS_CFG_P_DELNDEP       "No other plugins depend on this plugin."\r
     IDS_CFG_P_ENBCNFT       "About to enable plugin %s"\r
-    IDS_CFG_P_ENBCNFM       "The plugin %s will be marked as enabled.  The plugin will be come active the next time NetIDMgr is started."\r
+    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."\r
     IDS_PISTATE_FAILINIT    "Failed to initialize"\r
     IDS_CFG_P_UNRCNFT       "Unregistering plugin %s"\r
-    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."\r
-    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"\r
+    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."\r
+    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"\r
     IDS_ACTION_LAYOUT_CUST  "Custom"\r
     IDS_APR_HEADER_TEXT     "Header text"\r
 END\r
@@ -768,7 +768,7 @@ BEGIN
     IDS_ACTIONT_VIEW_REFRESH \r
                             "Re-obtain information about credentials and refresh the credentials display"\r
     IDS_ACTIONT_OPT_IDENTS  "Change options for identities"\r
-    IDS_ACTIONT_OPT_KHIM    "Change general application settings for NetIDMgr"\r
+    IDS_ACTIONT_OPT_KHIM    "Change general application settings for Network Identity Manager"\r
     IDS_ACTIONT_OPT_NOTIF   "Change notification options"\r
     IDS_ACTIONT_OPT_PLUGINS "Change options for plug-ins and modules"\r
     IDS_ACTIONT_OPT_APPEAR  "Change appearance and display settings"\r