Fixed lcl file bad merge (#7189)

This commit is contained in:
Arjun Balgovind 2020-10-08 19:38:21 -07:00 committed by GitHub
parent c393db0b65
commit 210426a020
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 15 deletions

View File

@ -88,12 +88,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";ERRORMESSAGE_DISABLEASACTIONKEY" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Disable can not be an action or a modifier key]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";EditKeyboard_Info" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Select the key you want to change (Key) and then the key or shortcut you want it to become (Mapped To).]]></Val>

View File

@ -139,15 +139,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";wox_plugin_folder_select_folder_result_subtitle" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Folder: {0}]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Mappa: {0}]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
</Item>
</LCX>