diff --git a/src/webimtray/WebIMTray/Main.Designer.cs b/src/webimtray/WebIMTray/Main.Designer.cs
index 58b80eac..efe303b4 100644
--- a/src/webimtray/WebIMTray/Main.Designer.cs
+++ b/src/webimtray/WebIMTray/Main.Designer.cs
@@ -39,7 +39,6 @@ namespace webImTray {
//
this.notifyIcon.ContextMenuStrip = this.notifyMenu;
this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon")));
- this.notifyIcon.Text = "Web Messenger Tray";
this.notifyIcon.Visible = true;
this.notifyIcon.MouseDown += new System.Windows.Forms.MouseEventHandler(this.notifyIconClick);
//
@@ -58,7 +57,6 @@ namespace webImTray {
this.optionsToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver;
this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(130, 22);
- this.optionsToolStripMenuItem.Text = "Options..";
this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsMenu_Click);
//
// toolStripMenuItem1
@@ -70,7 +68,6 @@ namespace webImTray {
//
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
this.exitToolStripMenuItem.Size = new System.Drawing.Size(130, 22);
- this.exitToolStripMenuItem.Text = "E&xit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.menuExitClick);
//
// toolbar
@@ -83,7 +80,6 @@ namespace webImTray {
this.toolbar.Name = "toolbar";
this.toolbar.Size = new System.Drawing.Size(864, 25);
this.toolbar.TabIndex = 1;
- this.toolbar.Text = "toolStrip1";
//
// toolNavigate
//
@@ -92,7 +88,6 @@ namespace webImTray {
this.toolNavigate.ImageTransparentColor = System.Drawing.Color.Silver;
this.toolNavigate.Name = "toolNavigate";
this.toolNavigate.Size = new System.Drawing.Size(23, 22);
- this.toolNavigate.Text = "Show pending users";
this.toolNavigate.Click += new System.EventHandler(this.toolNavigate_Click);
//
// toolOptions
@@ -102,7 +97,6 @@ namespace webImTray {
this.toolOptions.ImageTransparentColor = System.Drawing.Color.Silver;
this.toolOptions.Name = "toolOptions";
this.toolOptions.Size = new System.Drawing.Size(23, 22);
- this.toolOptions.Text = "Options..";
this.toolOptions.Click += new System.EventHandler(this.optionsMenu_Click);
//
// toolHideWindow
@@ -113,7 +107,6 @@ namespace webImTray {
this.toolHideWindow.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolHideWindow.Name = "toolHideWindow";
this.toolHideWindow.Size = new System.Drawing.Size(71, 22);
- this.toolHideWindow.Text = "Hide window";
this.toolHideWindow.Click += new System.EventHandler(this.toolHideWindow_Click);
//
// webBrowser1
@@ -141,7 +134,6 @@ namespace webImTray {
this.MinimizeBox = false;
this.Name = "MainWindow";
this.ShowInTaskbar = false;
- this.Text = "Web Messenger";
this.Shown += new System.EventHandler(this.MainWindow_Shown);
this.GotFocus += new System.EventHandler(this.gotFocus);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Client_FormClosing);
diff --git a/src/webimtray/WebIMTray/Main.cs b/src/webimtray/WebIMTray/Main.cs
index e687f0cd..763001c1 100644
--- a/src/webimtray/WebIMTray/Main.cs
+++ b/src/webimtray/WebIMTray/Main.cs
@@ -115,8 +115,9 @@ namespace webImTray {
}
private void Client_FormClosing(object sender, FormClosingEventArgs e) {
- if( !forceClosing && e.CloseReason == CloseReason.UserClosing
- && MessageBox.Show(this, "Do you want to quit WebIM for Tray?", "Web Messenger",
+ if( !forceClosing && e.CloseReason == CloseReason.UserClosing
+ && MessageBox.Show(this, Options.resourceManager.GetString("exitConfirmation"),
+ Options.resourceManager.GetString("webMessenger"),
MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) {
e.Cancel = true;
}
diff --git a/src/webimtray/WebIMTray/Options.cs b/src/webimtray/WebIMTray/Options.cs
index 43a91140..e648d094 100644
--- a/src/webimtray/WebIMTray/Options.cs
+++ b/src/webimtray/WebIMTray/Options.cs
@@ -110,7 +110,7 @@ namespace webImTray {
public static bool RussianLocale {
get {
- return Application.UserAppDataRegistry.GetValue("isrussianlocale", "false").ToString().ToLower().Equals("true");
+ return Application.UserAppDataRegistry.GetValue("isrussianlocale", "true").ToString().ToLower().Equals("true");
} set {
Application.UserAppDataRegistry.SetValue("isrussianlocale", value.ToString());
}
diff --git a/src/webimtray/WebIMTray/options/About.Designer.cs b/src/webimtray/WebIMTray/options/About.Designer.cs
index bcb467fb..54844ceb 100644
--- a/src/webimtray/WebIMTray/options/About.Designer.cs
+++ b/src/webimtray/WebIMTray/options/About.Designer.cs
@@ -44,7 +44,6 @@ namespace webImTray {
label3.Padding = new System.Windows.Forms.Padding(0, 0, 0, 7);
label3.Size = new System.Drawing.Size(335, 21);
label3.TabIndex = 3;
- label3.Text = "Copyright (c) 2006-08 Web Messenger Creators Community";
//
// label4
//
@@ -55,7 +54,6 @@ namespace webImTray {
label4.Padding = new System.Windows.Forms.Padding(0, 0, 0, 7);
label4.Size = new System.Drawing.Size(138, 21);
label4.TabIndex = 4;
- label4.Text = "Please, visit our website";
//
// label1
//
@@ -66,7 +64,6 @@ namespace webImTray {
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(208, 25);
this.label1.TabIndex = 0;
- this.label1.Text = "Web Messenger Tray";
//
// label2
//
@@ -76,7 +73,6 @@ namespace webImTray {
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(108, 18);
this.label2.TabIndex = 1;
- this.label2.Text = "version 1.0.4";
//
// pictureBox1
//
@@ -97,7 +93,6 @@ namespace webImTray {
this.linkLabel1.Size = new System.Drawing.Size(130, 21);
this.linkLabel1.TabIndex = 5;
this.linkLabel1.TabStop = true;
- this.linkLabel1.Text = "http://www.webim.ru";
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.webim_ru_link);
//
// pictureBox2
diff --git a/src/webimtray/WebIMTray/options/OptionsConnectionPanel.Designer.cs b/src/webimtray/WebIMTray/options/OptionsConnectionPanel.Designer.cs
index 98536eb6..296e157e 100644
--- a/src/webimtray/WebIMTray/options/OptionsConnectionPanel.Designer.cs
+++ b/src/webimtray/WebIMTray/options/OptionsConnectionPanel.Designer.cs
@@ -55,7 +55,6 @@ namespace webImTray {
this.groupBox1.Size = new System.Drawing.Size(491, 250);
this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Connection";
//
// label2
//
@@ -66,7 +65,6 @@ namespace webImTray {
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(57, 17);
this.label2.TabIndex = 9;
- this.label2.Text = "minutes";
//
// forceRefreshTime
//
@@ -103,7 +101,6 @@ namespace webImTray {
this.forceRefresh.Name = "forceRefresh";
this.forceRefresh.Size = new System.Drawing.Size(187, 21);
this.forceRefresh.TabIndex = 7;
- this.forceRefresh.Text = "Force page refresh every";
this.forceRefresh.UseVisualStyleBackColor = true;
this.forceRefresh.CheckedChanged += new System.EventHandler(this.forceRefresh_CheckedChanged);
//
@@ -117,7 +114,6 @@ namespace webImTray {
this.autoDesconnectOnSS.Name = "autoDesconnectOnSS";
this.autoDesconnectOnSS.Size = new System.Drawing.Size(280, 21);
this.autoDesconnectOnSS.TabIndex = 6;
- this.autoDesconnectOnSS.Text = "Become idle if the screen saver is active";
this.autoDesconnectOnSS.UseVisualStyleBackColor = true;
//
// webimServer
@@ -139,7 +135,6 @@ namespace webImTray {
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(201, 17);
this.label1.TabIndex = 4;
- this.label1.Text = "Web Instant Messenger server";
//
// autoDisconnect
//
@@ -150,7 +145,6 @@ namespace webImTray {
this.autoDisconnect.Name = "autoDisconnect";
this.autoDisconnect.Size = new System.Drawing.Size(261, 21);
this.autoDisconnect.TabIndex = 3;
- this.autoDisconnect.Text = "Become idle if the computer is locked";
this.autoDisconnect.UseVisualStyleBackColor = true;
this.autoDisconnect.CheckedChanged += new System.EventHandler(this.autoDisconnect_CheckedChanged);
//
@@ -165,7 +159,6 @@ namespace webImTray {
this.groupBox2.Size = new System.Drawing.Size(491, 107);
this.groupBox2.TabIndex = 2;
this.groupBox2.TabStop = false;
- this.groupBox2.Text = "Operator preferences";
//
// showUserPreferences
//
@@ -177,7 +170,6 @@ namespace webImTray {
this.showUserPreferences.Size = new System.Drawing.Size(296, 18);
this.showUserPreferences.TabIndex = 0;
this.showUserPreferences.TabStop = true;
- this.showUserPreferences.Text = "Click here to change your preferences online";
this.showUserPreferences.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.showUserPropertiesOnline);
//
// OptionsConnectionPanel
diff --git a/src/webimtray/WebIMTray/options/OptionsDialog.Designer.cs b/src/webimtray/WebIMTray/options/OptionsDialog.Designer.cs
index 82f9babd..00b459e3 100644
--- a/src/webimtray/WebIMTray/options/OptionsDialog.Designer.cs
+++ b/src/webimtray/WebIMTray/options/OptionsDialog.Designer.cs
@@ -54,7 +54,6 @@ namespace webImTray {
this.ok.Name = "ok";
this.ok.Size = new System.Drawing.Size(75, 23);
this.ok.TabIndex = 1;
- this.ok.Text = "OK";
this.ok.UseVisualStyleBackColor = true;
this.ok.Click += new System.EventHandler(this.ok_Click);
//
@@ -65,7 +64,6 @@ namespace webImTray {
this.cancel.Name = "cancel";
this.cancel.Size = new System.Drawing.Size(75, 23);
this.cancel.TabIndex = 2;
- this.cancel.Text = "Cancel";
this.cancel.UseVisualStyleBackColor = true;
//
// apply
@@ -75,7 +73,6 @@ namespace webImTray {
this.apply.Name = "apply";
this.apply.Size = new System.Drawing.Size(75, 23);
this.apply.TabIndex = 3;
- this.apply.Text = "Apply";
this.apply.UseVisualStyleBackColor = true;
this.apply.Click += new System.EventHandler(this.apply_Click);
//
@@ -95,7 +92,6 @@ namespace webImTray {
this.linkLabel1.Size = new System.Drawing.Size(96, 16);
this.linkLabel1.TabIndex = 5;
this.linkLabel1.TabStop = true;
- this.linkLabel1.Text = "www.webim.ru";
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.openWebIMSite);
//
// OptionsDialog
@@ -116,7 +112,6 @@ namespace webImTray {
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "OptionsDialog";
- this.Text = "WebIM Tray Options";
this.Load += new System.EventHandler(this.optionsDialogLoaded);
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.Designer.cs b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.Designer.cs
index c9932b0e..65023f51 100644
--- a/src/webimtray/WebIMTray/options/OptionsGeneralPanel.Designer.cs
+++ b/src/webimtray/WebIMTray/options/OptionsGeneralPanel.Designer.cs
@@ -54,7 +54,6 @@ namespace webImTray {
this.groupBox1.Size = new System.Drawing.Size(368, 106);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Application";
//
// hideWhenStarted
//
@@ -64,7 +63,6 @@ namespace webImTray {
this.hideWhenStarted.Name = "hideWhenStarted";
this.hideWhenStarted.Size = new System.Drawing.Size(134, 17);
this.hideWhenStarted.TabIndex = 3;
- this.hideWhenStarted.Text = "Hide window after start";
this.hideWhenStarted.UseVisualStyleBackColor = true;
this.hideWhenStarted.CheckedChanged += new System.EventHandler(this.checkboxChanged);
//
@@ -76,7 +74,6 @@ namespace webImTray {
this.autoStart.Name = "autoStart";
this.autoStart.Size = new System.Drawing.Size(225, 17);
this.autoStart.TabIndex = 1;
- this.autoStart.Text = "Start automatically when starting Windows";
this.autoStart.UseVisualStyleBackColor = true;
this.autoStart.CheckedChanged += new System.EventHandler(this.checkboxChanged);
//
@@ -88,7 +85,6 @@ namespace webImTray {
this.showInTaskBar.Name = "showInTaskBar";
this.showInTaskBar.Size = new System.Drawing.Size(103, 17);
this.showInTaskBar.TabIndex = 0;
- this.showInTaskBar.Text = "Show In taskbar";
this.showInTaskBar.UseVisualStyleBackColor = true;
this.showInTaskBar.CheckedChanged += new System.EventHandler(this.checkboxChanged);
//
@@ -105,7 +101,6 @@ namespace webImTray {
this.groupBox2.Size = new System.Drawing.Size(368, 89);
this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false;
- this.groupBox2.Text = "Hotkeys";
//
// textBox2
//
@@ -134,7 +129,6 @@ namespace webImTray {
this.showOptions.Name = "showOptions";
this.showOptions.Size = new System.Drawing.Size(90, 17);
this.showOptions.TabIndex = 1;
- this.showOptions.Text = "Show options";
this.showOptions.UseVisualStyleBackColor = true;
this.showOptions.CheckedChanged += new System.EventHandler(this.checkboxChanged);
//
@@ -147,7 +141,6 @@ namespace webImTray {
this.showHide.Name = "showHide";
this.showHide.Size = new System.Drawing.Size(147, 17);
this.showHide.TabIndex = 0;
- this.showHide.Text = "Show/Hide main window:";
this.showHide.UseVisualStyleBackColor = true;
this.showHide.CheckedChanged += new System.EventHandler(this.checkboxChanged);
//
@@ -161,31 +154,28 @@ namespace webImTray {
this.languageBox.Size = new System.Drawing.Size(371, 53);
this.languageBox.TabIndex = 2;
this.languageBox.TabStop = false;
- this.languageBox.Text = "Language";
//
// radioRussian
//
this.radioRussian.AutoSize = true;
+ this.radioRussian.Checked = true;
this.radioRussian.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
this.radioRussian.Location = new System.Drawing.Point(101, 30);
this.radioRussian.Name = "radioRussian";
this.radioRussian.Size = new System.Drawing.Size(63, 17);
this.radioRussian.TabIndex = 1;
- this.radioRussian.Text = "Russian";
+ this.radioRussian.TabStop = true;
this.radioRussian.UseVisualStyleBackColor = true;
this.radioRussian.CheckedChanged += new System.EventHandler(this.radioRussian_CheckedChanged);
//
// radioEnglish
//
this.radioEnglish.AutoSize = true;
- this.radioEnglish.Checked = true;
this.radioEnglish.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
this.radioEnglish.Location = new System.Drawing.Point(15, 30);
this.radioEnglish.Name = "radioEnglish";
this.radioEnglish.Size = new System.Drawing.Size(59, 17);
this.radioEnglish.TabIndex = 0;
- this.radioEnglish.TabStop = true;
- this.radioEnglish.Text = "English";
this.radioEnglish.UseVisualStyleBackColor = true;
this.radioEnglish.CheckedChanged += new System.EventHandler(this.radioEnglish_CheckedChanged);
//
diff --git a/src/webimtray/WebIMTray/options/OptionsSoundsPanel.Designer.cs b/src/webimtray/WebIMTray/options/OptionsSoundsPanel.Designer.cs
index d490da7c..71388f43 100644
--- a/src/webimtray/WebIMTray/options/OptionsSoundsPanel.Designer.cs
+++ b/src/webimtray/WebIMTray/options/OptionsSoundsPanel.Designer.cs
@@ -38,7 +38,6 @@ namespace webImTray {
this.groupBox1.Size = new System.Drawing.Size(368, 156);
this.groupBox1.TabIndex = 2;
this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Notifications";
//
// playSoundOnVisitor
//
@@ -49,7 +48,6 @@ namespace webImTray {
this.playSoundOnVisitor.Name = "playSoundOnVisitor";
this.playSoundOnVisitor.Size = new System.Drawing.Size(171, 17);
this.playSoundOnVisitor.TabIndex = 0;
- this.playSoundOnVisitor.Text = "Play sound when visitor comes";
this.playSoundOnVisitor.UseVisualStyleBackColor = true;
//
// OptionsSoundsPanel
diff --git a/src/webimtray/WebIMTray/webImTray.en-US.resx b/src/webimtray/WebIMTray/webImTray.en-US.resx
index 94dd6f55..c4488489 100644
--- a/src/webimtray/WebIMTray/webImTray.en-US.resx
+++ b/src/webimtray/WebIMTray/webImTray.en-US.resx
@@ -150,6 +150,9 @@
English
+
+ Do you want to quit WebIM for Tray?
+
Force page update every
@@ -231,4 +234,7 @@
Web Messenger Tray
+
+ Web Messenger
+
\ No newline at end of file
diff --git a/src/webimtray/WebIMTray/webImTray.ru-RU.resx b/src/webimtray/WebIMTray/webImTray.ru-RU.resx
index 6b04aa5f..09df56d6 100644
--- a/src/webimtray/WebIMTray/webImTray.ru-RU.resx
+++ b/src/webimtray/WebIMTray/webImTray.ru-RU.resx
@@ -150,6 +150,9 @@
Английский
+
+ Вы действительно хотите выйти из приложения?
+
Обновлять каждые
@@ -231,4 +234,7 @@
Веб Мессенджер "Трей"
+
+ Веб Мессенджер
+
\ No newline at end of file