Skip to content

Commit c276681

Browse files
committed
[NETID] Improve the 'Computer name' property page
- Check for changes of the host and domain name. - Use NetGetJoinInformation to retrieve the join status. - Implement the SyncDomainWithMembership setting. - Disable the administrator warning temporarily.
1 parent b3947d5 commit c276681

File tree

25 files changed

+203
-96
lines changed

25 files changed

+203
-96
lines changed

dll/win32/netid/lang/bg-BG.rc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ BEGIN
1717
PUSHBUTTON "&Мрежов опознавател...", IDC_NETWORK_ID, 170, 114, 85, 15
1818
LTEXT "За преименуване на компютъра или присъединяване към имение, натиснете „Промяна”.", IDC_STATIC, 6, 149, 170, 24
1919
PUSHBUTTON "Про&мяна...", IDC_NETWORK_PROPERTY, 170, 149, 85, 15
20-
LTEXT "Забележка: Само управниците могат да променят опознавателите\n на компютъра.", IDC_STATIC, 6, 179, 300, 18
20+
LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
21+
ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
22+
LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
2123
END
2224

2325
IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222

dll/win32/netid/lang/cs-CZ.rc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ BEGIN
2222
PUSHBUTTON "&Síťová ID...", IDC_NETWORK_ID, 190, 114, 58, 15 //FIXME nic vic nez "sitova ID" se nevejde na tlacitko!
2323
LTEXT "Kliknutím na ""Změnit"" lze přejmenovat tento počítač nebo se připojit k doméně.", IDC_STATIC, 6, 149, 170, 17
2424
PUSHBUTTON "&Změnit...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
25-
LTEXT "Poznámka: Identifikaci tohoto počítače mohou změnit pouze administrátoři.", IDC_STATIC, 6, 179, 300, 9
25+
LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
26+
ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
27+
LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
2628
END
2729

2830
IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222

dll/win32/netid/lang/de-DE.rc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
1313
CAPTION "Computername"
1414
FONT 8, "MS Shell Dlg"
1515
BEGIN
16-
ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON
16+
ICON IDI_COMPNAME, IDC_STATIC, 7, 7, 20, 20, SS_ICON
1717
LTEXT "ReactOS benutzt folgende Informationen, um Ihren Computer im Netzwerk zu identifizieren.", IDC_STATIC, 40, 5, 204, 20
1818
LTEXT "Computerbeschreibung:", IDC_STATIC, 6, 40, 80, 9
1919
EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
@@ -25,7 +25,9 @@ BEGIN
2525
PUSHBUTTON "&Netzwerk-ID...", IDC_NETWORK_ID, 190, 114, 58, 15
2626
LTEXT "Um diesen Computer umzubenennen oder sich an einer Domäne anzumelden, klicken Sie auf ""Ändern"".", IDC_STATIC, 6, 149, 170, 17
2727
PUSHBUTTON "&Ändern...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
28-
LTEXT "Bitte beachten: Nur Administratoren können die Identifikation dieses Computers ändern.", IDC_STATIC, 6, 179, 250, 18
28+
LTEXT "", IDC_MESSAGETEXT, 7, 172, 242, 24
29+
ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON
30+
LTEXT "Änderungen werden beim nächsten Neustart des Computers übernommen.", IDC_RESTARTTEXT, 25, 195, 209, 8
2931
END
3032

3133
IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222

dll/win32/netid/lang/el-GR.rc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ BEGIN
1717
PUSHBUTTON "&Network ID...", IDC_NETWORK_ID, 190, 114, 58, 15
1818
LTEXT "Για να μετονομάσετε αυτόν τον υπολογιστή ή να συμμετάσχετε σε μια ομάδα εργασίας, κάντε κλικ στο κουμπί ""Αλλαγή"".", IDC_STATIC, 6, 149, 170, 17
1919
PUSHBUTTON "&Αλλαγή...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
20-
LTEXT "Σημείωση: Μόνο οι διαχειριστές συστήματος μπορούν να αλλάξουν το αναγνωριστικό αυτού του υπολογιστή.", IDC_STATIC, 6, 179, 300, 9
20+
LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
21+
ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
22+
LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
2123
END
2224

2325
IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
@@ -72,7 +74,7 @@ BEGIN
7274
23 "Welcome to the %1 domain."
7375
24 "You must restart this computer for the changes to take effect."
7476
25 "You can change the name and the membership of this computer. Changes may affect access to network resources."
75-
1021 "Note: Only Administrators can change the identification of this computer."
77+
1021 "Σημείωση: Μόνο οι διαχειριστές συστήματος μπορούν να αλλάξουν το αναγνωριστικό αυτού του υπολογιστή."
7678
1022 "Note: The identification of the computer cannot be changed because:"
7779
1029 "The new computer name ""%1"" is a number. The name may not be a number."
7880
1030 "The new computer name ""%1"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?"

