Full localization in Open Shell #1317

vodek3 · 2023-01-31T09:07:44Z

AppVeyorBot · 2023-01-31T09:16:57Z

✅ Build Open-Shell-Menu 4.4.190-piyidvfe completed (commit 7d86a26dd6 by @vodek3)

ge0rdi · 2023-01-31T09:39:15Z

Src/Localization/English/OpenShell.hhp

 ClassicExplorer.html
 StartMenu.html
 ClassicIE.html
+ButtonTutorial.html


This doesn't belong to commit Change title of Help Window: Help -> Open-Shell Help.

Change title of Help Window: Help -> Open-Shell Help
and
Add to Help two chapters + Changes of formatting in head of all .html

They are inextricably linked, because whatever one may say, it is necessary to make changes in the HTML Help Workshop .hhp project file
You understand that, is not it?

And in general, all changes in this PR are related to the possibility of full localization of Open-Shell.

They are inextricably linked

No.
Commit Change title of Help Window: Help -> Open-Shell Help is supposed to just change the title of help window.
Adding some other things is certainly not related to help window title.
So those other things should go to other commit - Add to Help two chapters that adds those help chapters.

Listen, what are we talking about?
I made a separate commit to change the title of Help Windows.
Only by changing .hpp files
Maybe I didn't understand you correctly?

I made a separate commit to change the title of Help Windows.
Only by changing .hpp files

That is right. But some of those .hpp files contain also other changes than just change in title.
Just have a look at diff of that commit:
1143698

So you need to put those change so different commit (I guess they mixed in somehow).

I named the commit "Add two chapters to help + Format header changes in all .html" because they are inextricably linked! And also all the changes are connected with the name of the PR - full localization.
It is absurd to create a commit after deleting each character I underline in the, not in the code, but in the documentation. By the way, I created a revert on two spaces in resource-file, as you asked.

I named the commit "Add two chapters to help + Format header changes in all .html" because they are inextricably linked!

And I'm talking about commit Change title of Help Window: Help -> Open-Shell Help (the one where I left this comment):
1143698

Just click on it, see the differences made in that commit and in Src/Localization/English/OpenShell.hhp and Src/Localization/Russian/OpenShell.hhp files you will see changes that are not related to change of help title.

ge0rdi · 2023-01-31T09:40:33Z

Src/StartMenu/StartMenuDLL/StartMenuDLL.rc

 IDS_SEARCH_FILES "Search files"
 IDS_SEARCH_FILES_TIP "When this is checked, the search results will include files, emails and other items from indexed locations"
- IDS_SEARCH_FILES_TIP2 "When this is checked, the search results will include files, emails  and other items from indexed locations\nWarning: the search service is disabled"
+ IDS_SEARCH_FILES_TIP2 "When this is checked, the search results will include files, emails and other items from indexed locations\nWarning: the search service is disabled"


This change is unrelated to Adding the ability to localize Immersive/Immersive7 skins.
Please, revert it.

Two spaces in this string also connected with full localization of Open-Shell, I'll write about it bit later.
I have a suspicion that this is a bug. Now I'm just checking it out.

While two spaces in this string don't make much sense, it makes even less sense to fix that in commit that is about localization of Immersive skin.

So please just revert the change.

I described bug in #1318

I thought it was already explained that this change doesn't belong to commit that is about Immersive skin changes.
Moreover it is not relate to #1318 in any way.

Displaying in the template (more precisely, not displaying) a message with two spaces is described in #1318 and discussion of the same message (with two spaces) is not related to #1318?
Really?
Do you seriously think that two spaces in the message are so important that we need to spend more than two days discussing this issue?..

Two days... We wasted two days. For what? For replace two spaces by one. This is success! =D

Hmm, I thought I explained it in #1318 already.
It was related to settings handling code that depends on state of particular Windows service. It is not related to number of spaces in some string.
Please, try to read it again.

That issue is fixed now. If you think it is not, please, state that in #1318.

ge0rdi · 2023-01-31T09:41:41Z

Src/StartMenu/StartMenuDLL/StartMenuDLL.rc

 IDS_STRING7109 "Metro skin\n\nSkin that uses the start screen colors.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
 IDS_STRING7110 "Metallic skin\n\nA start menu skin with metallic look.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
