Mark up strings for translation

ticket: 6918

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

17 files changed, 737 insertions, 684 deletions

diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c
index 05561b671b..fedee85b1e 100644
--- a/src/kadmin/cli/kadmin.c
+++ b/src/kadmin/cli/kadmin.c
@@ -119,12 +119,16 @@ static void
 usage()
 {
     fprintf(stderr,
-            "Usage: %s [-r realm] [-p principal] [-q query] [clnt|local args]\n"
-            "\tclnt args: [-s admin_server[:port]] [[-c ccache]|[-k [-t keytab]]]|[-n]\n"
-            "\tlocal args: [-x db_args]* [-d dbname] [-e \"enc:salt ...\"] [-m]\n"
-            "where,\n\t[-x db_args]* - any number of database specific arguments.\n"
-            "\t\t\tLook at each database documentation for supported arguments\n",
-            whoami);
+            _("Usage: %s [-r realm] [-p principal] [-q query] "
+              "[clnt|local args]\n"
+              "\tclnt args: [-s admin_server[:port]] "
+              "[[-c ccache]|[-k [-t keytab]]]|[-n]\n"
+              "\tlocal args: [-x db_args]* [-d dbname] "
+              "[-e \"enc:salt ...\"] [-m]\n"
+              "where,\n\t[-x db_args]* - any number of database specific "
+              "arguments.\n"
+              "\t\t\tLook at each database documentation for supported "
+              "arguments\n"), whoami);
     exit(1);
 }
 
@@ -267,7 +271,7 @@ kadmin_startup(int argc, char *argv[])
 
     retval = kadm5_init_krb5_context(&context);
     if (retval) {
-        com_err(whoami, retval, "while initializing krb5 library");
+        com_err(whoami, retval, _("while initializing krb5 library"));
         exit(1);
     }
 
@@ -278,7 +282,8 @@ kadmin_startup(int argc, char *argv[])
             db_args_size++;
             db_args = realloc(db_args, sizeof(char*) * (db_args_size + 1));
             if (db_args == NULL) {
-                fprintf(stderr, "%s: Cannot initialize. Not enough memory\n",
+                fprintf(stderr,
+                        _("%s: Cannot initialize. Not enough memory\n"),
                         argv[0]);
                 exit(1);
             }
@@ -318,7 +323,8 @@ kadmin_startup(int argc, char *argv[])
             db_args_size++;
             db_args = realloc(db_args, sizeof(char*) * (db_args_size + 1));
             if (db_args == NULL) {
-                fprintf(stderr, "%s: Cannot initialize. Not enough memory\n",
+                fprintf(stderr,
+                        _("%s: Cannot initialize. Not enough memory\n"),
                         argv[0]);
                 exit(1);
             }
@@ -338,7 +344,8 @@ kadmin_startup(int argc, char *argv[])
                                              &params.keysalts,
                                              &params.num_keysalts);
             if (retval) {
-                com_err(whoami, retval, "while parsing keysalts %s", optarg);
+                com_err(whoami, retval, _("while parsing keysalts %s"),
+                        optarg);
                 exit(1);
             }
             params.mask |= KADM5_CONFIG_ENCTYPES;
@@ -360,7 +367,7 @@ kadmin_startup(int argc, char *argv[])
         usage();
 
     if (def_realm == NULL && krb5_get_default_realm(context, &def_realm)) {
-        fprintf(stderr, "%s: unable to get default realm\n", whoami);
+        fprintf(stderr, _("%s: unable to get default realm\n"), whoami);
         exit(1);
     }
 
@@ -379,13 +386,14 @@ kadmin_startup(int argc, char *argv[])
     if (ccache_name == NULL) {
         retval = krb5_cc_default(context, &cc);
         if (retval) {
-            com_err(whoami, retval, "while opening default credentials cache");
+            com_err(whoami, retval,
+                    _("while opening default credentials cache"));
             exit(1);
         }
     } else {
         retval = krb5_cc_resolve(context, ccache_name, &cc);
         if (retval) {
-            com_err(whoami, retval, "while opening credentials cache %s",
+            com_err(whoami, retval, _("while opening credentials cache %s"),
                     ccache_name);
             exit(1);
         }
@@ -407,7 +415,8 @@ kadmin_startup(int argc, char *argv[])
             !krb5_cc_get_principal(context, cc, &princ)) {
             retval = krb5_unparse_name(context, princ, &princstr);
             if (retval) {
-                com_err(whoami, retval, "while canonicalizing principal name");
+                com_err(whoami, retval,
+                        _("while canonicalizing principal name"));
                 exit(1);
             }
             krb5_free_principal(context, princ);
@@ -416,19 +425,20 @@ kadmin_startup(int argc, char *argv[])
             retval = krb5_sname_to_principal(context, NULL, "host",
                                              KRB5_NT_SRV_HST, &princ);
             if (retval) {
-                com_err(whoami, retval, "creating host service principal");
+                com_err(whoami, retval, _("creating host service principal"));
                 exit(1);
             }
             retval = krb5_unparse_name(context, princ, &princstr);
             if (retval) {
-                com_err(whoami, retval, "while canonicalizing principal name");
+                com_err(whoami, retval,
+                        _("while canonicalizing principal name"));
                 exit(1);
             }
             krb5_free_principal(context, princ);
             freeprinc++;
         } else if (!krb5_cc_get_principal(context, cc, &princ)) {
             if (krb5_unparse_name(context, princ, &canon)) {
-                fprintf(stderr, "%s: unable to canonicalize principal\n",
+                fprintf(stderr, _("%s: unable to canonicalize principal\n"),
                         whoami);
                 exit(1);
             }
@@ -452,7 +462,7 @@ kadmin_startup(int argc, char *argv[])
             if (asprintf(&princstr, "%s/admin%s%s", canon,
                          (realm) ? "@" : "",
                          (realm) ? realm : "") < 0) {
-                fprintf(stderr, "%s: out of memory\n", whoami);
+                fprintf(stderr, _("%s: out of memory\n"), whoami);
                 exit(1);
             }
             free(canon);
@@ -460,19 +470,19 @@ kadmin_startup(int argc, char *argv[])
             freeprinc++;
         } else if ((luser = getenv("USER"))) {
             if (asprintf(&princstr, "%s/admin@%s", luser, def_realm) < 0) {
-                fprintf(stderr, "%s: out of memory\n", whoami);
+                fprintf(stderr, _("%s: out of memory\n"), whoami);
                 exit(1);
             }
             freeprinc++;
         } else if ((pw = getpwuid(getuid()))) {
             if (asprintf(&princstr, "%s/admin@%s", pw->pw_name,
                          def_realm) < 0) {
-                fprintf(stderr, "%s: out of memory\n", whoami);
+                fprintf(stderr, _("%s: out of memory\n"), whoami);
                 exit(1);
             }
             freeprinc++;
         } else {
-            fprintf(stderr, "%s: unable to figure out a principal name\n",
+            fprintf(stderr, _("%s: unable to figure out a principal name\n"),
                     whoami);
             exit(1);
         }
@@ -480,7 +490,7 @@ kadmin_startup(int argc, char *argv[])
 
     retval = krb5_klog_init(context, "admin_server", whoami, 0);
     if (retval) {
-        com_err(whoami, retval, "while setting up logging");
+        com_err(whoami, retval, _("while setting up logging"));
         exit(1);
     }
 
@@ -489,29 +499,29 @@ kadmin_startup(int argc, char *argv[])
      * use it.  Otherwise, use/prompt for the password.
      */
     if (ccache_name) {
-        printf("Authenticating as principal %s with existing credentials.\n",
-               princstr);
+        printf(_("Authenticating as principal %s with existing "
+                 "credentials.\n"), princstr);
         retval = kadm5_init_with_creds(context, princstr, cc, svcname, &params,
                                        KADM5_STRUCT_VERSION,
                                        KADM5_API_VERSION_3, db_args, &handle);
     } else if (use_anonymous) {
-        printf("Authenticating as principal %s with password; "
-               "anonymous requested.\n", princstr);
+        printf(_("Authenticating as principal %s with password; "
+                 "anonymous requested.\n"), princstr);
         retval = kadm5_init_anonymous(context, princstr, svcname, &params,
                                       KADM5_STRUCT_VERSION,
                                       KADM5_API_VERSION_3, db_args, &handle);
     } else if (use_keytab) {
         if (keytab_name)
-            printf("Authenticating as principal %s with keytab %s.\n",
+            printf(_("Authenticating as principal %s with keytab %s.\n"),
                    princstr, keytab_name);
         else
-            printf("Authenticating as principal %s with default keytab.\n",
+            printf(_("Authenticating as principal %s with default keytab.\n"),
                    princstr);
         retval = kadm5_init_with_skey(context, princstr, keytab_name, svcname,
                                       &params, KADM5_STRUCT_VERSION,
                                       KADM5_API_VERSION_3, db_args, &handle);
     } else {
-        printf("Authenticating as principal %s with password.\n",
+        printf(_("Authenticating as principal %s with password.\n"),
                princstr);
         retval = kadm5_init_with_password(context, princstr, password, svcname,
                                           &params, KADM5_STRUCT_VERSION,
@@ -519,7 +529,7 @@ kadmin_startup(int argc, char *argv[])
                                           &handle);
     }
     if (retval) {
-        com_err(whoami, retval, "while initializing %s interface", whoami);
+        com_err(whoami, retval, _("while initializing %s interface"), whoami);
         if (retval == KADM5_BAD_CLIENT_PARAMS ||
             retval == KADM5_BAD_SERVER_PARAMS)
             usage();
@@ -533,7 +543,7 @@ kadmin_startup(int argc, char *argv[])
 
     retval = krb5_cc_close(context, cc);
     if (retval) {
-        com_err(whoami, retval, "while closing ccache %s", ccache_name);
+        com_err(whoami, retval, _("while closing ccache %s"), ccache_name);
         exit(1);
     }
 
@@ -554,15 +564,17 @@ quit()
     if (locked) {
         retval = kadm5_unlock(handle);
         if (retval) {
-            com_err("quit", retval, "while unlocking locked database");
+            com_err("quit", retval, _("while unlocking locked database"));
             return 1;
         }
         locked = 0;
     }
 
     kadm5_destroy(handle);
-    if (ccache_name != NULL)
-        fprintf(stderr, "\n\a\a\aAdministration credentials NOT DESTROYED.\n");
+    if (ccache_name != NULL) {
+        fprintf(stderr, "\n\a\a\a%s",
+                _("Administration credentials NOT DESTROYED.\n"));
+    }
 
     /* insert more random cleanup here */
     krb5_klog_close(context);
@@ -610,36 +622,38 @@ kadmin_delprinc(int argc, char *argv[])
 
     if (! (argc == 2 ||
            (argc == 3 && !strcmp("-force", argv[1])))) {
-        fprintf(stderr, "usage: delete_principal [-force] principal\n");
+        fprintf(stderr, _("usage: delete_principal [-force] principal\n"));
         return;
     }
     retval = kadmin_parse_name(argv[argc - 1], &princ);
     if (retval) {
-        com_err("delete_principal", retval, "while parsing principal name");
+        com_err("delete_principal", retval, _("while parsing principal name"));
         return;
     }
     retval = krb5_unparse_name(context, princ, &canon);
     if (retval) {
-        com_err("delete_principal", retval, "while canonicalizing principal");
+        com_err("delete_principal", retval,
+                _("while canonicalizing principal"));
         goto cleanup;
     }
     if (argc == 2) {
-        printf("Are you sure you want to delete the principal \"%s\"? "
-               "(yes/no): ", canon);
+        printf(_("Are you sure you want to delete the principal \"%s\"? "
+                 "(yes/no): "), canon);
         fgets(reply, sizeof (reply), stdin);
         if (strcmp("yes\n", reply)) {
-            fprintf(stderr, "Principal \"%s\" not deleted\n", canon);
+            fprintf(stderr, _("Principal \"%s\" not deleted\n"), canon);
             goto cleanup;
         }
     }
     retval = kadm5_delete_principal(handle, princ);
     if (retval) {
         com_err("delete_principal", retval,
-                "while deleting principal \"%s\"", canon);
+                _("while deleting principal \"%s\""), canon);
         goto cleanup;
     }
-    printf("Principal \"%s\" deleted.\nMake sure that you have removed this "
-           "principal from all ACLs before reusing.\n", canon);
+    printf(_("Principal \"%s\" deleted.\n"), canon);
+    printf(_("Make sure that you have removed this principal from all ACLs "
+             "before reusing.\n"));
 
 cleanup:
     krb5_free_principal(context, princ);
@@ -655,52 +669,53 @@ kadmin_renameprinc(int argc, char *argv[])
     char reply[5];
 
     if (!(argc == 3 || (argc == 4 && !strcmp("-force", argv[1])))) {
-        fprintf(stderr, "usage: rename_principal [-force] old_principal "
-                "new_principal\n");
+        fprintf(stderr, _("usage: rename_principal [-force] old_principal "
+                          "new_principal\n"));
         return;
     }
     retval = kadmin_parse_name(argv[argc - 2], &oprinc);
     if (retval) {
         com_err("rename_principal", retval,
-                "while parsing old principal name");
+                _("while parsing old principal name"));
         goto cleanup;
     }
     retval = kadmin_parse_name(argv[argc - 1], &nprinc);
     if (retval) {
         com_err("rename_principal", retval,
-                "while parsing new principal name");
+                _("while parsing new principal name"));
         goto cleanup;
     }
     retval = krb5_unparse_name(context, oprinc, &ocanon);
     if (retval) {
         com_err("rename_principal", retval,
-                "while canonicalizing old principal");
+                _("while canonicalizing old principal"));
         goto cleanup;
     }
     retval = krb5_unparse_name(context, nprinc, &ncanon);
     if (retval) {
         com_err("rename_principal", retval,
-                "while canonicalizing new principal");
+                _("while canonicalizing new principal"));
         goto cleanup;
     }
     if (argc == 3) {
-        printf("Are you sure you want to rename the principal \"%s\" "
-               "to \"%s\"? (yes/no): ", ocanon, ncanon);
+        printf(_("Are you sure you want to rename the principal \"%s\" "
+                 "to \"%s\"? (yes/no): "), ocanon, ncanon);
         fgets(reply, sizeof(reply), stdin);
         if (strcmp("yes\n", reply)) {
-            fprintf(stderr, "Principal \"%s\" not renamed\n", ocanon);
+            fprintf(stderr, _("Principal \"%s\" not renamed\n"), ocanon);
             goto cleanup;
         }
     }
     retval = kadm5_rename_principal(handle, oprinc, nprinc);
     if (retval) {
         com_err("rename_principal", retval,
-                "while renaming principal \"%s\" to \"%s\"", ocanon, ncanon);
+                _("while renaming principal \"%s\" to \"%s\""),
+                ocanon, ncanon);
         goto cleanup;
     }
-    printf("Principal \"%s\" renamed to \"%s\".\n"
-           "Make sure that you have removed the old principal from all ACLs "
-           "before reusing.\n", ocanon, ncanon);
+    printf(_("Principal \"%s\" renamed to \"%s\".\n"), ocanon, ncanon);
+    printf(_("Make sure that you have removed the old principal from all ACLs "
+             "before reusing.\n"));
 
 cleanup:
     krb5_free_principal(context, nprinc);
@@ -714,8 +729,8 @@ cpw_usage(const char *str)
 {
     if (str)
         fprintf(stderr, "%s\n", str);
-    fprintf(stderr, "usage: change_password [-randkey] [-keepold] "
-            "[-e keysaltlist] [-pw password] principal\n");
+    fprintf(stderr, _("usage: change_password [-randkey] [-keepold] "
+                      "[-e keysaltlist] [-pw password] principal\n"));
 }
 
 void
@@ -740,13 +755,13 @@ kadmin_cpw(int argc, char *argv[])
         if (!strcmp("-x", *argv)) {
             argc--;
             if (argc < 1) {
-                cpw_usage("change_password: missing db argument");
+                cpw_usage(_("change_password: missing db argument"));
                 goto cleanup;
             }
             db_args_size++;
             db_args = realloc(db_args, sizeof(char*) * (db_args_size + 1));
             if (db_args == NULL) {
-                fprintf(stderr, "change_password: Not enough memory\n");
+                fprintf(stderr, _("change_password: Not enough memory\n"));
                 exit(1);
             }
             db_args[db_args_size - 1] = *++argv;
@@ -754,7 +769,7 @@ kadmin_cpw(int argc, char *argv[])
         } else if (!strcmp("-pw", *argv)) {
             argc--;
             if (argc < 1) {
-                cpw_usage("change_password: missing password arg");
+                cpw_usage(_("change_password: missing password arg"));
                 goto cleanup;
             }
             pwarg = *++argv;
@@ -765,14 +780,14 @@ kadmin_cpw(int argc, char *argv[])
         } else if (!strcmp("-e", *argv)) {
             argc--;
             if (argc < 1) {
-                cpw_usage("change_password: missing keysaltlist arg");
+                cpw_usage(_("change_password: missing keysaltlist arg"));
                 goto cleanup;
             }
             retval = krb5_string_to_keysalts(*++argv, ", \t", ":.-", 0,
                                              &ks_tuple, &n_ks_tuple);
             if (retval) {
                 com_err("change_password", retval,
-                        "while parsing keysalts %s", *argv);
+                        _("while parsing keysalts %s"), *argv);
                 goto cleanup;
             }
         } else {
@@ -781,18 +796,19 @@ kadmin_cpw(int argc, char *argv[])
         }
     }
     if (*argv == NULL) {
-        com_err("change_password", 0, "missing principal name");
+        com_err("change_password", 0, _("missing principal name"));
         cpw_usage(NULL);
         goto cleanup;
     }
     retval = kadmin_parse_name(*argv, &princ);
     if (retval) {
-        com_err("change_password", retval, "while parsing principal name");
+        com_err("change_password", retval, _("while parsing principal name"));
         goto cleanup;
     }
     retval = krb5_unparse_name(context, princ, &canon);
     if (retval) {
-        com_err("change_password", retval, "while canonicalizing principal");
+        com_err("change_password", retval,
+                _("while canonicalizing principal"));
         goto cleanup;
     }
     if (pwarg != NULL) {
@@ -804,30 +820,30 @@ kadmin_cpw(int argc, char *argv[])
         }
         if (retval) {
             com_err("change_password", retval,
-                    "while changing password for \"%s\".", canon);
+                    _("while changing password for \"%s\"."), canon);
             goto cleanup;
         }
-        printf("Password for \"%s\" changed.\n", canon);
+        printf(_("Password for \"%s\" changed.\n"), canon);
     } else if (randkey) {
         retval = randkey_princ(princ, keepold, n_ks_tuple, ks_tuple);
         if (retval) {
             com_err("change_password", retval,
-                    "while randomizing key for \"%s\".", canon);
+                    _("while randomizing key for \"%s\"."), canon);
             goto cleanup;
         }
