From 6477c630679cb07ba6049d61b8ce07031d681f21 Mon Sep 17 00:00:00 2001
From: BornToBeRoot <BornToBeRoot@users.noreply.github.com>
Date: Wed, 23 Aug 2017 19:01:25 +0200
Subject: [PATCH] Cleanup, get ready for "1.1.0.0 BETA"

---
 .../Localization/Resources.de-DE.xaml         | 37 ++----------------
 .../Localization/Resources.en-US.xaml         | 38 +------------------
 .../Views/Applications/WakeOnLANView.xaml     |  2 +-
 .../Views/Help/HelpCommandLineWindow.xaml     |  2 +-
 4 files changed, 7 insertions(+), 72 deletions(-)

diff --git a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
index c56c576b66..beea883edd 100644
--- a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
+++ b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
@@ -6,12 +6,10 @@
     <system:String x:Key="String_Header_Destination">Ziel</system:String>
     <system:String x:Key="String_Header_Settings">Einstellungen</system:String>
     <system:String x:Key="String_Header_Status">Status</system:String>
-    <system:String x:Key="String_Header_WakeUp">Aufwecken</system:String>
     <system:String x:Key="String_Header_Templates">Templates</system:String>
     <system:String x:Key="String_Header_MACAddress">MAC-Adresse</system:String>
     <system:String x:Key="String_Header_MACAddressOrVendor">MAC-Adresse oder Hersteller</system:String>
     <system:String x:Key="String_Header_Details">Details</system:String>
-    <system:String x:Key="String_Header_IPv4Calculator">IPv4-Rechner</system:String>
     <system:String x:Key="String_Header_Input">Eingabe</system:String>
     <system:String x:Key="String_Header_Interface">Interface</system:String>
     <system:String x:Key="String_Header_Information">Informationen</system:String>
@@ -19,8 +17,6 @@
     <system:String x:Key="String_Header_Statistics">Statistik</system:String>
     <system:String x:Key="String_Header_About">Über</system:String>
     <system:String x:Key="String_Header_Window">Fenster</system:String>
-    <system:String x:Key="String_Header_General">Allgemein</system:String>
-    <system:String x:Key="String_Header_Appearance">Aussehen</system:String>
     <system:String x:Key="String_Header_Language">Sprache</system:String>
     <system:String x:Key="String_Header_Autostart">Autostart</system:String>
     <system:String x:Key="String_Header_Theme">Thema</system:String>
@@ -29,21 +25,17 @@
     <system:String x:Key="String_Header_Location">Speicherort</system:String>
     <system:String x:Key="String_Header_Portable">Portable</system:String>
     <system:String x:Key="String_Header_DefaultApplication">Standardanwendung</system:String>
-    <system:String x:Key="String_Header_IPScanner">IP-Scanner</system:String>
     <system:String x:Key="String_Header_IPRange">IP-Bereich</system:String>
     <system:String x:Key="String_Header_Result">Ergebnis</system:String>
     <system:String x:Key="String_Header_Ping">Ping</system:String>
     <system:String x:Key="String_Header_DNS">DNS</system:String>
     <system:String x:Key="String_Header_ARP">ARP</system:String>
     <system:String x:Key="String_Header_Traceroute">Traceroute</system:String>
-    <system:String x:Key="String_Header_PingError">Ping-Fehler</system:String>
-    <system:String x:Key="String_Header_DnsError">DNS-Fehler</system:String>
     <system:String x:Key="String_Header_Multithreading">Multithreading</system:String>
     <system:String x:Key="String_Header_Confirm">Bestätigen</system:String>
     <system:String x:Key="String_Header_HotKeys">HotKeys</system:String>
     <system:String x:Key="String_Header_DNSLookup">DNS Lookup</system:String>
     <system:String x:Key="String_Header_Route">Route</system:String>
-    <system:String x:Key="String_Header_CanceledByUser">Vom Benutzer abgebrochen</system:String>
     <system:String x:Key="String_Header_DontFragment">Nicht fragmentieren</system:String>
     <system:String x:Key="String_Header_Import">Importieren</system:String>
     <system:String x:Key="String_Header_Export">Exportieren</system:String>
