2 files changed, 17 insertions, 20 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 3d8d4f12..88016b1c 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2081,20 +2081,17 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         }
         if (!isEmpty_PtrArray(links)) {
             if (argLabel_Command(cmd, "confirm")) {
-                //const char *plural = size_PtrArray(links) != 1 ? "s" : "";
-                const iBool isPlural = size_PtrArray(links) != 1;
+                const size_t count = size_PtrArray(links);
                 makeQuestion_Widget(
                     uiHeading_ColorEscape "${heading.import.bookmarks}",
-                    format_CStr(cstr_Lang(isPlural ? "dlg.import.found.many" : "dlg.import.found"),
-                                size_PtrArray(links)),
-                    (iMenuItem[]){
-                        { "${cancel}", 0, 0, NULL },
-                        { format_CStr(cstr_Lang(isPlural ? "dlg.import.add.many" : "dlg.import.add"),
-                                      uiTextAction_ColorEscape,
-                                      size_PtrArray(links)),
-                          0,
-                          0,
-                          "bookmark.links" } },
+                    formatCStrs_Lang("dlg.import.found.n", count),
+                    (iMenuItem[]){ { "${cancel}", 0, 0, NULL },
+                                   { format_CStr(cstrCount_Lang("dlg.import.add.n", count),
+                                                 uiTextAction_ColorEscape,
+                                                 count),
+                                     0,
+                                     0,
+                                     "bookmark.links" } },
                     2);
             }
             else {
@@ -2846,10 +2843,10 @@ static void drawBannerRun_DrawContext_(iDrawContext *d, const iGmRun *run, iInt2
             const int days = secondsSince_Time(&oldUntil, &now) / 3600 / 24;
             appendCStr_String(&str, "\n");
             if (days <= 30) {
-                appendFormat_String(&str,
-                                    cstr_Lang("dlg.certwarn.mayberenewed"),
-                                    cstrCollect_String(format_Date(&exp, "%Y-%m-%d")),
-                                    days);
+                appendCStr_String(&str,
+                                  format_CStr(cstrCount_Lang("dlg.certwarn.mayberenewed.n", days),
+                                              cstrCollect_String(format_Date(&exp, "%Y-%m-%d")),
+                                              days));
             }
             else {
                 appendCStr_String(&str, cstr_Lang("dlg.certwarn.different"));
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 5ff585a5..29b3646a 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -352,7 +352,7 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                               "%s",
                               isActive ? cstr_Lang("ident.using")
                               : isUsed_GmIdentity(ident)
-                                  ? format_CStr(cstr_Lang("ident.usedonurls"), size_StringSet(ident->useUrls))
+                                  ? formatCStrs_Lang("ident.usedonurls.n", size_StringSet(ident->useUrls))
                                   : cstr_Lang("ident.notused"));
                 const char *expiry =
                     ident->flags & temporary_GmIdentityFlag
@@ -705,12 +705,12 @@ static void checkModeButtonLayout_SidebarWidget_(iSidebarWidget *d) {
         if (i == feeds_SidebarMode && d->numUnreadEntries) {
             updateText_LabelWidget(
                 button,
-                collectNewFormat_String("%s " uiTextAction_ColorEscape "%zu%s",
+                collectNewFormat_String("%s " uiTextAction_ColorEscape "%zu%s%s",
                                         tightModeLabels_[i],
                                         d->numUnreadEntries,
+                                        !isTight ? " " : "",
                                         !isTight
-                                            ? (d->numUnreadEntries == 1 ? " ${sidebar.unread}"
-                                                                        : " ${sidebar.unread.many}")
+                                            ? formatCStrs_Lang("sidebar.unread.n", d->numUnreadEntries)
                                             : ""));
         }
         else {