4 files changed, 28 insertions, 31 deletions

diff --git a/src/app.c b/src/app.c
index 52b004e2..3c1dd025 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1591,8 +1591,8 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
             const iString *country      = text_InputWidget (findChild_Widget(dlg, "ident.country"));
             const iBool    isTemp       = isSelected_Widget(findChild_Widget(dlg, "ident.temp"));
             if (isEmpty_String(commonName)) {
-                makeSimpleMessage_Widget(orange_ColorEscape "MISSING INFO",
-                                         "A \"Common name\" must be specified.");
+                makeSimpleMessage_Widget(orange_ColorEscape "${heading.newident.missing}",
+                                         "${dlg.newindent.missing.commonname}");
                 return iTrue;
             }
             iDate until;
@@ -1606,11 +1606,8 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
                            "%04u-%u-%u %u:%u:%u",
                            &val[0], &val[1], &val[2], &val[3], &val[4], &val[5]);
                 if (n <= 0) {
-                    makeSimpleMessage_Widget(orange_ColorEscape "INVALID DATE",
-                                             "Please check the \"Valid until\" date. Examples:\n"
-                                             "\u2022 2030\n"
-                                             "\u2022 2025-06-30\n"
-                                             "\u2022 2021-12-31 23:59:59");
+                    makeSimpleMessage_Widget(orange_ColorEscape "${heading.newident.date.bad}",
+                                             "${dlg.newident.date.example}");
                     return iTrue;
                 }
                 until.year   = val[0];
@@ -1625,8 +1622,8 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
                     initCurrent_Time(&now);
                     init_Time(&t, &until);
                     if (cmp_Time(&t, &now) <= 0) {
-                        makeSimpleMessage_Widget(orange_ColorEscape "INVALID DATE",
-                                                 "Expiration date must be in the future.");
+                        makeSimpleMessage_Widget(orange_ColorEscape "${heading.newident.date.bad}",
+                                                 "${dlg.newident.date.past}");
                         return iTrue;
                     }
                 }
diff --git a/src/gempub.c b/src/gempub.c
index 448349c8..c9b1c242 100644
--- a/src/gempub.c
+++ b/src/gempub.c
@@ -79,7 +79,7 @@ static iBool parseMetadata_Gempub_(iGempub *d) {
         "cover:",
     };
     /* Default values. */
-    setCStr_String(&d->props[title_GempubProperty], "Untitled Book");
+    setCStr_String(&d->props[title_GempubProperty], "${gempub.cover.untitled}");
     setCStr_String(&d->props[cover_GempubProperty],
                    entryCStr_Archive(d->arch, "cover.jpg") ? "cover.jpg" :
                    entryCStr_Archive(d->arch, "cover.png") ? "cover.png" : "");
@@ -173,38 +173,38 @@ iString *coverPageSource_Gempub(const iGempub *d) {
         appendFormat_String(out, "%s\n", cstr_String(&d->props[description_GempubProperty]));
     }
     appendCStr_String(out, "\n");
