Skip to content

Make the plugin settings dialog translatable and enable saving settings to an INI file #1783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 37 commits into from
Apr 16, 2023
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
72213ad
Make plugin settings dialog translatable
sdottaka Mar 30, 2023
56c2ffe
Make plugin settings dialog translatable (2)
sdottaka Mar 30, 2023
23803b6
Merge branch 'master' into make-plugin-settings-dialog-translatable
sdottaka Mar 30, 2023
ecaf525
Make plugin settings dialog translatable (3)
sdottaka Mar 31, 2023
9bf685f
Make plugin settings dialog translatable (4)
sdottaka Apr 1, 2023
4615fd3
Merge branch 'master' into make-plugin-settings-dialog-translatable
sdottaka Apr 1, 2023
fe8f908
Make plugin settings dialog translatable (5)
sdottaka Apr 2, 2023
9764fb6
Make plugin settings dialog translatable (6)
sdottaka Apr 4, 2023
7b90d77
Merge branch 'master' into make-plugin-settings-dialog-translatable
sdottaka Apr 4, 2023
b67ef69
Make plugin settings dialog translatable (7)
sdottaka Apr 5, 2023
db58748
Make plugin settings dialog translatable (8)
sdottaka Apr 8, 2023
6750b94
Merge branch 'master' into make-plugin-settings-dialog-translatable
sdottaka Apr 8, 2023
4f328c0
Make plugin settings dialog translatable (9)
sdottaka Apr 9, 2023
2f30fe8
Make plugin settings dialog translatable (10)
sdottaka Apr 9, 2023
781246e
Make plugin settings dialog translatable (11)
sdottaka Apr 9, 2023
7a2b296
Make plugin settings dialog translatable (12)
sdottaka Apr 9, 2023
a518f00
Make plugin settings dialog translatable (13)
sdottaka Apr 9, 2023
e5cb486
Make plugin settings dialog translatable (14)
sdottaka Apr 10, 2023
de28707
Make plugin settings dialog translatable (15)
sdottaka Apr 10, 2023
1f33346
Merge branch 'master' into make-plugin-settings-dialog-translatable
sdottaka Apr 11, 2023
76e47a8
Make plugin settings dialog translatable (16)
sdottaka Apr 11, 2023
6dec4c9
Make plugin settings dialog translatable (17)
sdottaka Apr 12, 2023
db9e398
Make plugin settings dialog translatable (18)
sdottaka Apr 12, 2023
fb9be57
Make plugin settings dialog translatable (19)
sdottaka Apr 12, 2023
ff1bdf2
Make plugin settings dialog translatable (20)
sdottaka Apr 12, 2023
a64b947
Merge branch 'master' into make-plugin-settings-dialog-translatable
sdottaka Apr 13, 2023
7455c76
Make plugin settings dialog translatable (21)
sdottaka Apr 14, 2023
458451f
Make plugin settings dialog translatable (22)
sdottaka Apr 14, 2023
0421c92
Merge branch 'master' into make-plugin-settings-dialog-translatable
sdottaka Apr 15, 2023
a96ef2e
Make plugin settings dialog translatable (23)
sdottaka Apr 15, 2023
6f62c07
Make plugin settings dialog translatable (24)
sdottaka Apr 15, 2023
ad1517f
Merge branch 'master' into make-plugin-settings-dialog-translatable
sdottaka Apr 16, 2023
949a3e8
Merge branch 'master' into make-plugin-settings-dialog-translatable
sdottaka Apr 16, 2023
5849439
Make plugin settings dialog translatable (25)
sdottaka Apr 16, 2023
966acbf
Make plugin settings dialog translatable (26)
sdottaka Apr 16, 2023
2b121d1
Make plugin settings dialog translatable (27)
sdottaka Apr 16, 2023
7da0a64
Make plugin settings dialog translatable (28)
sdottaka Apr 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ALL.vs2017.sln
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{AA9C
Plugins\CopyDlls.bat = Plugins\CopyDlls.bat
Plugins\Plugins.xml = Plugins\Plugins.xml
Plugins\README.md = Plugins\README.md
Plugins\resource.h = Plugins\resource.h
Plugins\Strings.rc = Plugins\Strings.rc
EndProjectSection
EndProject
Expand Down
1 change: 1 addition & 0 deletions ALL.vs2019.sln
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{AA9C
Plugins\CopyDlls.bat = Plugins\CopyDlls.bat
Plugins\Plugins.xml = Plugins\Plugins.xml
Plugins\README.md = Plugins\README.md
Plugins\resource.h = Plugins\resource.h
Plugins\Strings.rc = Plugins\Strings.rc
EndProjectSection
EndProject
Expand Down
1 change: 1 addition & 0 deletions ALL.vs2022.sln
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{AA9C
Plugins\CopyDlls.bat = Plugins\CopyDlls.bat
Plugins\Plugins.xml = Plugins\Plugins.xml
Plugins\README.md = Plugins\README.md
Plugins\resource.h = Plugins\resource.h
Plugins\Strings.rc = Plugins\Strings.rc
EndProjectSection
EndProject
Expand Down
100 changes: 100 additions & 0 deletions Plugins/Strings.rc
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,106 @@ BEGIN
"Windows Registry URL Scheme Handler. \r\nArguments: Command line options passed to the reg.exe command."
END

STRINGTABLE
BEGIN
IDS_PLUGIN_COMPAREMSEXCELFILES_STR1
"CompareMSExcelFiles.sct WinMerge Plugin Options"
IDS_PLUGIN_COMPAREMSEXCELFILES_STR2
"Extract workbook data to multiple files"
IDS_PLUGIN_COMPAREMSEXCELFILES_STR3 "Update external references(links)"
IDS_PLUGIN_COMPAREMSEXCELFILES_STR4 "Compare document properties"
IDS_PLUGIN_COMPAREMSEXCELFILES_STR5 "Compare names"
IDS_PLUGIN_COMPAREMSEXCELFILES_STR6 "Compare cell values"
IDS_PLUGIN_COMPAREMSEXCELFILES_STR7
"Compare worksheets as image (very slow)"
IDS_PLUGIN_COMPAREMSEXCELFILES_STR8 " - Image split size: "
IDS_PLUGIN_COMPAREMSEXCELFILES_STR9 "Compare worksheets as HTML"
IDS_PLUGIN_COMPAREMSEXCELFILES_STR10 "Compare formulas"
IDS_PLUGIN_COMPAREMSEXCELFILES_STR11 "Compare texts in shapes"
IDS_PLUGIN_COMPAREMSEXCELFILES_STR12 "Compare headers and footers"
END

STRINGTABLE
BEGIN
IDS_PLUGIN_COMPAREMSEXCELFILES_STR13 "Compare VBA macros"
IDS_PLUGIN_COMPAREMSWORDFILES_STR1
"CompareMSWordFiles.sct WinMerge Plugin Options"
IDS_PLUGIN_COMPAREMSWORDFILES_STR2
"Extract document data to multiple files"
IDS_PLUGIN_COMPAREMSWORDFILES_STR3 "Compare document properties"
IDS_PLUGIN_COMPAREMSWORDFILES_STR4 "Compare bookmarks"
IDS_PLUGIN_COMPAREMSWORDFILES_STR5 "Compare text contents of documents"
IDS_PLUGIN_COMPAREMSWORDFILES_STR6
"Compare documents as HTML file (very slow)"
IDS_PLUGIN_COMPAREMSWORDFILES_STR7 "Compare texts in shapes"
IDS_PLUGIN_COMPAREMSWORDFILES_STR8 "Compare VBA macros"
END

STRINGTABLE
BEGIN
IDS_PLUGIN_COMPAREMSPOWERPOINTFILES_STR1
"CompareMSPowerPointFiles.sct WinMerge Plugin Options"
IDS_PLUGIN_COMPAREMSPOWERPOINTFILES_STR2
"Extract slide data to multiple files"
IDS_PLUGIN_COMPAREMSPOWERPOINTFILES_STR3 "Compare document properties"
IDS_PLUGIN_COMPAREMSPOWERPOINTFILES_STR4
"Compare slides as image (very slow)"
END

STRINGTABLE
BEGIN
IDS_PLUGIN_COMPAREMSPOWERPOINTFILES_STR5 "Compare texts in shapes"
IDS_PLUGIN_COMPAREMSPOWERPOINTFILES_STR6 "Compare texts in notes page"
IDS_PLUGIN_COMPAREMSPOWERPOINTFILES_STR7 "Compare VBA macros"
END

STRINGTABLE
BEGIN
IDS_PLUGIN_COMPAREMSVISIOFILES_STR1
"CompareMSVisioFiles.sct WinMerge Plugin Options"
IDS_PLUGIN_COMPAREMSVISIOFILES_STR2 "Extract page data to multiple files"
IDS_PLUGIN_COMPAREMSVISIOFILES_STR3 "Compare pages as image (very slow)"
IDS_PLUGIN_COMPAREMSVISIOFILES_STR4 "Compare texts in shapes"
IDS_PLUGIN_COMPAREMSVISIOFILES_STR5 "Compare VBA macros"
END

STRINGTABLE
BEGIN
IDS_PLUGIN_PREDIFFLINEFILTER_STR1
"PrediffLineFilter.sct WinMerge Plugin Options"
IDS_PLUGIN_PREDIFFLINEFILTER_STR2 "Add"
IDS_PLUGIN_PREDIFFLINEFILTER_STR3 "Delete"
IDS_PLUGIN_PREDIFFLINEFILTER_STR4 "Enabled"
IDS_PLUGIN_PREDIFFLINEFILTER_STR5 "Ignore Case"
IDS_PLUGIN_PREDIFFLINEFILTER_STR6 "Use RegExp"
IDS_PLUGIN_PREDIFFLINEFILTER_STR7 "Find what"
IDS_PLUGIN_PREDIFFLINEFILTER_STR8 "Replace with"
END

STRINGTABLE
BEGIN
IDS_PLUGIN_IGNORE_STR1 "Settings"
IDS_PLUGIN_IGNORE_STR2 "Column Ranges To Ignore:\ne.g.) 3,10-20,32-33\n"
END

STRINGTABLE
BEGIN
IDS_PLUGIN_APPLYPATCH_STR1
"Enter the name of the file to which the patch '{0}' will be applied"
IDS_PLUGIN_APPLYPATCH_STR2 "File '{0}' does not exist"
IDS_PLUGIN_APPLYPATCH_STR3
"Enter the command line arguments for patch command"
IDS_PLUGIN_APPLYPATCH_STR4
"Enter the name of the folder to which the patch '{0}' will be applied"
END

STRINGTABLE
BEGIN
IDS_PLUGIN_APPLYPATCH_STR5 "Folder '{0}' does not exist"
IDS_PLUGIN_APPLYPATCH_STR6
"Do not specify the '-p0' command line option for the patch file which includes absolute paths"
END

#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////

Expand Down
Loading