@@ -59,7 +51,6 @@
     <system:String x:Key="String_Header_PortPortRangeOrService">Port, Port-Range oder Service</system:String>
     <system:String x:Key="String_Header_Socket">Socket</system:String>
     <system:String x:Key="String_Header_History">History</system:String>
-    <system:String x:Key="String_Header_Applications">Anwendungen</system:String>
     <system:String x:Key="String_Header_Update">Update</system:String>
     <system:String x:Key="String_Header_Transparency">Transparenz</system:String>
     <system:String x:Key="String_Header_WakeOnLAN">Wake on LAN</system:String>
@@ -67,24 +58,17 @@
     
     <!-- Normal strings -->
     <system:String x:Key="String_ProductName">NETworkManager</system:String>
-    <system:String x:Key="String_ShowWindow">Fenster anzeigen</system:String>
     <system:String x:Key="String_Settings">Einstellungen</system:String>
     <system:String x:Key="String_RestartRequired">Neustart Erforderlich</system:String>
     <system:String x:Key="String_RestartRequiredAfterSettingsChanged">Einige Einstellungen werden erst nach einem Neustart der Anwendung angewendet!</system:String>
     <system:String x:Key="String_Template">Template</system:String>
-    <system:String x:Key="String_Templates">Templates</system:String>
-    <system:String x:Key="String_NewTemplate">Neues Template</system:String>
     <system:String x:Key="String_WakeUp">Aufwecken</system:String>
-    <system:String x:Key="String_Import">Importieren</system:String>
-    <system:String x:Key="String_Export">Exportieren</system:String>
     <system:String x:Key="String_MACAddress">MAC-Adresse</system:String>
     <system:String x:Key="String_Hostname">Hostname</system:String>
     <system:String x:Key="String_Description">Beschreibung</system:String>
     <system:String x:Key="String_Broadcast">Broadcast</system:String>
     <system:String x:Key="String_Port">Port</system:String>
     <system:String x:Key="String_IPAddress">IP-Adresse</system:String>
-    <system:String x:Key="String_Output">Ausgabe</system:String>
-    <system:String x:Key="String_Calculate">Berechnen</system:String>
     <system:String x:Key="String_StartWithWindows">Mit Windows starten (aktueller Benutzer)</system:String>
     <system:String x:Key="String_StartMinimizedInTray">Minimiert im Tray starten</system:String>
     <system:String x:Key="String_AlwaysShowIconInTray">Icon immer im Tray anzeigen</system:String>
@@ -103,9 +87,8 @@
     <system:String x:Key="String_Subnetmask">Subnetzmaske</system:String>
     <system:String x:Key="String_CIDR">CIDR</system:String>
     <system:String x:Key="String_SubnetmaskOrCIDR">Subnetmask oder CIDR</system:String>
-    <system:String x:Key="String_Gateway">Gateway</system:String>
     <system:String x:Key="String_IPv4DefaultGateway">IPv4-Standardgateway</system:String>
-    <system:String x:Key="String_DHCPnabled">DHCP aktiviert</system:String>
+    <system:String x:Key="String_DHCPEnabled">DHCP aktiviert</system:String>
     <system:String x:Key="String_DHCPServer">DHCP-Server</system:String>
     <system:String x:Key="String_DHCPLeaseObtained">DHCP Lease erhalten</system:String>
     <system:String x:Key="String_DHCPLeaseExpires">DHCP Lease läuft ab</system:String>
@@ -120,7 +103,6 @@
     <system:String x:Key="String_SecondaryDNSServer">Sekundärer DNS-Server</system:String>
     <system:String x:Key="String_Yes">Ja</system:String>
     <system:String x:Key="String_No">Nein</system:String>
-    <system:String x:Key="String_Save">Speichern</system:String>
     <system:String x:Key="String_DNSSuffix">DNS Suffix</system:String>
     <system:String x:Key="String_DNSServers">DNS Servers</system:String>
     <system:String x:Key="String_DynamicIPv4Address">Dynamische IPv4-Adresse</system:String>
