Mark up strings for translation

ticket: 6918

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

1 files changed, 49 insertions, 42 deletions

diff --git a/src/kadmin/cli/keytab.c b/src/kadmin/cli/keytab.c
index d3c4a66a9b..2af8202837 100644
--- a/src/kadmin/cli/keytab.c
+++ b/src/kadmin/cli/keytab.c
@@ -64,16 +64,19 @@ static void
 add_usage()
 {
 #ifdef KADMIN_LOCAL
-    fprintf(stderr, "Usage: ktadd [-k[eytab] keytab] [-q] [-e keysaltlist] [-norandkey] [principal | -glob princ-exp] [...]\n");
+    fprintf(stderr, _("Usage: ktadd [-k[eytab] keytab] [-q] [-e keysaltlist] "
+                      "[-norandkey] [principal | -glob princ-exp] [...]\n"));
 #else
-    fprintf(stderr, "Usage: ktadd [-k[eytab] keytab] [-q] [-e keysaltlist] [principal | -glob princ-exp] [...]\n");
+    fprintf(stderr, _("Usage: ktadd [-k[eytab] keytab] [-q] [-e keysaltlist] "
+                      "[principal | -glob princ-exp] [...]\n"));
 #endif
 }
 
 static void
 rem_usage()
 {
-    fprintf(stderr, "Usage: ktremove [-k[eytab] keytab] [-q] principal [kvno|\"all\"|\"old\"]\n");
+    fprintf(stderr, _("Usage: ktremove [-k[eytab] keytab] [-q] principal "
+                      "[kvno|\"all\"|\"old\"]\n"));
 }
 
 static int