+ IDS_STRING7111 "Immersive skin\n\nA skin that uses immersive colors and modern visual elements in the style of Windows 10.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
+


Unnecessary blank line.

ge0rdi · 2023-01-31T09:47:00Z

Src/StartMenu/StartMenuDLL/StartMenuDLL.rc

 IDS_STRING7108 "Midnight skin\n\nSkin with dark background.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
 IDS_STRING7109 "Metro skin\n\nSkin that uses the start screen colors.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
 IDS_STRING7110 "Metallic skin\n\nA start menu skin with metallic look.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"
+ IDS_STRING7111 "Immersive skin\n\nA skin that uses immersive colors and modern visual elements in the style of Windows 10.\n\nPart of <A HREF=""https://github.com/Open-Shell/Open-Shell-Menu/"">Open-Shell</A> (c) 2009-2017, Ivo Beltchev"


Hmm, I know this is copied from Immersive skin description.
But this is new skin that was added by Open-Shell team, not Ivo as original author of Classic-Shell. So it makes no sense to have Ivo listed as author here.

I didn't realize that when we were adding the new skin.
But I think it should rather state (c) 2023, The Open-Shell Team.

@bonzibudd
What do you think?

ge0rdi · 2023-01-31T09:49:50Z

Regarding Add to Help two chapters + Changes of formatting in head of all .htm files commit.
I'm wondering what was the problem with having each change in separate commit.

We were discussing in last PR that unrelated changes should go to separate commits.

AppVeyorBot · 2023-01-31T10:01:22Z

✅ Build Open-Shell-Menu 4.4.190-gehgnrrt completed (commit ff5cb1fad8 by @vodek3)

vodek3 · 2023-01-31T10:08:41Z

I answered above

ge0rdi · 2023-01-31T10:25:43Z

Remove blank line

Here is an advice for creating fixup commits like this one.
You can create the commit using git commit --fixup <id-of-commit-that-is-being-fixed>.

It will be then much easier to squash particular fixups in to their base commits once review is finished.
One can then use git rebase -i --autosquash ... and git will automatically apply fixup commits to their base commits.

AppVeyorBot · 2023-01-31T10:50:11Z

✅ Build Open-Shell-Menu 4.4.190-rhgrwvew completed (commit 08af1db2bc by @vodek3)

AppVeyorBot · 2023-01-31T10:58:51Z

✅ Build Open-Shell-Menu 4.4.190-vebxolrj completed (commit 90c065e3a7 by @vodek3)

AppVeyorBot · 2023-01-31T12:07:13Z

✅ Build Open-Shell-Menu 4.4.190-lboiijcv completed (commit 8c5e8ea16c by @vodek3)

ge0rdi · 2023-01-31T12:13:31Z

Could you, please, squash fixes so that in the end there will be just commits you want to merge in this PR?
You can do that locally (look for "git interactive rebase") and then once you are satisfied with it, just force push it (git push -f).

So that it will be easier to review actual changes.

AppVeyorBot · 2023-01-31T12:16:50Z

✅ Build Open-Shell-Menu 4.4.190-exaiwpyc completed (commit 694d1a1bdf by @vodek3)

AppVeyorBot · 2023-01-31T12:51:00Z

✅ Build Open-Shell-Menu 4.4.190-ihnyvrcv completed (commit 44b03adae6 by @vodek3)

AppVeyorBot · 2023-01-31T13:00:31Z

✅ Build Open-Shell-Menu 4.4.190-jllreddc completed (commit 2cce65d806 by @vodek3)

AppVeyorBot · 2023-01-31T13:09:50Z

✅ Build Open-Shell-Menu 4.4.190-vdeyrhfa completed (commit faaca2d3b5 by @vodek3)

…calizations

AppVeyorBot · 2023-01-31T13:18:30Z

✅ Build Open-Shell-Menu 4.4.190-xpiahfvp completed (commit 545919d92c by @vodek3)

AppVeyorBot · 2023-01-31T13:27:17Z

✅ Build Open-Shell-Menu 4.4.190-qadvwydf completed (commit 16f047a21d by @vodek3)

AppVeyorBot · 2023-01-31T13:36:11Z