-        printf("Key for \"%s\" randomized.\n", canon);
+        printf(_("Key for \"%s\" randomized.\n"), canon);
     } else {
         unsigned int i = sizeof (newpw) - 1;
 
         snprintf(prompt1, sizeof(prompt1),
-                 "Enter password for principal \"%s\"", canon);
+                 _("Enter password for principal \"%s\""), canon);
         snprintf(prompt2, sizeof(prompt2),
-                 "Re-enter password for principal \"%s\"", canon);
+                 _("Re-enter password for principal \"%s\""), canon);
         retval = krb5_read_password(context, prompt1, prompt2,
                                     newpw, &i);
         if (retval) {
             com_err("change_password", retval,
-                    "while reading password for \"%s\".", canon);
+                    _("while reading password for \"%s\"."), canon);
             goto cleanup;
         }
         if (keepold || ks_tuple != NULL) {
@@ -840,10 +856,10 @@ kadmin_cpw(int argc, char *argv[])
         memset(newpw, 0, sizeof (newpw));
         if (retval) {
             com_err("change_password", retval,
-                    "while changing password for \"%s\".", canon);
+                    _("while changing password for \"%s\"."), canon);
             goto cleanup;
         }
-        printf("Password for \"%s\" changed.\n", canon);
+        printf(_("Password for \"%s\" changed.\n"), canon);
     }
 cleanup:
     free(canon);