@@ -131,16 +113,12 @@
     <system:String x:Key="String_AddTemplate">Template hinzufügen</system:String>
     <system:String x:Key="String_EnterNameForTemplate">Geben Sie einen Namen ein, unter dem das Template gespeichert werden soll</system:String>
     <system:String x:Key="String_EnterHostnameForTemplate">Geben Sie den Hostnamen ein, um das Template später zu identifizieren</system:String>
-    <system:String x:Key="String_ReleaseDate">Release date</system:String>
-    <system:String x:Key="String_Build">Build</system:String>
     <system:String x:Key="String_AllRightReserved">Alle Rechte vorbehalten.</system:String>
     <system:String x:Key="String_Libraries">Bibliotheken</system:String>
     <system:String x:Key="String_Administrator">Administrator</system:String>
     <system:String x:Key="String_RestartAsAdministrator">Neustart als Administrator</system:String>
     <system:String x:Key="String_RestartAsAdministratorMessage">Zum ändern dieser Konfiguration werden administrative Rechte benötigt.</system:String>
-    <system:String x:Key="String_StartMaximized">Fenster maximiert starten</system:String>
     <system:String x:Key="String_NetworkAddress">Netzwerkadresse</system:String>
-    <system:String x:Key="String_CouldNotResolveHostnameMessage">Hostname konnte nicht aufgelöst werden.</system:String>
     <system:String x:Key="String_DeleteTemplatesMessage">Die ausgewählten Templates werden unwiderruflich gelöscht.</system:String>
     <system:String x:Key="String_Timeout">Timeout</system:String>
     <system:String x:Key="String_Buffer">Buffer</system:String>
@@ -175,6 +153,7 @@
     <system:String x:Key="String_UntrayBringWindowToFront">Untray / Fenster in den Vordergrund bringen</system:String>
     <system:String x:Key="String_MaximumNumberOfHopsReached">Maximale Anzahl ({0}) an Hops/Router erreicht! </system:String>
     <system:String x:Key="String_CanceledByUser">Der Vorgang wurde vom Benutzer abgebrochen!</system:String>
+    <system:String x:Key="String_ApplicationSettings">Anwendungseinstellungen</system:String>
     <system:String x:Key="String_NetworkInterfaceConfigTemplates">Netzwerkinterface Konfigurations Templates</system:String>
     <system:String x:Key="String_WakeOnLANTemplates">Wake on LAN Templates</system:String>
     <system:String x:Key="String_SelectedSettingsAreReset">Die ausgewählten Einstellungen werden zurückgesetzt. (Der Speicherpfad ist hiervon nicht betroffen.)</system:String>
@@ -230,8 +209,6 @@
     <system:String x:Key="String_Button_Default">Standard</system:String>
     <system:String x:Key="String_Button_WakeUp">Aufwecken</system:String>
     <system:String x:Key="String_Button_Apply">Anwenden</system:String>
-    <system:String x:Key="String_Button_Refresh">Aktualisieren</system:String>
-    <system:String x:Key="String_Button_Later">Später</system:String>
     <system:String x:Key="String_Button_RestartNow">Jetzt neu starten</system:String>
     <system:String x:Key="String_Button_AddTemplate">Template hinzufügen</system:String>
     <system:String x:Key="String_Button_Add">Hinzufügen</system:String>
@@ -297,30 +274,22 @@
     <system:String x:Key="String_Progress_RenewDHCPLease">Erneuere DHCP Lease...</system:String>
     <system:String x:Key="String_Progress_FixGatewayAfterDHCPEnabled">Fixe Gateway nachdem DHCP aktiviert wurde...</system:String>
 
