diff --git a/src/dotnet/ReSharperPlugin.DotNetDisassembler/Resources/Strings.resx b/src/dotnet/ReSharperPlugin.DotNetDisassembler/Resources/Strings.resx
index 8c9cf72..3a0a6c3 100644
--- a/src/dotnet/ReSharperPlugin.DotNetDisassembler/Resources/Strings.resx
+++ b/src/dotnet/ReSharperPlugin.DotNetDisassembler/Resources/Strings.resx
@@ -4,7 +4,7 @@
     <value>Show ASM Viewer</value>
   </data>
   <data name="ShowAsmViewerContextAction_Description">
-    <value>Opens the ASM Viewer window to display assembly code for the selected method, property, constructor, or type declaration</value>
+    <value>Opens the ASM Viewer window to display JIT or native assembly code for the selected method, property, constructor, or type declaration</value>
   </data>
   <data name="ShowAsmViewerContextAction_Text">
     <value>Show in ASM Viewer</value>
diff --git a/src/rider/main/resources/messages/AsmViewerBundle.properties b/src/rider/main/resources/messages/AsmViewerBundle.properties
index d438b95..7b470c4 100644
--- a/src/rider/main/resources/messages/AsmViewerBundle.properties
+++ b/src/rider/main/resources/messages/AsmViewerBundle.properties
@@ -1,6 +1,6 @@
 # UI Messages
-state.initializing=Loading...
-state.waiting.for.input=Place the caret on a method, property, constructor, or type declaration to view JIT assembly code
+state.initializing=Loading\u2026
+state.waiting.for.input=Place the caret on a method, property, constructor, or type declaration to view JIT or native assembly code
 
 # Tool Window
 toolwindow.stripe.title=ASM
@@ -9,11 +9,11 @@ toolwindow.stripe.title=ASM
 diff.title=ASM Comparison
 diff.left.title=Snapshot
 diff.right.title=Current
-diff.error=Failed to create diff view
+diff.error=Failed to create a diff view
 
 # Actions
 action.create.snapshot.text=Create Snapshot
-action.create.snapshot.description=Save current ASM code as snapshot
+action.create.snapshot.description=Save current ASM code as a snapshot
 action.diffable.mode.enable.text=Enable Diff-Friendly Output
 action.diffable.mode.disable.text=Disable Diff-Friendly Output
 action.diffable.mode.description=Toggle diff-friendly output mode
@@ -34,7 +34,7 @@ section.build=Build
 section.runtime=Runtime
 general.show.asm.comments=Show Comments
 general.diffable.output=Diff-Friendly Output
-general.diffable.help=Enables JIT diffable disassembly for more deterministic output (reduces volatile details).
+general.diffable.help=Enables JIT diffable disassembly for more deterministic output (reduces volatile details)
 jit.use.tiered=Use Tiered Compilation
 jit.use.pgo=Use PGO (Profile-Guided Optimization)
 jit.compiler.label=Code Generator:
@@ -46,30 +46,30 @@ build.target.framework.placeholder=auto (newest)
 runtime.run.app.mode=Run Project
 runtime.run.project.help=Runs the entire application instead of analyzing a single method in isolation. <b>Warning:</b> may take a long time or hang if the application waits for input.
 runtime.timeout.label=Timeout (seconds):
-runtime.timeout.help=Maximum time to wait for disassembly process. Set to 0 to disable timeout.
+runtime.timeout.help=Maximum time to wait for the disassembly process. Set to 0 to disable the timeout.
 
 # Error Messages
 error.show.details=Show details
 error.details.dialog.title=Error Details
-error.SourceFileNotFound=Source file not found in solution
-error.PsiSourceFileUnavailable=Unable to get PSI source file
+error.SourceFileNotFound=Source file is not found in the solution
+error.PsiSourceFileUnavailable=Unable to get the PSI source file
 error.UnsupportedLanguage=ASM Viewer only works with C# files
-error.InvalidCaretPosition=Place caret on a method, property, constructor, or type declaration to view ASM code
+error.InvalidCaretPosition=Place the caret on a method, property, constructor, or type declaration to view JIT/native assembly code
 error.PgoNotSupportedForAot=PGO has no effect on R2R'd/NativeAOT code
 error.RunModeNotSupportedForAot=Run mode is not supported for crossgen/NativeAOT
 error.TieredJitNotSupportedForAot=Tiered Compilation has no effect on R2R/NativeAOT code
 error.FlowgraphsNotSupportedForAot=Flowgraphs are not tested with crossgen2/NativeAOT yet (in plugin)
 error.FlowgraphsForClassNotSupported=Flowgraph for classes (all methods) is not supported yet
-error.UnsupportedTargetFramework=Only net6.0 (and newer) apps are supported.\nMake sure <TargetFramework>net6.0</TargetFramework> is set in your csproj.
-error.CustomRuntimeRequiresNet7=Only net7.0 (and newer) apps are supported with non-locally built dotnet/runtime.\nMake sure <TargetFramework>net7.0</TargetFramework> is set in your csproj.
-error.GenericMethodsRequireRunMode=Generic methods require Run Project mode to be enabled.\nEnable it in ASM Viewer settings.
-error.CompilationFailed=Failed to generate ASM code
+error.UnsupportedTargetFramework=Only apps targeting .NET 6.0 or later are supported.\nMake sure <TargetFramework>net6.0</TargetFramework> is set in your .csproj file.
+error.CustomRuntimeRequiresNet7=Only apps targeting .NET 7.0 or later are supported with non-locally built dotnet/runtime.\nMake sure <TargetFramework>net7.0</TargetFramework> is set in your .csproj file.
+error.GenericMethodsRequireRunMode=Generic methods require Run Project mode to be enabled.\nEnable it in the ASM Viewer settings.
+error.CompilationFailed=Failed to generate JIT/native assembly code
 error.ProjectPathNotFound=Project path not found
 error.DotnetBuildFailed=dotnet build failed
 error.DotnetPublishFailed=dotnet publish failed
-error.EmptyDisassembly=No disassembly produced. The method may be one of the following:\n\n\
+error.EmptyDisassembly=No disassembly was produced. The method may be one of the following:\n\n\
 - inlined (use [MethodImpl(MethodImplOptions.NoInlining)])\n\
-- unreachable and removed by optimizations (e.g. NativeAOT)
+- unreachable and removed by optimizations (for example, NativeAOT)
 error.DotNetCliNotFound=.NET CLI not found. Please configure .NET SDK in Rider settings.
 error.RuntimePackNotFound=Runtime pack not found
 error.CoreClrCheckedNotFound=CoreClr checked files not found