Skip to content

Commit 4c85dc1

Browse files
BornToBeRootBornToBeRoot
committed
en-US strings changed, cleanup
1 parent fb3c6d0 commit 4c85dc1

2 files changed

Lines changed: 30 additions & 36 deletions

File tree

‎Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@
141141
<system:String x:Key="String_AddTemplate">Template hinzufügen</system:String>
142142
<system:String x:Key="String_EnterHostnameForClient">Geben Sie den Hostnamen ein, um den Client später zu identifizieren.</system:String>
143143
<system:String x:Key="String_Administrator">Administrator</system:String>
144-
<system:String x:Key="String_RestartAsAdministrator">Neustart als Administrator</system:String>
145-
<system:String x:Key="String_RestartAsAdministratorMessage">Zum ändern dieser Konfiguration werden administrative Rechte benötigt.</system:String>
146144
<system:String x:Key="String_NetworkAddress">Netzwerkadresse</system:String>
147145
<system:String x:Key="String_DeleteClientMessage">Der ausgewählte Client wird unwiderruflich gelöscht.</system:String>
148146
<system:String x:Key="String_Timeout">Timeout</system:String>
@@ -307,7 +305,6 @@
307305
<system:String x:Key="String_Button_Add">Hinzufügen</system:String>
308306
<system:String x:Key="String_Button_Cancel">Abbrechen</system:String>
309307
<system:String x:Key="String_Button_OK">OK</system:String>
310-
<system:String x:Key="String_Button_RestartAsAdministrator">Neustart als Administrator</system:String>
311308
<system:String x:Key="String_Button_Delete">Löschen</system:String>
312309
<system:String x:Key="String_Button_Calculate">Berechnen</system:String>
313310
<system:String x:Key="String_Button_Ping">Ping</system:String>

