top: make 'n/a' (not applicable) notation translatable <=== port of newlib daaf634e

______________________________ original newlib message
--------------------------------------------- ( none )

Signed-off-by: Jim Warner <james.warner@comcast.net>

diff --git a/top/top.c b/top/top.c
index 01430a7520d2f2477ec469acfa7f5e8f789a6eb8..5f2d27e837f9c95aef31d820a31585abd29a5648 100644 (file)
--- a/top/top.c
+++ b/top/top.c
@@ -5194,7 +5194,7 @@ static int bot_focus_str (const char *hdr, const char *str) {
       memset(Bot_buf, '\0', sizeof(Bot_buf));
       n = strlen(str);
       if (n >= sizeof(Bot_buf)) n = sizeof(Bot_buf) - 1;
-      if (!*str || !strcmp(str, "-")) strcpy(Bot_buf, "n/a");
+      if (!*str || !strcmp(str, "-")) strcpy(Bot_buf, N_txt(X_BOT_nodata_txt));
       else memccpy(Bot_buf, str, '\0', n);
       Bot_rsvd = 1 + BOT_RSVD + ((strlen(Bot_buf) - utf8_delta(Bot_buf)) / Screen_cols);
       if (Bot_rsvd > maxRSVD) Bot_rsvd = maxRSVD;
@@ -5246,7 +5246,7 @@ static int bot_focus_strv (const char *hdr, const char **strv) {
       if (n >= sizeof(Bot_buf)) n = sizeof(Bot_buf) - 1;
       memcpy(Bot_buf, strv[0], n);
       if (!Bot_buf[0] || (!strcmp(Bot_buf, "-") && n <= sizeof(char *)))
-         strcpy(Bot_buf, "n/a");
+         strcpy(Bot_buf, N_txt(X_BOT_nodata_txt));
       for (nsav= 0, p = Bot_buf, x = 0; strv[nsav] != NULL; nsav++) {
          p += strlen(strv[nsav]) + 1;
          if ((p - Bot_buf) >= sizeof(Bot_buf))

diff --git a/top/top_nls.c b/top/top_nls.c
index 0e15726684e38760c6149b2fa2598ad9175343d9..533042e315d3eaeef136e329597bbd039c051321 100644 (file)
--- a/top/top_nls.c
+++ b/top/top_nls.c
@@ -528,6 +528,7 @@ static void build_norm_nlstab (void) {
    Norm_nlstab[X_BOT_ctlgrp_fmt] = _("control groups for pid %d, %s");
    Norm_nlstab[X_BOT_envirn_fmt] = _("environment for pid %d, %s");
    Norm_nlstab[X_BOT_namesp_fmt] = _("namespaces for pid %d, %s");
+   Norm_nlstab[X_BOT_nodata_txt] = _("n/a");
    Norm_nlstab[X_BOT_supgrp_fmt] = _("supplementary groups for pid %d, %s");
    Norm_nlstab[X_BOT_msglog_txt] = _("message log, last 10 messages:");
 }

diff --git a/top/top_nls.h b/top/top_nls.h
index 52731a3c623eda06c98d81a101b660d020338e74..ae6d07f937125e10866238b1daa9ea79a53c9c92 100644 (file)
--- a/top/top_nls.h
+++ b/top/top_nls.h
@@ -85,7 +85,7 @@ enum norm_nls {
    XTRA_badflds_fmt, XTRA_fixwide_fmt, XTRA_modebad_txt, XTRA_size2up_txt,
    XTRA_vforest_fmt, XTRA_warncfg_txt, XTRA_warnold_txt, XTRA_winsize_txt,
    X_BOT_cmdlin_fmt, X_BOT_ctlgrp_fmt, X_BOT_envirn_fmt, X_BOT_msglog_txt,
-   X_BOT_namesp_fmt, X_BOT_supgrp_fmt,
+   X_BOT_namesp_fmt, X_BOT_nodata_txt, X_BOT_supgrp_fmt,
    YINSP_demo01_txt, YINSP_demo02_txt, YINSP_demo03_txt, YINSP_deqfmt_txt,
    YINSP_deqtyp_txt, YINSP_dstory_txt,
    YINSP_failed_fmt, YINSP_noent1_txt, YINSP_noent2_txt, YINSP_pidbad_fmt,