-    <!-- ToolTip -->
-    <system:String x:Key="String_ToolTip_Settings">Einstellungen öffnen</system:String>
-    <system:String x:Key="String_ToolTip_GitHub">Projekt auf Github anzeigen</system:String>
-    <system:String x:Key="String_ToolTip_AddTemplate">Template hinzufügen</system:String>
-
     <!-- Validate (User Input in GUI) -->
     <system:String x:Key="String_ValidateError_FieldEmpty">Feld darf nicht leer sein!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidMACAddress">Geben Sie eine gültige MAC-Addresse (z.B. 00:F1:23:AB:F2:35) ein!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidPort">Geben Sie einen gültigen Port ein (1 - 65535)!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidIPv4Address">Geben Sie eine gültige IPv4-Adresse ein!</system:String>
-    <system:String x:Key="String_ValidateError_MACAddressEmpty">MAC-Adresse darf nicht leer sein!</system:String>
-    <system:String x:Key="String_ValidateError_HostnameEmpty">Hostname darf nicht leer sein!</system:String>
     <system:String x:Key="String_ValidateError_FolderDoesNotExist">Ordner existiert nicht!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidSubnetmask">Geben Sie eine gültige Subnetzmaske ein (z.B. 255.255.255.0)!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidSubnetmaskOrCIDR">Geben Sie eine gültige Subnetzmaske oder CIDR ein (z.B. 255.255.255.0 oder /24)!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidIPScanRange">Geben Sie einen gültigen IP-Bereich ein!</system:String>
     <system:String x:Key="String_ValidateError_FileDoesNotExist">Datei existiert nicht!</system:String>
-    <system:String x:Key="String_ValidateError_EnterValidMACAddressOrFirst3Bytes">Geben Sie eine gültige MAC-Adresse oder die ersten 6-Zeichen einer MAC-Adresse ein!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidPortOrPortRange">Geben Sie einen gültigen Port und/oder Port-Bereich ein (1 - 65535)!</system:String>
     <system:String x:Key="String_ValidateError_OnlyNumbersCanBeEntered">Es dürfen nur Zahlen eingegeben werden!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidValueBetween10and100">Geben Sie einen gültigen Wert ein zwischen 10 und 100!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidIPAddress">Geben Sie eine gültige IP-Adresse ein!</system:String>
 
-    <!-- ApplicationInfo.Name && ApplicationInfo.Description-->
+    <!-- ApplicationInfo.Name -->
     <system:String x:Key="String_ApplicationName_IPScanner">IP-Scanner</system:String>
     <system:String x:Key="String_ApplicationName_NetworkInterface">Netzwerkinterface</system:String>
     <system:String x:Key="String_ApplicationName_PortScanner">Port-Scanner</system:String>
diff --git a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
index 51982b1d13..74dc799b7e 100644
--- a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
+++ b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
@@ -6,12 +6,10 @@
     <system:String x:Key="String_Header_Destination">Destination</system:String>
     <system:String x:Key="String_Header_Settings">Settings</system:String>
     <system:String x:Key="String_Header_Status">Status</system:String>
-    <system:String x:Key="String_Header_WakeUp">Wake Up</system:String>
     <system:String x:Key="String_Header_Templates">Templates</system:String>
     <system:String x:Key="String_Header_MACAddress">MAC-Address</system:String>
     <system:String x:Key="String_Header_MACAddressOrVendor">MAC-Address or Vendor</system:String>
     <system:String x:Key="String_Header_Details">Details</system:String>
-    <system:String x:Key="String_Header_IPv4Calculator">IPv4-Calculator</system:String>
     <system:String x:Key="String_Header_Input">Input</system:String>
     <system:String x:Key="String_Header_Interface">Interface</system:String>
     <system:String x:Key="String_Header_Information">Information</system:String>
@@ -19,8 +17,6 @@
     <system:String x:Key="String_Header_Statistics">Statistics</system:String>
     <system:String x:Key="String_Header_About">About</system:String>
     <system:String x:Key="String_Header_Window">Window</system:String>
-    <system:String x:Key="String_Header_General">General</system:String>
-    <system:String x:Key="String_Header_Appearance">Appearance</system:String>
     <system:String x:Key="String_Header_Language">Language</system:String>
     <system:String x:Key="String_Header_Autostart">Autostart</system:String>
     <system:String x:Key="String_Header_Theme">Theme</system:String>