‎Source/NETworkManager/Resources/Localization/Resources.en-US.xaml‎

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
<system:String x:Key="String_Header_AreYouSure">Are you sure?</system:String>
4343
<system:String x:Key="String_Header_ValidationFailed">Validation failed!</system:String>
4444
<system:String x:Key="String_Header_Success">Success!</system:String>
45-
<system:String x:Key="String_Header_OUILookup">OUI-Lookup</system:String>
46-
<system:String x:Key="String_Header_PortScanner">Port-Scanner</system:String>
47-
<system:String x:Key="String_Header_PortLookup">Port-Lookup</system:String>
45+
<system:String x:Key="String_Header_OUILookup">OUI Lookup</system:String>
46+
<system:String x:Key="String_Header_PortScanner">Port Scanner</system:String>
47+
<system:String x:Key="String_Header_PortLookup">Port Lookup</system:String>
4848
<system:String x:Key="String_Header_Port">Port</system:String>
4949
<system:String x:Key="String_Header_Socket">Socket</system:String>
5050
<system:String x:Key="String_Header_History">History</system:String>
@@ -90,12 +90,12 @@
9090
<system:String x:Key="String_RestartRequired">Restart Required</system:String>
9191
<system:String x:Key="String_RestartRequiredAfterSettingsChanged">Some settings are applied only after restarting the application!</system:String>
9292
<system:String x:Key="String_WakeUp">Wake Up</system:String>
93-
<system:String x:Key="String_MACAddress">MAC-Address</system:String>
93+
<system:String x:Key="String_MACAddress">MAC Address</system:String>
9494
<system:String x:Key="String_Hostname">Hostname</system:String>
9595
<system:String x:Key="String_Description">Description</system:String>
9696
<system:String x:Key="String_Broadcast">Broadcast</system:String>
9797
<system:String x:Key="String_Port">Port</system:String>
98-
<system:String x:Key="String_IPAddress">IP-Address</system:String>
98+
<system:String x:Key="String_IPAddress">IP Address</system:String>
9999
<system:String x:Key="String_StartWithWindows">Start with Windows (current user)</system:String>
100100
<system:String x:Key="String_StartMinimizedInTray">Start minimized in tray</system:String>
101101
<system:String x:Key="String_AlwaysShowIconInTray">Always show icon in tray</system:String>
@@ -110,7 +110,7 @@
110110
<system:String x:Key="String_Status">Status</system:String>
111111
<system:String x:Key="String_PhysicalAddress">Physical Address</system:String>
112112
<system:String x:Key="String_Speed">Speed</system:String>
113-
<system:String x:Key="String_IPv4Address">IPv4-Address</system:String>
113+
<system:String x:Key="String_IPv4Address">IPv4 Address</system:String>
114114
<system:String x:Key="String_Subnetmask">Subnetmask</system:String>
115115
<system:String x:Key="String_CIDR">CIDR</system:String>
116116
<system:String x:Key="String_SubnetmaskOrCIDR">Subnetmask or CIDR</system:String>
@@ -120,8 +120,8 @@
120120
<system:String x:Key="String_DHCPServer">DHCP server</system:String>
121121
<system:String x:Key="String_DHCPLeaseObtained">DHCP Lease Obtained</system:String>
122122
<system:String x:Key="String_DHCPLeaseExpires">DHCP Lease Expires</system:String>
123-
<system:String x:Key="String_IPv6Address">IPv6-Address</system:String>
124-
<system:String x:Key="String_IPv6AddressLinkLocal">Link-local IPv6-Address</system:String>
123+
<system:String x:Key="String_IPv6Address">IPv6 Address</system:String>
124+
<system:String x:Key="String_IPv6AddressLinkLocal">Link-local IPv6 Address</system:String>
125125
<system:String x:Key="String_IPv6DefaultGateway">IPv6-Default-Gateway</system:String>
126126
<system:String x:Key="String_ObtainAnIPAddressAutomatically">Obtain an IP address automatically</system:String>
127127
<system:String x:Key="String_UseTheFollowingIPAddress">Use the following IP address:</system:String>
@@ -133,16 +133,14 @@
133133
<system:String x:Key="String_No">No</system:String>
134134
<system:String x:Key="String_DNSSuffix">DNS Suffix</system:String>
135135
<system:String x:Key="String_DNSServers">DNS Servers</system:String>
136-
<system:String x:Key="String_DynamicIPv4Address">Dynamic IPv4-Address</system:String>
137-
<system:String x:Key="String_StaticIPv4Address">Static IPv4-Address</system:String>
138-
<system:String x:Key="String_StaticIPv4DNSServer">Static IPv4-DNS-Server</system:String>
139-
<system:String x:Key="String_DynamicIPv4DNSServer">Dynamic IPv4-DNS-Server</system:String>
140-
<system:String x:Key="String_DefaultGateway">Default-Gateway</system:String>
136+
<system:String x:Key="String_DynamicIPv4Address">Dynamic IPv4 Address</system:String>
137+
<system:String x:Key="String_StaticIPv4Address">Static IPv4 Address</system:String>
138+
<system:String x:Key="String_StaticIPv4DNSServer">Static IPv4 DNS Server</system:String>
139+
<system:String x:Key="String_DynamicIPv4DNSServer">Dynamic IPv4 DNS Server</system:String>
140+
<system:String x:Key="String_DefaultGateway">Default Gateway</system:String>
141141
<system:String x:Key="String_AddTemplate">Add template</system:String>
142142
<system:String x:Key="String_EnterHostnameForClient">Enter the hostname to identify the client later.</system:String>
143143
<system:String x:Key="String_Administrator">Administrator</system:String>
144-
<system:String x:Key="String_RestartAsAdministrator">Restart as Administrator</system:String>
145-
<system:String x:Key="String_RestartAsAdministratorMessage">Administrative rights are required to change this configuration.</system:String>
146144
<system:String x:Key="String_NetworkAddress">Network address</system:String>
147145
<system:String x:Key="String_DeleteClientMessage">The selected client will be deleted permanently.</system:String>
148146
<system:String x:Key="String_Timeout">Timeout</system:String>
@@ -153,7 +151,7 @@
153151
<system:String x:Key="String_IPv6">IPv6</system:String>
154152
<system:String x:Key="String_TimeToWaitBetweenEachPing">Time to wait between each ping</system:String>
155153
<system:String x:Key="String_ShowTheFollowingApplicationOnStartup">Show the following application on startup:</system:String>
156-
<system:String x:Key="String_IPAddresses">IP-Addresses</system:String>
154+
<system:String x:Key="String_IPAddresses">IP addresses</system:String>
157155
<system:String x:Key="String_PacketsTransmitted">Packets transmitted</system:String>
158156
<system:String x:Key="String_ReceivedLost">Received / Lost</system:String>
159157
<system:String x:Key="String_PacketLoss">Packet loss</system:String>
@@ -179,7 +177,7 @@
179177
<system:String x:Key="String_CanceledByUser">The operation has been canceled by the user!</system:String>
180178
<system:String x:Key="String_ApplicationSettings">Application settings</system:String>
181179
<system:String x:Key="String_NetworkInterfaceProfiles">Network interface profiles</system:String>
182-
<system:String x:Key="String_PortScannerProfiles">Port-Scanner profiles</system:String>
180+
<system:String x:Key="String_PortScannerProfiles">Port Scanner profiles</system:String>
183181
<system:String x:Key="String_WakeOnLANClients">Wake on LAN clients</system:String>
184182
<system:String x:Key="String_RemoteDesktopSessions">Remote Desktop sessions</system:String>
185183
<system:String x:Key="String_SelectedSettingsAreReset">The selected settings are reset.</system:String>
@@ -197,7 +195,7 @@
197195
<system:String x:Key="String_Protocol">Protocol</system:String>
198196
<system:String x:Key="String_Service">Service</system:String>
199197
<system:String x:Key="String_ShowClosedPorts">Show closed ports</system:String>
200-
<system:String x:Key="String_HostnameOrIPAddress">Hostname or IP-Address</system:String>
198+
<system:String x:Key="String_HostnameOrIPAddress">Hostname or IP address</system:String>
201199
<system:String x:Key="String_Ports">Ports</system:String>
202200
<system:String x:Key="String_NumberOfStoredEntries">Number of stored entries:</system:String>
203201
<system:String x:Key="String_NetworkLocationCannotBeReached">The network address cannot be reached. Check if your computer is connected to the network. For information about network troubleshooting, see Windows Help.</system:String>
@@ -218,7 +216,7 @@
218216
<system:String x:Key="String_Result">Result</system:String>
219217
<system:String x:Key="String_NoDNSRecordFoundCheckYourInputAndSettings">No DNS record found for "{0}"! Check your input and the settings.</system:String>
220218
<system:String x:Key="String_UnkownError">Unkown error!</system:String>
221-
<system:String x:Key="String_TimeoutWhenQueryingDNSServer">Timeout when querying the DNS server with the IP-Address "{0}"!</system:String>
219+
<system:String x:Key="String_TimeoutWhenQueryingDNSServer">Timeout when querying the DNS server with the IP address "{0}"!</system:String>
222220
<system:String x:Key="String_ResolveCNAME">Resolve CNAME</system:String>
223221
<system:String x:Key="String_Host">Host</system:String>
224222
<system:String x:Key="String_CouldNotResolveHostnameFor">Could not resolve hostname for: "{0}"</system:String>
@@ -241,10 +239,10 @@
241239
<system:String x:Key="String_AddDNSSuffixToHostname">Add DNS suffix (primary) to hostname</system:String>
242240
<system:String x:Key="String_UseCustomDNSSuffix">Use custom DNS suffix</system:String>
243241
<system:String x:Key="String_SettingsSuccessfullyImported">Settings successfully imported!</system:String>
244-
<system:String x:Key="String_IPScannerProfilesReloaded">IP-Scanner profiles reloaded</system:String>
242+
<system:String x:Key="String_IPScannerProfilesReloaded">IP Scanner profiles reloaded</system:String>
245243
<system:String x:Key="String_WakeOnLANClientsReloaded">Wake on LAN clients reloaded</system:String>
246244
<system:String x:Key="String_NetworkInterfaceProfilesReloaded">Network interface profiles reloaded</system:String>
247-
<system:String x:Key="String_PortScannerProfilesReloaded">Port-Scanner profiles reloaded</system:String>
245+
<system:String x:Key="String_PortScannerProfilesReloaded">Port Scanner profiles reloaded</system:String>
248246
<system:String x:Key="String_RemoteDesktopSessionsReloaded">Remote Desktop sessions reloaded</system:String>
249247
<system:String x:Key="String_ComingSoon">Coming Soon!</system:String>
250248
<system:String x:Key="String_Override">override</system:String>
@@ -261,8 +259,8 @@
261259
<system:String x:Key="String_Destination">Destination</system:String>
262260
<system:String x:Key="String_EnterASubnetToCalculateIt">Enter a subnet to calculate it...</system:String>
263261
<system:String x:Key="String_Subnet">Subnet</system:String>
264-
<system:String x:Key="String_FirstIPAddress">First IP-Address</system:String>
265-
<system:String x:Key="String_LastIPAddress">Last IP-Address</system:String>
262+
<system:String x:Key="String_FirstIPAddress">First IP Address</system:String>
263+
<system:String x:Key="String_LastIPAddress">Last IP Address</system:String>
266264
<system:String x:Key="String_Hosts">Hosts</system:String>
267265
<system:String x:Key="String_NoEnabledNetworkAdaptersFound">No enabled network adapters found!</system:String>
268266
<system:String x:Key="String_Domain">Domain</system:String>
@@ -273,7 +271,7 @@
273271
<system:String x:Key="String_Group">Group</system:String>
274272
<system:String x:Key="String_Default">Default</system:String>
275273
<system:String x:Key="String_CopyAs">Copy as</system:String>
276-
<system:String x:Key="String_IPScannerProfiles">IP-Scanner profiles</system:String>
274+
<system:String x:Key="String_IPScannerProfiles">IP scanner profiles</system:String>
277275
<system:String x:Key="String_IPRange">IP range</system:String>
278276
<system:String x:Key="String_NothingFound">Nothing found!</system:String>
279277
<system:String x:Key="String_RedirectClipboard">Redirect clipboard</system:String>
@@ -307,7 +305,6 @@
307305
<system:String x:Key="String_Button_Add">Add</system:String>
308306
<system:String x:Key="String_Button_Cancel">Cancel</system:String>
309307
<system:String x:Key="String_Button_OK">OK</system:String>
310-
<system:String x:Key="String_Button_RestartAsAdministrator">Restart as Administrator</system:String>
311308
<system:String x:Key="String_Button_Delete">Delete</system:String>
312309
<system:String x:Key="String_Button_Calculate">Calculate</system:String>
313310
<system:String x:Key="String_Button_Ping">Ping</system:String>
@@ -350,7 +347,7 @@
350347
<system:String x:Key="String_Watermark_ExamplePort">7</system:String>
351348
<system:String x:Key="String_Watermark_ExampleIPv4Address">192.168.178.55</system:String>
352349
<system:String x:Key="String_Watermark_ExampleSubnetmask">255.255.255.0</system:String>
353-
<system:String x:Key="String_Watermark_HostnameOrIPAddress">Hostname or IP-Address...</system:String>
350+
<system:String x:Key="String_Watermark_HostnameOrIPAddress">Hostname or IP address...</system:String>
354351
<system:String x:Key="String_Watermark_EampleIPScanRange">192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[178-179].[1,100,150-200]; 192.168.178.150</system:String>
355352
<system:String x:Key="String_Watermark_LocationOfTheImport">Location of the import file...</system:String>
356353
<system:String x:Key="String_Watermark_ExampleMACAddressesOrVendor">01:23:45:67:89:AB; 01-23-45; AA11BB; 00F1A2C3D4E5; Intel Corp; Asus</system:String>
@@ -365,18 +362,18 @@
365362

