Mark up strings for translation

ticket: 6918

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24961 dc483132-0cff-0310-8789-dd5450dbe970

2 files changed, 25 insertions, 22 deletions

diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c
index 162ea4215..7fe15449e 100644
--- a/src/kadmin/ktutil/ktutil.c
+++ b/src/kadmin/ktutil/ktutil.c
@@ -47,13 +47,13 @@ int main(argc, argv)
 
     retval = krb5_init_context(&kcontext);
     if (retval) {
-        com_err(argv[0], retval, "while initializing krb5");
+        com_err(argv[0], retval, _("while initializing krb5"));
         exit(1);
     }
     sci_idx = ss_create_invocation("ktutil", "5.0", (char *)NULL,
                                    &ktutil_cmds, &retval);
     if (retval) {
-        ss_perror(sci_idx, retval, "creating invocation");
+        ss_perror(sci_idx, retval, _("creating invocation"));
         exit(1);
     }
     retval = ss_listen(sci_idx);
@@ -68,12 +68,12 @@ void ktutil_clear_list(argc, argv)
     krb5_error_code retval;
 
     if (argc != 1) {
-        fprintf(stderr, "%s: invalid arguments\n", argv[0]);
+        fprintf(stderr, _("%s: invalid arguments\n"), argv[0]);
         return;
     }
     retval = ktutil_free_kt_list(kcontext, ktlist);
     if (retval)
-        com_err(argv[0], retval, "while freeing ktlist");
+        com_err(argv[0], retval, _("while freeing ktlist"));
     ktlist = NULL;
 }
 
@@ -84,12 +84,12 @@ void ktutil_read_v5(argc, argv)
     krb5_error_code retval;
 
     if (argc != 2) {
-        fprintf(stderr, "%s: must specify keytab to read\n", argv[0]);
+        fprintf(stderr, _("%s: must specify keytab to read\n"), argv[0]);
         return;
     }
     retval = ktutil_read_keytab(kcontext, argv[1], &ktlist);
     if (retval)
-        com_err(argv[0], retval, "while reading keytab \"%s\"", argv[1]);
+        com_err(argv[0], retval, _("while reading keytab \"%s\""), argv[1]);
 }
 
 void ktutil_read_v4(argc, argv)
@@ -99,12 +99,12 @@ void ktutil_read_v4(argc, argv)
     krb5_error_code retval;
 
     if (argc != 2) {
-        fprintf(stderr, "%s: must specify the srvtab to read\n", argv[0]);
+        fprintf(stderr, _("%s: must specify the srvtab to read\n"), argv[0]);
         return;
     }
     retval = ktutil_read_srvtab(kcontext, argv[1], &ktlist);
     if (retval)
-        com_err(argv[0], retval, "while reading srvtab \"%s\"", argv[1]);
+        com_err(argv[0], retval, _("while reading srvtab \"%s\""), argv[1]);
 }
 
 void ktutil_write_v5(argc, argv)
@@ -114,19 +114,20 @@ void ktutil_write_v5(argc, argv)
     krb5_error_code retval;
 
     if (argc != 2) {
-        fprintf(stderr, "%s: must specify keytab to write\n", argv[0]);
+        fprintf(stderr, _("%s: must specify keytab to write\n"), argv[0]);
         return;
     }
     retval = ktutil_write_keytab(kcontext, ktlist, argv[1]);
     if (retval)
-        com_err(argv[0], retval, "while writing keytab \"%s\"", argv[1]);
+        com_err(argv[0], retval, _("while writing keytab \"%s\""), argv[1]);
 }
 
 void ktutil_write_v4(argc, argv)
     int argc;
     char *argv[];
 {
-    fprintf(stderr, "%s: writing srvtabs is no longer supported\n", argv[0]);
+    fprintf(stderr, _("%s: writing srvtabs is no longer supported\n"),
+            argv[0]);
 }
 
 void ktutil_add_entry(argc, argv)
@@ -163,14 +164,14 @@ void ktutil_add_entry(argc, argv)
     }
 
     if (argc != 8 || !(princ && kvno && enctype) || (use_pass+use_key != 1)) {
-        fprintf(stderr, "usage: %s (-key | -password) -p principal "
-                "-k kvno -e enctype\n", argv[0]);
+        fprintf(stderr, _("usage: %s (-key | -password) -p principal "
+                          "-k kvno -e enctype\n"), argv[0]);
         return;
     }
 
     retval = ktutil_add(kcontext, &ktlist, princ, kvno, enctype, use_pass);
     if (retval)
