[dm-crypt] cryptsetup 1.5.0-rc2 messages questions

[dm-crypt] cryptsetup 1.5.0-rc2 messages questions

[Petr Pisar]

[-- Attachment #1: Type: text/plain, Size: 1113 bytes --]

Hello,

while updating Czech translation for cryptsetup 1.5.0-rc2, I found few issues
I'd like to clarify.

(1) Message:

#: src/cryptsetup_reencrypt.c:1249
msgid "[OPTION...] <device>"

is not properly internationalized:

    poptSetOtherOptionHelp(popt_context, N_("[OPTION...] <device>"));

As a result, the usage syntax is not fully localized:

$ ./src/cryptsetup-reencrypt --help
crypt_reencrypt 1.5.0-rc2
Použití: cryptsetup-reencrypt [OPTION...] <device>
      --version                        Vypíše verzi balíku

This is because there should be `_()' instead of `N_()'.

(2) It think message

#: src/cryptsetup_reencrypt.c:451
#, c-format
msgid "Log file %s exists, restarting reencryption.\n"

should be rephrased to `resuming reencryption' if I understand the
reencryption log correctly. `Restarting' means drop everything what has been
done till now and start again from the begining.

(3) There is missing space after the number 1.
#: src/cryptsetup_reencrypt.c:1288
msgid "Only values between 1MiB and 64 MiB allowed for reencryption block size."

-- Petr

[-- Attachment #2: Type: application/pgp-signature, Size: 230 bytes --]

Re: [dm-crypt] cryptsetup 1.5.0-rc2 messages questions

[Milan Broz]

On 06/25/2012 09:08 PM, Petr Pisar wrote:
> while updating Czech translation for cryptsetup 1.5.0-rc2, I found few issues
> I'd like to clarify.

There will be more cleanups needed, I added that to rc2 because this reencryption
tool can be useful for several people but it is still experimental.

Let me know if there are other changes needed.
(I guess ping on IRC works better in this case ;-)

>     poptSetOtherOptionHelp(popt_context, N_("[OPTION...] <device>"));

Hm. Then same problem is then in cryptsetup for years:

 N_("[OPTION...] <action> <action-specific>"));

> (2) It think message
> 
> #: src/cryptsetup_reencrypt.c:451
> #, c-format
> msgid "Log file %s exists, restarting reencryption.\n"
> 
> should be rephrased to `resuming reencryption' if I understand the
> reencryption log correctly. `Restarting' means drop everything what has been
> done till now and start again from the begining.

yes, I am using "suspending reencryption" elsewhere so resuming is definitely better.

> (3) There is missing space after the number 1.
> #: src/cryptsetup_reencrypt.c:1288
> msgid "Only values between 1MiB and 64 MiB allowed for reencryption block size."

ok, I'll change that.

Thanks,
Milan

Re: [dm-crypt] cryptsetup 1.5.0-rc2 messages questions

[Petr Pisar]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

On Mon, Jun 25, 2012 at 10:38:14PM +0200, Milan Broz wrote:
> On 06/25/2012 09:08 PM, Petr Pisar wrote:
> 
> >     poptSetOtherOptionHelp(popt_context, N_("[OPTION...] <device>"));
> 
> Hm. Then same problem is then in cryptsetup for years:
> 
>  N_("[OPTION...] <action> <action-specific>"));
> 
Yes. I checked popt sources, and obviously, application is reponsible for
translating the text. Following patch fixes it in all three main programs.

-- Petr

[-- Attachment #2: Type: application/pgp-signature, Size: 230 bytes --]

[dm-crypt] [PATCH] Pass help text to popt already translated

[Petr Písař]

popt does not process the text registered by poptSetOtherOptionHelp()
through gettext on its own. Application must do it.
---
 src/cryptsetup.c           |    2 +-
 src/cryptsetup_reencrypt.c |    2 +-
 src/veritysetup.c          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index 09d7510..1ca3287 100644
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -1326,7 +1326,7 @@ int main(int argc, const char **argv)
 
 	popt_context = poptGetContext(PACKAGE, argc, argv, popt_options, 0);
 	poptSetOtherOptionHelp(popt_context,
-	                       N_("[OPTION...] <action> <action-specific>"));
+	                       _("[OPTION...] <action> <action-specific>"));
 
 	while((r = poptGetNextOpt(popt_context)) > 0) {
 		unsigned long long ull_value;
diff --git a/src/cryptsetup_reencrypt.c b/src/cryptsetup_reencrypt.c
index a7b4509..7c0b985 100644
--- a/src/cryptsetup_reencrypt.c
+++ b/src/cryptsetup_reencrypt.c
@@ -1260,7 +1260,7 @@ int main(int argc, const char **argv)
 
 	popt_context = poptGetContext(PACKAGE, argc, argv, popt_options, 0);
 	poptSetOtherOptionHelp(popt_context,
-	                       N_("[OPTION...] <device>"));
+	                       _("[OPTION...] <device>"));
 
 	while((r = poptGetNextOpt(popt_context)) > 0) ;
 	if (r < -1)
diff --git a/src/veritysetup.c b/src/veritysetup.c
index 04691ba..d9bc048 100644
--- a/src/veritysetup.c
+++ b/src/veritysetup.c
@@ -517,7 +517,7 @@ int main(int argc, const char **argv)
 
 	popt_context = poptGetContext("verity", argc, argv, popt_options, 0);
 	poptSetOtherOptionHelp(popt_context,
-	                       N_("[OPTION...] <action> <action-specific>"));
+	                       _("[OPTION...] <action> <action-specific>"));
 
 	while((r = poptGetNextOpt(popt_context)) > 0) {
 		unsigned long long ull_value;
-- 
1.7.3.4

Re: [dm-crypt] [PATCH] Pass help text to popt already translated

[Milan Broz]

On 06/26/2012 08:41 PM, Petr Písař wrote:
> popt does not process the text registered by poptSetOtherOptionHelp()
> through gettext on its own. Application must do it.

Applied, thanks.

Milan