From a58de4840edd7796c385c11a6d49ce28c724b305 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Thu, 21 Aug 2014 10:19:09 +0800 Subject: [PATCH] ui/ncurses: Make device labels translateable We're not using gettext for the device label strings; this change adds the necessary macros to do so. Also, we change "Interface" to "Network", to make the label a little more obvious. Signed-off-by: Jeremy Kerr --- po/en.po | 14 +++++++++++++- ui/ncurses/nc-menu.c | 10 +++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/po/en.po b/po/en.po index 52a4c3f..e99580e 100644 --- a/po/en.po +++ b/po/en.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n" "Report-Msgid-Bugs-To: Geoff Levand \n" -"POT-Creation-Date: 2014-07-28 16:06+0800\n" +"POT-Creation-Date: 2014-08-21 10:22+0800\n" "PO-Revision-Date: 2014-06-24 13:56+0800\n" "Last-Translator: Jeremy Kerr \n" "Language-Team: English\n" @@ -291,6 +291,18 @@ msgstr "Petitboot Language Selection" msgid "!Invalid option %d" msgstr "!Invalid option %d" +msgid "Disk" +msgstr "Disk" + +msgid "CD/DVD" +msgstr "CD/DVD" + +msgid "Network" +msgstr "Network" + +msgid "Unknown Device" +msgstr "Unknown Device" + msgid "Waiting for system information..." msgstr "Waiting for system information..." diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c index 666b78b..7ff2468 100644 --- a/ui/ncurses/nc-menu.c +++ b/ui/ncurses/nc-menu.c @@ -265,7 +265,7 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev, if (matched) { snprintf(buf,sizeof(buf),"[%s: %s / %s]", dev->type == DEVICE_TYPE_DISK ? - "Disk" : "CD/DVD", + _("Disk") : _("CD/DVD"), bd->name, bd->uuid); } break; @@ -282,8 +282,8 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev, if (matched) { mac_str(intf->hwaddr, intf->hwaddr_size, hwaddr, sizeof(hwaddr)); - snprintf(buf,sizeof(buf),"[Interface %s / %s]", - intf->name, hwaddr); + snprintf(buf,sizeof(buf),"[%s: %s / %s]", + _("Network"), intf->name, hwaddr); } break; @@ -294,8 +294,8 @@ struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev, if (!matched) { pb_debug("%s: No matching device found for %s (%s)\n", __func__,opt->device_id, dev->id); - snprintf(buf,sizeof(buf),"[Unknown Device: %s]", - dev->id); + snprintf(buf, sizeof(buf), "[%s: %s]", + _("Unknown Device"), dev->id); } dev_hdr = pmenu_item_create(menu, buf); -- 2.39.2