From d2578e5be55ede32c05cbb8d4e290ecd820c9059 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Tue, 12 Feb 2019 22:18:51 +0100 Subject: [PATCH 01/13] made hardcoded strings on updates options page translatable, fixes #785 --- .../Resources/Language/Language.Designer.cs | 20 +++++ mRemoteV1/Resources/Language/Language.resx | 8 ++ .../OptionsPages/UpdatesPage.Designer.cs | 82 +++++++++---------- .../UI/Forms/OptionsPages/UpdatesPage.cs | 3 + 4 files changed, 68 insertions(+), 45 deletions(-) diff --git a/mRemoteV1/Resources/Language/Language.Designer.cs b/mRemoteV1/Resources/Language/Language.Designer.cs index 9852deb91..a80293275 100644 --- a/mRemoteV1/Resources/Language/Language.Designer.cs +++ b/mRemoteV1/Resources/Language/Language.Designer.cs @@ -6433,6 +6433,26 @@ namespace mRemoteNG { } } + /// + /// Looks up a localized string similar to Release Channel. + /// + internal static string strReleaseChannel { + get { + return ResourceManager.GetString("strReleaseChannel", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Stable channel includes final releases only. + ///Beta channel includes Betas & Release Candidates. + ///Development Channel includes Alphas, Betas & Release Candidates.. + /// + internal static string strReleaseChannelExplanation { + get { + return ResourceManager.GetString("strReleaseChannelExplanation", resourceCulture); + } + } + /// /// Looks up a localized string similar to Remote file. /// diff --git a/mRemoteV1/Resources/Language/Language.resx b/mRemoteV1/Resources/Language/Language.resx index d6f81eac2..a7b40c09f 100644 --- a/mRemoteV1/Resources/Language/Language.resx +++ b/mRemoteV1/Resources/Language/Language.resx @@ -2746,4 +2746,12 @@ This page will walk you through the process of upgrading your connections file o Always show connection tabs + + Release Channel + + + Stable channel includes final releases only. +Beta channel includes Betas & Release Candidates. +Development Channel includes Alphas, Betas & Release Candidates. + \ No newline at end of file diff --git a/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.Designer.cs index 43e41782d..172b1f08f 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.Designer.cs @@ -34,8 +34,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.btnUpdateCheckNow = new mRemoteNG.UI.Controls.Base.NGButton(); this.chkCheckForUpdatesOnStartup = new mRemoteNG.UI.Controls.Base.NGCheckBox(); this.cboUpdateCheckFrequency = new mRemoteNG.UI.Controls.Base.NGComboBox(); - this.textBox1 = new mRemoteNG.UI.Controls.Base.NGTextBox(); - this.lblReleaseChannel = new mRemoteNG.UI.Controls.Base.NGLabel(); + this.lblReleaseChannelExplanation = new mRemoteNG.UI.Controls.Base.NGTextBox(); this.cboReleaseChannel = new mRemoteNG.UI.Controls.Base.NGComboBox(); this.pnlProxy = new System.Windows.Forms.Panel(); this.pnlProxyBasic = new System.Windows.Forms.Panel(); @@ -51,13 +50,13 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.lblProxyPassword = new mRemoteNG.UI.Controls.Base.NGLabel(); this.txtProxyPassword = new mRemoteNG.UI.Controls.Base.NGTextBox(); this.btnTestProxy = new mRemoteNG.UI.Controls.Base.NGButton(); - this.pnlReleaseChannel = new System.Windows.Forms.Panel(); + this.groupBoxReleaseChannel = new mRemoteNG.UI.Controls.Base.NGGroupBox(); this.pnlUpdateCheck.SuspendLayout(); this.pnlProxy.SuspendLayout(); this.pnlProxyBasic.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numProxyPort)).BeginInit(); this.pnlProxyAuthentication.SuspendLayout(); - this.pnlReleaseChannel.SuspendLayout(); + this.groupBoxReleaseChannel.SuspendLayout(); this.SuspendLayout(); // // lblUpdatesExplanation @@ -81,7 +80,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // btnUpdateCheckNow // - this.btnUpdateCheckNow._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.HOVER; + this.btnUpdateCheckNow._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.OUT; this.btnUpdateCheckNow.Location = new System.Drawing.Point(3, 49); this.btnUpdateCheckNow.Name = "btnUpdateCheckNow"; this.btnUpdateCheckNow.Size = new System.Drawing.Size(120, 23); @@ -92,7 +91,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // chkCheckForUpdatesOnStartup // - this.chkCheckForUpdatesOnStartup._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER; + this.chkCheckForUpdatesOnStartup._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.OUT; this.chkCheckForUpdatesOnStartup.AutoSize = true; this.chkCheckForUpdatesOnStartup.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkCheckForUpdatesOnStartup.Location = new System.Drawing.Point(3, 4); @@ -113,36 +112,27 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.cboUpdateCheckFrequency.Size = new System.Drawing.Size(120, 21); this.cboUpdateCheckFrequency.TabIndex = 1; // - // textBox1 + // lblReleaseChannelExplanation // - this.textBox1.BackColor = System.Drawing.SystemColors.Control; - this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.textBox1.Location = new System.Drawing.Point(3, 47); - this.textBox1.Multiline = true; - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - this.textBox1.Size = new System.Drawing.Size(366, 44); - this.textBox1.TabIndex = 2; - this.textBox1.Text = "Stable channel includes final releases only.\r\nBeta channel includes Betas & Relea" + + this.lblReleaseChannelExplanation.BackColor = System.Drawing.SystemColors.Control; + this.lblReleaseChannelExplanation.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.lblReleaseChannelExplanation.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblReleaseChannelExplanation.Location = new System.Drawing.Point(3, 50); + this.lblReleaseChannelExplanation.Multiline = true; + this.lblReleaseChannelExplanation.Name = "lblReleaseChannelExplanation"; + this.lblReleaseChannelExplanation.ReadOnly = true; + this.lblReleaseChannelExplanation.Size = new System.Drawing.Size(595, 44); + this.lblReleaseChannelExplanation.TabIndex = 2; + this.lblReleaseChannelExplanation.Text = "Stable channel includes final releases only.\r\nBeta channel includes Betas & Relea" + "se Candidates.\r\nDevelopment Channel includes Alphas, Betas & Release Candidates." + ""; - // - // lblReleaseChannel - // - this.lblReleaseChannel.AutoSize = true; - this.lblReleaseChannel.Location = new System.Drawing.Point(0, 3); - this.lblReleaseChannel.Margin = new System.Windows.Forms.Padding(3); - this.lblReleaseChannel.Name = "lblReleaseChannel"; - this.lblReleaseChannel.Size = new System.Drawing.Size(95, 13); - this.lblReleaseChannel.TabIndex = 0; - this.lblReleaseChannel.Text = "Release Channel:"; // // cboReleaseChannel // this.cboReleaseChannel._mice = mRemoteNG.UI.Controls.Base.NGComboBox.MouseState.HOVER; this.cboReleaseChannel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboReleaseChannel.FormattingEnabled = true; - this.cboReleaseChannel.Location = new System.Drawing.Point(3, 20); + this.cboReleaseChannel.Location = new System.Drawing.Point(3, 21); this.cboReleaseChannel.Name = "cboReleaseChannel"; this.cboReleaseChannel.Size = new System.Drawing.Size(120, 21); this.cboReleaseChannel.TabIndex = 1; @@ -183,6 +173,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // txtProxyAddress // this.txtProxyAddress.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtProxyAddress.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtProxyAddress.Location = new System.Drawing.Point(110, 4); this.txtProxyAddress.Name = "txtProxyAddress"; this.txtProxyAddress.Size = new System.Drawing.Size(240, 22); @@ -222,7 +213,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // chkUseProxyForAutomaticUpdates // - this.chkUseProxyForAutomaticUpdates._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER; + this.chkUseProxyForAutomaticUpdates._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.OUT; this.chkUseProxyForAutomaticUpdates.AutoSize = true; this.chkUseProxyForAutomaticUpdates.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkUseProxyForAutomaticUpdates.Location = new System.Drawing.Point(6, 0); @@ -235,7 +226,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // chkUseProxyAuthentication // - this.chkUseProxyAuthentication._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER; + this.chkUseProxyAuthentication._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.OUT; this.chkUseProxyAuthentication.AutoSize = true; this.chkUseProxyAuthentication.Enabled = false; this.chkUseProxyAuthentication.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -271,6 +262,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // txtProxyUsername // this.txtProxyUsername.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtProxyUsername.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtProxyUsername.Location = new System.Drawing.Point(110, 4); this.txtProxyUsername.Name = "txtProxyUsername"; this.txtProxyUsername.Size = new System.Drawing.Size(240, 22); @@ -288,6 +280,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // txtProxyPassword // this.txtProxyPassword.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtProxyPassword.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtProxyPassword.Location = new System.Drawing.Point(110, 30); this.txtProxyPassword.Name = "txtProxyPassword"; this.txtProxyPassword.Size = new System.Drawing.Size(240, 22); @@ -296,7 +289,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // btnTestProxy // - this.btnTestProxy._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.HOVER; + this.btnTestProxy._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.OUT; this.btnTestProxy.Location = new System.Drawing.Point(6, 172); this.btnTestProxy.Name = "btnTestProxy"; this.btnTestProxy.Size = new System.Drawing.Size(120, 23); @@ -305,25 +298,25 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.btnTestProxy.UseVisualStyleBackColor = true; this.btnTestProxy.Click += new System.EventHandler(this.btnTestProxy_Click); // - // pnlReleaseChannel + // groupBoxReleaseChannel // - this.pnlReleaseChannel.Controls.Add(this.textBox1); - this.pnlReleaseChannel.Controls.Add(this.lblReleaseChannel); - this.pnlReleaseChannel.Controls.Add(this.cboReleaseChannel); - this.pnlReleaseChannel.Location = new System.Drawing.Point(3, 123); - this.pnlReleaseChannel.Name = "pnlReleaseChannel"; - this.pnlReleaseChannel.Size = new System.Drawing.Size(604, 97); - this.pnlReleaseChannel.TabIndex = 2; + this.groupBoxReleaseChannel.Controls.Add(this.lblReleaseChannelExplanation); + this.groupBoxReleaseChannel.Controls.Add(this.cboReleaseChannel); + this.groupBoxReleaseChannel.Location = new System.Drawing.Point(3, 123); + this.groupBoxReleaseChannel.Name = "groupBoxReleaseChannel"; + this.groupBoxReleaseChannel.Size = new System.Drawing.Size(604, 100); + this.groupBoxReleaseChannel.TabIndex = 3; + this.groupBoxReleaseChannel.TabStop = false; + this.groupBoxReleaseChannel.Text = "Release Channel"; // // UpdatesPage // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.Controls.Add(this.pnlReleaseChannel); + this.Controls.Add(this.groupBoxReleaseChannel); this.Controls.Add(this.lblUpdatesExplanation); this.Controls.Add(this.pnlUpdateCheck); this.Controls.Add(this.pnlProxy); - this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "UpdatesPage"; this.Size = new System.Drawing.Size(610, 490); this.pnlUpdateCheck.ResumeLayout(false); @@ -335,8 +328,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages ((System.ComponentModel.ISupportInitialize)(this.numProxyPort)).EndInit(); this.pnlProxyAuthentication.ResumeLayout(false); this.pnlProxyAuthentication.PerformLayout(); - this.pnlReleaseChannel.ResumeLayout(false); - this.pnlReleaseChannel.PerformLayout(); + this.groupBoxReleaseChannel.ResumeLayout(false); + this.groupBoxReleaseChannel.PerformLayout(); this.ResumeLayout(false); } @@ -359,9 +352,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages internal Controls.Base.NGLabel lblProxyPassword; internal Controls.Base.NGTextBox txtProxyPassword; internal Controls.Base.NGButton btnTestProxy; - private Controls.Base.NGLabel lblReleaseChannel; private Controls.Base.NGComboBox cboReleaseChannel; - private Controls.Base.NGTextBox textBox1; - private System.Windows.Forms.Panel pnlReleaseChannel; + private Controls.Base.NGTextBox lblReleaseChannelExplanation; + private Controls.Base.NGGroupBox groupBoxReleaseChannel; } } \ No newline at end of file diff --git a/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs b/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs index 65a013c33..36deec27a 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs @@ -41,6 +41,9 @@ namespace mRemoteNG.UI.Forms.OptionsPages chkCheckForUpdatesOnStartup.Text = Language.strCheckForUpdatesOnStartup; btnUpdateCheckNow.Text = Language.strCheckNow; + groupBoxReleaseChannel.Text = Language.strReleaseChannel; + lblReleaseChannelExplanation.Text = Language.strReleaseChannelExplanation; + chkUseProxyForAutomaticUpdates.Text = Language.strCheckboxUpdateUseProxy; lblProxyAddress.Text = Language.strLabelAddress; lblProxyPort.Text = Language.strLabelPort; From 595a22efc3b539761a87119eab16a75fc2cfb3b4 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Tue, 12 Feb 2019 22:53:10 +0100 Subject: [PATCH 02/13] made hardcoded text on buttons translatable --- mRemoteV1/UI/Forms/frmOptions.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mRemoteV1/UI/Forms/frmOptions.cs b/mRemoteV1/UI/Forms/frmOptions.cs index 390ffd3a6..cbd9440ca 100644 --- a/mRemoteV1/UI/Forms/frmOptions.cs +++ b/mRemoteV1/UI/Forms/frmOptions.cs @@ -37,6 +37,9 @@ namespace mRemoteNG.UI.Forms // Handle the main page here and the individual pages in // AddOptionsPagesToListView() -- one less foreach loop.... Text = Language.strOptionsPageTitle; + btnOK.Text = Language.strButtonOK; + btnCancel.Text = Language.strButtonCancel; + btnApply.Text = Language.strButtonApply; ApplyTheme(); ThemeManager.getInstance().ThemeChanged += ApplyTheme; lstOptionPages.SelectedIndexChanged += LstOptionPages_SelectedIndexChanged; From 7eda617af944cd96e732ce0271c7666eddbb5fa0 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Tue, 12 Feb 2019 22:53:24 +0100 Subject: [PATCH 03/13] added/fixed german translation --- .../Resources/Language/Language.Designer.cs | 27 ++++++++---- mRemoteV1/Resources/Language/Language.de.resx | 43 ++++++++++++++++--- mRemoteV1/Resources/Language/Language.resx | 5 ++- .../OptionsPages/ConnectionsPage.Designer.cs | 26 ++++++----- .../Forms/OptionsPages/ThemePage.Designer.cs | 4 +- mRemoteV1/UI/Forms/OptionsPages/ThemePage.cs | 2 +- 6 files changed, 76 insertions(+), 31 deletions(-) diff --git a/mRemoteV1/Resources/Language/Language.Designer.cs b/mRemoteV1/Resources/Language/Language.Designer.cs index a80293275..594274fe0 100644 --- a/mRemoteV1/Resources/Language/Language.Designer.cs +++ b/mRemoteV1/Resources/Language/Language.Designer.cs @@ -564,6 +564,15 @@ namespace mRemoteNG { } } + /// + /// Looks up a localized string similar to Apply. + /// + internal static string strButtonApply { + get { + return ResourceManager.GetString("strButtonApply", resourceCulture); + } + } + /// /// Looks up a localized string similar to &Browse.... /// @@ -4380,6 +4389,15 @@ namespace mRemoteNG { } } + /// + /// Looks up a localized string similar to Warning: Restart is required to commit any theme configuration change.. + /// + internal static string strOptionsThemeChangeWarning { + get { + return ResourceManager.GetString("strOptionsThemeChangeWarning", resourceCulture); + } + } + /// /// Looks up a localized string similar to Do you really want to delete the theme?. /// @@ -4434,15 +4452,6 @@ namespace mRemoteNG { } } - /// - /// Looks up a localized string similar to Warning: Restart is required to commit any theme configuration change.. - /// - internal static string strOptionsThemeThemeChaangeWarning { - get { - return ResourceManager.GetString("strOptionsThemeThemeChaangeWarning", resourceCulture); - } - } - /// /// Looks up a localized string similar to Out Of Range. /// diff --git a/mRemoteV1/Resources/Language/Language.de.resx b/mRemoteV1/Resources/Language/Language.de.resx index 4907e90f3..6ad09f824 100644 --- a/mRemoteV1/Resources/Language/Language.de.resx +++ b/mRemoteV1/Resources/Language/Language.de.resx @@ -580,7 +580,7 @@ Starte mit neuer Datei. Wollen Sie ohne Passwort fortfahren? - Bei leeren Benutzername-, Passwort- oder Domänenfeldern benutze: + Bei leeren Feldern für Benutzername, Passwort oder Domäne verwende: 128 Bit @@ -742,7 +742,7 @@ Starte mit neuer Datei. Setzen der Auflösung fehlgschlagen! - Quick connect Registerkarten identifizieren, indem das Präfix "Quick:" benutzt wird + QuickConnect-Tabs identifizieren, indem das Präfix "Quick" benutzt wird Von Active Directory importieren @@ -1117,7 +1117,7 @@ Starte mit neuer Datei. Nach oben - meine aktuellen (Windows-Anmeldeinformationen) + meine aktuellen Windows-Anmeldeinformationen Niemals @@ -1147,7 +1147,7 @@ Starte mit neuer Datei. Kein externes Programm definiert! - keine + keine Anmeldeinformationen Keine Angabe @@ -1172,7 +1172,7 @@ Wenn Sie Fehler feststellen, dann sollten Sie eine neue Verbindungsdatei erstell Offene Ports - Aussehen + Theme &Löschen @@ -1885,7 +1885,7 @@ Wenn Sie Fehler feststellen, dann sollten Sie eine neue Verbindungsdatei erstell Erster Port - Anfang/Ende + Start/Ende Status @@ -2353,7 +2353,7 @@ Diese Seite führt Sie durch den Prozess der Aktualisierung Ihrer Verbindungsdat Dieser Knoten ist nicht verschiebbar. - Block Cipher-Modus + Block-Cipher-Modus Zeige diese Nachrichtentypen @@ -2617,4 +2617,33 @@ Wählen Sie einen Pfad für die mRemoteNG-Protokolldatei Suchleiste über den Verbindungen anzeigen + + Erstelle ein leeres Panel, wenn mRemoteNG gestartet wird + + + Update-Kanal + + + Stable enthält nur finale Versionen. +Beta beinhaltet Betas & Release Candidates. +Development umfasst Alphas, Betas und Release Candidates. + + + Aktive Verbindung im Verbindungsbaum verfolgen + + + Iterationen der Schlüsselableitungsfunktion + + + UTF8-Kodierung für RDP Eigenschaft "Load Balance Info" verwenden + + + Anmeldedaten + + + Anwenden + + + Warnung: Ein Neustart ist erforderlich, um Änderungen am Theme anzuwenden. + \ No newline at end of file diff --git a/mRemoteV1/Resources/Language/Language.resx b/mRemoteV1/Resources/Language/Language.resx index a7b40c09f..6cab2a3da 100644 --- a/mRemoteV1/Resources/Language/Language.resx +++ b/mRemoteV1/Resources/Language/Language.resx @@ -2584,7 +2584,7 @@ This page will walk you through the process of upgrading your connections file o Type the new theme name - + Warning: Restart is required to commit any theme configuration change. @@ -2754,4 +2754,7 @@ This page will walk you through the process of upgrading your connections file o Beta channel includes Betas & Release Candidates. Development Channel includes Alphas, Betas & Release Candidates. + + Apply + \ No newline at end of file diff --git a/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.Designer.cs index a3a2fa23f..5037731ce 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.Designer.cs @@ -120,7 +120,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // chkSingleClickOnConnectionOpensIt // - this.chkSingleClickOnConnectionOpensIt._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER; + this.chkSingleClickOnConnectionOpensIt._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.OUT; this.chkSingleClickOnConnectionOpensIt.AutoSize = true; this.chkSingleClickOnConnectionOpensIt.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkSingleClickOnConnectionOpensIt.Location = new System.Drawing.Point(3, 3); @@ -132,7 +132,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // chkHostnameLikeDisplayName // - this.chkHostnameLikeDisplayName._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER; + this.chkHostnameLikeDisplayName._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.OUT; this.chkHostnameLikeDisplayName.AutoSize = true; this.chkHostnameLikeDisplayName.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkHostnameLikeDisplayName.Location = new System.Drawing.Point(3, 72); @@ -144,7 +144,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // chkSingleClickOnOpenedConnectionSwitchesToIt // - this.chkSingleClickOnOpenedConnectionSwitchesToIt._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER; + this.chkSingleClickOnOpenedConnectionSwitchesToIt._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.OUT; this.chkSingleClickOnOpenedConnectionSwitchesToIt.AutoSize = true; this.chkSingleClickOnOpenedConnectionSwitchesToIt.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkSingleClickOnOpenedConnectionSwitchesToIt.Location = new System.Drawing.Point(3, 26); @@ -201,50 +201,54 @@ namespace mRemoteNG.UI.Forms.OptionsPages // radCloseWarnAll // this.radCloseWarnAll.AutoSize = true; + this.radCloseWarnAll.BackColor = System.Drawing.Color.Transparent; this.radCloseWarnAll.Location = new System.Drawing.Point(16, 34); this.radCloseWarnAll.Name = "radCloseWarnAll"; this.radCloseWarnAll.Size = new System.Drawing.Size(209, 17); this.radCloseWarnAll.TabIndex = 1; this.radCloseWarnAll.TabStop = true; this.radCloseWarnAll.Text = "Warn me when closing connections"; - this.radCloseWarnAll.UseVisualStyleBackColor = true; + this.radCloseWarnAll.UseVisualStyleBackColor = false; // // radCloseWarnMultiple // this.radCloseWarnMultiple.AutoSize = true; + this.radCloseWarnMultiple.BackColor = System.Drawing.Color.Transparent; this.radCloseWarnMultiple.Location = new System.Drawing.Point(16, 57); this.radCloseWarnMultiple.Name = "radCloseWarnMultiple"; this.radCloseWarnMultiple.Size = new System.Drawing.Size(279, 17); this.radCloseWarnMultiple.TabIndex = 2; this.radCloseWarnMultiple.TabStop = true; this.radCloseWarnMultiple.Text = "Warn me only when closing multiple connections"; - this.radCloseWarnMultiple.UseVisualStyleBackColor = true; + this.radCloseWarnMultiple.UseVisualStyleBackColor = false; // // radCloseWarnExit // this.radCloseWarnExit.AutoSize = true; + this.radCloseWarnExit.BackColor = System.Drawing.Color.Transparent; this.radCloseWarnExit.Location = new System.Drawing.Point(16, 80); this.radCloseWarnExit.Name = "radCloseWarnExit"; this.radCloseWarnExit.Size = new System.Drawing.Size(233, 17); this.radCloseWarnExit.TabIndex = 3; this.radCloseWarnExit.TabStop = true; this.radCloseWarnExit.Text = "Warn me only when exiting mRemoteNG"; - this.radCloseWarnExit.UseVisualStyleBackColor = true; + this.radCloseWarnExit.UseVisualStyleBackColor = false; // // radCloseWarnNever // this.radCloseWarnNever.AutoSize = true; + this.radCloseWarnNever.BackColor = System.Drawing.Color.Transparent; this.radCloseWarnNever.Location = new System.Drawing.Point(16, 103); this.radCloseWarnNever.Name = "radCloseWarnNever"; this.radCloseWarnNever.Size = new System.Drawing.Size(246, 17); this.radCloseWarnNever.TabIndex = 4; this.radCloseWarnNever.TabStop = true; this.radCloseWarnNever.Text = "Do not warn me when closing connections"; - this.radCloseWarnNever.UseVisualStyleBackColor = true; + this.radCloseWarnNever.UseVisualStyleBackColor = false; // // chkSaveConnectionsAfterEveryEdit // - this.chkSaveConnectionsAfterEveryEdit._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER; + this.chkSaveConnectionsAfterEveryEdit._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.OUT; this.chkSaveConnectionsAfterEveryEdit.AutoSize = true; this.chkSaveConnectionsAfterEveryEdit.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkSaveConnectionsAfterEveryEdit.Location = new System.Drawing.Point(3, 95); @@ -256,7 +260,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // chkUseFilterSearch // - this.chkUseFilterSearch._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER; + this.chkUseFilterSearch._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.OUT; this.chkUseFilterSearch.AutoSize = true; this.chkUseFilterSearch.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkUseFilterSearch.Location = new System.Drawing.Point(3, 118); @@ -288,7 +292,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // chkPlaceSearchBarAboveConnectionTree // - this.chkPlaceSearchBarAboveConnectionTree._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER; + this.chkPlaceSearchBarAboveConnectionTree._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.OUT; this.chkPlaceSearchBarAboveConnectionTree.AutoSize = true; this.chkPlaceSearchBarAboveConnectionTree.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkPlaceSearchBarAboveConnectionTree.Location = new System.Drawing.Point(3, 141); @@ -300,7 +304,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // chkConnectionTreeTrackActiveConnection // - this.chkConnectionTreeTrackActiveConnection._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.HOVER; + this.chkConnectionTreeTrackActiveConnection._mice = mRemoteNG.UI.Controls.Base.NGCheckBox.MouseState.OUT; this.chkConnectionTreeTrackActiveConnection.AutoSize = true; this.chkConnectionTreeTrackActiveConnection.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkConnectionTreeTrackActiveConnection.Location = new System.Drawing.Point(3, 49); diff --git a/mRemoteV1/UI/Forms/OptionsPages/ThemePage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/ThemePage.Designer.cs index db0215ecd..6b55e1dd0 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/ThemePage.Designer.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/ThemePage.Designer.cs @@ -49,7 +49,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // btnThemeDelete // - this.btnThemeDelete._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.HOVER; + this.btnThemeDelete._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.OUT; this.btnThemeDelete.Dock = System.Windows.Forms.DockStyle.Fill; this.btnThemeDelete.Location = new System.Drawing.Point(507, 3); this.btnThemeDelete.Name = "btnThemeDelete"; @@ -61,7 +61,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // btnThemeNew // - this.btnThemeNew._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.HOVER; + this.btnThemeNew._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.OUT; this.btnThemeNew.Dock = System.Windows.Forms.DockStyle.Fill; this.btnThemeNew.Location = new System.Drawing.Point(407, 3); this.btnThemeNew.Name = "btnThemeNew"; diff --git a/mRemoteV1/UI/Forms/OptionsPages/ThemePage.cs b/mRemoteV1/UI/Forms/OptionsPages/ThemePage.cs index f0a1e73b0..db6fd8756 100644 --- a/mRemoteV1/UI/Forms/OptionsPages/ThemePage.cs +++ b/mRemoteV1/UI/Forms/OptionsPages/ThemePage.cs @@ -41,7 +41,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages btnThemeDelete.Text = Language.strOptionsThemeButtonDelete; btnThemeNew.Text = Language.strOptionsThemeButtonNew; - labelRestart.Text = Language.strOptionsThemeThemeChaangeWarning; + labelRestart.Text = Language.strOptionsThemeChangeWarning; } private new void ApplyTheme() From 91f01abbaea29bceade710f668fac67eee54896f Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Wed, 13 Feb 2019 09:57:28 +0100 Subject: [PATCH 04/13] fixed some more inconsistencies/missing strings in german translation --- mRemoteV1/Resources/Language/Language.de.resx | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/mRemoteV1/Resources/Language/Language.de.resx b/mRemoteV1/Resources/Language/Language.de.resx index 6ad09f824..ac700267d 100644 --- a/mRemoteV1/Resources/Language/Language.de.resx +++ b/mRemoteV1/Resources/Language/Language.de.resx @@ -166,7 +166,7 @@ Verwende die empfohlenen Einstellungen - {0} kann automatisch nach Updates suchen, die neue Funktionen und Bug Fixes enthalten können. Es wird empfohlen, dass Sie {0}, erlauben wöchentlich nach Updates zu suchen. + {0} kann automatisch nach Updates suchen, die neue Funktionen und Bug Fixes enthalten können. Es wird empfohlen, dass Sie {0} erlauben wöchentlich nach Updates zu suchen. Automatische Update-Einstellungen @@ -451,7 +451,8 @@ VncSharp Control Version {0} Möchten Sie die Verbindung "{0}" schließen? - Sind sie sicher, dass Sie das Panel "{0}" schließen möchten? Alle Verbindungen, die es enthält, werden ebenfalls geschlossen. + Sind sie sicher, dass Sie das Panel "{0}" schließen möchten? +Alle Verbindungen die es enthält werden ebenfalls geschlossen. Sind Sie sicher, dass Sie das extene Programm "{0}" entfernen möchten? @@ -940,7 +941,7 @@ Starte mit neuer Datei. STRG-ESC - Löschen... + Löschen Verbindung löschen... @@ -1015,7 +1016,7 @@ Starte mit neuer Datei. Alle Löschen - Verbindungsdatei öffnen... + Verbindungsdatei öffnen Optionen @@ -1057,7 +1058,7 @@ Starte mit neuer Datei. Verbindungsdatei speichern - Verbindungsdatei speichern unter... + Verbindungsdatei speichern unter Bildschirmschnappschuss @@ -2419,7 +2420,7 @@ Diese Seite führt Sie durch den Prozess der Aktualisierung Ihrer Verbindungsdat Verbindung testen - In Datei &exportieren... + In Datei &exportieren Beim Importieren der Datei ist ein Fehler aufgetreten ("{0}"). @@ -2646,4 +2647,10 @@ Development umfasst Alphas, Betas und Release Candidates. Warnung: Ein Neustart ist erforderlich, um Änderungen am Theme anzuwenden. + + Zwischenablage + + + Wählen Sie aus, ob die Zwischenablage freigegeben werden soll. + \ No newline at end of file From 220396d016a736b60d077470df45d3c47578499e Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Wed, 13 Feb 2019 21:24:53 +0100 Subject: [PATCH 05/13] renamed proxy settings category from miscellaneous to proxy as there was already a categroy named miscellaneous --- mRemoteV1/Connection/AbstractConnectionRecord.cs | 10 +++++----- mRemoteV1/Connection/ConnectionInfoInheritance.cs | 10 +++++----- mRemoteV1/Resources/Language/Language.Designer.cs | 9 +++++++++ mRemoteV1/Resources/Language/Language.resx | 3 +++ mRemoteV1/UI/Window/ConfigWindow.cs | 1 - 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/mRemoteV1/Connection/AbstractConnectionRecord.cs b/mRemoteV1/Connection/AbstractConnectionRecord.cs index a7f8c6fba..3a9c37b5f 100644 --- a/mRemoteV1/Connection/AbstractConnectionRecord.cs +++ b/mRemoteV1/Connection/AbstractConnectionRecord.cs @@ -584,7 +584,7 @@ namespace mRemoteNG.Connection set => SetField(ref _vncAuthMode, value, "VNCAuthMode"); } - [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7), + [LocalizedAttributes.LocalizedCategory("strCategoryProxy", 7), Browsable(false), LocalizedAttributes.LocalizedDisplayName("strPropertyNameVNCProxyType"), LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVNCProxyType"), @@ -595,7 +595,7 @@ namespace mRemoteNG.Connection set => SetField(ref _vncProxyType, value, "VNCProxyType"); } - [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7), + [LocalizedAttributes.LocalizedCategory("strCategoryProxy", 7), Browsable(false), LocalizedAttributes.LocalizedDisplayName("strPropertyNameVNCProxyAddress"), LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVNCProxyAddress")] @@ -605,7 +605,7 @@ namespace mRemoteNG.Connection set => SetField(ref _vncProxyIp, value, "VNCProxyIP"); } - [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7), + [LocalizedAttributes.LocalizedCategory("strCategoryProxy", 7), Browsable(false), LocalizedAttributes.LocalizedDisplayName("strPropertyNameVNCProxyPort"), LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVNCProxyPort")] @@ -615,7 +615,7 @@ namespace mRemoteNG.Connection set => SetField(ref _vncProxyPort, value, "VNCProxyPort"); } - [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7), + [LocalizedAttributes.LocalizedCategory("strCategoryProxy", 7), Browsable(false), LocalizedAttributes.LocalizedDisplayName("strPropertyNameVNCProxyUsername"), LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVNCProxyUsername")] @@ -625,7 +625,7 @@ namespace mRemoteNG.Connection set => SetField(ref _vncProxyUsername, value, "VNCProxyUsername"); } - [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7), + [LocalizedAttributes.LocalizedCategory("strCategoryProxy", 7), Browsable(false), LocalizedAttributes.LocalizedDisplayName("strPropertyNameVNCProxyPassword"), LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVNCProxyPassword"), diff --git a/mRemoteV1/Connection/ConnectionInfoInheritance.cs b/mRemoteV1/Connection/ConnectionInfoInheritance.cs index c937f72a9..2c669f88f 100644 --- a/mRemoteV1/Connection/ConnectionInfoInheritance.cs +++ b/mRemoteV1/Connection/ConnectionInfoInheritance.cs @@ -279,27 +279,27 @@ namespace mRemoteNG.Connection LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionAuthenticationMode"), TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCAuthMode {get; set;} - [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 9), + [LocalizedAttributes.LocalizedCategory("strCategoryProxy", 9), LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyType"), LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyType"), TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyType {get; set;} - [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 9), + [LocalizedAttributes.LocalizedCategory("strCategoryProxy", 9), LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyAddress"), LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyAddress"), TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyIP {get; set;} - [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 9), + [LocalizedAttributes.LocalizedCategory("strCategoryProxy", 9), LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyPort"), LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyPort"), TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyPort {get; set;} - [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 9), + [LocalizedAttributes.LocalizedCategory("strCategoryProxy", 9), LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyUsername"), LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyUsername"), TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyUsername {get; set;} - [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 9), + [LocalizedAttributes.LocalizedCategory("strCategoryProxy", 9), LocalizedAttributes.LocalizedDisplayNameInheritAttribute("strPropertyNameVNCProxyPassword"), LocalizedAttributes.LocalizedDescriptionInheritAttribute("strPropertyDescriptionVNCProxyPassword"), TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyPassword {get; set;} diff --git a/mRemoteV1/Resources/Language/Language.Designer.cs b/mRemoteV1/Resources/Language/Language.Designer.cs index 594274fe0..7f23e3786 100644 --- a/mRemoteV1/Resources/Language/Language.Designer.cs +++ b/mRemoteV1/Resources/Language/Language.Designer.cs @@ -826,6 +826,15 @@ namespace mRemoteNG { } } + /// + /// Looks up a localized string similar to Proxy. + /// + internal static string strCategoryProxy { + get { + return ResourceManager.GetString("strCategoryProxy", resourceCulture); + } + } + /// /// Looks up a localized string similar to Redirect. /// diff --git a/mRemoteV1/Resources/Language/Language.resx b/mRemoteV1/Resources/Language/Language.resx index 6cab2a3da..aba77fd17 100644 --- a/mRemoteV1/Resources/Language/Language.resx +++ b/mRemoteV1/Resources/Language/Language.resx @@ -2757,4 +2757,7 @@ Development Channel includes Alphas, Betas & Release Candidates. Apply + + Proxy + \ No newline at end of file diff --git a/mRemoteV1/UI/Window/ConfigWindow.cs b/mRemoteV1/UI/Window/ConfigWindow.cs index 9c79b119e..1a6d81d15 100644 --- a/mRemoteV1/UI/Window/ConfigWindow.cs +++ b/mRemoteV1/UI/Window/ConfigWindow.cs @@ -1214,7 +1214,6 @@ namespace mRemoteNG.UI.Window strHide.Add("VNCViewOnly"); strHide.Add("SoundQuality"); break; - case ProtocolType.ICA: strHide.Add("DisplayThemes"); strHide.Add("DisplayWallpaper"); From e4ff7b43f23a48350b93900c7114d8adebabd406 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Wed, 13 Feb 2019 23:14:38 +0100 Subject: [PATCH 06/13] fixed capitalization on one word; translated overlooked word --- mRemoteV1/Resources/Language/Language.de.resx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mRemoteV1/Resources/Language/Language.de.resx b/mRemoteV1/Resources/Language/Language.de.resx index ac700267d..72310f3fd 100644 --- a/mRemoteV1/Resources/Language/Language.de.resx +++ b/mRemoteV1/Resources/Language/Language.de.resx @@ -166,7 +166,7 @@ Verwende die empfohlenen Einstellungen - {0} kann automatisch nach Updates suchen, die neue Funktionen und Bug Fixes enthalten können. Es wird empfohlen, dass Sie {0} erlauben wöchentlich nach Updates zu suchen. + {0} kann automatisch nach Updates suchen, die neue Funktionen und Fehlerbehebungen enthalten können. Es wird empfohlen, dass Sie {0} erlauben wöchentlich nach Updates zu suchen. Automatische Update-Einstellungen @@ -451,7 +451,7 @@ VncSharp Control Version {0} Möchten Sie die Verbindung "{0}" schließen? - Sind sie sicher, dass Sie das Panel "{0}" schließen möchten? + Sind Sie sicher, dass Sie das Panel "{0}" schließen möchten? Alle Verbindungen die es enthält werden ebenfalls geschlossen. From 8468a3de7cef67d0d20dd7d53c83f14062a15923 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Thu, 14 Feb 2019 18:53:07 +0100 Subject: [PATCH 07/13] fixed unnatural wording --- mRemoteV1/Resources/Language/Language.de.resx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mRemoteV1/Resources/Language/Language.de.resx b/mRemoteV1/Resources/Language/Language.de.resx index 72310f3fd..bf0383657 100644 --- a/mRemoteV1/Resources/Language/Language.de.resx +++ b/mRemoteV1/Resources/Language/Language.de.resx @@ -2651,6 +2651,6 @@ Development umfasst Alphas, Betas und Release Candidates. Zwischenablage - Wählen Sie aus, ob die Zwischenablage freigegeben werden soll. + Umleitung der Zwischenablage erlauben. \ No newline at end of file From 8a7bc4583b268db384367b3971ed54e90385c488 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Thu, 14 Feb 2019 19:08:02 +0100 Subject: [PATCH 08/13] fixed typo in language resource string --- mRemoteV1/Resources/Language/Language.Designer.cs | 4 ++-- mRemoteV1/Resources/Language/Language.de.resx | 2 +- mRemoteV1/Resources/Language/Language.resx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mRemoteV1/Resources/Language/Language.Designer.cs b/mRemoteV1/Resources/Language/Language.Designer.cs index 7f23e3786..99acb3585 100644 --- a/mRemoteV1/Resources/Language/Language.Designer.cs +++ b/mRemoteV1/Resources/Language/Language.Designer.cs @@ -4932,9 +4932,9 @@ namespace mRemoteNG { /// /// Looks up a localized string similar to Select whether clipboard should be shared.. /// - internal static string strPropertyDescriptionRedirecClipboard { + internal static string strPropertyDescriptionRedirectClipboard { get { - return ResourceManager.GetString("strPropertyDescriptionRedirecClipboard", resourceCulture); + return ResourceManager.GetString("strPropertyDescriptionRedirectClipboard", resourceCulture); } } diff --git a/mRemoteV1/Resources/Language/Language.de.resx b/mRemoteV1/Resources/Language/Language.de.resx index bf0383657..c2276f6d8 100644 --- a/mRemoteV1/Resources/Language/Language.de.resx +++ b/mRemoteV1/Resources/Language/Language.de.resx @@ -2650,7 +2650,7 @@ Development umfasst Alphas, Betas und Release Candidates. Zwischenablage - + Umleitung der Zwischenablage erlauben. \ No newline at end of file diff --git a/mRemoteV1/Resources/Language/Language.resx b/mRemoteV1/Resources/Language/Language.resx index aba77fd17..723513529 100644 --- a/mRemoteV1/Resources/Language/Language.resx +++ b/mRemoteV1/Resources/Language/Language.resx @@ -1472,7 +1472,7 @@ If you run into such an error, please create a new connection file! Select whether local printers should be shown on the remote host. - + Select whether clipboard should be shared. From a4f354161d5506f703fb8e9e1add4c38ffeacaab Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Fri, 15 Feb 2019 21:55:17 +0100 Subject: [PATCH 09/13] removed "..." --- mRemoteV1/Resources/Language/Language.de.resx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mRemoteV1/Resources/Language/Language.de.resx b/mRemoteV1/Resources/Language/Language.de.resx index c2276f6d8..b4a0beea4 100644 --- a/mRemoteV1/Resources/Language/Language.de.resx +++ b/mRemoteV1/Resources/Language/Language.de.resx @@ -944,13 +944,13 @@ Starte mit neuer Datei. Löschen - Verbindung löschen... + Verbindung löschen Entfernen - Ordner löschen... + Ordner löschen Trennen From 1f46339900286a53cb24774eef5135f9d6104442 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Fri, 15 Feb 2019 21:57:09 +0100 Subject: [PATCH 10/13] removed newline --- mRemoteV1/Resources/Language/Language.de.resx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mRemoteV1/Resources/Language/Language.de.resx b/mRemoteV1/Resources/Language/Language.de.resx index b4a0beea4..2dbc4911b 100644 --- a/mRemoteV1/Resources/Language/Language.de.resx +++ b/mRemoteV1/Resources/Language/Language.de.resx @@ -2441,8 +2441,7 @@ Diese Seite führt Sie durch den Prozess der Aktualisierung Ihrer Verbindungsdat Warnung! Ein Neustart ist notwendig um ein Theme zu deaktivieren oder anzuwenden - -Es werden keine Themes geladen, vergewissern Sie sich, dass das standard mremoteNG-Theme im Ordner 'themes' vorhanden ist + Es werden keine Themes geladen, vergewissern Sie sich, dass das standard mremoteNG-Theme im Ordner 'themes' vorhanden ist Login fehlgeschlagen für Benutzer '{0}'. From c570c1c0eb6195b3d16ed8b9b80518ec81e898a7 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Fri, 15 Feb 2019 22:02:58 +0100 Subject: [PATCH 11/13] replaced "Protokolldatei" with "Logfile" --- mRemoteV1/Resources/Language/Language.de.resx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mRemoteV1/Resources/Language/Language.de.resx b/mRemoteV1/Resources/Language/Language.de.resx index 2dbc4911b..3f9af728e 100644 --- a/mRemoteV1/Resources/Language/Language.de.resx +++ b/mRemoteV1/Resources/Language/Language.de.resx @@ -2160,7 +2160,7 @@ mRemoteNG wird nun geschlossen und die Installation gestartet. Benutzt die DockPanel Suite von [Weifen Luo] - Log File schreiben (mRemoteNG.log) + Logfile schreiben (mRemoteNG.log) XULrunner Pfad: @@ -2506,11 +2506,10 @@ Es konnte kein Anmeldedatensatz mit der ID "{0}" für den Verbindungsdatensatz m Die Passwortlänge muss zwischen {0} und {1} liegen - -Wählen Sie einen Pfad für die mRemoteNG-Protokolldatei + Wählen Sie einen Pfad für die mRemoteNG-Logfile - Pfad der Protokolldatei + Pfad der Logfile Pfad auswählen From aef9f980959bc38d8d4a93121a0a569333cae967 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Fri, 15 Feb 2019 23:14:50 +0100 Subject: [PATCH 12/13] some more tweaks --- mRemoteV1/Resources/Language/Language.de.resx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mRemoteV1/Resources/Language/Language.de.resx b/mRemoteV1/Resources/Language/Language.de.resx index 3f9af728e..43fb084e8 100644 --- a/mRemoteV1/Resources/Language/Language.de.resx +++ b/mRemoteV1/Resources/Language/Language.de.resx @@ -163,7 +163,7 @@ Einstellungen jetzt anpassen - Verwende die empfohlenen Einstellungen + Empfohlenen Einstellungen verwenden {0} kann automatisch nach Updates suchen, die neue Funktionen und Fehlerbehebungen enthalten können. Es wird empfohlen, dass Sie {0} erlauben wöchentlich nach Updates zu suchen. @@ -2169,7 +2169,7 @@ mRemoteNG wird nun geschlossen und die Installation gestartet. Ja - Wiederverbinden aller offener Verbindungen + Alle offenen Verbindungen neu verbinden &Starten @@ -2306,7 +2306,7 @@ Diese Seite führt Sie durch den Prozess der Aktualisierung Ihrer Verbindungsdat &Nochmal versuchen - Neues externes Werkzeug + Neues externes Programm Die Verbindungsinformationen konnten nicht vom SQL-Server geladen werden. @@ -2631,7 +2631,7 @@ Development umfasst Alphas, Betas und Release Candidates. Aktive Verbindung im Verbindungsbaum verfolgen - Iterationen der Schlüsselableitungsfunktion + Iterationen der Ableitungsfunktion UTF8-Kodierung für RDP Eigenschaft "Load Balance Info" verwenden @@ -2651,4 +2651,7 @@ Development umfasst Alphas, Betas und Release Candidates. Umleitung der Zwischenablage erlauben. + + Multi-SSH Symbolleiste + \ No newline at end of file From c6d6c2323cededdebd88e3eaa74aca73b97d59e0 Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Sun, 17 Feb 2019 19:38:34 +0100 Subject: [PATCH 13/13] fixed genus of Logfile --- mRemoteV1/Resources/Language/Language.de.resx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mRemoteV1/Resources/Language/Language.de.resx b/mRemoteV1/Resources/Language/Language.de.resx index 43fb084e8..5592cc1ba 100644 --- a/mRemoteV1/Resources/Language/Language.de.resx +++ b/mRemoteV1/Resources/Language/Language.de.resx @@ -2441,7 +2441,7 @@ Diese Seite führt Sie durch den Prozess der Aktualisierung Ihrer Verbindungsdat Warnung! Ein Neustart ist notwendig um ein Theme zu deaktivieren oder anzuwenden - Es werden keine Themes geladen, vergewissern Sie sich, dass das standard mremoteNG-Theme im Ordner 'themes' vorhanden ist + Es werden keine Themes geladen, vergewissern Sie sich, dass das Standard mremoteNG-Theme im Ordner 'themes' vorhanden ist Login fehlgeschlagen für Benutzer '{0}'. @@ -2506,10 +2506,10 @@ Es konnte kein Anmeldedatensatz mit der ID "{0}" für den Verbindungsdatensatz m Die Passwortlänge muss zwischen {0} und {1} liegen - Wählen Sie einen Pfad für die mRemoteNG-Logfile + Wählen Sie einen Pfad für das mRemoteNG-Logfile - Pfad der Logfile + Pfad des Logfiles Pfad auswählen