diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index 0594175f15..49012460e6 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -88,6 +88,7 @@ ARPPRODUCTICON ARRAYSIZE arsinh artanh +Artsakh asdf AShortcut ASingle diff --git a/doc/devdocs/modules/launcher/plugins/timeZone.md b/doc/devdocs/modules/launcher/plugins/timeZone.md index cec1b7d0ae..49710cb947 100644 --- a/doc/devdocs/modules/launcher/plugins/timeZone.md +++ b/doc/devdocs/modules/launcher/plugins/timeZone.md @@ -32,7 +32,7 @@ A minimum entry for the `TimeZone.json` looks like: ```json { "Offset": "11:55", - "Name": "My unique time zone", + "Name": "My crazy time zone", } ``` @@ -41,26 +41,26 @@ A full entry for the `TimeZone.json` looks like: ```json { "Offset": "11:55", - "Name": "My unique time zone", + "Name": "My crazy time zone", "Shortcut" : "MYTZ", "MilitaryName" : "Order Time Zone", "TimeNamesStandard": [ - "My unique standard time" + "My crazy standard time" ], "ShortcutsStandard": [ "MCST" ], "TimeNamesDaylight": [ - "My unique daylight time" + "My crazy daylight time" ], "ShortcutsDaylight": [ "MCDT" ], "CountriesStandard": [ - "unique Land East" + "Crazy Land East" ], "CountriesDaylight": [ - "Unique Land West" + "Crazy Land West" ] } ``` diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.cpp b/src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.cpp index 1aef2b78e4..4040273cc7 100644 --- a/src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.cpp +++ b/src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.cpp @@ -37,8 +37,8 @@ namespace JsonUtils for (uint32_t i = 0; i < size; ++i) { json::JsonObject zoneJson = zonesJson.GetObjectAt(i); - const int x = static_cast(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::XAxisID)); - const int y = static_cast(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::YAxisID)); + const int x = static_cast(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::XID)); + const int y = static_cast(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::YID)); const int width = static_cast(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::WidthID)); const int height = static_cast(zoneJson.GetNamedNumber(NonLocalizable::CustomLayoutsIds::HeightID)); FancyZonesDataTypes::CanvasLayoutInfo::Rect zone{ x, y, width, height }; diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.h b/src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.h index efa8d88744..298edf0dde 100644 --- a/src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.h +++ b/src/modules/fancyzones/FancyZonesLib/FancyZonesData/CustomLayouts.h @@ -30,8 +30,8 @@ namespace NonLocalizable const static wchar_t* RefHeightID = L"ref-height"; const static wchar_t* RefWidthID = L"ref-width"; const static wchar_t* ZonesID = L"zones"; - const static wchar_t* XAxisID = L"X"; - const static wchar_t* YAxisID = L"Y"; + const static wchar_t* XID = L"X"; + const static wchar_t* YID = L"Y"; const static wchar_t* WidthID = L"width"; const static wchar_t* HeightID = L"height"; diff --git a/src/modules/fancyzones/FancyZonesTests/UnitTests/CustomLayoutsTests.Spec.cpp b/src/modules/fancyzones/FancyZonesTests/UnitTests/CustomLayoutsTests.Spec.cpp index 36edcf3867..f979cf7c69 100644 --- a/src/modules/fancyzones/FancyZonesTests/UnitTests/CustomLayoutsTests.Spec.cpp +++ b/src/modules/fancyzones/FancyZonesTests/UnitTests/CustomLayoutsTests.Spec.cpp @@ -32,16 +32,16 @@ namespace FancyZonesUnitTests json::JsonArray zonesArray{}; { json::JsonObject zone{}; - zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XAxisID, json::value(0)); - zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YAxisID, json::value(0)); + zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XID, json::value(0)); + zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YID, json::value(0)); zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::WidthID, json::value(1140)); zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::HeightID, json::value(1040)); zonesArray.Append(zone); } { json::JsonObject zone{}; - zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XAxisID, json::value(1140)); - zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YAxisID, json::value(649)); + zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XID, json::value(1140)); + zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YID, json::value(649)); zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::WidthID, json::value(780)); zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::HeightID, json::value(391)); zonesArray.Append(zone); diff --git a/src/modules/fancyzones/FancyZonesTests/UnitTests/Layout.Spec.cpp b/src/modules/fancyzones/FancyZonesTests/UnitTests/Layout.Spec.cpp index 4fbd9c163a..11d0ec3761 100644 --- a/src/modules/fancyzones/FancyZonesTests/UnitTests/Layout.Spec.cpp +++ b/src/modules/fancyzones/FancyZonesTests/UnitTests/Layout.Spec.cpp @@ -65,8 +65,8 @@ namespace FancyZonesUnitTests for (const auto& zoneRect : zones) { json::JsonObject zone{}; - zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XAxisID, json::value(zoneRect.left)); - zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YAxisID, json::value(zoneRect.top)); + zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::XID, json::value(zoneRect.left)); + zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::YID, json::value(zoneRect.top)); zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::WidthID, json::value(zoneRect.right - zoneRect.left)); zone.SetNamedValue(NonLocalizable::CustomLayoutsIds::HeightID, json::value(zoneRect.bottom - zoneRect.top)); zonesArray.Append(zone); diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Properties/Resources.Designer.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Properties/Resources.Designer.cs index b61937d4fb..78735dc479 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Properties/Resources.Designer.cs +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -411,6 +411,15 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties { } } + /// + /// Looks up a localized string similar to Artsakh. + /// + internal static string Artsakh { + get { + return ResourceManager.GetString("Artsakh", resourceCulture); + } + } + /// /// Looks up a localized string similar to Aruba. /// @@ -1023,15 +1032,6 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties { } } - /// - /// Looks up a localized string similar to Cabo Verde. - /// - internal static string Cabo_Verde { - get { - return ResourceManager.GetString("Cabo Verde", resourceCulture); - } - } - /// /// Looks up a localized string similar to Caiguna (Australia). /// @@ -1077,6 +1077,15 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties { } } + /// + /// Looks up a localized string similar to Cape Verde. + /// + internal static string Cape_Verde { + get { + return ResourceManager.GetString("Cape Verde", resourceCulture); + } + } + /// /// Looks up a localized string similar to Cape Verde Time. /// @@ -1770,6 +1779,15 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties { } } + /// + /// Looks up a localized string similar to East Timor. + /// + internal static string East_Timor { + get { + return ResourceManager.GetString("East Timor", resourceCulture); + } + } + /// /// Looks up a localized string similar to Easter Island (Chile). /// @@ -2778,6 +2796,15 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties { } } + /// + /// Looks up a localized string similar to Ivory Coast. + /// + internal static string Ivory_Coast { + get { + return ResourceManager.GetString("Ivory Coast", resourceCulture); + } + } + /// /// Looks up a localized string similar to Jamaica. /// @@ -3328,11 +3355,11 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties { } /// - /// Looks up a localized string similar to Macao SAR. + /// Looks up a localized string similar to Macau. /// - internal static string Macao_SAR { + internal static string Macau { get { - return ResourceManager.GetString("Macao SAR", resourceCulture); + return ResourceManager.GetString("Macau", resourceCulture); } } @@ -4236,6 +4263,15 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties { } } + /// + /// Looks up a localized string similar to Northern Cyprus. + /// + internal static string Northern_Cyprus { + get { + return ResourceManager.GetString("Northern Cyprus", resourceCulture); + } + } + /// /// Looks up a localized string similar to Northern Mariana Islands. /// @@ -4516,11 +4552,11 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties { } /// - /// Looks up a localized string similar to Palestine Authority. + /// Looks up a localized string similar to Palestine. /// - internal static string Palestine_Authority { + internal static string Palestine { get { - return ResourceManager.GetString("Palestine Authority", resourceCulture); + return ResourceManager.GetString("Palestine", resourceCulture); } } @@ -5631,6 +5667,15 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties { } } + /// + /// Looks up a localized string similar to Sverdlovsk (Russia). + /// + internal static string Sverdlovsk__Russia_ { + get { + return ResourceManager.GetString("Sverdlovsk (Russia)", resourceCulture); + } + } + /// /// Looks up a localized string similar to Sweden. /// @@ -5820,15 +5865,6 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties { } } - /// - /// Looks up a localized string similar to Timor-Leste. - /// - internal static string Timor_Leste { - get { - return ResourceManager.GetString("Timor-Leste", resourceCulture); - } - } - /// /// Looks up a localized string similar to Timor Leste Time. /// @@ -6540,15 +6576,6 @@ namespace Microsoft.PowerToys.Run.Plugin.TimeZone.Properties { } } - /// - /// Looks up a localized string similar to Yekaterinburg. - /// - internal static string Yekaterinburg { - get { - return ResourceManager.GetString("Yekaterinburg", resourceCulture); - } - } - /// /// Looks up a localized string similar to Yekaterinburg Time. /// diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Properties/Resources.resx b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Properties/Resources.resx index 73efd62ffe..61d12501d8 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Properties/Resources.resx +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/Properties/Resources.resx @@ -235,6 +235,9 @@ Armenia Time + + Artsakh + Aruba @@ -455,8 +458,8 @@ Canary Islands - - Cabo Verde + + Cape Verde Cape Verde Time @@ -692,8 +695,8 @@ East Nusa Tenggara (Indonesia) - - Timor-Leste + + East Timor Easter Island (Chile) @@ -1033,8 +1036,8 @@ Ittoqqortoormiit (Greenland) - - Côte d’Ivoire + + Ivory Coast Jamaica @@ -1221,8 +1224,8 @@ Luxembourg - - Macao SAR + + Macau Macquarie Island Station Time @@ -1525,6 +1528,9 @@ North Maluku (Indonesia) + + Northern Cyprus + Northern Mariana Islands @@ -1620,8 +1626,8 @@ Palau Time - - Palestine Authority + + Palestine Palmyra Atoll @@ -1997,8 +2003,8 @@ Suriname Time - - Yekaterinburg + + Sverdlovsk (Russia) Sweden diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/timezones.json b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/timezones.json index e83ab47d73..fcef0af599 100644 --- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/timezones.json +++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeZone/timezones.json @@ -514,7 +514,7 @@ "EGST" ], "CountriesStandard": [ - "Cabo Verde" + "Cape Verde" ], "CountriesDaylight": [ "Ittoqqortoormiit (Greenland)", @@ -553,7 +553,7 @@ "Guinea-Bissau", "Guinea", "Iceland", - "Côte d’Ivoire", + "Ivory Coast", "Liberia", "Mali", "Mauritania", @@ -716,7 +716,8 @@ "Lebanon", "Lithuania", "Moldova", - "Palestine Authority", + "Northern Cyprus", + "Palestine", "Romania", "Transnistria", "Syria" @@ -819,6 +820,7 @@ ], "CountriesDaylight": [ "Armenia", + "Artsakh", "Azerbaijan", "Crozet Islands (French Southern and Antarctic Lands)", "Georgia", @@ -894,7 +896,7 @@ "Kurgan (Russia)", "Orenburg (Russia)", "Perm (Russia)", - "Yekaterinburg", + "Sverdlovsk (Russia)", "Tyumen (Russia)", "Yamalia (Russia)", "Tajikistan", @@ -1079,7 +1081,7 @@ "South Kalimantan (Indonesia)", "Sulawesi (Indonesia)", "West Nusa Tenggara (Indonesia)", - "Macao SAR", + "Macau", "Malaysia", "Mongolia (most)", "Philippines", @@ -1130,7 +1132,7 @@ "YAKT" ], "CountriesStandard": [ - "Timor-Leste", + "East Timor", "Maluku (Indonesia)", "North Maluku (Indonesia)", "Papua (Indonesia)", diff --git a/src/modules/launcher/Wox.Infrastructure/Exception/ExceptionFormatter.cs b/src/modules/launcher/Wox.Infrastructure/Exception/ExceptionFormatter.cs index 9baf7a6d94..02c17e066d 100644 --- a/src/modules/launcher/Wox.Infrastructure/Exception/ExceptionFormatter.cs +++ b/src/modules/launcher/Wox.Infrastructure/Exception/ExceptionFormatter.cs @@ -91,23 +91,23 @@ namespace Wox.Infrastructure.Exception // GlobalAssemblyCache - .NET Core and .NET 5 and later: false in all cases. // Source https://learn.microsoft.com/dotnet/api/system.reflection.assembly.globalassemblycache?view=net-6.0 - foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) + foreach (var ass in AppDomain.CurrentDomain.GetAssemblies()) { sb.Append("* "); - sb.Append(assembly.FullName); + sb.Append(ass.FullName); sb.Append(" ("); - if (assembly.IsDynamic) + if (ass.IsDynamic) { sb.Append("dynamic assembly doesn't has location"); } - else if (string.IsNullOrEmpty(assembly.Location)) + else if (string.IsNullOrEmpty(ass.Location)) { sb.Append("location is null or empty"); } else { - sb.Append(assembly.Location); + sb.Append(ass.Location); } sb.AppendLine(")"); diff --git a/src/modules/poweraccent/PowerAccent.Core/Languages.cs b/src/modules/poweraccent/PowerAccent.Core/Languages.cs index 5357ece996..c9d7174650 100644 --- a/src/modules/poweraccent/PowerAccent.Core/Languages.cs +++ b/src/modules/poweraccent/PowerAccent.Core/Languages.cs @@ -53,7 +53,7 @@ namespace PowerAccent.Core Language.CUR => GetDefaultLetterKeyCUR(letter), // Currency Language.CY => GetDefaultLetterKeyCY(letter), // Welsh Language.CZ => GetDefaultLetterKeyCZ(letter), // Czech - Language.GA => GetDefaultLetterKeyGA(letter), // Gaeilge (Irish) + Language.GA => GetDefaultLetterKeyGA(letter), // Gaeilge (Irish Gaelic) Language.GD => GetDefaultLetterKeyGD(letter), // Gàidhlig (Scottish Gaelic) Language.DE => GetDefaultLetterKeyDE(letter), // German Language.EST => GetDefaultLetterKeyEST(letter), // Estonian