Add `[Un]Register shell extension for current user only` button to options dialog

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 9e932e3..897be23 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1693,11 +1693,13 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
 CAPTION "Shell Integration"\r
 FONT 8, "MS Shell Dlg", 0, 0, 0x1\r
 BEGIN\r
-    GROUPBOX        "Explorer",IDC_STATIC,7,6,238,80\r
+    GROUPBOX        "Explorer",IDC_STATIC,7,6,238,112\r
     CONTROL         "E&nable advanced menu",IDC_EXPLORER_ADVANCED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,27,30,210,10\r
     CONTROL         "&Add to context menu",IDC_EXPLORER_CONTEXT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,18,220,10\r
     PUSHBUTTON      "&Register shell extension",IDC_REGISTER_SHELLEXTENSION,17,48,220,14\r
     PUSHBUTTON      "&Unregister shell extension",IDC_UNREGISTER_SHELLEXTENSION,17,64,220,14\r
+    PUSHBUTTON      "Register shell extension for current user &only",IDC_REGISTER_SHELLEXTENSION_PERUSER,17,80,220,14\r
+    PUSHBUTTON      "Unregister shell extension for current user on&ly",IDC_UNREGISTER_SHELLEXTENSION_PERUSER,17,96,220,14\r
 END\r
 \r
 IDD_PROPPAGE_COMPARE_FOLDER DIALOGEX 0, 0, 255, 205\r

diff --git a/Src/PropShell.cpp b/Src/PropShell.cpp
index 3ca088a..8441406 100644 (file)
--- a/Src/PropShell.cpp
+++ b/Src/PropShell.cpp
@@ -26,7 +26,7 @@
 static LPCTSTR f_RegValueEnabled = _T("ContextMenuEnabled");
 static LPCTSTR f_RegValuePath = _T("Executable");
 