366363
<!-- ShowProgress -->
367364
<system:String x:Key="String_ProgessHeader_ConfigureNetworkInterface">Configure Network Interface</system:String>
368-
<system:String x:Key="String_Progress_SetStaticIPAddress">Set static IP-Address and gateway...</system:String>
369-
<system:String x:Key="String_Progress_SetDynamicIPAddress">Set dynamic IP-Address...</system:String>
370-
<system:String x:Key="String_Progress_SetStaticDNSServer">Set static DNS-Server...</system:String>
371-
<system:String x:Key="String_Progesss_SetDynamicDNSServer">Set dynamic DNS-Server...</system:String>
365+
<system:String x:Key="String_Progress_SetStaticIPAddress">Set static IP address and gateway...</system:String>
366+
<system:String x:Key="String_Progress_SetDynamicIPAddress">Set dynamic IP address...</system:String>
367+
<system:String x:Key="String_Progress_SetStaticDNSServer">Set static DNS server...</system:String>
368+
<system:String x:Key="String_Progesss_SetDynamicDNSServer">Set dynamic DNS server...</system:String>
372369
<system:String x:Key="String_Progress_RenewDHCPLease">Renew DHCP lease...</system:String>
373370
<system:String x:Key="String_Progress_FixGatewayAfterDHCPEnabled">Fix gateway after DHCP is enabled...</system:String>
374371

