mirror of
https://github.com/reactos/reactos.git
synced 2024-06-28 17:01:28 +00:00
[regedit]
- Prompt before importing from the command line. - Inform the user about successful import from the command line and the menu. - Updated Spanish & Italian translations. See issue #6230 for more details. svn path=/trunk/; revision=51621
This commit is contained in:
parent
5c49122627
commit
21fa080178
|
@ -393,7 +393,7 @@ static BOOL UnloadHive(HWND hWnd)
|
|||
static BOOL ImportRegistryFile(HWND hWnd)
|
||||
{
|
||||
OPENFILENAME ofn;
|
||||
TCHAR Caption[128];
|
||||
TCHAR Caption[128], szTitle[256], szText[256];
|
||||
LPCTSTR pszKeyPath;
|
||||
HKEY hRootKey;
|
||||
|
||||
|
@ -414,6 +414,10 @@ static BOOL ImportRegistryFile(HWND hWnd)
|
|||
fclose(fp);
|
||||
return FALSE;
|
||||
}
|
||||
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
|
||||
|
|
|
@ -394,6 +394,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Търсенето в регистъра приключи."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -391,6 +391,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Prohledávání registru bylo dokončeno."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -393,6 +393,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Durchsuchen der Registry beendet."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -393,6 +393,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Τέλος αναζήτησης στη registry."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -381,6 +381,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Finished searching through the registry."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -396,6 +396,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Finalizado la busqueda del registro."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Agregar los datos al registro?"
|
||||
IDS_IMPORTED_OK "La información ha sido agregada al registro"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -396,6 +396,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Recherche dans le registre terminée."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -394,6 +394,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Finished searching through the registry."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -393,6 +393,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Selesai mencari seluruh registri."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -398,6 +398,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Fine ricerca nel registro."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Aggiungere l'informazione al registro?"
|
||||
IDS_IMPORTED_OK "L'informazione è stata aggiunta al registro"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -391,6 +391,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "レジストリをすべて検索しました。"
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -378,6 +378,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "레지스트리 검색을 완료했습니다."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -393,6 +393,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Finished searching through the registry."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -393,6 +393,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Søket i registret er fullført."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -400,6 +400,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Przeszukiwanie rejestru zakończone."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -394,6 +394,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Pesquisa do Registro concluída."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -384,6 +384,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Finished searching through the registry."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -391,6 +391,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Поиск в реестре завершен."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -378,6 +378,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Finished searching through the registry."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -393,6 +393,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Finished searching through the registry."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -391,6 +391,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Slutfört sökningen av registret."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -393,6 +393,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Finished searching through the registry."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -394,6 +394,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "Пошук у реєстрі завершений."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -393,6 +393,12 @@ BEGIN
|
|||
IDS_FINISHEDFIND "注册表搜索完毕。"
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_IMPORT_PROMPT "Add the data to the registry?"
|
||||
IDS_IMPORTED_OK "Information added to the registry"
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
||||
|
||||
|
|
|
@ -134,6 +134,7 @@ void get_file_name(LPWSTR *command_line, LPWSTR file_name)
|
|||
|
||||
BOOL PerformRegAction(REGEDIT_ACTION action, LPWSTR s)
|
||||
{
|
||||
TCHAR szTitle[256], szText[256];
|
||||
switch (action)
|
||||
{
|
||||
case ACTION_ADD:
|
||||
|
@ -162,6 +163,10 @@ BOOL PerformRegAction(REGEDIT_ACTION action, LPWSTR s)
|
|||
}
|
||||
import_registry_file(fp);
|
||||
get_file_name(&s, filename);
|
||||
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);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
@ -311,9 +316,18 @@ BOOL ProcessCmdLine(LPWSTR lpCmdLine)
|
|||
}
|
||||
|
||||
if (*s && action == ACTION_UNDEF)
|
||||
action = ACTION_ADD;
|
||||
|
||||
if (action == ACTION_UNDEF)
|
||||
{
|
||||
TCHAR szTitle[256], szText[256];
|
||||
LoadString(hInst, IDS_APP_TITLE, szTitle, sizeof(szTitle));
|
||||
LoadString(hInst, IDS_IMPORT_PROMPT, szText, sizeof(szTitle));
|
||||
/* request import confirmation */
|
||||
if (MessageBox(NULL, szText, szTitle, MB_YESNO) == IDYES)
|
||||
{
|
||||
action = ACTION_ADD;
|
||||
}
|
||||
else return TRUE;
|
||||
}
|
||||
if (action == ACTION_UNDEF)
|
||||
return FALSE;
|
||||
|
||||
return PerformRegAction(action, s);
|
||||
|
|
|
@ -185,6 +185,8 @@
|
|||
#define IDS_NEW_VALUE 31127
|
||||
#define IDS_GOTO_SUGGESTED_KEY 31128
|
||||
|
||||
#define IDS_IMPORT_PROMPT 31129
|
||||
#define IDS_IMPORTED_OK 31130
|
||||
|
||||
#define IDD_EDIT_STRING 2000
|
||||
#define IDC_VALUE_NAME 2001
|
||||
|
|
Loading…
Reference in a new issue