dll/win32/netid/lang/en-US.rc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ BEGIN
1717
PUSHBUTTON "&Network ID...", IDC_NETWORK_ID, 190, 114, 58, 15
1818
LTEXT "To rename this computer or join a domain, click ""Change"".", IDC_STATIC, 6, 149, 170, 17
1919
PUSHBUTTON "&Change...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
20-
LTEXT "Note: Only Administrators can change the identification of this computer.", IDC_STATIC, 6, 179, 300, 9
20+
LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
21+
ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
22+
LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
2123
END
2224

2325
IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222

dll/win32/netid/lang/es-ES.rc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ BEGIN
1919
PUSHBUTTON "&Id de red...", IDC_NETWORK_ID, 190, 114, 58, 15
2020
LTEXT "Para cambiar el nombre de este equipo o unirse a un dominio, haga clic en ""Cambiar"".", IDC_STATIC, 6, 149, 170, 17
2121
PUSHBUTTON "Cam&biar...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
22-
LTEXT "Nota: Sólo los Administradores pueden cambiar la identificación de este equipo.", IDC_STATIC, 6, 179, 250, 17
22+
LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
23+
ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
24+
LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
2325
END
2426

2527
IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222

dll/win32/netid/lang/fr-FR.rc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ BEGIN
1717
PUSHBUTTON "ID &réseau...", IDC_NETWORK_ID, 170, 114, 78, 15
1818
LTEXT "Pour changer le nom de cet ordinateur ou rejoindre un domaine, cliquez sur Modifier.", IDC_STATIC, 6, 149, 160, 17
1919
PUSHBUTTON "Modifier...", IDC_NETWORK_PROPERTY, 170, 149, 78, 15
20-
LTEXT "Note : Seuls les administrateurs peuvent modifier l'identification de cet ordinateur.", IDC_STATIC, 6, 179, 244, 18
20+
LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
21+
ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
22+
LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
2123
END
2224

2325
IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222

dll/win32/netid/lang/he-IL.rc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ BEGIN
1717
PUSHBUTTON "מזהה רשת...", IDC_NETWORK_ID, 190, 114, 58, 15
1818
LTEXT "To rename this computer or join a domain, click ""Change"".", IDC_STATIC, 6, 149, 170, 17
1919
PUSHBUTTON "שנה...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
20-
LTEXT "Note: Only Administrators can change the identification of this computer.", IDC_STATIC, 6, 179, 300, 9
20+
LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
21+
ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
22+
LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
2123
END
2224

2325
IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222

dll/win32/netid/lang/id-ID.rc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ BEGIN
1717
PUSHBUTTON "&Network ID...", IDC_NETWORK_ID, 190, 114, 58, 15
1818
LTEXT "Untuk mengganti nama komputer ini atau bergabung dengan domain, klik ""Ubah"".", IDC_STATIC, 6, 149, 170, 17
1919
PUSHBUTTON "&Ubah...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
20-
LTEXT "Catatan: Hanya Administrator yang bisa mengubah identifikasi komputer ini.", IDC_STATIC, 6, 179, 300, 9
20+
LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
21+
ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
22+
LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
2123
END
2224

2325
IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222
@@ -72,7 +74,7 @@ BEGIN
7274
23 "Welcome to the %1 domain."
7375
24 "You must restart this computer for the changes to take effect."
7476
25 "You can change the name and the membership of this computer. Changes may affect access to network resources."
75-
1021 "Note: Only Administrators can change the identification of this computer."
77+
1021 "Catatan: Hanya Administrator yang bisa mengubah identifikasi komputer ini."
7678
1022 "Note: The identification of the computer cannot be changed because:"
7779
1029 "The new computer name ""%1"" is a number. The name may not be a number."
7880
1030 "The new computer name ""%1"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + [ ] { } \\ | ; : ' "" , < > / and ?"

dll/win32/netid/lang/it-IT.rc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ BEGIN
1919
PUSHBUTTON "&ID di rete...", IDC_NETWORK_ID, 190, 114, 58, 15
2020
LTEXT "Per cambiare il nome a questo computer o collegarsi a un dominio, clicca ""Modifica"".", IDC_STATIC, 6, 149, 170, 17
2121
PUSHBUTTON "&Modifica...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15
22-
LTEXT "Nota: Solo gli amministratori possono cambiare il nome di questo computer.", IDC_STATIC, 6, 179, 300, 9
22+
LTEXT "", IDC_MESSAGETEXT, 7, 179, 242, 46
23+
ICON IDI_WARNINGICO, IDC_RESTARTICON, 7, 194, 20, 20, SS_ICON | SS_REALSIZEIMAGE
24+
LTEXT "Changes will take effect after you restart this computer.", IDC_RESTARTTEXT, 25, 195, 209, 8
2325
END
2426

2527
IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222

0 commit comments

Comments
 (0)