@@ -29,22 +25,17 @@
     <system:String x:Key="String_Header_Location">Location</system:String>
     <system:String x:Key="String_Header_Portable">Portable</system:String>
     <system:String x:Key="String_Header_DefaultApplication">Default application</system:String>
-    <system:String x:Key="String_Header_IPScanner">IP-Scanner</system:String>
     <system:String x:Key="String_Header_IPRange">IP-Range</system:String>
     <system:String x:Key="String_Header_Result">Result</system:String>
     <system:String x:Key="String_Header_Ping">Ping</system:String>
     <system:String x:Key="String_Header_DNS">DNS</system:String>
     <system:String x:Key="String_Header_ARP">ARP</system:String>
     <system:String x:Key="String_Header_Traceroute">Traceroute</system:String>
-    <system:String x:Key="String_Header_Experimental">Experimental</system:String>
-    <system:String x:Key="String_Header_PingError">Ping error</system:String>
-    <system:String x:Key="String_Header_DnsError">DNS error</system:String>
     <system:String x:Key="String_Header_Multithreading">Multithreading</system:String>
     <system:String x:Key="String_Header_Confirm">Confirm</system:String>
     <system:String x:Key="String_Header_HotKeys">HotKeys</system:String>
     <system:String x:Key="String_Header_DNSLookup">DNS Lookup</system:String>
     <system:String x:Key="String_Header_Route">Route</system:String>
-    <system:String x:Key="String_Header_CanceledByUser">Canceled by user</system:String>
     <system:String x:Key="String_Header_DontFragment">Don't fragment</system:String>
     <system:String x:Key="String_Header_Import">Import</system:String>
     <system:String x:Key="String_Header_Export">Export</system:String>
@@ -60,7 +51,6 @@
     <system:String x:Key="String_Header_PortPortRangeOrService">Port, port range or service</system:String>
     <system:String x:Key="String_Header_Socket">Socket</system:String>
     <system:String x:Key="String_Header_History">History</system:String>
-    <system:String x:Key="String_Header_Applications">Applications</system:String>
     <system:String x:Key="String_Header_Update">Update</system:String>
     <system:String x:Key="String_Header_Transparency">Transparency</system:String>
     <system:String x:Key="String_Header_WakeOnLAN">Wake on LAN</system:String>
@@ -68,24 +58,17 @@
 
     <!-- Normal strings -->
     <system:String x:Key="String_ProductName">NETworkManager</system:String>
-    <system:String x:Key="String_ShowWindow">Show window</system:String>
     <system:String x:Key="String_Settings">Settings</system:String>
     <system:String x:Key="String_RestartRequired">Restart Required</system:String>
     <system:String x:Key="String_RestartRequiredAfterSettingsChanged">Some settings are applied only after restarting the application!</system:String>
     <system:String x:Key="String_Template">Template</system:String>
-    <system:String x:Key="String_Templates">Templates</system:String>
-    <system:String x:Key="String_NewTemplate">New template</system:String>
     <system:String x:Key="String_WakeUp">Wake Up</system:String>
-    <system:String x:Key="String_Import">Import</system:String>
-    <system:String x:Key="String_Export">Export</system:String>
     <system:String x:Key="String_MACAddress">MAC-Address</system:String>
     <system:String x:Key="String_Hostname">Hostname</system:String>
     <system:String x:Key="String_Description">Description</system:String>
     <system:String x:Key="String_Broadcast">Broadcast</system:String>
     <system:String x:Key="String_Port">Port</system:String>
     <system:String x:Key="String_IPAddress">IP-Address</system:String>
-    <system:String x:Key="String_Output">Output</system:String>
-    <system:String x:Key="String_Calculate">Calculate</system:String>
     <system:String x:Key="String_StartWithWindows">Start with Windows (current user)</system:String>
     <system:String x:Key="String_StartMinimizedInTray">Start minimized in tray</system:String>
     <system:String x:Key="String_AlwaysShowIconInTray">Always show icon in tray</system:String>