375372
<!-- Validate (User Input in GUI) -->
376373
<system:String x:Key="String_ValidateError_FieldEmpty">Field cannot be empty!</system:String>
377-
<system:String x:Key="String_ValidateError_EnterValidMACAddress">Enter a valid MAC-Address like 00:F1:23:AB:F2:35!</system:String>
374+
<system:String x:Key="String_ValidateError_EnterValidMACAddress">Enter a valid MAC address like 00:F1:23:AB:F2:35!</system:String>
378375
<system:String x:Key="String_ValidateError_EnterValidPort">Enter a valid port (1 - 65535)!</system:String>
379-
<system:String x:Key="String_ValidateError_EnterValidIPv4Address">Enter a valid IPv4-Address!</system:String>
376+
<system:String x:Key="String_ValidateError_EnterValidIPv4Address">Enter a valid IPv4 address!</system:String>
380377
<system:String x:Key="String_ValidateError_FolderDoesNotExist">Folder does not exists!</system:String>
381378
<system:String x:Key="String_ValidateError_EnterValidSubnetmask">Enter a valid subnetmask (like 255.255.255.0)!</system:String>
382379
<system:String x:Key="String_ValidateError_EnterValidSubnetmaskOrCIDR">Enter a valid subnetmask or CIDR (like 255.255.255.0 or 24)!</system:String>
@@ -385,7 +382,7 @@
385382
<system:String x:Key="String_ValidateError_EnterValidPortOrPortRange">Enter a valid port and/or port range (1 - 65535)!</system:String>
386383
<system:String x:Key="String_ValidateError_OnlyNumbersCanBeEntered">Only numbers can be entered!</system:String>
387384
<system:String x:Key="String_ValidateError_EnterValidValueBetween10and100">Enter a valid value between 10 and 100!</system:String>
388-
<system:String x:Key="String_ValidateError_EnterValidIPAddress">Enter a valid IP-Address!</system:String>
385+
<system:String x:Key="String_ValidateError_EnterValidIPAddress">Enter a valid IP address!</system:String>
389386
<system:String x:Key="String_ValidateError_EnterValidSubnet">Enter a valid subnet (like 192.168.178.133/26)</system:String>
390387

391388
<!-- ApplicationView.Name -->

0 commit comments

Comments
 (0)