Merge pull request #21186 from zeertzjq/vim-8.2.4155

vim-patch:8.2.{4155,4412}

src/nvim/os/time.c

@@ -188,6 +188,7 @@ char *os_ctime_r(const time_t *restrict clock, char *restrict result, size_t res
   if (clock_local_ptr == NULL) {
     xstrlcpy(result, _("(Invalid)"), result_len);
   } else {
+    // xgettext:no-c-format
     strftime(result, result_len, _("%a %b %d %H:%M:%S %Y"), clock_local_ptr);
   }
   xstrlcat(result, "\n", result_len);

src/nvim/po/cleanup.vim

@@ -22,7 +22,9 @@ silent g/^msgstr"/s//msgstr "/
 silent g/^msgid"/s//msgid "/
 silent g/^msgstr ""\(\n"\)\@!/?^msgid?,.s/^/#\~ /
 
+" clean up empty lines
 silent g/^\n\n\n/.d
+silent! %s/\n\+\%$//
 
 if s:was_diff
   setl diff