Skip to content

Commit cd8d7b9

Browse files
committed
added missing resources
1 parent a747c92 commit cd8d7b9

File tree

3 files changed

+28
-61
lines changed

3 files changed

+28
-61
lines changed

Rubberduck.Core/UI/Settings/AutoCompleteSettings.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,19 @@
8888
</DockPanel>
8989
</Label>
9090
<CheckBox Margin="10,0" VerticalContentAlignment="Center" IsChecked="{Binding IsEnabled}">
91-
<Label Content="{Resx ResxName=Rubberduck.Resources.Settings.SettingsUI, Key=EnableAutocompleteLabel}"/>
91+
<Label Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=EnableAutocompleteLabel}"/>
9292
</CheckBox>
9393

9494
<Label Margin="10"
95-
Content="{Resx ResxName=Rubberduck.Resources.Settings.SettingsUI, Key=SelfClosingPairs}"
95+
Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=SelfClosingPairs}"
9696
FontWeight="Bold" />
9797
<CheckBox Margin="15,0,15,0"
9898
IsEnabled="{Binding IsEnabled}"
9999
IsChecked="{Binding EnableSelfClosingPairs}"
100100
Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=EnableSelfClosingPairs}" />
101101

102102
<Label Margin="10"
103-
Content="{Resx ResxName=Rubberduck.Resources.Settings.SettingsUI, Key=SmartConcat}"
103+
Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=SmartConcat}"
104104
FontWeight="Bold" />
105105
<CheckBox Margin="15,0,15,0"
106106
IsEnabled="{Binding IsEnabled}"
@@ -112,7 +112,7 @@
112112
Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=ConcatVbNewline}" />
113113

114114
<Label Margin="10"
115-
Content="{Resx ResxName=Rubberduck.Resources.Settings.SettingsUI, Key=BlockCompletion}"
115+
Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=BlockCompletion}"
116116
FontWeight="Bold" />
117117
<CheckBox Margin="15,0,15,0"
118118
IsEnabled="{Binding IsEnabled}"

Rubberduck.Resources/Settings/AutoCompletesPage.resx

Lines changed: 24 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -117,61 +117,10 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="AutoCompleteClosingBraceDescription" xml:space="preserve">
121-
<value>Close curly braces '{'</value>
122-
</data>
123-
<data name="AutoCompleteClosingBracketDescription" xml:space="preserve">
124-
<value>Close square brackets '['</value>
125-
</data>
126-
<data name="AutoCompleteClosingParentheseDescription" xml:space="preserve">
127-
<value>Close parentheses '('</value>
128-
</data>
129-
<data name="AutoCompleteClosingStringDescription" xml:space="preserve">
130-
<value>Close string literals '"'</value>
131-
</data>
132-
<data name="AutoCompleteDoBlockDescription" xml:space="preserve">
133-
<value>Close 'Do [Until|While]...Loop' loop blocks</value>
134-
</data>
135-
<data name="AutoCompleteEnumBlockDescription" xml:space="preserve">
136-
<value>Close 'Enum' blocks</value>
137-
</data>
138-
<data name="AutoCompleteForBlockDescription" xml:space="preserve">
139-
<value>Close 'For [Each]...Next' loop blocks</value>
140-
</data>
141-
<data name="AutoCompleteIfBlockDescription" xml:space="preserve">
142-
<value>Close 'If' blocks</value>
143-
</data>
144-
<data name="AutoCompleteOnErrorResumeNextBlockDescription" xml:space="preserve">
145-
<value>Treat 'On Error Resume Next...GoTo 0' as a block</value>
146-
</data>
147-
<data name="AutoCompletePrecompilerIfBlockDescription" xml:space="preserve">
148-
<value>Close precompiler '#If' blocks</value>
149-
</data>
150-
<data name="AutoCompleteSelectBlockDescription" xml:space="preserve">
151-
<value>Close 'Select' blocks</value>
152-
</data>
153-
<data name="AutoCompleteTypeBlockDescription" xml:space="preserve">
154-
<value>Close 'Type' blocks</value>
155-
</data>
156-
<data name="AutoCompleteWhileBlockDescription" xml:space="preserve">
157-
<value>Close 'While...Wend' loop blocks</value>
158-
</data>
159-
<data name="AutoCompleteWithBlockDescription" xml:space="preserve">
160-
<value>Close 'With' blocks</value>
161-
</data>
162-
<data name="AutoCompleteSubBlockDescription" xml:space="preserve">
163-
<value>Override 'Sub' member block completion</value>
164-
</data>
165-
<data name="AutoCompleteFunctionBlockDescription" xml:space="preserve">
166-
<value>Override 'Function' member block completion</value>
167-
</data>
168-
<data name="AutoCompletePropertyBlockDescription" xml:space="preserve">
169-
<value>Override 'Property' member block completion</value>
170-
</data>
171-
<data name="HandleTabKey" xml:space="preserve">
120+
<data name="CompleteBlockOnTab" xml:space="preserve">
172121
<value>Autocomplete blocks on TAB</value>
173122
</data>
174-
<data name="HandleEnterKey" xml:space="preserve">
123+
<data name="CompleteBlockOnEnter" xml:space="preserve">
175124
<value>Autocomplete blocks on ENTER</value>
176125
</data>
177126
<data name="PageHeader" xml:space="preserve">
@@ -180,7 +129,28 @@
180129
<data name="PageInstructions" xml:space="preserve">
181130
<value>Configure which Rubberduck autocompletions are enabled.</value>
182131
</data>
132+
<data name="BlockCompletion" xml:space="preserve">
133+
<value>Block Completion</value>
134+
</data>
135+
<data name="ConcatVbNewLine" xml:space="preserve">
136+
<value>Concatenate 'vbNewLine' on Ctrl+Enter</value>
137+
</data>
138+
<data name="EnableAutocompleteLabel" xml:space="preserve">
139+
<value>Enable autocompletion features</value>
140+
</data>
141+
<data name="EnableBlockCompletion" xml:space="preserve">
142+
<value>Enable block completion</value>
143+
</data>
144+
<data name="EnableSelfClosingPairs" xml:space="preserve">
145+
<value>Enable self-closing pairs</value>
146+
</data>
183147
<data name="EnableSmartConcat" xml:space="preserve">
184-
<value>Enable smart concatenation</value>
148+
<value>Enable smart-concatenation</value>
149+
</data>
150+
<data name="SelfClosingPairs" xml:space="preserve">
151+
<value>Self-Closing Pairs</value>
152+
</data>
153+
<data name="SmartConcat" xml:space="preserve">
154+
<value>Smart-Concatenation</value>
185155
</data>
186156
</root>

Rubberduck.Resources/Settings/SettingsUI.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,6 @@
120120
<data name="ConfirmResetSettings" xml:space="preserve">
121121
<value>Reset settings to default configuration?</value>
122122
</data>
123-
<data name="EnableAutocompleteLabel" xml:space="preserve">
124-
<value>Enable autocompletion. Feature isn't fully completed and may behave in unintended ways.</value>
125-
</data>
126123
<data name="ExportPageSettingsButton" xml:space="preserve">
127124
<value>Export</value>
128125
</data>

0 commit comments

Comments
 (0)