Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge errors

Browse Source
This commit is contained in:
Faryan Rezagholi
2020-05-31 18:26:36 +02:00
parent d719a0d52a
commit 382af99ade
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mRemoteV1/Resources/Language/Language.Designer.cs generated
View File

@@ -349,16 +349,7 @@ namespace mRemoteNG {
}
/// <summary>
/// Looks up a localized string similar to Show/Hide Menu Strip.
/// </summary>
internal static string ShowHideMenu {
get {
return ResourceManager.GetString("ShowHideMenu", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Source.
/// Looks up a localized string similar to Always show panel tabs.
/// </summary>
internal static string AlwaysShowPanelTabs {
get {
@@ -5520,6 +5511,15 @@ namespace mRemoteNG {
}
}
/// <summary>
/// Looks up a localized string similar to Show/Hide Menu Strip.
/// </summary>
internal static string ShowHideMenu {
get {
return ResourceManager.GetString("ShowHideMenu", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Show logon information on tab names.
/// </summary>

1
mRemoteV1/Resources/Language/Language.de.resx
View File

@@ -2107,6 +2107,7 @@ Development umfasst Alphas, Betas und Release Candidates.</value>
</data>
<data name="PropertyDescriptionDisableFullWindowDrag" xml:space="preserve">
<value>Legt fest, ob der Fensterinhalt angezeigt wird, wenn Sie das Fenster an eine neue Position ziehen.</value>
</data>
<data name="ShowHideMenu" xml:space="preserve">
<value>Verstecke/Zeige Menü</value>
</data>

1
mRemoteV1/Resources/Language/Language.resx
View File

@@ -2269,6 +2269,7 @@ Development Channel includes Alphas, Betas &amp; Release Candidates.</value>
</data>
<data name="HttpFailedUrlBuild" xml:space="preserve">
<value>Failed to contruct the URL to load</value>
</data>
<data name="ShowHideMenu" xml:space="preserve">
<value>Show/Hide Menu Strip</value>
</data>

4
mRemoteV1/UI/Menu/AdvancedWindowMenu.cs
View File

@@ -45,11 +45,11 @@ namespace mRemoteNG.UI.Menu
{
_sysMenSubItems[i] = 200 + i;
_windowMenu.AppendMenuItem(popMen, WindowMenu.Flags.MF_STRING, new IntPtr(_sysMenSubItems[i]),
Language.strScreen + " " + Convert.ToString(i + 1));
Language.Screen + " " + Convert.ToString(i + 1));
}
_windowMenu.InsertMenuItem(_windowMenu.SystemMenuHandle, 0,
WindowMenu.Flags.MF_POPUP | WindowMenu.Flags.MF_BYPOSITION, popMen,
Language.strSendTo);
Language.SendTo);
// option to show/hide menu strips
_windowMenu.InsertMenuItem(_windowMenu.SystemMenuHandle, 1,
WindowMenu.Flags.MF_BYPOSITION, new IntPtr(0),