-    appendProperty_Gempub_(d, "Author:", author_GempubProperty, out);
+    appendProperty_Gempub_(d, "${gempub.meta.author}:", author_GempubProperty, out);
     if (!isRemote_Gempub_(d)) {
-        appendFormat_String(out, "\n=> %s " book_Icon " View Gempub contents\n",
+        appendFormat_String(out, "\n=> %s " book_Icon " ${gempub.cover.view}\n",
                             cstrCollect_String(concat_Path(baseUrl, &d->props[index_GempubProperty])));
         if (hasProperty_Gempub_(d, cover_GempubProperty)) {
-            appendFormat_String(out, "\n=> %s  Cover image\n",
+            appendFormat_String(out, "\n=> %s  ${gempub.cover.image}\n",
                                 cstrCollect_String(concat_Path(baseUrl, &d->props[cover_GempubProperty])));
         }
     }
     else {
         iString *key = collectNew_String(); /* TODO: add a helper for this */
         toString_Sym(SDLK_s, KMOD_PRIMARY, key);
-        appendCStr_String(out, "\nThis Gempub book can be viewed after it has been saved locally. ");
+        appendCStr_String(out, "\n${gempub.cover.viewlocal} ");
         appendFormat_String(out,
                             cstr_Lang("error.unsupported.suggestsave"),
                             cstr_String(key),
                             saveToDownloads_Label);
-        translate_Lang(out);
         appendCStr_String(out, "\n");
     }
-    appendCStr_String(out, "\n## About this book\n");
-    appendProperty_Gempub_(d, "Version:", version_GempubProperty, out);
-    appendProperty_Gempub_(d, "Revision date:", revisionDate_GempubProperty, out);
+    appendCStr_String(out, "\n## ${gempub.cover.aboutbook}\n");
+    appendProperty_Gempub_(d, "${gempub.meta.version}:", version_GempubProperty, out);
+    appendProperty_Gempub_(d, "${gempub.meta.revdate}:", revisionDate_GempubProperty, out);
     if (hasProperty_Gempub_(d, publishDate_GempubProperty)) {
-        appendProperty_Gempub_(d, "Publish date:", publishDate_GempubProperty, out);
+        appendProperty_Gempub_(d, "${gempub.meta.pubdate}:", publishDate_GempubProperty, out);
     }
     else {
-        appendProperty_Gempub_(d, "Published:", published_GempubProperty, out);
+        appendProperty_Gempub_(d, "${gempub.meta.pub}:", published_GempubProperty, out);
     }
-    appendProperty_Gempub_(d, "Language:", language_GempubProperty, out);
-    appendProperty_Gempub_(d, "License:", license_GempubProperty, out);
+    appendProperty_Gempub_(d, "${gempub.meta.lang}:", language_GempubProperty, out);
+    appendProperty_Gempub_(d, "${gempub.meta.license}:", license_GempubProperty, out);
     appendProperty_Gempub_(d, "\u00a9", copyright_GempubProperty, out);
+    translate_Lang(out);
     return out;
 }
 
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 290bf95e..4158b719 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1762,7 +1762,7 @@ static void saveToDownloads_(const iString *url, const iString *mime, const iBlo
             exportDownloadedFile_iOS(savePath);
 #else
             const iMenuItem items[2] = {
-                { "Open Downloaded File", 0, 0,
+                { "${dlg.save.opendownload}", 0, 0,
                     format_CStr("!open url:%s", cstrCollect_String(makeFileUrl_String(savePath))) },
                 { "${dlg.message.ok}", 0, 0, "message.ok" },
             };
diff --git a/src/ui/root.c b/src/ui/root.c
index d660c468..17682125 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -1252,16 +1252,16 @@ void createUserInterface_Root(iRoot *d) {
                                                 },
                                             4);
         iWidget *splitMenu = makeMenu_Widget(root, (iMenuItem[]){
-            { "Merge Tabs", '1', 0, "ui.split arg:0" },
-            { "Swap Sides", SDLK_x, 0, "ui.split swap:1" },
+            { "${menu.split.merge}", '1', 0, "ui.split arg:0" },
+            { "${menu.split.swap}", SDLK_x, 0, "ui.split swap:1" },
             { "---", 0, 0, NULL },
-            { "Horizontal", '2', 0, "ui.split arg:3 axis:0" },
-            { "Horizontal 1:2", SDLK_d, 0, "ui.split arg:1 axis:0" },
-            { "Horizontal 2:1", SDLK_e, 0, "ui.split arg:2 axis:0" },
+            { "${menu.split.horizontal}", '2', 0, "ui.split arg:3 axis:0" },
+            { "${menu.split.horizontal} 1:2", SDLK_d, 0, "ui.split arg:1 axis:0" },
+            { "${menu.split.horizontal} 2:1", SDLK_e, 0, "ui.split arg:2 axis:0" },
             { "---", 0, 0, NULL },
-            { "Vertical", '3', 0, "ui.split arg:3 axis:1" },
-            { "Vertical 1:2", SDLK_f, 0, "ui.split arg:1 axis:1" },
-            { "Vertical 2:1", SDLK_r, 0, "ui.split arg:2 axis:1" },
+            { "${menu.split.vertical}", '3', 0, "ui.split arg:3 axis:1" },
+            { "${menu.split.vertical} 1:2", SDLK_f, 0, "ui.split arg:1 axis:1" },
+            { "${menu.split.vertical} 2:1", SDLK_r, 0, "ui.split arg:2 axis:1" },
         }, 10);
         setFlags_Widget(splitMenu, disabledWhenHidden_WidgetFlag, iTrue); /* enabled when open */
         setId_Widget(tabsMenu, "doctabs.menu");