2 files changed, 7 insertions, 29 deletions

diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index c3bc4392..0becd419 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -359,29 +359,7 @@ void updateSize_LabelWidget(iLabelWidget *d) {
 }
 
 static void replaceVariables_LabelWidget_(iLabelWidget *d) {
-    for (const char *label = cstr_String(&d->label); *label; ) {
-        iRangecc id;
-        id.start = strstr(label, "${");
-        if (!id.start) {
-            break;
-        }
-        id.start += 2;
-        id.end = strchr(id.start, '}');
-        iAssert(id.end != NULL);
-        /* TODO: Add a lookup that doesn't allocate anything; Lang can handle it. */
-        const size_t len = size_Range(&id);
-        char *key = malloc(len + 1);
-        memcpy(key, id.start, len);
-        key[len] = 0;
-        const char *text = cstr_Lang(key);
-        const size_t textLen = strlen(text);
-        free(key);
-        /* Replace it. */
-        size_t startPos = id.start - cstr_String(&d->label) - 2;
-        remove_Block(&d->label.chars, startPos, len + 3);
-        insertData_Block(&d->label.chars, startPos, text, textLen);
-        label = cstr_String(&d->label) + startPos + textLen;
-    }
+    translate_Lang(&d->label);
 }
 
 void init_LabelWidget(iLabelWidget *d, const char *label, const char *cmd) {
diff --git a/src/ui/window.c b/src/ui/window.c
index 2d1deb72..d27d252b 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1055,12 +1055,12 @@ static void setupUserInterface_Window(iWindow *d) {
         setAlignVisually_LabelWidget(navMenu, iTrue);
         setId_Widget(addChildFlags_Widget(navBar, iClob(navMenu), collapse_WidgetFlag), "navbar.menu");
 #else
-        insertMenuItems_MacOS("File", 1, fileMenuItems_, iElemCount(fileMenuItems_));
-        insertMenuItems_MacOS("Edit", 2, editMenuItems_, iElemCount(editMenuItems_));
-        insertMenuItems_MacOS("View", 3, viewMenuItems_, iElemCount(viewMenuItems_));
-        insertMenuItems_MacOS("Bookmarks", 4, bookmarksMenuItems_, iElemCount(bookmarksMenuItems_));
-        insertMenuItems_MacOS("Identity", 5, identityMenuItems_, iElemCount(identityMenuItems_));
-        insertMenuItems_MacOS("Help", 7, helpMenuItems_, iElemCount(helpMenuItems_));
+        insertMenuItems_MacOS("${menu.title.file}", 1, fileMenuItems_, iElemCount(fileMenuItems_));
+        insertMenuItems_MacOS("${menu.title.edit}", 2, editMenuItems_, iElemCount(editMenuItems_));
+        insertMenuItems_MacOS("${menu.title.view}", 3, viewMenuItems_, iElemCount(viewMenuItems_));
+        insertMenuItems_MacOS("${menu.title.bookmarks}", 4, bookmarksMenuItems_, iElemCount(bookmarksMenuItems_));
+        insertMenuItems_MacOS("${menu.title.identity}", 5, identityMenuItems_, iElemCount(identityMenuItems_));
+        insertMenuItems_MacOS("${menu.title.help}", 7, helpMenuItems_, iElemCount(helpMenuItems_));
 #endif
     }
     /* Tab bar. */ {