-static bool IsShellExtensionRegistered()
+static bool IsShellExtensionRegistered(bool peruser)
 {
        HKEY hKey;
 #ifdef _WIN64
@@ -35,14 +35,15 @@ static bool IsShellExtensionRegistered()
        auto Is64BitWindows = []() { BOOL f64 = FALSE; return IsWow64Process(GetCurrentProcess(), &f64) && f64; };
        DWORD ulOptions = KEY_QUERY_VALUE | (Is64BitWindows() ? KEY_WOW64_64KEY : 0);
 #endif
-       if (ERROR_SUCCESS == RegOpenKeyEx(HKEY_CLASSES_ROOT, _T("CLSID\\{4E716236-AA30-4C65-B225-D68BBA81E9C2}"), 0, ulOptions, &hKey)) {
+       if (ERROR_SUCCESS == RegOpenKeyEx(peruser ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, _T("Software\\Classes\\CLSID\\{4E716236-AA30-4C65-B225-D68BBA81E9C2}"), 0, ulOptions, &hKey))
+       {
                RegCloseKey(hKey);
                return true;
        }
        return false;
 }
 
-static bool RegisterShellExtension(bool unregister)
+static bool RegisterShellExtension(bool unregister, bool peruser)
 {
        TCHAR szSystem32[260] = { 0 };
        TCHAR szSysWow64[260] = { 0 };
@@ -52,24 +53,28 @@ static bool RegisterShellExtension(bool unregister)
        String progpath = env::GetProgPath();
        String regsvr32 = paths::ConcatPath(szSystem32, _T("regsvr32.exe"));
        String args;
+       String options = (unregister ? _T("/s /u") : _T("/s"));
+       options += peruser ? _T(" /n /i:user") : _T("");
        SHELLEXECUTEINFO sei = { sizeof(sei) };
-       sei.lpVerb = _T("runas");
+       if (!peruser)
+               sei.lpVerb = _T("runas");
        if (szSysWow64[0])
        {
-               args = (unregister ? _T("/s /u \"") : _T("/s \"")) + paths::ConcatPath(progpath, _T("ShellExtensionX64.dll")) + _T("\"");
+               args = options + _T(" \"") + paths::ConcatPath(progpath, _T("ShellExtensionX64.dll")) + _T("\"");
+
                sei.lpFile = regsvr32.c_str();
                sei.lpParameters = args.c_str();
                ShellExecuteEx(&sei);
 
                regsvr32 = paths::ConcatPath(szSysWow64, _T("regsvr32.exe"));
-               args = (unregister ? _T("/s /u \"") : _T("/s \"")) + paths::ConcatPath(progpath, _T("ShellExtensionU.dll")) + _T("\"");
+               args = options + _T("\"") + paths::ConcatPath(progpath, _T("ShellExtensionU.dll")) + _T("\"");
                sei.lpFile = regsvr32.c_str();
                sei.lpParameters = args.c_str();
                return !!ShellExecuteEx(&sei);
        }
        else
        {
-               args = (unregister ? _T("/s /u \"") : _T("/s \"")) + paths::ConcatPath(progpath, _T("ShellExtensionU.dll")) + _T("\"");
+               args = options + _T(" \"") + paths::ConcatPath(progpath, _T("ShellExtensionU.dll")) + _T("\"");
                sei.lpFile = regsvr32.c_str();
                sei.lpParameters = args.c_str();
                return !!ShellExecuteEx(&sei);
@@ -119,6 +124,8 @@ BEGIN_MESSAGE_MAP(PropShell, CPropertyPage)
        ON_BN_CLICKED(IDC_EXPLORER_CONTEXT, OnAddToExplorer)
        ON_BN_CLICKED(IDC_REGISTER_SHELLEXTENSION, OnRegisterShellExtension)
        ON_BN_CLICKED(IDC_UNREGISTER_SHELLEXTENSION, OnUnregisterShellExtension)
+       ON_BN_CLICKED(IDC_REGISTER_SHELLEXTENSION_PERUSER, OnRegisterShellExtensionPerUser)
+       ON_BN_CLICKED(IDC_UNREGISTER_SHELLEXTENSION_PERUSER, OnUnregisterShellExtensionPerUser)
        ON_WM_TIMER()
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
@@ -229,22 +236,35 @@ void PropShell::AdvancedContextMenuCheck()
 
 void PropShell::UpdateButtons()
 {
-       bool registered = IsShellExtensionRegistered();
-       EnableDlgItem(IDC_EXPLORER_CONTEXT, registered);
+       bool registered = IsShellExtensionRegistered(false);
+       bool registeredPerUser = IsShellExtensionRegistered(true);
+       EnableDlgItem(IDC_EXPLORER_CONTEXT, registered || registeredPerUser);
        EnableDlgItem(IDC_REGISTER_SHELLEXTENSION, !registered);
        EnableDlgItem(IDC_UNREGISTER_SHELLEXTENSION, registered);
+       EnableDlgItem(IDC_REGISTER_SHELLEXTENSION_PERUSER, !registeredPerUser);
+       EnableDlgItem(IDC_UNREGISTER_SHELLEXTENSION_PERUSER, registeredPerUser);
        EnableDlgItem(IDC_EXPLORER_ADVANCED, 
-               registered && IsDlgButtonChecked(IDC_EXPLORER_CONTEXT));
+               (registered || registeredPerUser) && IsDlgButtonChecked(IDC_EXPLORER_CONTEXT));
 }
 
 void PropShell::OnRegisterShellExtension()
 {
-       RegisterShellExtension(false);
+       RegisterShellExtension(false, false);
 }
 
 void PropShell::OnUnregisterShellExtension()
 {
-       RegisterShellExtension(true);
+       RegisterShellExtension(true, false);
+}
+
+void PropShell::OnRegisterShellExtensionPerUser()
+{
+       RegisterShellExtension(false, true);
+}
+
+void PropShell::OnUnregisterShellExtensionPerUser()
+{
+       RegisterShellExtension(true, true);
 }
 
 void PropShell::OnTimer(UINT_PTR nIDEvent)

diff --git a/Src/PropShell.h b/Src/PropShell.h
index beb8094..65fdca1 100644 (file)
--- a/Src/PropShell.h
+++ b/Src/PropShell.h
@@ -36,6 +36,8 @@ protected:
        afx_msg void OnAddToExplorer();
        afx_msg void OnRegisterShellExtension();
        afx_msg void OnUnregisterShellExtension();
+       afx_msg void OnRegisterShellExtensionPerUser();
+       afx_msg void OnUnregisterShellExtensionPerUser();
        afx_msg void OnTimer(UINT_PTR nIDEvent);
 
        void GetContextRegValues();

diff --git a/Src/resource.h b/Src/resource.h
index 9345528..715e923 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -473,6 +473,8 @@
 #define IDC_MARGIN_COLOR_LABEL          1351\r
 #define IDC_MARGIN_BKGD_COLOR           1352\r
 #define IDC_COMPARE_BINARYC_LIMIT       1353\r
+#define IDC_REGISTER_SHELLEXTENSION_PERUSER 1354\r
+#define IDC_UNREGISTER_SHELLEXTENSION_PERUSER 1355\r
 #define IDC_EDIT_WHOLE_WORD             8603\r
 #define IDC_EDIT_MATCH_CASE             8604\r
 #define IDC_EDIT_FINDTEXT               8605\r
@@ -1242,7 +1244,7 @@
 #ifdef APSTUDIO_INVOKED\r
 #ifndef APSTUDIO_READONLY_SYMBOLS\r
 #define _APS_3D_CONTROLS                     1\r
-#define _APS_NEXT_RESOURCE_VALUE        250\r
+#define _APS_NEXT_RESOURCE_VALUE        251\r
 #define _APS_NEXT_COMMAND_VALUE         33660\r
 #define _APS_NEXT_CONTROL_VALUE         8830\r
 #define _APS_NEXT_SYMED_VALUE           116\r

diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 46645ee..336ba5a 100644 (file)
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -2739,6 +2739,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index 2c6730d..1149017 100644 (file)
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -2743,6 +2743,14 @@ msgstr "&Registrar a extensão do shell"
 msgid "&Unregister shell extension"
 msgstr "&Tirar o registro da extensão do shell"
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 329abae..81fac30 100644 (file)
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -2732,6 +2732,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index 1e8ae6c..d926930 100644 (file)
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -2731,6 +2731,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index 59be0a7..3971f37 100644 (file)
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -2734,6 +2734,14 @@ msgstr "注册到外壳扩展(&R)"
 msgid "&Unregister shell extension"
 msgstr "取消注册到外壳扩展(&U)"
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index 2576580..3249138 100644 (file)
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -2747,6 +2747,14 @@ msgstr "註冊右鍵快顯功能表(&R)"
 msgid "&Unregister shell extension"
 msgstr "註銷右鍵快顯功能表(&U)"
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index 588b074..d1f58f3 100644 (file)
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -2736,6 +2736,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 7d57fb9..930c898 100644 (file)
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -2734,6 +2734,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index 50506d8..bfe2942 100644 (file)
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -2743,6 +2743,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index 48fca71..db85d1a 100644 (file)
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -2749,6 +2749,14 @@ msgstr "Shell-extensie registreren"
 msgid "&Unregister shell extension"
 msgstr "Shell-extensie de-registreren"
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index b79d743..419c416 100644 (file)
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2019-05-11 09:49+0000\n"
+"POT-Creation-Date: 2019-05-19 10:55+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -2208,6 +2208,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 msgid "Folder"
 msgstr ""

diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index bb96e06..18a76b3 100644 (file)
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -2729,6 +2729,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index 1ffb1b7..0d2dbb2 100644 (file)
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -2740,6 +2740,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index 3a89241..4bbf37d 100644 (file)
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -2737,6 +2737,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index afd6dbd..a485ad1 100644 (file)
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -2742,6 +2742,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 079591c..ca8afba 100644 (file)
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -2731,6 +2731,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 3c096d0..0a13880 100644 (file)
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -2732,6 +2732,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index 23ec18c..2ff5eef 100644 (file)
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -2732,6 +2732,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index a3b2b4c..74c2b89 100644 (file)
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -2232,6 +2232,14 @@ msgstr "シェル拡張を登録(&R)"
 msgid "&Unregister shell extension"
 msgstr "シェル拡張の登録を解除(&U)"
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr "現在のユーザーのみシェル拡張を登録(&O)"
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr "現在のユーザーのみシェル拡張の登録を解除(&L)"
+
 #: Merge.rc:7262BE24
 msgid "Folder"
 msgstr "フォルダー"

diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 5a21a3d..bd4e2ed 100644 (file)
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -2744,6 +2744,14 @@ msgstr "쉘 확장자 등록하기(&R)"
 msgid "&Unregister shell extension"
 msgstr "쉘 확장자 등록 해제(&U)"
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index 94e33ae..790f79f 100644 (file)
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -2225,6 +2225,14 @@ msgstr "&Registruoti aplinkos plėtinį"
 msgid "&Unregister shell extension"
 msgstr "&Išregistruoti aplinkos plėtinį"
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 msgid "Folder"
 msgstr "Katalogų"

diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index 02c9080..e12f9bc 100644 (file)
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -2736,6 +2736,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index 8fe48f5..76dd629 100644 (file)
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -2745,6 +2745,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 844605d..174b3e7 100644 (file)
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -2737,6 +2737,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index 0fe1711..b97b385 100644 (file)
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -2732,6 +2732,14 @@ msgstr "&Registar extensão shell"
 msgid "&Unregister shell extension"
 msgstr "Extensão shell não registada"
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index c1a14af..4877735 100644 (file)
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -2732,6 +2732,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index ac19fb8..1704eb5 100644 (file)
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -2739,6 +2739,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index 810b953..e49c61d 100644 (file)
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -2719,6 +2719,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index a79c970..702163b 100644 (file)
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -2731,6 +2731,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index 5dfb91a..0b23462 100644 (file)
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -2736,6 +2736,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index bc03692..f87c456 100644 (file)
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -2739,6 +2739,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index 2156822..bb26559 100644 (file)
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -2738,6 +2738,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index 1883bec..bda111d 100644 (file)
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -2744,6 +2744,14 @@ msgstr "Registrera GränssnittsIntegration"
 msgid "&Unregister shell extension"
 msgstr "Avregistrera GränssnittsIntegration"
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index 8a78b3f..a5b5636 100644 (file)
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -2739,6 +2739,14 @@ msgstr "Kabuk &Uzantısını Kaydet"
 msgid "&Unregister shell extension"
 msgstr "Kab&uk Uzantısı Kaydını Sil"
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"

diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index 33e2e70..1160224 100644 (file)
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -2737,6 +2737,14 @@ msgstr ""
 msgid "&Unregister shell extension"
 msgstr ""
 
+#: Merge.rc:2D682DC2
+msgid "Register shell extension for current user &only"
+msgstr ""
+
+#: Merge.rc:5C3A0110
+msgid "Unregister shell extension for current user on&ly"
+msgstr ""
+
 #: Merge.rc:7262BE24
 #, c-format
 msgid "Folder"