Merge branch 'LabWork02_base' into LabWork03_base

FlowerShop/FlowerShop/FormMain.Designer.cs

@@ -35,9 +35,9 @@
             this.buttonPut = new System.Windows.Forms.Button();
             this.buttonRefresh = new System.Windows.Forms.Button();
             this.menuStrip = new System.Windows.Forms.MenuStrip();
-            this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.guidesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.componentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.изделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.bouquetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
             this.menuStrip.SuspendLayout();
             this.SuspendLayout();
@@ -112,7 +112,7 @@
             // 
             this.menuStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
             this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.справочникиToolStripMenuItem});
+            this.guidesToolStripMenuItem});
             this.menuStrip.Location = new System.Drawing.Point(0, 0);
             this.menuStrip.Name = "menuStrip";
             this.menuStrip.Padding = new System.Windows.Forms.Padding(4, 1, 0, 1);
@@ -120,28 +120,28 @@
             this.menuStrip.TabIndex = 6;
             this.menuStrip.Text = "menuStrip1";
             // 
-            // справочникиToolStripMenuItem
+            // guidesToolStripMenuItem
             // 
-            this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.guidesToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.компонентыToolStripMenuItem,
+            this.componentsToolStripMenuItem,
-            this.изделияToolStripMenuItem});
+            this.bouquetsToolStripMenuItem});
-            this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
+            this.guidesToolStripMenuItem.Name = "guidesToolStripMenuItem";
-            this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 22);
+            this.guidesToolStripMenuItem.Size = new System.Drawing.Size(94, 22);
-            this.справочникиToolStripMenuItem.Text = "Справочники";
+            this.guidesToolStripMenuItem.Text = "Справочники";
             // 
-            // компонентыToolStripMenuItem
+            // componentsToolStripMenuItem
             // 
-            this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
+            this.componentsToolStripMenuItem.Name = "componentsToolStripMenuItem";
-            this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.componentsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.компонентыToolStripMenuItem.Text = "Компоненты";
+            this.componentsToolStripMenuItem.Text = "Компоненты";
-            this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.componentsToolStripMenuItem_Click);
+            this.componentsToolStripMenuItem.Click += new System.EventHandler(this.componentsToolStripMenuItem_Click);
             // 
-            // изделияToolStripMenuItem
+            // bouquetsToolStripMenuItem
             // 
-            this.изделияToolStripMenuItem.Name = "изделияToolStripMenuItem";
+            this.bouquetsToolStripMenuItem.Name = "bouquetsToolStripMenuItem";
-            this.изделияToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.bouquetsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
-            this.изделияToolStripMenuItem.Text = "Букеты";
+            this.bouquetsToolStripMenuItem.Text = "Букеты";
-            this.изделияToolStripMenuItem.Click += new System.EventHandler(this.bouquetsToolStripMenuItem_Click);
+            this.bouquetsToolStripMenuItem.Click += new System.EventHandler(this.bouquetsToolStripMenuItem_Click);
             // 
             // FormMain
             // 
@@ -176,9 +176,9 @@
         private Button buttonPut;
         private Button buttonRefresh;
         private MenuStrip menuStrip;
-        private ToolStripMenuItem справочникиToolStripMenuItem;
+        private ToolStripMenuItem guidesToolStripMenuItem;
-        private ToolStripMenuItem компонентыToolStripMenuItem;
+        private ToolStripMenuItem componentsToolStripMenuItem;
-        private ToolStripMenuItem изделияToolStripMenuItem;
+        private ToolStripMenuItem bouquetsToolStripMenuItem;
         private Button buttonReady;
     }
 }