Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 524399d8 编写于 作者: F Fredric Silberberg
浏览文件
操作

Update messaging.

上级 c487f596
隐藏空白更改
内联 并排
Showing with 79 addition and 82 deletion
src/VisualStudio/Core/Def/Implementation/Experimentation/KeybindingResetDetector.cs
浏览文件 @ 524399d8
......@@ -2,7 +2,6 @@
using System;
using System.ComponentModel.Composition;
using System.Diagnostics;
using System.Runtime.InteropServices;
using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
using Microsoft.CodeAnalysis.ErrorReporting;
......@@ -18,7 +17,6 @@
using Microsoft.VisualStudio.Shell.Interop;
using Roslyn.Utilities;
using Task = System.Threading.Tasks.Task;
using IOleServiceProvider = Microsoft.VisualStudio.OLE.Interop.IServiceProvider;
namespace Microsoft.VisualStudio.LanguageServices.Implementation.Experimentation
{
......@@ -48,7 +46,7 @@ internal sealed class KeybindingResetDetector : ForegroundThreadAffinitizedObjec
private static readonly Guid ReSharperCommandGroup = new Guid("{47F03277-5055-4922-899C-0F7F30D26BF1}");
private readonly VisualStudioWorkspace _workspace;
private readonly SVsServiceProvider _serviceProvider;
private readonly System.IServiceProvider _serviceProvider;
// All mutable fields are UI-thread affinitized
......@@ -190,7 +188,7 @@ private void ShowGoldBar()
}
else if (_experimentationService.IsExperimentEnabled(ExternalFlightName))
{
message = ServicesVSResources.We_noticed_your_keybindings_are_broken;
message = ServicesVSResources.Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands;
}
else
{
......@@ -227,8 +225,7 @@ private ReSharperStatus IsReSharperEnabled()
if (_oleCommandTarget == null)
{
var oleServiceProvider = _serviceProvider.GetService<IOleServiceProvider>();
_oleCommandTarget = (IOleCommandTarget)oleServiceProvider.QueryService(VSConstants.SID_SUIHostCommandDispatcher);
_oleCommandTarget = _serviceProvider.GetService<IOleCommandTarget, SUIHostCommandDispatcher>();
}
var cmds = new OLECMD[1];
......
src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs
浏览文件 @ 524399d8
......@@ -2597,15 +2597,6 @@ internal class ServicesVSResources {
}
}
/// <summary>
/// Looks up a localized string similar to We noticed your keybindings are broken..
/// </summary>
internal static string We_noticed_your_keybindings_are_broken {
get {
return ResourceManager.GetString("We_noticed_your_keybindings_are_broken", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to When generating properties:.
/// </summary>
......@@ -2659,5 +2650,14 @@ internal class ServicesVSResources {
return ResourceManager.GetString("You_must_select_at_least_one_member", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Your keybindings are no longer mapped to Visual Studio commands..
/// </summary>
internal static string Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands {
get {
return ResourceManager.GetString("Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands", resourceCulture);
}
}
}
}
src/VisualStudio/Core/Def/ServicesVSResources.resx
浏览文件 @ 524399d8
......@@ -992,8 +992,8 @@ Additional information: {1}</value>
<data name="Use_Keybindings_for_extensions" xml:space="preserve">
<value>Use keybindings for ReSharper/IntelliJ/Vim/etc.</value>
</data>
<data name="We_noticed_your_keybindings_are_broken" xml:space="preserve">
<value>We noticed your keybindings are broken.</value>
<data name="Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands" xml:space="preserve">
<value>Your keybindings are no longer mapped to Visual Studio commands.</value>
</data>
<data name="We_noticed_you_suspended_ReSharper_Ultimate_Restore_Visual_Studio_keybindings_to_continue_to_navigate_and_refactor" xml:space="preserve">
<value>We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</value>
......
src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
浏览文件 @ 524399d8
......@@ -1452,11 +1452,6 @@ Additional information: {1}</target>
<target state="new">Restore Visual Studio keybindings</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_your_keybindings_are_broken">
<source>We noticed your keybindings are broken.</source>
<target state="new">We noticed your keybindings are broken.</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_you_suspended_ReSharper_Ultimate_Restore_Visual_Studio_keybindings_to_continue_to_navigate_and_refactor">
<source>We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</source>
<target state="new">We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</target>
......@@ -1467,6 +1462,11 @@ Additional information: {1}</target>
<target state="new">Use keybindings for ReSharper/IntelliJ/Vim/etc.</target>
<note />
</trans-unit>
<trans-unit id="Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands">
<source>Your keybindings are no longer mapped to Visual Studio commands.</source>
<target state="new">Your keybindings are no longer mapped to Visual Studio commands.</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
\ No newline at end of file
src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
浏览文件 @ 524399d8
......@@ -1452,11 +1452,6 @@ Additional information: {1}</target>
<target state="new">Restore Visual Studio keybindings</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_your_keybindings_are_broken">
<source>We noticed your keybindings are broken.</source>
<target state="new">We noticed your keybindings are broken.</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_you_suspended_ReSharper_Ultimate_Restore_Visual_Studio_keybindings_to_continue_to_navigate_and_refactor">
<source>We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</source>
<target state="new">We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</target>
......@@ -1467,6 +1462,11 @@ Additional information: {1}</target>
<target state="new">Use keybindings for ReSharper/IntelliJ/Vim/etc.</target>
<note />
</trans-unit>
<trans-unit id="Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands">
<source>Your keybindings are no longer mapped to Visual Studio commands.</source>
<target state="new">Your keybindings are no longer mapped to Visual Studio commands.</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
\ No newline at end of file
src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
浏览文件 @ 524399d8
......@@ -1452,11 +1452,6 @@ Additional information: {1}</target>
<target state="new">Restore Visual Studio keybindings</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_your_keybindings_are_broken">
<source>We noticed your keybindings are broken.</source>
<target state="new">We noticed your keybindings are broken.</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_you_suspended_ReSharper_Ultimate_Restore_Visual_Studio_keybindings_to_continue_to_navigate_and_refactor">
<source>We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</source>
<target state="new">We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</target>
......@@ -1467,6 +1462,11 @@ Additional information: {1}</target>
<target state="new">Use keybindings for ReSharper/IntelliJ/Vim/etc.</target>
<note />
</trans-unit>
<trans-unit id="Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands">
<source>Your keybindings are no longer mapped to Visual Studio commands.</source>
<target state="new">Your keybindings are no longer mapped to Visual Studio commands.</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
\ No newline at end of file
src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
浏览文件 @ 524399d8
......@@ -1452,11 +1452,6 @@ Additional information: {1}</target>
<target state="new">Restore Visual Studio keybindings</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_your_keybindings_are_broken">
<source>We noticed your keybindings are broken.</source>
<target state="new">We noticed your keybindings are broken.</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_you_suspended_ReSharper_Ultimate_Restore_Visual_Studio_keybindings_to_continue_to_navigate_and_refactor">
<source>We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</source>
<target state="new">We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</target>
......@@ -1467,6 +1462,11 @@ Additional information: {1}</target>
<target state="new">Use keybindings for ReSharper/IntelliJ/Vim/etc.</target>
<note />
</trans-unit>
<trans-unit id="Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands">
<source>Your keybindings are no longer mapped to Visual Studio commands.</source>
<target state="new">Your keybindings are no longer mapped to Visual Studio commands.</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
\ No newline at end of file
src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
浏览文件 @ 524399d8
......@@ -1452,11 +1452,6 @@ Additional information: {1}</target>
<target state="new">Restore Visual Studio keybindings</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_your_keybindings_are_broken">
<source>We noticed your keybindings are broken.</source>
<target state="new">We noticed your keybindings are broken.</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_you_suspended_ReSharper_Ultimate_Restore_Visual_Studio_keybindings_to_continue_to_navigate_and_refactor">
<source>We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</source>
<target state="new">We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</target>
......@@ -1467,6 +1462,11 @@ Additional information: {1}</target>
<target state="new">Use keybindings for ReSharper/IntelliJ/Vim/etc.</target>
<note />
</trans-unit>
<trans-unit id="Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands">
<source>Your keybindings are no longer mapped to Visual Studio commands.</source>
<target state="new">Your keybindings are no longer mapped to Visual Studio commands.</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
\ No newline at end of file
src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
浏览文件 @ 524399d8
......@@ -1452,11 +1452,6 @@ Additional information: {1}</target>
<target state="new">Restore Visual Studio keybindings</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_your_keybindings_are_broken">
<source>We noticed your keybindings are broken.</source>
<target state="new">We noticed your keybindings are broken.</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_you_suspended_ReSharper_Ultimate_Restore_Visual_Studio_keybindings_to_continue_to_navigate_and_refactor">
<source>We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</source>
<target state="new">We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</target>
......@@ -1467,6 +1462,11 @@ Additional information: {1}</target>
<target state="new">Use keybindings for ReSharper/IntelliJ/Vim/etc.</target>
<note />
</trans-unit>
<trans-unit id="Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands">
<source>Your keybindings are no longer mapped to Visual Studio commands.</source>
<target state="new">Your keybindings are no longer mapped to Visual Studio commands.</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
\ No newline at end of file
src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
浏览文件 @ 524399d8
......@@ -1452,11 +1452,6 @@ Additional information: {1}</target>
<target state="new">Restore Visual Studio keybindings</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_your_keybindings_are_broken">
<source>We noticed your keybindings are broken.</source>
<target state="new">We noticed your keybindings are broken.</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_you_suspended_ReSharper_Ultimate_Restore_Visual_Studio_keybindings_to_continue_to_navigate_and_refactor">
<source>We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</source>
<target state="new">We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</target>
......@@ -1467,6 +1462,11 @@ Additional information: {1}</target>
<target state="new">Use keybindings for ReSharper/IntelliJ/Vim/etc.</target>
<note />
</trans-unit>
<trans-unit id="Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands">
<source>Your keybindings are no longer mapped to Visual Studio commands.</source>
<target state="new">Your keybindings are no longer mapped to Visual Studio commands.</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
\ No newline at end of file
src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
浏览文件 @ 524399d8
......@@ -1452,11 +1452,6 @@ Additional information: {1}</target>
<target state="new">Restore Visual Studio keybindings</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_your_keybindings_are_broken">
<source>We noticed your keybindings are broken.</source>
<target state="new">We noticed your keybindings are broken.</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_you_suspended_ReSharper_Ultimate_Restore_Visual_Studio_keybindings_to_continue_to_navigate_and_refactor">
<source>We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</source>
<target state="new">We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</target>
......@@ -1467,6 +1462,11 @@ Additional information: {1}</target>
<target state="new">Use keybindings for ReSharper/IntelliJ/Vim/etc.</target>
<note />
</trans-unit>
<trans-unit id="Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands">
<source>Your keybindings are no longer mapped to Visual Studio commands.</source>
<target state="new">Your keybindings are no longer mapped to Visual Studio commands.</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
\ No newline at end of file
src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
浏览文件 @ 524399d8
......@@ -1452,11 +1452,6 @@ Additional information: {1}</target>
<target state="new">Restore Visual Studio keybindings</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_your_keybindings_are_broken">
<source>We noticed your keybindings are broken.</source>
<target state="new">We noticed your keybindings are broken.</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_you_suspended_ReSharper_Ultimate_Restore_Visual_Studio_keybindings_to_continue_to_navigate_and_refactor">
<source>We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</source>
<target state="new">We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</target>
......@@ -1467,6 +1462,11 @@ Additional information: {1}</target>
<target state="new">Use keybindings for ReSharper/IntelliJ/Vim/etc.</target>
<note />
</trans-unit>
<trans-unit id="Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands">
<source>Your keybindings are no longer mapped to Visual Studio commands.</source>
<target state="new">Your keybindings are no longer mapped to Visual Studio commands.</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
\ No newline at end of file
src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
浏览文件 @ 524399d8
......@@ -1452,11 +1452,6 @@ Additional information: {1}</target>
<target state="new">Restore Visual Studio keybindings</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_your_keybindings_are_broken">
<source>We noticed your keybindings are broken.</source>
<target state="new">We noticed your keybindings are broken.</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_you_suspended_ReSharper_Ultimate_Restore_Visual_Studio_keybindings_to_continue_to_navigate_and_refactor">
<source>We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</source>
<target state="new">We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</target>
......@@ -1467,6 +1462,11 @@ Additional information: {1}</target>
<target state="new">Use keybindings for ReSharper/IntelliJ/Vim/etc.</target>
<note />
</trans-unit>
<trans-unit id="Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands">
<source>Your keybindings are no longer mapped to Visual Studio commands.</source>
<target state="new">Your keybindings are no longer mapped to Visual Studio commands.</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
\ No newline at end of file
src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
浏览文件 @ 524399d8
......@@ -1452,11 +1452,6 @@ Additional information: {1}</target>
<target state="new">Restore Visual Studio keybindings</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_your_keybindings_are_broken">
<source>We noticed your keybindings are broken.</source>
<target state="new">We noticed your keybindings are broken.</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_you_suspended_ReSharper_Ultimate_Restore_Visual_Studio_keybindings_to_continue_to_navigate_and_refactor">
<source>We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</source>
<target state="new">We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</target>
......@@ -1467,6 +1462,11 @@ Additional information: {1}</target>
<target state="new">Use keybindings for ReSharper/IntelliJ/Vim/etc.</target>
<note />
</trans-unit>
<trans-unit id="Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands">
<source>Your keybindings are no longer mapped to Visual Studio commands.</source>
<target state="new">Your keybindings are no longer mapped to Visual Studio commands.</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
\ No newline at end of file
src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
浏览文件 @ 524399d8
......@@ -1452,11 +1452,6 @@ Additional information: {1}</target>
<target state="new">Restore Visual Studio keybindings</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_your_keybindings_are_broken">
<source>We noticed your keybindings are broken.</source>
<target state="new">We noticed your keybindings are broken.</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_you_suspended_ReSharper_Ultimate_Restore_Visual_Studio_keybindings_to_continue_to_navigate_and_refactor">
<source>We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</source>
<target state="new">We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</target>
......@@ -1467,6 +1462,11 @@ Additional information: {1}</target>
<target state="new">Use keybindings for ReSharper/IntelliJ/Vim/etc.</target>
<note />
</trans-unit>
<trans-unit id="Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands">
<source>Your keybindings are no longer mapped to Visual Studio commands.</source>
<target state="new">Your keybindings are no longer mapped to Visual Studio commands.</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
\ No newline at end of file
src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
浏览文件 @ 524399d8
......@@ -1452,11 +1452,6 @@ Additional information: {1}</target>
<target state="new">Restore Visual Studio keybindings</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_your_keybindings_are_broken">
<source>We noticed your keybindings are broken.</source>
<target state="new">We noticed your keybindings are broken.</target>
<note />
</trans-unit>
<trans-unit id="We_noticed_you_suspended_ReSharper_Ultimate_Restore_Visual_Studio_keybindings_to_continue_to_navigate_and_refactor">
<source>We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</source>
<target state="new">We noticed you suspended ‘ReSharper Ultimate’. Restore Visual Studio keybindings to continue to navigate and refactor.</target>
......@@ -1467,6 +1462,11 @@ Additional information: {1}</target>
<target state="new">Use keybindings for ReSharper/IntelliJ/Vim/etc.</target>
<note />
</trans-unit>
<trans-unit id="Your_keybindings_are_no_longer_mapped_to_Visual_Studio_commands">
<source>Your keybindings are no longer mapped to Visual Studio commands.</source>
<target state="new">Your keybindings are no longer mapped to Visual Studio commands.</target>
<note />
</trans-unit>
</body>
</file>
</xliff>
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或