@@ -86,18 +89,18 @@ process_keytab(krb5_context my_context, char **keytab_str,
     if (name == NULL) {
         name = malloc(BUFSIZ);
         if (!name) {
-            com_err(whoami, ENOMEM, "while creating keytab name");
+            com_err(whoami, ENOMEM, _("while creating keytab name"));
             return 1;
         }
         code = krb5_kt_default(my_context, keytab);
         if (code != 0) {
-            com_err(whoami, code, "while opening default keytab");
+            com_err(whoami, code, _("while opening default keytab"));
             free(name);
             return 1;
         }
         code = krb5_kt_get_name(my_context, *keytab, name, BUFSIZ);
         if (code != 0) {
-            com_err(whoami, code, "while getting keytab name");
+            com_err(whoami, code, _("while getting keytab name"));
             free(name);
             return 1;
         }
@@ -107,13 +110,13 @@ process_keytab(krb5_context my_context, char **keytab_str,
         else if (asprintf(&name, "WRFILE:%s", name) < 0)
             name = NULL;
         if (name == NULL) {
-            com_err(whoami, ENOMEM, "while creating keytab name");
+            com_err(whoami, ENOMEM, _("while creating keytab name"));
             return 1;
         }
 
         code = krb5_kt_resolve(my_context, name, keytab);
         if (code != 0) {
-            com_err(whoami, code, "while resolving keytab %s", name);
+            com_err(whoami, code, _("while resolving keytab %s"), name);
             free(name);
             return 1;
         }
@@ -162,7 +165,7 @@ kadmin_keytab_add(int argc, char **argv)
             retval = krb5_string_to_keysalts(*++argv, ", \t", ":.-", 0,
                                              &ks_tuple, &n_ks_tuple);
             if (retval) {
-                com_err("ktadd", retval, "while parsing keysalts %s",
+                com_err("ktadd", retval, _("while parsing keysalts %s"),
                         *argv);
 
                 return;
@@ -179,7 +182,8 @@ kadmin_keytab_add(int argc, char **argv)
 
 #ifdef KADMIN_LOCAL
     if (norandkey && ks_tuple) {
-        fprintf(stderr, "cannot specify keysaltlist when not changing key\n");
+        fprintf(stderr,
+                _("cannot specify keysaltlist when not changing key\n"));
         return;
     }
 #endif
@@ -196,7 +200,7 @@ kadmin_keytab_add(int argc, char **argv)
 
             code = kadm5_get_principals(handle, *argv, &princs, &num);
             if (code) {
-                com_err(whoami, code, "while expanding expression \"%s\".",
+                com_err(whoami, code, _("while expanding expression \"%s\"."),
                         *argv);
                 argv++;
                 continue;
@@ -215,7 +219,7 @@ kadmin_keytab_add(int argc, char **argv)
 
     code = krb5_kt_close(context, keytab);
     if (code != 0)
-        com_err(whoami, code, "while closing keytab");
+        com_err(whoami, code, _("while closing keytab"));
 
     free(keytab_str);
 }
@@ -255,7 +259,7 @@ kadmin_keytab_remove(int argc, char **argv)
 
     code = krb5_kt_close(context, keytab);
     if (code != 0)
-        com_err(whoami, code, "while closing keytab");
+        com_err(whoami, code, _("while closing keytab"));
 
     free(keytab_str);
 }
@@ -279,7 +283,7 @@ add_principal(void *lhandle, char *keytab_str, krb5_keytab keytab,
 
     code = krb5_parse_name(context, princ_str, &princ);
     if (code != 0) {
-        com_err(whoami, code, "while parsing -add principal name %s",
+        com_err(whoami, code, _("while parsing -add principal name %s"),
                 princ_str);
         goto cleanup;
     }
@@ -296,17 +300,17 @@ add_principal(void *lhandle, char *keytab_str, krb5_keytab keytab,
             code = kadm5_randkey_principal(lhandle, princ, &keys, &nkeys);
     if (code != 0) {
         if (code == KADM5_UNK_PRINC) {
-            fprintf(stderr, "%s: Principal %s does not exist.\n",
+            fprintf(stderr, _("%s: Principal %s does not exist.\n"),
                     whoami, princ_str);
         } else
-            com_err(whoami, code, "while changing %s's key", princ_str);
+            com_err(whoami, code, _("while changing %s's key"), princ_str);
         goto cleanup;
     }
 
     code = kadm5_get_principal(lhandle, princ, &princ_rec,
                                KADM5_PRINCIPAL_NORMAL_MASK);
     if (code != 0) {
-        com_err(whoami, code, "while retrieving principal");
+        com_err(whoami, code, _("while retrieving principal"));
         goto cleanup;
     }
 
@@ -318,14 +322,14 @@ add_principal(void *lhandle, char *keytab_str, krb5_keytab keytab,
 
         code = krb5_kt_add_entry(context, keytab, &new_entry);
         if (code != 0) {
-            com_err(whoami, code, "while adding key to keytab");
+            com_err(whoami, code, _("while adding key to keytab"));
             kadm5_free_principal_ent(lhandle, &princ_rec);
             goto cleanup;
         }
 
         if (!quiet) {
-            printf("Entry for principal %s with kvno %d, "
-                   "encryption type %s added to keytab %s.\n",
+            printf(_("Entry for principal %s with kvno %d, "
+                     "encryption type %s added to keytab %s.\n"),
                    princ_str, princ_rec.kvno,
                    etype_string(keys[i].enctype), keytab_str);
         }
@@ -333,7 +337,7 @@ add_principal(void *lhandle, char *keytab_str, krb5_keytab keytab,
 
     code = kadm5_free_principal_ent(lhandle, &princ_rec);
     if (code != 0) {
-        com_err(whoami, code, "while freeing principal entry");
+        com_err(whoami, code, _("while freeing principal entry"));
         goto cleanup;
     }
 
@@ -357,7 +361,7 @@ remove_principal(char *keytab_str, krb5_keytab keytab,
 
     code = krb5_parse_name(context, princ_str, &princ);
     if (code != 0) {
-        com_err(whoami, code, "while parsing principal name %s", princ_str);
+        com_err(whoami, code, _("while parsing principal name %s"), princ_str);
         return;
     }
 
@@ -380,20 +384,22 @@ remove_principal(char *keytab_str, krb5_keytab keytab,
     code = krb5_kt_get_entry(context, keytab, princ, kvno, 0, &entry);
     if (code != 0) {
         if (code == ENOENT) {
-            fprintf(stderr, "%s: Keytab %s does not exist.\n",
+            fprintf(stderr, _("%s: Keytab %s does not exist.\n"),
                     whoami, keytab_str);
         } else if (code == KRB5_KT_NOTFOUND) {
             if (mode != SPEC) {
-                fprintf(stderr, "%s: No entry for principal "
-                        "%s exists in keytab %s\n",
+                fprintf(stderr, _("%s: No entry for principal %s exists in "
+                                  "keytab %s\n"),
                         whoami, princ_str, keytab_str);
             } else {
-                fprintf(stderr, "%s: No entry for principal "
-                        "%s with kvno %d exists in keytab "
-                        "%s.\n", whoami, princ_str, kvno, keytab_str);
+                fprintf(stderr, _("%s: No entry for principal %s with kvno %d "
+                                  "exists in keytab %s\n"),
+                        whoami, princ_str, kvno, keytab_str);
             }
-        } else
-            com_err(whoami, code, "while retrieving highest kvno from keytab");
+        } else {
+            com_err(whoami, code,
+                    _("while retrieving highest kvno from keytab"));
+        }
         return;
     }
 
@@ -404,7 +410,7 @@ remove_principal(char *keytab_str, krb5_keytab keytab,
 
     code = krb5_kt_start_seq_get(context, keytab, &cursor);
     if (code != 0) {
-        com_err(whoami, code, "while starting keytab scan");
+        com_err(whoami, code, _("while starting keytab scan"));
         return;
     }
 
@@ -424,35 +430,36 @@ remove_principal(char *keytab_str, krb5_keytab keytab,
              */
             code = krb5_kt_end_seq_get(context, keytab, &cursor);
             if (code != 0) {
-                com_err(whoami, code, "while temporarily ending keytab scan");
+                com_err(whoami, code,
+                        _("while temporarily ending keytab scan"));
                 return;
             }
             code = krb5_kt_remove_entry(context, keytab, &entry);
             if (code != 0) {
-                com_err(whoami, code, "while deleting entry from keytab");
+                com_err(whoami, code, _("while deleting entry from keytab"));
                 return;
             }
             code = krb5_kt_start_seq_get(context, keytab, &cursor);
             if (code != 0) {
-                com_err(whoami, code, "while restarting keytab scan");
+                com_err(whoami, code, _("while restarting keytab scan"));
                 return;
             }
 
             did_something++;
-            if (!quiet)
-                printf("Entry for principal %s with kvno %d "
-                       "removed from keytab %s.\n",
-                       princ_str, entry.vno, keytab_str);
+            if (!quiet) {
+                printf(_("Entry for principal %s with kvno %d removed from "
+                         "keytab %s.\n"), princ_str, entry.vno, keytab_str);
+            }
         }
         krb5_kt_free_entry(context, &entry);
     }
     if (code && code != KRB5_KT_END) {
-        com_err(whoami, code, "while scanning keytab");
+        com_err(whoami, code, _("while scanning keytab"));
         return;
     }
     code = krb5_kt_end_seq_get(context, keytab, &cursor);
     if (code) {
-        com_err(whoami, code, "while ending keytab scan");
+        com_err(whoami, code, _("while ending keytab scan"));
         return;
     }
 
@@ -462,8 +469,8 @@ remove_principal(char *keytab_str, krb5_keytab keytab,
      * prevent unexpected error messages...
      */
     if (!did_something && mode == OLD) {
-        fprintf(stderr, "%s: There is only one entry for principal "
-                "%s in keytab %s\n", whoami, princ_str, keytab_str);
+        fprintf(stderr, _("%s: There is only one entry for principal %s in "
+                          "keytab %s\n"), whoami, princ_str, keytab_str);
     }
 }