Translations are being placed incorrectly for addonUpdater

[XLTechie]

While things at least look normal on SRT, for some reason when pulling translations for the addonUpdater add-on from the nvdaaddons/addonUpdater repo's stable branch, the translations have an extra path element that makes them difficult to merge.
It also makes the histories diverge when trying to merge main back into stable.

Instead of:

addon/locale/<language-code>/LC_MESSAGES/nvda.po

The files are placed in:

addon/locale/<language-code>/add-ons/LC_MESSAGES/nvda.po

Here is a fragment from the latest attempt to merge stable into main.

 addon/locale/cs/add-ons/LC_MESSAGES/nvda.po    | 352 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  addon/locale/da/add-ons/LC_MESSAGES/nvda.po    | 362 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
   addon/locale/de/add-ons/LC_MESSAGES/nvda.po    | 371 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
    addon/locale/es/add-ons/LC_MESSAGES/nvda.po    | 341 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
     addon/locale/fa/add-ons/LC_MESSAGES/nvda.po    | 356 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
      addon/locale/fi/add-ons/LC_MESSAGES/nvda.po    | 367 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
       addon/locale/fr/add-ons/LC_MESSAGES/nvda.po    | 368 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
        addon/locale/gl/add-ons/LC_MESSAGES/nvda.po    | 368 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
         addon/locale/hr/add-ons/LC_MESSAGES/nvda.po    | 367 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
          addon/locale/it/add-ons/LC_MESSAGES/nvda.po    | 357 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
           addon/locale/ka/add-ons/LC_MESSAGES/nvda.po    | 353 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
            addon/locale/ko/add-ons/LC_MESSAGES/nvda.po    | 350 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
             addon/locale/pl/add-ons/LC_MESSAGES/nvda.po    | 349 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
              addon/locale/pt_PT/add-ons/LC_MESSAGES/nvda.po | 363 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
               addon/locale/ro/add-ons/LC_MESSAGES/nvda.po    | 366 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
                addon/locale/ru/add-ons/LC_MESSAGES/nvda.po    | 344 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
                 addon/locale/sk/add-ons/LC_MESSAGES/nvda.po    | 345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
                  addon/locale/sr/add-ons/LC_MESSAGES/nvda.po    | 367 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
                   addon/locale/tr/add-ons/LC_MESSAGES/nvda.po    | 370 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
                    addon/locale/uk/add-ons/LC_MESSAGES/nvda.po    | 363 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
                     addon/locale/zh_CN/add-ons/LC_MESSAGES/nvda.po | 348 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
                      addon/locale/zh_TW/add-ons/LC_MESSAGES/nvda.po | 325 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
                       24 files changed, 8539 insertions(+)

CC @nvdaes @michaelDCurran
This is not new behavior, but I don't know how long it has been going on--maybe years.

[nvdaes]

@XLTechie , I don't imagine what is the cause of this. I prefer not to experiment with this.
I've loked into an old version of addonUpdater, sconstruct file, and mrconfig scripts, and I don't see the problem.
If you want, we may try to register the add-on again.
Or Mick may have a better idea.