From b259c4ae801131c804d12366f08097bc615439de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Nicolaysen=20S=C3=B8rnes?= Date: Thu, 6 Dec 2007 10:20:48 +0100 Subject: [PATCH] shell32: Localize 'new folder' string. --- dlls/shell32/shell32_Bg.rc | 2 ++ dlls/shell32/shell32_Cn.rc | 2 ++ dlls/shell32/shell32_Cs.rc | 2 ++ dlls/shell32/shell32_De.rc | 2 ++ dlls/shell32/shell32_En.rc | 2 ++ dlls/shell32/shell32_Eo.rc | 2 ++ dlls/shell32/shell32_Es.rc | 2 ++ dlls/shell32/shell32_Fi.rc | 2 ++ dlls/shell32/shell32_Fr.rc | 2 ++ dlls/shell32/shell32_It.rc | 2 ++ dlls/shell32/shell32_Ja.rc | 2 ++ dlls/shell32/shell32_Ko.rc | 2 ++ dlls/shell32/shell32_No.rc | 2 ++ dlls/shell32/shell32_Pl.rc | 2 ++ dlls/shell32/shell32_Pt.rc | 2 ++ dlls/shell32/shell32_Ru.rc | 2 ++ dlls/shell32/shell32_Si.rc | 2 ++ dlls/shell32/shell32_Sk.rc | 2 ++ dlls/shell32/shell32_Tr.rc | 2 ++ dlls/shell32/shell32_Uk.rc | 2 ++ dlls/shell32/shell32_Zh.rc | 2 ++ dlls/shell32/shfldr_fs.c | 3 ++- dlls/shell32/shfldr_unixfs.c | 6 ++++-- dlls/shell32/shresdef.h | 2 ++ 24 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_Bg.rc b/dlls/shell32/shell32_Bg.rc index 63e56d6439..ff917785d6 100644 --- a/dlls/shell32/shell32_Bg.rc +++ b/dlls/shell32/shell32_Bg.rc @@ -208,4 +208,6 @@ STRINGTABLE DISCARDABLE IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + + IDS_NEWFOLDER "New Folder" } diff --git a/dlls/shell32/shell32_Cn.rc b/dlls/shell32/shell32_Cn.rc index 3e37f8befa..f88a1ead48 100644 --- a/dlls/shell32/shell32_Cn.rc +++ b/dlls/shell32/shell32_Cn.rc @@ -80,6 +80,8 @@ BEGIN IDS_SHV_COLUMN7 "ʣռ" IDS_SHV_COLUMN8 "Name" /*FIXME*/ IDS_SHV_COLUMN9 "Comments" /*FIXME*/ + + IDS_NEWFOLDER "New Folder" END #pragma code_page(default) diff --git a/dlls/shell32/shell32_Cs.rc b/dlls/shell32/shell32_Cs.rc index ba42a1cdcc..05133a4995 100644 --- a/dlls/shell32/shell32_Cs.rc +++ b/dlls/shell32/shell32_Cs.rc @@ -186,4 +186,6 @@ BEGIN IDS_SHV_COLUMN7 "Voln msto" IDS_SHV_COLUMN8 "Jmno" IDS_SHV_COLUMN9 "Koment" + + IDS_NEWFOLDER "New Folder" END diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index f919e59e38..aa5fa6c71b 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -228,4 +228,6 @@ STRINGTABLE DISCARDABLE IDS_COMMON_PICTURES "Dokumente\\Eigene Bilder" IDS_COMMON_VIDEO "Dokumente\\Eigene Videos" IDS_CDBURN_AREA "Lokale Einstellungen\\Anwendungsdaten\\Microsoft\\CD Burning" + + IDS_NEWFOLDER "New Folder" } diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index 0989ed9f10..ca063b80dc 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -245,4 +245,6 @@ STRINGTABLE DISCARDABLE IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + + IDS_NEWFOLDER "New Folder" } diff --git a/dlls/shell32/shell32_Eo.rc b/dlls/shell32/shell32_Eo.rc index 7441294983..eb4024090a 100644 --- a/dlls/shell32/shell32_Eo.rc +++ b/dlls/shell32/shell32_Eo.rc @@ -226,4 +226,6 @@ STRINGTABLE DISCARDABLE IDS_COMMON_PICTURES "Documents\\Bildoj" IDS_COMMON_VIDEO "Documents\\Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + + IDS_NEWFOLDER "New Folder" } diff --git a/dlls/shell32/shell32_Es.rc b/dlls/shell32/shell32_Es.rc index a827cc88a1..9e9ef529c9 100644 --- a/dlls/shell32/shell32_Es.rc +++ b/dlls/shell32/shell32_Es.rc @@ -228,4 +228,6 @@ STRINGTABLE DISCARDABLE IDS_COMMON_PICTURES "Documentos\\Mis imgenes" IDS_COMMON_VIDEO "Documentos\\Mis vdeos" IDS_CDBURN_AREA "Configuracin local\\Datos de programa\\Microsoft\\CD Burning" + + IDS_NEWFOLDER "New Folder" } diff --git a/dlls/shell32/shell32_Fi.rc b/dlls/shell32/shell32_Fi.rc index f2cc1ebb03..dc019f5108 100644 --- a/dlls/shell32/shell32_Fi.rc +++ b/dlls/shell32/shell32_Fi.rc @@ -206,4 +206,6 @@ STRINGTABLE DISCARDABLE IDS_COMMON_PICTURES "Dokumentit\\Omat kuvatiedostot" IDS_COMMON_VIDEO "Dokumentit\\Omat videotiedostot" IDS_CDBURN_AREA "Paikalliset asetukset\\Ohjelmien tiedot\\Microsoft\\CD Burning" + + IDS_NEWFOLDER "New Folder" } diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index b968241553..719572d8be 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -249,4 +249,6 @@ STRINGTABLE DISCARDABLE IDS_COMMON_PICTURES "Documents\\Mes images" IDS_COMMON_VIDEO "Documents\\Mes vidos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + + IDS_NEWFOLDER "New Folder" } diff --git a/dlls/shell32/shell32_It.rc b/dlls/shell32/shell32_It.rc index 44361bf670..b8f4ef184d 100644 --- a/dlls/shell32/shell32_It.rc +++ b/dlls/shell32/shell32_It.rc @@ -206,4 +206,6 @@ STRINGTABLE DISCARDABLE IDS_APPDATA "Applicazioni" IDS_PRINTHOOD "PrintHood" IDS_COOKIES "Cookies" + + IDS_NEWFOLDER "New Folder" } diff --git a/dlls/shell32/shell32_Ja.rc b/dlls/shell32/shell32_Ja.rc index 254ec8d6be..d38b00d394 100644 --- a/dlls/shell32/shell32_Ja.rc +++ b/dlls/shell32/shell32_Ja.rc @@ -138,4 +138,6 @@ BEGIN IDS_SHV_COLUMN7 "󂫗e" IDS_SHV_COLUMN8 "Name" /*FIXME*/ IDS_SHV_COLUMN9 "Comments" /*FIXME*/ + + IDS_NEWFOLDER "New Folder" END diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index da2c31a870..56d27cec31 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -248,4 +248,6 @@ IDS_COMMON_MUSIC "Documents\\My Music" IDS_COMMON_PICTURES "Documents\\My Pictures" IDS_COMMON_VIDEO "Documents\\My Video" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + +IDS_NEWFOLDER "New Folder" } diff --git a/dlls/shell32/shell32_No.rc b/dlls/shell32/shell32_No.rc index 8ea0b4dda8..63174ad193 100644 --- a/dlls/shell32/shell32_No.rc +++ b/dlls/shell32/shell32_No.rc @@ -245,4 +245,6 @@ STRINGTABLE DISCARDABLE IDS_COMMON_PICTURES "Dokumenter\\Mine bilder" IDS_COMMON_VIDEO "Dokumenter\\Mine videoklipp" IDS_CDBURN_AREA "Lokale innstillinger\\Programdata\\Microsoft\\CD Burning" + + IDS_NEWFOLDER "Ny mappe" } diff --git a/dlls/shell32/shell32_Pl.rc b/dlls/shell32/shell32_Pl.rc index 7ce6484b07..63f77010e2 100644 --- a/dlls/shell32/shell32_Pl.rc +++ b/dlls/shell32/shell32_Pl.rc @@ -228,4 +228,6 @@ STRINGTABLE DISCARDABLE IDS_COMMON_PICTURES "Documenty\\Moje obrazy" IDS_COMMON_VIDEO "Documenty\\Moje wideo" IDS_CDBURN_AREA "Ustawienia lokalne\\Dane aplikacji\\Microsoft\\Nagrywanie dyskw CD" + + IDS_NEWFOLDER "New Folder" } diff --git a/dlls/shell32/shell32_Pt.rc b/dlls/shell32/shell32_Pt.rc index 88ada49d0a..8c2ed7f20b 100644 --- a/dlls/shell32/shell32_Pt.rc +++ b/dlls/shell32/shell32_Pt.rc @@ -372,4 +372,6 @@ STRINGTABLE DISCARDABLE IDS_COMMON_PICTURES "Os Meus Documentos\\As Minhas Imagens" IDS_COMMON_VIDEO "Os Meus Documentos\\Os Meus Vdeos" IDS_CDBURN_AREA "Definies locais\\Application Data\\Microsoft\\CD Burning" + + IDS_NEWFOLDER "New Folder" } diff --git a/dlls/shell32/shell32_Ru.rc b/dlls/shell32/shell32_Ru.rc index f0de124319..7bc78483e6 100644 --- a/dlls/shell32/shell32_Ru.rc +++ b/dlls/shell32/shell32_Ru.rc @@ -207,4 +207,6 @@ STRINGTABLE DISCARDABLE IDS_COMMON_PICTURES " \\ " IDS_COMMON_VIDEO " \\ " IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + + IDS_NEWFOLDER "New Folder" } diff --git a/dlls/shell32/shell32_Si.rc b/dlls/shell32/shell32_Si.rc index dfe92a55ed..1d84d09628 100644 --- a/dlls/shell32/shell32_Si.rc +++ b/dlls/shell32/shell32_Si.rc @@ -79,4 +79,6 @@ BEGIN IDS_SHV_COLUMN7 "Prosto" IDS_SHV_COLUMN8 "Name" /*FIXME*/ IDS_SHV_COLUMN9 "Comments" /*FIXME*/ + + IDS_NEWFOLDER "New Folder" END diff --git a/dlls/shell32/shell32_Sk.rc b/dlls/shell32/shell32_Sk.rc index 410690a7b9..644ef32c8b 100644 --- a/dlls/shell32/shell32_Sk.rc +++ b/dlls/shell32/shell32_Sk.rc @@ -79,4 +79,6 @@ BEGIN IDS_SHV_COLUMN7 "Vekos k dispozcii" IDS_SHV_COLUMN8 "Name" /*FIXME*/ IDS_SHV_COLUMN9 "Comments" /*FIXME*/ + + IDS_NEWFOLDER "New Folder" END diff --git a/dlls/shell32/shell32_Tr.rc b/dlls/shell32/shell32_Tr.rc index fbd11721d2..b7cae6e930 100644 --- a/dlls/shell32/shell32_Tr.rc +++ b/dlls/shell32/shell32_Tr.rc @@ -214,4 +214,6 @@ STRINGTABLE DISCARDABLE IDS_COMMON_PICTURES "Belgeler\\Resimlerim" IDS_COMMON_VIDEO "Belgeler\\Videolarm" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + + IDS_NEWFOLDER "New Folder" } diff --git a/dlls/shell32/shell32_Uk.rc b/dlls/shell32/shell32_Uk.rc index f0a5560afa..228c47d815 100644 --- a/dlls/shell32/shell32_Uk.rc +++ b/dlls/shell32/shell32_Uk.rc @@ -180,4 +180,6 @@ BEGIN IDS_SHV_COLUMN5 "" IDS_SHV_COLUMN6 "" IDS_SHV_COLUMN7 "³ " + + IDS_NEWFOLDER "New Folder" END diff --git a/dlls/shell32/shell32_Zh.rc b/dlls/shell32/shell32_Zh.rc index 97e48b5f85..0691ea75c0 100644 --- a/dlls/shell32/shell32_Zh.rc +++ b/dlls/shell32/shell32_Zh.rc @@ -79,6 +79,8 @@ BEGIN IDS_SHV_COLUMN7 "ʣNg" IDS_SHV_COLUMN8 "Name" /*FIXME*/ IDS_SHV_COLUMN9 "Comments" /*FIXME*/ + + IDS_NEWFOLDER "New Folder" END #pragma code_page(default) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 0cc08b545e..7de6ae872e 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1080,11 +1080,12 @@ ISFHelper_fnGetUniqueName (ISFHelper * iface, LPWSTR pwszName, UINT uLen) IEnumIDList *penum; HRESULT hr; WCHAR wszText[MAX_PATH]; - const WCHAR wszNewFolder[] = {'N','e','w',' ','F','o','l','d','e','r',0 }; + WCHAR wszNewFolder[25]; const WCHAR wszFormat[] = {'%','s',' ','%','d',0 }; TRACE ("(%p)(%p %u)\n", This, pwszName, uLen); + LoadStringW(shell32_hInstance, IDS_NEWFOLDER, wszNewFolder, sizeof(wszNewFolder)/sizeof(WCHAR)); if (uLen < sizeof(wszNewFolder)/sizeof(WCHAR) + 3) return E_POINTER; diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 6c190012b8..72c1965d89 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1708,11 +1708,13 @@ static HRESULT WINAPI UnixFolder_ISFHelper_GetUniqueName(ISFHelper* iface, LPWST LPITEMIDLIST pidlElem; DWORD dwFetched; int i; - static const WCHAR wszNewFolder[] = { 'N','e','w',' ','F','o','l','d','e','r', 0 }; + WCHAR wszNewFolder[25]; static const WCHAR wszFormat[] = { '%','s',' ','%','d',0 }; TRACE("(iface=%p, pwszName=%p, uLen=%u)\n", iface, pwszName, uLen); - + + LoadStringW(shell32_hInstance, IDS_NEWFOLDER, wszNewFolder, sizeof(wszNewFolder)/sizeof(WCHAR)); + if (uLen < sizeof(wszNewFolder)/sizeof(WCHAR)+3) return E_INVALIDARG; diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 4fdbdf604f..22c8615b76 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -94,6 +94,8 @@ #define IDS_CANTTRASH_TEXT 140 #define IDS_OVERWRITEFOLDER_TEXT 141 +#define IDS_NEWFOLDER 142 + #define MENU_SHV_FILE 144 /* Note: this string is referenced from the registry*/