Skip to content

Commit

Permalink
Removed all conflicting files.
Browse files Browse the repository at this point in the history 
I used the following Git commands:
$ git merge-base pr/6661-french-layout-review-aug3 master
506bdbd

$ git checkout 506bdbd --  dlgOneVariableGraph.resx dlgOneVariableSummarise.resx dlgOneWayFrequencies.resx sdgDataOptions.resx sdgFiltersFromFactor.resx sdgOneVarGraph.resx sdgSummaries.resx ucrAxes.Designer.vb ucrAxes.resx ucrSaveGraph.resx
  • Loading branch information
@lloyddewit
lloyddewit committed Aug 6, 2021
1 parent 05af41f commit 790ebcd
Show file tree
Hide file tree
Showing 10 changed files with 2,938 additions and 2,548 deletions.
164 changes: 58 additions & 106 deletions instat/dlgOneVariableGraph.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;lblSelectedVariables.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="cmdGraphOptions.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 204</value>
<value>10, 201</value>
</data>
<data name="cmdGraphOptions.Size" type="System.Drawing.Size, System.Drawing">
<value>150, 24</value>
<value>120, 23</value>
</data>
<data name="cmdGraphOptions.TabIndex" type="System.Int32, mscorlib">
<value>3</value>
Expand All @@ -168,80 +168,8 @@
<value>$this</value>
</data>
<data name="&gt;&gt;cmdGraphOptions.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;rdoSingleGraphs.Name" xml:space="preserve">
<value>rdoSingleGraphs</value>
</data>
<data name="&gt;&gt;rdoSingleGraphs.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;rdoSingleGraphs.Parent" xml:space="preserve">
<value>grpOutput</value>
</data>
<data name="&gt;&gt;rdoSingleGraphs.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="&gt;&gt;rdoCombine.Name" xml:space="preserve">
<value>rdoCombine</value>
</data>
<data name="&gt;&gt;rdoCombine.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;rdoCombine.Parent" xml:space="preserve">
<value>grpOutput</value>
</data>
<data name="&gt;&gt;rdoCombine.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;rdoFacets.Name" xml:space="preserve">
<value>rdoFacets</value>
</data>
<data name="&gt;&gt;rdoFacets.Type" xml:space="preserve">
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;rdoFacets.Parent" xml:space="preserve">
<value>grpOutput</value>
</data>
<data name="&gt;&gt;rdoFacets.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="&gt;&gt;ucrPnlOutput.Name" xml:space="preserve">
<value>ucrPnlOutput</value>
</data>
<data name="&gt;&gt;ucrPnlOutput.Type" xml:space="preserve">
<value>instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ucrPnlOutput.Parent" xml:space="preserve">
<value>grpOutput</value>
</data>
<data name="&gt;&gt;ucrPnlOutput.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="grpOutput.Location" type="System.Drawing.Point, System.Drawing">
<value>248, 172</value>
</data>
<data name="grpOutput.Size" type="System.Drawing.Size, System.Drawing">
<value>142, 91</value>
</data>
<data name="grpOutput.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="grpOutput.Text" xml:space="preserve">
<value>Output</value>
</data>
<data name="&gt;&gt;grpOutput.Name" xml:space="preserve">
<value>grpOutput</value>
</data>
<data name="&gt;&gt;grpOutput.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;grpOutput.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;grpOutput.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="rdoSingleGraphs.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
Expand Down Expand Up @@ -338,11 +266,35 @@
<data name="&gt;&gt;ucrPnlOutput.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="grpOutput.Location" type="System.Drawing.Point, System.Drawing">
<value>248, 172</value>
</data>
<data name="grpOutput.Size" type="System.Drawing.Size, System.Drawing">
<value>142, 91</value>
</data>
<data name="grpOutput.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="grpOutput.Text" xml:space="preserve">
<value>Output</value>
</data>
<data name="&gt;&gt;grpOutput.Name" xml:space="preserve">
<value>grpOutput</value>
</data>
<data name="&gt;&gt;grpOutput.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;grpOutput.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;grpOutput.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="ucrChkFlip.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 238</value>
</data>
<data name="ucrChkFlip.Size" type="System.Drawing.Size, System.Drawing">
<value>232, 20</value>
<value>145, 20</value>
</data>
<data name="ucrChkFlip.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
Expand All @@ -357,13 +309,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;ucrChkFlip.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="ucrBase.Location" type="System.Drawing.Point, System.Drawing">
<value>9, 292</value>
</data>
<data name="ucrBase.Size" type="System.Drawing.Size, System.Drawing">
<value>405, 52</value>
<value>395, 52</value>
</data>
<data name="ucrBase.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
Expand All @@ -378,7 +330,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;ucrBase.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
Expand All @@ -387,12 +339,36 @@
<value>6, 13</value>
</data>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>416, 348</value>
<value>409, 348</value>
</data>
<data name="ucrSaveGraph.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 266</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="ucrSaveGraph.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="ucrSaveGraph.Size" type="System.Drawing.Size, System.Drawing">
<value>255, 24</value>
</data>
<data name="ucrSaveGraph.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="&gt;&gt;ucrSaveGraph.Name" xml:space="preserve">
<value>ucrSaveGraph</value>
</data>
<data name="&gt;&gt;ucrSaveGraph.Type" xml:space="preserve">
<value>instat.ucrSave, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ucrSaveGraph.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;ucrSaveGraph.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="ucrSelectorOneVarGraph.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 10</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="ucrSelectorOneVarGraph.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
Expand All @@ -412,30 +388,6 @@
<value>$this</value>
</data>
<data name="&gt;&gt;ucrSelectorOneVarGraph.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="ucrSaveGraph.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 266</value>
</data>
<data name="ucrSaveGraph.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>4, 5, 4, 5</value>
</data>
<data name="ucrSaveGraph.Size" type="System.Drawing.Size, System.Drawing">
<value>329, 24</value>
</data>
<data name="ucrSaveGraph.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="&gt;&gt;ucrSaveGraph.Name" xml:space="preserve">
<value>ucrSaveGraph</value>
</data>
<data name="&gt;&gt;ucrSaveGraph.Type" xml:space="preserve">
<value>instat.ucrSave, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ucrSaveGraph.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;ucrSaveGraph.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
Expand Down Expand Up @@ -472,6 +424,6 @@
<value>$this</value>
</data>
<data name="&gt;&gt;ucrReceiverOneVarGraph.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
</root>
28 changes: 14 additions & 14 deletions instat/dlgOneVariableSummarise.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="lblSelectedVariable.Location" type="System.Drawing.Point, System.Drawing">
<value>260, 45</value>
<value>261, 45</value>
</data>
<data name="lblSelectedVariable.Size" type="System.Drawing.Size, System.Drawing">
<value>142, 14</value>
Expand All @@ -145,7 +145,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;lblSelectedVariable.ZOrder" xml:space="preserve">
<value>8</value>
<value>9</value>
</data>
<data name="lblMaxSum.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
Expand All @@ -154,7 +154,7 @@
<value>10, 238</value>
</data>
<data name="lblMaxSum.Size" type="System.Drawing.Size, System.Drawing">
<value>226, 13</value>
<value>187, 13</value>
</data>
<data name="lblMaxSum.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
Expand All @@ -172,7 +172,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;lblMaxSum.ZOrder" xml:space="preserve">
<value>11</value>
<value>3</value>
</data>
<data name="cmdSummaries.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
Expand All @@ -181,7 +181,7 @@
<value>NoControl</value>
</data>
<data name="cmdSummaries.Location" type="System.Drawing.Point, System.Drawing">
<value>261, 200</value>
<value>242, 200</value>
</data>
<data name="cmdSummaries.Size" type="System.Drawing.Size, System.Drawing">
<value>116, 23</value>
Expand All @@ -202,7 +202,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;cmdSummaries.ZOrder" xml:space="preserve">
<value>9</value>
<value>10</value>
</data>
<data name="lblSummaries.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
Expand Down Expand Up @@ -295,7 +295,7 @@
<value>0</value>
</data>
<data name="ucrNudMaxSum.Location" type="System.Drawing.Point, System.Drawing">
<value>261, 235</value>
<value>205, 235</value>
</data>
<data name="ucrNudMaxSum.Size" type="System.Drawing.Size, System.Drawing">
<value>50, 20</value>
Expand All @@ -313,13 +313,13 @@
<value>$this</value>
</data>
<data name="&gt;&gt;ucrNudMaxSum.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="ucrChkOmitMissing.Location" type="System.Drawing.Point, System.Drawing">
<value>14, 235</value>
</data>
<data name="ucrChkOmitMissing.Size" type="System.Drawing.Size, System.Drawing">
<value>241, 20</value>
<value>166, 20</value>
</data>
<data name="ucrChkOmitMissing.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
Expand All @@ -334,7 +334,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;ucrChkOmitMissing.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="ucrSelectorOneVarSummarise.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 10</value>
Expand All @@ -358,7 +358,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;ucrSelectorOneVarSummarise.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
Expand Down Expand Up @@ -388,7 +388,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;ucrBase.ZOrder" xml:space="preserve">
<value>7</value>
<value>8</value>
</data>
<data name="ucrPnlSummaries.Location" type="System.Drawing.Point, System.Drawing">
<value>10, 192</value>
Expand All @@ -409,7 +409,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;ucrPnlSummaries.ZOrder" xml:space="preserve">
<value>10</value>
<value>11</value>
</data>
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
<value>CenterScreen</value>
Expand Down Expand Up @@ -445,6 +445,6 @@
<value>$this</value>
</data>
<data name="&gt;&gt;ucrReceiverOneVarSummarise.ZOrder" xml:space="preserve">
<value>6</value>
<value>7</value>
</data>
</root>
Loading

0 comments on commit 790ebcd

Please sign in to comment.