-        com_err(argv[0], retval, "while adding new entry");
+        com_err(argv[0], retval, _("while adding new entry"));
 }
 
 void ktutil_delete_entry(argc, argv)
@@ -180,12 +181,12 @@ void ktutil_delete_entry(argc, argv)
     krb5_error_code retval;
 
     if (argc != 2) {
-        fprintf(stderr, "%s: must specify entry to delete\n", argv[0]);
+        fprintf(stderr, _("%s: must specify entry to delete\n"), argv[0]);
         return;
     }
     retval = ktutil_delete(kcontext, &ktlist, atoi(argv[1]));
     if (retval)
-        com_err(argv[0], retval, "while deleting entry %d", atoi(argv[1]));
+        com_err(argv[0], retval, _("while deleting entry %d"), atoi(argv[1]));
 }
 
 void ktutil_list(argc, argv)
@@ -213,9 +214,10 @@ void ktutil_list(argc, argv)
             continue;
         }
 
-        fprintf(stderr, "%s: usage: %s [-t] [-k] [-e]\n", argv[0], argv[0]);
+        fprintf(stderr, _("%s: usage: %s [-t] [-k] [-e]\n"), argv[0], argv[0]);
         return;
     }
+    /* XXX Translating would disturb table alignment; skip for now. */
     if (show_time) {
         printf("slot KVNO Timestamp         Principal\n");
         printf("---- ---- ----------------- ---------------------------------------------------\n");
@@ -251,7 +253,8 @@ void ktutil_list(argc, argv)
             static char buf[256];
             if ((retval = krb5_enctype_to_name(lp->entry->key.enctype, FALSE,
                                                buf, sizeof(buf)))) {
-                com_err(argv[0], retval, "While converting enctype to string");
+                com_err(argv[0], retval,
+                        _("While converting enctype to string"));
                 return;
             }
             printf(" (%s) ", buf);
diff --git a/src/kadmin/ktutil/ktutil_funcs.c b/src/kadmin/ktutil/ktutil_funcs.c
index 91cad6b07..20a348c80 100644
--- a/src/kadmin/ktutil/ktutil_funcs.c
+++ b/src/kadmin/ktutil/ktutil_funcs.c
@@ -159,7 +159,7 @@ krb5_error_code ktutil_add(context, list, princ_str, kvno,
             goto cleanup;
         }
 
-        snprintf(promptstr, sizeof(promptstr), "Password for %.1000s",
+        snprintf(promptstr, sizeof(promptstr), _("Password for %.1000s"),
                  princ_str);
         retval = krb5_read_password(context, promptstr, NULL, password.data,
                                     &password.length);
@@ -176,7 +176,7 @@ krb5_error_code ktutil_add(context, list, princ_str, kvno,
         password.length = 0;
         lp->entry->key = key;
     } else {
-        printf("Key for %s (hex): ", princ_str);
+        printf(_("Key for %s (hex): "), princ_str);
         fgets(buf, BUFSIZ, stdin);
         /*
          * We need to get rid of the trailing '\n' from fgets.
@@ -188,7 +188,7 @@ krb5_error_code ktutil_add(context, list, princ_str, kvno,
          */
         buf[strlen(buf) - 1] = strlen(buf) % 2 ? '\0' : '0';
         if (strlen(buf) == 0) {
-            fprintf(stderr, "addent: Error reading key.\n");
+            fprintf(stderr, _("addent: Error reading key.\n"));
             retval = 0;
             goto cleanup;
         }
@@ -203,7 +203,7 @@ krb5_error_code ktutil_add(context, list, princ_str, kvno,
         i = 0;
         for (cp = buf; *cp; cp += 2) {
             if (!isxdigit((int) cp[0]) || !isxdigit((int) cp[1])) {
-                fprintf(stderr, "addent: Illegal character in key.\n");
+                fprintf(stderr, _("addent: Illegal character in key.\n"));
                 retval = 0;
                 goto cleanup;
             }