@@ -104,10 +87,9 @@
     <system:String x:Key="String_Subnetmask">Subnetmask</system:String>
     <system:String x:Key="String_CIDR">CIDR</system:String>
     <system:String x:Key="String_SubnetmaskOrCIDR">Subnetmask oder CIDR</system:String>
-    <system:String x:Key="String_Gateway">Gateway</system:String>
     <system:String x:Key="String_IPv4DefaultGateway">IPv4-Default-Gateway</system:String>
-    <system:String x:Key="String_DHCPEnabled">DHCP Enabled</system:String>
-    <system:String x:Key="String_DHCPServer">DHCP Server</system:String>
+    <system:String x:Key="String_DHCPEnabled">DHCP enabled</system:String>
+    <system:String x:Key="String_DHCPServer">DHCP server</system:String>
     <system:String x:Key="String_DHCPLeaseObtained">DHCP Lease Obtained</system:String>
     <system:String x:Key="String_DHCPLeaseExpires">DHCP Lease Expires</system:String>
     <system:String x:Key="String_IPv6Address">IPv6-Address</system:String>
@@ -121,7 +103,6 @@
     <system:String x:Key="String_SecondaryDNSServer">Secondary DNS-Server</system:String>
     <system:String x:Key="String_Yes">Yes</system:String>
     <system:String x:Key="String_No">No</system:String>
-    <system:String x:Key="String_Save">Save</system:String>
     <system:String x:Key="String_DNSSuffix">DNS Suffix</system:String>
     <system:String x:Key="String_DNSServers">DNS Servers</system:String>
     <system:String x:Key="String_DynamicIPv4Address">Dynamic IPv4-Address</system:String>
@@ -132,16 +113,12 @@
     <system:String x:Key="String_AddTemplate">Add template</system:String>
     <system:String x:Key="String_EnterNameForTemplate">Enter a name under which you want to save the template</system:String>
     <system:String x:Key="String_EnterHostnameForTemplate">Enter the hostname to identify the template later</system:String>
-    <system:String x:Key="String_ReleaseDate">Veröffentlichungsdatum</system:String>
-    <system:String x:Key="String_Build">Build</system:String>
     <system:String x:Key="String_AllRightReserved">All rights reserved.</system:String>
     <system:String x:Key="String_Libraries">Libraries</system:String>
     <system:String x:Key="String_Administrator">Administrator</system:String>
     <system:String x:Key="String_RestartAsAdministrator">Restart as Administrator</system:String>
     <system:String x:Key="String_RestartAsAdministratorMessage">Administrative rights are required to change this configuration.</system:String>
-    <system:String x:Key="String_StartMaximized">Start window maximized</system:String>
     <system:String x:Key="String_NetworkAddress">Network address</system:String>
-    <system:String x:Key="String_CouldNotResolveHostnameMessage">Could not resolve hostname.</system:String>
     <system:String x:Key="String_DeleteTemplatesMessage">The selected templates will be deleted permanently.</system:String>
     <system:String x:Key="String_Timeout">Timeout</system:String>
     <system:String x:Key="String_Buffer">Buffer</system:String>
@@ -232,8 +209,6 @@
     <system:String x:Key="String_Button_Default">Default</system:String>
     <system:String x:Key="String_Button_WakeUp">Wake Up</system:String>
     <system:String x:Key="String_Button_Apply">Apply</system:String>
-    <system:String x:Key="String_Button_Refresh">Refresh</system:String>
-    <system:String x:Key="String_Button_Later">Later</system:String>
     <system:String x:Key="String_Button_RestartNow">Restart now</system:String>
     <system:String x:Key="String_Button_AddTemplate">Add template</system:String>
     <system:String x:Key="String_Button_Add">Add</system:String>
@@ -299,24 +274,16 @@
     <system:String x:Key="String_Progress_RenewDHCPLease">Renew DHCP lease...</system:String>
     <system:String x:Key="String_Progress_FixGatewayAfterDHCPEnabled">Fix gateway after DHCP is enabled...</system:String>
     
