From db4737b5ec9415cea4439c66a0c44d1be3feec7a Mon Sep 17 00:00:00 2001 From: Gabor Apati-Nagy Date: Fri, 13 Nov 2015 20:00:25 +0000 Subject: [PATCH 1/2] CA-185888: "Forget" in XenCenter is unclear Renamed "Forget" to "Forget password" and updated unit tests accordingly. Signed-off-by: Gabor Apati-Nagy --- XenAdmin/MainWindow.resx | 2 +- XenAdminTests/TabsAndMenus/MainMenuGeorge.cs | 32 ++++++++++---------- XenModel/Messages.Designer.cs | 4 +-- XenModel/Messages.resx | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/XenAdmin/MainWindow.resx b/XenAdmin/MainWindow.resx index 8e87c7b0b..b65737310 100644 --- a/XenAdmin/MainWindow.resx +++ b/XenAdmin/MainWindow.resx @@ -2109,7 +2109,7 @@ 124, 22 - &Forget + &Forget password 212, 22 diff --git a/XenAdminTests/TabsAndMenus/MainMenuGeorge.cs b/XenAdminTests/TabsAndMenus/MainMenuGeorge.cs index 96e4cc035..a379e5da8 100644 --- a/XenAdminTests/TabsAndMenus/MainMenuGeorge.cs +++ b/XenAdminTests/TabsAndMenus/MainMenuGeorge.cs @@ -106,7 +106,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget", false, false )}), + new ExpectedTextMenuItem("&Forget password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -219,7 +219,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", true, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", true, false ), - new ExpectedTextMenuItem("&Forget", false, false )}), + new ExpectedTextMenuItem("&Forget password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -334,7 +334,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", true, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", true, false ), - new ExpectedTextMenuItem("&Forget", false, false )}), + new ExpectedTextMenuItem("&Forget password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", host.IsMaster(), false ), @@ -449,7 +449,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget", false, false )}), + new ExpectedTextMenuItem("&Forget password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -565,7 +565,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget", false, false )}), + new ExpectedTextMenuItem("&Forget password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -683,7 +683,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget", false, false )}), + new ExpectedTextMenuItem("&Forget password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -802,7 +802,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget", false, false )}), + new ExpectedTextMenuItem("&Forget password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -924,7 +924,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget", false, false )}), + new ExpectedTextMenuItem("&Forget password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -1047,7 +1047,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget", false, false )}), + new ExpectedTextMenuItem("&Forget password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -1171,7 +1171,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget", false, false )}), + new ExpectedTextMenuItem("&Forget password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -1296,7 +1296,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget", false, false )}), + new ExpectedTextMenuItem("&Forget password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -1416,7 +1416,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", true, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", true, false ), - new ExpectedTextMenuItem("&Forget", false, false )}), + new ExpectedTextMenuItem("&Forget password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", true, false ), @@ -1529,7 +1529,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", true, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", true, false ), - new ExpectedTextMenuItem("&Forget", false, false )}), + new ExpectedTextMenuItem("&Forget password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -1644,7 +1644,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget", false, false )}), + new ExpectedTextMenuItem("&Forget password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -1787,7 +1787,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget", false, false )}), + new ExpectedTextMenuItem("&Forget password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -1916,7 +1916,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget", false, false )}), + new ExpectedTextMenuItem("&Forget password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index 5b3c931b2..9587ab641 100644 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18444 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -20218,7 +20218,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to &Forget. + /// Looks up a localized string similar to &Forget password. /// public static string MAINWINDOW_FORGET_SAVED_PASSWORD { get { diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index 10eb9c85d..2d4272a23 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -7049,7 +7049,7 @@ This will permanently delete and reinitialize all local storage on the servers. Force Shut Do&wn - &Forget + &Forget password &Forget From 57cea2564c1a3a7dbbbe3712dad2ae347d814e8b Mon Sep 17 00:00:00 2001 From: Gabor Apati-Nagy Date: Mon, 16 Nov 2015 16:11:40 +0000 Subject: [PATCH 2/2] CA-185888: "Forget" in XenCenter is unclear Capitalized. Signed-off-by: Gabor Apati-Nagy --- XenAdmin/MainWindow.resx | 2 +- XenAdminTests/TabsAndMenus/MainMenuGeorge.cs | 32 ++++++++++---------- XenModel/Messages.Designer.cs | 2 +- XenModel/Messages.resx | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/XenAdmin/MainWindow.resx b/XenAdmin/MainWindow.resx index b65737310..c05987b4b 100644 --- a/XenAdmin/MainWindow.resx +++ b/XenAdmin/MainWindow.resx @@ -2109,7 +2109,7 @@ 124, 22 - &Forget password + &Forget Password 212, 22 diff --git a/XenAdminTests/TabsAndMenus/MainMenuGeorge.cs b/XenAdminTests/TabsAndMenus/MainMenuGeorge.cs index a379e5da8..5dbd1b51d 100644 --- a/XenAdminTests/TabsAndMenus/MainMenuGeorge.cs +++ b/XenAdminTests/TabsAndMenus/MainMenuGeorge.cs @@ -106,7 +106,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget password", false, false )}), + new ExpectedTextMenuItem("&Forget Password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -219,7 +219,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", true, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", true, false ), - new ExpectedTextMenuItem("&Forget password", false, false )}), + new ExpectedTextMenuItem("&Forget Password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -334,7 +334,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", true, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", true, false ), - new ExpectedTextMenuItem("&Forget password", false, false )}), + new ExpectedTextMenuItem("&Forget Password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", host.IsMaster(), false ), @@ -449,7 +449,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget password", false, false )}), + new ExpectedTextMenuItem("&Forget Password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -565,7 +565,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget password", false, false )}), + new ExpectedTextMenuItem("&Forget Password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -683,7 +683,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget password", false, false )}), + new ExpectedTextMenuItem("&Forget Password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -802,7 +802,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget password", false, false )}), + new ExpectedTextMenuItem("&Forget Password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -924,7 +924,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget password", false, false )}), + new ExpectedTextMenuItem("&Forget Password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -1047,7 +1047,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget password", false, false )}), + new ExpectedTextMenuItem("&Forget Password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -1171,7 +1171,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget password", false, false )}), + new ExpectedTextMenuItem("&Forget Password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -1296,7 +1296,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget password", false, false )}), + new ExpectedTextMenuItem("&Forget Password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -1416,7 +1416,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", true, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", true, false ), - new ExpectedTextMenuItem("&Forget password", false, false )}), + new ExpectedTextMenuItem("&Forget Password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", true, false ), @@ -1529,7 +1529,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", true, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", true, false ), - new ExpectedTextMenuItem("&Forget password", false, false )}), + new ExpectedTextMenuItem("&Forget Password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -1644,7 +1644,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget password", false, false )}), + new ExpectedTextMenuItem("&Forget Password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -1787,7 +1787,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget password", false, false )}), + new ExpectedTextMenuItem("&Forget Password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), @@ -1916,7 +1916,7 @@ namespace XenAdminTests.TabsAndMenus new ExpectedTextMenuItem("Remove Crash &Dump Files", false, false ), new ExpectedTextMenuItem("Pass&word", false, false, new ExpectedMenuItem[]{ new ExpectedTextMenuItem("&Change...", false, false ), - new ExpectedTextMenuItem("&Forget password", false, false )}), + new ExpectedTextMenuItem("&Forget Password", false, false )}), new ExpectedSeparator(), new ExpectedTextMenuItem("D&estroy", false, false ), new ExpectedTextMenuItem("Remo&ve from XenCenter", false, false ), diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs index 9587ab641..a179f433c 100644 --- a/XenModel/Messages.Designer.cs +++ b/XenModel/Messages.Designer.cs @@ -20218,7 +20218,7 @@ namespace XenAdmin { } /// - /// Looks up a localized string similar to &Forget password. + /// Looks up a localized string similar to &Forget Password. /// public static string MAINWINDOW_FORGET_SAVED_PASSWORD { get { diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx index 2d4272a23..121fd96e1 100755 --- a/XenModel/Messages.resx +++ b/XenModel/Messages.resx @@ -7049,7 +7049,7 @@ This will permanently delete and reinitialize all local storage on the servers. Force Shut Do&wn - &Forget password + &Forget Password &Forget