Mark up strings for translation

ticket: 6918

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

3 files changed, 37 insertions, 31 deletions

diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index b37a5c110..e18b99e8b 100644
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -180,7 +180,8 @@ get_conf_section(krb5_context context, char **section)
 
     if (context->default_realm == NULL) {
         krb5_set_error_message(context, KRB5_KDB_SERVER_INTERNAL_ERR,
-                               "No default realm set; cannot initialize KDB");
+                               _("No default realm set; cannot initialize "
+                                 "KDB"));
         return KRB5_KDB_SERVER_INTERNAL_ERR;
     }
     status = profile_get_string(context->profile,
@@ -282,7 +283,7 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library *libptr)
 #endif
     if (!vftabl_addr) {
         krb5_set_error_message(kcontext, KRB5_KDB_DBTYPE_NOTFOUND,
-                               "Unable to find requested database type: %s",
+                               _("Unable to find requested database type: %s"),
                                lib_name);
         return KRB5_PLUGIN_OP_NOTSUPP;
     }
@@ -364,9 +365,10 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library *lib)
                                             &(*lib)->dl_dir_handle, &kcontext->err))) {
         const char *err_str = krb5_get_error_message(kcontext, status);
         status = KRB5_KDB_DBTYPE_NOTFOUND;
-        krb5_set_error_message (kcontext, status,
-                                "Unable to find requested database type: %s", err_str);
-        krb5_free_error_message (kcontext, err_str);
+        krb5_set_error_message(kcontext, status,
+                               _("Unable to find requested database type: %s"),
+                               err_str);
+        krb5_free_error_message(kcontext, err_str);
         goto clean_n_exit;
     }
 
@@ -374,18 +376,20 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library *lib)
                                                &vftabl_addrs, &kcontext->err))) {
         const char *err_str = krb5_get_error_message(kcontext, status);
         status = KRB5_KDB_DBTYPE_INIT;
-        krb5_set_error_message (kcontext, status,
-                                "plugin symbol 'kdb_function_table' lookup failed: %s", err_str);
-        krb5_free_error_message (kcontext, err_str);
+        krb5_set_error_message(kcontext, status,
+                               _("plugin symbol 'kdb_function_table' lookup "
+                                 "failed: %s"), err_str);
+        krb5_free_error_message(kcontext, err_str);
         goto clean_n_exit;
     }
 
     if (vftabl_addrs[0] == NULL) {
         /* No plugins! */
         status = KRB5_KDB_DBTYPE_NOTFOUND;
-        krb5_set_error_message (kcontext, status,
-                                _("Unable to load requested database module '%s': plugin symbol 'kdb_function_table' not found"),
-                                lib_name);
+        krb5_set_error_message(kcontext, status,
+                               _("Unable to load requested database module "
+                                 "'%s': plugin symbol 'kdb_function_table' "
+                                 "not found"), lib_name);
         goto clean_n_exit;
     }
 
@@ -1709,8 +1713,8 @@ krb5_dbe_lookup_mkey_aux(krb5_context context, krb5_db_entry *entry,
             }
         } else {
             krb5_set_error_message(context, KRB5_KDB_BAD_VERSION,
-                                   "Illegal version number for KRB5_TL_MKEY_AUX %d\n",
-                                   version);
+                                   _("Illegal version number for "
+                                     "KRB5_TL_MKEY_AUX %d\n"), version);
             return (KRB5_KDB_BAD_VERSION);
         }
     }
@@ -1860,9 +1864,9 @@ krb5_dbe_lookup_actkvno(krb5_context context, krb5_db_entry *entry,
                 next_tuple += ACTKVNO_TUPLE_SIZE;
             }
         } else {
-            krb5_set_error_message (context, KRB5_KDB_BAD_VERSION,
-                                    "Illegal version number for KRB5_TL_ACTKVNO %d\n",
-                                    version);
+            krb5_set_error_message(context, KRB5_KDB_BAD_VERSION,
+                                   _("Illegal version number for "
+                                     "KRB5_TL_ACTKVNO %d\n"), version);
             return (KRB5_KDB_BAD_VERSION);
         }
     }
diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c
index 9763d6e80..d8dd4266e 100644
--- a/src/lib/kdb/kdb_default.c
+++ b/src/lib/kdb/kdb_default.c
@@ -160,9 +160,9 @@ krb5_def_store_mkey_list(krb5_context       context,
         /* if keyfile exists it better be a regular file */
         if (!S_ISREG(stb.st_mode)) {
             retval = EINVAL;
-            krb5_set_error_message (context, retval,
-                                    "keyfile (%s) is not a regular file: %s",
-                                    keyfile, error_message(retval));
+            krb5_set_error_message(context, retval,
+                                   _("keyfile (%s) is not a regular file: %s"),
+                                   keyfile, error_message(retval));
             goto out;
         }
     }
@@ -171,8 +171,8 @@ krb5_def_store_mkey_list(krb5_context       context,
 
     /* create temp file template for use by mktemp() */
     if ((retval = asprintf(&tmp_ktname, "WRFILE:%s_XXXXXX", keyfile)) < 0) {
-        krb5_set_error_message (context, retval,
-                                "Could not create temp keytab file name.");
+        krb5_set_error_message(context, retval,
+                               _("Could not create temp keytab file name."));
         goto out;
     }
 
@@ -185,9 +185,9 @@ krb5_def_store_mkey_list(krb5_context       context,
 
     if (mktemp(tmp_ktpath) == NULL) {
         retval = errno;
-        krb5_set_error_message (context, retval,
-                                "Could not create temp stash file: %s",
-                                error_message(errno));
+        krb5_set_error_message(context, retval,
+                               _("Could not create temp stash file: %s"),
+                               error_message(errno));
         goto out;
     }
 
@@ -215,9 +215,10 @@ krb5_def_store_mkey_list(krb5_context       context,
         /* rename original keyfile to original filename */
         if (rename(tmp_ktpath, keyfile) < 0) {
             retval = errno;
-            krb5_set_error_message (context, retval,
-                                    "rename of temporary keyfile (%s) to (%s) failed: %s",
-                                    tmp_ktpath, keyfile, error_message(errno));
+            krb5_set_error_message(context, retval,
+                                   _("rename of temporary keyfile (%s) to "
+                                     "(%s) failed: %s"), tmp_ktpath, keyfile,
+                                   error_message(errno));
         }
     }
 
@@ -405,7 +406,7 @@ krb5_db_def_fetch_mkey(krb5_context   context,
      */
     if (retval != 0) {
         krb5_set_error_message(context, KRB5_KDB_CANTREAD_STORED,
-                               "Can not fetch master key (error: %s).",
+                               _("Can not fetch master key (error: %s)."),
                                error_message(retval));
         return KRB5_KDB_CANTREAD_STORED;
     } else
@@ -468,8 +469,9 @@ krb5_def_fetch_mkey_list(krb5_context        context,
             }
         }
         if (found_key != TRUE) {
-            krb5_set_error_message (context, KRB5_KDB_BADMASTERKEY,
-                                    "Unable to decrypt latest master key with the provided master key\n");
+            krb5_set_error_message(context, KRB5_KDB_BADMASTERKEY,
+                                   _("Unable to decrypt latest master key "
+                                     "with the provided master key\n"));
             retval = KRB5_KDB_BADMASTERKEY;
             goto clean_n_exit;
         }
diff --git a/src/lib/kdb/kdb_log.c b/src/lib/kdb/kdb_log.c
index c254ab27d..625c71a3e 100644
--- a/src/lib/kdb/kdb_log.c
+++ b/src/lib/kdb/kdb_log.c
@@ -100,7 +100,7 @@ ulog_sync_header(kdb_hlog_t *ulog)
         /*
          * Couldn't sync to disk, let's panic
          */
-        syslog(LOG_ERR, "ulog_sync_header: could not sync to disk");
+        syslog(LOG_ERR, _("ulog_sync_header: could not sync to disk"));
         abort();
     }
 }