Index: base/applications/regedit/framewnd.c =================================================================== --- base/applications/regedit/framewnd.c (rvision 56867) +++ base/applications/regedit/framewnd.c (copie de travail) @@ -85,8 +85,7 @@ } else { - while(RemoveMenu(hMenu, s_nFavoriteMenuSubPos, MF_BYPOSITION)) - ; + while(RemoveMenu(hMenu, s_nFavoriteMenuSubPos, MF_BYPOSITION)); } lResult = RegOpenKey(HKEY_CURRENT_USER, s_szFavoritesRegKey, &hKey); @@ -260,7 +259,7 @@ static BOOL InitOpenFileName(HWND hWnd, OPENFILENAME* pofn) { - FILTERPAIR FilterPairs[3]; + FILTERPAIR FilterPairs[4]; static TCHAR Filter[1024]; memset(pofn, 0, sizeof(OPENFILENAME)); @@ -271,11 +270,13 @@ /* create filter string */ FilterPairs[0].DisplayID = IDS_FLT_REGFILES; FilterPairs[0].FilterID = IDS_FLT_REGFILES_FLT; - FilterPairs[1].DisplayID = IDS_FLT_REGEDIT4; - FilterPairs[1].FilterID = IDS_FLT_REGEDIT4_FLT; - FilterPairs[2].DisplayID = IDS_FLT_ALLFILES; - FilterPairs[2].FilterID = IDS_FLT_ALLFILES_FLT; - BuildFilterStrings(Filter, FilterPairs, sizeof(FilterPairs) / sizeof(FILTERPAIR)); + FilterPairs[1].DisplayID = IDS_FLT_HIVFILES; + FilterPairs[1].FilterID = IDS_FLT_HIVFILES_FLT; + FilterPairs[2].DisplayID = IDS_FLT_REGEDIT4; + FilterPairs[2].FilterID = IDS_FLT_REGEDIT4_FLT; + FilterPairs[3].DisplayID = IDS_FLT_ALLFILES; + FilterPairs[3].FilterID = IDS_FLT_ALLFILES_FLT; + BuildFilterStrings(Filter, FilterPairs, COUNT_OF(FilterPairs)); pofn->lpstrFilter = Filter; pofn->lpstrFile = FileNameBuffer; @@ -379,6 +380,9 @@ if(regLoadResult == ERROR_SUCCESS) { + /* Flush the root key */ + RegFlushKey(hRootKey); + /* refresh tree and list views */ RefreshTreeView(g_pChildWnd->hTreeWnd); pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); @@ -417,6 +421,9 @@ if(regUnloadResult == ERROR_SUCCESS) { + /* Flush the root key */ + RegFlushKey(hRootKey); + /* refresh tree and list views */ RefreshTreeView(g_pChildWnd->hTreeWnd); pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); @@ -432,11 +439,15 @@ static BOOL ImportRegistryFile(HWND hWnd) { + BOOL bRet = FALSE; OPENFILENAME ofn; TCHAR Caption[128], szTitle[256], szText[256]; + HKEY hKeyRoot; LPCTSTR pszKeyPath; - HKEY hRootKey; + /* Figure out in which key path we are importing */ + pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + InitOpenFileName(hWnd, &ofn); LoadString(hInst, IDS_IMPORT_REG_FILE, Caption, COUNT_OF(Caption)); ofn.lpstrTitle = Caption; @@ -444,32 +455,77 @@ /* ofn.lCustData = ;*/ if (GetOpenFileName(&ofn)) { - FILE *fp = _wfopen(ofn.lpstrFile, L"r"); - if (fp == NULL || !import_registry_file(fp)) + /* Look at the extension of the file to determine its type */ + if (ofn.nFileExtension >= 1 && + _tcsicmp(ofn.lpstrFile + ofn.nFileExtension, TEXT("reg")) == 0) /* REGEDIT4 or Windows Registry Editor Version 5.00 */ { - LPSTR p = GetMultiByteString(ofn.lpstrFile); - fprintf(stderr, "Can't open file \"%s\"\n", p); - HeapFree(GetProcessHeap(), 0, p); - if (fp != NULL) - fclose(fp); - return FALSE; + /* Open the file */ + FILE *fp = _wfopen(ofn.lpstrFile, L"r"); + + /* Import it */ + if (fp == NULL || !import_registry_file(fp)) + { + LPSTR p = GetMultiByteString(ofn.lpstrFile); + fprintf(stderr, "Can't open file \"%s\"\n", p); + HeapFree(GetProcessHeap(), 0, p); + bRet = FALSE; + } + else + { + /* Show successful import */ + LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); + LoadString(hInst, IDS_IMPORTED_OK, szText, COUNT_OF(szText)); + MessageBox(NULL, szText, szTitle, MB_OK); + bRet = TRUE; + } + + /* Close the file */ + if (fp) fclose(fp); } - LoadString(hInst, IDS_APP_TITLE, szTitle, sizeof(szTitle)); - LoadString(hInst, IDS_IMPORTED_OK, szText, sizeof(szTitle)); - /* show successful import */ - MessageBox(NULL, szText, szTitle, MB_OK); - fclose(fp); + else /* Registry Hive Files */ + { + LoadString(hInst, IDS_QUERY_IMPORT_HIVE_CAPTION, szTitle, COUNT_OF(szTitle)); + LoadString(hInst, IDS_QUERY_IMPORT_HIVE_MSG, szText, COUNT_OF(szText)); + + /* Display a confirmation message */ + if (MessageBox(g_pChildWnd->hWnd, szText, szTitle, MB_ICONWARNING | MB_YESNO) == IDYES) + { + LONG lResult; + HKEY hSubKey; + + /* Open the subkey */ + lResult = RegOpenKeyEx(hKeyRoot, pszKeyPath, 0, KEY_WRITE, &hSubKey); + if (lResult == ERROR_SUCCESS) + { + /* Enable the 'restore' privilege, restore the hive then disable the privilege */ + EnablePrivilege(SE_RESTORE_NAME, NULL, TRUE); + lResult = RegRestoreKey(hSubKey, ofn.lpstrFile, REG_FORCE_RESTORE); + EnablePrivilege(SE_RESTORE_NAME, NULL, FALSE); + + /* Flush the subkey and close it */ + RegFlushKey(hSubKey); + RegCloseKey(hSubKey); + } + + /* Set the return value */ + bRet = (lResult == ERROR_SUCCESS); + + /* Display error, if any */ + if (!bRet) ErrorMessageBox(hWnd, Caption, lResult); + } + } } else { CheckCommDlgError(hWnd); } + /* refresh tree and list views */ RefreshTreeView(g_pChildWnd->hTreeWnd); - pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hRootKey); - RefreshListView(g_pChildWnd->hListWnd, hRootKey, pszKeyPath); + pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, pszKeyPath); - return TRUE; + return bRet; } static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) @@ -528,6 +584,7 @@ BOOL ExportRegistryFile(HWND hWnd) { + BOOL bRet = FALSE; OPENFILENAME ofn; TCHAR ExportKeyPath[_MAX_PATH]; TCHAR Caption[128]; @@ -539,7 +596,7 @@ GetKeyName(ExportKeyPath, COUNT_OF(ExportKeyPath), hKeyRoot, pszKeyPath); InitOpenFileName(hWnd, &ofn); - LoadString(hInst, IDS_EXPORT_REG_FILE, Caption, sizeof(Caption)/sizeof(TCHAR)); + LoadString(hInst, IDS_EXPORT_REG_FILE, Caption, COUNT_OF(Caption)); ofn.lpstrTitle = Caption; /* Only set the path if a key (not the root node) is selected */ @@ -552,27 +609,86 @@ ofn.lpTemplateName = MAKEINTRESOURCE(IDD_EXPORTRANGE); if (GetSaveFileName(&ofn)) { - BOOL result; - DWORD format; + switch (ofn.nFilterIndex) + { + case 2: /* Registry Hive Files */ + { + LONG lResult; + HKEY hSubKey; - if (ofn.nFilterIndex == 1) - format = REG_FORMAT_5; - else - format = REG_FORMAT_4; - result = export_registry_key(ofn.lpstrFile, ExportKeyPath, format); - if (!result) - { - LPSTR p = GetMultiByteString(ofn.lpstrFile); - fprintf(stderr, "Can't open file \"%s\"\n", p); - HeapFree(GetProcessHeap(), 0, p); - return FALSE; + /* Open the subkey */ + lResult = RegOpenKeyEx(hKeyRoot, pszKeyPath, 0, KEY_READ, &hSubKey); + if (lResult == ERROR_SUCCESS) + { + /* Enable the 'backup' privilege, save the hive then disable the privilege */ + EnablePrivilege(SE_BACKUP_NAME, NULL, TRUE); + lResult = RegSaveKey(hSubKey, ofn.lpstrFile, NULL); + if (lResult == ERROR_ALREADY_EXISTS) + { + /* + * We are here, that means that we already said "yes" to the confirmation dialog. + * So we absolutely want to replace the hive file. + */ + if (DeleteFile(ofn.lpstrFile)) + { + /* Try again */ + lResult = RegSaveKey(hSubKey, ofn.lpstrFile, NULL); + } + } + EnablePrivilege(SE_BACKUP_NAME, NULL, FALSE); + + if(lResult != ERROR_SUCCESS) + { + /* + * If we are here, it's because RegSaveKey has failed for any reason. + * The problem is that even if it has failed, it has created or + * remplaced the exported hive file with a new empty file. We don't + * want to keep this file, so we delete it. + */ + DeleteFile(ofn.lpstrFile); + } + + /* Close the subkey */ + RegCloseKey(hSubKey); + } + + /* Set the return value */ + bRet = (lResult == ERROR_SUCCESS); + + /* Display error, if any */ + if (!bRet) ErrorMessageBox(hWnd, Caption, lResult); + + break; + } + + case 1: /* Windows Registry Editor Version 5.00 */ + case 3: /* REGEDIT4 */ + default: /* All files ==> use Windows Registry Editor Version 5.00 */ + { + if (!export_registry_key(ofn.lpstrFile, ExportKeyPath, + (ofn.nFilterIndex == 3 ? REG_FORMAT_4 + : REG_FORMAT_5))) + { + LPSTR p = GetMultiByteString(ofn.lpstrFile); + fprintf(stderr, "Can't open file \"%s\"\n", p); + HeapFree(GetProcessHeap(), 0, p); + bRet = FALSE; + } + else + { + bRet = TRUE; + } + + break; + } } } else { CheckCommDlgError(hWnd); } - return TRUE; + + return bRet; } BOOL PrintRegistryHive(HWND hWnd, LPTSTR path) @@ -1055,8 +1171,8 @@ if(nSelected >= 1) { TCHAR msg[128], caption[128]; - LoadString(hInst, IDS_QUERY_DELETE_CONFIRM, caption, sizeof(caption)/sizeof(TCHAR)); - LoadString(hInst, (nSelected == 1 ? IDS_QUERY_DELETE_ONE : IDS_QUERY_DELETE_MORE), msg, sizeof(msg)/sizeof(TCHAR)); + LoadString(hInst, IDS_QUERY_DELETE_CONFIRM, caption, COUNT_OF(caption)); + LoadString(hInst, (nSelected == 1 ? IDS_QUERY_DELETE_ONE : IDS_QUERY_DELETE_MORE), msg, COUNT_OF(msg)); if(MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONQUESTION | MB_YESNO) == IDYES) { int ni, errs; @@ -1076,8 +1192,8 @@ RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); if(errs > 0) { - LoadString(hInst, IDS_ERR_DELVAL_CAPTION, caption, sizeof(caption)/sizeof(TCHAR)); - LoadString(hInst, IDS_ERR_DELETEVALUE, msg, sizeof(msg)/sizeof(TCHAR)); + LoadString(hInst, IDS_ERR_DELVAL_CAPTION, caption, COUNT_OF(caption)); + LoadString(hInst, IDS_ERR_DELETEVALUE, msg, COUNT_OF(msg)); MessageBox(g_pChildWnd->hWnd, msg, caption, MB_ICONSTOP); } } @@ -1135,7 +1251,8 @@ case ID_VIEW_REFRESH: RefreshTreeView(g_pChildWnd->hTreeWnd); - /*RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, NULL); */ + keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); break; /*case ID_OPTIONS_TOOLBAR:*/ /* toggle_child(hWnd, LOWORD(wParam), hToolBar);*/ Index: base/applications/regedit/lang/bg-BG.rc =================================================================== --- base/applications/regedit/lang/bg-BG.rc (rvision 56867) +++ base/applications/regedit/lang/bg-BG.rc (copie de travail) @@ -59,9 +59,9 @@ MENUITEM "&Износ...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Зареждане на рой...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Изоставяне на рой...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Зареждане на рой...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Изоставяне на рой...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Свързване с мрежов регистър...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -366,8 +366,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Грешка" - IDS_WARNING "Предупреждение" + IDS_ERROR "Грешка" + IDS_WARNING "Предупреждение" IDS_BAD_KEY "Невъзможно извличането на ключ '%s'" IDS_BAD_VALUE "Невъзможно извличането на стойност '%s'" IDS_UNSUPPORTED_TYPE "Промяната на ключове от този вид е невъзможна (%ld)" @@ -383,6 +383,8 @@ IDS_ERR_DELETEVALUE "Изтриването на всички указани стойности е невъзможно!" IDS_ERR_RENVAL_CAPTION "Грешка при преиманеуването" IDS_ERR_RENVAL_TOEMPTY "Неуспешно преименуване на %s. Указаната стойност не е празна. Опитайте отново с друго име." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Нов ключ #%d" IDS_NEW_VALUE "Нова стойност #%d" END @@ -403,10 +405,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Вписващ файл" - IDS_FLT_REGFILES "Вписващи (регистърни) файлове" + IDS_FLT_REGFILES "Вписващи (регистърни) файлове (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 вписващи файлове (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4 вписващи файлове (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Всички файлове (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/cs-CZ.rc =================================================================== --- base/applications/regedit/lang/cs-CZ.rc (rvision 56867) +++ base/applications/regedit/lang/cs-CZ.rc (copie de travail) @@ -54,9 +54,9 @@ MENUITEM "&Exportovat do souboru registru...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Načíst strom registru...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Uvolnit strom registru...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Načíst strom registru...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Uvolnit strom registru...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Připojit síťový registr...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Nelze odstranit všechny vybrané položky!" IDS_ERR_RENVAL_CAPTION "Chyba při přejmenování položky" IDS_ERR_RENVAL_TOEMPTY "Nelze přejmenovat %s. Vybraná položka je prázdná. Vyzkoušejte jiný název." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Nový klíč #%d" IDS_NEW_VALUE "Nová hodnota #%d" END @@ -388,10 +390,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Soubor registru" - IDS_FLT_REGFILES "Soubory registru" + IDS_FLT_REGFILES "Soubory registru (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Soubory registru Win9x/NT4 (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Soubory registru Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Všechny soubory (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/de-DE.rc =================================================================== --- base/applications/regedit/lang/de-DE.rc (rvision 56867) +++ base/applications/regedit/lang/de-DE.rc (copie de travail) @@ -54,9 +54,9 @@ MENUITEM "&Exportieren...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Zweig laden...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Zweig entladen...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Zweig laden...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Zweig entladen...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Mit Netzwerkregistrierung verbinden...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Fehler" - IDS_WARNING "Warnung" + IDS_ERROR "Fehler" + IDS_WARNING "Warnung" IDS_BAD_KEY "Kann den Schlüssel '%s' nicht lesen" IDS_BAD_VALUE "Kann den Wert '%s' nicht lesen" IDS_UNSUPPORTED_TYPE "Kann den Schlüssel des Typs (%ld) nicht ändern" @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Es konnten nicht alle Werte gelöscht werden!" IDS_ERR_RENVAL_CAPTION "Fehler beim Umbenennen des Wertes" IDS_ERR_RENVAL_TOEMPTY "Kann %s nicht umbenennen. Der angegebene Name ist leer." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Neuer Schlüssel #%d" IDS_NEW_VALUE "Neuer Wert #%d" END @@ -388,10 +390,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Registrierungsdatei" - IDS_FLT_REGFILES "Registrierungsdateien" + IDS_FLT_REGFILES "Registrierungsdateien (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4-Registrierungsdateien (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4-Registrierungsdateien (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Alle Dateien (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/el-GR.rc =================================================================== --- base/applications/regedit/lang/el-GR.rc (rvision 56867) +++ base/applications/regedit/lang/el-GR.rc (copie de travail) @@ -54,9 +54,9 @@ MENUITEM "&Εξαγωγή...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Φόρτωση Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Αφαίρεση Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Φόρτωση Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Αφαίρεση Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Connect Network Registry...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Σφάλμα" - IDS_WARNING "Προειδοποίηση" + IDS_ERROR "Σφάλμα" + IDS_WARNING "Προειδοποίηση" IDS_BAD_KEY "Can't query key '%s'" IDS_BAD_VALUE "Can't query value '%s'" IDS_UNSUPPORTED_TYPE "Δεν είναι δυνατή η επεξεργασία κλειδιών αυτού του τύπου (%ld)" @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Δεν ήτνα δυνατή η διαγραφή όλων των τιμών!" IDS_ERR_RENVAL_CAPTION "Σφάλμα κατά τη Μετονομασία Τιμών" IDS_ERR_RENVAL_TOEMPTY "Δεν είναι δυνατή η μετονομασία του %s. Το όνομα της συγκεκριμένης τιμής είναι άδειο. Δώστε άλλο όνομα και προσπαθήστε ξανά." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Νέο Κλειδί #%d" IDS_NEW_VALUE "Νέα Τιμή #%d" END @@ -388,10 +390,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registration αρχεία" + IDS_FLT_REGFILES "Registration αρχεία (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration αρχεία (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration αρχεία (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Όλα τα αρχεία (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/en-US.rc =================================================================== --- base/applications/regedit/lang/en-US.rc (rvision 56867) +++ base/applications/regedit/lang/en-US.rc (copie de travail) @@ -54,9 +54,9 @@ MENUITEM "&Export...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Connect Network Registry...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Error" - IDS_WARNING "Warning" + IDS_ERROR "Error" + IDS_WARNING "Warning" IDS_BAD_KEY "Can't query key '%s'" IDS_BAD_VALUE "Can't query value '%s'" IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Unable to delete all specified values!" IDS_ERR_RENVAL_CAPTION "Error Renaming Value" IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "New Key #%d" IDS_NEW_VALUE "New Value #%d" END @@ -388,10 +390,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registration Files" + IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/es-ES.rc =================================================================== --- base/applications/regedit/lang/es-ES.rc (rvision 56867) +++ base/applications/regedit/lang/es-ES.rc (copie de travail) @@ -56,10 +56,10 @@ MENUITEM "&Exportar archivo de registro...", ID_REGISTRY_EXPORTREGISTRYFILE - MENUITEM SEPARATOR - MENUITEM "Cargar archivo de registro...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Descargar archivo de registro...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM SEPARATOR + MENUITEM "Cargar archivo de registro...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Descargar archivo de registro...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Conectar al Registro de red...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -354,8 +354,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Error" - IDS_WARNING "Aviso" + IDS_ERROR "Error" + IDS_WARNING "Aviso" IDS_BAD_KEY "No puede averiguar valor clave '%s'" IDS_BAD_VALUE "No puede averiguar valor '%s'" IDS_UNSUPPORTED_TYPE "No puede editar claves de este tipo (%ld)" @@ -371,6 +371,8 @@ IDS_ERR_DELETEVALUE "¡Incapaz de borrar todos los valores especificados!" IDS_ERR_RENVAL_CAPTION "Error Renombrando Valor" IDS_ERR_RENVAL_TOEMPTY "No puede renombrar %s. El nombre de valor especificado esta vacio. Trate otro nombre y comienze otra vez." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Nueva Clave #%d" IDS_NEW_VALUE "Nuevo Valor #%d" END @@ -391,10 +393,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Fichero de Registro" - IDS_FLT_REGFILES "Fichero de Registro" + IDS_FLT_REGFILES "Fichero de Registro (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Fichero de Registro Win9x/NT4 (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Fichero de Registro Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Todos los archivos (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/fr-FR.rc =================================================================== --- base/applications/regedit/lang/fr-FR.rc (rvision 56867) +++ base/applications/regedit/lang/fr-FR.rc (copie de travail) @@ -53,19 +53,13 @@ POPUP "&Fichier" BEGIN MENUITEM "&Importer...", ID_REGISTRY_IMPORTREGISTRYFILE - MENUITEM "&Exporter...", ID_REGISTRY_EXPORTREGISTRYFILE - MENUITEM SEPARATOR - MENUITEM "Charger un fichier registre...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Décharger un fichier registre...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM "Charger la ruche...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Décharger la ruche...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM SEPARATOR MENUITEM "&Connecter à des registres via le réseau...", ID_REGISTRY_CONNECTNETWORKREGISTRY - - MENUITEM "&Déconnecter de registres réseau...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED - - MENUITEM SEPARATOR MENUITEM "Im&primer\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR @@ -325,9 +319,9 @@ ID_REGISTRY_EXPORTREGISTRYFILE "Exporte tout ou une partie des registres dans un fichier texte" ID_REGISTRY_LOADHIVE - "Loads a hive file into the registry" + "Charge un fichier ruche dans le Registre" ID_REGISTRY_UNLOADHIVE - "Unloads a hive from the registry" + "Décharge une ruche à partir du Registre" ID_REGISTRY_CONNECTNETWORKREGISTRY "Connecte aux registres d'un ordinateur distant" ID_REGISTRY_DISCONNECTNETWORKREGISTRY @@ -354,47 +348,50 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Erreur" - IDS_WARNING "Attention" + IDS_ERROR "Erreur" + IDS_WARNING "Attention" IDS_BAD_KEY "Impossible de récupérer la clé '%s'" IDS_BAD_VALUE "Impossible de récupérer la valeur '%s'" IDS_UNSUPPORTED_TYPE "Impossible d'éditer les clés de ce type (%ld)" IDS_TOO_BIG_VALUE "La valeur est trop importante (%ld)" IDS_MULTI_SZ_EMPTY_STRING "Les données de type REG_MULTI_SZ ne peuvent contenir des chaînes vides.\nLes chaînes vides ont été supprimées de la liste." - IDS_QUERY_DELETE_KEY_ONE "Êtes-vous sûr de vouloir supprimer cette clé?" - IDS_QUERY_DELETE_KEY_MORE "Êtes-vous sûr de vouloir supprimer ces clés?" + IDS_QUERY_DELETE_KEY_ONE "Êtes-vous sûr de vouloir supprimer cette clé ?" + IDS_QUERY_DELETE_KEY_MORE "Êtes-vous sûr de vouloir supprimer ces clés ?" IDS_QUERY_DELETE_KEY_CONFIRM "Confirmation de la suppression de la clé" - IDS_QUERY_DELETE_ONE "Êtes-vous sûr de vouloir supprimer cette valeur?" - IDS_QUERY_DELETE_MORE "Êtes-vous sûr de vouloir supprimer ces valeurs?" + IDS_QUERY_DELETE_ONE "Êtes-vous sûr de vouloir supprimer cette valeur ?" + IDS_QUERY_DELETE_MORE "Êtes-vous sûr de vouloir supprimer ces valeurs ?" IDS_QUERY_DELETE_CONFIRM "Confirmation de la suppression de la valeur" - IDS_ERR_DELVAL_CAPTION "Erreur lors de la suppression des valeurs" - IDS_ERR_DELETEVALUE "Impossible de supprimer toutes les valeurs seléctionnées!" - IDS_ERR_RENVAL_CAPTION "Erreur lors de la tentative pour renommer la valeur" + IDS_ERR_DELVAL_CAPTION "Erreur lors de la suppression des valeurs." + IDS_ERR_DELETEVALUE "Impossible de supprimer toutes les valeurs seléctionnées !" + IDS_ERR_RENVAL_CAPTION "Erreur lors de la tentative pour renommer la valeur." IDS_ERR_RENVAL_TOEMPTY "Impossible de renommer %s. Le nom de valeur spécifié est vide. Essayez à nouveau avec un autre nom." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirmation de la restauration de la clé" + IDS_QUERY_IMPORT_HIVE_MSG "Une clé sera restaurée en remplacement de la clé sélectionnée.\nToutes les valeurs et les sous-clés contenues dans cette clé seront supprimées.\nVoulez-vous continuer l'opération ?" IDS_NEW_KEY "Nouvelle clé #%d" IDS_NEW_VALUE "Nouvelle valeur #%d" END STRINGTABLE DISCARDABLE BEGIN - IDS_BINARY_EMPTY "(valeur binaire de longueur nulle)" + IDS_BINARY_EMPTY "(valeur binaire de longueur nulle)" IDS_DEFAULT_VALUE_NAME "(Défaut)" IDS_VALUE_NOT_SET "(valeur non définie)" IDS_UNKNOWN_TYPE "Type inconnu: (0x%lx)" IDS_MY_COMPUTER "Mon ordinateur" IDS_IMPORT_REG_FILE "Importer un fichier registre" IDS_EXPORT_REG_FILE "Exporter un fichier registre" - IDS_LOAD_HIVE "Load Hive" - IDS_UNLOAD_HIVE "Unload Hive" + IDS_LOAD_HIVE "Charger la ruche" + IDS_UNLOAD_HIVE "Décharger la ruche" IDS_INVALID_DWORD "(valeur mot double invalide)" END STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Fichier registre" - IDS_FLT_REGFILES "Fichiers registre" + IDS_FLT_REGFILES "Fichiers d'enregistrement (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Fichiers registres de Win9x/NT4 (REGEDIT4)" + IDS_FLT_HIVFILES "Fichiers ruche du Registre (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Fichiers d'enregistrement Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Tous les fichiers (*.*)" IDS_FLT_ALLFILES_FLT "*.*" @@ -433,8 +430,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Voulez-vous ajouter des informations dans le Registre ?" + IDS_IMPORTED_OK "Les informations ont bien été ajoutées dans le Registre." END STRINGTABLE DISCARDABLE @@ -502,18 +499,18 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Export Range",IDC_STATIC,2,0,366,48 - CONTROL "&All",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 - CONTROL "S&elected Branch",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 + GROUPBOX "Étendue de l'exportation",IDC_STATIC,2,0,366,48 + CONTROL "T&out",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 + CONTROL "&Branche sélectionnée",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12 END IDD_LOADHIVE DIALOGEX DISCARDABLE 0, 0, 193, 34 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Load Hive" +CAPTION "Charger une ruche" FONT 8, "Ms Shell Dlg" { - LTEXT "&Key:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT + LTEXT "&Clé:", IDC_STATIC, 4, 4, 15, 8, SS_LEFT EDITTEXT IDC_EDIT_KEY, 23, 2, 167, 13 DEFPUSHBUTTON "OK", IDOK, 140, 17, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 89, 17, 50, 14 Index: base/applications/regedit/lang/hu-HU.rc =================================================================== --- base/applications/regedit/lang/hu-HU.rc (rvision 56867) +++ base/applications/regedit/lang/hu-HU.rc (copie de travail) @@ -55,9 +55,9 @@ MENUITEM "&Export Registry File...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Connect Network Registry...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -352,8 +352,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Error" - IDS_WARNING "Warning" + IDS_ERROR "Error" + IDS_WARNING "Warning" IDS_BAD_KEY "Can't query key '%s'" IDS_BAD_VALUE "Can't query value '%s'" IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" @@ -369,6 +369,8 @@ IDS_ERR_DELETEVALUE "Unable to delete all specified values!" IDS_ERR_RENVAL_CAPTION "Error Renaming Value" IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "New Key #%d" IDS_NEW_VALUE "New Value #%d" END @@ -389,10 +391,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registration Files" + IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/id-ID.rc =================================================================== --- base/applications/regedit/lang/id-ID.rc (rvision 56867) +++ base/applications/regedit/lang/id-ID.rc (copie de travail) @@ -54,15 +54,14 @@ MENUITEM "&Ekspor...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Ambil Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Buang Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Ambil Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Buang Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Sambung Registri Jaringan...", ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "&Putus Registri Jaringan...", - ID_REGISTRY_DISCONNECTNETWORKREGISTRY - , GRAYED + ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR MENUITEM "&Cetak\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR @@ -351,8 +350,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Salah" - IDS_WARNING "Peringatan" + IDS_ERROR "Salah" + IDS_WARNING "Peringatan" IDS_BAD_KEY "Tidak bisa menanyakan kunci '%s'" IDS_BAD_VALUE "Tidak bisa menanyakan nilai '%s'" IDS_UNSUPPORTED_TYPE "Tidak bisa mengedit kunci jenis ini (%ld)" @@ -368,6 +367,8 @@ IDS_ERR_DELETEVALUE "Tidak bisa menghapus semua nilai yang ditetapkan!" IDS_ERR_RENVAL_CAPTION "Kesalahan Mengganti nama Nilai" IDS_ERR_RENVAL_TOEMPTY "Tidak bisa mengganti nama %s. Nama nilai yang ditetapkan kosong. Coba nama lain dan coba lagi." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Kunci Baru #%d" IDS_NEW_VALUE "Nilai Baru #%d" END @@ -388,10 +389,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "File Registrasi" + IDS_FLT_REGFILES "File Registrasi (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "File Registrasi Win9x/NT4 (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "File Registrasi Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Semua File (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/it-IT.rc =================================================================== --- base/applications/regedit/lang/it-IT.rc (rvision 56867) +++ base/applications/regedit/lang/it-IT.rc (copie de travail) @@ -52,20 +52,19 @@ BEGIN POPUP "&Registro" BEGIN - MENUITEM "&Importa...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Importa...", ID_REGISTRY_IMPORTREGISTRYFILE - MENUITEM "&Esporta...", ID_REGISTRY_EXPORTREGISTRYFILE + MENUITEM "&Esporta...", ID_REGISTRY_EXPORTREGISTRYFILE - MENUITEM SEPARATOR - MENUITEM "Carica Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Scarica Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM SEPARATOR + MENUITEM "Carica Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Scarica Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Connetti a Registro in rete...", - ID_REGISTRY_CONNECTNETWORKREGISTRY + ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "&Disconnetti da Registro di rete...", - ID_REGISTRY_DISCONNECTNETWORKREGISTRY - ,GRAYED + ID_REGISTRY_DISCONNECTNETWORKREGISTRY,GRAYED MENUITEM SEPARATOR MENUITEM "&Stampa\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR @@ -354,8 +353,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Errore" - IDS_WARNING "Segnalazione" + IDS_ERROR "Errore" + IDS_WARNING "Segnalazione" IDS_BAD_KEY "Impossibile interrogare la chiave '%s'" IDS_BAD_VALUE "Impossibile interrogare il valore '%s'" IDS_UNSUPPORTED_TYPE "Impossibile editare valori di questo tipo (%ld)" @@ -371,6 +370,8 @@ IDS_ERR_DELETEVALUE "Impossibile cancellare tutti i valori indicati!" IDS_ERR_RENVAL_CAPTION "Errore nel rinominare il valore" IDS_ERR_RENVAL_TOEMPTY "Impossibile rinominare %s. Il nome indicato è vuoto. Riprovate con un altro nome." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Nuova chiave #%d" IDS_NEW_VALUE "Nuovo valore #%d" END @@ -391,10 +392,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "File di Registrazione" - IDS_FLT_REGFILES "File di Registrazione" + IDS_FLT_REGFILES "File di Registrazione (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "File di Registrazione Win9x/NT4 (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "File di Registrazione Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Tutti i file (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/ja-JP.rc =================================================================== --- base/applications/regedit/lang/ja-JP.rc (rvision 56867) +++ base/applications/regedit/lang/ja-JP.rc (copie de travail) @@ -55,7 +55,7 @@ MENUITEM SEPARATOR MENUITEM "ハイブの読み込み...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "ハイブのアンロード...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM "ハイブのアンロード...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM SEPARATOR MENUITEM "ネットワーク レジストリへの接続(&C)...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "指定された値のすべてを削除できません!" IDS_ERR_RENVAL_CAPTION "値の名前を変更するときにエラーが発生しました。" IDS_ERR_RENVAL_TOEMPTY "%s の名前を変更できません。指定された値の名前には文字が含まれていません。別の名前でやり直してください。" + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "新しいキー #%d" IDS_NEW_VALUE "新しい値 #%d" END @@ -388,10 +390,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "登録ファイル" - IDS_FLT_REGFILES "登録ファイル" + IDS_FLT_REGFILES "登録ファイル (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 登録ファイル (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4 登録ファイル (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "すべてのファイル (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/ko-KR.rc =================================================================== --- base/applications/regedit/lang/ko-KR.rc (rvision 56867) +++ base/applications/regedit/lang/ko-KR.rc (copie de travail) @@ -39,9 +39,9 @@ MENUITEM "내보내기(&E)", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "하이브 로드...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "하이브 언로드...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "하이브 로드...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "하이브 언로드...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "네트워크 레지스트리에 연결(&C)", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -336,8 +336,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "에러" - IDS_WARNING "경고" + IDS_ERROR "에러" + IDS_WARNING "경고" IDS_BAD_KEY "'%s' 키를 조회할 수 없습니다" IDS_BAD_VALUE "'%s' 값을 조회할 수 없습니다" IDS_UNSUPPORTED_TYPE "이런 타입의 키를 편집할 수 없습니다 (%ld)" @@ -353,6 +353,8 @@ IDS_ERR_DELETEVALUE "모든 선택된 값을 제거할 수 없습니다!" IDS_ERR_RENVAL_CAPTION "값 이름 바꾸기 오류" IDS_ERR_RENVAL_TOEMPTY "%s의 이름을 바꿀 수 없습니다. 값의 이름이 없습니다. 다른 이름으로 해 보세요." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "새 키 #%d" IDS_NEW_VALUE "새 값 #%d" END @@ -373,10 +375,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "레지스트리 파일" - IDS_FLT_REGFILES "레지스트리 파일들" + IDS_FLT_REGFILES "레지스트리 파일들 (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 레지스트리 파일 (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4 레지스트리 파일 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "모든 파일 (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/nl-NL.rc =================================================================== --- base/applications/regedit/lang/nl-NL.rc (rvision 56867) +++ base/applications/regedit/lang/nl-NL.rc (copie de travail) @@ -54,9 +54,9 @@ MENUITEM "Registerbestand &exporteren...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "Verbinding &maken met netwerkregister...", ID_REGISTRY_CONNECTNETWORKREGISTRY, GRAYED @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Error" - IDS_WARNING "Warning" + IDS_ERROR "Error" + IDS_WARNING "Warning" IDS_BAD_KEY "Can't query key '%s'" IDS_BAD_VALUE "Can't query value '%s'" IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Unable to delete all specified values!" IDS_ERR_RENVAL_CAPTION "Error Renaming Value" IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "New Key #%d" IDS_NEW_VALUE "New Value #%d" END @@ -388,10 +390,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registration Files" + IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/no-NO.rc =================================================================== --- base/applications/regedit/lang/no-NO.rc (rvision 56867) +++ base/applications/regedit/lang/no-NO.rc (copie de travail) @@ -54,9 +54,9 @@ MENUITEM "&Eksport...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Last inn struktur...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Fjern struktur...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Last inn struktur...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Fjern struktur...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "Koble til nettverksregister...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Feil" - IDS_WARNING "Advarsel" + IDS_ERROR "Feil" + IDS_WARNING "Advarsel" IDS_BAD_KEY "Kan ikke lese nøkkel '%s'" IDS_BAD_VALUE "Kan ikke lese verdi '%s'" IDS_UNSUPPORTED_TYPE "Kan ikke endre nøkkel av type (%ld)" @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Kunne ikke slette alle angitte verdier!" IDS_ERR_RENVAL_CAPTION "Feil ved endring av navn" IDS_ERR_RENVAL_TOEMPTY "Kan ikke gi nytt navn til %s. Den angitte verdien er tom. Prøv et annet navn, og forsøk på nytt." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Ny nøkkel #%d" IDS_NEW_VALUE "Ny verdi #%d" END @@ -388,10 +390,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registerfiler" + IDS_FLT_REGFILES "Registerfiler (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registerfiler (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registerfiler (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Alle Filer (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/pl-PL.rc =================================================================== --- base/applications/regedit/lang/pl-PL.rc (rvision 56867) +++ base/applications/regedit/lang/pl-PL.rc (copie de travail) @@ -61,9 +61,9 @@ MENUITEM "&Eksportuj plik rejestru...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Ładuj Drzewo....", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Wyładuj Drzewo..", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Ładuj Drzewo....", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Wyładuj Drzewo..", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Podłącz rejestr sieciowy...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -358,8 +358,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Błąd" - IDS_WARNING "Ostrzeżenie" + IDS_ERROR "Błąd" + IDS_WARNING "Ostrzeżenie" IDS_BAD_KEY "Nie można odczytać klucza '%s'" IDS_BAD_VALUE "Nie można odczytać wartości '%s'" IDS_UNSUPPORTED_TYPE "Nie można edytować kluczy tego typu (%ld)" @@ -375,6 +375,8 @@ IDS_ERR_DELETEVALUE "Nie można usunąć wszystkich podanych wartości!" IDS_ERR_RENVAL_CAPTION "Błąd przy zmianie wartości" IDS_ERR_RENVAL_TOEMPTY "Nie można zmienić nazwy %s. Określona nazwa klucza jest pusta. Wpisz inną nazwę i spróbuj ponownie." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Nowy klucz #%d" IDS_NEW_VALUE "Nowa wartość #%d" END @@ -395,10 +397,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Plik rejestru" - IDS_FLT_REGFILES "Pliki rejestru" + IDS_FLT_REGFILES "Pliki rejestru (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Pliki rejestru Win9x/NT4 (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Pliki rejestru Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Wszystkie pliki (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/pt-BR.rc =================================================================== --- base/applications/regedit/lang/pt-BR.rc (rvision 56867) +++ base/applications/regedit/lang/pt-BR.rc (copie de travail) @@ -55,9 +55,9 @@ MENUITEM "&Exportar...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "&Carregar Seção...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "&Descarregar Seção...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "&Carregar Seção...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "&Descarregar Seção...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "C&onectar Registro da rede...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -352,8 +352,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Erro" - IDS_WARNING "Aviso" + IDS_ERROR "Erro" + IDS_WARNING "Aviso" IDS_BAD_KEY "Não pode consultar chave '%s'" IDS_BAD_VALUE "Não pode consultar valor '%s'" IDS_UNSUPPORTED_TYPE "Não pode editar chaves deste tipo (%ld)" @@ -369,6 +369,8 @@ IDS_ERR_DELETEVALUE "Não foi possível excluir todos os valores especificados" IDS_ERR_RENVAL_CAPTION "Erro renomeando valor" IDS_ERR_RENVAL_TOEMPTY "Não pode renomear %s. O nome do valor especificado está vazio. Tente novamente com outro nome." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Nova chave #%d" IDS_NEW_VALUE "Novo valor #%d" END @@ -389,10 +391,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Arquivos do Registro" + IDS_FLT_REGFILES "Arquivos do Registro (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Arquivos do Registro Win9x/NT4 (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Arquivos do Registro Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Todos os arquivos (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/pt-PT.rc =================================================================== --- base/applications/regedit/lang/pt-PT.rc (rvision 56867) +++ base/applications/regedit/lang/pt-PT.rc (copie de travail) @@ -55,9 +55,9 @@ MENUITEM "&Exportar arquivo do Registro...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Conectar Registro da rede...", ID_REGISTRY_CONNECTNETWORKREGISTRY, GRAYED @@ -353,8 +353,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Erro" - IDS_WARNING "Warning" + IDS_ERROR "Erro" + IDS_WARNING "Warning" IDS_BAD_KEY "Can't query key '%s'" IDS_BAD_VALUE "Não pode perguntar o valor '%s'" IDS_UNSUPPORTED_TYPE "Não pode editar chaves deste tipo (%ld)" @@ -370,6 +370,8 @@ IDS_ERR_DELETEVALUE "Unable to delete all specified values!" IDS_ERR_RENVAL_CAPTION "Error Renaming Value" IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "New Key #%d" IDS_NEW_VALUE "New Value #%d" END @@ -390,10 +392,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registration Files" + IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/ro-RO.rc =================================================================== --- base/applications/regedit/lang/ro-RO.rc (rvision 56867) +++ base/applications/regedit/lang/ro-RO.rc (copie de travail) @@ -57,9 +57,9 @@ MENUITEM "E&xportare…", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Î&ncărcare registru…", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Eli&berare registru…", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Î&ncărcare registru…", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Eli&berare registru…", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Conectare la un registru din rețea…", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -349,8 +349,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Eroare" - IDS_WARNING "Avertisment" + IDS_ERROR "Eroare" + IDS_WARNING "Avertisment" IDS_BAD_KEY "Nu se poate citi cheia „%s”" IDS_BAD_VALUE "Nu se poate citi valoarea „%s”" IDS_UNSUPPORTED_TYPE "Nu se poate edita acest tip de cheie (%ld)" @@ -366,6 +366,8 @@ IDS_ERR_DELETEVALUE "Nu s-a reușit ștergerea tuturor valorilor specificate!" IDS_ERR_RENVAL_CAPTION "Eroare la redenumirea de valori" IDS_ERR_RENVAL_TOEMPTY "Nu se poate redenumi %s. Numele valorii specificate este gol. Încercați introducerea unui alt nume." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Cheia nouă #%d" IDS_NEW_VALUE "Valoarea nouă #%d" END @@ -386,10 +388,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Fișier registru" - IDS_FLT_REGFILES "Fișiere registru" + IDS_FLT_REGFILES "Fișiere registru (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Fișiere registru Win9x/NT4 (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Fișiere registru Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Orice fișier (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/ru-RU.rc =================================================================== --- base/applications/regedit/lang/ru-RU.rc (rvision 56867) +++ base/applications/regedit/lang/ru-RU.rc (copie de travail) @@ -54,9 +54,9 @@ MENUITEM "&Экспортировать файл реестра...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Загрузить куст...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Выгрузить куст...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Загрузить куст...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Выгрузить куст...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Подключить сетевой реестр...", ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "&Отключить сетевой реестр...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED @@ -348,25 +348,27 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Ошибка" - IDS_WARNING "Предупреждение" - IDS_BAD_KEY "Не удалось получить ключ '%s'" - IDS_BAD_VALUE "Не удалось получить значение '%s'" - IDS_UNSUPPORTED_TYPE "Невозможно изменить ключи этого типа (%ld)" - IDS_TOO_BIG_VALUE "Значение слишком большое (%ld)" - IDS_MULTI_SZ_EMPTY_STRING "Данные типа REG_MULTI_SZ не могут содержать пустые строки.\nВсе пустые строки будут удалены." - IDS_QUERY_DELETE_KEY_ONE "Вы действительно хотите удалить этот ключ?" - IDS_QUERY_DELETE_KEY_MORE "Вы действительно хотите удалить эти ключи?" - IDS_QUERY_DELETE_KEY_CONFIRM "Подтверждение удаления ключа" - IDS_QUERY_DELETE_ONE "Вы действительно хотите удалить это значение?" - IDS_QUERY_DELETE_MORE "Вы действительно хотите удалить эти значения?" - IDS_QUERY_DELETE_CONFIRM "Подтверждение удаления значения" - IDS_ERR_DELVAL_CAPTION "Ошибка удаления значения" - IDS_ERR_DELETEVALUE "Невозможно удалить все указанные значения!" - IDS_ERR_RENVAL_CAPTION "Ошибка переименования значения" - IDS_ERR_RENVAL_TOEMPTY "Невозможно переименовать %s. Указанное значение не пустое. Введите другое значение и повторите попытку." - IDS_NEW_KEY "Новый ключ #%d" - IDS_NEW_VALUE "Новое значение #%d" + IDS_ERROR "Ошибка" + IDS_WARNING "Предупреждение" + IDS_BAD_KEY "Не удалось получить ключ '%s'" + IDS_BAD_VALUE "Не удалось получить значение '%s'" + IDS_UNSUPPORTED_TYPE "Невозможно изменить ключи этого типа (%ld)" + IDS_TOO_BIG_VALUE "Значение слишком большое (%ld)" + IDS_MULTI_SZ_EMPTY_STRING "Данные типа REG_MULTI_SZ не могут содержать пустые строки.\nВсе пустые строки будут удалены." + IDS_QUERY_DELETE_KEY_ONE "Вы действительно хотите удалить этот ключ?" + IDS_QUERY_DELETE_KEY_MORE "Вы действительно хотите удалить эти ключи?" + IDS_QUERY_DELETE_KEY_CONFIRM "Подтверждение удаления ключа" + IDS_QUERY_DELETE_ONE "Вы действительно хотите удалить это значение?" + IDS_QUERY_DELETE_MORE "Вы действительно хотите удалить эти значения?" + IDS_QUERY_DELETE_CONFIRM "Подтверждение удаления значения" + IDS_ERR_DELVAL_CAPTION "Ошибка удаления значения" + IDS_ERR_DELETEVALUE "Невозможно удалить все указанные значения!" + IDS_ERR_RENVAL_CAPTION "Ошибка переименования значения" + IDS_ERR_RENVAL_TOEMPTY "Невозможно переименовать %s. Указанное значение не пустое. Введите другое значение и повторите попытку." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" + IDS_NEW_KEY "Новый ключ #%d" + IDS_NEW_VALUE "Новое значение #%d" END STRINGTABLE DISCARDABLE @@ -385,10 +387,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Файл реестра" - IDS_FLT_REGFILES "Файлы реестра" + IDS_FLT_REGFILES "Файлы реестра (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Файлы реестра Win9x/NT4 (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Файлы реестра Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Все файлы (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/sk-SK.rc =================================================================== --- base/applications/regedit/lang/sk-SK.rc (rvision 56867) +++ base/applications/regedit/lang/sk-SK.rc (copie de travail) @@ -39,9 +39,9 @@ MENUITEM "&Exportovať...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Pripojiť registre v sieti...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -353,6 +353,8 @@ IDS_ERR_DELETEVALUE "Unable to delete all specified values!" IDS_ERR_RENVAL_CAPTION "Error Renaming Value" IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Nový kľúč #%d" IDS_NEW_VALUE "Nová hodnota #%d" END @@ -373,10 +375,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registration Files" + IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Všetky súbory (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/sl-SI.rc =================================================================== --- base/applications/regedit/lang/sl-SI.rc (rvision 56867) +++ base/applications/regedit/lang/sl-SI.rc (copie de travail) @@ -54,9 +54,9 @@ MENUITEM "&Izvozi registrsko datoteko ...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "P&oveži se z omrežnim registrom ...", ID_REGISTRY_CONNECTNETWORKREGISTRY, GRAYED @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Error" - IDS_WARNING "Warning" + IDS_ERROR "Error" + IDS_WARNING "Warning" IDS_BAD_KEY "Can't query key '%s'" IDS_BAD_VALUE "Can't query value '%s'" IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Unable to delete all specified values!" IDS_ERR_RENVAL_CAPTION "Error Renaming Value" IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "New Key #%d" IDS_NEW_VALUE "New Value #%d" END @@ -388,10 +390,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registration Files" + IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/sv-SE.rc =================================================================== --- base/applications/regedit/lang/sv-SE.rc (rvision 56867) +++ base/applications/regedit/lang/sv-SE.rc (copie de travail) @@ -54,9 +54,9 @@ MENUITEM "&Exportera registerfil...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Läs in Registerdata...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Ta bort Registerdata...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Läs in Registerdata...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Ta bort Registerdata...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Anslut Nätverksregister...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Fel" - IDS_WARNING "Varning" + IDS_ERROR "Fel" + IDS_WARNING "Varning" IDS_BAD_KEY "Kan inte läsa nyckel '%s'" IDS_BAD_VALUE "Kan inte läsa värdet '%s'" IDS_UNSUPPORTED_TYPE "Kan inte ändra nycklar av typen %ld" @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Det gick inte att ta bort alla specificerade värden!" IDS_ERR_RENVAL_CAPTION "Fel vid namnändring av värde" IDS_ERR_RENVAL_TOEMPTY "Kunde inte byta namn på %s. Det specificerade värdenamnet är tomt. Ange ett annat namn och försök igen." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Ny Nyckel #%d" IDS_NEW_VALUE "Nytt Värde #%d" END @@ -388,10 +390,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Registerfil" - IDS_FLT_REGFILES "Registerfiler" + IDS_FLT_REGFILES "Registerfiler (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4-Registerfiler (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4-Registerfiler (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Alla filer (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/th-TH.rc =================================================================== --- base/applications/regedit/lang/th-TH.rc (rvision 56867) +++ base/applications/regedit/lang/th-TH.rc (copie de travail) @@ -54,9 +54,9 @@ MENUITEM "&ส่งออก...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Connect Network Registry...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Error" - IDS_WARNING "Warning" + IDS_ERROR "Error" + IDS_WARNING "Warning" IDS_BAD_KEY "Can't query key '%s'" IDS_BAD_VALUE "Can't query value '%s'" IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "Unable to delete all specified values!" IDS_ERR_RENVAL_CAPTION "Error Renaming Value" IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "New Key #%d" IDS_NEW_VALUE "New Value #%d" END @@ -388,10 +390,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Registration File" - IDS_FLT_REGFILES "Registration Files" + IDS_FLT_REGFILES "Registration Files (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "All Files (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/uk-UA.rc =================================================================== --- base/applications/regedit/lang/uk-UA.rc (rvision 56867) +++ base/applications/regedit/lang/uk-UA.rc (copie de travail) @@ -55,9 +55,9 @@ MENUITEM "&Експорт...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "Завантажити файл реєстру...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Вивантажити файл реєстру...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "Завантажити файл реєстру...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Вивантажити файл реєстру...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "&Підключити мережевий реєстр...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -352,8 +352,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "Помилка" - IDS_WARNING "Увага" + IDS_ERROR "Помилка" + IDS_WARNING "Увага" IDS_BAD_KEY "Не можу запросити розділ '%s'" IDS_BAD_VALUE "Не можу запросити значення '%s'" IDS_UNSUPPORTED_TYPE "Не можу редагувати розділи цього типу (%ld)" @@ -369,6 +369,8 @@ IDS_ERR_DELETEVALUE "Неможливо видалити усі задані значення!" IDS_ERR_RENVAL_CAPTION "Помилка при перейменуванні значення" IDS_ERR_RENVAL_TOEMPTY "Не можу перейменувати %s. Ім'я заданого значення порожнє. Спробуйте інше ім'я та повторіть спробу." + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "Новий розділ #%d" IDS_NEW_VALUE "Нове значення #%d" END @@ -389,10 +391,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "Файл реєстру" - IDS_FLT_REGFILES "Файли реєстру" + IDS_FLT_REGFILES "Файли реєстру (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Файли реєстру Win9x/NT4 (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Файли реєстру Win9x/NT4 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Усі файли (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/zh-CN.rc =================================================================== --- base/applications/regedit/lang/zh-CN.rc (rvision 56867) +++ base/applications/regedit/lang/zh-CN.rc (copie de travail) @@ -54,9 +54,9 @@ MENUITEM "导出(&E)...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "加载配置单元...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "卸载配置单元...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "加载配置单元...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "卸载配置单元...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "连接网络注册表(&C)...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -351,8 +351,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "错误" - IDS_WARNING "警告" + IDS_ERROR "错误" + IDS_WARNING "警告" IDS_BAD_KEY "不能查询项 '%s'" IDS_BAD_VALUE "不能查询值 '%s'" IDS_UNSUPPORTED_TYPE "不能编辑这类型的项 (%ld)" @@ -368,6 +368,8 @@ IDS_ERR_DELETEVALUE "无法删除所有指定的值!" IDS_ERR_RENVAL_CAPTION "重命名值时产生错误" IDS_ERR_RENVAL_TOEMPTY "注册表编辑器无法重命名 %s。指定的值名为空。请键入其他名称，再试一次。" + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "新项 #%d" IDS_NEW_VALUE "新值 #%d" END @@ -388,10 +390,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "注册文件" - IDS_FLT_REGFILES "注册文件" + IDS_FLT_REGFILES "注册文件 (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 注册文件 (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4 注册文件 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "所有文件 (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/lang/zh-TW.rc =================================================================== --- base/applications/regedit/lang/zh-TW.rc (rvision 56867) +++ base/applications/regedit/lang/zh-TW.rc (copie de travail) @@ -56,9 +56,9 @@ MENUITEM "匯出(&E)...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "載入登錄區...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "卸載登錄區...", ID_REGISTRY_UNLOADHIVE, GRAYED - MENUITEM SEPARATOR + MENUITEM "載入登錄區...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "卸載登錄區...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR MENUITEM "連接網絡登錄(&C)...", ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -352,8 +352,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR "錯誤" - IDS_WARNING "警告" + IDS_ERROR "錯誤" + IDS_WARNING "警告" IDS_BAD_KEY "不能查詢機碼 '%s'" IDS_BAD_VALUE "不能查詢值 '%s'" IDS_UNSUPPORTED_TYPE "不能編輯這類型的機碼 (%ld)" @@ -369,6 +369,8 @@ IDS_ERR_DELETEVALUE "無法刪除所有指定的值！" IDS_ERR_RENVAL_CAPTION "重新命名值時產生錯誤" IDS_ERR_RENVAL_TOEMPTY "登錄編輯器無法重新命名 %s。指定的值為空。請輸入其他名稱，再試一次。" + IDS_QUERY_IMPORT_HIVE_CAPTION "Confirm Key Restoration" + IDS_QUERY_IMPORT_HIVE_MSG "A key will be restored on top of the currently selected key.\nAll values and subkeys of this key will be deleted.\nDo you want to continue the operation?" IDS_NEW_KEY "新機碼 #%d" IDS_NEW_VALUE "新值 #%d" END @@ -389,10 +391,11 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILE "登錄文件" - IDS_FLT_REGFILES "登錄文件" + IDS_FLT_REGFILES "登錄文件 (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 登錄文件 (REGEDIT4)" + IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES_FLT "*.*" + IDS_FLT_REGEDIT4 "Win9x/NT4 登錄文件 (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "所有文件 (*.*)" IDS_FLT_ALLFILES_FLT "*.*" Index: base/applications/regedit/resource.h =================================================================== --- base/applications/regedit/resource.h (rvision 56867) +++ base/applications/regedit/resource.h (copie de travail) @@ -136,12 +136,14 @@ #define IDS_ERR_DELETEVALUE 32855 #define IDS_ERR_RENVAL_CAPTION 32856 #define IDS_ERR_RENVAL_TOEMPTY 32857 -#define IDS_BAD_KEY 32858 -#define IDS_LOAD_HIVE 32859 -#define IDS_UNLOAD_HIVE 32860 +#define IDS_QUERY_IMPORT_HIVE_CAPTION 32858 +#define IDS_QUERY_IMPORT_HIVE_MSG 32859 +#define IDS_BAD_KEY 32860 +#define IDS_LOAD_HIVE 32861 +#define IDS_UNLOAD_HIVE 32862 -#define ID_EDIT_NEW_MULTISTRINGVALUE 32861 -#define ID_EDIT_NEW_EXPANDABLESTRINGVALUE 32862 +#define ID_EDIT_NEW_MULTISTRINGVALUE 32863 +#define ID_EDIT_NEW_EXPANDABLESTRINGVALUE 32864 #define ID_SWITCH_PANELS 32871 #define ID_EDIT_PERMISSIONS 32872 @@ -155,13 +157,14 @@ #define ID_TREE_EXPORT 32888 #define ID_TREE_PERMISSIONS 32889 -#define IDS_FLT_REGFILE 31000 -#define IDS_FLT_REGFILES 31001 -#define IDS_FLT_REGFILES_FLT 31002 -#define IDS_FLT_REGEDIT4 31003 -#define IDS_FLT_REGEDIT4_FLT 31004 -#define IDS_FLT_ALLFILES 31005 -#define IDS_FLT_ALLFILES_FLT 31006 +#define IDS_FLT_REGFILES 31000 +#define IDS_FLT_REGFILES_FLT 31001 +#define IDS_FLT_HIVFILES 31002 +#define IDS_FLT_HIVFILES_FLT 31003 +#define IDS_FLT_REGEDIT4 31004 +#define IDS_FLT_REGEDIT4_FLT 31005 +#define IDS_FLT_ALLFILES 31006 +#define IDS_FLT_ALLFILES_FLT 31007 #define IDS_ACCESS_FULLCONTROL 31101 #define IDS_ACCESS_READ 31102 Index: include/psdk/winnt.h =================================================================== --- include/psdk/winnt.h (rvision 56867) +++ include/psdk/winnt.h (copie de travail) @@ -1375,6 +1375,7 @@ #define REG_WHOLE_HIVE_VOLATILE 1 #define REG_REFRESH_HIVE 2 #define REG_NO_LAZY_FLUSH 4 +#define REG_FORCE_RESTORE 8 #define REG_OPTION_RESERVED 0 #define REG_OPTION_NON_VOLATILE 0 #define REG_OPTION_VOLATILE 1