[PATCH 1/1] replace some hardcoded values in printfs of options.c

[Andrei Kholodnyi]

replace log level hardcoded values
replace rate, volume, pitch hardcoded values
replace inet_socket and unix_socket
---
 po/hu.po                  |   33 +++++++++++++--------------------
 src/clients/say/options.c |    6 +++---
 src/server/options.c      |    8 ++++----
 3 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/po/hu.po b/po/hu.po
index db8ba43..6690c19 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -43,14 +43,12 @@ msgstr "Futtat??s ??n??ll?? alkalmaz??sk??nt\n"
 #: ../src/server/options.c:72
 #, c-format
 msgid "Start only if autospawn is not disabled\n"
-msgstr ""
-"Ind??t??s csak akkor, ha az autospawn be??ll??t??s nincs \n"
-" letiltva\n"
+msgstr "Ind??t??s csak akkor, ha az autospawn be??ll??t??s nincs letiltva\n"
 
 #: ../src/server/options.c:74
 #, c-format
-msgid "Set log level (1..5)\n"
-msgstr "A napl??z??s szintj??nek be??ll??t??sa (1..5)\n"
+msgid "Set log level (%d...%d)\n"
+msgstr "A napl??z??s szintj??nek be??ll??t??sa (%d...%d)\n"
 
 #: ../src/server/options.c:76
 #, c-format
@@ -59,21 +57,21 @@ msgstr "A napl??f??jlok el??r??si ??tj??nak megad??sa\n"
 
 #: ../src/server/options.c:78
 #, c-format
-msgid "Communication method to use %s\n"
-msgstr "A kommunik??ci??s m??d megad??sa %s\n"
+msgid "Communication method to use ('%s' or '%s')\n"
+msgstr "A kommunik??ci??s m??d megad??sa ('%s' vagy '%s')\n"
 
 #: ../src/server/options.c:80
 #, c-format
 msgid ""
-"Socket path to use for 'unix_socket' method (filesystem path or 'default')\n"
+"Socket path to use for '%s' method (filesystem path or '%s')\n"
 msgstr ""
-"Haszn??lt socket el??r??si ??t az unix socket m??dhoz \n"
-"(f??jlrendszer el??r??si ??tja, vagy az alapbe??ll??t??s haszn??lata)\n"
+"Haszn??lt socket el??r??si ??t az '%s' m??dhoz \n"
+"(f??jlrendszer el??r??si ??tja, vagy '%s')\n"
 
 #: ../src/server/options.c:82
 #, c-format
-msgid "Specify a port number for 'inet_socket' method\n"
-msgstr "Egy portsz??m megad??sa az inet socket m??dhoz\n"
+msgid "Specify a port number for '%s' method\n"
+msgstr "Egy portsz??m megad??sa az '%s' m??dhoz\n"
 
 #: ../src/server/options.c:84
 #, c-format
@@ -164,10 +162,10 @@ msgstr ""
 msgid "Set the rate of the speech\n"
 msgstr "A besz??dsebess??g be??ll??t??sa\n"
 
-#: ../src/clients/say/options.c:51 ../src/clients/say/options.c:56
+#: ../src/clients/say/options.c:51 ../src/clients/say/options.c:56 
../src/clients/say/options.c:61
 #, c-format
-msgid "(between -100 and +100, default: 0)\n"
-msgstr "(-100 ??s +100 k??z??tt, az alap??rtelmezett ??rt??k 0)\n"
+msgid "(between %+d and %+d, default: %d)\n"
+msgstr "(%+d ??s %+d k??z??tt, az alap??rtelmezett ??rt??k %d)\n"
 
 #: ../src/clients/say/options.c:54
 #, c-format
@@ -179,11 +177,6 @@ msgstr "A hangmagass??g be??ll??t??sa\n"
 msgid "Set the volume (intensity) of the speech\n"
 msgstr "A hanger?? be??ll??t??sa\n"
 
-#: ../src/clients/say/options.c:61
-#, c-format
-msgid "(between -100 and +100, default: 0) \n"
-msgstr "(-100 ??s +100 k??z??tt, az alap??rtelmezett ??rt??k 0)\n"
-
 #: ../src/clients/say/options.c:64
 #, c-format
 msgid "Set the output module\n"
diff --git a/src/clients/say/options.c b/src/clients/say/options.c
index 8d6fef3..a22a33c 100644
--- a/src/clients/say/options.c
+++ b/src/clients/say/options.c
@@ -48,17 +48,17 @@ options_print_help(char *argv[])
     printf("-r, --rate\t\t\t");
     printf(_("Set the rate of the speech\n"));
     printf("\t\t\t\t");
-    printf(_("(between -100 and +100, default: 0)\n"));
+    printf(_("(between %+d and %+d, default: %d)\n"), -100, 100, 0);
 
     printf("-p, --pitch\t\t\t");
     printf(_("Set the pitch of the speech\n"));
     printf("\t\t\t\t");
-    printf(_("(between -100 and +100, default: 0)\n"));
+    printf(_("(between %+d and %+d, default: %d)\n"), -100, 100, 0);
 
     printf("-i, --volume\t\t\t");
     printf(_("Set the volume (intensity) of the speech\n"));
     printf("\t\t\t\t");
-    printf(_("(between -100 and +100, default: 0) \n"));
+    printf(_("(between %+d and %+d, default: %d)\n"), -100, 100, 0);
 
     printf("-o, --output-module\t\t");
     printf(_("Set the output module\n"));
diff --git a/src/server/options.c b/src/server/options.c
index d90721b..3770cc7 100644
--- a/src/server/options.c
+++ b/src/server/options.c
@@ -71,15 +71,15 @@ options_print_help(char *argv[])
     printf("-a, --spawn\t\t");
     printf(_("Start only if autospawn is not disabled\n"));
     printf("-l, --log-level\t\t");
-    printf(_("Set log level (1..5)\n"));
+    printf(_("Set log level (%d...%d)\n"), 1, 5);
     printf("-L, --log-dir\t\t");
     printf(_("Set path to logging\n"));
     printf("-c, --communication-method\t");
-    printf(_("Communication method to use %s\n"), "(unix_socket or 
inet_socket)");
+    printf(_("Communication method to use ('%s' or '%s')\n"), "unix_socket", 
"inet_socket");
     printf("-S, --socket-path\t");
-    printf(_("Socket path to use for 'unix_socket' method (filesystem path or 
'default')\n"));
+    printf(_("Socket path to use for '%s' method (filesystem path or 
'%s')\n"), "unix_socket", "default");
     printf("-p, --port\t\t");
-    printf(_("Specify a port number for 'inet_socket' method\n"));
+    printf(_("Specify a port number for '%s' method\n"), "inet_socket");
     printf("-P, --pid-file\t\t");
     printf(_("Set path to pid file\n"));
     printf(_("-C, --config-dir\t"));
-- 
1.7.0.4