-    <!-- ToolTip-->
-    <system:String x:Key="String_ToolTip_Settings">Open settings</system:String>
-    <system:String x:Key="String_ToolTip_GitHub">Show project on GitHub</system:String>
-    <system:String x:Key="String_ToolTip_AddTemplate">Add template</system:String>
-    
     <!-- Validate (User Input in GUI) -->
     <system:String x:Key="String_ValidateError_FieldEmpty">Field cannot be empty!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidMACAddress">Enter a valid MAC-Address like 00:F1:23:AB:F2:35!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidPort">Enter a valid port (1 - 65535)!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidIPv4Address">Enter a valid IPv4-Address!</system:String>
-    <system:String x:Key="String_ValidateError_MACAddressEmpty">MAC-Address cannot be empty!</system:String>
-    <system:String x:Key="String_ValidateError_HostnameEmpty">Hostname cannot be empty!</system:String>
     <system:String x:Key="String_ValidateError_FolderDoesNotExist">Folder does not exists!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidSubnetmask">Enter a valid subnetmask (like 255.255.255.0)!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidSubnetmaskOrCIDR">Enter a valid subnetmask or CIDR (like 255.255.255.0 or 24)!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidIPScanRange">Enter a valid ip range!</system:String>
     <system:String x:Key="String_ValidateError_FileDoesNotExist">File does not exists!</system:String>
-    <system:String x:Key="String_ValidateError_EnterValidMACAddressOrFirst3Bytes">Enter a valid MAC address or the first 6 characters of a MAC address!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidPortOrPortRange">Enter a valid port and/or port range (1 - 65535)!</system:String>
     <system:String x:Key="String_ValidateError_OnlyNumbersCanBeEntered">Only numbers can be entered!</system:String>
     <system:String x:Key="String_ValidateError_EnterValidValueBetween10and100">Enter a valid value between 10 and 100!</system:String>
@@ -395,5 +362,4 @@
     <system:String x:Key="String_Libary_MahAppsMetroIconPacksDescription">Some awesome icons for WPF and UWP all together...</system:String>
     <system:String x:Key="String_Libary_HeijdenDNSName">Heijden.DNS</system:String>
     <system:String x:Key="String_Libary_HeijdenDNSDescription">Reusable DNS resolver component</system:String>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Source/NETworkManager/Views/Applications/WakeOnLANView.xaml b/Source/NETworkManager/Views/Applications/WakeOnLANView.xaml
index e445b041c8..30dbd03242 100644
--- a/Source/NETworkManager/Views/Applications/WakeOnLANView.xaml
+++ b/Source/NETworkManager/Views/Applications/WakeOnLANView.xaml
@@ -86,7 +86,7 @@
                 </TextBox>
             </Grid>
             <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
-                <Button Command="{Binding AddTemplateCommand}" HorizontalAlignment="Right" ToolTip="{DynamicResource String_ToolTip_AddTemplate}" Margin="0,0,10,0">
+                <Button Command="{Binding AddTemplateCommand}" HorizontalAlignment="Right" Margin="0,0,10,0">
                     <Button.Content>
                         <Grid>
                             <Grid.ColumnDefinitions>
diff --git a/Source/NETworkManager/Views/Help/HelpCommandLineWindow.xaml b/Source/NETworkManager/Views/Help/HelpCommandLineWindow.xaml
index ca8460708a..c35c1b6ece 100644
--- a/Source/NETworkManager/Views/Help/HelpCommandLineWindow.xaml
+++ b/Source/NETworkManager/Views/Help/HelpCommandLineWindow.xaml
@@ -49,7 +49,7 @@
         </Grid>
         </ScrollViewer>
         </Border>
-        <Grid Grid.Row="3" Visibility="{Binding DisplayWrongParameterNote, Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0,0,0,10">
+        <Grid Grid.Row="3" Visibility="{Binding DisplayWrongParameter, Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0,0,0,10">
             <Grid.Resources>
                 <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource TextBlockAsTextBox}">
                     <Setter Property="ContextMenu" Value="{StaticResource CopyContextMenu}" />