Skip to content

Rewrite English.pot, add JXL image extension #2682

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Mar 22, 2025
Merged

Rewrite English.pot, add JXL image extension #2682

merged 3 commits into from
Mar 22, 2025

Conversation

dcog989
Copy link
Contributor

@dcog989 dcog989 commented Mar 21, 2025

No description provided.

dcog989 added 3 commits March 21, 2025 10:56
@dcog989
Add JXL image extension
3e15d7a
@dcog989
Add JXL image extension
619152c
@dcog989
Major rewrite of English.pot
8a0c45f 
Rewritten for brevity and clarity, correct grammar, consistent capitalisation.
@dcog989 dcog989 changed the title Add JXL image extension Rewrite English.pot, add JXL image extension Mar 22, 2025
@sdottaka sdottaka merged commit a1dfc84 into WinMerge:master Mar 22, 2025
@sdottaka
Copy link
Member

Thank you for the PR.
As for English.pot, this file is actually automatically generated from the Merge.rc file, so I had to modify Merge.rc. I will modify Merge.rc later.
Note that I may not incorporate all of the fixes in this PR.
For example, you have made a change to change many lowercase letters to uppercase. However, while this is fine for menu items, I would like the text displayed in the Options window to have only the first letter of a line in uppercase, like in other applications.

@dcog989
Copy link
Contributor Author

dcog989 commented Mar 22, 2025

Understood on capitalisation. I was just trying to be consistent everywhere.

If you like, reject this PR for the English.pot and I will resubmit with revised capitalisation applied to Merge.rc.

sdottaka added a commit that referenced this pull request Mar 23, 2025
@sdottaka
Rewrite English.pot, add JXL image extension (#2682) (2)
01df553
@sdottaka
Copy link
Member

In commit 01df553, I merged the changes from English.pot into merge.rc and other files.

@dcog989
Copy link
Contributor Author

dcog989 commented Mar 23, 2025

I've skimmed all the changes. Looks good. Any issues, please let me know and I'll be happy to fix.

Marcellomco added a commit to Marcellomco/winmerge that referenced this pull request Mar 24, 2025
@Marcellomco
Update Brazilian.po
77feef4 
Added translation for "Rewrite English.pot, add JXL image extension (WinMerge#2682) (2)"
@Marcellomco Marcellomco mentioned this pull request Mar 24, 2025
Merged
sdottaka pushed a commit that referenced this pull request Mar 24, 2025
@Marcellomco
Update Brazilian.po (#2688)
046e5fb 
Added translation for "Rewrite English.pot, add JXL image extension (#2682) (2)"
@sdottaka sdottaka added this to the v2.16.47 milestone Mar 24, 2025
sdottaka added a commit that referenced this pull request Mar 26, 2025
@sdottaka
Rewrite English.pot, add JXL image extension (#2682) (3)
daf0ee2
Marcellomco added a commit to Marcellomco/winmerge that referenced this pull request Mar 27, 2025
@Marcellomco
Update Brazilian.po
d2cbb71 
Added translation for "Rewrite English.pot, add JXL image extension (WinMerge#2682) (3)"
@Marcellomco Marcellomco mentioned this pull request Mar 27, 2025
Merged
sdottaka pushed a commit that referenced this pull request Mar 27, 2025
@Marcellomco
Update Brazilian.po (#2697)
369f0bc 
Added translation for "Rewrite English.pot, add JXL image extension (#2682) (3)"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.16.47
Development

Successfully merging this pull request may close these issues.
2 participants
@dcog989 @sdottaka