Re-generate .pot with custom rules (#7467)

* fix double-translated merge() call

* Fix untranslated strings

* Second pass at generating .pot

Author: MichaelChirico

R/data.table.R

@@ -561,7 +561,7 @@ replace_dot_alias = function(e) {
             }
             irows = vecseq(f__, len__, limit)
           }
-          if (verbose) {cat(timetaken(last.started.at),"\n"); flush.console()}
+          if (verbose) {cat(timetaken(last.started.at),"\n"); flush.console()} # notranslate
           # Fix for #1092 and #1074
           # TODO: implement better version of "any"/"all"/"which" to avoid
           # unnecessary construction of logical vectors

R/frollapply.R

@@ -259,7 +259,7 @@ frollapply = function(X, N, FUN, ..., by.column=TRUE, fill=NA, align=c("right","
   } else leftadaptive = FALSE
   if (leftadaptive) {
     if (verbose)
-      cat("frollapply: adaptive=TRUE && align='left' pre-processing for align='right'\n")
+      catf("frollapply: adaptive=TRUE && align='left' pre-processing for align='right'\n")
     if (by.column) {
       X = lapply(X, rev)
     } else {
@@ -329,7 +329,7 @@ frollapply = function(X, N, FUN, ..., by.column=TRUE, fill=NA, align=c("right","
   DTths0 = getDTthreads(FALSE)
   use.fork0 = .Platform$OS.type!="windows" && DTths0 > 1L
   if (verbose && !use.fork0)
-    cat("frollapply running on single CPU thread\n")
+    catf("frollapply running on single CPU thread\n")
   ans = vector("list", nx*nn)
   ## vectorized x
 

R/merge.R

@@ -130,13 +130,15 @@ merge.data.table = function(x, y, by = NULL, by.x = NULL, by.y = NULL, all = FAL
   if (is.null(nm)) {
     warningf(ngettext(n_dots, "merge.data.table() received %d unnamed argument in '...' which will be ignored.",
                               "merge.data.table() received %d unnamed arguments in '...' which will be ignored."),
-              n_dots)
+              n_dots,
+              domain=NA)
   } else {
     named_idx = nzchar(nm)
     if (all(named_idx)) {
       warningf(ngettext(n_dots, "merge.data.table() received %d unknown keyword argument which will be ignored: %s",
                                 "merge.data.table() received %d unknown keyword arguments which will be ignored: %s"),
-                n_dots, brackify(nm))
+                n_dots, brackify(nm),
+               domain=NA)
     } else {
       n_named <- sum(named_idx)
       unnamed_clause <- sprintf(ngettext(n_dots - n_named, "%d unnamed argument in '...'", "%d unnamed arguments in '...'"), n_dots - n_named)