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

Petr Písař petr.pisar at atlas.cz
Tue Jun 26 20:41:16 CEST 2012


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



More information about the dm-crypt mailing list