Translations for hardcoded English strings

IssueID #276

18 files changed, 69 insertions, 32 deletions

diff --git a/po/en.po b/po/en.po
index a3306f27..609a4bca 100644
--- a/po/en.po
+++ b/po/en.po
@@ -12,6 +12,12 @@ msgstr "%s is a compressed archive."
 msgid "doc.archive.view"
 msgstr "View archive contents"
 
+msgid "media.untitled.image"
+msgstr "Image"
+
+msgid "media.untitled.audio"
+msgstr "Audio"
+
 # Inline download status message.
 msgid "media.download.warnclose"
 msgstr "Download will be cancelled if this tab is closed."
@@ -468,6 +474,9 @@ msgstr "Mark All as Read"
 msgid "feeds.refresh"
 msgstr "Refresh Feeds"
 
+msgid "feeds.atom.translated"
+msgstr "This Atom XML document has been automatically translated to a Gemini feed to allow subscribing to it."
+
 msgid "menu.opentab"
 msgstr "Open in New Tab"
 
@@ -837,6 +846,41 @@ msgstr "View Image"
 msgid "bookmark.title.blank"
 msgstr "Blank Page"
 
+msgid "bookmark.export.title.folder"
+msgstr "Bookmarks"
+
+msgid "bookmark.export.title.tag"
+msgstr "Bookmark tags"
+
+msgid "bookmark.export.title.time"
+msgstr "Created bookmarks"
+
+msgid "bookmark.export.count"
+msgid_plural "bookmark.export.count.n"
+msgstr[0] "You have %d bookmark."
+msgstr[1] "You have %d bookmarks."
+
+msgid "bookmark.export.saving"
+msgstr "Save this page to export them, or you can copy them to the clipboard."
+
+msgid "bookmark.export.taginfo"
+msgstr "In this list each heading represents a bookmark tag. Only tagged bookmarks are listed. Bookmarks with multiple tags are repeated under each tag."
+
+msgid "bookmark.export.format.sub"
+msgstr "This page is formatted according to the \"Subscribing to Gemini pages\" companion specification."
+
+msgid "bookmark.export.format.linklines"
+msgstr "Each link represents a bookmark."
+
+msgid "bookmark.export.format.otherlines"
+msgstr "Bullet lines and quotes are reserved for additional information about the preceding bookmark. Text lines and preformatted text are considered comments and should be ignored."
+
+msgid "bookmark.export.format.folders"
+msgstr "Folder structure is defined by level 2/3 headings."
+
+msgid "bookmark.export.format.tags"
+msgstr "Tags are defined by level 2 headings."
+
 # Interpret as "Results from bookmarks..."
 msgid "heading.lookup.bookmarks"
 msgstr "BOOKMARKS"