✅ Build Open-Shell-Menu 4.4.190-fbiaisvn completed (commit 38f7d23803 by @vodek3)

AppVeyorBot · 2023-01-31T13:44:49Z

✅ Build Open-Shell-Menu 4.4.190-ygqsuioh completed (commit 430e1202bb by @vodek3)

AppVeyorBot · 2023-01-31T13:53:22Z

✅ Build Open-Shell-Menu 4.4.190-gmjhcwpu completed (commit 42208ed3e2 by @vodek3)

AppVeyorBot · 2023-01-31T14:02:07Z

✅ Build Open-Shell-Menu 4.4.190-wvdfjyuh completed (commit 940455e7d8 by @vodek3)

AppVeyorBot · 2023-01-31T14:11:58Z

✅ Build Open-Shell-Menu 4.4.190-wtqrxjde completed (commit 75405f6b6e by @vodek3)

AppVeyorBot · 2023-01-31T14:34:25Z

✅ Build Open-Shell-Menu 4.4.190-gtnjxtnp completed (commit d59f589286 by @vodek3)

ge0rdi · 2023-01-31T14:49:20Z

For the future, it is much better to prepare all the commits locally and then push them at once.
Instead of pushing one commit here and there.

AppVeyorBot · 2023-01-31T14:59:12Z

✅ Build Open-Shell-Menu 4.4.190-qbynomji completed (commit 865043dcd8 by @vodek3)

AppVeyorBot · 2023-01-31T15:09:56Z

✅ Build Open-Shell-Menu 4.4.190-yopxnuih completed (commit b4614bfc21 by @vodek3)

AppVeyorBot · 2023-01-31T15:20:17Z

✅ Build Open-Shell-Menu 4.4.190-ptmeurfc completed (commit 4f707a157a by @vodek3)

… - OpenShell.hhp

AppVeyorBot · 2023-01-31T15:31:43Z

✅ Build Open-Shell-Menu 4.4.190-fyxviusl completed (commit e4b3cb72a6 by @vodek3)

AppVeyorBot · 2023-01-31T15:40:40Z

✅ Build Open-Shell-Menu 4.4.190-ypdegkwh completed (commit 75736b377b by @vodek3)

AppVeyorBot · 2023-01-31T15:50:57Z

✅ Build Open-Shell-Menu 4.4.190-aqochikx completed (commit ead1b00117 by @vodek3)

AppVeyorBot · 2023-01-31T16:00:23Z

✅ Build Open-Shell-Menu 4.4.190-nxabujqg completed (commit 79fc7deaa5 by @vodek3)

ge0rdi

These commits still contain mix of different things. I've tried to explain it as best as I can,

How about this:
I have all required data here, so I will just rearrange them a bit to have more meaningful commit.
I can try to do it here (not sure if I can modify commits in PR where I'm not the author).
Or will create new PR with required changes (you will be listed as author of commits).

Will that work for you?

ge0rdi · 2023-02-01T10:19:20Z

Src/StartMenu/StartMenuDLL/StartMenuDLL.rc

 IDS_SEARCH_FILES "Search files"
 IDS_SEARCH_FILES_TIP "When this is checked, the search results will include files, emails and other items from indexed locations"
- IDS_SEARCH_FILES_TIP2 "When this is checked, the search results will include files, emails  and other items from indexed locations\nWarning: the search service is disabled"
+ IDS_SEARCH_FILES_TIP2 "When this is checked, the search results will include files, emails and other items from indexed locations\nWarning: the search service is disabled"


I thought it was already explained that this change doesn't belong to commit that is about Immersive skin changes.
Moreover it is not relate to #1318 in any way.

ge0rdi · 2023-02-01T10:23:30Z

Src/Localization/English/ButtonTutorial.html

@@ -0,0 +1,143 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">


New help pages should be added in separate commit as they are introducing new content.
It makes no sense to add completely new pages in commit that aims to make existing help files more uniform.

I repeat. My main goal is to make it possible to easily localize all Open-Shell messages (including group policy templates).
By the way. I made (a few years ago) for myself the ru-RU.dll library and it works correctly. I don't use the Immersive skin. ;-)
But there is what is called the shift of the motive to the goal - it became interesting for me to finish what I started and share it with everyone.
And so.
I absolutely do not care who will be indicated as the author of the changes in the source code. Make it as easy as possible for you. The main thing is the result!
If any action is required from me, please let me know.
Once again, I would like to note that all the proposed changes/improvements in this PR are directly related to localization.
It's important.

ge0rdi · 2023-02-01T14:49:21Z

@vodek3
You have added ButtonTutorial and SkinTutorial to russian folder but they are english.
I guess that doesn't make much sense.
Wouldn't it be better to add those once they are translated to russian?
Do you plan to translate them?

We will have them in main english help (btw the only one that is being provided with the application).

AppVeyorBot · 2023-02-01T16:00:49Z

✅ Build Open-Shell-Menu 4.4.190-bivwhndv completed (commit 2c9ccc1666 by @vodek3)

vodek3 · 2023-02-01T16:30:41Z

I explain my goal minimum twice...
Look, when compile for example Russian version of Open-Shell help compile automatically and an installation package is created, including a help file. So it turns out that the localized help will differ from the English one without two chapters...
Let's start from revise and unify all fields for subsequent translation. I think this is a very good idea because it is substantive and quantitative.
After that we will remove all double spaces of course. ;)

