20 Apr
2020
20 Apr
'20
8:13 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c82ba3485ecec4866bbbc…
commit c82ba3485ecec4866bbbc22ed99c8d7dbb789661
Author: Charles Ambrye <giawa(a)hotmail.com>
AuthorDate: Sun Apr 19 19:49:38 2020 -0700
Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org>
CommitDate: Mon Apr 20 23:13:09 2020 +0300
[SHELL32] Modify context menu to include Align To Grid, and remove Line Up Icons
Implement support for using Align To Grid, which itself simply sets the
LVS_EX_SNAPTOGRID extended style of the list view control
---
dll/win32/shell32/CDefView.cpp | 29 ++++++++++++++++++++++++++---
dll/win32/shell32/CDefViewBckgrndMenu.cpp | 1 +
dll/win32/shell32/lang/bg-BG.rc | 4 ++--
dll/win32/shell32/lang/ca-ES.rc | 4 ++--
dll/win32/shell32/lang/cs-CZ.rc | 4 ++--
dll/win32/shell32/lang/da-DK.rc | 4 ++--
dll/win32/shell32/lang/de-DE.rc | 4 ++--
dll/win32/shell32/lang/el-GR.rc | 4 ++--
dll/win32/shell32/lang/en-GB.rc | 4 ++--
dll/win32/shell32/lang/en-US.rc | 4 ++--
dll/win32/shell32/lang/es-ES.rc | 4 ++--
dll/win32/shell32/lang/et-EE.rc | 4 ++--
dll/win32/shell32/lang/fi-FI.rc | 4 ++--
dll/win32/shell32/lang/fr-FR.rc | 4 ++--
dll/win32/shell32/lang/he-IL.rc | 4 ++--
dll/win32/shell32/lang/hi-IN.rc | 4 ++--
dll/win32/shell32/lang/hu-HU.rc | 4 ++--
dll/win32/shell32/lang/id-ID.rc | 4 ++--
dll/win32/shell32/lang/it-IT.rc | 4 ++--
dll/win32/shell32/lang/ja-JP.rc | 4 ++--
dll/win32/shell32/lang/ko-KR.rc | 4 ++--
dll/win32/shell32/lang/nl-NL.rc | 4 ++--
dll/win32/shell32/lang/no-NO.rc | 4 ++--
dll/win32/shell32/lang/pl-PL.rc | 4 ++--
dll/win32/shell32/lang/pt-BR.rc | 4 ++--
dll/win32/shell32/lang/pt-PT.rc | 4 ++--
dll/win32/shell32/lang/ro-RO.rc | 4 ++--
dll/win32/shell32/lang/ru-RU.rc | 4 ++--
dll/win32/shell32/lang/sk-SK.rc | 4 ++--
dll/win32/shell32/lang/sl-SI.rc | 4 ++--
dll/win32/shell32/lang/sq-AL.rc | 4 ++--
dll/win32/shell32/lang/sv-SE.rc | 4 ++--
dll/win32/shell32/lang/tr-TR.rc | 4 ++--
dll/win32/shell32/lang/uk-UA.rc | 4 ++--
dll/win32/shell32/lang/zh-CN.rc | 4 ++--
dll/win32/shell32/lang/zh-TW.rc | 4 ++--
dll/win32/shell32/shresdef.h | 1 +
sdk/include/psdk/shlobj.h | 1 +
38 files changed, 97 insertions(+), 71 deletions(-)
diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp
index 608101cc1f5..4f9b409fd9e 100644
--- a/dll/win32/shell32/CDefView.cpp
+++ b/dll/win32/shell32/CDefView.cpp
@@ -116,6 +116,7 @@ class CDefView :
HRESULT _MergeToolbar();
BOOL _Sort();
HRESULT _DoFolderViewCB(UINT uMsg, WPARAM wParam, LPARAM lParam);
+ HRESULT _GetSnapToGrid();
public:
CDefView();
@@ -571,6 +572,9 @@ BOOL CDefView::CreateList()
if (m_FolderSettings.fFlags & FWF_AUTOARRANGE)
dwStyle |= LVS_AUTOARRANGE;
+ if (m_FolderSettings.fFlags & FWF_SNAPTOGRID)
+ dwExStyle |= LVS_EX_SNAPTOGRID;
+
if (m_FolderSettings.fFlags & FWF_DESKTOP)
m_FolderSettings.fFlags |= FWF_NOCLIENTEDGE | FWF_NOSCROLL;
@@ -1311,13 +1315,20 @@ HRESULT CDefView::FillArrangeAsMenu(HMENU hmenuArrange)
if (m_FolderSettings.ViewMode == FVM_DETAILS || m_FolderSettings.ViewMode ==
FVM_LIST)
{
EnableMenuItem(hmenuArrange, FCIDM_SHVIEW_AUTOARRANGE, MF_BYCOMMAND |
MF_GRAYED);
+ EnableMenuItem(hmenuArrange, FCIDM_SHVIEW_ALIGNTOGRID, MF_BYCOMMAND |
MF_GRAYED);
}
else
{
- EnableMenuItem(hmenuArrange, FCIDM_SHVIEW_AUTOARRANGE, MF_BYCOMMAND);
+ EnableMenuItem(hmenuArrange, FCIDM_SHVIEW_AUTOARRANGE, MF_BYCOMMAND);
+ EnableMenuItem(hmenuArrange, FCIDM_SHVIEW_ALIGNTOGRID, MF_BYCOMMAND);
if (GetAutoArrange() == S_OK)
CheckMenuItem(hmenuArrange, FCIDM_SHVIEW_AUTOARRANGE, MF_CHECKED);
+
+ if (_GetSnapToGrid() == S_OK)
+ CheckMenuItem(hmenuArrange, FCIDM_SHVIEW_ALIGNTOGRID, MF_CHECKED);
+ else
+ CheckMenuItem(hmenuArrange, FCIDM_SHVIEW_ALIGNTOGRID, MF_UNCHECKED);
}
@@ -1770,6 +1781,12 @@ LRESULT CDefView::OnCommand(UINT uMsg, WPARAM wParam, LPARAM
lParam, BOOL &bHand
case FCIDM_SHVIEW_SNAPTOGRID:
m_ListView.Arrange(LVA_SNAPTOGRID);
break;
+ case FCIDM_SHVIEW_ALIGNTOGRID:
+ if (_GetSnapToGrid() == S_OK)
+ m_ListView.SetExtendedListViewStyle(0, LVS_EX_SNAPTOGRID);
+ else
+ ArrangeGrid();
+ break;
case FCIDM_SHVIEW_AUTOARRANGE:
if (GetAutoArrange() == S_OK)
m_ListView.ModifyStyle(LVS_AUTOARRANGE, 0);
@@ -2729,6 +2746,12 @@ HRESULT STDMETHODCALLTYPE CDefView::GetAutoArrange()
return ((m_ListView.GetStyle() & LVS_AUTOARRANGE) ? S_OK : S_FALSE);
}
+HRESULT CDefView::_GetSnapToGrid()
+{
+ DWORD dwExStyle = (DWORD)m_ListView.SendMessage(LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0);
+ return ((dwExStyle & LVS_EX_SNAPTOGRID) ? S_OK : S_FALSE);
+}
+
HRESULT STDMETHODCALLTYPE CDefView::SelectItem(int iItem, DWORD dwFlags)
{
LVITEMW lvItem;
@@ -2905,8 +2928,8 @@ HRESULT STDMETHODCALLTYPE CDefView::GetArrangeParam(LPARAM *sort)
HRESULT STDMETHODCALLTYPE CDefView::ArrangeGrid()
{
- FIXME("(%p) stub\n", this);
- return E_NOTIMPL;
+ m_ListView.SetExtendedListViewStyle(LVS_EX_SNAPTOGRID, LVS_EX_SNAPTOGRID);
+ return S_OK;
}
HRESULT STDMETHODCALLTYPE CDefView::AutoArrange()
diff --git a/dll/win32/shell32/CDefViewBckgrndMenu.cpp
b/dll/win32/shell32/CDefViewBckgrndMenu.cpp
index 5636cdf548a..7d3e67a92f9 100644
--- a/dll/win32/shell32/CDefViewBckgrndMenu.cpp
+++ b/dll/win32/shell32/CDefViewBckgrndMenu.cpp
@@ -263,6 +263,7 @@ CDefViewBckgrndMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi)
case FCIDM_SHVIEW_AUTOARRANGE:
case FCIDM_SHVIEW_SNAPTOGRID:
case FCIDM_SHVIEW_REFRESH:
+ case FCIDM_SHVIEW_ALIGNTOGRID:
if (!m_site)
return E_FAIL;
diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc
index 7b9498ca7a3..61590e669fd 100644
--- a/dll/win32/shell32/lang/bg-BG.rc
+++ b/dll/win32/shell32/lang/bg-BG.rc
@@ -12,6 +12,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Самоподреждане", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -32,9 +33,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Самоподреждане", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Подравнени значета", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Опресняване", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Поставяне", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc
index 65209c7caca..b046ec113c2 100644
--- a/dll/win32/shell32/lang/ca-ES.rc
+++ b/dll/win32/shell32/lang/ca-ES.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Paste", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc
index a07a6426de6..49edf7bc821 100644
--- a/dll/win32/shell32/lang/cs-CZ.rc
+++ b/dll/win32/shell32/lang/cs-CZ.rc
@@ -17,6 +17,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Rovnat automaticky", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -37,9 +38,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Rovnat automaticky", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Zarovnat ikony", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "A&ktualizovat", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "V&ložit", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc
index 9b8f2e20cc5..73cb4c7b791 100644
--- a/dll/win32/shell32/lang/da-DK.rc
+++ b/dll/win32/shell32/lang/da-DK.rc
@@ -17,6 +17,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Arrangere Automatisk", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -37,9 +38,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Arrangere Automatisk", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Line up Ikoner", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Opfrisk", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Indsæt", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc
index 8c66c1a58d9..ed353d9cbe1 100644
--- a/dll/win32/shell32/lang/de-DE.rc
+++ b/dll/win32/shell32/lang/de-DE.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Automatisch anordnen", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Automatisch anordnen", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Icons anordnen", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Aktualisieren", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Einfügen", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc
index 2fa2128c82c..d2f9abcd3fd 100644
--- a/dll/win32/shell32/lang/el-GR.rc
+++ b/dll/win32/shell32/lang/el-GR.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Αυτόματη τακτοποίηση", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Αυτόματη τακτοποίηση", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Ευθυγράμμιση εικονιδίων", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Ανανέωση", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Επικόληση", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc
index 973293b3417..d778623377b 100644
--- a/dll/win32/shell32/lang/en-GB.rc
+++ b/dll/win32/shell32/lang/en-GB.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Paste", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc
index d1e460f00da..dc5bc3001ce 100644
--- a/dll/win32/shell32/lang/en-US.rc
+++ b/dll/win32/shell32/lang/en-US.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Paste", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc
index a8e68424439..7629f98b54d 100644
--- a/dll/win32/shell32/lang/es-ES.rc
+++ b/dll/win32/shell32/lang/es-ES.rc
@@ -20,6 +20,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Ordenar automáticamente", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -40,9 +41,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Ordenar automáticamente", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Alinear iconos", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Actualizar", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Pegar", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc
index 7444ec2800a..c6e41d8299a 100644
--- a/dll/win32/shell32/lang/et-EE.rc
+++ b/dll/win32/shell32/lang/et-EE.rc
@@ -18,6 +18,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Automaatkorralda", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -38,9 +39,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Automaatkorralda", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Joonda koordinaatvõrguga", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Värskenda", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Kleebi", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc
index 79fe458b524..15599ef59d2 100644
--- a/dll/win32/shell32/lang/fi-FI.rc
+++ b/dll/win32/shell32/lang/fi-FI.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Järjestä &Automaattisesti", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Järjestä &Automaattisesti", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Järjestä kuvakkeet riviin", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Päivitä", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Liitä", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc
index 4c2c33ef4f9..3e884987946 100644
--- a/dll/win32/shell32/lang/fr-FR.rc
+++ b/dll/win32/shell32/lang/fr-FR.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "T&ri automatique", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Aligner sur la &grille", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "T&ri automatique", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Aligner sur la &grille", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Aligner les icônes", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Rafraîchir", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Coller", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc
index cbdc37dee78..820b5861570 100644
--- a/dll/win32/shell32/lang/he-IL.rc
+++ b/dll/win32/shell32/lang/he-IL.rc
@@ -13,6 +13,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "סידור אוטומטי", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -33,9 +34,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "סידור אוטומטי", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "סדר סמלים", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "רענן", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "הדבק", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc
index 597e829bc65..6599a48d36f 100644
--- a/dll/win32/shell32/lang/hi-IN.rc
+++ b/dll/win32/shell32/lang/hi-IN.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&ऑटो अरेंज", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&ऑटो अरेंज", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "लाइन अप आइकन", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "रिफ़्रिश", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "पेस्ट", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc
index 9d12d48f379..5b9fa0f0cfa 100644
--- a/dll/win32/shell32/lang/hu-HU.rc
+++ b/dll/win32/shell32/lang/hu-HU.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Automatikus elrendezés", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Automatikus elrendezés", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Ikonok igazítása", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Frissítés", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Beillesztés", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc
index b38d8e01c3c..800649f20ef 100644
--- a/dll/win32/shell32/lang/id-ID.rc
+++ b/dll/win32/shell32/lang/id-ID.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Otomatis &Urutkan", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Otomatis &Urutkan", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Bariskan Ikon", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Segarkan", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Tempel", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc
index f0125ec857b..27b6ffdaba9 100644
--- a/dll/win32/shell32/lang/it-IT.rc
+++ b/dll/win32/shell32/lang/it-IT.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Disponi Automaticamente", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Disponi Automaticamente", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Allinea Icone", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Aggiorna", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Incolla", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc
index 93ed74f11f2..27049132c6a 100644
--- a/dll/win32/shell32/lang/ja-JP.rc
+++ b/dll/win32/shell32/lang/ja-JP.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "アイコンの自動整列(&A)", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "アイコンの自動整列(&A)", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "等間隔に整列", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "最新の情報に更新", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "貼り付け", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc
index d117d9f9af3..e00bc84dfb3 100644
--- a/dll/win32/shell32/lang/ko-KR.rc
+++ b/dll/win32/shell32/lang/ko-KR.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Paste", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc
index 99406fe5461..7e6a33b3273 100644
--- a/dll/win32/shell32/lang/nl-NL.rc
+++ b/dll/win32/shell32/lang/nl-NL.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Paste", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc
index df3fd718dcb..5d6e5832eb8 100644
--- a/dll/win32/shell32/lang/no-NO.rc
+++ b/dll/win32/shell32/lang/no-NO.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Ordne &automatisk", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Ordne &automatisk", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Still opp ikoner", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Oppdater", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Lim inn", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc
index 893a071d465..7728d4c2a09 100644
--- a/dll/win32/shell32/lang/pl-PL.rc
+++ b/dll/win32/shell32/lang/pl-PL.rc
@@ -17,6 +17,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Autorozmieszczanie", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "&Wyrównaj do siatki", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -37,9 +38,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Autorozmieszczanie", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "&Wyrównaj do siatki", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "&Wyrównaj ikony", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Odśwież", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "W&klej", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc
index 1a21f30d95c..8ef64f05475 100644
--- a/dll/win32/shell32/lang/pt-BR.rc
+++ b/dll/win32/shell32/lang/pt-BR.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Auto organi&zar", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Auto organi&zar", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Alin&har ícones", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Atualizar", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Co&lar", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc
index 21de5d99294..2dd69f85cd6 100644
--- a/dll/win32/shell32/lang/pt-PT.rc
+++ b/dll/win32/shell32/lang/pt-PT.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Auto organi&zar", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Auto organi&zar", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Alin&har ícones", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Actualizar", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Co&lar", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc
index 731a2a061cd..885559fe59a 100644
--- a/dll/win32/shell32/lang/ro-RO.rc
+++ b/dll/win32/shell32/lang/ro-RO.rc
@@ -13,6 +13,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Criteriu &automat", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -33,9 +34,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Criteriu &automat", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Aranjea&ză în grilă", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Împ&rospătează", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Lipește", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc
index 6a7bfdc1340..b974732935f 100644
--- a/dll/win32/shell32/lang/ru-RU.rc
+++ b/dll/win32/shell32/lang/ru-RU.rc
@@ -18,6 +18,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Автоматически", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -38,9 +39,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Автоматически", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "В&ыровнять значки", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "О&бновить", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Вставить", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc
index 1dbc9eba295..403956196d8 100644
--- a/dll/win32/shell32/lang/sk-SK.rc
+++ b/dll/win32/shell32/lang/sk-SK.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Usporiadať &automaticky", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Usporiadať &automaticky", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Zarovnať ikony", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Obnoviť", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Prilepiť", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc
index 7beee80d600..dbdef73b378 100644
--- a/dll/win32/shell32/lang/sl-SI.rc
+++ b/dll/win32/shell32/lang/sl-SI.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Paste", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc
index 3739bcd0980..c249e0b955d 100644
--- a/dll/win32/shell32/lang/sq-AL.rc
+++ b/dll/win32/shell32/lang/sq-AL.rc
@@ -15,6 +15,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Organizo &Auto", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -35,9 +36,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Organizo &Auto", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Rreshto Ikonat", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Riresko", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Ngjit", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc
index c941da1710d..64881741295 100644
--- a/dll/win32/shell32/lang/sv-SE.rc
+++ b/dll/win32/shell32/lang/sv-SE.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Ordna automatiskt", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Ordna automatiskt", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Rada upp ikoner", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Uppdatera", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Klistra in", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc
index 17e69da786f..aef28fb801c 100644
--- a/dll/win32/shell32/lang/tr-TR.rc
+++ b/dll/win32/shell32/lang/tr-TR.rc
@@ -13,6 +13,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Kendiliğinden Düzenle", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -33,9 +34,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Kendiliğinden Düzenle", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "&Kılavuza Hizâla", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&Yenile", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Y&apıştır", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc
index 41ef406152b..3bac38eb8fc 100644
--- a/dll/win32/shell32/lang/uk-UA.rc
+++ b/dll/win32/shell32/lang/uk-UA.rc
@@ -11,6 +11,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&автоматично", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -31,9 +32,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "&автоматично", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "Вирівняти значки", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Оновити", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "Вставити", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc
index 8ff7eefa01a..510d6d75bbd 100644
--- a/dll/win32/shell32/lang/zh-CN.rc
+++ b/dll/win32/shell32/lang/zh-CN.rc
@@ -21,6 +21,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "自动排列(&D)", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -41,9 +42,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "自动排列(&D)", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "对齐图标", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "刷新", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "粘贴", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc
index 35d8a2ce9f3..af61fb63a45 100644
--- a/dll/win32/shell32/lang/zh-TW.rc
+++ b/dll/win32/shell32/lang/zh-TW.rc
@@ -20,6 +20,7 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "自動排列(&A)", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
END
@@ -40,9 +41,8 @@ BEGIN
BEGIN
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "自動排列(&A)", FCIDM_SHVIEW_AUTOARRANGE
+ MENUITEM "Align to &Grid", FCIDM_SHVIEW_ALIGNTOGRID
END
- MENUITEM "對齊圖示", FCIDM_SHVIEW_SNAPTOGRID
- MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "重新整理", FCIDM_SHVIEW_REFRESH
MENUITEM "", -1, MFT_SEPARATOR
MENUITEM "貼上", FCIDM_SHVIEW_INSERT
diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h
index 4e9fc63703f..412dec29c58 100644
--- a/dll/win32/shell32/shresdef.h
+++ b/dll/win32/shell32/shresdef.h
@@ -765,6 +765,7 @@
/* 0x7030-0x703f are used by the shellbrowser */
#define FCIDM_SHVIEW_AUTOARRANGE 0x7031
#define FCIDM_SHVIEW_SNAPTOGRID 0x7032
+#define FCIDM_SHVIEW_ALIGNTOGRID 0x7033
#define FCIDM_SHVIEW_HELP 0x7041
#define FCIDM_SHVIEW_RENAME 0x7050
diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h
index 973f923a5d6..b478ca228f7 100644
--- a/sdk/include/psdk/shlobj.h
+++ b/sdk/include/psdk/shlobj.h
@@ -526,6 +526,7 @@ typedef struct
/* 0x7030-0x703f are used by the shellbrowser */
#define FCIDM_SHVIEW_AUTOARRANGE 0x7031
#define FCIDM_SHVIEW_SNAPTOGRID 0x7032
+#define FCIDM_SHVIEW_ALIGNTOGRID 0x7033
#define FCIDM_SHVIEW_HELP 0x7041
#define FCIDM_SHVIEW_RENAME 0x7050