Skip to content

Commit a4480df

Browse files
author
Mihaela Stoica
authored
Merge pull request xenserver#1315 from GaborApatiNagy/CA-229365
CA-229365: Install Update Wizard: Fixed commas in the blurb
2 parents 7f2ecb6 + 9c4628f commit a4480df

File tree

2 files changed

+34
-37
lines changed

2 files changed

+34
-37
lines changed

‎XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎XenAdmin/Wizards/PatchingWizard/PatchingWizard_SelectPatchPage.resx‎

Lines changed: 33 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -133,19 +133,19 @@
133133
</data>
134134
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
135135
<data name="labelWithoutAutomatic.Location" type="System.Drawing.Point, System.Drawing">
136-
<value>3, 40</value>
136+
<value>3, 32</value>
137137
</data>
138138
<data name="labelWithoutAutomatic.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
139139
<value>3, 0, 3, 6</value>
140140
</data>
141141
<data name="labelWithoutAutomatic.Size" type="System.Drawing.Size, System.Drawing">
142-
<value>745, 17</value>
142+
<value>595, 13</value>
143143
</data>
144144
<data name="labelWithoutAutomatic.TabIndex" type="System.Int32, mscorlib">
145145
<value>1</value>
146146
</data>
147147
<data name="labelWithoutAutomatic.Text" xml:space="preserve">
148-
<value>Select an update to be downloaded from [Citrix], or browse your computer for an update or supplemental pack file.</value>
148+
<value>Select an update to be downloaded from [Citrix] or browse your computer for an update or supplemental pack file.</value>
149149
</data>
150150
<data name="&gt;&gt;labelWithoutAutomatic.Name" xml:space="preserve">
151151
<value>labelWithoutAutomatic</value>
@@ -175,13 +175,13 @@
175175
<value>3, 0, 3, 6</value>
176176
</data>
177177
<data name="labelWithAutomatic.Size" type="System.Drawing.Size, System.Drawing">
178-
<value>745, 34</value>
178+
<value>595, 26</value>
179179
</data>
180180
<data name="labelWithAutomatic.TabIndex" type="System.Int32, mscorlib">
181181
<value>0</value>
182182
</data>
183183
<data name="labelWithAutomatic.Text" xml:space="preserve">
184-
<value>Select Automatic mode or choose an update to be downloaded from [Citrix], or browse your computer for an update or supplemental pack file.</value>
184+
<value>Select Automatic mode, choose an update to be downloaded from [Citrix] or browse your computer for an update or supplemental pack file.</value>
185185
</data>
186186
<data name="&gt;&gt;labelWithAutomatic.Name" xml:space="preserve">
187187
<value>labelWithAutomatic</value>
@@ -202,13 +202,13 @@
202202
<value>NoControl</value>
203203
</data>
204204
<data name="AutomaticRadioButton.Location" type="System.Drawing.Point, System.Drawing">
205-
<value>3, 75</value>
205+
<value>3, 63</value>
206206
</data>
207207
<data name="AutomaticRadioButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
208208
<value>3, 12, 3, 3</value>
209209
</data>
210210
<data name="AutomaticRadioButton.Size" type="System.Drawing.Size, System.Drawing">
211-
<value>91, 21</value>
211+
<value>72, 17</value>
212212
</data>
213213
<data name="AutomaticRadioButton.TabIndex" type="System.Int32, mscorlib">
214214
<value>2</value>
@@ -238,10 +238,10 @@
238238
<value>NoControl</value>
239239
</data>
240240
<data name="automaticOptionLabel.Location" type="System.Drawing.Point, System.Drawing">
241-
<value>23, 99</value>
241+
<value>23, 83</value>
242242
</data>
243243
<data name="automaticOptionLabel.Size" type="System.Drawing.Size, System.Drawing">
244-
<value>725, 34</value>
244+
<value>575, 26</value>
245245
</data>
246246
<data name="automaticOptionLabel.TabIndex" type="System.Int32, mscorlib">
247247
<value>3</value>
@@ -268,13 +268,13 @@
268268
<value>NoControl</value>
269269
</data>
270270
<data name="downloadUpdateRadioButton.Location" type="System.Drawing.Point, System.Drawing">
271-
<value>3, 145</value>
271+
<value>3, 121</value>
272272
</data>
273273
<data name="downloadUpdateRadioButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
274274
<value>3, 12, 3, 3</value>
275275
</data>
276276
<data name="downloadUpdateRadioButton.Size" type="System.Drawing.Size, System.Drawing">
277-
<value>213, 21</value>
277+
<value>163, 17</value>
278278
</data>
279279
<data name="downloadUpdateRadioButton.TabIndex" type="System.Int32, mscorlib">
280280
<value>4</value>
@@ -301,7 +301,7 @@
301301
<value>NoControl</value>
302302
</data>
303303
<data name="RefreshListButton.Location" type="System.Drawing.Point, System.Drawing">
304-
<value>23, 429</value>
304+
<value>23, 326</value>
305305
</data>
306306
<data name="RefreshListButton.Size" type="System.Drawing.Size, System.Drawing">
307307
<value>94, 27</value>
@@ -331,7 +331,7 @@
331331
<value>NoControl</value>
332332
</data>
333333
<data name="RestoreDismUpdatesButton.Location" type="System.Drawing.Point, System.Drawing">
334-
<value>123, 429</value>
334+
<value>123, 326</value>
335335
</data>
336336
<data name="RestoreDismUpdatesButton.Size" type="System.Drawing.Size, System.Drawing">
337337
<value>193, 27</value>
@@ -361,13 +361,13 @@
361361
<value>NoControl</value>
362362
</data>
363363
<data name="selectFromDiskRadioButton.Location" type="System.Drawing.Point, System.Drawing">
364-
<value>3, 471</value>
364+
<value>3, 368</value>
365365
</data>
366366
<data name="selectFromDiskRadioButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
367367
<value>3, 12, 3, 3</value>
368368
</data>
369369
<data name="selectFromDiskRadioButton.Size" type="System.Drawing.Size, System.Drawing">
370-
<value>316, 21</value>
370+
<value>240, 17</value>
371371
</data>
372372
<data name="selectFromDiskRadioButton.TabIndex" type="System.Int32, mscorlib">
373373
<value>8</value>
@@ -406,10 +406,10 @@
406406
<value>NoControl</value>
407407
</data>
408408
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
409-
<value>3, 8</value>
409+
<value>3, 10</value>
410410
</data>
411411
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
412-
<value>69, 17</value>
412+
<value>52, 13</value>
413413
</data>
414414
<data name="label2.TabIndex" type="System.Int32, mscorlib">
415415
<value>0</value>
@@ -436,10 +436,10 @@
436436
<value>Left, Right</value>
437437
</data>
438438
<data name="fileNameTextBox.Location" type="System.Drawing.Point, System.Drawing">
439-
<value>78, 5</value>
439+
<value>61, 6</value>
440440
</data>
441441
<data name="fileNameTextBox.Size" type="System.Drawing.Size, System.Drawing">
442-
<value>562, 22</value>
442+
<value>429, 20</value>
443443
</data>
444444
<data name="fileNameTextBox.TabIndex" type="System.Int32, mscorlib">
445445
<value>1</value>
@@ -463,7 +463,7 @@
463463
<value>NoControl</value>
464464
</data>
465465
<data name="BrowseButton.Location" type="System.Drawing.Point, System.Drawing">
466-
<value>646, 3</value>
466+
<value>496, 3</value>
467467
</data>
468468
<data name="BrowseButton.Size" type="System.Drawing.Size, System.Drawing">
469469
<value>76, 27</value>
@@ -490,13 +490,13 @@
490490
<value>Fill</value>
491491
</data>
492492
<data name="tableLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
493-
<value>23, 498</value>
493+
<value>23, 391</value>
494494
</data>
495495
<data name="tableLayoutPanel2.RowCount" type="System.Int32, mscorlib">
496496
<value>1</value>
497497
</data>
498498
<data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
499-
<value>725, 33</value>
499+
<value>575, 33</value>
500500
</data>
501501
<data name="tableLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
502502
<value>9</value>
@@ -559,10 +559,10 @@
559559
<value>True</value>
560560
</data>
561561
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
562-
<value>25, 2</value>
562+
<value>25, 4</value>
563563
</data>
564564
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
565-
<value>154, 17</value>
565+
<value>117, 13</value>
566566
</data>
567567
<data name="label1.TabIndex" type="System.Int32, mscorlib">
568568
<value>1</value>
@@ -583,13 +583,13 @@
583583
<value>1</value>
584584
</data>
585585
<data name="tableLayoutPanelSpinner.Location" type="System.Drawing.Point, System.Drawing">
586-
<value>253, 112</value>
586+
<value>178, 75</value>
587587
</data>
588588
<data name="tableLayoutPanelSpinner.RowCount" type="System.Int32, mscorlib">
589589
<value>1</value>
590590
</data>
591591
<data name="tableLayoutPanelSpinner.Size" type="System.Drawing.Size, System.Drawing">
592-
<value>182, 22</value>
592+
<value>145, 22</value>
593593
</data>
594594
<data name="tableLayoutPanelSpinner.TabIndex" type="System.Int32, mscorlib">
595595
<value>1</value>
@@ -619,7 +619,7 @@
619619
<value>50</value>
620620
</data>
621621
<data name="ColumnUpdate.Width" type="System.Int32, mscorlib">
622-
<value>83</value>
622+
<value>67</value>
623623
</data>
624624
<metadata name="ColumnDescription.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
625625
<value>True</value>
@@ -664,7 +664,7 @@
664664
<value>Vertical</value>
665665
</data>
666666
<data name="dataGridViewPatches.Size" type="System.Drawing.Size, System.Drawing">
667-
<value>725, 251</value>
667+
<value>575, 176</value>
668668
</data>
669669
<data name="dataGridViewPatches.TabIndex" type="System.Int32, mscorlib">
670670
<value>0</value>
@@ -685,10 +685,10 @@
685685
<value>Fill</value>
686686
</data>
687687
<data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
688-
<value>23, 172</value>
688+
<value>23, 144</value>
689689
</data>
690690
<data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
691-
<value>725, 251</value>
691+
<value>575, 176</value>
692692
</data>
693693
<data name="panel1.TabIndex" type="System.Int32, mscorlib">
694694
<value>5</value>
@@ -715,7 +715,7 @@
715715
<value>9</value>
716716
</data>
717717
<data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
718-
<value>751, 534</value>
718+
<value>601, 427</value>
719719
</data>
720720
<data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
721721
<value>0</value>
@@ -739,13 +739,10 @@
739739
<value>True</value>
740740
</metadata>
741741
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
742-
<value>120, 120</value>
743-
</data>
744-
<data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
745-
<value>4, 4, 4, 4</value>
742+
<value>96, 96</value>
746743
</data>
747744
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
748-
<value>751, 534</value>
745+
<value>601, 427</value>
749746
</data>
750747
<data name="&gt;&gt;ColumnUpdate.Name" xml:space="preserve">
751748
<value>ColumnUpdate</value>

0 commit comments

Comments
 (0)