[PATCH] findmnt: (usage) add a needed equals sign before an optional argument

[PATCH] findmnt: (usage) add a needed equals sign before an optional argument

[Benno Schulenberg]

The argument of --kernel is optional, so an '=' is required when an
argument is specified.

Also tweak the wording, and add a semicolon between two phrases.

Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
---
 misc-utils/findmnt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 463537e69..83989c10e 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -1533,8 +1533,8 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -F, --tab-file <path>  alternative file for -s, -m or -k options\n"), out);
 	fputs(_(" -m, --mtab             search in table of mounted filesystems\n"
 		"                          (includes user space mount options)\n"), out);
-	fputs(_(" -k                     alias to '--kernel mountinfo'\n"), out);
-	fputs(_(" --kernel[=<method>]    search in kernel mount table (default)\n"
+	fputs(_(" -k                     an alias for '--kernel=mountinfo'\n"), out);
+	fputs(_(" --kernel[=<method>]    search in kernel mount table (default behavior);\n"
 		"                          <method> is mountinfo or listmount\n"), out);
 	fputs(_(" -N, --task <tid>       use alternative namespace (/proc/<tid>/mountinfo file)\n"), out);
 	fputs(_(" -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"), out);
-- 
2.51.0

Re: [PATCH] findmnt: (usage) add a needed equals sign before an optional argument

[Benno Schulenberg]

[-- Attachment #1.1: Type: text/plain, Size: 500 bytes --]


Op 11-09-2025 om 15:48 schreef Benno Schulenberg:
> -	fputs(_(" -k                     alias to '--kernel mountinfo'\n"), out);
> -	fputs(_(" --kernel[=<method>]    search in kernel mount table (default)\n"
> +	fputs(_(" -k                     an alias for '--kernel=mountinfo'\n"), out);
> +	fputs(_(" --kernel[=<method>]    search in kernel mount table (default behavior);\n"

Karel, do you want to roll an rc2, or shall I just make these changes in
rc1 POT file for the TP?


Benno


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

Re: [PATCH] findmnt: (usage) add a needed equals sign before an optional argument

[Karel Zak]

On Thu, Sep 11, 2025 at 03:51:48PM +0200, Benno Schulenberg wrote:
> 
> Op 11-09-2025 om 15:48 schreef Benno Schulenberg:
> > -	fputs(_(" -k                     alias to '--kernel mountinfo'\n"), out);
> > -	fputs(_(" --kernel[=<method>]    search in kernel mount table (default)\n"
> > +	fputs(_(" -k                     an alias for '--kernel=mountinfo'\n"), out);
> > +	fputs(_(" --kernel[=<method>]    search in kernel mount table (default behavior);\n"
> 
> Karel, do you want to roll an rc2, or shall I just make these changes in
> rc1 POT file for the TP?

I think RC1 is sufficient for translations for stable releases; we
don’t need as long a stabilization period as for major releases.
That’s why I asked for an update on TP.

Or do you think including stable release updates on TP is overkill?

We haven’t done this in recent years, but the number of translated
strings is growing, so updating more often might be better, and x.y.2
releases are usually the last for the branch.

I’m open to advices; I don’t have a strong opinion on this.

    Karel


-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH] findmnt: (usage) add a needed equals sign before an optional argument

[Benno Schulenberg]

[-- Attachment #1.1: Type: text/plain, Size: 1279 bytes --]


Op 12-09-2025 om 15:18 schreef Karel Zak:
> On Thu, Sep 11, 2025 at 03:51:48PM +0200, Benno Schulenberg wrote:
>>
>> Op 11-09-2025 om 15:48 schreef Benno Schulenberg:
>>> -	fputs(_(" -k                     alias to '--kernel mountinfo'\n"), out);
>>> -	fputs(_(" --kernel[=<method>]    search in kernel mount table (default)\n"
>>> +	fputs(_(" -k                     an alias for '--kernel=mountinfo'\n"), out);
>>> +	fputs(_(" --kernel[=<method>]    search in kernel mount table (default behavior);\n"
>>
>> Karel, do you want to roll an rc2, or shall I just make these changes in
>> rc1 POT file for the TP?
> 
> I think RC1 is sufficient for translations for stable releases; we
> don’t need as long a stabilization period as for major releases.
> That’s why I asked for an update on TP.
> 
> Or do you think including stable release updates on TP is overkill?

No -- offering stable dot releases for translation is fine,
as long as the string changes are the same as made in master.

What I'm asking is: will you apply the patch (both to master
and to the stable branch)?  If yes, then I'll edit the rc1 POT
file to correspond with those changes.  (I don't want to offer
a faulty string and then see it corrected in the next POT.)


Benno


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

Re: [PATCH] findmnt: (usage) add a needed equals sign before an optional argument

[Karel Zak]

On Fri, Sep 12, 2025 at 04:47:57PM +0200, Benno Schulenberg wrote:
> 
> Op 12-09-2025 om 15:18 schreef Karel Zak:
> > On Thu, Sep 11, 2025 at 03:51:48PM +0200, Benno Schulenberg wrote:
> > > 
> > > Op 11-09-2025 om 15:48 schreef Benno Schulenberg:
> > > > -	fputs(_(" -k                     alias to '--kernel mountinfo'\n"), out);
> > > > -	fputs(_(" --kernel[=<method>]    search in kernel mount table (default)\n"
> > > > +	fputs(_(" -k                     an alias for '--kernel=mountinfo'\n"), out);
> > > > +	fputs(_(" --kernel[=<method>]    search in kernel mount table (default behavior);\n"
> > > 
> > > Karel, do you want to roll an rc2, or shall I just make these changes in
> > > rc1 POT file for the TP?
> > 
> > I think RC1 is sufficient for translations for stable releases; we
> > don’t need as long a stabilization period as for major releases.
> > That’s why I asked for an update on TP.
> > 
> > Or do you think including stable release updates on TP is overkill?
> 
> No -- offering stable dot releases for translation is fine,
> as long as the string changes are the same as made in master.

Changes in the stable branches will always be a subset of changes in
the master branch.

The stable branch is almost always about backports (see "cherry-picked
from" in the commit messages of 'git log stable/v2.41'), whereas in
the master branch we often make more invasive changes.

Also note that before a new master release I always sync po/ and
po-man/ against the latest translations from TP. This means the
initial versions of the po/ and po-man/ strings in the major release
2.42 will be from 2.41.2 (or so).

> What I'm asking is: will you apply the patch (both to master
> and to the stable branch)?  If yes, then I'll edit the rc1 POT
> file to correspond with those changes.  (I don't want to offer
> a faulty string and then see it corrected in the next POT.)

When translators are working on strings, it's best to keep them frozen
and do string fixes in the next release (or next -rc). So I have
applied the patch to the master branch only for now. OK?

For a major release (e.g., v2.42), it would be best to do string
translations twice before the final release to allow time to fix
strings and finalize the translations. Maybe for the final release
it would be best to have

-rc1 ... stabilization only, no translations
-rc2 ... translations, string fixes from translators
-rc3 ... final translations

But I'm not sure translators are ready for such repetitive work
(although the second update will probably be quite small).

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH] findmnt: (usage) add a needed equals sign before an optional argument

[Benno Schulenberg]

[-- Attachment #1.1: Type: text/plain, Size: 1254 bytes --]


Op 15-09-2025 om 11:22 schreef Karel Zak:
> When translators are working on strings, it's best to keep them frozen

Translators are currently not working on the strings for 2.41.2,
because I haven't announced the POT file yet.  So it is fine to
still make changes also to the branch.

> and do string fixes in the next release (or next -rc). So I have
> applied the patch to the master branch only for now. OK?

Not OK.  As said: I don't want to offer a faulty string.  Please
apply the patch also to the 2.41 stable branch, so that I can
announce a  better POT file (I will edit it in place -- no need
for another rc release).

> For a major release (e.g., v2.42), it would be best to do string
> translations twice before the final release to allow time to fix
> strings and finalize the translations. Maybe for the final release
> it would be best to have
> 
> -rc1 ... stabilization only, no translations
> -rc2 ... translations, string fixes from translators
> -rc3 ... final translations

That sounds fine.

> But I'm not sure translators are ready for such repetitive work
> (although the second update will probably be quite small).

Ideally I should catch the faulty strings before you make the rc2.


Benno


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

Re: [PATCH] findmnt: (usage) add a needed equals sign before an optional argument

[Karel Zak]

On Mon, Sep 15, 2025 at 11:51:01AM +0200, Benno Schulenberg wrote:
> > and do string fixes in the next release (or next -rc). So I have
> > applied the patch to the master branch only for now. OK?
> 
> Not OK.  As said: I don't want to offer a faulty string.  Please
> apply the patch also to the 2.41 stable branch, so that I can
> announce a  better POT file (I will edit it in place -- no need
> for another rc release).

OK, done. Applied to the stable branch, you can edit it in place.

> > For a major release (e.g., v2.42), it would be best to do string
> > translations twice before the final release to allow time to fix
> > strings and finalize the translations. Maybe for the final release
> > it would be best to have
> > 
> > -rc1 ... stabilization only, no translations
> > -rc2 ... translations, string fixes from translators
> > -rc3 ... final translations
> 
> That sounds fine.
> 
> > But I'm not sure translators are ready for such repetitive work
> > (although the second update will probably be quite small).
> 
> Ideally I should catch the faulty strings before you make the rc2.

Yes, that would be best; we can avoid -rc3 and have all strings ready
for -rc2.

Thanks!

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com