alienvalkyrie alienvalkyrie This patch updates almost all comments and strings appropriately. It does not change:
The patch also includes some general typo and grammar fixes in affected lines.
I don't think it's worth the effort to go back and apply the same changes to S3_1 and S3_0 – maybe the string changes, but the comment changes probably aren't worth it.
Reply To alienvalkyrie
I don't think it's worth the effort to go back and apply the same changes to S3_1 and S3_0 – maybe the string changes, but the comment changes probably aren't worth it.
Targeting to 3.2, then. We can change that if you decide to provide patches for older branches.
--
There's one comment change that might need more work
- /* An actor unit is asking the player what to do. Don't steal his
+ /* An actor unit is asking the player what to do. Don't steal its
* focus. */
This is about player's focus, I think. With "its", it seems like it refers to the unit.
Reply To alienvalkyrie
* Some stuff in the m4 subdirectory, because I don't know exactly what that is and it seemed like someone else's code
Some of it comes from various upstreams (mostly gnulib), and gets updated (i.e. overwritten) with new versions, but some of it is our own. Ideally we should fix our own code that we're maintainers of, if there's any issues in there. Worth opening separate ticket to look in to that? (Probably better not to hold this main patch for that part)
alienvalkyrie Reply To cazfi
Reply To alienvalkyrie
* Some stuff in the m4 subdirectory, because I don't know exactly what that is and it seemed like someone else's code
Some of it comes from various upstreams (mostly gnulib), and gets updated (i.e. overwritten) with new versions, but some of it is our own. Ideally we should fix our own code that we're maintainers of, if there's any issues in there. Worth opening separate ticket to look in to that? (Probably better not to hold this main patch for that part)
The three affected files – iconv.m4, lib-link.m4 and lib-prefix.m4 – all have a copyright notice from the Free Software Foundation and credit someone named Bruno Haible, so I think it's safe to assume they belong to the first category.
alienvalkyrie Reply To cazfi
There's one comment change that might need more work - /* An actor unit is asking the player what to do. Don't steal his
+ /* An actor unit is asking the player what to do. Don't steal its
* focus. */ This is about player's focus, I think. With "its", it seems like it refers to the unit.
That's how I interpreted it – the unit currently has focus, so it's the unit's focus that would be taken away. The player's focus wouldn't really be stolen, just moved somewhere else.
Ultimately, it doesn't really matter; I rephrased it in a way that sidesteps the problem.
Reply To alienvalkyrie
Reply To cazfi
There's one comment change that might need more work - /* An actor unit is asking the player what to do. Don't steal his
+ /* An actor unit is asking the player what to do. Don't steal its
* focus. */ This is about player's focus, I think. With "its", it seems like it refers to the unit.That's how I interpreted it – the unit currently has focus, so it's the unit's focus that would be taken away. The player's focus wouldn't really be stolen, just moved somewhere else.
Ok, I had a wrong assumption about the context. The new version is fine anyway.
Pushed to master, and closing now, though I'm not convinced that porting this to S3_1 would be too much work for avoiding releasing freeciv-3.1 in 2024, or later, without such indications that we still live in nineteenth century.
Mostly in comments, but some /* TRANS: ... */ comments and translatable strings are affected as well.