From c07eb9fb1b7f3450e0806980cc0decf35cc73a50 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Fri, 1 Mar 2024 08:42:59 +0900 Subject: [PATCH] [APPWIZ] Shortcut: Rename if there is a conflict (#6556) Follow-up to #6550. Avoid same name overwriting. JIRA issue: CORE-5866 - Rename the filename if there was duplicate. - Simplify CreateShortcut function. - Rename IDC_SHORTCUT_LOCATION as IDC_LINK_LOCATION to resolve name conflict with shell32/shresdef.h. --- dll/cpl/appwiz/createlink.c | 141 ++++++++++++++++------------------- dll/cpl/appwiz/lang/bg-BG.rc | 2 +- dll/cpl/appwiz/lang/cs-CZ.rc | 2 +- dll/cpl/appwiz/lang/de-DE.rc | 2 +- dll/cpl/appwiz/lang/el-GR.rc | 2 +- dll/cpl/appwiz/lang/en-US.rc | 2 +- dll/cpl/appwiz/lang/es-ES.rc | 2 +- dll/cpl/appwiz/lang/et-EE.rc | 2 +- dll/cpl/appwiz/lang/fr-FR.rc | 2 +- dll/cpl/appwiz/lang/he-IL.rc | 2 +- dll/cpl/appwiz/lang/hu-HU.rc | 2 +- dll/cpl/appwiz/lang/id-ID.rc | 2 +- dll/cpl/appwiz/lang/it-IT.rc | 2 +- dll/cpl/appwiz/lang/ja-JP.rc | 2 +- dll/cpl/appwiz/lang/no-NO.rc | 2 +- dll/cpl/appwiz/lang/pl-PL.rc | 2 +- dll/cpl/appwiz/lang/pt-BR.rc | 2 +- dll/cpl/appwiz/lang/pt-PT.rc | 2 +- dll/cpl/appwiz/lang/ro-RO.rc | 2 +- dll/cpl/appwiz/lang/ru-RU.rc | 2 +- dll/cpl/appwiz/lang/sk-SK.rc | 2 +- dll/cpl/appwiz/lang/sq-AL.rc | 2 +- dll/cpl/appwiz/lang/tr-TR.rc | 2 +- dll/cpl/appwiz/lang/uk-UA.rc | 2 +- dll/cpl/appwiz/lang/zh-CN.rc | 2 +- dll/cpl/appwiz/lang/zh-HK.rc | 2 +- dll/cpl/appwiz/lang/zh-TW.rc | 2 +- dll/cpl/appwiz/resource.h | 6 +- 28 files changed, 93 insertions(+), 106 deletions(-) diff --git a/dll/cpl/appwiz/createlink.c b/dll/cpl/appwiz/createlink.c index 6a9f5f38a5b..acce1443d3d 100644 --- a/dll/cpl/appwiz/createlink.c +++ b/dll/cpl/appwiz/createlink.c @@ -15,6 +15,7 @@ #include #include #include // for PathFindOnPathExW +#include "../../win32/shell32/shresdef.h" // for IDS_NEWITEMFORMAT and IDS_LNK_FILE BOOL IsShortcut(HKEY hKey) @@ -75,83 +76,45 @@ IsExtensionAShortcut(LPWSTR lpExtension) BOOL CreateShortcut(PCREATE_LINK_CONTEXT pContext) { - IShellLinkW *pShellLink, *pSourceShellLink; + IShellLinkW *pShellLink; IPersistFile *pPersistFile; HRESULT hr; - WCHAR Path[MAX_PATH]; - LPWSTR lpExtension; - /* get the extension */ - lpExtension = PathFindExtensionW(pContext->szTarget); - - if (pContext->pidlTarget) - { - Path[0] = UNICODE_NULL; - } - else if (IsExtensionAShortcut(lpExtension)) - { - hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_ALL, &IID_IShellLinkW, (void**)&pSourceShellLink); - - if (FAILED(hr)) - return FALSE; - - hr = IUnknown_QueryInterface(pSourceShellLink, &IID_IPersistFile, (void**)&pPersistFile); - if (FAILED(hr)) - { - IUnknown_Release(pSourceShellLink); - return FALSE; - } - - hr = pPersistFile->lpVtbl->Load(pPersistFile, (LPCOLESTR)pContext->szTarget, STGM_READ); - IUnknown_Release(pPersistFile); - - if (FAILED(hr)) - { - IUnknown_Release(pSourceShellLink); - return FALSE; - } - - hr = IShellLinkW_GetPath(pSourceShellLink, Path, _countof(Path), NULL, 0); - IUnknown_Release(pSourceShellLink); - - if (FAILED(hr)) - { - return FALSE; - } - } - else - { - StringCchCopyW(Path, _countof(Path), pContext->szTarget); - } - - hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_ALL, - &IID_IShellLinkW, (void**)&pShellLink); - - if (hr != S_OK) + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_ALL, &IID_IShellLinkW, (void**)&pShellLink); + if (FAILED(hr)) return FALSE; - if (pContext->pidlTarget) - pShellLink->lpVtbl->SetIDList(pShellLink, pContext->pidlTarget); - else - pShellLink->lpVtbl->SetPath(pShellLink, Path); - - if (pContext->szArguments[0]) - pShellLink->lpVtbl->SetArguments(pShellLink, pContext->szArguments); - - if (pContext->szDescription[0]) - pShellLink->lpVtbl->SetDescription(pShellLink, pContext->szDescription); - hr = IUnknown_QueryInterface(pShellLink, &IID_IPersistFile, (void**)&pPersistFile); - if (hr != S_OK) + if (FAILED(hr)) { IUnknown_Release(pShellLink); return FALSE; } - hr = pPersistFile->lpVtbl->Save(pPersistFile, pContext->szLinkName, TRUE); + if (IsExtensionAShortcut(PathFindExtensionW(pContext->szTarget))) + { + hr = pPersistFile->lpVtbl->Load(pPersistFile, (LPCOLESTR)pContext->szTarget, STGM_READ); + } + else + { + if (pContext->pidlTarget) + pShellLink->lpVtbl->SetIDList(pShellLink, pContext->pidlTarget); + else + pShellLink->lpVtbl->SetPath(pShellLink, pContext->szTarget); + + if (pContext->szArguments[0]) + pShellLink->lpVtbl->SetArguments(pShellLink, pContext->szArguments); + + if (pContext->szDescription[0]) + pShellLink->lpVtbl->SetDescription(pShellLink, pContext->szDescription); + } + + if (SUCCEEDED(hr)) + hr = pPersistFile->lpVtbl->Save(pPersistFile, pContext->szLinkName, TRUE); + IUnknown_Release(pPersistFile); IUnknown_Release(pShellLink); - return (hr == S_OK); + return SUCCEEDED(hr); } BOOL @@ -258,13 +221,13 @@ WelcomeDlgProc(HWND hwndDlg, pContext = (PCREATE_LINK_CONTEXT) ppsp->lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pContext); PropSheet_SetWizButtons(GetParent(hwndDlg), 0); - SHAutoComplete(GetDlgItem(hwndDlg, IDC_SHORTCUT_LOCATION), SHACF_DEFAULT); + SHAutoComplete(GetDlgItem(hwndDlg, IDC_LINK_LOCATION), SHACF_DEFAULT); break; case WM_COMMAND: { switch (LOWORD(wParam)) { - case IDC_SHORTCUT_LOCATION: + case IDC_LINK_LOCATION: { if (HIWORD(wParam) == EN_CHANGE) { @@ -275,7 +238,7 @@ WelcomeDlgProc(HWND hwndDlg, pContext->pidlTarget = NULL; } - if (SendDlgItemMessage(hwndDlg, IDC_SHORTCUT_LOCATION, WM_GETTEXTLENGTH, 0, 0)) + if (SendDlgItemMessage(hwndDlg, IDC_LINK_LOCATION, WM_GETTEXTLENGTH, 0, 0)) PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); else PropSheet_SetWizButtons(GetParent(hwndDlg), 0); @@ -302,11 +265,11 @@ WelcomeDlgProc(HWND hwndDlg, SHGetPathFromIDListW(pidllist, szPath); if (PathFileExistsW(szPath) && !PathIsRelativeW(szPath)) - SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION, szPath); + SetDlgItemTextW(hwndDlg, IDC_LINK_LOCATION, szPath); else - SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION, szDisplayName); + SetDlgItemTextW(hwndDlg, IDC_LINK_LOCATION, szDisplayName); - SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_LOCATION, EM_SETSEL, 0, -1); + SendDlgItemMessageW(hwndDlg, IDC_LINK_LOCATION, EM_SETSEL, 0, -1); if (pContext->pidlTarget) CoTaskMemFree(pContext->pidlTarget); @@ -319,11 +282,11 @@ WelcomeDlgProc(HWND hwndDlg, lppsn = (LPPSHNOTIFY) lParam; if (lppsn->hdr.code == PSN_SETACTIVE) { - SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION, pContext->szTarget); + SetDlgItemTextW(hwndDlg, IDC_LINK_LOCATION, pContext->szTarget); } else if (lppsn->hdr.code == PSN_WIZNEXT) { - GetDlgItemTextW(hwndDlg, IDC_SHORTCUT_LOCATION, pContext->szTarget, _countof(pContext->szTarget)); + GetDlgItemTextW(hwndDlg, IDC_LINK_LOCATION, pContext->szTarget, _countof(pContext->szTarget)); StrTrimW(pContext->szTarget, L" \t"); ExpandEnvironmentStringsW(pContext->szTarget, szPath, _countof(szPath)); @@ -362,7 +325,7 @@ WelcomeDlgProc(HWND hwndDlg, !PathFileExistsW(szPath)) { /* Not found */ - SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_LOCATION, EM_SETSEL, 0, -1); + SendDlgItemMessageW(hwndDlg, IDC_LINK_LOCATION, EM_SETSEL, 0, -1); LoadStringW(hApplet, IDS_CREATE_SHORTCUT, szDesc, _countof(szDesc)); LoadStringW(hApplet, IDS_ERROR_NOT_FOUND, szPath, _countof(szPath)); @@ -411,7 +374,7 @@ FinishDlgProc(HWND hwndDlg, LPPROPSHEETPAGEW ppsp; PCREATE_LINK_CONTEXT pContext; LPPSHNOTIFY lppsn; - WCHAR szText[MAX_PATH]; + WCHAR szText[MAX_PATH], szPath[MAX_PATH]; WCHAR szMessage[128]; switch(uMsg) @@ -447,8 +410,32 @@ FinishDlgProc(HWND hwndDlg, pContext = (PCREATE_LINK_CONTEXT) GetWindowLongPtr(hwndDlg, DWLP_USER); if (lppsn->hdr.code == PSN_SETACTIVE) { - /* TODO: Use shell32!PathCleanupSpec instead of DoConvertNameForFileSystem */ + /* Remove invalid characters */ DoConvertNameForFileSystem(pContext->szDescription); + PathCleanupSpec(NULL, pContext->szDescription); + + /* Is it empty? (rare case) */ + if (!pContext->szDescription[0]) + { + HMODULE hShell32 = GetModuleHandleW(L"shell32.dll"); + LoadStringW(hShell32, IDS_NEWITEMFORMAT, szText, _countof(szText)); + LoadStringW(hShell32, IDS_LNK_FILE, szMessage, _countof(szMessage)); + StringCchPrintfW(pContext->szDescription, _countof(pContext->szDescription), + szText, szMessage); + } + + /* Build a path from szOldFile */ + StringCchCopyW(szText, _countof(szText), pContext->szOldFile); + PathRemoveFileSpecW(szText); + + /* Rename duplicate if necessary */ + PathAddExtensionW(pContext->szDescription, + (IsInternetLocation(pContext->szTarget) ? L".url" : L".lnk")); + PathYetAnotherMakeUniqueName(szPath, szText, NULL, pContext->szDescription); + StringCchCopyW(pContext->szDescription, _countof(pContext->szDescription), + PathFindFileNameW(szPath)); + PathRemoveExtensionW(pContext->szDescription); + SetDlgItemTextW(hwndDlg, IDC_SHORTCUT_NAME, pContext->szDescription); SendDlgItemMessageW(hwndDlg, IDC_SHORTCUT_NAME, EM_SETSEL, 0, -1); SetFocus(GetDlgItem(hwndDlg, IDC_SHORTCUT_NAME)); @@ -483,7 +470,7 @@ FinishDlgProc(HWND hwndDlg, /* change extension if any */ PathRemoveExtensionW(pContext->szLinkName); - StringCchCatW(pContext->szLinkName, _countof(pContext->szLinkName), L".url"); + PathAddExtensionW(pContext->szLinkName, L".url"); if (!CreateInternetShortcut(pContext)) { @@ -500,7 +487,7 @@ FinishDlgProc(HWND hwndDlg, /* change extension if any */ PathRemoveExtensionW(pContext->szLinkName); - StringCchCatW(pContext->szLinkName, _countof(pContext->szLinkName), L".lnk"); + PathAddExtensionW(pContext->szLinkName, L".lnk"); if (!CreateShortcut(pContext)) { diff --git a/dll/cpl/appwiz/lang/bg-BG.rc b/dll/cpl/appwiz/lang/bg-BG.rc index 5cb93daa660..74e4c91aecb 100644 --- a/dll/cpl/appwiz/lang/bg-BG.rc +++ b/dll/cpl/appwiz/lang/bg-BG.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Вълшебникът ви помага за създаването на препратки към местни или мрежови приложения, файлове, папки, компютри или адреси в интернет.", -1, 120, 15, 200, 32 LTEXT "Напишете местоположението на предмета:", -1, 120, 50, 160, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Обзор...", IDC_SHORTCUT_BROWSE, 275, 65, 55, 15, ES_LEFT LTEXT "Натиснете ""Напред"" за продължаване.", -1, 120, 100, 160, 10 END diff --git a/dll/cpl/appwiz/lang/cs-CZ.rc b/dll/cpl/appwiz/lang/cs-CZ.rc index e03f52666b2..bef33a26d21 100644 --- a/dll/cpl/appwiz/lang/cs-CZ.rc +++ b/dll/cpl/appwiz/lang/cs-CZ.rc @@ -31,7 +31,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Tento průvodce pomůže s vytvořením zástupců na místní\nnebo síťové programy, soubory, složky, počítače nebo\ninternetové adresy.", -1, 120, 15, 200, 30 LTEXT "Zadejte umístění položky:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Procházet...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Pokračujte kliknutím na Další.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/de-DE.rc b/dll/cpl/appwiz/lang/de-DE.rc index 07f78bc33f5..92ae5bb21cf 100644 --- a/dll/cpl/appwiz/lang/de-DE.rc +++ b/dll/cpl/appwiz/lang/de-DE.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Mit diesem Assistenten können Sie Verknüpfungen mit lokalen oder vernetzten Programmen, Dateien, Ordnern, Computern oder Internetadressen erstellen.", -1, 120, 15, 200, 30 LTEXT "&Geben Sie den Speicherort des Elements ein:", -1, 120, 50, 150, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "&Durchsuchen...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Klicken Sie auf Weiter, um fortzufahren.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/el-GR.rc b/dll/cpl/appwiz/lang/el-GR.rc index 6d1b0fcb7d8..f5ace98c0f2 100644 --- a/dll/cpl/appwiz/lang/el-GR.rc +++ b/dll/cpl/appwiz/lang/el-GR.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Αυτός ο οδηγός σας βοηθάει να δημιουργήσετε συντομεύσεις σε τοπικά προγράμματα ή προγράμματα δικτύου, αρχεία, φακέλους, υπολογιστές ή διευθύνσεις στο διαδίκτυο.", -1, 120, 15, 200, 30 LTEXT "Εισάγετε την θέση του στοιχείου:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Αναζήτηση...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Πατήστε 'Επόμενο' για να συνεχίσετε.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/en-US.rc b/dll/cpl/appwiz/lang/en-US.rc index 1c4be80aef3..a1380332eb4 100644 --- a/dll/cpl/appwiz/lang/en-US.rc +++ b/dll/cpl/appwiz/lang/en-US.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Click Next to continue.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/es-ES.rc b/dll/cpl/appwiz/lang/es-ES.rc index 5f59afb626c..f064698d1ae 100644 --- a/dll/cpl/appwiz/lang/es-ES.rc +++ b/dll/cpl/appwiz/lang/es-ES.rc @@ -36,7 +36,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Este asistente le ayudará a crear accesos directos a programas locales o en red, archivos, carpetas, equipos, o direcciones de Internet.", -1, 120, 15, 200, 30 LTEXT "Escriba la ubicación del elemento:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Examinar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Presione Siguiente para continuar.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/et-EE.rc b/dll/cpl/appwiz/lang/et-EE.rc index a17534fb4e8..423fea89bd7 100644 --- a/dll/cpl/appwiz/lang/et-EE.rc +++ b/dll/cpl/appwiz/lang/et-EE.rc @@ -33,7 +33,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Selle viisardi abil saate luua otseteid kohalike või\nvõrguprogrammide, failide, kaustada, arvutite või\nInterneti-aadresside juurde.", -1, 120, 15, 200, 30 LTEXT "Tippige üksuse asukoht:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Sirvi...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Jätkamiseks klõpsake nuppu Edasi.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/fr-FR.rc b/dll/cpl/appwiz/lang/fr-FR.rc index 731283c04f2..fa3d4459117 100644 --- a/dll/cpl/appwiz/lang/fr-FR.rc +++ b/dll/cpl/appwiz/lang/fr-FR.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Cet assistant vous aide à créer des raccourcis vers des programmes, des fichiers, des dossiers, des ordinateurs,\nou des adresses Internet locaux ou sur le réseau.", -1, 120, 15, 200, 30 LTEXT "Entrez la localisation de l'élément :", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Parcourir...", IDC_SHORTCUT_BROWSE, 272, 65, 60, 15, ES_LEFT LTEXT "Cliquez sur Suivant pour continuer.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/he-IL.rc b/dll/cpl/appwiz/lang/he-IL.rc index 01a4ce72301..2883d5c91ab 100644 --- a/dll/cpl/appwiz/lang/he-IL.rc +++ b/dll/cpl/appwiz/lang/he-IL.rc @@ -27,7 +27,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 LTEXT "הקלד את מיקום הפריט:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "סייר...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "לחץ הבא כדי להמשיך.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/hu-HU.rc b/dll/cpl/appwiz/lang/hu-HU.rc index 665869289d0..184f2277c6a 100644 --- a/dll/cpl/appwiz/lang/hu-HU.rc +++ b/dll/cpl/appwiz/lang/hu-HU.rc @@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Ez a varázsló parancsikonok létrehozásában nyújt segítséget,\nhelyi vagy hálózati programokhoz, fájlokhoz, mappákhoz,\nszámítógépekhez vagy internetes címekhez.", -1, 120, 15, 200, 30 LTEXT "Írja be az elem helyét:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Tallózás...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Kattintson a tovább gombra a folytatáshoz.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/id-ID.rc b/dll/cpl/appwiz/lang/id-ID.rc index 83e4a0f7931..7b2feff397c 100644 --- a/dll/cpl/appwiz/lang/id-ID.rc +++ b/dll/cpl/appwiz/lang/id-ID.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Penuntun ini membantu membuat pintasan pada lokal atau\njaringan berupa program, berkas, folder, Komputer, atau Alamat Internet.", -1, 120, 15, 200, 30 LTEXT "Ketik lokasi butir:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Cari...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Klik Lanjut untuk meneruskan.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/it-IT.rc b/dll/cpl/appwiz/lang/it-IT.rc index ab8e9cddf4c..9bffef82c36 100644 --- a/dll/cpl/appwiz/lang/it-IT.rc +++ b/dll/cpl/appwiz/lang/it-IT.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Questo wizard permette la creazione di collegamenti verso programmi locali o di rete, file, cartella, computer, o\nindirizzi Internet.", -1, 120, 15, 200, 30 LTEXT "Digitare la posizione:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Sfoglia...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Premere Avanti per continuare.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/ja-JP.rc b/dll/cpl/appwiz/lang/ja-JP.rc index 6455621ba13..0070e2f4706 100644 --- a/dll/cpl/appwiz/lang/ja-JP.rc +++ b/dll/cpl/appwiz/lang/ja-JP.rc @@ -26,7 +26,7 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN LTEXT "このウィザードは、ローカルまたはネットワークプログラム、ファイル、フォルダー、コンピューター、またはインターネット アドレスへのショートカットを作成するのを助けます。", -1, 120, 15, 200, 30 LTEXT "項目の位置を入力して下さい:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "参照...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "次へをクリックすると続行します。", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/no-NO.rc b/dll/cpl/appwiz/lang/no-NO.rc index dc5c660ba6d..21498c093b8 100644 --- a/dll/cpl/appwiz/lang/no-NO.rc +++ b/dll/cpl/appwiz/lang/no-NO.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Denne veiviseren vil hjelper deg å lage snarvei til en lokal eller\nnettverk programmer, filer, mapper, datamaskiner, eller internett\nadresse.", -1, 120, 15, 200, 30 LTEXT "Velg din lagring plassering:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Bla gjennom...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Trykk på neste for å fortsette.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/pl-PL.rc b/dll/cpl/appwiz/lang/pl-PL.rc index 408ad78f23c..25e6b1fb2f3 100644 --- a/dll/cpl/appwiz/lang/pl-PL.rc +++ b/dll/cpl/appwiz/lang/pl-PL.rc @@ -36,7 +36,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Ten program pomoże ci stworzyć skróty do lokalnych lub sieciowych programów, plików, katalogów, komputerów, bądź adresów Internetowych.", -1, 120, 15, 200, 30 LTEXT "Wpisz ścieżkę dostępu do obiektu:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Przeglądaj...", IDC_SHORTCUT_BROWSE, 274, 65, 55, 15, ES_LEFT LTEXT "Kliknij Dalej, aby kontynuować.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/pt-BR.rc b/dll/cpl/appwiz/lang/pt-BR.rc index c21d9eaeb58..de75e4f5071 100644 --- a/dll/cpl/appwiz/lang/pt-BR.rc +++ b/dll/cpl/appwiz/lang/pt-BR.rc @@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Este assitente irá ajudá-lo a criar atalhos para\nprogramas, arquivos, pastas, computadores ou endereços\nde Internet, ambos locais ou de rede.", -1, 120, 15, 200, 30 LTEXT "Digite a localização do item:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Procurar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Pressione Próximo para prosseguir.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/pt-PT.rc b/dll/cpl/appwiz/lang/pt-PT.rc index d0cf672158a..8ceefaa08db 100644 --- a/dll/cpl/appwiz/lang/pt-PT.rc +++ b/dll/cpl/appwiz/lang/pt-PT.rc @@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Este assitente irá ajudá-lo a criar atalhos para\nprogramas, arquivos, pastas, computadores ou endereços\nde Internet, ambos locais ou de rede.", -1, 120, 15, 200, 30 LTEXT "Digite a localização do item:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Procurar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Pressione Próximo para prosseguir.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc index b53505b72b5..fb9a5d7b447 100644 --- a/dll/cpl/appwiz/lang/ro-RO.rc +++ b/dll/cpl/appwiz/lang/ro-RO.rc @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Acest expert vă va ajuta în crearea unei scurtături\ncătre adrese din Internet, calculatoare, dosare, fișiere\nlocale sau din rețea.", -1, 120, 15, 200, 30 LTEXT "Scrieți adresa elementului:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Spe&cificare…", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Apăsați Înainte pentru a continua.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/ru-RU.rc b/dll/cpl/appwiz/lang/ru-RU.rc index 75fafc51b51..74fa9a81297 100644 --- a/dll/cpl/appwiz/lang/ru-RU.rc +++ b/dll/cpl/appwiz/lang/ru-RU.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Этот мастер поможет создать ярлык для локальных или\nсетевых программ, файлов, папок, компьютеров или\nИнтернет-адресов.", -1, 120, 15, 200, 30 LTEXT "Выберите местоположение элемента:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Обзор...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Щелкните ""Далее"" для продолжения.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/sk-SK.rc b/dll/cpl/appwiz/lang/sk-SK.rc index aaca7a01487..3a702948d73 100644 --- a/dll/cpl/appwiz/lang/sk-SK.rc +++ b/dll/cpl/appwiz/lang/sk-SK.rc @@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Tento sprievodca Vám pomôže vytvoriť odkazy na miestne alebo\nsieťové programy, súbory, priečinky, počítače, alebo internetové\nadresy.", -1, 120, 15, 200, 30 LTEXT "Zadajte umiestnenie položky:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "&Prehľadávať...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Kliknite na tlačidlo Ďalej pre pokračovanie.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/sq-AL.rc b/dll/cpl/appwiz/lang/sq-AL.rc index b6dbbc3aa5d..067b4ea4a72 100644 --- a/dll/cpl/appwiz/lang/sq-AL.rc +++ b/dll/cpl/appwiz/lang/sq-AL.rc @@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Ky magjistar ju ndihmon për të krijuar shkurtesat për të lokale ose\nprograme networku, dokumenta, dosje, kompjutra, ose adresa\nInterneti.", -1, 120, 15, 200, 30 LTEXT "Shkruaj vendndodhjen e sendit:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Shfleto...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Klikoni Next për të vazhduar.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/tr-TR.rc b/dll/cpl/appwiz/lang/tr-TR.rc index 745f690df08..e6906621acf 100644 --- a/dll/cpl/appwiz/lang/tr-TR.rc +++ b/dll/cpl/appwiz/lang/tr-TR.rc @@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Bu sihirbaz, yerel ya da ağdaki programlara, dosyalara,\ndizinlere, bilgisayarlara ve İnternet adreslerine\nkısayollar oluşturmanıza yardımcı olur.", -1, 120, 15, 200, 30 LTEXT "Ögenin konumunu yazınız:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "&Göz At...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Devam etmek için ""İleri""ye tıklayınız.", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/uk-UA.rc b/dll/cpl/appwiz/lang/uk-UA.rc index bebed612638..00c5a7d5c47 100644 --- a/dll/cpl/appwiz/lang/uk-UA.rc +++ b/dll/cpl/appwiz/lang/uk-UA.rc @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Цей майстер допомагає створити ярлик, який указує на\nлокальні або мережні програми, файли, папки, комп'ютери\nабо адреси в Інтернеті.", -1, 120, 15, 200, 30 LTEXT "Укажіть розташування об'єкта:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Огляд...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Щоб продовжити установку, натисніть кнопку ""Далі"".", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/zh-CN.rc b/dll/cpl/appwiz/lang/zh-CN.rc index c3b99c5dc7a..555cfb87ded 100644 --- a/dll/cpl/appwiz/lang/zh-CN.rc +++ b/dll/cpl/appwiz/lang/zh-CN.rc @@ -35,7 +35,7 @@ FONT 9, "宋体", 0, 0, 0x0 BEGIN LTEXT "此向导可帮助您创建本地或网络程序、文件、文件夹、计算机或 Internet 地址的快捷方式。", -1, 120, 15, 200, 30 LTEXT "请输入项目位置：", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "浏览...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "点击“下一步”继续。", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/zh-HK.rc b/dll/cpl/appwiz/lang/zh-HK.rc index 1baeb03850c..c10cfe121d1 100644 --- a/dll/cpl/appwiz/lang/zh-HK.rc +++ b/dll/cpl/appwiz/lang/zh-HK.rc @@ -34,7 +34,7 @@ FONT 9, "新細明體", 0, 0, 0x0 BEGIN LTEXT "這個精靈協助您建立本地或網路程式、檔案、目錄、電腦或互聯網地址的捷徑。", -1, 120, 15, 200, 30 LTEXT "輸入項目位置：", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "瀏覽...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "按［下一步］繼續。", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/lang/zh-TW.rc b/dll/cpl/appwiz/lang/zh-TW.rc index a4bd7485c1f..be25b82d3be 100644 --- a/dll/cpl/appwiz/lang/zh-TW.rc +++ b/dll/cpl/appwiz/lang/zh-TW.rc @@ -35,7 +35,7 @@ FONT 9, "新細明體", 0, 0, 0x0 BEGIN LTEXT "此精靈幫助您建立本地或網路程式、檔案、目錄、電腦或網際網路地址的捷徑。", -1, 120, 15, 200, 30 LTEXT "輸入項目位置：", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL + EDITTEXT IDC_LINK_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "瀏覽...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "按［下一步］繼續。", -1, 120, 97, 162, 10 END diff --git a/dll/cpl/appwiz/resource.h b/dll/cpl/appwiz/resource.h index 9b780c71867..e7be45b3ef7 100644 --- a/dll/cpl/appwiz/resource.h +++ b/dll/cpl/appwiz/resource.h @@ -37,9 +37,9 @@ #define IDS_DWL_FAILED 17 /* Controls */ -#define IDC_SHORTCUT_LOCATION 107 -#define IDC_SHORTCUT_BROWSE 108 -#define IDC_SHORTCUT_NAME 109 +#define IDC_LINK_LOCATION 107 +#define IDC_SHORTCUT_BROWSE 108 +#define IDC_SHORTCUT_NAME 109 #define IDC_STARTMENU_TREE 110 #define IDC_REMOVE_ENTRIES 111