From 1bb1659aba0f2a4a80a3e104cc24b40cabb51b38 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Wed, 18 Aug 2021 09:19:22 +0900 Subject: [PATCH] ShellExtension: As with WinMergeU.exe, do not embed translation strings in ShellExtension*.dll, but get it from the *.po file. --- BuildArc.cmd | 3 +- DownloadDeps.cmd | 2 +- Installer/InnoSetup/WinMerge.iss | 35 ++ Installer/InnoSetup/WinMergeARM64.is6.iss | 35 ++ Installer/InnoSetup/WinMergeX64.is6.iss | 35 ++ Installer/InnoSetup/WinMergeX64.iss | 35 ++ Installer/InnoSetup/WinMergeX64NonAdmin.iss | 35 ++ ShellExtension/LanguageSelect.cpp | 697 +++++++++++++++++++++ ShellExtension/LanguageSelect.h | 36 ++ ShellExtension/Languages/ShellExtensionBasque.rc | 55 -- .../Languages/ShellExtensionBrazilian.rc | 55 -- .../Languages/ShellExtensionBulgarian.rc | 55 -- ShellExtension/Languages/ShellExtensionCatalan.rc | 55 -- .../Languages/ShellExtensionChineseSimplified.rc | 55 -- .../Languages/ShellExtensionChineseTraditional.rc | 55 -- ShellExtension/Languages/ShellExtensionCroatian.rc | 55 -- ShellExtension/Languages/ShellExtensionCzech.rc | 55 -- ShellExtension/Languages/ShellExtensionDanish.rc | 55 -- ShellExtension/Languages/ShellExtensionDutch.rc | 55 -- ShellExtension/Languages/ShellExtensionFinnish.rc | 55 -- ShellExtension/Languages/ShellExtensionFrench.rc | 55 -- ShellExtension/Languages/ShellExtensionGalician.rc | 55 -- ShellExtension/Languages/ShellExtensionGerman.rc | 55 -- ShellExtension/Languages/ShellExtensionGreek.rc | 55 -- .../Languages/ShellExtensionHungarian.rc | 55 -- ShellExtension/Languages/ShellExtensionItalian.rc | 55 -- ShellExtension/Languages/ShellExtensionJapanese.rc | 55 -- ShellExtension/Languages/ShellExtensionKorean.rc | 55 -- .../Languages/ShellExtensionLithuanian.rc | 55 -- .../Languages/ShellExtensionNorwegian.rc | 55 -- ShellExtension/Languages/ShellExtensionPersian.rc | 55 -- ShellExtension/Languages/ShellExtensionPolish.rc | 55 -- .../Languages/ShellExtensionPortuguese.rc | 55 -- ShellExtension/Languages/ShellExtensionRomanian.rc | 55 -- ShellExtension/Languages/ShellExtensionRussian.rc | 55 -- ShellExtension/Languages/ShellExtensionSerbian.rc | 55 -- ShellExtension/Languages/ShellExtensionSinhala.rc | 55 -- ShellExtension/Languages/ShellExtensionSlovak.rc | 55 -- .../Languages/ShellExtensionSlovenian.rc | 55 -- ShellExtension/Languages/ShellExtensionSpanish.rc | 55 -- ShellExtension/Languages/ShellExtensionSwedish.rc | 55 -- ShellExtension/Languages/ShellExtensionTemplate.rc | 55 -- ShellExtension/Languages/ShellExtensionTurkish.rc | 55 -- .../Languages/ShellExtensionUkrainian.rc | 55 -- ShellExtension/ShellExtension.rc | 552 ---------------- ShellExtension/ShellExtension.vcxproj | 266 +------- ShellExtension/ShellExtension.vcxproj.filters | 105 +--- ShellExtension/WinMergeShell.cpp | 95 +-- ShellExtension/WinMergeShell.h | 5 + .../GoogleTest/Encoding/codepage_detect_test.cpp | 5 - .../ShellExtension/CreateTranslatedRcFiles.vbs | 301 --------- Translations/ShellExtension/Japanese.po | 2 +- Translations/WinMerge/Brazilian.po | 27 - 53 files changed, 981 insertions(+), 3215 deletions(-) create mode 100644 ShellExtension/LanguageSelect.cpp create mode 100644 ShellExtension/LanguageSelect.h delete mode 100644 ShellExtension/Languages/ShellExtensionBasque.rc delete mode 100644 ShellExtension/Languages/ShellExtensionBrazilian.rc delete mode 100644 ShellExtension/Languages/ShellExtensionBulgarian.rc delete mode 100644 ShellExtension/Languages/ShellExtensionCatalan.rc delete mode 100644 ShellExtension/Languages/ShellExtensionChineseSimplified.rc delete mode 100644 ShellExtension/Languages/ShellExtensionChineseTraditional.rc delete mode 100644 ShellExtension/Languages/ShellExtensionCroatian.rc delete mode 100644 ShellExtension/Languages/ShellExtensionCzech.rc delete mode 100644 ShellExtension/Languages/ShellExtensionDanish.rc delete mode 100644 ShellExtension/Languages/ShellExtensionDutch.rc delete mode 100644 ShellExtension/Languages/ShellExtensionFinnish.rc delete mode 100644 ShellExtension/Languages/ShellExtensionFrench.rc delete mode 100644 ShellExtension/Languages/ShellExtensionGalician.rc delete mode 100644 ShellExtension/Languages/ShellExtensionGerman.rc delete mode 100644 ShellExtension/Languages/ShellExtensionGreek.rc delete mode 100644 ShellExtension/Languages/ShellExtensionHungarian.rc delete mode 100644 ShellExtension/Languages/ShellExtensionItalian.rc delete mode 100644 ShellExtension/Languages/ShellExtensionJapanese.rc delete mode 100644 ShellExtension/Languages/ShellExtensionKorean.rc delete mode 100644 ShellExtension/Languages/ShellExtensionLithuanian.rc delete mode 100644 ShellExtension/Languages/ShellExtensionNorwegian.rc delete mode 100644 ShellExtension/Languages/ShellExtensionPersian.rc delete mode 100644 ShellExtension/Languages/ShellExtensionPolish.rc delete mode 100644 ShellExtension/Languages/ShellExtensionPortuguese.rc delete mode 100644 ShellExtension/Languages/ShellExtensionRomanian.rc delete mode 100644 ShellExtension/Languages/ShellExtensionRussian.rc delete mode 100644 ShellExtension/Languages/ShellExtensionSerbian.rc delete mode 100644 ShellExtension/Languages/ShellExtensionSinhala.rc delete mode 100644 ShellExtension/Languages/ShellExtensionSlovak.rc delete mode 100644 ShellExtension/Languages/ShellExtensionSlovenian.rc delete mode 100644 ShellExtension/Languages/ShellExtensionSpanish.rc delete mode 100644 ShellExtension/Languages/ShellExtensionSwedish.rc delete mode 100644 ShellExtension/Languages/ShellExtensionTemplate.rc delete mode 100644 ShellExtension/Languages/ShellExtensionTurkish.rc delete mode 100644 ShellExtension/Languages/ShellExtensionUkrainian.rc delete mode 100644 Translations/ShellExtension/CreateTranslatedRcFiles.vbs diff --git a/BuildArc.cmd b/BuildArc.cmd index cd6768ce5..1e0624fe3 100644 --- a/BuildArc.cmd +++ b/BuildArc.cmd @@ -68,7 +68,7 @@ if not "%1" == "" ( ) rem Create folder structure -for %%i in (ColorSchemes Languages Filters MergePlugins Docs Frhed\Docs Frhed\Languages WinIMerge Merge7z\Lang Commands\Apache-Tika Commands\tidy-html5 Commands\jq Commands\q Commands\GnuWin32) do ( +for %%i in (ColorSchemes Languages\ShellExtension Filters MergePlugins Docs Frhed\Docs Frhed\Languages WinIMerge Merge7z\Lang Commands\Apache-Tika Commands\tidy-html5 Commands\jq Commands\q Commands\GnuWin32) do ( mkdir "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\%%i" 2> NUL ) @@ -102,6 +102,7 @@ copy ShellExtension\*Register*.bat "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" rem Translations echo Copy Translations... copy Build\%PLATFORM%\Release\Languages\*.po "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\Languages\" > NUL +copy Translations\ShellExtension\*.po "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\Languages\ShellExtension" > NUL rem ColorSchemes echo Copy ColorSchemes... diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd index 5b52091e7..ab49ca6b8 100644 --- a/DownloadDeps.cmd +++ b/DownloadDeps.cmd @@ -11,7 +11,7 @@ if not %ERRORLEVEL% == 0 ( set downloadsdir=%~dp0\build\WinMergeDownloadDeps set urls_destdirs=^ https://github.com/WinMerge/winmerge/releases/download/winmerge_manual_another_build_tools_v2/winmerge_manual_another_build_tools_v2.zip!Docs\Manual\Tools ^ -https://github.com/WinMerge/winmerge/releases/download/ShellExtension-1.17.14.0/ShellExtension-1.17.14.0.zip!Build ^ +https://github.com/WinMerge/winmerge/releases/download/ShellExtension-1.17.15.0/ShellExtension-1.17.15.0.zip!Build ^ https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.5/Merge7z1900.5-win32.zip!Build ^ https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.5/Merge7z1900.5-x64.zip!Build\X64 ^ https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.5/Merge7z1900.5-ARM64.zip!Build\ARM64 ^ diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss index 622bfbff0..0aedcee90 100755 --- a/Installer/InnoSetup/WinMerge.iss +++ b/Installer/InnoSetup/WinMerge.iss @@ -442,65 +442,100 @@ Source: ..\..\Build\Merge7z\Lang\*.txt; DestDir: {app}\Merge7z\Lang; Flags: prom ; Language files Source: ..\..\Translations\WinMerge\Arabic.po; DestDir: {app}\Languages; Components: Languages\Arabic; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Arabic.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Arabic; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Basque.po; DestDir: {app}\Languages; Components: Languages\Basque; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Basque.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Basque; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Basque.txt; DestDir: {app}\Docs; Components: Languages\Basque Source: ..\..\Translations\WinMerge\Brazilian.po; DestDir: {app}\Languages; Components: Languages\PortugueseBrazilian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Brazilian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\PortugueseBrazilian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Brazilian.txt; DestDir: {app}\Docs; Components: Languages\PortugueseBrazilian Source: ..\..\Translations\WinMerge\Bulgarian.po; DestDir: {app}\Languages; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Bulgarian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Bulgarian.txt; DestDir: {app}\Docs; Components: Languages\Bulgarian Source: ..\..\Translations\WinMerge\Catalan.po; DestDir: {app}\Languages; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Catalan.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Catalan.txt; DestDir: {app}\Docs; Components: Languages\Catalan Source: ..\..\Translations\WinMerge\ChineseSimplified.po; DestDir: {app}\Languages; Components: Languages\Chinese_Simplified; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\ChineseSimplified.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Chinese_Simplified; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-ChineseSimplified.txt; DestDir: {app}\Docs; Components: Languages\Chinese_Simplified Source: ..\..\Translations\WinMerge\ChineseTraditional.po; DestDir: {app}\Languages; Components: Languages\Chinese_Traditional; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\ChineseTraditional.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Chinese_Traditional; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-ChineseTraditional.txt; DestDir: {app}\Docs; Components: Languages\Chinese_Traditional Source: ..\..\Translations\WinMerge\Croatian.po; DestDir: {app}\Languages; Components: Languages\Croatian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Croatian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Croatian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Croatian.txt; DestDir: {app}\Docs; Components: Languages\Croatian Source: ..\..\Translations\WinMerge\Czech.po; DestDir: {app}\Languages; Components: Languages\Czech; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Czech.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Czech; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Danish.po; DestDir: {app}\Languages; Components: Languages\Danish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Danish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Danish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Dutch.po; DestDir: {app}\Languages; Components: Languages\Dutch; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Dutch.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Dutch; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Dutch.txt; DestDir: {app}\Docs; Components: Languages\Dutch Source: ..\..\Translations\WinMerge\Finnish.po; DestDir: {app}\Languages; Components: Languages\Finnish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Finnish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Finnish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Finnish.txt; DestDir: {app}\Docs; Components: Languages\Finnish Source: ..\..\Translations\WinMerge\French.po; DestDir: {app}\Languages; Components: Languages\French; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\French.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\French; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-French.txt; DestDir: {app}\Docs; Components: Languages\French Source: ..\..\Translations\WinMerge\Galician.po; DestDir: {app}\Languages; Components: Languages\Galician; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Galician.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Galician; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Galician.txt; DestDir: {app}\Docs; Components: Languages\Galician Source: ..\..\Translations\WinMerge\German.po; DestDir: {app}\Languages; Components: Languages\German; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\German.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\German; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-German.txt; DestDir: {app}\Docs; Components: Languages\German Source: ..\..\Translations\WinMerge\Greek.po; DestDir: {app}\Languages; Components: Languages\Greek; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Greek.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Greek; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Greek.txt; DestDir: {app}\Docs; Components: Languages\Greek Source: ..\..\Translations\WinMerge\Hungarian.po; DestDir: {app}\Languages; Components: Languages\Hungarian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Hungarian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Hungarian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Italian.po; DestDir: {app}\Languages; Components: Languages\Italian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Italian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Italian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Italian.txt; DestDir: {app}\Docs; Components: Languages\Italian Source: ..\..\Translations\WinMerge\Japanese.po; DestDir: {app}\Languages; Components: Languages\Japanese; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Japanese.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Japanese; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Japanese.txt; DestDir: {app}\Docs; Components: Languages\Japanese Source: ..\..\Build\Manual\htmlhelp\WinMergeJapanese.chm; DestDir: {app}\Docs; Components: Languages\Japanese Source: ..\..\Translations\WinMerge\Korean.po; DestDir: {app}\Languages; Components: Languages\Korean; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Korean.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Korean; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Lithuanian.po; DestDir: {app}\Languages; Components: Languages\Lithuanian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Lithuanian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Lithuanian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Lithuanian.txt; DestDir: {app}\Docs; Components: Languages\Lithuanian Source: ..\..\Translations\WinMerge\Norwegian.po; DestDir: {app}\Languages; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Norwegian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Persian.po; DestDir: {app}\Languages; Components: Languages\Persian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Persian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Persian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Polish.po; DestDir: {app}\Languages; Components: Languages\Polish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Polish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Polish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Portuguese.po; DestDir: {app}\Languages; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Portuguese.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Portuguese.txt; DestDir: {app}\Docs; Components: Languages\Portuguese Source: ..\..\Translations\WinMerge\Romanian.po; DestDir: {app}\Languages; Components: Languages\Romanian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Romanian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Romanian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Romanian.txt; DestDir: {app}\Docs; Components: Languages\Romanian Source: ..\..\Translations\WinMerge\Russian.po; DestDir: {app}\Languages; Components: Languages\Russian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Russian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Russian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Serbian.po; DestDir: {app}\Languages; Components: Languages\Serbian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Serbian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Serbian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Serbian.txt; DestDir: {app}\Docs; Components: Languages\Serbian Source: ..\..\Translations\WinMerge\Sinhala.po; DestDir: {app}\Languages; Components: Languages\Sinhala; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Sinhala.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Sinhala; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Slovak.po; DestDir: {app}\Languages; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Slovak.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Slovak.txt; DestDir: {app}\Docs; Components: Languages\Slovak Source: ..\..\Translations\WinMerge\Slovenian.po; DestDir: {app}\Languages; Components: Languages\Slovenian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Slovenian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Slovenian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Slovenian.txt; DestDir: {app}\Docs; Components: Languages\Slovenian Source: ..\..\Translations\WinMerge\Spanish.po; DestDir: {app}\Languages; Components: Languages\Spanish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Spanish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Spanish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Spanish.txt; DestDir: {app}\Docs; Components: Languages\Spanish Source: ..\..\Translations\WinMerge\Swedish.po; DestDir: {app}\Languages; Components: Languages\Swedish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Swedish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Swedish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Swedish.txt; DestDir: {app}\Docs; Components: Languages\Swedish Source: ..\..\Translations\WinMerge\Turkish.po; DestDir: {app}\Languages; Components: Languages\Turkish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Turkish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Turkish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Turkish.txt; DestDir: {app}\Docs; Components: Languages\Turkish Source: ..\..\Translations\WinMerge\Ukrainian.po; DestDir: {app}\Languages; Components: Languages\Ukrainian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Ukrainian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Ukrainian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Ukrainian.txt; DestDir: {app}\Docs; Components: Languages\Ukrainian ;Filters diff --git a/Installer/InnoSetup/WinMergeARM64.is6.iss b/Installer/InnoSetup/WinMergeARM64.is6.iss index c9846c021..62332ca0d 100644 --- a/Installer/InnoSetup/WinMergeARM64.is6.iss +++ b/Installer/InnoSetup/WinMergeARM64.is6.iss @@ -430,65 +430,100 @@ Source: ..\..\Build\ARM64\Merge7z\Lang\*.txt; DestDir: {app}\Merge7z\Lang; Flags ; Language files Source: ..\..\Translations\WinMerge\Arabic.po; DestDir: {app}\Languages; Components: Languages\Arabic; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Arabic.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Arabic; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Basque.po; DestDir: {app}\Languages; Components: Languages\Basque; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Basque.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Basque; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Basque.txt; DestDir: {app}\Docs; Components: Languages\Basque Source: ..\..\Translations\WinMerge\Brazilian.po; DestDir: {app}\Languages; Components: Languages\PortugueseBrazilian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Brazilian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\PortugueseBrazilian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Brazilian.txt; DestDir: {app}\Docs; Components: Languages\PortugueseBrazilian Source: ..\..\Translations\WinMerge\Bulgarian.po; DestDir: {app}\Languages; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Bulgarian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Bulgarian.txt; DestDir: {app}\Docs; Components: Languages\Bulgarian Source: ..\..\Translations\WinMerge\Catalan.po; DestDir: {app}\Languages; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Catalan.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Catalan.txt; DestDir: {app}\Docs; Components: Languages\Catalan Source: ..\..\Translations\WinMerge\ChineseSimplified.po; DestDir: {app}\Languages; Components: Languages\Chinese_Simplified; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\ChineseSimplified.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Chinese_Simplified; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-ChineseSimplified.txt; DestDir: {app}\Docs; Components: Languages\Chinese_Simplified Source: ..\..\Translations\WinMerge\ChineseTraditional.po; DestDir: {app}\Languages; Components: Languages\Chinese_Traditional; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\ChineseTraditional.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Chinese_Traditional; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-ChineseTraditional.txt; DestDir: {app}\Docs; Components: Languages\Chinese_Traditional Source: ..\..\Translations\WinMerge\Croatian.po; DestDir: {app}\Languages; Components: Languages\Croatian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Croatian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Croatian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Croatian.txt; DestDir: {app}\Docs; Components: Languages\Croatian Source: ..\..\Translations\WinMerge\Czech.po; DestDir: {app}\Languages; Components: Languages\Czech; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Czech.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Czech; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Danish.po; DestDir: {app}\Languages; Components: Languages\Danish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Danish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Danish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Dutch.po; DestDir: {app}\Languages; Components: Languages\Dutch; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Dutch.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Dutch; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Dutch.txt; DestDir: {app}\Docs; Components: Languages\Dutch Source: ..\..\Translations\WinMerge\Finnish.po; DestDir: {app}\Languages; Components: Languages\Finnish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Finnish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Finnish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Finnish.txt; DestDir: {app}\Docs; Components: Languages\Finnish Source: ..\..\Translations\WinMerge\French.po; DestDir: {app}\Languages; Components: Languages\French; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\French.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\French; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-French.txt; DestDir: {app}\Docs; Components: Languages\French Source: ..\..\Translations\WinMerge\Galician.po; DestDir: {app}\Languages; Components: Languages\Galician; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Galician.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Galician; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Galician.txt; DestDir: {app}\Docs; Components: Languages\Galician Source: ..\..\Translations\WinMerge\German.po; DestDir: {app}\Languages; Components: Languages\German; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\German.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\German; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-German.txt; DestDir: {app}\Docs; Components: Languages\German Source: ..\..\Translations\WinMerge\Greek.po; DestDir: {app}\Languages; Components: Languages\Greek; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Greek.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Greek; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Greek.txt; DestDir: {app}\Docs; Components: Languages\Greek Source: ..\..\Translations\WinMerge\Hungarian.po; DestDir: {app}\Languages; Components: Languages\Hungarian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Hungarian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Hungarian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Italian.po; DestDir: {app}\Languages; Components: Languages\Italian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Italian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Italian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Italian.txt; DestDir: {app}\Docs; Components: Languages\Italian Source: ..\..\Translations\WinMerge\Japanese.po; DestDir: {app}\Languages; Components: Languages\Japanese; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Japanese.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Japanese; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Japanese.txt; DestDir: {app}\Docs; Components: Languages\Japanese Source: ..\..\Build\Manual\htmlhelp\WinMergeJapanese.chm; DestDir: {app}\Docs; Components: Languages\Japanese Source: ..\..\Translations\WinMerge\Korean.po; DestDir: {app}\Languages; Components: Languages\Korean; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Korean.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Korean; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Lithuanian.po; DestDir: {app}\Languages; Components: Languages\Lithuanian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Lithuanian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Lithuanian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Lithuanian.txt; DestDir: {app}\Docs; Components: Languages\Lithuanian Source: ..\..\Translations\WinMerge\Norwegian.po; DestDir: {app}\Languages; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Norwegian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Persian.po; DestDir: {app}\Languages; Components: Languages\Persian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Persian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Persian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Polish.po; DestDir: {app}\Languages; Components: Languages\Polish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Polish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Polish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Portuguese.po; DestDir: {app}\Languages; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Portuguese.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Portuguese.txt; DestDir: {app}\Docs; Components: Languages\Portuguese Source: ..\..\Translations\WinMerge\Romanian.po; DestDir: {app}\Languages; Components: Languages\Romanian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Romanian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Romanian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Romanian.txt; DestDir: {app}\Docs; Components: Languages\Romanian Source: ..\..\Translations\WinMerge\Russian.po; DestDir: {app}\Languages; Components: Languages\Russian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Russian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Russian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Serbian.po; DestDir: {app}\Languages; Components: Languages\Serbian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Serbian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Serbian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Serbian.txt; DestDir: {app}\Docs; Components: Languages\Serbian Source: ..\..\Translations\WinMerge\Sinhala.po; DestDir: {app}\Languages; Components: Languages\Sinhala; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Sinhala.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Sinhala; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Slovak.po; DestDir: {app}\Languages; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Slovak.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Slovak.txt; DestDir: {app}\Docs; Components: Languages\Slovak Source: ..\..\Translations\WinMerge\Slovenian.po; DestDir: {app}\Languages; Components: Languages\Slovenian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Slovenian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Slovenian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Slovenian.txt; DestDir: {app}\Docs; Components: Languages\Slovenian Source: ..\..\Translations\WinMerge\Spanish.po; DestDir: {app}\Languages; Components: Languages\Spanish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Spanish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Spanish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Spanish.txt; DestDir: {app}\Docs; Components: Languages\Spanish Source: ..\..\Translations\WinMerge\Swedish.po; DestDir: {app}\Languages; Components: Languages\Swedish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Swedish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Swedish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Swedish.txt; DestDir: {app}\Docs; Components: Languages\Swedish Source: ..\..\Translations\WinMerge\Turkish.po; DestDir: {app}\Languages; Components: Languages\Turkish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Turkish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Turkish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Turkish.txt; DestDir: {app}\Docs; Components: Languages\Turkish Source: ..\..\Translations\WinMerge\Ukrainian.po; DestDir: {app}\Languages; Components: Languages\Ukrainian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Ukrainian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Ukrainian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Ukrainian.txt; DestDir: {app}\Docs; Components: Languages\Ukrainian ;Filters diff --git a/Installer/InnoSetup/WinMergeX64.is6.iss b/Installer/InnoSetup/WinMergeX64.is6.iss index 83012c7d0..c4a4b547f 100644 --- a/Installer/InnoSetup/WinMergeX64.is6.iss +++ b/Installer/InnoSetup/WinMergeX64.is6.iss @@ -429,65 +429,100 @@ Source: ..\..\Build\X64\Merge7z\Lang\*.txt; DestDir: {app}\Merge7z\Lang; Flags: ; Language files Source: ..\..\Translations\WinMerge\Arabic.po; DestDir: {app}\Languages; Components: Languages\Arabic; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Arabic.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Arabic; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Basque.po; DestDir: {app}\Languages; Components: Languages\Basque; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Basque.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Basque; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Basque.txt; DestDir: {app}\Docs; Components: Languages\Basque Source: ..\..\Translations\WinMerge\Brazilian.po; DestDir: {app}\Languages; Components: Languages\PortugueseBrazilian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Brazilian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\PortugueseBrazilian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Brazilian.txt; DestDir: {app}\Docs; Components: Languages\PortugueseBrazilian Source: ..\..\Translations\WinMerge\Bulgarian.po; DestDir: {app}\Languages; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Bulgarian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Bulgarian.txt; DestDir: {app}\Docs; Components: Languages\Bulgarian Source: ..\..\Translations\WinMerge\Catalan.po; DestDir: {app}\Languages; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Catalan.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Catalan.txt; DestDir: {app}\Docs; Components: Languages\Catalan Source: ..\..\Translations\WinMerge\ChineseSimplified.po; DestDir: {app}\Languages; Components: Languages\Chinese_Simplified; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\ChineseSimplified.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Chinese_Simplified; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-ChineseSimplified.txt; DestDir: {app}\Docs; Components: Languages\Chinese_Simplified Source: ..\..\Translations\WinMerge\ChineseTraditional.po; DestDir: {app}\Languages; Components: Languages\Chinese_Traditional; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\ChineseTraditional.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Chinese_Traditional; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-ChineseTraditional.txt; DestDir: {app}\Docs; Components: Languages\Chinese_Traditional Source: ..\..\Translations\WinMerge\Croatian.po; DestDir: {app}\Languages; Components: Languages\Croatian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Croatian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Croatian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Croatian.txt; DestDir: {app}\Docs; Components: Languages\Croatian Source: ..\..\Translations\WinMerge\Czech.po; DestDir: {app}\Languages; Components: Languages\Czech; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Czech.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Czech; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Danish.po; DestDir: {app}\Languages; Components: Languages\Danish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Danish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Danish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Dutch.po; DestDir: {app}\Languages; Components: Languages\Dutch; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Dutch.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Dutch; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Dutch.txt; DestDir: {app}\Docs; Components: Languages\Dutch Source: ..\..\Translations\WinMerge\Finnish.po; DestDir: {app}\Languages; Components: Languages\Finnish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Finnish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Finnish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Finnish.txt; DestDir: {app}\Docs; Components: Languages\Finnish Source: ..\..\Translations\WinMerge\French.po; DestDir: {app}\Languages; Components: Languages\French; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\French.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\French; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-French.txt; DestDir: {app}\Docs; Components: Languages\French Source: ..\..\Translations\WinMerge\Galician.po; DestDir: {app}\Languages; Components: Languages\Galician; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Galician.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Galician; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Galician.txt; DestDir: {app}\Docs; Components: Languages\Galician Source: ..\..\Translations\WinMerge\German.po; DestDir: {app}\Languages; Components: Languages\German; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\German.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\German; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-German.txt; DestDir: {app}\Docs; Components: Languages\German Source: ..\..\Translations\WinMerge\Greek.po; DestDir: {app}\Languages; Components: Languages\Greek; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Greek.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Greek; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Greek.txt; DestDir: {app}\Docs; Components: Languages\Greek Source: ..\..\Translations\WinMerge\Hungarian.po; DestDir: {app}\Languages; Components: Languages\Hungarian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Hungarian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Hungarian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Italian.po; DestDir: {app}\Languages; Components: Languages\Italian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Italian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Italian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Italian.txt; DestDir: {app}\Docs; Components: Languages\Italian Source: ..\..\Translations\WinMerge\Japanese.po; DestDir: {app}\Languages; Components: Languages\Japanese; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Japanese.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Japanese; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Japanese.txt; DestDir: {app}\Docs; Components: Languages\Japanese Source: ..\..\Build\Manual\htmlhelp\WinMergeJapanese.chm; DestDir: {app}\Docs; Components: Languages\Japanese Source: ..\..\Translations\WinMerge\Korean.po; DestDir: {app}\Languages; Components: Languages\Korean; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Korean.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Korean; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Lithuanian.po; DestDir: {app}\Languages; Components: Languages\Lithuanian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Lithuanian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Lithuanian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Lithuanian.txt; DestDir: {app}\Docs; Components: Languages\Lithuanian Source: ..\..\Translations\WinMerge\Norwegian.po; DestDir: {app}\Languages; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Norwegian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Persian.po; DestDir: {app}\Languages; Components: Languages\Persian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Persian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Persian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Polish.po; DestDir: {app}\Languages; Components: Languages\Polish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Polish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Polish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Portuguese.po; DestDir: {app}\Languages; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Portuguese.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Portuguese.txt; DestDir: {app}\Docs; Components: Languages\Portuguese Source: ..\..\Translations\WinMerge\Romanian.po; DestDir: {app}\Languages; Components: Languages\Romanian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Romanian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Romanian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Romanian.txt; DestDir: {app}\Docs; Components: Languages\Romanian Source: ..\..\Translations\WinMerge\Russian.po; DestDir: {app}\Languages; Components: Languages\Russian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Russian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Russian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Serbian.po; DestDir: {app}\Languages; Components: Languages\Serbian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Serbian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Serbian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Serbian.txt; DestDir: {app}\Docs; Components: Languages\Serbian Source: ..\..\Translations\WinMerge\Sinhala.po; DestDir: {app}\Languages; Components: Languages\Sinhala; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Sinhala.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Sinhala; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Slovak.po; DestDir: {app}\Languages; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Slovak.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Slovak.txt; DestDir: {app}\Docs; Components: Languages\Slovak Source: ..\..\Translations\WinMerge\Slovenian.po; DestDir: {app}\Languages; Components: Languages\Slovenian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Slovenian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Slovenian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Slovenian.txt; DestDir: {app}\Docs; Components: Languages\Slovenian Source: ..\..\Translations\WinMerge\Spanish.po; DestDir: {app}\Languages; Components: Languages\Spanish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Spanish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Spanish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Spanish.txt; DestDir: {app}\Docs; Components: Languages\Spanish Source: ..\..\Translations\WinMerge\Swedish.po; DestDir: {app}\Languages; Components: Languages\Swedish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Swedish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Swedish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Swedish.txt; DestDir: {app}\Docs; Components: Languages\Swedish Source: ..\..\Translations\WinMerge\Turkish.po; DestDir: {app}\Languages; Components: Languages\Turkish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Turkish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Turkish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Turkish.txt; DestDir: {app}\Docs; Components: Languages\Turkish Source: ..\..\Translations\WinMerge\Ukrainian.po; DestDir: {app}\Languages; Components: Languages\Ukrainian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Ukrainian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Ukrainian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Ukrainian.txt; DestDir: {app}\Docs; Components: Languages\Ukrainian ;Filters diff --git a/Installer/InnoSetup/WinMergeX64.iss b/Installer/InnoSetup/WinMergeX64.iss index 4dbbd30ad..8f82ae739 100644 --- a/Installer/InnoSetup/WinMergeX64.iss +++ b/Installer/InnoSetup/WinMergeX64.iss @@ -421,65 +421,100 @@ Source: ..\..\Build\X64\Merge7z\Lang\*.txt; DestDir: {app}\Merge7z\Lang; Flags: ; Language files Source: ..\..\Translations\WinMerge\Arabic.po; DestDir: {app}\Languages; Components: Languages\Arabic; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Arabic.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Arabic; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Basque.po; DestDir: {app}\Languages; Components: Languages\Basque; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Basque.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Basque; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Basque.txt; DestDir: {app}\Docs; Components: Languages\Basque Source: ..\..\Translations\WinMerge\Brazilian.po; DestDir: {app}\Languages; Components: Languages\PortugueseBrazilian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Brazilian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\PortugueseBrazilian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Brazilian.txt; DestDir: {app}\Docs; Components: Languages\PortugueseBrazilian Source: ..\..\Translations\WinMerge\Bulgarian.po; DestDir: {app}\Languages; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Bulgarian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Bulgarian.txt; DestDir: {app}\Docs; Components: Languages\Bulgarian Source: ..\..\Translations\WinMerge\Catalan.po; DestDir: {app}\Languages; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Catalan.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Catalan.txt; DestDir: {app}\Docs; Components: Languages\Catalan Source: ..\..\Translations\WinMerge\ChineseSimplified.po; DestDir: {app}\Languages; Components: Languages\Chinese_Simplified; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\ChineseSimplified.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Chinese_Simplified; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-ChineseSimplified.txt; DestDir: {app}\Docs; Components: Languages\Chinese_Simplified Source: ..\..\Translations\WinMerge\ChineseTraditional.po; DestDir: {app}\Languages; Components: Languages\Chinese_Traditional; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\ChineseTraditional.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Chinese_Traditional; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-ChineseTraditional.txt; DestDir: {app}\Docs; Components: Languages\Chinese_Traditional Source: ..\..\Translations\WinMerge\Croatian.po; DestDir: {app}\Languages; Components: Languages\Croatian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Croatian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Croatian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Croatian.txt; DestDir: {app}\Docs; Components: Languages\Croatian Source: ..\..\Translations\WinMerge\Czech.po; DestDir: {app}\Languages; Components: Languages\Czech; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Czech.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Czech; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Danish.po; DestDir: {app}\Languages; Components: Languages\Danish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Danish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Danish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Dutch.po; DestDir: {app}\Languages; Components: Languages\Dutch; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Dutch.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Dutch; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Dutch.txt; DestDir: {app}\Docs; Components: Languages\Dutch Source: ..\..\Translations\WinMerge\Finnish.po; DestDir: {app}\Languages; Components: Languages\Finnish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Finnish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Finnish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Finnish.txt; DestDir: {app}\Docs; Components: Languages\Finnish Source: ..\..\Translations\WinMerge\French.po; DestDir: {app}\Languages; Components: Languages\French; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\French.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\French; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-French.txt; DestDir: {app}\Docs; Components: Languages\French Source: ..\..\Translations\WinMerge\Galician.po; DestDir: {app}\Languages; Components: Languages\Galician; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Galician.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Galician; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Galician.txt; DestDir: {app}\Docs; Components: Languages\Galician Source: ..\..\Translations\WinMerge\German.po; DestDir: {app}\Languages; Components: Languages\German; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\German.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\German; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-German.txt; DestDir: {app}\Docs; Components: Languages\German Source: ..\..\Translations\WinMerge\Greek.po; DestDir: {app}\Languages; Components: Languages\Greek; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Greek.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Greek; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Greek.txt; DestDir: {app}\Docs; Components: Languages\Greek Source: ..\..\Translations\WinMerge\Hungarian.po; DestDir: {app}\Languages; Components: Languages\Hungarian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Hungarian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Hungarian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Italian.po; DestDir: {app}\Languages; Components: Languages\Italian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Italian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Italian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Italian.txt; DestDir: {app}\Docs; Components: Languages\Italian Source: ..\..\Translations\WinMerge\Japanese.po; DestDir: {app}\Languages; Components: Languages\Japanese; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Japanese.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Japanese; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Japanese.txt; DestDir: {app}\Docs; Components: Languages\Japanese Source: ..\..\Build\Manual\htmlhelp\WinMergeJapanese.chm; DestDir: {app}\Docs; Components: Languages\Japanese Source: ..\..\Translations\WinMerge\Korean.po; DestDir: {app}\Languages; Components: Languages\Korean; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Korean.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Korean; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Lithuanian.po; DestDir: {app}\Languages; Components: Languages\Lithuanian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Lithuanian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Lithuanian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Lithuanian.txt; DestDir: {app}\Docs; Components: Languages\Lithuanian Source: ..\..\Translations\WinMerge\Norwegian.po; DestDir: {app}\Languages; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Norwegian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Persian.po; DestDir: {app}\Languages; Components: Languages\Persian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Persian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Persian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Polish.po; DestDir: {app}\Languages; Components: Languages\Polish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Polish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Polish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Portuguese.po; DestDir: {app}\Languages; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Portuguese.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Portuguese.txt; DestDir: {app}\Docs; Components: Languages\Portuguese Source: ..\..\Translations\WinMerge\Romanian.po; DestDir: {app}\Languages; Components: Languages\Romanian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Romanian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Romanian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Romanian.txt; DestDir: {app}\Docs; Components: Languages\Romanian Source: ..\..\Translations\WinMerge\Russian.po; DestDir: {app}\Languages; Components: Languages\Russian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Russian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Russian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Serbian.po; DestDir: {app}\Languages; Components: Languages\Serbian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Serbian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Serbian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Serbian.txt; DestDir: {app}\Docs; Components: Languages\Serbian Source: ..\..\Translations\WinMerge\Sinhala.po; DestDir: {app}\Languages; Components: Languages\Sinhala; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Sinhala.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Sinhala; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Slovak.po; DestDir: {app}\Languages; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Slovak.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Slovak.txt; DestDir: {app}\Docs; Components: Languages\Slovak Source: ..\..\Translations\WinMerge\Slovenian.po; DestDir: {app}\Languages; Components: Languages\Slovenian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Slovenian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Slovenian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Slovenian.txt; DestDir: {app}\Docs; Components: Languages\Slovenian Source: ..\..\Translations\WinMerge\Spanish.po; DestDir: {app}\Languages; Components: Languages\Spanish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Spanish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Spanish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Spanish.txt; DestDir: {app}\Docs; Components: Languages\Spanish Source: ..\..\Translations\WinMerge\Swedish.po; DestDir: {app}\Languages; Components: Languages\Swedish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Swedish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Swedish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Swedish.txt; DestDir: {app}\Docs; Components: Languages\Swedish Source: ..\..\Translations\WinMerge\Turkish.po; DestDir: {app}\Languages; Components: Languages\Turkish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Turkish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Turkish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Turkish.txt; DestDir: {app}\Docs; Components: Languages\Turkish Source: ..\..\Translations\WinMerge\Ukrainian.po; DestDir: {app}\Languages; Components: Languages\Ukrainian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Ukrainian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Ukrainian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Ukrainian.txt; DestDir: {app}\Docs; Components: Languages\Ukrainian ;Filters diff --git a/Installer/InnoSetup/WinMergeX64NonAdmin.iss b/Installer/InnoSetup/WinMergeX64NonAdmin.iss index 29be6ed89..5a21bf086 100644 --- a/Installer/InnoSetup/WinMergeX64NonAdmin.iss +++ b/Installer/InnoSetup/WinMergeX64NonAdmin.iss @@ -420,65 +420,100 @@ Source: ..\..\Build\X64\Merge7z\Lang\*.txt; DestDir: {app}\Merge7z\Lang; Flags: ; Language files Source: ..\..\Translations\WinMerge\Arabic.po; DestDir: {app}\Languages; Components: Languages\Arabic; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Arabic.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Arabic; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Basque.po; DestDir: {app}\Languages; Components: Languages\Basque; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Basque.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Basque; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Basque.txt; DestDir: {app}\Docs; Components: Languages\Basque Source: ..\..\Translations\WinMerge\Brazilian.po; DestDir: {app}\Languages; Components: Languages\PortugueseBrazilian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Brazilian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\PortugueseBrazilian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Brazilian.txt; DestDir: {app}\Docs; Components: Languages\PortugueseBrazilian Source: ..\..\Translations\WinMerge\Bulgarian.po; DestDir: {app}\Languages; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Bulgarian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Bulgarian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Bulgarian.txt; DestDir: {app}\Docs; Components: Languages\Bulgarian Source: ..\..\Translations\WinMerge\Catalan.po; DestDir: {app}\Languages; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Catalan.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Catalan; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Catalan.txt; DestDir: {app}\Docs; Components: Languages\Catalan Source: ..\..\Translations\WinMerge\ChineseSimplified.po; DestDir: {app}\Languages; Components: Languages\Chinese_Simplified; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\ChineseSimplified.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Chinese_Simplified; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-ChineseSimplified.txt; DestDir: {app}\Docs; Components: Languages\Chinese_Simplified Source: ..\..\Translations\WinMerge\ChineseTraditional.po; DestDir: {app}\Languages; Components: Languages\Chinese_Traditional; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\ChineseTraditional.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Chinese_Traditional; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-ChineseTraditional.txt; DestDir: {app}\Docs; Components: Languages\Chinese_Traditional Source: ..\..\Translations\WinMerge\Croatian.po; DestDir: {app}\Languages; Components: Languages\Croatian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Croatian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Croatian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Croatian.txt; DestDir: {app}\Docs; Components: Languages\Croatian Source: ..\..\Translations\WinMerge\Czech.po; DestDir: {app}\Languages; Components: Languages\Czech; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Czech.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Czech; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Danish.po; DestDir: {app}\Languages; Components: Languages\Danish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Danish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Danish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Dutch.po; DestDir: {app}\Languages; Components: Languages\Dutch; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Dutch.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Dutch; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Dutch.txt; DestDir: {app}\Docs; Components: Languages\Dutch Source: ..\..\Translations\WinMerge\Finnish.po; DestDir: {app}\Languages; Components: Languages\Finnish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Finnish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Finnish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Finnish.txt; DestDir: {app}\Docs; Components: Languages\Finnish Source: ..\..\Translations\WinMerge\French.po; DestDir: {app}\Languages; Components: Languages\French; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\French.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\French; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-French.txt; DestDir: {app}\Docs; Components: Languages\French Source: ..\..\Translations\WinMerge\Galician.po; DestDir: {app}\Languages; Components: Languages\Galician; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Galician.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Galician; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Galician.txt; DestDir: {app}\Docs; Components: Languages\Galician Source: ..\..\Translations\WinMerge\German.po; DestDir: {app}\Languages; Components: Languages\German; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\German.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\German; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-German.txt; DestDir: {app}\Docs; Components: Languages\German Source: ..\..\Translations\WinMerge\Greek.po; DestDir: {app}\Languages; Components: Languages\Greek; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Greek.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Greek; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Greek.txt; DestDir: {app}\Docs; Components: Languages\Greek Source: ..\..\Translations\WinMerge\Hungarian.po; DestDir: {app}\Languages; Components: Languages\Hungarian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Hungarian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Hungarian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Italian.po; DestDir: {app}\Languages; Components: Languages\Italian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Italian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Italian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Italian.txt; DestDir: {app}\Docs; Components: Languages\Italian Source: ..\..\Translations\WinMerge\Japanese.po; DestDir: {app}\Languages; Components: Languages\Japanese; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Japanese.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Japanese; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Japanese.txt; DestDir: {app}\Docs; Components: Languages\Japanese Source: ..\..\Build\Manual\htmlhelp\WinMergeJapanese.chm; DestDir: {app}\Docs; Components: Languages\Japanese Source: ..\..\Translations\WinMerge\Korean.po; DestDir: {app}\Languages; Components: Languages\Korean; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Korean.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Korean; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Lithuanian.po; DestDir: {app}\Languages; Components: Languages\Lithuanian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Lithuanian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Lithuanian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Lithuanian.txt; DestDir: {app}\Docs; Components: Languages\Lithuanian Source: ..\..\Translations\WinMerge\Norwegian.po; DestDir: {app}\Languages; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Norwegian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Norwegian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Persian.po; DestDir: {app}\Languages; Components: Languages\Persian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Persian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Persian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Polish.po; DestDir: {app}\Languages; Components: Languages\Polish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Polish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Polish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Portuguese.po; DestDir: {app}\Languages; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Portuguese.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Portuguese; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Portuguese.txt; DestDir: {app}\Docs; Components: Languages\Portuguese Source: ..\..\Translations\WinMerge\Romanian.po; DestDir: {app}\Languages; Components: Languages\Romanian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Romanian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Romanian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Romanian.txt; DestDir: {app}\Docs; Components: Languages\Romanian Source: ..\..\Translations\WinMerge\Russian.po; DestDir: {app}\Languages; Components: Languages\Russian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Russian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Russian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Serbian.po; DestDir: {app}\Languages; Components: Languages\Serbian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Serbian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Serbian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Serbian.txt; DestDir: {app}\Docs; Components: Languages\Serbian Source: ..\..\Translations\WinMerge\Sinhala.po; DestDir: {app}\Languages; Components: Languages\Sinhala; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Sinhala.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Sinhala; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\WinMerge\Slovak.po; DestDir: {app}\Languages; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Slovak.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Slovak; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Slovak.txt; DestDir: {app}\Docs; Components: Languages\Slovak Source: ..\..\Translations\WinMerge\Slovenian.po; DestDir: {app}\Languages; Components: Languages\Slovenian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Slovenian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Slovenian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Slovenian.txt; DestDir: {app}\Docs; Components: Languages\Slovenian Source: ..\..\Translations\WinMerge\Spanish.po; DestDir: {app}\Languages; Components: Languages\Spanish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Spanish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Spanish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Spanish.txt; DestDir: {app}\Docs; Components: Languages\Spanish Source: ..\..\Translations\WinMerge\Swedish.po; DestDir: {app}\Languages; Components: Languages\Swedish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Swedish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Swedish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Swedish.txt; DestDir: {app}\Docs; Components: Languages\Swedish Source: ..\..\Translations\WinMerge\Turkish.po; DestDir: {app}\Languages; Components: Languages\Turkish; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Turkish.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Turkish; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Turkish.txt; DestDir: {app}\Docs; Components: Languages\Turkish Source: ..\..\Translations\WinMerge\Ukrainian.po; DestDir: {app}\Languages; Components: Languages\Ukrainian; Flags: ignoreversion comparetimestamp +Source: ..\..\Translations\ShellExtension\Ukrainian.po; DestDir: {app}\Languages\ShellExtension; Components: Languages\Ukrainian; Flags: ignoreversion comparetimestamp Source: ..\..\Translations\Docs\Readme\ReadMe-Ukrainian.txt; DestDir: {app}\Docs; Components: Languages\Ukrainian ;Filters diff --git a/ShellExtension/LanguageSelect.cpp b/ShellExtension/LanguageSelect.cpp new file mode 100644 index 000000000..d0819703d --- /dev/null +++ b/ShellExtension/LanguageSelect.cpp @@ -0,0 +1,697 @@ +/** + * @file LanguageSelect.cpp + * + * @brief Implements the Language Selection dialog class (which contains the language data) + */ + +#include "StdAfx.h" +#include "LanguageSelect.h" + +// Escaped character constants in range 0x80-0xFF are interpreted in current codepage +// Using C locale gets us direct mapping to Unicode codepoints +#pragma setlocale("C") + +#ifdef _DEBUG +#define new DEBUG_NEW +#endif + +static wchar_t *EatPrefix(wchar_t *text, const wchar_t *prefix); +static void unslash(std::wstring &s); +static HANDLE NTAPI FindFile(HANDLE h, LPCTSTR path, WIN32_FIND_DATA *fd); + +/** + * @brief A class holding information about language file. + */ +class LangFileInfo +{ +public: + LANGID id; /**< Language ID. */ + + static LANGID LangId(const char *lang, const char *sublang); + + /** + * A constructor taking a language id as parameter. + * @param [in] id Language ID to use. + */ + explicit LangFileInfo(LANGID id): id(id) { }; + + explicit LangFileInfo(LPCTSTR path); + std::wstring GetString(LCTYPE type) const; + +private: + struct rg + { + LANGID id; + const char *lang; + }; + static const struct rg rg[]; +}; + +/** + * @brief An array holding language IDs and names. + */ +const struct LangFileInfo::rg LangFileInfo::rg[] = +{ + { + LANG_AFRIKAANS, "AFRIKAANS\0" + }, + { + LANG_ALBANIAN, "ALBANIAN\0" + }, + { + LANG_ARABIC, "ARABIC\0" "SAUDI_ARABIA\0" + "IRAQ\0" + "EGYPT\0" + "LIBYA\0" + "ALGERIA\0" + "MOROCCO\0" + "TUNISIA\0" + "OMAN\0" + "YEMEN\0" + "SYRIA\0" + "JORDAN\0" + "LEBANON\0" + "KUWAIT\0" + "UAE\0" + "BAHRAIN\0" + "QATAR\0" + }, + { + LANG_ARMENIAN, "ARMENIAN\0" + }, + { + LANG_ASSAMESE, "ASSAMESE\0" + }, + { + LANG_AZERI, "AZERI\0" "LATIN\0" + "CYRILLIC\0" + }, + { + LANG_BASQUE, "BASQUE\0" + }, + { + LANG_BELARUSIAN, "BELARUSIAN\0" + }, + { + LANG_BENGALI, "BENGALI\0" + }, + { + LANG_BULGARIAN, "BULGARIAN\0" + }, + { + LANG_CATALAN, "CATALAN\0" + }, + { + LANG_CHINESE, "CHINESE\0" "TRADITIONAL\0" + "SIMPLIFIED\0" + "HONGKONG\0" + "SINGAPORE\0" + "MACAU\0" + }, + { + LANG_CROATIAN, "CROATIAN\0" + }, + { + LANG_CZECH, "CZECH\0" + }, + { + LANG_DANISH, "DANISH\0" + }, + { + LANG_DIVEHI, "DIVEHI\0" + }, + { + MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH), "DUTCH\0" + "BELGIAN\0" + }, + { + LANG_ENGLISH, "ENGLISH\0" "US\0" + "UK\0" + "AUS\0" + "CAN\0" + "NZ\0" + "EIRE\0" + "SOUTH_AFRICA\0" + "JAMAICA\0" + "CARIBBEAN\0" + "BELIZE\0" + "TRINIDAD\0" + "ZIMBABWE\0" + "PHILIPPINES\0" + }, + { + LANG_ESTONIAN, "ESTONIAN\0" + }, + { + LANG_FAEROESE, "FAEROESE\0" + }, + { + LANG_FARSI, "FARSI\0" + }, + { + LANG_FINNISH, "FINNISH\0" + }, + { + MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH), "FRENCH\0" + "BELGIAN\0" + "CANADIAN\0" + "SWISS\0" + "LUXEMBOURG\0" + "MONACO\0" + }, + { + LANG_GALICIAN, "GALICIAN\0" + }, + { + LANG_GEORGIAN, "GEORGIAN\0" + }, + { + MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), "GERMAN\0" + "SWISS\0" + "AUSTRIAN\0" + "LUXEMBOURG\0" + "LIECHTENSTEIN" + }, + { + LANG_GREEK, "GREEK\0" + }, + { + LANG_GUJARATI, "GUJARATI\0" + }, + { + LANG_HEBREW, "HEBREW\0" + }, + { + LANG_HINDI, "HINDI\0" + }, + { + LANG_HUNGARIAN, "HUNGARIAN\0" + }, + { + LANG_ICELANDIC, "ICELANDIC\0" + }, + { + LANG_INDONESIAN, "INDONESIAN\0" + }, + { + MAKELANGID(LANG_ITALIAN, SUBLANG_ITALIAN), "ITALIAN\0" + "SWISS\0" + }, + { + LANG_JAPANESE, "JAPANESE\0" + }, + { + LANG_KANNADA, "KANNADA\0" + }, + { + MAKELANGID(LANG_KASHMIRI, SUBLANG_DEFAULT), "KASHMIRI\0" + "SASIA\0" + }, + { + LANG_KAZAK, "KAZAK\0" + }, + { + LANG_KONKANI, "KONKANI\0" + }, + { + MAKELANGID(LANG_KOREAN, SUBLANG_KOREAN), "KOREAN\0" + }, + { + LANG_KYRGYZ, "KYRGYZ\0" + }, + { + LANG_LATVIAN, "LATVIAN\0" + }, + { + MAKELANGID(LANG_LITHUANIAN, SUBLANG_LITHUANIAN), "LITHUANIAN\0" + }, + { + LANG_MACEDONIAN, "MACEDONIAN\0" + }, + { + LANG_MALAY, "MALAY\0" "MALAYSIA\0" + "BRUNEI_DARUSSALAM\0" + }, + { + LANG_MALAYALAM, "MALAYALAM\0" + }, + { + LANG_MANIPURI, "MANIPURI\0" + }, + { + LANG_MARATHI, "MARATHI\0" + }, + { + LANG_MONGOLIAN, "MONGOLIAN\0" + }, + { + MAKELANGID(LANG_NEPALI, SUBLANG_DEFAULT), "NEPALI\0" + "INDIA\0" + }, + { + LANG_NORWEGIAN, "NORWEGIAN\0" "BOKMAL\0" + "NYNORSK\0" + }, + { + LANG_ORIYA, "ORIYA\0" + }, + { + LANG_POLISH, "POLISH\0" + }, + { + MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE), "PORTUGUESE\0" + "BRAZILIAN\0" + }, + { + LANG_PUNJABI, "PUNJABI\0" + }, + { + LANG_ROMANIAN, "ROMANIAN\0" + }, + { + LANG_RUSSIAN, "RUSSIAN\0" + }, + { + LANG_SANSKRIT, "SANSKRIT\0" + }, + { + MAKELANGID(LANG_SERBIAN, SUBLANG_DEFAULT), "SERBIAN\0" + "LATIN\0" + "CYRILLIC\0" + }, + { + LANG_SINDHI, "SINDHI\0" + }, + { + LANG_SINHALESE, "SINHALESE\0" + }, + { + LANG_SLOVAK, "SLOVAK\0" + }, + { + LANG_SLOVENIAN, "SLOVENIAN\0" + }, + { + MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), "SPANISH\0" + "MEXICAN\0" + "MODERN\0" + "GUATEMALA\0" + "COSTA_RICA\0" + "PANAMA\0" + "DOMINICAN_REPUBLIC\0" + "VENEZUELA\0" + "COLOMBIA\0" + "PERU\0" + "ARGENTINA\0" + "ECUADOR\0" + "CHILE\0" + "URUGUAY\0" + "PARAGUAY\0" + "BOLIVIA\0" + "EL_SALVADOR\0" + "HONDURAS\0" + "NICARAGUA\0" + "PUERTO_RICO\0" + }, + { + LANG_SWAHILI, "SWAHILI\0" + }, + { + MAKELANGID(LANG_SWEDISH, SUBLANG_SWEDISH), "SWEDISH\0" + "FINLAND\0" + }, + { + LANG_SYRIAC, "SYRIAC\0" + }, + { + LANG_TAMIL, "TAMIL\0" + }, + { + LANG_TATAR, "TATAR\0" + }, + { + LANG_TELUGU, "TELUGU\0" + }, + { + LANG_THAI, "THAI\0" + }, + { + LANG_TURKISH, "TURKISH\0" + }, + { + LANG_UKRAINIAN, "UKRAINIAN\0" + }, + { + LANG_URDU, "URDU\0" "PAKISTAN\0" + "INDIA\0" + }, + { + LANG_UZBEK, "UZBEK\0" "LATIN\0" + "CYRILLIC\0" + }, + { + LANG_VIETNAMESE, "VIETNAMESE\0" + }, +}; + +/** + * @brief Get a language ID for given language + sublanguage. + * @param [in] lang Language name. + * @param [in] sublang Sub language name. + * @return Language ID. + */ +LANGID LangFileInfo::LangId(const char *lang, const char *sublang) +{ + // binary search the array for passed in lang + size_t lower = 0; + size_t upper = std::size(rg); + while (lower < upper) + { + size_t match = (upper + lower) >> 1; + int cmp = strcmp(rg[match].lang, lang); + if (cmp >= 0) + upper = match; + if (cmp <= 0) + lower = match + 1; + } + if (lower <= upper) + return 0; + LANGID baseid = rg[upper].id; + // figure out sublang + if ((baseid & ~0x3ff) && *sublang == '\0') + return baseid; + LANGID id = PRIMARYLANGID(baseid); + if (0 == strcmp(sublang, "DEFAULT")) + return MAKELANGID(id, SUBLANG_DEFAULT); + const char *sub = rg[upper].lang; + do + { + do + { + id += MAKELANGID(0, 1); + } while (id == baseid); + sub += strlen(sub) + 1; + if (0 == strcmp(sublang, sub)) + return id; + } while (*sub); + return 0; +} + +/** + * @brief A constructor taking a path to language file as parameter. + * @param [in] path Full path to the language file. + */ +LangFileInfo::LangFileInfo(LPCTSTR path) +: id(0) +{ + FILE *f; + if (_tfopen_s(&f, path, _T("r,ccs=utf-8")) == 0 && f) + { + wchar_t buf[1024 + 1]; + while (fgetws(buf, static_cast(std::size(buf)) - 1, f) != nullptr) + { + int i = 0; + wcscat_s(buf, L"1"); + swscanf_s(buf, L"msgid \" LANG_ENGLISH , SUBLANG_ENGLISH_US \" %d", &i); + if (i) + { + if (fgetws(buf, static_cast(std::size(buf)), f) != nullptr) + { + wchar_t *lang = wcsstr(buf, L"LANG_"); + wchar_t *sublang = wcsstr(buf, L"SUBLANG_"); + wchar_t *langNext = nullptr; + wchar_t *sublangNext = nullptr; + if (lang && sublang) + { + wcstok_s(lang, L",\" \t\r\n", &langNext); + wcstok_s(sublang, L",\" \t\r\n", &sublangNext); + lang += std::size("LANG"); + sublang += std::size("SUBLANG"); + if (0 != wcscmp(sublang, L"DEFAULT")) + { + sublang = EatPrefix(sublang, lang); + if (sublang && *sublang) + sublang = EatPrefix(sublang, L"_"); + } + if (sublang) + { + USES_CONVERSION; + id = LangId(W2A(lang), W2A(sublang)); + } + } + } + break; + } + } + fclose(f); + } +} + +std::wstring LangFileInfo::GetString(LCTYPE type) const +{ + std::wstring s; + if (int cch = GetLocaleInfo(id, type, 0, 0)) + { + s.resize(cch - 1); + GetLocaleInfo(id, type, &*s.begin(), cch); + } + return s; +} + +static HANDLE NTAPI FindFile(HANDLE h, LPCTSTR path, WIN32_FIND_DATA *fd) +{ + if (h == INVALID_HANDLE_VALUE) + { + h = FindFirstFile(path, fd); + } + else if (fd->dwFileAttributes == INVALID_FILE_ATTRIBUTES || !FindNextFile(h, fd)) + { + FindClose(h); + h = INVALID_HANDLE_VALUE; + } + return h; +} + +///////////////////////////////////////////////////////////////////////////// +// CLanguageSelect dialog + +CLanguageSelect::CLanguageSelect() + : m_langId(0) +{ +} + +/** + * @brief Remove prefix from the string. + * @param [in] text String from which to jump over prefix. + * @param [in] prefix Prefix string to jump over. + * @return String without the prefix. + * @note Function returns pointer to original string, + * it does not allocate a new string. + */ +static wchar_t *EatPrefix(wchar_t *text, const wchar_t *prefix) +{ + if (size_t len = wcslen(prefix)) + if (_memicmp(text, prefix, len * sizeof(wchar_t)) == 0) + return text + len; + return 0; +} + +/** + * @brief Convert C style \\nnn, \\r, \\n, \\t etc into their indicated characters. + * @param [in,out] s String to convert. + */ +static void unslash(std::wstring &s) +{ + wchar_t *p = &*s.begin(); + wchar_t *q = p; + wchar_t c = {}; + do + { + wchar_t *r = q + 1; + switch (c = *q) + { + case '\\': + switch (c = *r++) + { + case 'a': + c = '\a'; + break; + case 'b': + c = '\b'; + break; + case 'f': + c = '\f'; + break; + case 'n': + c = '\n'; + break; + case 'r': + c = '\r'; + break; + case 't': + c = '\t'; + break; + case 'v': + c = '\v'; + break; + case 'x': + *p = (wchar_t)wcstol(r, &q, 16); + break; + default: + *p = (wchar_t)wcstol(r - 1, &q, 8); + break; + } + if (q >= r) + break; + [[fallthrough]]; + default: + *p = c; + q = r; + } + ++p; + } while (c != '\0'); + s.resize(p - 1 - &*s.begin()); +} + +/** + * @brief Load language.file + * @param [in] wLangId + * @return `true` on success, `false` otherwise. + */ +bool CLanguageSelect::LoadLanguageFile(LANGID wLangId, const std::wstring& sLanguagesFolder) +{ + std::wstring strPath = GetFileName(wLangId, sLanguagesFolder); + if (strPath.empty()) + return false; + + wchar_t buf[1024]; + std::wstring *ps = nullptr; + std::wstring msgctxt; + std::wstring msgid; + FILE *f; + if (_tfopen_s(&f, strPath.c_str(), _T("r,ccs=UTF-8")) != 0) + return false; + ps = nullptr; + std::wstring format; + std::wstring msgstr; + std::wstring directive; + auto addToMap = [&]() { + ps = nullptr; + if (!msgctxt.empty()) + unslash(msgctxt); + if (!msgid.empty()) + unslash(msgid); + if (msgstr.empty()) + msgstr = msgid; + unslash(msgstr); + if (!msgid.empty()) + { + if (msgctxt.empty()) + m_map_msgid_to_msgstr.insert_or_assign(msgid, msgstr); + else + m_map_msgid_to_msgstr.insert_or_assign(L"\x01\"" + msgctxt + L"\"" + msgid, msgstr); + } + msgctxt.erase(); + msgid.erase(); + msgstr.erase(); + }; + while (fgetws(buf, static_cast(std::size(buf)), f) != nullptr) + { + if (wchar_t *p1 = EatPrefix(buf, L"#,")) + { + format = p1; + format.erase(0, format.find_first_not_of(L" \t\r\n")); + format.erase(format.find_last_not_of(L" \t\r\n") + 1); + } + else if (wchar_t *p2 = EatPrefix(buf, L"#.")) + { + directive = p2; + directive.erase(0, directive.find_first_not_of(L" \t\r\n")); + directive.erase(directive.find_last_not_of(L" \t\r\n") + 1); + } + else if (EatPrefix(buf, L"msgctxt ")) + { + ps = &msgctxt; + } + else if (EatPrefix(buf, L"msgid ")) + { + ps = &msgid; + } + else if (EatPrefix(buf, L"msgstr ")) + { + ps = &msgstr; + } + if (ps != nullptr) + { + wchar_t *p = wcschr(buf, '"'); + wchar_t *q = wcsrchr(buf, '"'); + if (std::wstring::size_type n = q - p) + { + ps->append(p + 1, n - 1); + } + else + { + addToMap(); + } + } + } + if (ps != nullptr) + addToMap(); + fclose(f); + + m_langId = wLangId; + + return true; +} + +/** + * @brief Get a language file for the specified language ID. + * This function gets a language file name for the given language ID. Language + * files are currently named as [languagename].po. + * @param [in] wLangId Language ID. + * @return Language filename, or empty string if no file for language found. + */ +std::wstring CLanguageSelect::GetFileName(LANGID wLangId, const std::wstring& sLanguagesFolder) +{ + std::wstring filename; + std::wstring path = sLanguagesFolder; + if (!path.empty() && path.back() != '\\') + path += '\\'; + std::wstring pattern = path + L"*.po"; + WIN32_FIND_DATA ff; + HANDLE h = INVALID_HANDLE_VALUE; + while ((h = FindFile(h, pattern.c_str(), &ff)) != INVALID_HANDLE_VALUE) + { + filename = path + ff.cFileName; + LangFileInfo lfi(filename.c_str()); + if (lfi.id == wLangId) + ff.dwFileAttributes = INVALID_FILE_ATTRIBUTES; // terminate loop + else + filename.erase(); + } + return filename; +} + +///////////////////////////////////////////////////////////////////////////// +// CLanguageSelect commands + +bool CLanguageSelect::TranslateString(const std::wstring& msgid, std::wstring &s) const +{ + if (m_map_msgid_to_msgstr.find(msgid) != m_map_msgid_to_msgstr.end()) + { + s = m_map_msgid_to_msgstr.at(msgid); + return true; + } + if (msgid.length() > 2 && msgid[0] == '\x01' && msgid[1] == '"') + { + size_t pos = msgid.find('"', 2); + if (pos != std::wstring::npos) + { + s = msgid.substr(pos + 1); + return true; + } + } + s = msgid; + return false; +} + diff --git a/ShellExtension/LanguageSelect.h b/ShellExtension/LanguageSelect.h new file mode 100644 index 000000000..1b271caae --- /dev/null +++ b/ShellExtension/LanguageSelect.h @@ -0,0 +1,36 @@ +/** + * @file LanguageSelect.h + * + * @brief Declaration file for CLanguageSelect dialog. + */ +#pragma once + +#include +#include + +///////////////////////////////////////////////////////////////////////////// +// CLanguageSelect class + +/** + * @brief Class for selecting GUI language. + * + * Language select dialog shows list of installed GUI languages and + * allows user to select one for use. + */ +class CLanguageSelect +{ +// Construction +public: + CLanguageSelect(); // standard constructor + bool LoadLanguageFile(LANGID wLangId, const std::wstring& sLanguagesFolder); + bool TranslateString(const std::wstring&, std::wstring&) const; + LANGID GetLangId() const { return m_langId; } + +// Implementation data +private: + std::map m_map_msgid_to_msgstr; +// Implementation methods +private: + static std::wstring GetFileName(LANGID wLangId, const std::wstring& sLanguagesFolder); + LANGID m_langId; +}; diff --git a/ShellExtension/Languages/ShellExtensionBasque.rc b/ShellExtension/Languages/ShellExtensionBasque.rc deleted file mode 100644 index c4daa55b1..000000000 --- a/ShellExtension/Languages/ShellExtensionBasque.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_EUQ) -#ifdef _WIN32 -LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Ireki WinMergerekin" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Gorde helburu hau. Hautatu beste helburu bat helburu honekin alderatzeko." - IDS_HELP_COMPARESAVED "Alderatu gordetako helburuarekin (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionBrazilian.rc b/ShellExtension/Languages/ShellExtensionBrazilian.rc deleted file mode 100644 index 21c6dfb5f..000000000 --- a/ShellExtension/Languages/ShellExtensionBrazilian.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PTB) -#ifdef _WIN32 -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "Extensão do Shell" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Abrir com o WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Salvar este caminho. Selecione outro caminho para comparar com este caminho." - IDS_HELP_COMPARESAVED "Comparar com o caminho salvo (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionBulgarian.rc b/ShellExtension/Languages/ShellExtensionBulgarian.rc deleted file mode 100644 index c45e3ecc5..000000000 --- a/ShellExtension/Languages/ShellExtensionBulgarian.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_BGR) -#ifdef _WIN32 -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Отвори с WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Запиши този път. Изберете друг път за сравнение с този." - IDS_HELP_COMPARESAVED "Сравняване със записания път (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionCatalan.rc b/ShellExtension/Languages/ShellExtensionCatalan.rc deleted file mode 100644 index 13542d10a..000000000 --- a/ShellExtension/Languages/ShellExtensionCatalan.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CAT) -#ifdef _WIN32 -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Obre amb el WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Selecciona aquest camí. Tria un altre camí per a comparar-lo amb aquest camí." - IDS_HELP_COMPARESAVED "Compara amb el camí anteriorment seleccionat (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionChineseSimplified.rc b/ShellExtension/Languages/ShellExtensionChineseSimplified.rc deleted file mode 100644 index 6fc384456..000000000 --- a/ShellExtension/Languages/ShellExtensionChineseSimplified.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) -#ifdef _WIN32 -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "用 WinMerge 打开" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "保存此路径。然后选择另一个路径来与之比较。" - IDS_HELP_COMPARESAVED "与保存的路径（%1）比较" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionChineseTraditional.rc b/ShellExtension/Languages/ShellExtensionChineseTraditional.rc deleted file mode 100644 index c5908db13..000000000 --- a/ShellExtension/Languages/ShellExtensionChineseTraditional.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHT) -#ifdef _WIN32 -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "系統介面延伸" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "以 WinMerge 開啟" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "儲存此路徑。選另一路徑與此路徑比較。" - IDS_HELP_COMPARESAVED "與儲存的路徑比較 (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionCroatian.rc b/ShellExtension/Languages/ShellExtensionCroatian.rc deleted file mode 100644 index b9684d6b8..000000000 --- a/ShellExtension/Languages/ShellExtensionCroatian.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HRV) -#ifdef _WIN32 -LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Otvori s WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Pohrani ovu stazu. Za usporedbu, odaberite drugu stazu." - IDS_HELP_COMPARESAVED "Staza pohrane usporedbe (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionCzech.rc b/ShellExtension/Languages/ShellExtensionCzech.rc deleted file mode 100644 index 71c2ddab6..000000000 --- a/ShellExtension/Languages/ShellExtensionCzech.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CSY) -#ifdef _WIN32 -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Otevřít ve WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Uloží tuto cestu do paměti. Potom vyberte jinou cestu k porovnání s touto cestou." - IDS_HELP_COMPARESAVED "Porovná s cestou uloženou do paměti (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionDanish.rc b/ShellExtension/Languages/ShellExtensionDanish.rc deleted file mode 100644 index e25a60684..000000000 --- a/ShellExtension/Languages/ShellExtensionDanish.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DAN) -#ifdef _WIN32 -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Åben med WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Gem denne sti. Vælg en anden sti at sammenligne med denne sti." - IDS_HELP_COMPARESAVED "Sammenlign med den gemte sti (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionDutch.rc b/ShellExtension/Languages/ShellExtensionDutch.rc deleted file mode 100644 index 4d2956204..000000000 --- a/ShellExtension/Languages/ShellExtensionDutch.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NLB) -#ifdef _WIN32 -LANGUAGE LANG_DUTCH, SUBLANG_DUTCH -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "Contextmenu" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Openen met WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Dit pad opslaan. Selecteer een ander pad om te vergelijken met dit pad." - IDS_HELP_COMPARESAVED "Vergelijken met opgeslagen pad (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionFinnish.rc b/ShellExtension/Languages/ShellExtensionFinnish.rc deleted file mode 100644 index 343afa2a9..000000000 --- a/ShellExtension/Languages/ShellExtensionFinnish.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FIN) -#ifdef _WIN32 -LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "Liittymälaajennus" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Avaa WinMergellä" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Tallenna tämä polku. Valitse toinen polku tämän polun vertailuun." - IDS_HELP_COMPARESAVED "Vertaa tallennettuun polkuun (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionFrench.rc b/ShellExtension/Languages/ShellExtensionFrench.rc deleted file mode 100644 index b216fef59..000000000 --- a/ShellExtension/Languages/ShellExtensionFrench.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) -#ifdef _WIN32 -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Ouvrir avec WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Conserver ce chemin. Puis en choisir un second pour effectuer la comparaison." - IDS_HELP_COMPARESAVED "Comparer au chemin conservé (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionGalician.rc b/ShellExtension/Languages/ShellExtensionGalician.rc deleted file mode 100644 index 3f91ee824..000000000 --- a/ShellExtension/Languages/ShellExtensionGalician.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) -#ifdef _WIN32 -LANGUAGE LANG_GALICIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Abrir con WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Gardar esta ruta. Seleccionar outra ruta para comparar con ésta." - IDS_HELP_COMPARESAVED "Comparar coa ruta gardada (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionGerman.rc b/ShellExtension/Languages/ShellExtensionGerman.rc deleted file mode 100644 index 823269333..000000000 --- a/ShellExtension/Languages/ShellExtensionGerman.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -#ifdef _WIN32 -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Öffnen mit WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Diesen Pfad speichern. Wählen Sie einen anderen Pfad, um ihn mit diesem Pfad zu vergleichen." - IDS_HELP_COMPARESAVED "Vergleichen mit dem gespeicherten Pfad (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionGreek.rc b/ShellExtension/Languages/ShellExtensionGreek.rc deleted file mode 100644 index 9afe6c7c6..000000000 --- a/ShellExtension/Languages/ShellExtensionGreek.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ELL) -#ifdef _WIN32 -LANGUAGE LANG_GREEK, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "Επέκταση Περιβάλλοντος" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Άνοιγμα με το WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Αποθήκευση αυτής της διαδρομής. Επιλέξατε κάποια άλλη διαδρομή προς σύγκριση με αυτή τη διαδρομή." - IDS_HELP_COMPARESAVED "Σύγκριση με αποθηκευμένη διαδρομή (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionHungarian.rc b/ShellExtension/Languages/ShellExtensionHungarian.rc deleted file mode 100644 index b725ec344..000000000 --- a/ShellExtension/Languages/ShellExtensionHungarian.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HUN) -#ifdef _WIN32 -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Megnyitás WinMerge-dzsel" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Mentsd el ezt az elérési utat. Válassz egy másik elérési utat az ezzel való összehasonlításhoz." - IDS_HELP_COMPARESAVED "Összehasonlítás a mentett elérési úttal (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionItalian.rc b/ShellExtension/Languages/ShellExtensionItalian.rc deleted file mode 100644 index c4c365041..000000000 --- a/ShellExtension/Languages/ShellExtensionItalian.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA) -#ifdef _WIN32 -LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "Estensione shell" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Apri con WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Salva questo percorso.\nSeleziona un altro da confrontare con questo." - IDS_HELP_COMPARESAVED "Confronta con il percorso salvato (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionJapanese.rc b/ShellExtension/Languages/ShellExtensionJapanese.rc deleted file mode 100644 index 5f6b2f0ad..000000000 --- a/ShellExtension/Languages/ShellExtensionJapanese.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN) -#ifdef _WIN32 -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "WinMerge で開く" - IDS_CONTEXT_HELP_MANYITEMS "3 項目以上は選択しないで下さい" - IDS_COMPARE "比較(&C)" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "中央として選択(&M)" - IDS_HELP_SAVETHIS "このパスを保存します。このパスと比較するために別のパスを選択してください。" - IDS_HELP_COMPARESAVED "保存されたパス (%1) と比較します。" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionKorean.rc b/ShellExtension/Languages/ShellExtensionKorean.rc deleted file mode 100644 index 9dae79932..000000000 --- a/ShellExtension/Languages/ShellExtensionKorean.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_KOR) -#ifdef _WIN32 -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Open with WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path." - IDS_HELP_COMPARESAVED "Compare to saved path (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionLithuanian.rc b/ShellExtension/Languages/ShellExtensionLithuanian.rc deleted file mode 100644 index 05d4b00df..000000000 --- a/ShellExtension/Languages/ShellExtensionLithuanian.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_LIT) -#ifdef _WIN32 -LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Atverti su WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Išsaugoti šį kelią. Parinkti kitą kelią ir palyginti su šiuo keliu." - IDS_HELP_COMPARESAVED "Palyginti su išsaugotu keliu (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionNorwegian.rc b/ShellExtension/Languages/ShellExtensionNorwegian.rc deleted file mode 100644 index 33c5f0fc0..000000000 --- a/ShellExtension/Languages/ShellExtensionNorwegian.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NOR) -#ifdef _WIN32 -LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Open with WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path." - IDS_HELP_COMPARESAVED "Compare to saved path (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionPersian.rc b/ShellExtension/Languages/ShellExtensionPersian.rc deleted file mode 100644 index ad7b477fe..000000000 --- a/ShellExtension/Languages/ShellExtensionPersian.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FAR) -#ifdef _WIN32 -LANGUAGE LANG_FARSI, SUBLANG_NEUTRAL -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME " شل اکستنشن " - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP " باز کردن با وينمرج " - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS " اين مسير را ذخيره کن. مسير ديگري را براي مقايسه با اين مسير انتخاب کن " - IDS_HELP_COMPARESAVED " همسنجي با مسير ذخيره شده %1 " - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionPolish.rc b/ShellExtension/Languages/ShellExtensionPolish.rc deleted file mode 100644 index 3471c4983..000000000 --- a/ShellExtension/Languages/ShellExtensionPolish.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PLK) -#ifdef _WIN32 -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Otwórz w WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Zapisz ścieżkę. Wybierz kolejną ścieżkę do porównania z obecną." - IDS_HELP_COMPARESAVED "Porównaj z zapisaną ścieżką (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionPortuguese.rc b/ShellExtension/Languages/ShellExtensionPortuguese.rc deleted file mode 100644 index b8488a5d4..000000000 --- a/ShellExtension/Languages/ShellExtensionPortuguese.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PTG) -#ifdef _WIN32 -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Abrir com WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Guardar esta localização. Selecione outra localização para comparar com esta." - IDS_HELP_COMPARESAVED "Comparar com localização guardada (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionRomanian.rc b/ShellExtension/Languages/ShellExtensionRomanian.rc deleted file mode 100644 index a86f5eed3..000000000 --- a/ShellExtension/Languages/ShellExtensionRomanian.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ROM) -#ifdef _WIN32 -LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Deschide cu WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Salveaza calea aceasta. Selecteaza alta cale pentru a o compara cu aceasta." - IDS_HELP_COMPARESAVED "Compara cu calea salvata (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionRussian.rc b/ShellExtension/Languages/ShellExtensionRussian.rc deleted file mode 100644 index 2911cdbec..000000000 --- a/ShellExtension/Languages/ShellExtensionRussian.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) -#ifdef _WIN32 -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Открыть в WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Сохранить путь и выбрать второй." - IDS_HELP_COMPARESAVED "Сравнить с (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionSerbian.rc b/ShellExtension/Languages/ShellExtensionSerbian.rc deleted file mode 100644 index 768157246..000000000 --- a/ShellExtension/Languages/ShellExtensionSerbian.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SER) -#ifdef _WIN32 -LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Open with WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path." - IDS_HELP_COMPARESAVED "Compare to saved path (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionSinhala.rc b/ShellExtension/Languages/ShellExtensionSinhala.rc deleted file mode 100644 index e54c069c6..000000000 --- a/ShellExtension/Languages/ShellExtensionSinhala.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_LKA) -#ifdef _WIN32 -LANGUAGE LANG_SINHALESE, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Open with WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path." - IDS_HELP_COMPARESAVED "Compare to saved path (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionSlovak.rc b/ShellExtension/Languages/ShellExtensionSlovak.rc deleted file mode 100644 index 5f9c11928..000000000 --- a/ShellExtension/Languages/ShellExtensionSlovak.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SKY) -#ifdef _WIN32 -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Otvoriť pomocou WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Uložiť túto cestu. Vybrať inú cestu, ktorá sa s ňou porovná." - IDS_HELP_COMPARESAVED "Porovnať s uloženou cestou (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionSlovenian.rc b/ShellExtension/Languages/ShellExtensionSlovenian.rc deleted file mode 100644 index e014a8724..000000000 --- a/ShellExtension/Languages/ShellExtensionSlovenian.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SLV) -#ifdef _WIN32 -LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "Razširitev integracije v lupino" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Odpri z WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Shrani to pot. Izberite še drugo pot za primerjavo s to potjo." - IDS_HELP_COMPARESAVED "Primerjaj s shranjeno potjo (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionSpanish.rc b/ShellExtension/Languages/ShellExtensionSpanish.rc deleted file mode 100644 index e55d8b2c5..000000000 --- a/ShellExtension/Languages/ShellExtensionSpanish.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) -#ifdef _WIN32 -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Abrir con WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Guardar esta ruta. Seleccionar otra ruta para compararla con ésta." - IDS_HELP_COMPARESAVED "Comparar con la ruta guardada (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionSwedish.rc b/ShellExtension/Languages/ShellExtensionSwedish.rc deleted file mode 100644 index b211b5b53..000000000 --- a/ShellExtension/Languages/ShellExtensionSwedish.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE) -#ifdef _WIN32 -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "GränssnittsMeny" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Öppna med WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Spara denna sökväg. Välj en annan för att jämföra med denna." - IDS_HELP_COMPARESAVED "Jämför med sparad sökväg (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionTemplate.rc b/ShellExtension/Languages/ShellExtensionTemplate.rc deleted file mode 100644 index dd5a4a0f6..000000000 --- a/ShellExtension/Languages/ShellExtensionTemplate.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Open with WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Save this path. Select another path to compare with this path." - IDS_HELP_COMPARESAVED "Compare to saved path (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionTurkish.rc b/ShellExtension/Languages/ShellExtensionTurkish.rc deleted file mode 100644 index 5a2b1c4fe..000000000 --- a/ShellExtension/Languages/ShellExtensionTurkish.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_TRK) -#ifdef _WIN32 -LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "KabukEklentisi" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "WinMerge ile Aç" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Bu yolu kaydet. Ardından bu yol ile karşılaştırılacak başka bir yol seçebilirsiniz." - IDS_HELP_COMPARESAVED "Kaydedilen yol ile karşılaştır (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/Languages/ShellExtensionUkrainian.rc b/ShellExtension/Languages/ShellExtensionUkrainian.rc deleted file mode 100644 index e51bab106..000000000 --- a/ShellExtension/Languages/ShellExtensionUkrainian.rc +++ /dev/null @@ -1,55 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -// This is an *automatic* generated file for the ShellExtension translation. -// Please edit the PO file instead of this RC file for translation updates: -// ..\..\Translations\ShellExtension\.po -// -// $Id$ - -#include "../resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_UKR) -#ifdef _WIN32 -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -// -// *** TRANSLATED STRINGS *** -// Translate strings below -// -STRINGTABLE -BEGIN - IDS_PROJNAME "ShellExtension" - IDS_CONTEXT_MENU "&WinMerge" - IDS_CONTEXT_HELP "Відкрити у WinMerge" - IDS_CONTEXT_HELP_MANYITEMS "Please select no more than 3 items" - IDS_COMPARE "&Compare" - IDS_COMPARE_ELLIPSIS "Compare&..." - IDS_SELECT_LEFT "Select &Left" - IDS_SELECT_MIDDLE "Select &Middle" - IDS_HELP_SAVETHIS "Зберегти цей шлях. Обрати інший шлях для порівняння з цим шляхом." - IDS_HELP_COMPARESAVED "Порівняти зі збереженим шляхом (%1)" - IDS_RESELECT_LEFT "Re-select &Left" -END - -#endif // Resources -///////////////////////////////////////////////////////////////////////////// diff --git a/ShellExtension/ShellExtension.rc b/ShellExtension/ShellExtension.rc index fd5c41317..105789c1d 100644 --- a/ShellExtension/ShellExtension.rc +++ b/ShellExtension/ShellExtension.rc @@ -41,286 +41,6 @@ END 3 TEXTINCLUDE BEGIN "1 TYPELIB ""ShellExtension.tlb""\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ARA)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionArabic.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_EUQ)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionBasque.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PTB)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionBrazilian.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_BGR)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionBulgarian.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CAT)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionCatalan.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionChineseSimplified.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHT)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionChineseTraditional.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HRV)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionCroatian.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CSY)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_CZECH, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionCzech.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DAN)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_DANISH, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionDanish.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NLD)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_DUTCH, SUBLANG_DUTCH\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionDutch.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FIN)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionFinnish.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_FRENCH, SUBLANG_FRENCH\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionFrench.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_GALICIAN, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionGalician.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_GERMAN, SUBLANG_GERMAN\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionGerman.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ELL)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_GREEK, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionGreek.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HUN)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionHungarian.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionItalian.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionJapanese.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_KOR)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionKorean.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_LIT)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionLithuanian.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NOR)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionNorwegian.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FAR)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_FARSI, SUBLANG_NEUTRAL\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionPersian.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PLK)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_POLISH, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionPolish.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PTG)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionPortuguese.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ROM)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionRomanian.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionRussian.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SER)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionSerbian.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_LKA)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_SINHALESE, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionSinhala.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SKY)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionSlovak.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SLV)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionSlovenian.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionSpanish.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionSwedish.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_TRK)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionTurkish.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_UKR)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT\r\n" - "#pragma code_page(65001)\r\n" - "#include ""Languages\\ShellExtensionUkrainian.rc""\r\n" - "#endif //_WIN32\r\n" - "#endif\r\n" "\0" END @@ -413,278 +133,6 @@ END // 1 TYPELIB "ShellExtension.tlb" -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_EUQ) -#ifdef _WIN32 -LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionBasque.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PTB) -#ifdef _WIN32 -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -#pragma code_page(65001) -#include "Languages\ShellExtensionBrazilian.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_BGR) -#ifdef _WIN32 -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionBulgarian.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CAT) -#ifdef _WIN32 -LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionCatalan.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS) -#ifdef _WIN32 -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -#pragma code_page(65001) -#include "Languages\ShellExtensionChineseSimplified.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHT) -#ifdef _WIN32 -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -#pragma code_page(65001) -#include "Languages\ShellExtensionChineseTraditional.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HRV) -#ifdef _WIN32 -LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionCroatian.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CSY) -#ifdef _WIN32 -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionCzech.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DAN) -#ifdef _WIN32 -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionDanish.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NLD) -#ifdef _WIN32 -LANGUAGE LANG_DUTCH, SUBLANG_DUTCH -#pragma code_page(65001) -#include "Languages\ShellExtensionDutch.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FIN) -#ifdef _WIN32 -LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionFinnish.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) -#ifdef _WIN32 -LANGUAGE LANG_FRENCH, SUBLANG_FRENCH -#pragma code_page(65001) -#include "Languages\ShellExtensionFrench.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) -#ifdef _WIN32 -LANGUAGE LANG_GALICIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionGalician.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) -#ifdef _WIN32 -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(65001) -#include "Languages\ShellExtensionGerman.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ELL) -#ifdef _WIN32 -LANGUAGE LANG_GREEK, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionGreek.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HUN) -#ifdef _WIN32 -LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionHungarian.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA) -#ifdef _WIN32 -LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN -#pragma code_page(65001) -#include "Languages\ShellExtensionItalian.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN) -#ifdef _WIN32 -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionJapanese.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_KOR) -#ifdef _WIN32 -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionKorean.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_LIT) -#ifdef _WIN32 -LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionLithuanian.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NOR) -#ifdef _WIN32 -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL -#pragma code_page(65001) -#include "Languages\ShellExtensionNorwegian.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FAR) -#ifdef _WIN32 -LANGUAGE LANG_FARSI, SUBLANG_NEUTRAL -#pragma code_page(65001) -#include "Languages\ShellExtensionPersian.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PLK) -#ifdef _WIN32 -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionPolish.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PTG) -#ifdef _WIN32 -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -#pragma code_page(65001) -#include "Languages\ShellExtensionPortuguese.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ROM) -#ifdef _WIN32 -LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionRomanian.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) -#ifdef _WIN32 -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionRussian.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SER) -#ifdef _WIN32 -LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC -#pragma code_page(65001) -#include "Languages\ShellExtensionSerbian.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_LKA) -#ifdef _WIN32 -LANGUAGE LANG_SINHALESE, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionSinhala.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SKY) -#ifdef _WIN32 -LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionSlovak.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SLV) -#ifdef _WIN32 -LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionSlovenian.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN) -#ifdef _WIN32 -LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN -#pragma code_page(65001) -#include "Languages\ShellExtensionSpanish.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE) -#ifdef _WIN32 -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionSwedish.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_TRK) -#ifdef _WIN32 -LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionTurkish.rc" -#endif //_WIN32 -#endif - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_UKR) -#ifdef _WIN32 -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -#pragma code_page(65001) -#include "Languages\ShellExtensionUkrainian.rc" -#endif //_WIN32 -#endif - ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED diff --git a/ShellExtension/ShellExtension.vcxproj b/ShellExtension/ShellExtension.vcxproj index a550eca22..6f8be1b19 100644 --- a/ShellExtension/ShellExtension.vcxproj +++ b/ShellExtension/ShellExtension.vcxproj @@ -385,6 +385,7 @@ + @@ -432,6 +433,7 @@ + @@ -439,30 +441,6 @@ - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - _DEBUG _DEBUG @@ -477,246 +455,6 @@ $(OUTDIR);%(AdditionalIncludeDirectories) $(OUTDIR);%(AdditionalIncludeDirectories) - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - diff --git a/ShellExtension/ShellExtension.vcxproj.filters b/ShellExtension/ShellExtension.vcxproj.filters index 010948f71..c1d4adc92 100644 --- a/ShellExtension/ShellExtension.vcxproj.filters +++ b/ShellExtension/ShellExtension.vcxproj.filters @@ -30,6 +30,9 @@ Source Files + + Source Files + @@ -57,110 +60,14 @@ Header Files + + Header Files + Resource Files - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - diff --git a/ShellExtension/WinMergeShell.cpp b/ShellExtension/WinMergeShell.cpp index 5fb93dcad..f2e835626 100644 --- a/ShellExtension/WinMergeShell.cpp +++ b/ShellExtension/WinMergeShell.cpp @@ -111,8 +111,6 @@ enum MENU_THREESEL }; -static String GetResourceString(UINT resourceID); - // GreyMerlin (03 Sept 2017) - The following Version Info checking code is a // short extract from the Microsoft file. Unfortunatly, // that file is not available for WinXP-compatible Platform Toolsets (e.g. @@ -158,46 +156,24 @@ IsWindows8OrGreater() } #endif // VERSIONHELPERAPI -/** - * @brief Load a string from resource. - * @param [in] Resource string ID. - * @return String loaded from resource. - */ -static String GetResourceString(UINT resourceID) -{ - TCHAR resStr[1024] = {0}; - int res = LoadString(_AtlComModule.m_hInstTypeLib, resourceID, resStr, 1024); - ATLASSERT(res != 0); - String strResource = resStr; - return strResource; -} - -static BOOL InsertMenuString(HMENU hMenu, UINT uPosition, UINT uIDNewItem, UINT uStringId) -{ - String str = GetResourceString(uStringId); - MENUITEMINFO mii{sizeof mii}; - mii.fMask = MIIM_ID | MIIM_STRING | MIIM_DATA; - mii.wID = uIDNewItem; - mii.dwTypeData = const_cast(str.c_str()); - mii.dwItemData = uStringId; - return InsertMenuItem(hMenu, uPosition, TRUE, &mii); -} - HBITMAP ConvertHICONtoHBITMAP(HICON hIcon, int cx, int cy) { LPVOID lpBits; BITMAPINFO bmi = { { sizeof(BITMAPINFOHEADER), cx, cy, 1, IsWindows8OrGreater() ? 32u : 24u } }; - HBITMAP hbmp = CreateDIBSection(NULL, (BITMAPINFO*)&bmi, DIB_RGB_COLORS, &lpBits, NULL, 0); HDC hdcMem = CreateCompatibleDC(NULL); - HBITMAP hbmpPrev = (HBITMAP)SelectObject(hdcMem, hbmp); - RECT rc = { 0, 0, cx, cy }; - if (bmi.bmiHeader.biBitCount <= 24) + HBITMAP hbmp = CreateDIBSection(NULL, (BITMAPINFO*)&bmi, DIB_RGB_COLORS, &lpBits, NULL, 0); + if (hbmp) { - SetBkColor(hdcMem, GetSysColor(COLOR_MENU)); - ExtTextOut(hdcMem, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL); + HBITMAP hbmpPrev = (HBITMAP)SelectObject(hdcMem, hbmp); + RECT rc = { 0, 0, cx, cy }; + if (bmi.bmiHeader.biBitCount <= 24) + { + SetBkColor(hdcMem, GetSysColor(COLOR_MENU)); + ExtTextOut(hdcMem, 0, 0, ETO_OPAQUE, &rc, NULL, 0, NULL); + } + DrawIconEx(hdcMem, 0, 0, hIcon, cx, cy, 0, NULL, DI_NORMAL); + SelectObject(hdcMem, hbmpPrev); } - DrawIconEx(hdcMem, 0, 0, hIcon, cx, cy, 0, NULL, DI_NORMAL); - SelectObject(hdcMem, hbmpPrev); DeleteDC(hdcMem); return hbmp; } @@ -207,8 +183,11 @@ HBITMAP ConvertHICONtoHBITMAP(HICON hIcon, int cx, int cy) /// Default constructor, loads icon bitmap CWinMergeShell::CWinMergeShell() + : m_dwContextMenuEnabled(false) + , m_nSelectedItems(0) + , m_dwMenuState(0) + , m_langID(GetUserDefaultUILanguage()) { - m_dwMenuState = 0; int cx = GetSystemMetrics(SM_CXMENUCHECK); int cy = GetSystemMetrics(SM_CYMENUCHECK); @@ -224,6 +203,10 @@ CWinMergeShell::CWinMergeShell() DestroyIcon(hMergeIcon); DestroyIcon(hMergeDirIcon); + CRegKeyEx reg; + if (reg.Open(HKEY_CURRENT_USER, f_RegLocaleDir) == ERROR_SUCCESS) + m_langID = static_cast(reg.ReadDword(f_LanguageId, m_langID)); + } /// Default destructor, unloads bitmap @@ -408,9 +391,7 @@ HRESULT CWinMergeShell::GetCommandString(UINT_PTR idCmd, UINT uFlags, // supplied buffer. if (uFlags & GCS_HELPTEXT) { - String strHelp; - - strHelp = GetHelpText(idCmd); + String strHelp = GetHelpText(idCmd); if (uFlags & GCS_UNICODE) // We need to cast pszName to a Unicode string, and then use the @@ -564,6 +545,42 @@ HRESULT CWinMergeShell::InvokeCommand(LPCMINVOKECOMMANDINFO pCmdInfo) return S_OK; } +/** + * @brief Load a string from resource. + * @param [in] Resource string ID. + * @return String loaded from resource. + */ +String CWinMergeShell::GetResourceString(UINT resourceID) +{ + if (!s_pLang) + s_pLang = new CLanguageSelect(); + if (s_pLang->GetLangId() != m_langID) + { + TCHAR szFileName[1024] = {0}; + GetModuleFileName(_AtlComModule.m_hInstTypeLib, szFileName, sizeof(szFileName) / sizeof(TCHAR)); + PathRemoveFileSpec(szFileName); + String languagesFolder = String(szFileName) + _T("\\Languages\\ShellExtension"); + s_pLang->LoadLanguageFile(m_langID, languagesFolder); + } + TCHAR resStr[1024] = {0}; + int res = LoadString(_AtlComModule.m_hInstTypeLib, resourceID, resStr, 1024); + ATLASSERT(res != 0); + String strResource; + s_pLang->TranslateString(resStr, strResource); + return strResource; +} + +BOOL CWinMergeShell::InsertMenuString(HMENU hMenu, UINT uPosition, UINT uIDNewItem, UINT uStringId) +{ + String str = GetResourceString(uStringId); + MENUITEMINFO mii{sizeof mii}; + mii.fMask = MIIM_ID | MIIM_STRING | MIIM_DATA; + mii.wID = uIDNewItem; + mii.dwTypeData = const_cast(str.c_str()); + mii.dwItemData = uStringId; + return InsertMenuItem(hMenu, uPosition, TRUE, &mii); +} + /// Reads WinMerge path from registry BOOL CWinMergeShell::GetWinMergeDir(String &strDir) { diff --git a/ShellExtension/WinMergeShell.h b/ShellExtension/WinMergeShell.h index b314e71eb..e70b2503d 100644 --- a/ShellExtension/WinMergeShell.h +++ b/ShellExtension/WinMergeShell.h @@ -32,6 +32,7 @@ #include // for ATL string conversion macros #include "resource.h" // main symbols #include "UnicodeString.h" +#include "LanguageSelect.h" /** * @brief Class for handling shell extension tasks @@ -66,8 +67,10 @@ protected: UINT m_nSelectedItems; /**< Amount of selected items */ DWORD m_dwContextMenuEnabled; /**< Is context menu enabled and in which mode? */ DWORD m_dwMenuState; /**< Shown menuitems */ + LANGID m_langID; /**< Current Language Id */ inline static HMENU s_hMenuLastAdded = nullptr; inline static UINT s_uidCmdLastAdded = 0; + inline static CLanguageSelect *s_pLang = nullptr; BOOL GetWinMergeDir(String &strDir); int DrawSimpleMenu(HMENU hmenu, UINT uMenuIndex, UINT uidFirstCmd); @@ -75,6 +78,8 @@ protected: String GetHelpText(UINT_PTR idCmd); String FormatCmdLine(const String &winmergePath, const String &path1, const String &path2, const String &path3, BOOL bAlterSubFolders); + String GetResourceString(UINT resourceID); + BOOL InsertMenuString(HMENU hMenu, UINT uPosition, UINT uIDNewItem, UINT uStringId); public: // IShellExtInit diff --git a/Testing/GoogleTest/Encoding/codepage_detect_test.cpp b/Testing/GoogleTest/Encoding/codepage_detect_test.cpp index c4974e980..a1877c0ab 100644 --- a/Testing/GoogleTest/Encoding/codepage_detect_test.cpp +++ b/Testing/GoogleTest/Encoding/codepage_detect_test.cpp @@ -85,11 +85,6 @@ namespace EXPECT_EQ(28591, enc.m_codepage); EXPECT_EQ(false, enc.m_bom); EXPECT_EQ(ucr::NONE, enc.m_unicoding); - - enc = codepage_detect::Guess(_T("../../../ShellExtension/Languages/ShellExtensionRussian.rc"), 1); - EXPECT_EQ(65001, enc.m_codepage); - EXPECT_EQ(true, enc.m_bom); - EXPECT_EQ(ucr::UTF8, enc.m_unicoding); } diff --git a/Translations/ShellExtension/CreateTranslatedRcFiles.vbs b/Translations/ShellExtension/CreateTranslatedRcFiles.vbs deleted file mode 100644 index 3bb072adf..000000000 --- a/Translations/ShellExtension/CreateTranslatedRcFiles.vbs +++ /dev/null @@ -1,301 +0,0 @@ -Option Explicit -'' -' This script creates the translated RC files for the shell extension. -' -' Copyright (C) 2007-2009 by Tim Gerundt -' Released under the "GNU General Public License" -' -' ID line follows -- this is updated by SVN -' $Id: CreateTranslatedRcFiles.vbs 6780 2009-05-23 11:58:54Z gerundt $ - -Const ForReading = 1 - -Const NO_BLOCK = 0 -Const STRINGTABLE_BLOCK = 1 - -Const PATH_SHELLEXTTEMPLATE_RC = "../../ShellExtension/Languages/ShellExtensionTemplate.rc" - -Dim oFSO, oCharsets, bRunFromCmd - -Set oFSO = CreateObject("Scripting.FileSystemObject") - -bRunFromCmd = False -If LCase(oFSO.GetFileName(Wscript.FullName)) = "cscript.exe" Then - bRunFromCmd = True -End If - -Set oCharsets = CreateObject("Scripting.Dictionary") -oCharsets.Add "CP932", "Shift_JIS" -oCharsets.Add "CP936", "GB2312" -oCharsets.Add "CP949", "EUC-KR" -oCharsets.Add "CP950", "BIG5" -oCharsets.Add "CP1250", "Windows-1250" -oCharsets.Add "CP1251", "Windows-1251" -oCharsets.Add "CP1252", "Windows-1252" -oCharsets.Add "CP1253", "Windows-1253" -oCharsets.Add "CP1254", "Windows-1254" -oCharsets.Add "CP1256", "Windows-1256" -oCharsets.Add "CP1257", "Windows-1257" -oCharsets.Add "UTF-8", "UTF-8" - -Call Main - -'' -' ... -Sub Main - Dim oLanguages, sLanguage - Dim oLanguageTranslations, sLanguagePoFilePath - Dim StartTime, EndTime, Seconds - Dim sCharset - - StartTime = Time - - InfoBox "Warning: " & Wscript.ScriptName & " can take several seconds to finish!", 3 - - Set oLanguages = GetLanguages - For Each sLanguage In oLanguages.Keys 'For all languages... - If (bRunFromCmd = True) Then 'If run from command line... - Wscript.Echo sLanguage - End If - Set oLanguageTranslations = GetTranslationsFromPoFile(oLanguages(sLanguage), sCharset) - If (oLanguageTranslations.Count > 0) Then 'If translations exists... - CreateRcFileWithTranslations PATH_SHELLEXTTEMPLATE_RC, "../../ShellExtension/Languages/ShellExtension" & sLanguage & ".rc", oLanguageTranslations, sCharset - End If - Next - - EndTime = Time - Seconds = DateDiff("s", StartTime, EndTime) - - InfoBox Wscript.ScriptName & " finished after " & Seconds & " seconds!", 3 -End Sub - -'' -' ... -Function GetLanguages() - Dim oLanguages, oFile - - Set oLanguages = CreateObject("Scripting.Dictionary") - - For Each oFile In oFSO.GetFolder(".").Files 'For all files in the current folder... - If (LCase(oFSO.GetExtensionName(oFile.Name)) = "po") Then 'If a PO file... - oLanguages.Add oFSO.GetBaseName(oFile.Name), oFile.Path - End If - Next - Set GetLanguages = oLanguages -End Function - -'' -' ... -Function GetTranslationsFromPoFile(ByVal sPoPath, sCharset) - Dim oTranslations, oTextFile, sLine - Dim oMatch, iMsgStarted, sMsgId, sMsgStr - Dim reMsgId, reMsgStr, reMsgContinued, reCharset - - Set reMsgId = New RegExp - reMsgId.Pattern = "^msgid ""(.*)""$" - reMsgId.IgnoreCase = True - - Set reMsgStr = New RegExp - reMsgStr.Pattern = "^msgstr ""(.*)""$" - reMsgStr.IgnoreCase = True - - Set reMsgContinued = New RegExp - reMsgContinued.Pattern = "^""(.*)""$" - reMsgContinued.IgnoreCase = True - - ' - sCharset = "_autodetect" - Set reCharset = New RegExp - reCharset.Pattern = "harset=(.*)\\n""$" - reCharset.IgnoreCase = True - Set oTextFile = oFSO.OpenTextFile(sPoPath, ForReading) - Do Until oTextFile.AtEndOfStream 'For all lines... - sLine = Trim(oTextFile.ReadLine) - If reCharset.Test(sLine) Then - Set oMatch = reCharset.Execute(sLine)(0) - sCharset = oCharsets(oMatch.SubMatches(0)) - Exit Do - End If - Loop - oTextFile.Close - - Set oTranslations = CreateObject("Scripting.Dictionary") - - If (oFSO.FileExists(sPoPath) = True) Then 'If the PO file exists... - iMsgStarted = 0 - sMsgId = "" - sMsgStr = "" - Set oTextFile = CreateObject("ADODB.Stream") - oTextFile.Type = 2 ' adTypeText - oTextFile.LineSeparator = 10 ' adLF - oTextFile.Charset = sCharset - oTextFile.Open - oTextFile.LoadFromFile(sPoPath) - Do Until oTextFile.EOS 'For all lines... - sLine = oTextFile.ReadText(-2) ' -2 = adReadLine - If Len(sLine) > 0 Then - If Right(sLine, 1) = vbCR Then - sLine = Left(sLine, Len(sLine) - 1) - End If - End If - sLine = Trim(sLine) - - If (sLine <> "") Then 'If NOT empty line... - If (Left(sLine, 1) <> "#") Then 'If NOT comment line... - '-------------------------------------------------------------------------------- - ' Note: We must replace \" temporary with FormFeed and convert them later to "" - '-------------------------------------------------------------------------------- - sLine = Replace(sLine, "\""", vbFormFeed) - If reMsgId.Test(sLine) Then 'If "msgid"... - iMsgStarted = 1 - Set oMatch = reMsgId.Execute(sLine)(0) - sMsgId = oMatch.SubMatches(0) - ElseIf reMsgStr.Test(sLine) Then 'If "msgstr"... - iMsgStarted = 2 - Set oMatch = reMsgStr.Execute(sLine)(0) - sMsgStr = oMatch.SubMatches(0) - ElseIf reMsgContinued.Test(sLine) Then 'If "msgid" or "msgstr" continued... - Set oMatch = reMsgContinued.Execute(sLine)(0) - If (iMsgStarted = 1) Then - sMsgId = sMsgId & oMatch.SubMatches(0) - ElseIf (iMsgStarted = 2) Then - sMsgStr = sMsgStr & oMatch.SubMatches(0) - End If - End If - sMsgId = Replace(sMsgId, vbFormFeed, """""") - sMsgStr = Replace(sMsgStr, vbFormFeed, """""") - End If - Else 'If empty line - iMsgStarted = 0 - End If - - If (iMsgStarted = 0) Then 'If NOT inside a translation... - If (sMsgId <> "") And (sMsgStr <> "") And (sMsgId <> sMsgStr) Then 'If translated... - oTranslations.Add sMsgId, sMsgStr - End If - sMsgId = "" - sMsgStr = "" - End If - Loop - If (sMsgId <> "") And (sMsgStr <> "") And (sMsgId <> sMsgStr) Then 'If translated... - oTranslations.Add sMsgId, sMsgStr - End If - oTextFile.Close - End If - Set GetTranslationsFromPoFile = oTranslations -End Function - -'' -' ... -Sub CreateRcFileWithTranslations(ByVal sMasterRcPath, ByVal sLanguageRcPath, ByVal oTranslations, sCharset) - Dim oMasterRcFile, sMasterLine - Dim oLanguageRcFile, sLanguageLine - Dim iBlockType, oMatches, oMatch, sMsgId, sMsgStr - Dim reAfxTarg, reLanguage, reCodePage, reString, sTemp - - Set reAfxTarg = New RegExp - reAfxTarg.Pattern = "defined\((AFX_TARG_\w*)\)" - reAfxTarg.IgnoreCase = True - - Set reLanguage = New RegExp - reLanguage.Pattern = "LANGUAGE (LANG_\w*, SUBLANG_\w*)" - reLanguage.IgnoreCase = True - - Set reCodePage = New RegExp - reCodePage.Pattern = "code_page\(([\d]+)\)" - reCodePage.IgnoreCase = True - - Set reString = New RegExp - reString.Pattern = """(.*?)""" - reString.IgnoreCase = True - - If (oFSO.FileExists(sMasterRcPath) = True) Then 'If the master RC file exists... - iBlockType = NO_BLOCK - Set oMasterRcFile = oFSO.OpenTextFile(sMasterRcPath, ForReading) - Set oLanguageRcFile = CreateObject("ADODB.Stream") - oLanguageRcFile.Type = 2 ' adTypeText - oLanguageRcFile.LineSeparator = -1 ' adCRLF - oLanguageRcFile.Charset = sCharset - oLanguageRcFile.Open - Do Until oMasterRcFile.AtEndOfStream = True 'For all lines... - sMasterLine = oMasterRcFile.ReadLine - sLanguageLine = sMasterLine - sMasterLine = Trim(sMasterLine) 'Save Masterline trimmed! - - If (sMasterLine = "STRINGTABLE") Then 'STRINGTABLE... - iBlockType = STRINGTABLE_BLOCK - ElseIf (sMasterLine = "BEGIN") Then 'BEGIN... - 'IGNORE FOR SPEEDUP! - ElseIf (sMasterLine = "END") Then 'END... - If (iBlockType = STRINGTABLE_BLOCK) Then 'If inside stringtable... - iBlockType = NO_BLOCK - End If - ElseIf (Left(sMasterLine, 2) = "//") Then 'If comment line... - 'IGNORE FOR SPEEDUP! - ElseIf (sMasterLine <> "") Then 'If NOT empty line... - Select Case iBlockType - Case NO_BLOCK: - If reAfxTarg.Test(sMasterLine) Then 'AFX_TARG_*... - Set oMatch = reAfxTarg.Execute(sMasterLine)(0) - sMsgId = oMatch.SubMatches(0) - If (sMsgId <> "") And (oTranslations.Exists(sMsgId) = True) Then 'If translation located... - sMsgStr = oTranslations(sMsgId) - sLanguageLine = Replace(sLanguageLine, "defined(" & sMsgId, "defined(" & sMsgStr) - End If - ElseIf reLanguage.Test(sMasterLine) Then 'LANGUAGE... - Set oMatch = reLanguage.Execute(sMasterLine)(0) - sMsgId = oMatch.SubMatches(0) - If (sMsgId <> "") And (oTranslations.Exists(sMsgId) = True) Then 'If translation located... - sMsgStr = oTranslations(sMsgId) - sLanguageLine = Replace(sLanguageLine, "LANGUAGE " & sMsgId, "LANGUAGE " & sMsgStr) - End If - ElseIf reCodePage.Test(sMasterLine) Then 'code_page... - Set oMatch = reCodePage.Execute(sMasterLine)(0) - sMsgId = oMatch.SubMatches(0) - If (sMsgId <> "") And (oTranslations.Exists(sMsgId) = True) Then 'If translation located... - sMsgStr = oTranslations(sMsgId) - sLanguageLine = Replace(sLanguageLine, "code_page(" & sMsgId & ")", "code_page(" & sMsgStr & ")") - End If - End If - - Case STRINGTABLE_BLOCK: - If (InStr(sMasterLine, """") > 0) Then 'If quote found (for speedup)... - '-------------------------------------------------------------------------------- - ' Note: We must replace "" temporary with FormFeed... - '-------------------------------------------------------------------------------- - sTemp = Replace(sMasterLine, """""", vbFormFeed) - If reString.Test(sTemp) Then 'String... - Set oMatches = reString.Execute(sTemp) - For Each oMatch In oMatches 'For all strings... - sMsgId = Replace(oMatch.SubMatches(0), vbFormFeed, """""") - If (sMsgId <> "") And (oTranslations.Exists(sMsgId) = True) Then 'If translation located... - sMsgStr = oTranslations(sMsgId) - sLanguageLine = Replace(sLanguageLine, """" & sMsgId & """", """" & sMsgStr & """") - End If - Next - End If - End If - - End Select - End If - oLanguageRcFile.WriteText sLanguageLine, 1 - Loop - oMasterRcFile.Close - WScript.Echo sLanguageRcPath - oLanguageRcFile.SaveToFile sLanguageRcPath, 2 - oLanguageRcFile.Close - End If -End Sub - -'' -' ... -Function InfoBox(ByVal sText, ByVal iSecondsToWait) - Dim oShell - - If (bRunFromCmd = False) Then 'If run from command line... - Set oShell = Wscript.CreateObject("WScript.Shell") - InfoBox = oShell.Popup(sText, iSecondsToWait, Wscript.ScriptName, 64) - Else 'If NOT run from command line... - Wscript.Echo sText - End If -End Function diff --git a/Translations/ShellExtension/Japanese.po b/Translations/ShellExtension/Japanese.po index 0a3ece069..fa4b64aa4 100644 --- a/Translations/ShellExtension/Japanese.po +++ b/Translations/ShellExtension/Japanese.po @@ -91,4 +91,4 @@ msgstr "保存されたパス (%1) と比較します。" #: ShellExtensionTemplate.rc:51 #, c-format msgid "Re-select &Left" -msgstr "左側として再選択" +msgstr "左側として再選択(&L)" diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po index 1da643a7a..3402dec4a 100644 --- a/Translations/WinMerge/Brazilian.po +++ b/Translations/WinMerge/Brazilian.po @@ -3888,30 +3888,3 @@ msgstr "Marca das aspas ausentes na tubulação do plugin: %1" msgid "Specify plugin arguments" msgstr "Especificar os argumentos do plugin" - -#~ msgid "&Select Line Difference\tF4" -#~ msgstr "&Selecionar a Diferença da Linha\tF4" - -#, c-format -#~ msgid "&XML" -#~ msgstr "&XML" - -#, c-format -#~ msgid "&No prediffer" -#~ msgstr "&Sem prediffer" - -#, c-format -#~ msgid "Auto prediffer" -#~ msgstr "Auto prediffer" - -#, c-format -#~ msgid "Select Unpacker" -#~ msgstr "Selecionar o Desempacotador" - -#, c-format -#~ msgid "File unpacker:" -#~ msgstr "Desempacotador do arquivo:" - -#, c-format -#~ msgid "Cannot create a patch file from directories." -#~ msgstr "Não pode criar um arquivo de patch através dos diretórios." -- 2.11.0