@@ -881,7 +897,7 @@ add_tl_data(kadm5_principal_ent_t princ, krb5_int16 tl_type, krb5_ui_2 len,
     copy = malloc(len);
     tl_data = calloc(1, sizeof(*tl_data));
     if (copy == NULL || tl_data == NULL) {
-        fprintf(stderr, "Not enough memory\n");
+        fprintf(stderr, _("Not enough memory\n"));
         exit(1);
     }
     memcpy(copy, contents, len);
@@ -911,7 +927,7 @@ unlock_princ(kadm5_principal_ent_t princ, long *mask, const char *caller)
      * see it, since fail_auth_count is unreplicated. */
     retval = krb5_timeofday(context, &now);
     if (retval) {
-        com_err(caller, retval, "while getting time");
+        com_err(caller, retval, _("while getting time"));
         exit(1);
     }
     store_32_le((krb5_int32)now, timebuf);
@@ -965,7 +981,7 @@ kadmin_parse_princ_args(int argc, char *argv[], kadm5_principal_ent_t oprinc,
             else {
                 date = get_date(argv[i]);
                 if (date == (time_t)-1) {
-                    fprintf(stderr, "Invalid date specification \"%s\".\n",
+                    fprintf(stderr, _("Invalid date specification \"%s\".\n"),
                             argv[i]);
                     return -1;
                 }
@@ -980,7 +996,7 @@ kadmin_parse_princ_args(int argc, char *argv[], kadm5_principal_ent_t oprinc,
             else {
                 date = get_date(argv[i]);
                 if (date == (time_t)-1) {
-                    fprintf(stderr, "Invalid date specification \"%s\".\n",
+                    fprintf(stderr, _("Invalid date specification \"%s\".\n"),
                             argv[i]);
                     return -1;
                 }
@@ -995,7 +1011,7 @@ kadmin_parse_princ_args(int argc, char *argv[], kadm5_principal_ent_t oprinc,
             else {
                 date = get_date(argv[i]);
                 if (date == (time_t)-1) {
-                    fprintf(stderr, "Invalid date specification \"%s\".\n",
+                    fprintf(stderr, _("Invalid date specification \"%s\".\n"),
                             argv[i]);
                     return -1;
                 }
@@ -1010,7 +1026,7 @@ kadmin_parse_princ_args(int argc, char *argv[], kadm5_principal_ent_t oprinc,
             else {
                 date = get_date(argv[i]);
                 if (date == (time_t)-1) {
-                    fprintf(stderr, "Invalid date specification \"%s\".\n",
+                    fprintf(stderr, _("Invalid date specification \"%s\".\n"),
                             argv[i]);
                     return -1;
                 }
@@ -1075,8 +1091,8 @@ kadmin_parse_princ_args(int argc, char *argv[], kadm5_principal_ent_t oprinc,
                 retval = krb5_string_to_keysalts(argv[i], ", \t", ":.-", 0,
                                                  ks_tuple, n_ks_tuple);
                 if (retval) {
-                    com_err(caller, retval,
-                            "while parsing keysalts %s", argv[i]);
+                    com_err(caller, retval, _("while parsing keysalts %s"),
+                            argv[i]);
                     return -1;
                 }
             }
@@ -1110,7 +1126,7 @@ kadmin_parse_princ_args(int argc, char *argv[], kadm5_principal_ent_t oprinc,
         return -1;
     retval = kadmin_parse_name(argv[i], &oprinc->principal);
     if (retval) {
-        com_err(caller, retval, "while parsing principal");
+        com_err(caller, retval, _("while parsing principal"));
         return -1;
     }
     return 0;
@@ -1119,42 +1135,54 @@ kadmin_parse_princ_args(int argc, char *argv[], kadm5_principal_ent_t oprinc,
 static void
 kadmin_addprinc_usage()
 {
-    fprintf(stderr, "usage: add_principal [options] principal\n");
-    fprintf(stderr, "\toptions are:\n");
-    fprintf(stderr, "\t\t[-x db_princ_args]* [-expire expdate] "
+    fprintf(stderr, _("usage: add_principal [options] principal\n"));
+    fprintf(stderr, _("\toptions are:\n"));
+    fprintf(stderr, _("\t\t[-x db_princ_args]* [-expire expdate] "
             "[-pwexpire pwexpdate] [-maxlife maxtixlife]\n"
             "\t\t[-kvno kvno] [-policy policy] [-clearpolicy] [-randkey]\n"
             "\t\t[-pw password] [-maxrenewlife maxrenewlife]\n"
-            "\t\t[-e keysaltlist]\n\t\t[{+|-}attribute]\n"
-#if APPLE_PKINIT
-            "\t\t[-certhash hash_string]\n"
-#endif /* APPLE_PKINIT */
+                      "\t\t[-e keysaltlist]\n\t\t[{+|-}attribute]\n")
     );
-    fprintf(stderr, "\tattributes are:\n");
-    fprintf(stderr, "%s%s%s",
-            "\t\tallow_postdated allow_forwardable allow_tgs_req allow_renewable\n",
-            "\t\tallow_proxiable allow_dup_skey allow_tix requires_preauth\n",
-            "\t\trequires_hwauth needchange allow_svr password_changing_service\n"
-            "\t\tok_as_delegate ok_to_auth_as_delegate no_auth_data_required\n"
-            "\nwhere,\n\t[-x db_princ_args]* - any number of database specific arguments.\n"
-            "\t\t\tLook at each database documentation for supported arguments\n");
+    fprintf(stderr, _("\tattributes are:\n"));
+    fprintf(stderr,
+            _("\t\tallow_postdated allow_forwardable allow_tgs_req "
+              "allow_renewable\n"
+              "\t\tallow_proxiable allow_dup_skey allow_tix requires_preauth\n"
+              "\t\trequires_hwauth needchange allow_svr "
+              "password_changing_service\n"
+              "\t\tok_as_delegate ok_to_auth_as_delegate "
+              "no_auth_data_required\n"
+              "\nwhere,\n\t[-x db_princ_args]* - any number of database "
+              "specific arguments.\n"
+              "\t\t\tLook at each database documentation for supported "
+              "arguments\n"));
 }
 
 static void
 kadmin_modprinc_usage()
 {
-    fprintf(stderr, "usage: modify_principal [options] principal\n");
-    fprintf(stderr, "\toptions are:\n");
-    fprintf(stderr, "\t\t[-x db_princ_args]* [-expire expdate] [-pwexpire pwexpdate] [-maxlife maxtixlife]\n\t\t[-kvno kvno] [-policy policy] [-clearpolicy]\n\t\t[-maxrenewlife maxrenewlife] [-unlock] [{+|-}attribute]\n");
+    fprintf(stderr, _("usage: modify_principal [options] principal\n"));
+    fprintf(stderr, _("\toptions are:\n"));
+    fprintf(stderr,
+            _("\t\t[-x db_princ_args]* [-expire expdate] "
+              "[-pwexpire pwexpdate] [-maxlife maxtixlife]\n"
+              "\t\t[-kvno kvno] [-policy policy] [-clearpolicy]\n"
+              "\t\t[-maxrenewlife maxrenewlife] [-unlock] "
+              "[{+|-}attribute]\n"));
     fprintf(stderr, "\tattributes are:\n");
-    fprintf(stderr, "%s%s%s",
-            "\t\tallow_postdated allow_forwardable allow_tgs_req allow_renewable\n",
-            "\t\tallow_proxiable allow_dup_skey allow_tix requires_preauth\n",
-            "\t\trequires_hwauth needchange allow_svr password_changing_service\n"
-            "\t\tok_as_delegate ok_to_auth_as_delegate no_auth_data_required\n"
-            "\nwhere,\n\t[-x db_princ_args]* - any number of database specific arguments.\n"
-            "\t\t\tLook at each database documentation for supported arguments\n"
-    );
+    fprintf(stderr,
+            _("\t\tallow_postdated allow_forwardable allow_tgs_req "
+              "allow_renewable\n"
+              "\t\tallow_proxiable allow_dup_skey allow_tix "
+              "requires_preauth\n"
+              "\t\trequires_hwauth needchange allow_svr "
+              "password_changing_service\n"
+              "\t\tok_as_delegate ok_to_auth_as_delegate "
+              "no_auth_data_required\n"
+              "\nwhere,\n\t[-x db_princ_args]* - any number of database "
+              "specific arguments.\n"
+              "\t\t\tLook at each database documentation for supported "
+              "arguments\n"));
 }
 
 /* Create a dummy password for old-style (pre-1.8) randkey creation. */
@@ -1211,7 +1239,7 @@ kadmin_addprinc(int argc, char *argv[])
 
     retval = krb5_unparse_name(context, princ.principal, &canon);
     if (retval) {
-        com_err("add_principal", retval, "while canonicalizing principal");
+        com_err("add_principal", retval, _("while canonicalizing principal"));
         goto cleanup;
     }
 
@@ -1223,14 +1251,14 @@ kadmin_addprinc(int argc, char *argv[])
      */
     if (!(mask & KADM5_POLICY) && !(mask & KADM5_POLICY_CLR)) {
         if (!kadm5_get_policy(handle, "default", &defpol)) {
-            fprintf(stderr, "NOTICE: no policy specified for %s; "
-                    "assigning \"default\"\n", canon);
+            fprintf(stderr, _("NOTICE: no policy specified for %s; "
+                              "assigning \"default\"\n"), canon);
             princ.policy = "default";
             mask |= KADM5_POLICY;
             kadm5_free_policy_ent(handle, &defpol);
         } else
-            fprintf(stderr, "WARNING: no policy specified for %s; "
-                    "defaulting to no policy\n", canon);
+            fprintf(stderr, _("WARNING: no policy specified for %s; "
+                              "defaulting to no policy\n"), canon);
     }
     mask &= ~KADM5_POLICY_CLR;
 
@@ -1240,13 +1268,13 @@ kadmin_addprinc(int argc, char *argv[])
         unsigned int sz = sizeof(newpw) - 1;
 
         snprintf(prompt1, sizeof(prompt1),
-                 "Enter password for principal \"%s\"", canon);
+                 _("Enter password for principal \"%s\""), canon);
         snprintf(prompt2, sizeof(prompt2),
-                 "Re-enter password for principal \"%s\"", canon);
+                 _("Re-enter password for principal \"%s\""), canon);
         retval = krb5_read_password(context, prompt1, prompt2, newpw, &sz);
         if (retval) {
             com_err("add_principal", retval,
-                    "while reading password for \"%s\".", canon);
+                    _("while reading password for \"%s\"."), canon);
             goto cleanup;
         }
         pass = newpw;
@@ -1274,7 +1302,7 @@ kadmin_addprinc(int argc, char *argv[])
         retval = randkey_princ(princ.principal, FALSE, n_ks_tuple, ks_tuple);
         if (retval) {
             com_err("add_principal", retval,
-                    "while randomizing key for \"%s\".", canon);
+                    _("while randomizing key for \"%s\"."), canon);
             goto cleanup;
         }
         princ.attributes &= ~KRB5_KDB_DISALLOW_ALL_TIX; /* clear notix */
@@ -1282,7 +1310,7 @@ kadmin_addprinc(int argc, char *argv[])
         retval = kadm5_modify_principal(handle, &princ, mask);
         if (retval) {
             com_err("add_principal", retval,
-                    "while clearing DISALLOW_ALL_TIX for \"%s\".", canon);
+                    _("while clearing DISALLOW_ALL_TIX for \"%s\"."), canon);
             goto cleanup;
         }
     }
@@ -1320,18 +1348,19 @@ kadmin_modprinc(int argc, char *argv[])
 
     retval = kadmin_parse_name(argv[argc - 1], &kprinc);
     if (retval) {
-        com_err("modify_principal", retval, "while parsing principal");
+        com_err("modify_principal", retval, _("while parsing principal"));
         return;
     }
     retval = krb5_unparse_name(context, kprinc, &canon);
     if (retval) {
-        com_err("modify_principal", retval, "while canonicalizing principal");
+        com_err("modify_principal", retval,
+                _("while canonicalizing principal"));
         goto cleanup;
     }
     retval = kadm5_get_principal(handle, kprinc, &oldprinc,
                                  KADM5_PRINCIPAL_NORMAL_MASK);
     if (retval) {
-        com_err("modify_principal", retval, "while getting \"%s\".", canon);
+        com_err("modify_principal", retval, _("while getting \"%s\"."), canon);
         goto cleanup;
     }
     princ.attributes = oldprinc.attributes;
@@ -1380,10 +1409,11 @@ kadmin_modprinc(int argc, char *argv[])
         retval = kadm5_modify_principal(handle, &princ, mask);
     }
     if (retval) {
-        com_err("modify_principal", retval, "while modifying \"%s\".", canon);
+        com_err("modify_principal", retval, _("while modifying \"%s\"."),
+                canon);
         goto cleanup;
     }
-    printf("Principal \"%s\" modified.\n", canon);
+    printf(_("Principal \"%s\" modified.\n"), canon);
 cleanup:
     krb5_free_principal(context, kprinc);
     krb5_free_principal(context, princ.principal);
@@ -1403,7 +1433,7 @@ kadmin_getprinc(int argc, char *argv[])
     size_t j;
 
     if (!(argc == 2 || (argc == 3 && !strcmp("-terse", argv[1])))) {
-        fprintf(stderr, "usage: get_principal [-terse] principal\n");
+        fprintf(stderr, _("usage: get_principal [-terse] principal\n"));
         return;
     }
 
@@ -1411,80 +1441,80 @@ kadmin_getprinc(int argc, char *argv[])
 
     retval = kadmin_parse_name(argv[argc - 1], &princ);
     if (retval) {
-        com_err("get_principal", retval, "while parsing principal");
+        com_err("get_principal", retval, _("while parsing principal"));
         return;
     }
     retval = krb5_unparse_name(context, princ, &canon);
     if (retval) {
-        com_err("get_principal", retval, "while canonicalizing principal");
+        com_err("get_principal", retval, _("while canonicalizing principal"));
         goto cleanup;
     }
     retval = kadm5_get_principal(handle, princ, &dprinc,
                                  KADM5_PRINCIPAL_NORMAL_MASK | KADM5_KEY_DATA);
     if (retval) {
-        com_err("get_principal", retval, "while retrieving \"%s\".", canon);
+        com_err("get_principal", retval, _("while retrieving \"%s\"."), canon);
         goto cleanup;
     }
     retval = krb5_unparse_name(context, dprinc.principal, &canon);
     if (retval) {
-        com_err("get_principal", retval, "while canonicalizing principal");
+        com_err("get_principal", retval, _("while canonicalizing principal"));
         goto cleanup;
     }
     retval = krb5_unparse_name(context, dprinc.mod_name, &modcanon);
     if (retval) {
-        com_err("get_principal", retval, "while unparsing modname");
+        com_err("get_principal", retval, _("while unparsing modname"));
         goto cleanup;
     }
     if (argc == 2) {
-        printf("Principal: %s\n", canon);
-        printf("Expiration date: %s\n", dprinc.princ_expire_time ?
-               strdate(dprinc.princ_expire_time) : "[never]");
-        printf("Last password change: %s\n", dprinc.last_pwd_change ?
-               strdate(dprinc.last_pwd_change) : "[never]");
-        printf("Password expiration date: %s\n",
+        printf(_("Principal: %s\n"), canon);
+        printf(_("Expiration date: %s\n"), dprinc.princ_expire_time ?
+               strdate(dprinc.princ_expire_time) : _("[never]"));
+        printf(_("Last password change: %s\n"), dprinc.last_pwd_change ?
+               strdate(dprinc.last_pwd_change) : _("[never]"));
+        printf(_("Password expiration date: %s\n"),
                dprinc.pw_expiration ?
-               strdate(dprinc.pw_expiration) : "[none]");
-        printf("Maximum ticket life: %s\n", strdur(dprinc.max_life));
-        printf("Maximum renewable life: %s\n",
+               strdate(dprinc.pw_expiration) : _("[none]"));
+        printf(_("Maximum ticket life: %s\n"), strdur(dprinc.max_life));
+        printf(_("Maximum renewable life: %s\n"),
                strdur(dprinc.max_renewable_life));
-        printf("Last modified: %s (%s)\n", strdate(dprinc.mod_date), modcanon);
-        printf("Last successful authentication: %s\n",
+        printf(_("Last modified: %s (%s)\n"), strdate(dprinc.mod_date),
+               modcanon);
+        printf(_("Last successful authentication: %s\n"),
                dprinc.last_success ? strdate(dprinc.last_success) :
-               "[never]");
+               _("[never]"));
         printf("Last failed authentication: %s\n",
                dprinc.last_failed ? strdate(dprinc.last_failed) :
                "[never]");
-        printf("Failed password attempts: %d\n",
+        printf(_("Failed password attempts: %d\n"),
                dprinc.fail_auth_count);
-        printf("Number of keys: %d\n", dprinc.n_key_data);
+        printf(_("Number of keys: %d\n"), dprinc.n_key_data);
         for (i = 0; i < dprinc.n_key_data; i++) {
             krb5_key_data *key_data = &dprinc.key_data[i];
             char enctype[BUFSIZ], salttype[BUFSIZ];
 
             if (krb5_enctype_to_name(key_data->key_data_type[0], FALSE,
                                      enctype, sizeof(enctype)))
-                snprintf(enctype, sizeof(enctype), "<Encryption type 0x%x>",
+                snprintf(enctype, sizeof(enctype), _("<Encryption type 0x%x>"),
                          key_data->key_data_type[0]);
             printf("Key: vno %d, %s, ", key_data->key_data_kvno, enctype);
             if (key_data->key_data_ver > 1) {
                 if (krb5_salttype_to_string(key_data->key_data_type[1],
                                             salttype, sizeof(salttype)))
-                    snprintf(salttype, sizeof(salttype), "<Salt type 0x%x>",
+                    snprintf(salttype, sizeof(salttype), _("<Salt type 0x%x>"),
                              key_data->key_data_type[1]);
                 printf("%s\n", salttype);
             } else
-                printf("no salt\n");
+                printf(_("no salt\n"));
         }
-        printf("MKey: vno %d\n",
-               dprinc.mkvno);
+        printf(_("MKey: vno %d\n"), dprinc.mkvno);
 
-        printf("Attributes:");
+        printf(_("Attributes:"));
         for (j = 0; j < sizeof(prflags) / sizeof(char *); j++) {
             if (dprinc.attributes & (krb5_flags) 1 << j)
                 printf(" %s", prflags[j]);
         }
         printf("\n");
-        printf("Policy: %s\n", dprinc.policy ? dprinc.policy : "[none]");
+        printf(_("Policy: %s\n"), dprinc.policy ? dprinc.policy : _("[none]"));
     } else {
         printf("\"%s\"\t%d\t%d\t%d\t%d\t\"%s\"\t%d\t%d\t%d\t%d\t\"%s\""
                "\t%d\t%d\t%d\t%d\t%d",
@@ -1519,12 +1549,12 @@ kadmin_getprincs(int argc, char *argv[])
 
     expr = NULL;
     if (!(argc == 1 || (argc == 2 && (expr = argv[1])))) {
-        fprintf(stderr, "usage: get_principals [expression]\n");
+        fprintf(stderr, _("usage: get_principals [expression]\n"));
         return;
     }
     retval = kadm5_get_principals(handle, expr, &names, &count);
     if (retval) {
-        com_err("get_principals", retval, "while retrieving list.");
+        com_err("get_principals", retval, _("while retrieving list."));
         return;
     }
     for (i = 0; i < count; i++)
@@ -1548,7 +1578,7 @@ kadmin_parse_policy_args(int argc, char *argv[], kadm5_policy_ent_t policy,
             else {
                 date = get_date(argv[i]);
                 if (date == (time_t)-1) {
-                    fprintf(stderr, "Invalid date specification \"%s\".\n",
+                    fprintf(stderr, _("Invalid date specification \"%s\".\n"),
                             argv[i]);
                     return -1;
                 }
@@ -1562,7 +1592,7 @@ kadmin_parse_policy_args(int argc, char *argv[], kadm5_policy_ent_t policy,
             else {
                 date = get_date(argv[i]);
                 if (date == (time_t)-1) {
-                    fprintf(stderr, "Invalid date specification \"%s\".\n",
+                    fprintf(stderr, _("Invalid date specification \"%s\".\n"),
                             argv[i]);
                     return -1;
                 }
@@ -1635,7 +1665,7 @@ kadmin_parse_policy_args(int argc, char *argv[], kadm5_policy_ent_t policy,
             return -1;
     }
     if (i != argc -1) {
-        fprintf(stderr, "%s: parser lost count!\n", caller);
+        fprintf(stderr, _("%s: parser lost count!\n"), caller);
         return -1;
     } else
         return 0;
@@ -1644,10 +1674,13 @@ kadmin_parse_policy_args(int argc, char *argv[], kadm5_policy_ent_t policy,
 static void
 kadmin_addmodpol_usage(char *func)
 {
-    fprintf(stderr, "usage; %s [options] policy\n", func);
-    fprintf(stderr, "\toptions are:\n");
-    fprintf(stderr, "\t\t[-maxlife time] [-minlife time] [-minlength length]\n\t\t[-minclasses number] [-history number]\n\t\t[-maxfailure number] [-failurecountinterval time]\n");
-    fprintf(stderr, "\t\t[-lockoutduration time]\n");
+    fprintf(stderr, _("usage; %s [options] policy\n"), func);
+    fprintf(stderr, _("\toptions are:\n"));
+    fprintf(stderr,
+            _("\t\t[-maxlife time] [-minlife time] [-minlength length]\n"
+              "\t\t[-minclasses number] [-history number]\n"
+              "\t\t[-maxfailure number] [-failurecountinterval time]\n"));
+    fprintf(stderr, _("\t\t[-lockoutduration time]\n"));
 }
 
 void
@@ -1666,7 +1699,7 @@ kadmin_addpol(int argc, char *argv[])
     mask |= KADM5_POLICY;
     retval = kadm5_create_policy(handle, &policy, mask);
     if (retval) {
-        com_err("add_policy", retval, "while creating policy \"%s\".",
+        com_err("add_policy", retval, _("while creating policy \"%s\"."),
                 policy.policy);
     }
 }
@@ -1687,7 +1720,7 @@ kadmin_modpol(int argc, char *argv[])
     policy.policy = argv[argc - 1];
     retval = kadm5_modify_policy(handle, &policy, mask);
     if (retval) {
-        com_err("modify_policy", retval, "while modifying policy \"%s\".",
+        com_err("modify_policy", retval, _("while modifying policy \"%s\"."),
                 policy.policy);
     }
 }
@@ -1699,21 +1732,21 @@ kadmin_delpol(int argc, char *argv[])
     char reply[5];
 
     if (!(argc == 2 || (argc == 3 && !strcmp("-force", argv[1])))) {
-        fprintf(stderr, "usage: delete_policy [-force] policy\n");
+        fprintf(stderr, _("usage: delete_policy [-force] policy\n"));
         return;
     }
     if (argc == 2) {
-        printf("Are you sure you want to delete the policy \"%s\"? (yes/no): ",
-               argv[1]);
+        printf(_("Are you sure you want to delete the policy \"%s\"? "
+                 "(yes/no): "), argv[1]);
         fgets(reply, sizeof(reply), stdin);
         if (strcmp("yes\n", reply)) {
-            fprintf(stderr, "Policy \"%s\" not deleted.\n", argv[1]);
+            fprintf(stderr, _("Policy \"%s\" not deleted.\n"), argv[1]);
             return;
         }
     }
     retval = kadm5_delete_policy(handle, argv[argc - 1]);
     if (retval) {
-        com_err("delete_policy:", retval, "while deleting policy \"%s\"",
+        com_err("delete_policy:", retval, _("while deleting policy \"%s\""),
                 argv[argc - 1]);
     }
 }
@@ -1725,29 +1758,29 @@ kadmin_getpol(int argc, char *argv[])
     kadm5_policy_ent_rec policy;
 
     if (!(argc == 2 || (argc == 3 && !strcmp("-terse", argv[1])))) {
-        fprintf(stderr, "usage: get_policy [-terse] policy\n");
+        fprintf(stderr, _("usage: get_policy [-terse] policy\n"));
         return;
     }
     retval = kadm5_get_policy(handle, argv[argc - 1], &policy);
     if (retval) {
-        com_err("get_policy", retval, "while retrieving policy \"%s\".",
+        com_err("get_policy", retval, _("while retrieving policy \"%s\"."),
                 argv[argc - 1]);
         return;
     }
     if (argc == 2) {
-        printf("Policy: %s\n", policy.policy);
-        printf("Maximum password life: %ld\n", policy.pw_max_life);
-        printf("Minimum password life: %ld\n", policy.pw_min_life);
-        printf("Minimum password length: %ld\n", policy.pw_min_length);
-        printf("Minimum number of password character classes: %ld\n",
+        printf(_("Policy: %s\n"), policy.policy);
+        printf(_("Maximum password life: %ld\n"), policy.pw_max_life);
+        printf(_("Minimum password life: %ld\n"), policy.pw_min_life);
+        printf(_("Minimum password length: %ld\n"), policy.pw_min_length);
+        printf(_("Minimum number of password character classes: %ld\n"),
                policy.pw_min_classes);
-        printf("Number of old keys kept: %ld\n", policy.pw_history_num);
-        printf("Reference count: %ld\n", policy.policy_refcnt);
-        printf("Maximum password failures before lockout: %lu\n",
+        printf(_("Number of old keys kept: %ld\n"), policy.pw_history_num);
+        printf(_("Reference count: %ld\n"), policy.policy_refcnt);
+        printf(_("Maximum password failures before lockout: %lu\n"),
                (unsigned long)policy.pw_max_fail);
-        printf("Password failure count reset interval: %s\n",
+        printf(_("Password failure count reset interval: %s\n"),
                strdur(policy.pw_failcnt_interval));
-        printf("Password lockout duration: %s\n",
+        printf(_("Password lockout duration: %s\n"),
                strdur(policy.pw_lockout_duration));
     } else {
         printf("\"%s\"\t%ld\t%ld\t%ld\t%ld\t%ld\t%ld\t%lu\t%ld\t%ld\n",
@@ -1770,12 +1803,12 @@ kadmin_getpols(int argc, char *argv[])
 
     expr = NULL;
     if (!(argc == 1 || (argc == 2 && (expr = argv[1])))) {
-        fprintf(stderr, "usage: get_policies [expression]\n");
+        fprintf(stderr, _("usage: get_policies [expression]\n"));
         return;
     }
     retval = kadm5_get_policies(handle, expr, &names, &count);
     if (retval) {
-        com_err("get_policies", retval, "while retrieving list.");
+        com_err("get_policies", retval, _("while retrieving list."));
         return;
     }
     for (i = 0; i < count; i++)
@@ -1792,15 +1825,15 @@ kadmin_getprivs(int argc, char *argv[])
     long plist;
 
     if (argc != 1) {
-        fprintf(stderr, "usage: get_privs\n");
+        fprintf(stderr, _("usage: get_privs\n"));
         return;
     }
     retval = kadm5_get_privs(handle, &plist);
     if (retval) {
-        com_err("get_privs", retval, "while retrieving privileges");
+        com_err("get_privs", retval, _("while retrieving privileges"));
         return;
     }
-    printf("current privileges:");
+    printf(_("current privileges:"));
     for (i = 0; i < sizeof (privs) / sizeof (char *); i++) {
         if (plist & 1 << i)
             printf(" %s", privs[i]);
@@ -1824,31 +1857,31 @@ kadmin_purgekeys(int argc, char *argv[])
         pname = argv[1];
     }
     if (pname == NULL) {
-        fprintf(stderr, "usage: purgekeys [-keepkvno oldest_kvno_to_keep] "
-                "principal\n");
+        fprintf(stderr, _("usage: purgekeys [-keepkvno oldest_kvno_to_keep] "
+                          "principal\n"));
         return;
     }
 
     retval = kadmin_parse_name(pname, &princ);
     if (retval) {
-        com_err("purgekeys", retval, "while parsing principal");
+        com_err("purgekeys", retval, _("while parsing principal"));
         return;
     }
 
     retval = krb5_unparse_name(context, princ, &canon);
     if (retval) {
-        com_err("purgekeys", retval, "while canonicalizing principal");
+        com_err("purgekeys", retval, _("while canonicalizing principal"));
         goto cleanup;
     }
 
     retval = kadm5_purgekeys(handle, princ, keepkvno);
     if (retval) {
         com_err("purgekeys", retval,
-                "while purging keys for principal \"%s\"", canon);
+                _("while purging keys for principal \"%s\""), canon);
         goto cleanup;
     }
 
-    printf("Old keys for principal \"%s\" purged.\n", canon);
+    printf(_("Old keys for principal \"%s\" purged.\n"), canon);
 cleanup:
     krb5_free_principal(context, princ);
     free(canon);
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);
     }
 }
 
diff --git a/src/kadmin/cli/ss_wrapper.c b/src/kadmin/cli/ss_wrapper.c
index 249a9b4b14..bde9b15612 100644
--- a/src/kadmin/cli/ss_wrapper.c
+++ b/src/kadmin/cli/ss_wrapper.c
@@ -24,9 +24,8 @@
  */
 
 #include <krb5.h>
+#include <k5-platform.h>
 #include <ss/ss.h>
-#include <stdio.h>
-#include <string.h>
 #include "kadmin.h"
 
 extern ss_request_table kadmin_cmds;
@@ -45,7 +44,7 @@ main(int argc, char *argv[])
     request = kadmin_startup(argc, argv);
     sci_idx = ss_create_invocation(whoami, "5.0", NULL, &kadmin_cmds, &retval);
     if (retval) {
-        ss_perror(sci_idx, retval, "creating invocation");
+        ss_perror(sci_idx, retval, _("creating invocation"));
         exit(1);
     }
     if (request) {
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index 2c646889de..39bfe00c43 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -210,53 +210,53 @@ extern krb5_db_entry      *master_entry;
 static const char null_mprinc_name[] = "kdb5_dump@MISSING";
 
 /* Message strings */
-#define regex_err               "%s: regular expression error - %s\n"
-#define regex_merr              "%s: regular expression match error - %s\n"
-#define pname_unp_err           "%s: cannot unparse principal name (%s)\n"
-#define mname_unp_err           "%s: cannot unparse modifier name (%s)\n"
-#define nokeys_err              "%s: cannot find any standard key for %s\n"
-#define sdump_tl_inc_err        "%s: tagged data list inconsistency for %s (counted %d, stored %d)\n"
-#define ofopen_error            "%s: cannot open %s for writing (%s)\n"
-#define oflock_error            "%s: cannot lock %s (%s)\n"
-#define dumprec_err             "%s: error performing %s dump (%s)\n"
-#define trash_end_fmt           "%s(%d): ignoring trash at end of line: "
-#define read_name_string        "name string"
-#define read_key_type           "key type"
-#define read_key_data           "key data"
-#define read_pr_data1           "first set of principal attributes"
-#define read_mod_name           "modifier name"
-#define read_pr_data2           "second set of principal attributes"
-#define read_salt_data          "salt data"
-#define read_akey_type          "alternate key type"
-#define read_akey_data          "alternate key data"
-#define read_asalt_type         "alternate salt type"
-#define read_asalt_data         "alternate salt data"
-#define read_exp_data           "expansion data"
-#define store_err_fmt           "%s(%d): cannot store %s(%s)\n"
-#define add_princ_fmt           "%s\n"
-#define parse_err_fmt           "%s(%d): cannot parse %s (%s)\n"
-#define read_err_fmt            "%s(%d): cannot read %s\n"
-#define no_mem_fmt              "%s(%d): no memory for buffers\n"
-#define rhead_err_fmt           "%s(%d): cannot match size tokens\n"
-#define err_line_fmt            "%s: error processing line %d of %s\n"
-#define head_bad_fmt            "%s: dump header bad in %s\n"
-#define read_nint_data          "principal static attributes"
-#define read_tcontents          "tagged data contents"
-#define read_ttypelen           "tagged data type and length"
-#define read_kcontents          "key data contents"
-#define read_ktypelen           "key data type and length"
-#define read_econtents          "extra data contents"
-#define no_name_mem_fmt         "%s: cannot get memory for temporary name\n"
-#define ctx_err_fmt             "%s: cannot initialize Kerberos context\n"
-#define stdin_name              "standard input"
-#define remaster_err_fmt        "while re-encoding keys for principal %s with new master key"
-#define restfail_fmt            "%s: %s restore failed\n"
-#define close_err_fmt           "%s: cannot close database (%s)\n"
-#define dbinit_err_fmt          "%s: cannot initialize database (%s)\n"
-#define dbdelerr_fmt            "%s: cannot delete bad database %s (%s)\n"
-#define dbunlockerr_fmt         "%s: cannot unlock database %s (%s)\n"
-#define dbcreaterr_fmt          "%s: cannot create database %s (%s)\n"
-#define dfile_err_fmt           "%s: cannot open %s (%s)\n"
+#define regex_err         _("%s: regular expression error - %s\n")
+#define regex_merr        _("%s: regular expression match error - %s\n")
+#define pname_unp_err     _("%s: cannot unparse principal name (%s)\n")
+#define mname_unp_err     _("%s: cannot unparse modifier name (%s)\n")
+#define nokeys_err        _("%s: cannot find any standard key for %s\n")
+#define sdump_tl_inc_err  _("%s: tagged data list inconsistency for %s (counted %d, stored %d)\n")
+#define ofopen_error      _("%s: cannot open %s for writing (%s)\n")
+#define oflock_error      _("%s: cannot lock %s (%s)\n")
+#define dumprec_err       _("%s: error performing %s dump (%s)\n")
+#define trash_end_fmt     _("%s(%d): ignoring trash at end of line: ")
+#define read_name_string  _("name string")
+#define read_key_type     _("key type")
+#define read_key_data     _("key data")
+#define read_pr_data1     _("first set of principal attributes")
+#define read_mod_name     _("modifier name")
+#define read_pr_data2     _("second set of principal attributes")
+#define read_salt_data    _("salt data")
+#define read_akey_type    _("alternate key type")
+#define read_akey_data    _("alternate key data")
+#define read_asalt_type   _("alternate salt type")
+#define read_asalt_data   _("alternate salt data")
+#define read_exp_data     _("expansion data")
+#define store_err_fmt     _("%s(%d): cannot store %s(%s)\n")
+#define add_princ_fmt     _("%s\n")
+#define parse_err_fmt     _("%s(%d): cannot parse %s (%s)\n")
+#define read_err_fmt      _("%s(%d): cannot read %s\n")
+#define no_mem_fmt        _("%s(%d): no memory for buffers\n")
+#define rhead_err_fmt     _("%s(%d): cannot match size tokens\n")
+#define err_line_fmt      _("%s: error processing line %d of %s\n")
+#define head_bad_fmt      _("%s: dump header bad in %s\n")
+#define read_nint_data    _("principal static attributes")
+#define read_tcontents    _("tagged data contents")
+#define read_ttypelen     _("tagged data type and length")
+#define read_kcontents    _("key data contents")
+#define read_ktypelen     _("key data type and length")
+#define read_econtents    _("extra data contents")
+#define no_name_mem_fmt   _("%s: cannot get memory for temporary name\n")
+#define ctx_err_fmt       _("%s: cannot initialize Kerberos context\n")
+#define stdin_name        _("standard input")
+#define remaster_err_fmt  _("while re-encoding keys for principal %s with new master key")
+#define restfail_fmt      _("%s: %s restore failed\n")
+#define close_err_fmt     _("%s: cannot close database (%s)\n")
+#define dbinit_err_fmt    _("%s: cannot initialize database (%s)\n")
+#define dbdelerr_fmt      _("%s: cannot delete bad database %s (%s)\n")
+#define dbunlockerr_fmt   _("%s: cannot unlock database %s (%s)\n")
+#define dbcreaterr_fmt    _("%s: cannot create database %s (%s)\n")
+#define dfile_err_fmt     _("%s: cannot open %s (%s)\n")
 
 static const char oldoption[] = "-old";
 static const char b6option[] = "-b6";
@@ -342,19 +342,19 @@ void update_ok_file (file_name)
 
     if (asprintf(&file_ok, "%s%s", file_name, ok) < 0) {
         com_err(progname, ENOMEM,
-                "while allocating filename for update_ok_file");
+                _("while allocating filename for update_ok_file"));
         exit_status++;
         return;
     }
     if ((fd = open(file_ok, O_WRONLY|O_CREAT|O_TRUNC, 0600)) < 0) {
-        com_err(progname, errno, "while creating 'ok' file, '%s'",
+        com_err(progname, errno, _("while creating 'ok' file, '%s'"),
                 file_ok);
         exit_status++;
         free(file_ok);
         return;
     }
     if (write(fd, "", 1) != 1) {
-        com_err(progname, errno, "while writing to 'ok' file, '%s'",
+        com_err(progname, errno, _("while writing to 'ok' file, '%s'"),
                 file_ok);
         exit_status++;
         free(file_ok);
@@ -1034,8 +1034,8 @@ static krb5_error_code dump_ov_princ(krb5_pointer ptr, krb5_db_entry *kdb)
             if (key_data->key_data_type[0] != ENCTYPE_DES_CBC_CRC)
                 continue;
             if (foundcrc) {
-                fprintf(stderr, "Warning!  Multiple DES-CBC-CRC keys "
-                        "for principal %s; skipping duplicates.\n",
+                fprintf(stderr, _("Warning!  Multiple DES-CBC-CRC keys for "
+                                  "principal %s; skipping duplicates.\n"),
                         princstr);
                 continue;
             }
@@ -1044,10 +1044,11 @@ static krb5_error_code dump_ov_princ(krb5_pointer ptr, krb5_db_entry *kdb)
             fputc('\t', arg->ofile);
             print_key_data(arg->ofile, key_data);
         }
-        if (!foundcrc)
-            fprintf(stderr, "Warning!  No DES-CBC-CRC key for principal "
-                    "%s, cannot generate OV-compatible record; skipping\n",
-                    princstr);
+        if (!foundcrc) {
+            fprintf(stderr, _("Warning!  No DES-CBC-CRC key for principal %s, "
+                              "cannot generate OV-compatible record; "
+                              "skipping\n"), princstr);
+        }
     }
 
     fputc('\n', arg->ofile);
@@ -1159,7 +1160,7 @@ dump_db(argc, argv)
      * to be opened if we try a dump that uses it.
      */
     if (!dbactive) {
-        com_err(progname, 0, "Database not currently opened!");
+        com_err(progname, 0, _("Database not currently opened!"));
         exit_status++;
         return;
     }
@@ -1178,16 +1179,14 @@ dump_db(argc, argv)
                                         NULL, NULL,
                                         &master_keyblock);
             if (retval) {
-                com_err(progname, retval,
-                        "while reading master key");
+                com_err(progname, retval, _("while reading master key"));
                 exit(1);
             }
             retval = krb5_db_fetch_mkey_list(util_context, master_princ,
                                              &master_keyblock, IGNORE_VNO,
                                              &mkeys);
             if (retval) {
-                com_err(progname, retval,
-                        "while verifying master key");
+                com_err(progname, retval, _("while verifying master key"));
                 exit(1);
             }
             krb5_db_free_mkey_list(util_context, mkeys);
@@ -1212,18 +1211,18 @@ dump_db(argc, argv)
                                              &kt_kvno,
                                              NULL,
                                              &new_master_keyblock))) {
-                com_err(progname, retval, "while reading new master key");
+                com_err(progname, retval, _("while reading new master key"));
                 exit(1);
             }
         } else {
-            printf("Please enter new master key....\n");
+            printf(_("Please enter new master key....\n"));
             if ((retval = krb5_db_fetch_mkey(util_context, master_princ,
                                              new_master_keyblock.enctype,
                                              TRUE,
                                              TRUE,
                                              NULL, NULL, NULL,
                                              &new_master_keyblock))) {
-                com_err(progname, retval, "while reading new master key");
+                com_err(progname, retval, _("while reading new master key"));
                 exit(1);
             }
         }
@@ -2112,7 +2111,7 @@ process_k5beta7_policy(fname, kcontext, filep, flags, linenop)
     if (nread == EOF)
         return -1;
     else if (nread != 7) {
-        fprintf(stderr, "cannot parse policy on line %d (%d read)\n",
+        fprintf(stderr, _("cannot parse policy on line %d (%d read)\n"),
                 *linenop, nread);
         return 1;
     }
@@ -2120,13 +2119,13 @@ process_k5beta7_policy(fname, kcontext, filep, flags, linenop)
     if ((ret = krb5_db_create_policy(kcontext, &rec))) {
         if (ret &&
             ((ret = krb5_db_put_policy(kcontext, &rec)))) {
-            fprintf(stderr, "cannot create policy on line %d: %s\n",
+            fprintf(stderr, _("cannot create policy on line %d: %s\n"),
                     *linenop, error_message(ret));
             return 1;
         }
     }
     if (flags & FLAG_VERBOSE)
-        fprintf(stderr, "created policy %s\n", rec.name);
+        fprintf(stderr, _("created policy %s\n"), rec.name);
 
     return 0;
 }
@@ -2209,7 +2208,7 @@ process_k5beta7_record(fname, kcontext, filep, flags, linenop)
         process_k5beta7_policy(fname, kcontext, filep, flags,
                                linenop);
     else {
-        fprintf(stderr, "unknown record type \"%s\" on line %d\n",
+        fprintf(stderr, _("unknown record type \"%s\" on line %d\n"),
                 rectype, *linenop);
         return 1;
     }
@@ -2247,7 +2246,7 @@ process_ov_record(fname, kcontext, filep, flags, linenop)
     else if (strcmp(rectype, "End") == 0)
         return -1;
     else {
-        fprintf(stderr, "unknown record type \"%s\" on line %d\n",
+        fprintf(stderr, _("unknown record type \"%s\" on line %d\n"),
                 rectype, *linenop);
         return 1;
     }
@@ -2283,7 +2282,7 @@ process_r1_8_record(fname, kcontext, filep, flags, linenop)
         process_r1_8_policy(fname, kcontext, filep, flags,
                             linenop);
     else {
-        fprintf(stderr, "unknown record type \"%s\" on line %d\n",
+        fprintf(stderr, _("unknown record type \"%s\" on line %d\n"),
                 rectype, *linenop);
         return 1;
     }
@@ -2390,7 +2389,8 @@ load_db(argc, argv)
             flags |= FLAG_UPDATE;
         else if (!strcmp(argv[aindex], hashoption)) {
             if (!add_db_arg("hash=true")) {
-                com_err(progname, ENOMEM, "while parsing command arguments\n");
+                com_err(progname, ENOMEM,
+                        _("while parsing command arguments\n"));
                 exit(1);
             }
         } else
@@ -2413,7 +2413,7 @@ load_db(argc, argv)
 
     if( (kret = krb5_set_default_realm(kcontext, util_context->default_realm)) )
     {
-        fprintf(stderr, "%s: Unable to set the default realm\n", progname);
+        fprintf(stderr, _("%s: Unable to set the default realm\n"), progname);
         exit_status++;
         return;
     }
@@ -2433,7 +2433,7 @@ load_db(argc, argv)
         }
         if ((kret = krb5_lock_file(kcontext, fileno(f),
                                    KRB5_LOCKMODE_SHARED))) {
-            fprintf(stderr, "%s: Cannot lock %s: %s\n", progname,
+            fprintf(stderr, _("%s: Cannot lock %s: %s\n"), progname,
                     dumpfile, error_message(errno));
             exit_status++;
             return;
@@ -2478,8 +2478,8 @@ load_db(argc, argv)
         }
     }
     if (load->updateonly && !(flags & FLAG_UPDATE)) {
-        fprintf(stderr, "%s: dump version %s can only be loaded with the "
-                "-update flag\n", progname, load->name);
+        fprintf(stderr, _("%s: dump version %s can only be loaded with the "
+                          "-update flag\n"), progname, load->name);
         exit_status++;
         return;
     }
@@ -2491,12 +2491,12 @@ load_db(argc, argv)
      */
     if (! (flags & FLAG_UPDATE)) {
         if (!add_db_arg("temporary")) {
-            com_err(progname, ENOMEM, "computing parameters for database");
+            com_err(progname, ENOMEM, _("computing parameters for database"));
             exit(1);
         }
 
         if (!add_update && !add_db_arg("merge_nra")) {
-            com_err(progname, ENOMEM, "computing parameters for database");
+            com_err(progname, ENOMEM, _("computing parameters for database"));
             exit(1);
         }
 
@@ -2527,7 +2527,7 @@ load_db(argc, argv)
         if (kret == 0)
             db_locked = 1;
         else if (kret != KRB5_PLUGIN_OP_NOTSUPP) {
-            fprintf(stderr, "%s: %s while permanently locking database\n",
+            fprintf(stderr, _("%s: %s while permanently locking database\n"),
                     progname, error_message(kret));
             exit_status++;
             goto error;
@@ -2639,8 +2639,8 @@ load_db(argc, argv)
          * anyway.
          */
         if (kret != 0 && kret != KRB5_PLUGIN_OP_NOTSUPP) {
-            fprintf(stderr, "%s: cannot make newly loaded database live (%s)\n",
-                    progname, error_message(kret));
+            fprintf(stderr, _("%s: cannot make newly loaded database live "
+                              "(%s)\n"), progname, error_message(kret));
             exit_status++;
         }
     }
diff --git a/src/kadmin/dbutil/kadm5_create.c b/src/kadmin/dbutil/kadm5_create.c
index c086adf75b..65cd68be5d 100644
--- a/src/kadmin/dbutil/kadm5_create.c
+++ b/src/kadmin/dbutil/kadm5_create.c
@@ -84,7 +84,8 @@ int kadm5_create(kadm5_config_params *params)
      */
     if ((retval = kadm5_get_config_params(context, 1,
                                           params, &lparams))) {
-        com_err(progname, retval, "while looking up the Kerberos configuration");
+        com_err(progname, retval, _("while looking up the Kerberos "
+                                    "configuration"));
         return 1;
     }
 
@@ -110,7 +111,8 @@ int kadm5_create_magic_princs(kadm5_config_params *params,
                              KADM5_API_VERSION_3,
                              db5util_db_args,
                              &handle))) {
-        com_err(progname, retval, "while initializing the Kerberos admin interface");
+        com_err(progname, retval, _("while initializing the Kerberos admin "
+                                    "interface"));
         return retval;
     }
 
@@ -192,9 +194,8 @@ static int add_admin_princs(void *handle, krb5_context context, char *realm)
     }
     if (ai->ai_canonname == NULL) {
         ret = EINVAL;
-        fprintf(stderr,
-                "getaddrinfo(%s): Cannot determine canonical hostname.\n",
-                localname);
+        fprintf(stderr, _("getaddrinfo(%s): Cannot determine canonical "
+                          "hostname.\n"), localname);
         freeaddrinfo(ai);
         goto clean_and_exit;
     }
@@ -214,7 +215,7 @@ static int add_admin_princs(void *handle, krb5_context context, char *realm)
     }
     if (asprintf(&service_name, "kadmin/%s", ai->ai_canonname) < 0) {
         ret = ENOMEM;
-        fprintf(stderr, "Out of memory\n");
+        fprintf(stderr, _("Out of memory\n"));
         freeaddrinfo(ai);
         goto clean_and_exit;
     }
@@ -286,7 +287,7 @@ int add_admin_princ(void *handle, krb5_context context,
     fullname = build_name_with_realm(name, realm);
     ret = krb5_parse_name(context, fullname, &ent.principal);
     if (ret) {
-        com_err(progname, ret, "while parsing admin principal name");
+        com_err(progname, ret, _("while parsing admin principal name"));
         return(ERR);
     }
     ent.max_life = lifetime;
@@ -298,7 +299,7 @@ int add_admin_princ(void *handle, krb5_context context,
                                  "to-be-random");
     if (ret) {
         if (ret != KADM5_DUP) {
-            com_err(progname, ret, "while creating principal %s", fullname);
+            com_err(progname, ret, _("while creating principal %s"), fullname);
             krb5_free_principal(context, ent.principal);
             free(fullname);
             return ERR;
@@ -307,7 +308,8 @@ int add_admin_princ(void *handle, krb5_context context,
         /* only randomize key if we created the principal */
         ret = kadm5_randkey_principal(handle, ent.principal, NULL, NULL);
         if (ret) {
-            com_err(progname, ret, "while randomizing principal %s", fullname);
+            com_err(progname, ret, _("while randomizing principal %s"),
+                    fullname);
             krb5_free_principal(context, ent.principal);
             free(fullname);
             return ERR;
@@ -316,7 +318,8 @@ int add_admin_princ(void *handle, krb5_context context,
         ent.attributes = attrs;
         ret = kadm5_modify_principal(handle, &ent, KADM5_ATTRIBUTES);
         if (ret) {
-            com_err(progname, ret, "while setting attributes on %s", fullname);
+            com_err(progname, ret, _("while setting attributes on %s"),
+                    fullname);
             krb5_free_principal(context, ent.principal);
             free(fullname);
             return ERR;
diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c
index 0d41b5f736..b34219b08e 100644
--- a/src/kadmin/dbutil/kdb5_create.c
+++ b/src/kadmin/dbutil/kdb5_create.c
@@ -172,7 +172,8 @@ void kdb5_create(argc, argv)
             break;
         case 'h':
             if (!add_db_arg("hash=true")) {
-                com_err(progname, ENOMEM, "while parsing command arguments\n");
+                com_err(progname, ENOMEM,
+                        _("while parsing command arguments\n"));
                 exit(1);
             }
             break;
@@ -195,10 +196,10 @@ void kdb5_create(argc, argv)
 
     log_ctx = util_context->kdblog_context;
 
-    printf ("Loading random data\n");
+    printf(_("Loading random data\n"));
     retval = krb5_c_random_os_entropy (util_context, strong_random, NULL);
     if (retval) {
-        com_err (progname, retval, "Loading random data");
+        com_err(progname, retval, _("Loading random data"));
         exit_status++; return;
     }
 
@@ -208,7 +209,7 @@ void kdb5_create(argc, argv)
                                           global_params.mkey_name,
                                           global_params.realm,
                                           &mkey_fullname, &master_princ))) {
-        com_err(progname, retval, "while setting up master key name");
+        com_err(progname, retval, _("while setting up master key name"));
         exit_status++; return;
     }
 
@@ -219,26 +220,27 @@ void kdb5_create(argc, argv)
     krb5_princ_component(util_context, &tgt_princ,1)->data = global_params.realm;
     krb5_princ_component(util_context, &tgt_princ,1)->length = strlen(global_params.realm);
 
-    printf("Initializing database '%s' for realm '%s',\n\
-master key name '%s'\n",
+    printf(_("Initializing database '%s' for realm '%s',\n"
+             "master key name '%s'\n"),
            global_params.dbname, global_params.realm, mkey_fullname);
 
     if (!mkey_password) {
-        printf("You will be prompted for the database Master Password.\n");
-        printf("It is important that you NOT FORGET this password.\n");
+        printf(_("You will be prompted for the database Master Password.\n"));
+        printf(_("It is important that you NOT FORGET this password.\n"));
         fflush(stdout);
 
         pw_size = 1024;
         pw_str = malloc(pw_size);
         if (pw_str == NULL) {
-            com_err(progname, ENOMEM, "while creating new master key");
+            com_err(progname, ENOMEM, _("while creating new master key"));
             exit_status++; return;
         }
 
         retval = krb5_read_password(util_context, KRB5_KDC_MKEY_1, KRB5_KDC_MKEY_2,
                                     pw_str, &pw_size);
         if (retval) {
-            com_err(progname, retval, "while reading master key from keyboard");
+            com_err(progname, retval,
+                    _("while reading master key from keyboard"));
             exit_status++; return;
         }
         mkey_password = pw_str;
@@ -248,14 +250,15 @@ master key name '%s'\n",
     pwd.length = strlen(mkey_password);
     retval = krb5_principal2salt(util_context, master_princ, &master_salt);
     if (retval) {
-        com_err(progname, retval, "while calculating master key salt");
+        com_err(progname, retval, _("while calculating master key salt"));
         exit_status++; return;
     }
 
     retval = krb5_c_string_to_key(util_context, master_keyblock.enctype,
                                   &pwd, &master_salt, &master_keyblock);
     if (retval) {
-        com_err(progname, retval, "while transforming master key from password");
+        com_err(progname, retval,
+                _("while transforming master key from password"));
         exit_status++; return;
     }
 
@@ -265,12 +268,13 @@ master key name '%s'\n",
     seed.data = master_keyblock.contents;
 
     if ((retval = krb5_c_random_seed(util_context, &seed))) {
-        com_err(progname, retval, "while initializing random key generator");
+        com_err(progname, retval,
+                _("while initializing random key generator"));
         exit_status++; return;
     }
     if ((retval = krb5_db_create(util_context,
                                  db5util_db_args))) {
-        com_err(progname, retval, "while creating database '%s'",
+        com_err(progname, retval, _("while creating database '%s'"),
                 global_params.dbname);
         exit_status++; return;
     }
@@ -288,8 +292,7 @@ master key name '%s'\n",
         if ((retval = ulog_map(util_context, global_params.iprop_logfile,
                                global_params.iprop_ulogsize, FKCOMMAND,
                                db5util_db_args))) {
-            com_err(argv[0], retval,
-                    _("while creating update log"));
+            com_err(argv[0], retval, _("while creating update log"));
             exit_status++;
             return;
         }
@@ -316,7 +319,7 @@ master key name '%s'\n",
     if ((retval = add_principal(util_context, master_princ, MASTER_KEY, &rblock)) ||
         (retval = add_principal(util_context, &tgt_princ, TGT_KEY, &rblock))) {
         (void) krb5_db_fini(util_context);
-        com_err(progname, retval, "while adding entries to the database");
+        com_err(progname, retval, _("while adding entries to the database"));
         exit_status++; return;
     }
 
@@ -344,8 +347,8 @@ master key name '%s'\n",
                                       &master_keyblock,
                                       mkey_password);
     if (retval) {
-        com_err(progname, errno, "while storing key");
-        printf("Warning: couldn't stash master key.\n");
+        com_err(progname, errno, _("while storing key"));
+        printf(_("Warning: couldn't stash master key.\n"));
     }
     /* clean up */
     (void) krb5_db_fini(util_context);
diff --git a/src/kadmin/dbutil/kdb5_destroy.c b/src/kadmin/dbutil/kdb5_destroy.c
index 04cd340f7d..f32988a6de 100644
--- a/src/kadmin/dbutil/kdb5_destroy.c
+++ b/src/kadmin/dbutil/kdb5_destroy.c
@@ -55,13 +55,13 @@ kdb5_destroy(argc, argv)
     retval1 = kadm5_init_krb5_context(&context);
     if( retval1 )
     {
-        com_err(progname, retval1, "while initializing krb5_context");
+        com_err(progname, retval1, _("while initializing krb5_context"));
         exit(1);
     }
 
     if ((retval1 = krb5_set_default_realm(context,
                                           util_context->default_realm))) {
-        com_err(progname, retval1, "while setting default realm name");
+        com_err(progname, retval1, _("while setting default realm name"));
         exit(1);
     }
 
@@ -81,20 +81,21 @@ kdb5_destroy(argc, argv)
         }
     }
     if (!force) {
-        printf("Deleting KDC database stored in '%s', are you sure?\n", dbname);
-        printf("(type 'yes' to confirm)? ");
+        printf(_("Deleting KDC database stored in '%s', are you sure?\n"),
+               dbname);
+        printf(_("(type 'yes' to confirm)? "));
         if (fgets(buf, sizeof(buf), stdin) == NULL) {
             exit_status++; return;
         }
         if (strcmp(buf, yes)) {
             exit_status++; return;
         }
-        printf("OK, deleting database '%s'...\n", dbname);
+        printf(_("OK, deleting database '%s'...\n"), dbname);
     }
 
     retval1 = krb5_db_destroy(context, db5util_db_args);
     if (retval1) {
-        com_err(progname, retval1, "deleting database '%s'",dbname);
+        com_err(progname, retval1, _("deleting database '%s'"), dbname);
         exit_status++; return;
     }
 
@@ -103,6 +104,6 @@ kdb5_destroy(argc, argv)
     }
 
     dbactive = FALSE;
-    printf("** Database '%s' destroyed.\n", dbname);
+    printf(_("** Database '%s' destroyed.\n"), dbname);
     return;
 }
diff --git a/src/kadmin/dbutil/kdb5_mkey.c b/src/kadmin/dbutil/kdb5_mkey.c
index 4bd72e50ef..e5da1927ec 100644
--- a/src/kadmin/dbutil/kdb5_mkey.c
+++ b/src/kadmin/dbutil/kdb5_mkey.c
@@ -218,7 +218,8 @@ kdb5_add_mkey(int argc, char *argv[])
         switch(optchar) {
         case 'e':
             if (krb5_string_to_enctype(optarg, &new_master_enctype)) {
-                com_err(progname, EINVAL, "%s is an invalid enctype", optarg);
+                com_err(progname, EINVAL, _("%s is an invalid enctype"),
+                        optarg);
                 exit_status++;
                 return;
             }
@@ -241,7 +242,7 @@ kdb5_add_mkey(int argc, char *argv[])
                                           global_params.mkey_name,
                                           global_params.realm,
                                           &mkey_fullname, &master_princ))) {
-        com_err(progname, retval, "while setting up master key name");
+        com_err(progname, retval, _("while setting up master key name"));
         exit_status++;
         return;
     }
@@ -249,24 +250,23 @@ kdb5_add_mkey(int argc, char *argv[])
     retval = krb5_db_get_principal(util_context, master_princ, 0,
                                    &master_entry);
     if (retval != 0) {
-        com_err(progname, retval,
-                "while getting master key principal %s",
+        com_err(progname, retval, _("while getting master key principal %s"),
                 mkey_fullname);
         exit_status++;
         goto cleanup_return;
     }
 
-    printf("Creating new master key for master key principal '%s'\n",
+    printf(_("Creating new master key for master key principal '%s'\n"),
            mkey_fullname);
 
-    printf("You will be prompted for a new database Master Password.\n");
-    printf("It is important that you NOT FORGET this password.\n");
+    printf(_("You will be prompted for a new database Master Password.\n"));
+    printf(_("It is important that you NOT FORGET this password.\n"));
     fflush(stdout);
 
     pw_size = 1024;
     pw_str = malloc(pw_size);
     if (pw_str == NULL) {
-        com_err(progname, ENOMEM, "while creating new master key");
+        com_err(progname, ENOMEM, _("while creating new master key"));
         exit_status++;
         goto cleanup_return;
     }
@@ -274,7 +274,8 @@ kdb5_add_mkey(int argc, char *argv[])
     retval = krb5_read_password(util_context, KRB5_KDC_MKEY_1, KRB5_KDC_MKEY_2,
                                 pw_str, &pw_size);
     if (retval) {
-        com_err(progname, retval, "while reading new master key from keyboard");
+        com_err(progname, retval,
+                _("while reading new master key from keyboard"));
         exit_status++;
         goto cleanup_return;
     }
@@ -284,7 +285,7 @@ kdb5_add_mkey(int argc, char *argv[])
     pwd.length = strlen(new_mkey_password);
     retval = krb5_principal2salt(util_context, master_princ, &master_salt);
     if (retval) {
-        com_err(progname, retval, "while calculating master key salt");
+        com_err(progname, retval, _("while calculating master key salt"));
         exit_status++;
         goto cleanup_return;
     }
@@ -292,34 +293,38 @@ kdb5_add_mkey(int argc, char *argv[])
     retval = krb5_c_string_to_key(util_context, new_master_enctype,
                                   &pwd, &master_salt, &new_mkeyblock);
     if (retval) {
-        com_err(progname, retval, "while transforming master key from password");
+        com_err(progname, retval,
+                _("while transforming master key from password"));
         exit_status++;
         goto cleanup_return;
     }
 
     retval = add_new_mkey(util_context, master_entry, &new_mkeyblock, 0);
     if (retval) {
-        com_err(progname, retval, "adding new master key to master principal");
+        com_err(progname, retval,
+                _("adding new master key to master principal"));
         exit_status++;
         goto cleanup_return;
     }
 
     if ((retval = krb5_timeofday(util_context, &now))) {
-        com_err(progname, retval, "while getting current time");
+        com_err(progname, retval, _("while getting current time"));
         exit_status++;
         goto cleanup_return;
     }
 
     if ((retval = krb5_dbe_update_mod_princ_data(util_context, master_entry,
                                                  now, master_princ))) {
-        com_err(progname, retval, "while updating the master key principal modification time");
+        com_err(progname, retval, _("while updating the master key principal "
+                                    "modification time"));
         exit_status++;
         goto cleanup_return;
     }
 
     if ((retval = krb5_db_put_principal(util_context, master_entry))) {
         (void) krb5_db_fini(util_context);
-        com_err(progname, retval, "while adding master key entry to the database");
+        com_err(progname, retval, _("while adding master key entry to the "
+                                    "database"));
         exit_status++;
         goto cleanup_return;
     }
@@ -332,8 +337,8 @@ kdb5_add_mkey(int argc, char *argv[])
                                           &new_mkeyblock,
                                           mkey_password);
         if (retval) {
-            com_err(progname, errno, "while storing key");
-            printf("Warning: couldn't stash master key.\n");
+            com_err(progname, errno, _("while storing key"));
+            printf(_("Warning: couldn't stash master key.\n"));
         }
     }
 
@@ -375,7 +380,7 @@ kdb5_use_mkey(int argc, char *argv[])
 
     use_kvno = atoi(argv[1]);
     if (use_kvno == 0) {
-        com_err(progname, EINVAL, "0 is an invalid KVNO value");
+        com_err(progname, EINVAL, _("0 is an invalid KVNO value"));
         exit_status++;
         return;
     } else {
@@ -386,14 +391,15 @@ kdb5_use_mkey(int argc, char *argv[])
                 break;
         }
         if (!keylist_node) {
-            com_err(progname, EINVAL, "%d is an invalid KVNO value", use_kvno);
+            com_err(progname, EINVAL, _("%d is an invalid KVNO value"),
+                    use_kvno);
             exit_status++;
             return;
         }
     }
 
     if ((retval = krb5_timeofday(util_context, &now))) {
-        com_err(progname, retval, "while getting current time");
+        com_err(progname, retval, _("while getting current time"));
         exit_status++;
         return;
     }
@@ -401,7 +407,7 @@ kdb5_use_mkey(int argc, char *argv[])
     if (argc == 3) {
         time_t t = get_date(argv[2]);
         if (t == -1) {
-            com_err(progname, 0, "could not parse date-time string '%s'",
+            com_err(progname, 0, _("could not parse date-time string '%s'"),
                     argv[2]);
             exit_status++;
             return;
@@ -426,7 +432,7 @@ kdb5_use_mkey(int argc, char *argv[])
                                           global_params.mkey_name,
                                           global_params.realm,
                                           &mkey_fullname, &master_princ))) {
-        com_err(progname, retval, "while setting up master key name");
+        com_err(progname, retval, _("while setting up master key name"));
         exit_status++;
         goto cleanup_return;
     }
@@ -434,8 +440,7 @@ kdb5_use_mkey(int argc, char *argv[])
     retval = krb5_db_get_principal(util_context, master_princ, 0,
                                    &master_entry);
     if (retval != 0) {
-        com_err(progname, retval,
-                "while getting master key principal %s",
+        com_err(progname, retval, _("while getting master key principal %s"),
                 mkey_fullname);
         exit_status++;
         goto cleanup_return;
@@ -444,7 +449,7 @@ kdb5_use_mkey(int argc, char *argv[])
     retval = krb5_dbe_lookup_actkvno(util_context, master_entry, &actkvno_list);
     if (retval != 0) {
         com_err(progname, retval,
-                "while looking up active version of master key");
+                _("while looking up active version of master key"));
         exit_status++;
         goto cleanup_return;
     }
@@ -483,7 +488,7 @@ kdb5_use_mkey(int argc, char *argv[])
         /* alloc enough space to hold new and existing key_data */
         new_actkvno = (krb5_actkvno_node *) malloc(sizeof(krb5_actkvno_node));
         if (new_actkvno == NULL) {
-            com_err(progname, ENOMEM, "while adding new master key");
+            com_err(progname, ENOMEM, _("while adding new master key"));
             exit_status++;
             goto cleanup_return;
         }
@@ -520,28 +525,32 @@ kdb5_use_mkey(int argc, char *argv[])
     }
 
     if (actkvno_list->act_time > now) {
-        com_err(progname, EINVAL, "there must be one master key currently active");
+        com_err(progname, EINVAL,
+                _("there must be one master key currently active"));
         exit_status++;
         goto cleanup_return;
     }
 
     if ((retval = krb5_dbe_update_actkvno(util_context, master_entry,
                                           actkvno_list))) {
-        com_err(progname, retval, "while updating actkvno data for master principal entry");
+        com_err(progname, retval,
+                _("while updating actkvno data for master principal entry"));
         exit_status++;
         goto cleanup_return;
     }
 
     if ((retval = krb5_dbe_update_mod_princ_data(util_context, master_entry,
                                                  now, master_princ))) {
-        com_err(progname, retval, "while updating the master key principal modification time");
+        com_err(progname, retval, _("while updating the master key principal "
+                                    "modification time"));
         exit_status++;
         goto cleanup_return;
     }
 
     if ((retval = krb5_db_put_principal(util_context, master_entry))) {
         (void) krb5_db_fini(util_context);
-        com_err(progname, retval, "while adding master key entry to the database");
+        com_err(progname, retval,
+                _("while adding master key entry to the database"));
         exit_status++;
         goto cleanup_return;
     }
@@ -568,7 +577,7 @@ kdb5_list_mkeys(int argc, char *argv[])
     krb5_keyblock *act_mkey;
 
     if (master_keylist == NULL) {
-        com_err(progname, 0, "master keylist not initialized");
+        com_err(progname, 0, _("master keylist not initialized"));
         exit_status++;
         return;
     }
@@ -578,7 +587,7 @@ kdb5_list_mkeys(int argc, char *argv[])
                                           global_params.mkey_name,
                                           global_params.realm,
                                           &mkey_fullname, &master_princ))) {
-        com_err(progname, retval, "while setting up master key name");
+        com_err(progname, retval, _("while setting up master key name"));
         exit_status++;
         return;
     }
@@ -586,8 +595,7 @@ kdb5_list_mkeys(int argc, char *argv[])
     retval = krb5_db_get_principal(util_context, master_princ, 0,
                                    &master_entry);
     if (retval != 0) {
-        com_err(progname, retval,
-                "while getting master key principal %s",
+        com_err(progname, retval, _("while getting master key principal %s"),
                 mkey_fullname);
         exit_status++;
         goto cleanup_return;
@@ -595,7 +603,7 @@ kdb5_list_mkeys(int argc, char *argv[])
 
     retval = krb5_dbe_lookup_actkvno(util_context, master_entry, &actkvno_list);
     if (retval != 0) {
-        com_err(progname, retval, "while looking up active kvno list");
+        com_err(progname, retval, _("while looking up active kvno list"));
         exit_status++;
         goto cleanup_return;
     }
@@ -612,7 +620,7 @@ kdb5_list_mkeys(int argc, char *argv[])
             /* Keep going.  */
             act_kvno = -1;
         } else if (retval != 0) {
-            com_err(progname, retval, "while looking up active master key");
+            com_err(progname, retval, _("while looking up active master key"));
             exit_status++;
             goto cleanup_return;
         }
@@ -625,7 +633,7 @@ kdb5_list_mkeys(int argc, char *argv[])
 
         if ((retval = krb5_enctype_to_name(cur_kb_node->keyblock.enctype,
                                            FALSE, enctype, sizeof(enctype)))) {
-            com_err(progname, retval, "while getting enctype description");
+            com_err(progname, retval, _("while getting enctype description"));
             exit_status++;
             goto cleanup_return;
         }
@@ -645,7 +653,7 @@ kdb5_list_mkeys(int argc, char *argv[])
              * key is active now
              */
             if ((retval = krb5_timeofday(util_context, &act_time))) {
-                com_err(progname, retval, "while getting current time");
+                com_err(progname, retval, _("while getting current time"));
                 exit_status++;
                 goto cleanup_return;
             }
@@ -653,19 +661,23 @@ kdb5_list_mkeys(int argc, char *argv[])
 
         if (cur_kb_node->kvno == act_kvno) {
             /* * indicates kvno is currently active */
-            retval = asprintf(&output_str, "KNVO: %d, Enctype: %s, Active on: %s *\n",
+            retval = asprintf(&output_str,
+                              _("KNVO: %d, Enctype: %s, Active on: %s *\n"),
                               cur_kb_node->kvno, enctype, strdate(act_time));
         } else {
             if (act_time != -1) {
-                retval = asprintf(&output_str, "KNVO: %d, Enctype: %s, Active on: %s\n",
+                retval = asprintf(&output_str,
+                                  _("KNVO: %d, Enctype: %s, Active on: %s\n"),
                                   cur_kb_node->kvno, enctype, strdate(act_time));
             } else {
-                retval = asprintf(&output_str, "KNVO: %d, Enctype: %s, No activate time set\n",
-                                  cur_kb_node->kvno, enctype);
+                retval = asprintf(&output_str,
+                                  _("KNVO: %d, Enctype: %s, No activate time "
+                                    "set\n"), cur_kb_node->kvno, enctype);
             }
         }
         if (retval == -1) {
-            com_err(progname, ENOMEM, "asprintf could not allocate enough memory to hold output");
+            com_err(progname, ENOMEM, _("asprintf could not allocate enough "
+                                        "memory to hold output"));
             exit_status++;
             goto cleanup_return;
         }
@@ -799,7 +811,7 @@ update_princ_encryption_1(void *cb, krb5_db_entry *ent)
     retval = krb5_unparse_name(util_context, ent->princ, &pname);
     if (retval) {
         com_err(progname, retval,
-                "getting string representation of principal name");
+                _("getting string representation of principal name"));
         goto fail;
     }
 
@@ -823,50 +835,48 @@ update_princ_encryption_1(void *cb, krb5_db_entry *ent)
     retval = krb5_dbe_get_mkvno(util_context, ent, master_keylist, &old_mkvno);
     if (retval) {
         com_err(progname, retval,
-                "determining master key used for principal '%s'",
-                pname);
+                _("determining master key used for principal '%s'"), pname);
         goto fail;
     }
     /* Line up "skip" and "update" messages for viewing.  */
     if (old_mkvno == new_mkvno) {
         if (p->dry_run && p->verbose)
-            printf("would skip:   %s\n", pname);
+            printf(_("would skip:   %s\n"), pname);
         else if (p->verbose)
-            printf("skipping: %s\n", pname);
+            printf(_("skipping: %s\n"), pname);
         p->already_current++;
         goto skip;
     }
     if (p->dry_run) {
         if (p->verbose)
-            printf("would update: %s\n", pname);
+            printf(_("would update: %s\n"), pname);
         p->updated++;
         goto skip;
     } else if (p->verbose)
-        printf("updating: %s\n", pname);
+        printf(_("updating: %s\n"), pname);
     retval = master_key_convert (util_context, ent);
     if (retval) {
         com_err(progname, retval,
-                "error re-encrypting key for principal '%s'", pname);
+                _("error re-encrypting key for principal '%s'"), pname);
         goto fail;
     }
     if ((retval = krb5_timeofday(util_context, &now))) {
-        com_err(progname, retval, "while getting current time");
+        com_err(progname, retval, _("while getting current time"));
         goto fail;
     }
 
     if ((retval = krb5_dbe_update_mod_princ_data(util_context, ent,
                                                  now, master_princ))) {
         com_err(progname, retval,
-                "while updating principal '%s' modification time", pname);
+                _("while updating principal '%s' modification time"), pname);
         goto fail;
     }
 
     ent->mask |= KADM5_KEY_DATA;
 
     if ((retval = krb5_db_put_principal(util_context, ent))) {
-        com_err(progname, retval,
-                "while updating principal '%s' key data in the database",
-                pname);
+        com_err(progname, retval, _("while updating principal '%s' key data "
+                                    "in the database"), pname);
         goto fail;
     }
     p->updated++;
@@ -897,7 +907,7 @@ are_you_sure (const char *format, ...)
     va_start(va, format);
     vprintf(format, va);
     va_end(va);
-    printf("\n(type 'yes' to confirm)? ");
+    printf(_("\n(type 'yes' to confirm)? "));
     fflush(stdout);
     if (fgets(ansbuf, sizeof(ansbuf), stdin) == NULL)
         return 0;
@@ -948,13 +958,13 @@ kdb5_update_princ_encryption(int argc, char *argv[])
 
     retval = krb5_unparse_name(util_context, master_princ, &mkey_fullname);
     if (retval) {
-        com_err(progname, retval, "while formatting master principal name");
+        com_err(progname, retval, _("while formatting master principal name"));
         exit_status++;
         goto cleanup;
     }
 
     if (master_keylist == NULL) {
-        com_err(progname, retval, "master keylist not initialized");
+        com_err(progname, retval, _("master keylist not initialized"));
         exit_status++;
         goto cleanup;
     }
@@ -965,7 +975,7 @@ kdb5_update_princ_encryption(int argc, char *argv[])
         name_pattern = "*";
     if (glob_to_regexp(name_pattern, "hi", &regexp) != 0) {
         com_err(progname, ENOMEM,
-                "converting glob pattern '%s' to regular expression",
+                _("converting glob pattern '%s' to regular expression"),
                 name_pattern);
         exit_status++;
         goto cleanup;
@@ -983,7 +993,8 @@ kdb5_update_princ_encryption(int argc, char *argv[])
 #endif
     ) {
         /* XXX syslog msg or regerr(regerrno) */
-        com_err(progname, 0, "error compiling converted regexp '%s'", regexp);
+        com_err(progname, 0, _("error compiling converted regexp '%s'"),
+                regexp);
         exit_status++;
         goto cleanup;
     }
@@ -991,7 +1002,7 @@ kdb5_update_princ_encryption(int argc, char *argv[])
     retval = krb5_db_get_principal(util_context, master_princ, 0,
                                    &master_entry);
     if (retval != 0) {
-        com_err(progname, retval, "while getting master key principal %s",
+        com_err(progname, retval, _("while getting master key principal %s"),
                 mkey_fullname);
         exit_status++;
         goto cleanup;
@@ -999,7 +1010,7 @@ kdb5_update_princ_encryption(int argc, char *argv[])
 
     retval = krb5_dbe_lookup_actkvno(util_context, master_entry, &actkvno_list);
     if (retval != 0) {
-        com_err(progname, retval, "while looking up active kvno list");
+        com_err(progname, retval, _("while looking up active kvno list"));
         exit_status++;
         goto cleanup;
     }
@@ -1013,7 +1024,7 @@ kdb5_update_princ_encryption(int argc, char *argv[])
     retval = krb5_dbe_find_mkey(util_context, master_keylist,
                                 master_entry, &tmp_keyblock);
     if (retval) {
-        com_err(progname, retval, "retrieving the most recent master key");
+        com_err(progname, retval, _("retrieving the most recent master key"));
         exit_status++;
         goto cleanup;
     }
@@ -1021,19 +1032,20 @@ kdb5_update_princ_encryption(int argc, char *argv[])
 
     if (!force &&
         !data.dry_run &&
-        !are_you_sure("Re-encrypt all keys not using master key vno %u?",
+        !are_you_sure(_("Re-encrypt all keys not using master key vno %u?"),
                       new_mkvno)) {
-        printf("OK, doing nothing.\n");
+        printf(_("OK, doing nothing.\n"));
         exit_status++;
         goto cleanup;
     }
     if (data.verbose) {
-        if (data.dry_run)
-            printf("Principals whose keys WOULD BE re-encrypted to master key vno %u:\n",
-                   new_mkvno);
-        else
-            printf("Principals whose keys are being re-encrypted to master key vno %u if necessary:\n",
-                   new_mkvno);
+        if (data.dry_run) {
+            printf(_("Principals whose keys WOULD BE re-encrypted to master "
+                     "key vno %u:\n"), new_mkvno);
+        } else {
+            printf(_("Principals whose keys are being re-encrypted to master "
+                     "key vno %u if necessary:\n"), new_mkvno);
+        }
     }
 
     retval = krb5_db_iterate(util_context, name_pattern,
@@ -1041,16 +1053,18 @@ kdb5_update_princ_encryption(int argc, char *argv[])
     /* If exit_status is set, then update_princ_encryption_1 already
        printed a message.  */
     if (retval != 0 && exit_status == 0) {
-        com_err(progname, retval, "trying to process principal database");
+        com_err(progname, retval, _("trying to process principal database"));
         exit_status++;
     }
     (void) krb5_db_fini(util_context);
-    if (data.dry_run)
-        printf("%u principals processed: %u would be updated, %u already current\n",
+    if (data.dry_run) {
+        printf(_("%u principals processed: %u would be updated, %u already "
+                 "current\n"),
                data.re_match_count, data.updated, data.already_current);
-    else
-        printf("%u principals processed: %u updated, %u already current\n",
+    } else {
+        printf(_("%u principals processed: %u updated, %u already current\n"),
                data.re_match_count, data.updated, data.already_current);
+    }
 
 cleanup:
     free(regexp);
@@ -1137,7 +1151,7 @@ kdb5_purge_mkeys(int argc, char *argv[])
     }
 
     if (master_keylist == NULL) {
-        com_err(progname, 0, "master keylist not initialized");
+        com_err(progname, 0, _("master keylist not initialized"));
         exit_status++;
         return;
     }
@@ -1147,7 +1161,7 @@ kdb5_purge_mkeys(int argc, char *argv[])
                                           global_params.mkey_name,
                                           global_params.realm,
                                           &mkey_fullname, &master_princ))) {
-        com_err(progname, retval, "while setting up master key name");
+        com_err(progname, retval, _("while setting up master key name"));
         exit_status++;
         return;
     }
@@ -1155,17 +1169,16 @@ kdb5_purge_mkeys(int argc, char *argv[])
     retval = krb5_db_get_principal(util_context, master_princ, 0,
                                    &master_entry);
     if (retval != 0) {
-        com_err(progname, retval,
-                "while getting master key principal %s",
+        com_err(progname, retval, _("while getting master key principal %s"),
                 mkey_fullname);
         exit_status++;
         goto cleanup_return;
     }
 
     if (!force) {
-        printf("Will purge all unused master keys stored in the '%s' principal, are you sure?\n",
-               mkey_fullname);
-        printf("(type 'yes' to confirm)? ");
+        printf(_("Will purge all unused master keys stored in the '%s' "
+                 "principal, are you sure?\n"), mkey_fullname);
+        printf(_("(type 'yes' to confirm)? "));
         if (fgets(buf, sizeof(buf), stdin) == NULL) {
             exit_status++;
             goto cleanup_return;
@@ -1174,14 +1187,16 @@ kdb5_purge_mkeys(int argc, char *argv[])
             exit_status++;
             goto cleanup_return;
         }
-        printf("OK, purging unused master keys from '%s'...\n", mkey_fullname);
+        printf(_("OK, purging unused master keys from '%s'...\n"),
+               mkey_fullname);
     }
 
     /* save the old keydata */
     old_key_data_count = master_entry->n_key_data;
     if (old_key_data_count == 1) {
         if (verbose)
-            printf("There is only one master key which can not be purged.\n");
+            printf(_("There is only one master key which can not be "
+                     "purged.\n"));
         goto cleanup_return;
     }
     old_key_data = master_entry->key_data;
@@ -1189,7 +1204,7 @@ kdb5_purge_mkeys(int argc, char *argv[])
     args.kvnos = (struct kvnos_in_use *) malloc(sizeof(struct kvnos_in_use) * old_key_data_count);
     if (args.kvnos == NULL) {
         retval = ENOMEM;
-        com_err(progname, ENOMEM, "while allocating args.kvnos");
+        com_err(progname, ENOMEM, _("while allocating args.kvnos"));
         exit_status++;
         goto cleanup_return;
     }
@@ -1205,7 +1220,7 @@ kdb5_purge_mkeys(int argc, char *argv[])
                                   NULL,
                                   find_mkvnos_in_use,
                                   (krb5_pointer) &args))) {
-        com_err(progname, retval, "while finding master keys in use");
+        com_err(progname, retval, _("while finding master keys in use"));
         exit_status++;
         goto cleanup_return;
     }
@@ -1213,10 +1228,13 @@ kdb5_purge_mkeys(int argc, char *argv[])
      * args.kvnos has been marked with the mkvno's that are currently protecting
      * princ entries
      */
-    if (dry_run)
-        printf("Would purge the follwing master key(s) from %s:\n", mkey_fullname);
-    else
-        printf("Purging the follwing master key(s) from %s:\n", mkey_fullname);
+    if (dry_run) {
+        printf(_("Would purge the follwing master key(s) from %s:\n"),
+               mkey_fullname);
+    } else {
+        printf(_("Purging the follwing master key(s) from %s:\n"),
+               mkey_fullname);
+    }
 
     /* find # of keys still in use or print out verbose info */
     for (i = num_kvnos_inuse = num_kvnos_purged = 0; i < args.num_kvnos; i++) {
@@ -1226,35 +1244,36 @@ kdb5_purge_mkeys(int argc, char *argv[])
             /* this key would be deleted */
             if (args.kvnos[i].kvno == master_kvno) {
                 com_err(progname, KRB5_KDB_STORED_MKEY_NOTCURRENT,
-                        "master key stash file needs updating, command aborting");
+                        _("master key stash file needs updating, command "
+                          "aborting"));
                 exit_status++;
                 goto cleanup_return;
             }
             num_kvnos_purged++;
-            printf("KNVO: %d\n", args.kvnos[i].kvno);
+            printf(_("KVNO: %d\n"), args.kvnos[i].kvno);
         }
     }
     /* didn't find any keys to purge */
     if (num_kvnos_inuse == args.num_kvnos) {
-        printf("All keys in use, nothing purged.\n");
+        printf(_("All keys in use, nothing purged.\n"));
         goto cleanup_return;
     }
     if (dry_run) {
         /* bail before doing anything else */
-        printf("%d key(s) would be purged.\n", num_kvnos_purged);
+        printf(_("%d key(s) would be purged.\n"), num_kvnos_purged);
         goto cleanup_return;
     }
 
     retval = krb5_dbe_lookup_actkvno(util_context, master_entry, &actkvno_list);
     if (retval != 0) {
-        com_err(progname, retval, "while looking up active kvno list");
+        com_err(progname, retval, _("while looking up active kvno list"));
         exit_status++;
         goto cleanup_return;
     }
 
     retval = krb5_dbe_lookup_mkey_aux(util_context, master_entry, &mkey_aux_list);
     if (retval != 0) {
-        com_err(progname, retval, "while looking up mkey aux data list");
+        com_err(progname, retval, _("while looking up mkey aux data list"));
         exit_status++;
         goto cleanup_return;
     }
@@ -1262,7 +1281,7 @@ kdb5_purge_mkeys(int argc, char *argv[])
     master_entry->key_data = (krb5_key_data *) malloc(sizeof(krb5_key_data) * num_kvnos_inuse);
     if (master_entry->key_data == NULL) {
         retval = ENOMEM;
-        com_err(progname, ENOMEM, "while allocating key_data");
+        com_err(progname, ENOMEM, _("while allocating key_data"));
         exit_status++;
         goto cleanup_return;
     }
@@ -1335,7 +1354,7 @@ kdb5_purge_mkeys(int argc, char *argv[])
     if ((retval = krb5_dbe_update_actkvno(util_context, master_entry,
                                           actkvno_list))) {
         com_err(progname, retval,
-                "while updating actkvno data for master principal entry");
+                _("while updating actkvno data for master principal entry"));
         exit_status++;
         goto cleanup_return;
     }
@@ -1343,21 +1362,21 @@ kdb5_purge_mkeys(int argc, char *argv[])
     if ((retval = krb5_dbe_update_mkey_aux(util_context, master_entry,
                                            mkey_aux_list))) {
         com_err(progname, retval,
-                "while updating mkey_aux data for master principal entry");
+                _("while updating mkey_aux data for master principal entry"));
         exit_status++;
         return;
     }
 
     if ((retval = krb5_timeofday(util_context, &now))) {
-        com_err(progname, retval, "while getting current time");
+        com_err(progname, retval, _("while getting current time"));
         exit_status++;
         goto cleanup_return;
     }
 
     if ((retval = krb5_dbe_update_mod_princ_data(util_context, master_entry,
                                                  now, master_princ))) {
-        com_err(progname, retval,
-                "while updating the master key principal modification time");
+        com_err(progname, retval, _("while updating the master key principal "
+                                    "modification time"));
         exit_status++;
         goto cleanup_return;
     }
@@ -1366,11 +1385,12 @@ kdb5_purge_mkeys(int argc, char *argv[])
 
     if ((retval = krb5_db_put_principal(util_context, master_entry))) {
         (void) krb5_db_fini(util_context);
-        com_err(progname, retval, "while adding master key entry to the database");
+        com_err(progname, retval,
+                _("while adding master key entry to the database"));
         exit_status++;
         goto cleanup_return;
     }
-    printf("%d key(s) purged.\n", num_kvnos_purged);
+    printf(_("%d key(s) purged.\n"), num_kvnos_purged);
 
 cleanup_return:
     /* clean up */
diff --git a/src/kadmin/dbutil/kdb5_stash.c b/src/kadmin/dbutil/kdb5_stash.c
index 23b54f895c..35592b8082 100644
--- a/src/kadmin/dbutil/kdb5_stash.c
+++ b/src/kadmin/dbutil/kdb5_stash.c
@@ -95,7 +95,7 @@ kdb5_stash(argc, argv)
         if (krb5_enctype_to_name(master_keyblock.enctype, FALSE,
                                  tmp, sizeof(tmp)))
             com_err(progname, KRB5_PROG_KEYTYPE_NOSUPP,
-                    "while setting up enctype %d", master_keyblock.enctype);
+                    _("while setting up enctype %d"), master_keyblock.enctype);
         else
             com_err(progname, KRB5_PROG_KEYTYPE_NOSUPP, "%s", tmp);
         exit_status++; return;
@@ -114,7 +114,7 @@ kdb5_stash(argc, argv)
                                     &mkey_kvno,
                                     NULL, &master_keyblock);
         if (retval) {
-            com_err(progname, retval, "while reading master key");
+            com_err(progname, retval, _("while reading master key"));
             exit_status++; return;
         }
 
@@ -122,17 +122,17 @@ kdb5_stash(argc, argv)
                                          &master_keyblock, mkey_kvno,
                                          &master_keylist);
         if (retval) {
-            com_err(progname, retval, "while getting master key list");
+            com_err(progname, retval, _("while getting master key list"));
             exit_status++; return;
         }
     } else {
-        printf("Using existing stashed keys to update stash file.\n");
+        printf(_("Using existing stashed keys to update stash file.\n"));
     }
 
     retval = krb5_db_store_master_key_list(util_context, keyfile, master_princ,
                                            master_keylist, NULL);
     if (retval) {
-        com_err(progname, errno, "while storing key");
+        com_err(progname, errno, _("while storing key"));
         exit_status++; return;
     }
 
diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
index e7a555fafb..7f5d6746b4 100644
--- a/src/kadmin/dbutil/kdb5_util.c
+++ b/src/kadmin/dbutil/kdb5_util.c
@@ -76,27 +76,31 @@ kadm5_config_params global_params;
 
 void usage()
 {
-    fprintf(stderr, "Usage: "
-            "kdb5_util [-x db_args]* [-r realm] [-d dbname] [-k mkeytype] [-M mkeyname]\n"
-            "\t        [-kv mkeyVNO] [-sf stashfilename] [-m] cmd [cmd_options]\n"
-            "\tcreate  [-s]\n"
-            "\tdestroy [-f]\n"
-            "\tstash   [-f keyfile]\n"
-            "\tdump    [-old|-ov|-b6|-b7|-r13] [-verbose]\n"
-            "\t        [-mkey_convert] [-new_mkey_file mkey_file]\n"
-            "\t        [-rev] [-recurse] [filename [princs...]]\n"
-            "\tload    [-old|-ov|-b6|-b7|-r13] [-verbose] [-update] filename\n"
-            "\tark     [-e etype_list] principal\n"
-            "\tadd_mkey [-e etype] [-s]\n"
-            "\tuse_mkey kvno [time]\n"
-            "\tlist_mkeys\n"
-    );
+    fprintf(stderr,
+            _("Usage: kdb5_util [-x db_args]* [-r realm] [-d dbname] "
+              "[-k mkeytype] [-M mkeyname]\n"
+              "\t        [-kv mkeyVNO] [-sf stashfilename] [-m] cmd "
+              "[cmd_options]\n"
+              "\tcreate  [-s]\n"
+              "\tdestroy [-f]\n"
+              "\tstash   [-f keyfile]\n"
+              "\tdump    [-old|-ov|-b6|-b7|-r13] [-verbose]\n"
+              "\t        [-mkey_convert] [-new_mkey_file mkey_file]\n"
+              "\t        [-rev] [-recurse] [filename [princs...]]\n"
+              "\tload    [-old|-ov|-b6|-b7|-r13] [-verbose] [-update] "
+              "filename\n"
+              "\tark     [-e etype_list] principal\n"
+              "\tadd_mkey [-e etype] [-s]\n"
+              "\tuse_mkey kvno [time]\n"
+              "\tlist_mkeys\n"));
     /* avoid a string length compiler warning */
     fprintf(stderr,
-            "\tupdate_princ_encryption [-f] [-n] [-v] [princ-pattern]\n"
-            "\tpurge_mkeys [-f] [-n] [-v]\n"
-            "\nwhere,\n\t[-x db_args]* - any number of database specific arguments.\n"
-            "\t\t\tLook at each database documentation for supported arguments\n");
+            _("\tupdate_princ_encryption [-f] [-n] [-v] [princ-pattern]\n"
+              "\tpurge_mkeys [-f] [-n] [-v]\n"
+              "\nwhere,\n\t[-x db_args]* - any number of database specific "
+              "arguments.\n"
+              "\t\t\tLook at each database documentation for supported "
+              "arguments\n"));
     exit(1);
 }
 
@@ -204,13 +208,13 @@ int main(argc, argv)
 
     retval = kadm5_init_krb5_context(&util_context);
     if (retval) {
-        com_err (progname, retval, "while initializing Kerberos code");
+        com_err (progname, retval, _("while initializing Kerberos code"));
         exit(1);
     }
 
     cmd_argv = (char **) malloc(sizeof(char *)*argc);
     if (cmd_argv == NULL) {
-        com_err(progname, ENOMEM, "while creating sub-command arguments");
+        com_err(progname, ENOMEM, _("while creating sub-command arguments"));
         exit(1);
     }
     memset(cmd_argv, 0, sizeof(char *)*argc);
@@ -227,18 +231,21 @@ int main(argc, argv)
 
             if (asprintf(&db_name_tmp, "dbname=%s", global_params.dbname) < 0)
             {
-                com_err(progname, ENOMEM, "while parsing command arguments");
+                com_err(progname, ENOMEM,
+                        _("while parsing command arguments"));
                 exit(1);
             }
 
             if (!add_db_arg(db_name_tmp)) {
-                com_err(progname, ENOMEM, "while parsing command arguments\n");
+                com_err(progname, ENOMEM,
+                        _("while parsing command arguments\n"));
                 exit(1);
             }
 
         } else if (strcmp(*argv, "-x") == 0 && ARG_VAL) {
             if (!add_db_arg(koptarg)) {
-                com_err(progname, ENOMEM, "while parsing command arguments\n");
+                com_err(progname, ENOMEM,
+                        _("while parsing command arguments\n"));
                 exit(1);
             }
 
@@ -248,19 +255,22 @@ int main(argc, argv)
             /* not sure this is really necessary */
             if ((retval = krb5_set_default_realm(util_context,
                                                  global_params.realm))) {
-                com_err(progname, retval, "while setting default realm name");
+                com_err(progname, retval,
+                        _("while setting default realm name"));
                 exit(1);
             }
         } else if (strcmp(*argv, "-k") == 0 && ARG_VAL) {
             if (krb5_string_to_enctype(koptarg, &global_params.enctype)) {
-                com_err(progname, EINVAL, ": %s is an invalid enctype", koptarg);
+                com_err(progname, EINVAL, _(": %s is an invalid enctype"),
+                        koptarg);
                 exit(1);
             } else
                 global_params.mask |= KADM5_CONFIG_ENCTYPE;
         } else if (strcmp(*argv, "-kv") == 0 && ARG_VAL) {
             global_params.kvno = (krb5_kvno) atoi(koptarg);
             if (global_params.kvno == IGNORE_VNO) {
-                com_err(progname, EINVAL, ": %s is an invalid mkeyVNO", koptarg);
+                com_err(progname, EINVAL, _(": %s is an invalid mkeyVNO"),
+                        koptarg);
                 exit(1);
             } else
                 global_params.mask |= KADM5_CONFIG_KVNO;
@@ -294,7 +304,7 @@ int main(argc, argv)
         retval = krb5_get_default_realm(util_context, &temp);
         if( retval )
         {
-            com_err (progname, retval, "while getting default realm");
+            com_err(progname, retval, _("while getting default realm"));
             exit(1);
         }
         util_context->default_realm = temp;
@@ -303,7 +313,8 @@ int main(argc, argv)
     retval = kadm5_get_config_params(util_context, 1,
                                      &global_params, &global_params);
     if (retval) {
-        com_err(progname, retval, "while retreiving configuration parameters");
+        com_err(progname, retval,
+                _("while retreiving configuration parameters"));
         exit(1);
     }
 
@@ -354,14 +365,14 @@ void set_dbname(argc, argv)
     krb5_error_code retval;
 
     if (argc < 3) {
-        com_err(argv[0], 0, "Too few arguments");
-        com_err(progname, 0, "Usage: %s dbpathname realmname", argv[0]);
+        com_err(argv[0], 0, _("Too few arguments"));
+        com_err(progname, 0, _("Usage: %s dbpathname realmname"), argv[0]);
         exit_status++;
         return;
     }
     if (dbactive) {
         if ((retval = krb5_db_fini(util_context)) && retval!= KRB5_KDB_DBNOTINITED) {
-            com_err(progname, retval, "while closing previous database");
+            com_err(progname, retval, _("while closing previous database"));
             exit_status++;
             return;
         }
@@ -398,7 +409,7 @@ static int open_db_and_mkey()
 
     if ((retval = krb5_db_open(util_context, db5util_db_args,
                                KRB5_KDB_OPEN_RW | KRB5_KDB_SRV_TYPE_ADMIN))) {
-        com_err(progname, retval, "while initializing database");
+        com_err(progname, retval, _("while initializing database"));
         exit_status++;
         return(1);
     }
@@ -409,13 +420,13 @@ static int open_db_and_mkey()
                                           global_params.mkey_name,
                                           global_params.realm,
                                           0, &master_princ))) {
-        com_err(progname, retval, "while setting up master key name");
+        com_err(progname, retval, _("while setting up master key name"));
         exit_status++;
         return(1);
     }
     if ((retval = krb5_db_get_principal(util_context, master_princ, 0,
                                         &master_entry))) {
-        com_err(progname, retval, "while retrieving master entry");
+        com_err(progname, retval, _("while retrieving master entry"));
         exit_status++;
         (void) krb5_db_fini(util_context);
         return(1);
@@ -434,7 +445,7 @@ static int open_db_and_mkey()
         pwd.length = strlen(mkey_password);
         retval = krb5_principal2salt(util_context, master_princ, &scratch);
         if (retval) {
-            com_err(progname, retval, "while calculated master key salt");
+            com_err(progname, retval, _("while calculated master key salt"));
             exit_status++;
             return(1);
         }
@@ -451,7 +462,7 @@ static int open_db_and_mkey()
                                       &pwd, &scratch, &master_keyblock);
         if (retval) {
             com_err(progname, retval,
-                    "while transforming master key from password");
+                    _("while transforming master key from password"));
             exit_status++;
             return(1);
         }
@@ -465,8 +476,8 @@ static int open_db_and_mkey()
                                          global_params.stash_file,
                                          &master_kvno,
                                          0, &master_keyblock))) {
-            com_err(progname, retval, "while reading master key");
-            com_err(progname, 0, "Warning: proceeding without master key");
+            com_err(progname, retval, _("while reading master key"));
+            com_err(progname, 0, _("Warning: proceeding without master key"));
             exit_status++;
             return(0);
         }
@@ -485,7 +496,7 @@ static int open_db_and_mkey()
     seed.data = (char *) master_keyblock.contents;
 
     if ((retval = krb5_c_random_seed(util_context, &seed))) {
-        com_err(progname, retval, "while seeding random number generator");
+        com_err(progname, retval, _("while seeding random number generator"));
         exit_status++;
         memset(master_keyblock.contents, 0, master_keyblock.length);
         krb5_free_keyblock_contents(util_context, &master_keyblock);
@@ -497,8 +508,7 @@ static int open_db_and_mkey()
         if (ulog_map(util_context, global_params.iprop_logfile,
                      global_params.iprop_ulogsize, FKCOMMAND,
                      db5util_db_args)) {
-            fprintf(stderr, _("%s: Could not map log\n"),
-                    progname);
+            fprintf(stderr, _("%s: Could not map log\n"), progname);
             exit_status++;
             return(1);
         }
@@ -526,7 +536,7 @@ quit()
     memset(master_keyblock.contents, 0, master_keyblock.length);
     finished = TRUE;
     if (retval && retval != KRB5_KDB_DBNOTINITED) {
-        com_err(progname, retval, "while closing database");
+        com_err(progname, retval, _("while closing database"));
         exit_status++;
         return 1;
     }
@@ -567,13 +577,13 @@ add_random_key(argc, argv)
     pr_str = *argv;
     ret = krb5_parse_name(util_context, pr_str, &princ);
     if (ret) {
-        com_err(me, ret, "while parsing principal name %s", pr_str);
+        com_err(me, ret, _("while parsing principal name %s"), pr_str);
         exit_status++;
         return;
     }
     ret = krb5_db_get_principal(util_context, princ, 0, &dbent);
     if (ret) {
-        com_err(me, ret, "while fetching principal %s", pr_str);
+        com_err(me, ret, _("while fetching principal %s"), pr_str);
         exit_status++;
         return;
     }
@@ -582,7 +592,7 @@ add_random_key(argc, argv)
                                   &keysalts,
                                   &num_keysalts);
     if (ret) {
-        com_err(me, ret, "while parsing keysalts %s", ks_str);
+        com_err(me, ret, _("while parsing keysalts %s"), ks_str);
         exit_status++;
         return;
     }
@@ -596,7 +606,7 @@ add_random_key(argc, argv)
     /* Find the mkey used to protect the existing keys */
     ret = krb5_dbe_find_mkey(util_context, master_keylist, dbent, &tmp_mkey);
     if (ret) {
-        com_err(me, ret, "while finding mkey");
+        com_err(me, ret, _("while finding mkey"));
         krb5_db_free_principal(util_context, dbent);
         exit_status++;
         return;
@@ -614,14 +624,14 @@ add_random_key(argc, argv)
     dbent->attributes &= ~KRB5_KDB_REQUIRES_PWCHANGE;
     ret = krb5_timeofday(util_context, &now);
     if (ret) {
-        com_err(me, ret, "while getting time");
+        com_err(me, ret, _("while getting time"));
         krb5_db_free_principal(util_context, dbent);
         exit_status++;
         return;
     }
     ret = krb5_dbe_update_last_pwd_change(util_context, dbent, now);
     if (ret) {
-        com_err(me, ret, "while setting changetime");
+        com_err(me, ret, _("while setting changetime"));
         krb5_db_free_principal(util_context, dbent);
         exit_status++;
         return;
@@ -629,9 +639,9 @@ add_random_key(argc, argv)
     ret = krb5_db_put_principal(util_context, dbent);
     krb5_db_free_principal(util_context, dbent);
     if (ret) {
-        com_err(me, ret, "while saving principal %s", pr_str);
+        com_err(me, ret, _("while saving principal %s"), pr_str);
         exit_status++;
         return;
     }
-    printf("%s changed\n", pr_str);
+    printf(_("%s changed\n"), pr_str);
 }
diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c
index 162ea42158..7fe15449e3 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 91cad6b079..20a348c805 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;
             }
diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c
index 28c91a819f..d732098a2f 100644
--- a/src/kadmin/server/ipropd_svc.c
+++ b/src/kadmin/server/ipropd_svc.c
@@ -163,7 +163,7 @@ iprop_get_updates_1_svc(kdb_last_t *arg, struct svc_req *rqstp)
 	    free(client_name);
 	    free(service_name);
 	    krb5_klog_syslog(LOG_ERR,
-			     "%s: out of memory recording principal names",
+			     _("%s: out of memory recording principal names"),
 			     whoami);
 	    goto out;
 	}
@@ -290,7 +290,7 @@ ipropx_resync(uint32_t vers, struct svc_req *rqstp)
 	    free(client_name);
 	    free(service_name);
 	    krb5_klog_syslog(LOG_ERR,
-			     "%s: out of memory recording principal names",
+			     _("%s: out of memory recording principal names"),
 			     whoami);
 	    goto out;
 	}
@@ -476,8 +476,9 @@ check_iprop_rpcsec_auth(struct svc_req *rqstp)
      maj_stat = gss_inquire_context(&min_stat, ctx, NULL, &name,
 				    NULL, NULL, NULL, NULL, NULL);
      if (maj_stat != GSS_S_COMPLETE) {
-	  krb5_klog_syslog(LOG_ERR, "check_rpcsec_auth: "
-			   "failed inquire_context, stat=%u", maj_stat);
+	  krb5_klog_syslog(LOG_ERR,
+			   _("check_rpcsec_auth: failed inquire_context, "
+			     "stat=%u"), maj_stat);
 	  log_badauth(maj_stat, min_stat,
 		      &rqstp->rq_xprt->xp_raddr, NULL);
 	  goto fail_name;
@@ -508,8 +509,8 @@ check_iprop_rpcsec_auth(struct svc_req *rqstp)
 
 fail_princ:
      if (!success) {
-	 krb5_klog_syslog(LOG_ERR, "bad service principal %.*s%s",
-			  (int) slen, (char *) gss_str.value, sdots);
+	  krb5_klog_syslog(LOG_ERR, _("bad service principal %.*s%s"),
+			   (int) slen, (char *) gss_str.value, sdots);
      }
      gss_release_buffer(&min_stat, &gss_str);
      krb5_free_principal(kctx, princ);
@@ -531,8 +532,8 @@ krb5_iprop_prog_1(struct svc_req *rqstp,
     char *whoami = "krb5_iprop_prog_1";
 
     if (!check_iprop_rpcsec_auth(rqstp)) {
-	krb5_klog_syslog(LOG_ERR,
-			 "authentication attempt failed: %s, RPC authentication flavor %d",
+	krb5_klog_syslog(LOG_ERR, _("authentication attempt failed: %s, RPC "
+				    "authentication flavor %d"),
 			 inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr),
 			 rqstp->rq_cred.oa_flavor);
 	svcerr_weakauth(transp);
diff --git a/src/kadmin/server/kadm_rpc_svc.c b/src/kadmin/server/kadm_rpc_svc.c
index a231d0b1f2..a9bccf5999 100644
--- a/src/kadmin/server/kadm_rpc_svc.c
+++ b/src/kadmin/server/kadm_rpc_svc.c
@@ -4,15 +4,10 @@
  *
  */
 
-#include <stdio.h>
+#include <k5-platform.h>
 #include <gssrpc/rpc.h>
 #include <gssapi/gssapi_krb5.h> /* for gss_nt_krb5_name */
 #include <syslog.h>
-#include <string.h>
-#include "autoconf.h"
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
 #include <kadm5/kadm_rpc.h>
 #include <krb5.h>
 #include <kadm5/admin.h>
@@ -269,8 +264,8 @@ check_rpcsec_auth(struct svc_req *rqstp)
      maj_stat = gss_inquire_context(&min_stat, ctx, NULL, &name,
 				    NULL, NULL, NULL, NULL, NULL);
      if (maj_stat != GSS_S_COMPLETE) {
-	  krb5_klog_syslog(LOG_ERR, "check_rpcsec_auth: "
-			   "failed inquire_context, stat=%u", maj_stat);
+	  krb5_klog_syslog(LOG_ERR, _("check_rpcsec_auth: failed "
+				      "inquire_context, stat=%u"), maj_stat);
 	  log_badauth(maj_stat, min_stat,
 		      &rqstp->rq_xprt->xp_raddr, NULL);
 	  goto fail_name;
@@ -305,7 +300,7 @@ check_rpcsec_auth(struct svc_req *rqstp)
 
 fail_princ:
      if (!success) {
-	 krb5_klog_syslog(LOG_ERR, "bad service principal %.*s%s",
+	 krb5_klog_syslog(LOG_ERR, _("bad service principal %.*s%s"),
 			  (int) slen, (char *) gss_str.value, sdots);
      }
      gss_release_buffer(&min_stat, &gss_str);
@@ -326,9 +321,8 @@ gss_to_krb5_name_1(struct svc_req *rqstp, krb5_context ctx, gss_name_t gss_name,
 
      status = gss_display_name(&minor_stat, gss_name, gss_str, &gss_type);
      if ((status != GSS_S_COMPLETE) || (gss_type != gss_nt_krb5_name)) {
-	  krb5_klog_syslog(LOG_ERR,
-			   "gss_to_krb5_name: "
-			   "failed display_name status %d", status);
+	  krb5_klog_syslog(LOG_ERR, _("gss_to_krb5_name: failed display_name "
+				      "status %d"), status);
 	  log_badauth(status, minor_stat,
 		      &rqstp->rq_xprt->xp_raddr, NULL);
 	  return 0;
diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index 4d7a261912..8c11480e8b 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -127,15 +127,13 @@ void kadm5_set_use_password_server (void);
 
 static void usage()
 {
-    fprintf(stderr, "Usage: kadmind [-x db_args]* [-r realm] [-m] [-nofork] "
-#ifdef USE_PASSWORD_SERVER
-            "[-passwordserver] "
-#endif
-            "[-port port-number]\n"
-            "\t\t[-P pid_file]\n"
-            "\nwhere,\n\t[-x db_args]* - any number of database specific arguments.\n"
-            "\t\t\tLook at each database documentation for supported arguments\n"
-    );
+    fprintf(stderr, _("Usage: kadmind [-x db_args]* [-r realm] [-m] [-nofork] "
+                      "[-port port-number]\n"
+                      "\t\t[-P pid_file]\n"
+                      "\nwhere,\n\t[-x db_args]* - any number of database "
+                      "specific arguments.\n"
+                      "\t\t\tLook at each database documentation for "
+                      "supported arguments\n"));
     exit(1);
 }
 
@@ -181,8 +179,7 @@ static void display_status_1(m, code, type)
         maj_stat = gss_display_status(&min_stat, code,
                                       type, GSS_C_NULL_OID,
                                       &msg_ctx, &msg);
-        fprintf(stderr, "GSS-API error %s: %s\n", m,
-                (char *)msg.value);
+        fprintf(stderr, _("GSS-API error %s: %s\n"), m, (char *)msg.value);
         (void) gss_release_buffer(&min_stat, &msg);
 
         if (!msg_ctx)
@@ -256,7 +253,7 @@ int main(int argc, char *argv[])
     gssbuf.length = strlen(gssbuf.value);
     major_status = gss_str_to_oid(&minor_status, &gssbuf, &nt_krb5_name_oid);
     if (major_status != GSS_S_COMPLETE) {
-        fprintf(stderr, "Couldn't create KRB5 Name NameType OID\n");
+        fprintf(stderr, _("Couldn't create KRB5 Name NameType OID\n"));
         display_status("str_to_oid", major_status, minor_status);
         exit(1);
     }
@@ -285,8 +282,8 @@ int main(int argc, char *argv[])
                 char **temp = realloc( db_args, sizeof(char*) * (db_args_size+1)); /* one for NULL */
                 if( temp == NULL )
                 {
-                    fprintf(stderr,"%s: cannot initialize. Not enough memory\n",
-                            whoami);
+                    fprintf(stderr, _("%s: cannot initialize. Not enough "
+                                      "memory\n"), whoami);
                     exit(1);
                 }
                 db_args = temp;
@@ -332,7 +329,7 @@ int main(int argc, char *argv[])
         usage();
 
     if ((ret = kadm5_init_krb5_context(&context))) {
-        fprintf(stderr, "%s: %s while initializing context, aborting\n",
+        fprintf(stderr, _("%s: %s while initializing context, aborting\n"),
                 whoami, error_message(ret));
         exit(1);
     }
@@ -346,9 +343,8 @@ int main(int argc, char *argv[])
                          db_args,
                          &global_server_handle)) != KADM5_OK) {
         const char *e_txt = krb5_get_error_message (context, ret);
-        krb5_klog_syslog(LOG_ERR, "%s while initializing, aborting",
-                         e_txt);
-        fprintf(stderr, "%s: %s while initializing, aborting\n",
+        krb5_klog_syslog(LOG_ERR, _("%s while initializing, aborting"), e_txt);
+        fprintf(stderr, _("%s: %s while initializing, aborting\n"),
                 whoami, e_txt);
         krb5_klog_close(context);
         exit(1);
@@ -357,9 +353,9 @@ int main(int argc, char *argv[])
     if ((ret = kadm5_get_config_params(context, 1, &params,
                                        &params))) {
         const char *e_txt = krb5_get_error_message (context, ret);
-        krb5_klog_syslog(LOG_ERR, "%s: %s while initializing, aborting",
+        krb5_klog_syslog(LOG_ERR, _("%s: %s while initializing, aborting"),
                          whoami, e_txt);
-        fprintf(stderr, "%s: %s while initializing, aborting\n",
+        fprintf(stderr, _("%s: %s while initializing, aborting\n"),
                 whoami, e_txt);
         kadm5_destroy(global_server_handle);
         krb5_klog_close(context);
@@ -369,11 +365,12 @@ int main(int argc, char *argv[])
 #define REQUIRED_PARAMS (KADM5_CONFIG_REALM | KADM5_CONFIG_ACL_FILE)
 
     if ((params.mask & REQUIRED_PARAMS) != REQUIRED_PARAMS) {
-        krb5_klog_syslog(LOG_ERR, "%s: Missing required configuration values "
-                         "(%lx) while initializing, aborting", whoami,
+        krb5_klog_syslog(LOG_ERR,
+                         _("%s: Missing required configuration values "
+                           "(%lx) while initializing, aborting"), whoami,
                          (params.mask & REQUIRED_PARAMS) ^ REQUIRED_PARAMS);
-        fprintf(stderr, "%s: Missing required configuration values "
-                "(%lx) while initializing, aborting\n", whoami,
+        fprintf(stderr, _("%s: Missing required configuration values "
+                          "(%lx) while initializing, aborting\n"), whoami,
                 (params.mask & REQUIRED_PARAMS) ^ REQUIRED_PARAMS);
         krb5_klog_close(context);
         kadm5_destroy(global_server_handle);
@@ -395,9 +392,9 @@ int main(int argc, char *argv[])
 #undef server_handle
         || (ret = setup_network(global_server_handle, whoami, 0))) {
         const char *e_txt = krb5_get_error_message (context, ret);
-        krb5_klog_syslog(LOG_ERR, "%s: %s while initializing network, aborting",
-                         whoami, e_txt);
-        fprintf(stderr, "%s: %s while initializing network, aborting\n",
+        krb5_klog_syslog(LOG_ERR, _("%s: %s while initializing network, "
+                                    "aborting"), whoami, e_txt);
+        fprintf(stderr, _("%s: %s while initializing network, aborting\n"),
                 whoami, e_txt);
         kadm5_destroy(global_server_handle);
         krb5_klog_close(context);
@@ -407,10 +404,9 @@ int main(int argc, char *argv[])
     names[0].name = build_princ_name(KADM5_ADMIN_SERVICE, params.realm);
     names[1].name = build_princ_name(KADM5_CHANGEPW_SERVICE, params.realm);
     if (names[0].name == NULL || names[1].name == NULL) {
-        krb5_klog_syslog(LOG_ERR,
-                         "Cannot build GSS-API authentication names, "
-                         "failing.");
-        fprintf(stderr, "%s: Cannot build GSS-API authentication names.\n",
+        krb5_klog_syslog(LOG_ERR, _("Cannot build GSS-API authentication "
+                                    "names, failing."));
+        fprintf(stderr, _("%s: Cannot build GSS-API authentication names.\n"),
                 whoami);
         kadm5_destroy(global_server_handle);
         krb5_klog_close(context);
@@ -427,34 +423,34 @@ int main(int argc, char *argv[])
     /* Set ktkdb's internal krb5_context. */
     ret = krb5_ktkdb_set_context(hctx);
     if (ret) {
-        krb5_klog_syslog(LOG_ERR, "Can't set kdb keytab's internal context.");
+        krb5_klog_syslog(LOG_ERR,
+                         _("Can't set kdb keytab's internal context."));
         goto kterr;
     }
     ret = krb5_kt_register(context, &krb5_kt_kdb_ops);
     if (ret) {
-        krb5_klog_syslog(LOG_ERR, "Can't register kdb keytab.");
+        krb5_klog_syslog(LOG_ERR, _("Can't register kdb keytab."));
         goto kterr;
     }
     /* Tell gssapi about the kdb keytab. */
     ret = krb5_gss_register_acceptor_identity("KDB:");
     if (ret) {
-        krb5_klog_syslog(LOG_ERR, "Can't register acceptor keytab.");
+        krb5_klog_syslog(LOG_ERR, _("Can't register acceptor keytab."));
         goto kterr;
     }
 kterr:
     if (ret) {
         krb5_klog_syslog(LOG_ERR, "%s", krb5_get_error_message (context, ret));
-        fprintf(stderr, "%s: Can't set up keytab for RPC.\n", whoami);
+        fprintf(stderr, _("%s: Can't set up keytab for RPC.\n"), whoami);
         kadm5_destroy(global_server_handle);
         krb5_klog_close(context);
         exit(1);
     }
 
     if (svcauth_gssapi_set_names(names, 2) == FALSE) {
-        krb5_klog_syslog(LOG_ERR,
-                         "Cannot set GSS-API authentication names (keytab not present?), "
-                         "failing.");
-        fprintf(stderr, "%s: Cannot set GSS-API authentication names.\n",
+        krb5_klog_syslog(LOG_ERR, _("Cannot set GSS-API authentication names "
+                                    "(keytab not present?), failing."));
+        fprintf(stderr, _("%s: Cannot set GSS-API authentication names.\n"),
                 whoami);
         svcauth_gssapi_unset_names();
         kadm5_destroy(global_server_handle);
@@ -477,16 +473,15 @@ kterr:
     svcauth_gss_set_log_miscerr_func(log_miscerr, NULL);
 
     if (svcauth_gss_set_svc_name(GSS_C_NO_NAME) != TRUE) {
-        fprintf(stderr, "%s: Cannot initialize RPCSEC_GSS service name.\n",
+        fprintf(stderr, _("%s: Cannot initialize RPCSEC_GSS service name.\n"),
                 whoami);
         exit(1);
     }
 
     if ((ret = kadm5int_acl_init(context, 0, params.acl_file))) {
         errmsg = krb5_get_error_message (context, ret);
-        krb5_klog_syslog(LOG_ERR, "Cannot initialize acl file: %s",
-                         errmsg);
-        fprintf(stderr, "%s: Cannot initialize acl file: %s\n",
+        krb5_klog_syslog(LOG_ERR, _("Cannot initialize acl file: %s"), errmsg);
+        fprintf(stderr, _("%s: Cannot initialize acl file: %s\n"),
                 whoami, errmsg);
         svcauth_gssapi_unset_names();
         kadm5_destroy(global_server_handle);
@@ -497,9 +492,8 @@ kterr:
     if (!nofork && (ret = daemon(0, 0))) {
         ret = errno;
         errmsg = krb5_get_error_message (context, ret);
-        krb5_klog_syslog(LOG_ERR, "Cannot detach from tty: %s", errmsg);
-        fprintf(stderr, "%s: Cannot detach from tty: %s\n",
-                whoami, errmsg);
+        krb5_klog_syslog(LOG_ERR, _("Cannot detach from tty: %s"), errmsg);
+        fprintf(stderr, _("%s: Cannot detach from tty: %s\n"), whoami, errmsg);
         svcauth_gssapi_unset_names();
         kadm5_destroy(global_server_handle);
         krb5_klog_close(context);
@@ -509,7 +503,7 @@ kterr:
         ret = write_pid_file(pid_file);
         if (ret) {
             errmsg = krb5_get_error_message(context, ret);
-            krb5_klog_syslog(LOG_ERR, "Cannot create PID file %s: %s",
+            krb5_klog_syslog(LOG_ERR, _("Cannot create PID file %s: %s"),
                              pid_file, errmsg);
             svcauth_gssapi_unset_names();
             kadm5_destroy(global_server_handle);
@@ -518,10 +512,10 @@ kterr:
         }
     }
 
-    krb5_klog_syslog(LOG_INFO, "Seeding random number generator");
+    krb5_klog_syslog(LOG_INFO, _("Seeding random number generator"));
     ret = krb5_c_random_os_entropy(context, strong_random, NULL);
     if (ret) {
-        krb5_klog_syslog(LOG_ERR, "Error getting random seed: %s, aborting",
+        krb5_klog_syslog(LOG_ERR, _("Error getting random seed: %s, aborting"),
                          krb5_get_error_message(context, ret));
         svcauth_gssapi_unset_names();
         kadm5_destroy(global_server_handle);
@@ -556,7 +550,7 @@ kterr:
 
         if (nofork)
             fprintf(stderr,
-                    "%s: create IPROP svc (PROG=%d, VERS=%d)\n",
+                    _("%s: create IPROP svc (PROG=%d, VERS=%d)\n"),
                     whoami, KRB5_IPROP_PROG, KRB5_IPROP_VERS);
 
 #if 0
@@ -629,10 +623,10 @@ kterr:
     setup_signal_handlers(log_ctx->iproprole);
     krb5_klog_syslog(LOG_INFO, _("starting"));
     if (nofork)
-        fprintf(stderr, "%s: starting...\n", whoami);
+        fprintf(stderr, _("%s: starting...\n"), whoami);
 
     listen_and_process(global_server_handle, whoami, reset_db);
-    krb5_klog_syslog(LOG_INFO, "finished, exiting");
+    krb5_klog_syslog(LOG_INFO, _("finished, exiting"));
 
     /* Clean up memory, etc */
     svcauth_gssapi_unset_names();
@@ -823,7 +817,7 @@ void reset_db(void)
 
 void request_exit(int signum)
 {
-    krb5_klog_syslog(LOG_DEBUG, "Got signal to request exit");
+    krb5_klog_syslog(LOG_DEBUG, _("Got signal to request exit"));
     signal_requests_exit = 1;
     return;
 }
@@ -839,8 +833,8 @@ void request_exit(int signum)
  */
 void sig_pipe(int unused)
 {
-    krb5_klog_syslog(LOG_NOTICE, "Warning: Received a SIGPIPE; probably a "
-                     "client aborted.  Continuing.");
+    krb5_klog_syslog(LOG_NOTICE, _("Warning: Received a SIGPIPE; probably a "
+                                   "client aborted.  Continuing."));
     return;
 }
 
@@ -968,13 +962,15 @@ void log_badverf(gss_name_t client_name, gss_name_t server_name,
         }
     }
     if (procname != NULL)
-        krb5_klog_syslog(LOG_NOTICE, "WARNING! Forged/garbled request: %s, "
-                         "claimed client = %.*s%s, server = %.*s%s, addr = %s",
+        krb5_klog_syslog(LOG_NOTICE,
+                         _("WARNING! Forged/garbled request: %s, claimed "
+                           "client = %.*s%s, server = %.*s%s, addr = %s"),
                          procname, (int) clen, (char *) client.value, cdots,
                          (int) slen, (char *) server.value, sdots, a);
     else
-        krb5_klog_syslog(LOG_NOTICE, "WARNING! Forged/garbled request: %d, "
-                         "claimed client = %.*s%s, server = %.*s%s, addr = %s",
+        krb5_klog_syslog(LOG_NOTICE,
+                         _("WARNING! Forged/garbled request: %d, claimed "
+                           "client = %.*s%s, server = %.*s%s, addr = %s"),
                          proc, (int) clen, (char *) client.value, cdots,
                          (int) slen, (char *) server.value, sdots, a);
 
@@ -1004,7 +1000,8 @@ void log_miscerr(struct svc_req *rqst, struct rpc_msg *msg,
     char *a;
 
     a = inet_ntoa(rqst->rq_xprt->xp_raddr.sin_addr);
-    krb5_klog_syslog(LOG_NOTICE, "Miscellaneous RPC error: %s, %s", a, error);
+    krb5_klog_syslog(LOG_NOTICE, _("Miscellaneous RPC error: %s, %s"), a,
+                     error);
 }
 
 
@@ -1036,10 +1033,10 @@ void log_badauth(OM_uint32 major, OM_uint32 minor,
 
     a = inet_ntoa(addr->sin_addr);
 
-    krb5_klog_syslog(LOG_NOTICE, "Authentication attempt failed: %s, GSS-API "
-                     "error strings are:", a);
+    krb5_klog_syslog(LOG_NOTICE, _("Authentication attempt failed: %s, "
+                                   "GSS-API error strings are:"), a);
     log_badauth_display_status("   ", major, minor);
-    krb5_klog_syslog(LOG_NOTICE, "   GSS-API error strings complete.");
+    krb5_klog_syslog(LOG_NOTICE, _("   GSS-API error strings complete."));
 }
 
 void log_badauth_display_status(char *msg, OM_uint32 major, OM_uint32 minor)
@@ -1066,8 +1063,9 @@ void log_badauth_display_status_1(char *m, OM_uint32 code, int type,
                 log_badauth_display_status_1(m, minor_stat,
                                              GSS_C_MECH_CODE, 1);
             } else
-                krb5_klog_syslog(LOG_ERR, "GSS-API authentication error %.*s: "
-                                 "recursive failure!", (int) msg.length,
+                krb5_klog_syslog(LOG_ERR,
+                                 _("GSS-API authentication error %.*s: "
+                                   "recursive failure!"), (int) msg.length,
                                  (char *) msg.value);
             return;
         }
diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c
index aef30d16aa..4f7f1104e3 100644
--- a/src/kadmin/server/schpw.c
+++ b/src/kadmin/server/schpw.c
@@ -299,15 +299,13 @@ process_chpw_request(krb5_context context, void *server_handle, char *realm,
             targetp = clientstr;
         }
 
-        krb5_klog_syslog(LOG_NOTICE, "setpw request from %s by %.*s%s for %.*s%s: %s",
-                         addrbuf,
-                         (int) clen, clientstr, cdots,
-                         (int) tlen, targetp, tdots,
+        krb5_klog_syslog(LOG_NOTICE, _("setpw request from %s by %.*s%s for "
+                                       "%.*s%s: %s"), addrbuf, (int) clen,
+                         clientstr, cdots, (int) tlen, targetp, tdots,
                          errmsg ? errmsg : "success");
     } else {
-        krb5_klog_syslog(LOG_NOTICE, "chpw request from %s for %.*s%s: %s",
-                         addrbuf,
-                         (int) clen, clientstr, cdots,
+        krb5_klog_syslog(LOG_NOTICE, _("chpw request from %s for %.*s%s: %s"),
+                         addrbuf, (int) clen, clientstr, cdots,
                          errmsg ? errmsg : "success");
     }
     switch (ret) {
@@ -484,7 +482,7 @@ dispatch(void *handle,
 
     ret = krb5_kt_resolve(server_handle->context, "KDB:", &kt);
     if (ret != 0) {
-        krb5_klog_syslog(LOG_ERR, "chpw: Couldn't open admin keytab %s",
+        krb5_klog_syslog(LOG_ERR, _("chpw: Couldn't open admin keytab %s"),
                          krb5_get_error_message(server_handle->context, ret));
         goto cleanup;
     }
diff --git a/src/kadmin/server/server_stubs.c b/src/kadmin/server/server_stubs.c
index 79bd2839fc..6a2ed75511 100644
--- a/src/kadmin/server/server_stubs.c
+++ b/src/kadmin/server/server_stubs.c
@@ -4,6 +4,7 @@
  *
  */
 
+#include <k5-platform.h>
 #include <gssapi/gssapi.h>
 #include <gssapi/gssapi_krb5.h> /* for gss_nt_krb5_name */
 #include <krb5.h>
@@ -15,10 +16,6 @@
 #include <arpa/inet.h>  /* inet_ntoa */
 #include <adm_proto.h>  /* krb5_klog_syslog */
 #include "misc.h"
-#include <string.h>
-
-#define LOG_UNAUTH  "Unauthorized request: %s, %s, client=%s, service=%s, addr=%s"
-#define LOG_DONE    "Request: %s, %s, %s, client=%s, service=%s, addr=%s"
 
 extern gss_name_t                       gss_changepw_name;
 extern gss_name_t                       gss_oldchangepw_name;
@@ -262,8 +259,8 @@ log_unauth(
 
     /* okay to cast lengths to int because trunc_name limits max value */
     return krb5_klog_syslog(LOG_NOTICE,
-                            "Unauthorized request: %s, %.*s%s, "
-                            "client=%.*s%s, service=%.*s%s, addr=%s",
+                            _("Unauthorized request: %s, %.*s%s, "
+                              "client=%.*s%s, service=%.*s%s, addr=%s"),
                             op, (int)tlen, target, tdots,
                             (int)clen, (char *)client->value, cdots,
                             (int)slen, (char *)server->value, sdots,
@@ -282,6 +279,8 @@ log_done(
     size_t tlen, clen, slen;
     char *tdots, *cdots, *sdots;
 
+    if (errmsg == NULL)
+        errmsg = _("success");
     tlen = strlen(target);
     trunc_name(&tlen, &tdots);
     clen = client->length;
@@ -291,8 +290,8 @@ log_done(
 
     /* okay to cast lengths to int because trunc_name limits max value */
     return krb5_klog_syslog(LOG_NOTICE,
-                            "Request: %s, %.*s%s, %s, "
-                            "client=%.*s%s, service=%.*s%s, addr=%s",
+                            _("Request: %s, %.*s%s, %s, "
+                              "client=%.*s%s, service=%.*s%s, addr=%s"),
                             op, (int)tlen, target, tdots, errmsg,
                             (int)clen, (char *)client->value, cdots,
                             (int)slen, (char *)server->value, sdots,
@@ -345,8 +344,7 @@ create_principal_2_svc(cprinc_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_create_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_create_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -408,8 +406,7 @@ create_principal3_2_svc(cprinc3_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_create_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_create_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -465,8 +462,7 @@ delete_principal_2_svc(dprinc_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_delete_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_delete_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -525,8 +521,7 @@ modify_principal_2_svc(mprinc_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_modify_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_modify_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -599,9 +594,9 @@ rename_principal_2_svc(rprinc_arg *arg, struct svc_req *rqstp)
     if (ret.code != KADM5_OK) {
         /* okay to cast lengths to int because trunc_name limits max value */
         krb5_klog_syslog(LOG_NOTICE,
-                         "Unauthorized request: kadm5_rename_principal, "
-                         "%.*s%s to %.*s%s, "
-                         "client=%.*s%s, service=%.*s%s, addr=%s",
+                         _("Unauthorized request: kadm5_rename_principal, "
+                           "%.*s%s to %.*s%s, "
+                           "client=%.*s%s, service=%.*s%s, addr=%s"),
                          (int)tlen1, prime_arg1, tdots1,
                          (int)tlen2, prime_arg2, tdots2,
                          (int)clen, (char *)client_name.value, cdots,
@@ -615,12 +610,12 @@ rename_principal_2_svc(rprinc_arg *arg, struct svc_req *rqstp)
 
         /* okay to cast lengths to int because trunc_name limits max value */
         krb5_klog_syslog(LOG_NOTICE,
-                         "Request: kadm5_rename_principal, "
-                         "%.*s%s to %.*s%s, %s, "
-                         "client=%.*s%s, service=%.*s%s, addr=%s",
+                         _("Request: kadm5_rename_principal, "
+                           "%.*s%s to %.*s%s, %s, "
+                           "client=%.*s%s, service=%.*s%s, addr=%s"),
                          (int)tlen1, prime_arg1, tdots1,
                          (int)tlen2, prime_arg2, tdots2,
-                         errmsg ? errmsg : "success",
+                         errmsg ? errmsg : _("success"),
                          (int)clen, (char *)client_name.value, cdots,
                          (int)slen, (char *)service_name.value, sdots,
                          inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr));
@@ -686,7 +681,7 @@ get_principal_2_svc(gprinc_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done(funcname, prime_arg, errmsg ? errmsg : "success",
+        log_done(funcname, prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -744,8 +739,7 @@ get_princs_2_svc(gprincs_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_get_principals", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_get_principals", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -807,8 +801,7 @@ chpass_principal_2_svc(chpass_arg *arg, struct svc_req *rqstp)
         if (ret.code != 0)
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_chpass_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_chpass_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -877,8 +870,7 @@ chpass_principal3_2_svc(chpass3_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_chpass_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_chpass_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -938,8 +930,7 @@ setv4key_principal_2_svc(setv4key_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_setv4key_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_setv4key_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -999,8 +990,7 @@ setkey_principal_2_svc(setkey_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_setkey_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_setkey_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1063,8 +1053,7 @@ setkey_principal3_2_svc(setkey3_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_setkey_principal", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_setkey_principal", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1137,7 +1126,7 @@ chrand_principal_2_svc(chrand_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done(funcname, prime_arg, errmsg ? errmsg : "success",
+        log_done(funcname, prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1214,7 +1203,7 @@ chrand_principal3_2_svc(chrand3_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done(funcname, prime_arg, errmsg ? errmsg : "success",
+        log_done(funcname, prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1269,8 +1258,7 @@ create_policy_2_svc(cpol_arg *arg, struct svc_req *rqstp)
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
         log_done("kadm5_create_policy",
-                 ((prime_arg == NULL) ? "(null)" : prime_arg),
-                 errmsg ? errmsg : "success",
+                 ((prime_arg == NULL) ? "(null)" : prime_arg), errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1322,8 +1310,7 @@ delete_policy_2_svc(dpol_arg *arg, struct svc_req *rqstp)
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
         log_done("kadm5_delete_policy",
-                 ((prime_arg == NULL) ? "(null)" : prime_arg),
-                 errmsg ? errmsg : "success",
+                 ((prime_arg == NULL) ? "(null)" : prime_arg), errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1376,8 +1363,7 @@ modify_policy_2_svc(mpol_arg *arg, struct svc_req *rqstp)
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
         log_done("kadm5_modify_policy",
-                 ((prime_arg == NULL) ? "(null)" : prime_arg),
-                 errmsg ? errmsg : "success",
+                 ((prime_arg == NULL) ? "(null)" : prime_arg), errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1449,8 +1435,7 @@ get_policy_2_svc(gpol_arg *arg, struct svc_req *rqstp)
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
         log_done(funcname,
-                 ((prime_arg == NULL) ? "(null)" : prime_arg),
-                 errmsg ? errmsg : "success",
+                 ((prime_arg == NULL) ? "(null)" : prime_arg), errmsg,
                  &client_name, &service_name, rqstp);
         if (errmsg != NULL)
             krb5_free_error_message(handle->context, errmsg);
@@ -1509,8 +1494,7 @@ get_pols_2_svc(gpols_arg *arg, struct svc_req *rqstp)
         if( ret.code != 0 )
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done("kadm5_get_policies", prime_arg,
-                 errmsg ? errmsg : "success",
+        log_done("kadm5_get_policies", prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1550,8 +1534,7 @@ getprivs_ret * get_privs_2_svc(krb5_ui_4 *arg, struct svc_req *rqstp)
     if( ret.code != 0 )
         errmsg = krb5_get_error_message(handle->context, ret.code);
 
-    log_done("kadm5_get_privs", client_name.value,
-             errmsg ? errmsg : "success",
+    log_done("kadm5_get_privs", client_name.value, errmsg,
              &client_name, &service_name, rqstp);
 
     if (errmsg != NULL)
@@ -1607,7 +1590,7 @@ purgekeys_2_svc(purgekeys_arg *arg, struct svc_req *rqstp)
         if (ret.code != 0)
             errmsg = krb5_get_error_message(handle->context, ret.code);
 
-        log_done(funcname, prime_arg, errmsg ? errmsg : "success",
+        log_done(funcname, prime_arg, errmsg,
                  &client_name, &service_name, rqstp);
 
         if (errmsg != NULL)
@@ -1655,11 +1638,11 @@ generic_ret *init_2_svc(krb5_ui_4 *arg, struct svc_req *rqstp)
     slen = service_name.length;
     trunc_name(&slen, &sdots);
     /* okay to cast lengths to int because trunc_name limits max value */
-    krb5_klog_syslog(LOG_NOTICE, "Request: kadm5_init, %.*s%s, %s, "
-                     "client=%.*s%s, service=%.*s%s, addr=%s, "
-                     "vers=%d, flavor=%d",
+    krb5_klog_syslog(LOG_NOTICE, _("Request: kadm5_init, %.*s%s, %s, "
+                                   "client=%.*s%s, service=%.*s%s, addr=%s, "
+                                   "vers=%d, flavor=%d"),
                      (int)clen, (char *)client_name.value, cdots,
-                     errmsg ? errmsg : "success",
+                     errmsg ? errmsg : _("success"),
                      (int)clen, (char *)client_name.value, cdots,
                      (int)slen, (char *)service_name.value, sdots,
                      inet_ntoa(rqstp->rq_xprt->xp_raddr.sin_addr),