Ticket #45535

Spelling fixes ("Uknown", "transfered")

Date d'ouverture: 2022-08-31 23:32 Dernière mise à jour: 2022-09-09 06:35

Rapporteur:
Propriétaire:
Type:
État:
Atteints
Composant:
Priorité:
5 - moyen
Sévérité:
5 - moyen
Résolution:
Fixed
Fichier:
3

Détails

During updating of the Debian package, the Debian tool found those two spelling problems:

I: freeciv-server: spelling-error-in-binary Uknown Unknown usr/games/freeciv-ruledit I: freeciv-server: spelling-error-in-binary Uknown Unknown usr/games/freeciv-ruleup I: freeciv-server: spelling-error-in-binary Uknown Unknown usr/games/freeciv-server I: freeciv-server: spelling-error-in-binary transfered transferred usr/games/freeciv-ruledit I: freeciv-server: spelling-error-in-binary transfered transferred usr/games/freeciv-ruleup I: freeciv-server: spelling-error-in-binary transfered transferred usr/games/freeciv-server

The attached patch I'll attach in a seconds is a mass-sed-replace-style of the mispeslled words, (except ChangeLog, which I did not change)

Ticket History (3/12 Histories)

2022-08-31 23:32 Updated by: coldtobi
  • New Ticket "Spelling fixes" created
2022-09-02 12:49 Updated by: cazfi
  • Jalon Update from (Aucun) to 3.0.4 (atteints)
  • Composant Update from (Aucun) to General
2022-09-06 03:34 Updated by: cazfi
  • Summary Updated
2022-09-06 03:57 Updated by: cazfi
Commentaire

Slightly controversial part of this patch is that it touches .po files directly. Checking it through all the changes seem to be to English originals, however (no accident with some language where "transfered" would be a real word). And I think this is one of the cases where it makes sense to do changes directly to the .po files. Certainly no translation would need changing because of this typo fix in the original, so it's *better* not to unnecessarily fuzzy the translations.

- I've not looked what it takes to port this to later branches. I assume you don't want to do that, but it will be left to me?
- It touches freeciv-core.pot not present in the repository (generated file)
- There's some conflict with #45395. I'm not yet sure which one of the patches need to be rebased on top of the other, but likely #45395 goes in first, already before we get this one ready for all branches.
- The very sentence touched has also word 'inefective'

2022-09-06 04:31 Updated by: cazfi
Commentaire

Reply To cazfi

it's *better* not to unnecessarily fuzzy the translations.

Need to keep freeciv-i18n informed, though, as pushing the update to repo is not going to update the copies translators are working on, which can lead to all kind of chain reactions after they push in an update that accidentally reverts this msgid.

2022-09-06 04:42 Updated by: coldtobi
Commentaire

Reply To cazfi

Slightly controversial part of this patch is that it touches .po files directly. Checking it through all the changes seem to be to English originals, however (no accident with some language where "transfered" would be a real word). And I think this is one of the cases where it makes sense to do changes directly to the .po files. Certainly no translation would need changing because of this typo fix in the original, so it's *better* not to unnecessarily fuzzy the translations.

Yes, avoiding fuzz was my intention when adding the po files.

- I've not looked what it takes to port this to later branches. I assume you don't want to do that, but it will be left to me?
- It touches freeciv-core.pot not present in the repository (generated file)

Yes, this file should have been let out.

- There's some conflict with #45395. I'm not yet sure which one of the patches need to be rebased on top of the other, but likely #45395 goes in first, already before we get this one ready for all branches.
- The very sentence touched has also word 'inefective'

The patch to fix transferred was literally generated with

grep -r --files-with-match transfered * | xargs sed -i s/transfered/transferred/g

So possibly it is easier just do re-run that command on the branches you want to fix it and ignore my patch completly ;-) I guess it is sufficient just to fix it on "master",( at least for Debian, I will only pacakge "future" releases, not older ones. </selfishmode>)

Cheers, tobi

2022-09-06 06:40 Updated by: cazfi
Commentaire

I rebased this on top of my local patch stack for each branch.

Surprisingly once I had rebased it for S3_0, that commit cleanly cherry-picked to S3_1. I just had to add handling of one new occurrence of "transfered" in S3_1. And that commit then cleanly cherry-picked to master.

2022-09-06 06:40 Updated by: cazfi
  • Propriétaire Update from (Aucun) to cazfi
  • Résolution Update from Aucun to Accepted
2022-09-09 06:35 Updated by: cazfi
  • État Update from Ouvert to Atteints
  • Résolution Update from Accepted to Fixed

Modifier

Please login to add comment to this ticket » Connexion