diff --git a/res/lang/de.bin b/res/lang/de.bin
index ab7b90e2..bac3d41b 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index ae50e06a..d2f19cef 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index e0a17671..8462461d 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index 9ca9838a..7b7b6c28 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index b27c62fb..9c3024f8 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index fe067931..4b82125e 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index 39ee9776..97c02a90 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index a1fe6e16..f905414b 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index 0425df1e..176fa4fe 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index 32dce6c8..4a299323 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index 22a2418e..4cd4212d 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index 279a5503..49decd2d 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index 82cdb583..10a8e86c 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/bookmarks.c b/src/bookmarks.c
index 65cc7982..c27efbfe 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -325,22 +325,18 @@ const iString *bookmarkListPage_Bookmarks(const iBookmarks *d, enum iBookmarkLis
     iString *str = collectNew_String();
     lock_Mutex(d->mtx);
     format_String(str,
-                  "# %s\n\n",
-                  listType == listByFolder_BookmarkListType ? "Bookmarks"
-                  : listType == listByTag_BookmarkListType  ? "Bookmark tags"
-                                                            : "Created bookmarks");
+                  "# ${bookmark.export.title.%s}\n\n",
+                  listType == listByFolder_BookmarkListType ? "folder"
+                  : listType == listByTag_BookmarkListType  ? "tag"
+                                                            : "time");
     if (listType == listByFolder_BookmarkListType) {
         appendFormat_String(str,
-                            "You have %d bookmark%s.\n\n"
-                            "Save this page to export them, or you can copy them to "
-                            "the clipboard.\n\n",
-                            size_Hash(&d->bookmarks),
-                            size_Hash(&d->bookmarks) != 1 ? "s" : "");
+                            "%s\n\n"
+                            "${bookmark.export.saving}\n\n",
+                            formatCStrs_Lang("bookmark.export.count.n", size_Hash(&d->bookmarks)));
     }
     else if (listType == listByTag_BookmarkListType) {
-        appendFormat_String(str, "In this list each heading represents a bookmark tag. "
-                                 "Only tagged bookmarks are listed. "
-                                 "Bookmarks with multiple tags are repeated under each tag.\n\n");
+        appendFormat_String(str, "${bookmark.export.taginfo}\n\n");
     }
     iStringSet *tags = new_StringSet();
     const iPtrArray *bmList = list_Bookmarks(d,
@@ -393,22 +389,20 @@ const iString *bookmarkListPage_Bookmarks(const iBookmarks *d, enum iBookmarkLis
     iRelease(tags);
     unlock_Mutex(d->mtx);
     if (listType == listByCreationTime_BookmarkListType) {
-        appendCStr_String(str, "\nThis page is formatted according to the "
-                               "\"Subscribing to Gemini pages\" companion specification.\n");
+        appendCStr_String(str, "\n${bookmark.export.format.sub}\n");
     }
     else {
         appendFormat_String(str,
-                            "\nEach link represents a bookmark. "
+                            "\n${bookmark.export.format.linklines} "
                             "%s"
-                            "Bullet lines and quotes are reserved for additional information about "
-                            "the preceding bookmark. Text lines and preformatted text are considered "
-                            "comments and should be ignored.\n",
+                            "${bookmark.export.format.otherlines}\n",
                             listType == listByFolder_BookmarkListType
-                                ? "Folder structure is defined by level 2/3 headings. "
+                                ? "${bookmark.export.format.folders} "
                             : listType == listByTag_BookmarkListType
-                                ? "Tags are defined by level 2 headings. "
+                                ? "${bookmark.export.format.tags} "
                                 : "");
     }
+    translate_Lang(str);
     return str;
 }
 
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 1d2790cc..00a02983 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -985,9 +985,12 @@ iBool isFinished_GmRequest(const iGmRequest *d) {
 }
 
 enum iGmStatusCode status_GmRequest(const iGmRequest *d) {
-    enum iGmStatusCode code;
-    iGuardMutex(d->mtx, code = d->resp->statusCode);
-    return code;
+    if (d) {
+        enum iGmStatusCode code;
+        iGuardMutex(d->mtx, code = d->resp->statusCode);
+        return code;
+    }
+    return none_GmStatusCode;
 }
 
 const iString *meta_GmRequest(const iGmRequest *d) {
diff --git a/src/mimehooks.c b/src/mimehooks.c
index 4788d534..ce712c2d 100644
--- a/src/mimehooks.c
+++ b/src/mimehooks.c
@@ -139,9 +139,8 @@ static iBlock *translateAtomXmlToGeminiFeed_(const iString *mime, const iBlock *
     if (!isEmpty_String(subtitle)) {
         appendFormat_String(&out, "## %s\n\n", cstr_String(subtitle));
     }
-    appendCStr_String(&out,
-                      "This Atom XML document has been automatically translated to a Gemini feed "
-                      "to allow subscribing to it.\n\n");
+    appendCStr_String(&out, cstr_Lang("feeds.atom.translated"));
+    appendCStr_String(&out, "\n\n");
     iRegExp *datePattern =
         iClob(new_RegExp("^([0-9][0-9][0-9][0-9]-[0-1][0-9]-[0-3][0-9])T.*", caseSensitive_RegExpOption));
     iBeginCollect();
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 2d4b6b1c..9c8be416 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1174,10 +1174,6 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
                     1);
                 break;
             }
-            case slowDown_GmStatusCode:
-                appendFormat_String(src, "\n\nWait %s seconds before your next request.",
-                                    cstr_String(meta));
-                break;
             default:
                 if (!isEmpty_String(meta)) {
                     appendFormat_String(src, "\n\n${error.server.msg}\n> %s", cstr_String(meta));
@@ -1482,8 +1478,9 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
                     const iGmLinkId imgLinkId = 1; /* there's only the one link */
                     /* TODO: Do the image loading in `postProcessRequestContent_DocumentWidget_()` */
                     if ((isAudio && isInitialUpdate) || (!isAudio && isRequestFinished)) {
-                        const char *linkTitle =
-                            startsWith_String(mimeStr, "image/") ? "Image" : "Audio";
+                        const char *linkTitle = cstr_Lang(
+                            startsWith_String(mimeStr, "image/") ? "media.untitled.image"
+                                                                 : "media.untitled.audio");
                         iUrl parts;
                         init_Url(&parts, d->mod.url);
                         if (!isEmpty_Range(&parts.path)) {