ge0rdi · 2023-02-01T17:33:09Z

I understand what you wrote, but I don't agree with all of it.
I don't want any unnecessary localization changes, nor adding untranslated files to existing localizations.

I have prepared PR #1320 with changes that are imo OK.
So please have a look and leave some feedback there eventually.

Once that PR is in master, you can submit PR that will deal with Russian part of localizations.

I will close this PR as it is not relevant anymore.

vodek3 added 2 commits January 31, 2023 10:30

Correction of writing\spelling errors

7198fa1

Rebrand to Open-Shell

ac53c5a

ge0rdi requested changes Jan 31, 2023

View reviewed changes

ge0rdi requested a review from bonzibudd January 31, 2023 10:29

vodek3 force-pushed the master branch from afef060 to 1143698 Compare January 31, 2023 12:47

vodek3 force-pushed the master branch 2 times, most recently from 1143698 to ac53c5a Compare January 31, 2023 12:56

Change title of Help Window: Help -> Open-Shell Help

04fc8b3

Bringing the header of all html-files of Help to uniformity in all lo…

0885f19

…calizations

vodek3 force-pushed the master branch 2 times, most recently from abc469d to 0885f19 Compare January 31, 2023 14:55

vodek3 added 3 commits January 31, 2023 18:20

Adding a list of all used files to an HTML Help Workshop Project file…

98fbc61

… - OpenShell.hhp

OpenShell.hhp. Addition to list of files two added Chapters

524d441

Adding the ability to localize Immersive/Immersive7 skins

cbe915e

Russian transaltion Open-Shell#1318

6410143

vodek3 requested review from ge0rdi and removed request for bonzibudd February 1, 2023 07:12

ge0rdi requested a review from bonzibudd February 1, 2023 08:00

ge0rdi requested changes Feb 1, 2023

View reviewed changes

ge0rdi removed the request for review from bonzibudd February 1, 2023 13:16

Fix translation l#1318

70aa4db

ge0rdi closed this Feb 1, 2023

vodek3 mentioned this pull request Feb 1, 2023

Localization improvements #1320

Merged

		@@ -0,0 +1,143 @@
		<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">

Full localization in Open Shell #1317

Full localization in Open Shell #1317

Uh oh!

Conversation

vodek3 commented Jan 31, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

AppVeyorBot commented Jan 31, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vodek3 Feb 1, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ge0rdi commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

vodek3 commented Jan 31, 2023

ge0rdi commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

ge0rdi commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

ge0rdi commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

AppVeyorBot commented Jan 31, 2023

ge0rdi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vodek3 Feb 1, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

ge0rdi commented Feb 1, 2023

AppVeyorBot commented Feb 1, 2023

vodek3 commented Feb 1, 2023

ge0rdi commented Feb 1, 2023

Labels

3 participants

vodek3 commented Jan 31, 2023 •

edited

Loading

vodek3 Feb 1, 2023 •

edited

Loading

vodek3 Feb 1, 2023 •

edited

Loading