diff --git a/build/Makefile.am b/build/Makefile.am
index cb7f1380fa..9f3ea1ee4a 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -14,7 +14,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/misc
 usrlibdir = $(libdir)
 usrlib_LTLIBRARIES = librpmbuild.la
 librpmbuild_la_SOURCES = \
-	build.c expression.c files.c misc.c pack.c \
+	build.c files.c misc.c pack.c \
 	parseSimpleScript.c parseChangelog.c parseDescription.c \
 	parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \
 	parseSpec.c parseList.c reqprov.c rpmfc.c spec.c \
diff --git a/build/build.c b/build/build.c
index dec7d9608b..08c2df1e4e 100644
--- a/build/build.c
+++ b/build/build.c
@@ -60,7 +60,6 @@ rpmRC doScript(rpmSpec spec, rpmBuildFlags what, const char *name,
     int argc = 0;
     const char **argv = NULL;
     FILE * fp = NULL;
-    FILE * cmdOut = rpmIsVerbose() ? stdout : NULL;
 
     FD_t fd = NULL;
     rpmRC rc = RPMRC_FAIL; /* assume failure */
@@ -156,7 +155,7 @@ rpmRC doScript(rpmSpec spec, rpmBuildFlags what, const char *name,
 
     rpmlog(RPMLOG_NOTICE, _("Executing(%s): %s\n"), name, buildCmd);
     if (rpmfcExec((ARGV_const_t)argv, NULL, sb_stdoutp, 1,
-		  spec->buildSubdir, cmdOut)) {
+		  spec->buildSubdir)) {
 	rpmlog(RPMLOG_ERR, _("Bad exit status from %s (%s)\n"),
 		scriptName, name);
 	goto exit;
@@ -200,10 +199,6 @@ static int doBuildRequires(rpmSpec spec, int test)
     argvSplit(&output, getStringBuf(sb_stdout), "\n\r");
     outc = argvCount(output);
 
-    if (!outc) {
-	goto exit;
-    }
-
     for (int i = 0; i < outc; i++) {
 	parseRCPOT(spec, spec->sourcePackage, output[i], RPMTAG_REQUIRENAME,
 		   0, 0, addReqProvPkg, NULL);
@@ -246,6 +241,9 @@ static rpmRC buildSpec(rpmts ts, BTA_t buildArgs, rpmSpec spec, int what)
     int missing_buildreqs = 0;
     int test = (what & RPMBUILD_NOBUILD);
     char *cookie = buildArgs->cookie ? xstrdup(buildArgs->cookie) : NULL;
+    /* handle quiet mode by capturing the output into a sink buffer */
+    StringBuf sink = NULL;
+    StringBuf *sbp = rpmIsVerbose() ? NULL : &sink;
 
     if (rpmExpandNumeric("%{?source_date_epoch_from_changelog}") &&
 	getenv("SOURCE_DATE_EPOCH") == NULL) {
@@ -296,7 +294,7 @@ static rpmRC buildSpec(rpmts ts, BTA_t buildArgs, rpmSpec spec, int what)
 
 	if ((what & RPMBUILD_PREP) &&
 	    (rc = doScript(spec, RPMBUILD_PREP, "%prep",
-			   getStringBuf(spec->prep), test, NULL)))
+			   getStringBuf(spec->prep), test, sbp)))
 		goto exit;
 
 	if (what & RPMBUILD_BUILDREQUIRES)
@@ -305,7 +303,8 @@ static rpmRC buildSpec(rpmts ts, BTA_t buildArgs, rpmSpec spec, int what)
 	        (rc == RPMRC_MISSINGBUILDREQUIRES))
 	    rc = doCheckBuildRequires(ts, spec, test);
 	if (rc == RPMRC_MISSINGBUILDREQUIRES) {
-	    if (what & RPMBUILD_DUMPBUILDREQUIRES) {
+	    if ((what & RPMBUILD_DUMPBUILDREQUIRES) &&
+		!(spec->flags & RPMSPEC_FORCE)) {
 		/* Create buildreqs package */
 		char *nvr = headerGetAsString(spec->packages->header, RPMTAG_NVR);
 		rasprintf(&spec->sourceRpmName, "%s.buildreqs.nosrc.rpm", nvr);
@@ -324,17 +323,17 @@ static rpmRC buildSpec(rpmts ts, BTA_t buildArgs, rpmSpec spec, int what)
 
 	if ((what & RPMBUILD_BUILD) &&
 	    (rc = doScript(spec, RPMBUILD_BUILD, "%build",
-			   getStringBuf(spec->build), test, NULL)))
+			   getStringBuf(spec->build), test, sbp)))
 		goto exit;
 
 	if ((what & RPMBUILD_INSTALL) &&
 	    (rc = doScript(spec, RPMBUILD_INSTALL, "%install",
-			   getStringBuf(spec->install), test, NULL)))
+			   getStringBuf(spec->install), test, sbp)))
 		goto exit;
 
 	if ((what & RPMBUILD_CHECK) &&
 	    (rc = doScript(spec, RPMBUILD_CHECK, "%check",
-			   getStringBuf(spec->check), test, NULL)))
+			   getStringBuf(spec->check), test, sbp)))
 		goto exit;
 
 	if ((what & RPMBUILD_PACKAGESOURCE) &&
@@ -361,11 +360,11 @@ static rpmRC buildSpec(rpmts ts, BTA_t buildArgs, rpmSpec spec, int what)
 	
 	if ((what & RPMBUILD_CLEAN) &&
 	    (rc = doScript(spec, RPMBUILD_CLEAN, "%clean",
-			   getStringBuf(spec->clean), test, NULL)))
+			   getStringBuf(spec->clean), test, sbp)))
 		goto exit;
 
 	if ((what & RPMBUILD_RMBUILD) &&
-	    (rc = doScript(spec, RPMBUILD_RMBUILD, "--clean", NULL, test, NULL)))
+	    (rc = doScript(spec, RPMBUILD_RMBUILD, "--clean", NULL, test, sbp)))
 		goto exit;
     }
 
@@ -376,6 +375,7 @@ static rpmRC buildSpec(rpmts ts, BTA_t buildArgs, rpmSpec spec, int what)
 	(void) unlink(spec->specFile);
 
 exit:
+    freeStringBuf(sink);
     free(cookie);
     spec->rootDir = NULL;
     if (rc != RPMRC_OK && rc != RPMRC_MISSINGBUILDREQUIRES &&
diff --git a/build/files.c b/build/files.c
index b95af1c573..ad4f462f1b 100644
--- a/build/files.c
+++ b/build/files.c
@@ -1575,6 +1575,8 @@ static rpmRC recurseDir(FileList fl, const char * diskPath)
 	case FTS_INIT:		/* initialized only */
 	case FTS_W:		/* whiteout object */
 	default:
+	    rpmlog(RPMLOG_ERR, _("Can't read content of file: %s\n"),
+		fts->fts_path);
 	    rc = RPMRC_FAIL;
 	    break;
 	}
@@ -2779,7 +2781,7 @@ static int checkFiles(const char *buildRoot, StringBuf fileList)
 
     rpmlog(RPMLOG_NOTICE, _("Checking for unpackaged file(s): %s\n"), s);
 
-    rc = rpmfcExec(av_ckfile, fileList, &sb_stdout, 0, buildRoot, NULL);
+    rc = rpmfcExec(av_ckfile, fileList, &sb_stdout, 0, buildRoot);
     if (rc < 0)
 	goto exit;
     
diff --git a/build/parseDescription.c b/build/parseDescription.c
index 2b255b5145..c0737c09cf 100644
--- a/build/parseDescription.c
+++ b/build/parseDescription.c
@@ -21,6 +21,7 @@ int parseDescription(rpmSpec spec)
     const char **argv = NULL;
     const char *name = NULL;
     const char *lang = RPMBUILD_DEFAULT_LANG;
+    const char *descr = "";
     poptContext optCon = NULL;
     struct poptOption optionsTable[] = {
 	{ NULL, 'n', POPT_ARG_STRING, &name, 'n', NULL, NULL},
@@ -68,9 +69,13 @@ int parseDescription(rpmSpec spec)
 	goto exit;
     }
 
-    stripTrailingBlanksStringBuf(sb);
+    if (sb) {
+	stripTrailingBlanksStringBuf(sb);
+	descr = getStringBuf(sb);
+    }
+
     if (addLangTag(spec, pkg->header,
-		   RPMTAG_DESCRIPTION, getStringBuf(sb), lang)) {
+		   RPMTAG_DESCRIPTION, descr, lang)) {
 	nextPart = PART_ERROR;
     }
      
diff --git a/build/parsePrep.c b/build/parsePrep.c
index ba88ae55b4..e2ba98ea1e 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -45,12 +45,13 @@ static rpmRC checkOwners(const char * urlfn)
  * @param fuzz		fuzz factor, fuzz<0 means no fuzz set
  * @param dir		dir to change to (i.e. patch -d argument)
  * @param outfile	send output to this file (i.e. patch -o argument)
+ * @param setUtc	include -Z?
  * @return		expanded %patch macro (NULL on error)
  */
 
 static char *doPatch(rpmSpec spec, uint32_t c, int strip, const char *db,
 		     int reverse, int removeEmpties, int fuzz, const char *dir,
-		     const char *outfile)
+		     const char *outfile, int setUtc)
 {
     char *buf = NULL;
     char *arg_backup = NULL;
@@ -88,9 +89,10 @@ static char *doPatch(rpmSpec spec, uint32_t c, int strip, const char *db,
 	rasprintf(&arg_fuzz, " --fuzz=%d", fuzz);
     } else arg_fuzz = xstrdup("");
 
-    rasprintf(&args, "%s -p%d %s%s%s%s%s%s", arg_patch_flags, strip, arg_backup, arg_fuzz, arg_dir, arg_outfile,
+    rasprintf(&args, "%s -p%d %s%s%s%s%s%s%s", arg_patch_flags, strip, arg_backup, arg_fuzz, arg_dir, arg_outfile,
 		reverse ? " -R" : "", 
-		removeEmpties ? " -E" : "");
+		removeEmpties ? " -E" : "",
+		setUtc ? " -Z" : "");
 
     /* Avoid the extra cost of fork and pipe for uncompressed patches */
     if (compressed != COMPRESSED_NOT) {
@@ -394,7 +396,7 @@ static rpmRC doPatchMacro(rpmSpec spec, const char *line)
 {
     char *opt_b, *opt_P, *opt_d, *opt_o;
     char *buf = NULL;
-    int opt_p, opt_R, opt_E, opt_F;
+    int opt_p, opt_R, opt_E, opt_F, opt_Z;
     int argc, c;
     const char **argv = NULL;
     ARGV_t patch, patchnums = NULL;
@@ -410,11 +412,12 @@ static rpmRC doPatchMacro(rpmSpec spec, const char *line)
 	{ NULL, 'F', POPT_ARG_INT, &opt_F, 'F', NULL, NULL },
 	{ NULL, 'd', POPT_ARG_STRING, &opt_d, 'd', NULL, NULL },
 	{ NULL, 'o', POPT_ARG_STRING, &opt_o, 'o', NULL, NULL },
+	{ NULL, 'Z', POPT_ARG_NONE, &opt_Z, 'Z', NULL, NULL},
 	{ NULL, 0, 0, NULL, 0, NULL, NULL }
     };
     poptContext optCon = NULL;
 
-    opt_p = opt_R = opt_E = 0;
+    opt_p = opt_R = opt_E = opt_Z = 0;
     opt_F = rpmExpandNumeric("%{_default_patch_fuzz}");		/* get default fuzz factor for %patch */
     opt_b = opt_d = opt_o = NULL;
 
@@ -469,7 +472,7 @@ static rpmRC doPatchMacro(rpmSpec spec, const char *line)
 		     *patch, line);
 	    goto exit;
 	}
-	s = doPatch(spec, pnum, opt_p, opt_b, opt_R, opt_E, opt_F, opt_d, opt_o);
+	s = doPatch(spec, pnum, opt_p, opt_b, opt_R, opt_E, opt_F, opt_d, opt_o, opt_Z);
 	if (s == NULL) {
 	    goto exit;
 	}
diff --git a/build/parseScript.c b/build/parseScript.c
index b3128ee512..bdf6ab3fbd 100644
--- a/build/parseScript.c
+++ b/build/parseScript.c
@@ -79,7 +79,7 @@ int parseScript(rpmSpec spec, int parsePart)
     /*  -p "<sh> <args>..."                */
     /*  -f <file>                          */
 
-    const char *p;
+    const char *p = "";
     const char **progArgv = NULL;
     int progArgc;
     const char *partname = NULL;
@@ -354,8 +354,11 @@ int parseScript(rpmSpec spec, int parsePart)
 
     if ((res = parseLines(spec, STRIP_NOTHING, NULL, &sb)) == PART_ERROR)
 	goto exit;
-    stripTrailingBlanksStringBuf(sb);
-    p = getStringBuf(sb);
+
+    if (sb) {
+	stripTrailingBlanksStringBuf(sb);
+	p = getStringBuf(sb);
+    }
 
 #ifdef WITH_LUA
     if (rstreq(progArgv[0], "<lua>")) {
diff --git a/build/parseSpec.c b/build/parseSpec.c
index 4e2bb2792f..ed5c3ef63b 100644
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -332,15 +332,29 @@ static int copyNextLineFromOFI(rpmSpec spec, OFI_t *ofi, int strip)
     return 0;
 }
 
-static void copyNextLineFinish(rpmSpec spec, int strip)
+static parsedSpecLine copyNextLineFinish(rpmSpec spec, int strip)
 {
     char *last;
     char ch;
+    char *s;
+    parsedSpecLine lineType;
 
     /* Find next line in expanded line buffer */
-    spec->line = last = spec->nextline;
+    s = spec->line = last = spec->nextline;
     ch = ' ';
+
+    /* skip space until '\n' or non space is reached */
+    while (*(s) && (*s != '\n') && risspace(*(s)))
+	(s)++;
+    lineType = parseLineType(s);
+
     while (*spec->nextline && ch != '\n') {
+	/* for conditionals and %include trim trailing '\' */
+	if (lineType && (*spec->nextline == '\\') &&
+	    (*spec->nextline+1) && (*(spec->nextline+1) == '\n')) {
+	    *spec->nextline = ' ';
+	    *(spec->nextline+1) = ' ';
+	}
 	ch = *spec->nextline++;
 	if (!risspace(ch))
 	    last = spec->nextline;
@@ -357,6 +371,8 @@ static void copyNextLineFinish(rpmSpec spec, int strip)
     
     if (strip & STRIP_TRAILINGSPACE)
 	*last = '\0';
+
+    return lineType;
 }
 
 static int readLineFromOFI(rpmSpec spec, OFI_t *ofi)
@@ -449,12 +465,9 @@ int readLine(rpmSpec spec, int strip)
 	}
     }
 
-    copyNextLineFinish(spec, strip);
-
+    lineType = copyNextLineFinish(spec, strip);
     s = spec->line;
     SKIPSPACE(s);
-
-    lineType = parseLineType(s);
     if (!lineType)
 	goto after_classification;
 
@@ -488,7 +501,7 @@ int readLine(rpmSpec spec, int strip)
 	else
 	    checkCondition = spec->readStack->readable;
 	if (checkCondition) {
-	    match = parseExpressionBoolean(s);
+	    match = rpmExprBool(s);
 	    if (match < 0) {
 		rpmlog(RPMLOG_ERR,
 			    _("%s:%d: bad %s condition: %s\n"),
@@ -1022,10 +1035,23 @@ static rpmSpec parseSpec(const char *specFile, rpmSpecFlags flags,
 
 #ifdef ENABLE_OPENMP
     /* Set number of OMP threads centrally */
-    int ncpus = rpmExpandNumeric("%{?_smp_build_ncpus}");
-    if (ncpus <= 0)
-	ncpus = 1;
-    omp_set_num_threads(ncpus);
+    int nthreads = rpmExpandNumeric("%{?_smp_build_nthreads}");
+    int nthreads_max = rpmExpandNumeric("%{?_smp_nthreads_max}");
+    if (nthreads <= 0)
+        nthreads = omp_get_max_threads();
+    if (nthreads_max > 0 && nthreads > nthreads_max)
+	nthreads = nthreads_max;
+#if __WORDSIZE == 32
+    /* On 32bit platforms, address space shortage is an issue. Play safe. */
+    int platlimit = 4;
+    if (nthreads > platlimit) {
+	nthreads = platlimit;
+	rpmlog(RPMLOG_DEBUG,
+	    "limiting number of threads to %d due to platform\n", platlimit);
+    }
+#endif
+    if (nthreads > 0)
+	omp_set_num_threads(nthreads);
 #endif
 
     if (spec->clean == NULL) {
diff --git a/build/rpmbuild_internal.h b/build/rpmbuild_internal.h
index 16d72ec9f7..ddecb469fd 100644
--- a/build/rpmbuild_internal.h
+++ b/build/rpmbuild_internal.h
@@ -401,14 +401,6 @@ RPM_GNUC_INTERNAL
 rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char * field, rpmTagVal tagN,
 		int index, rpmsenseFlags tagflags, addReqProvFunction cb, void *cbdata);
 
-/** \ingroup rpmbuild
- * Evaluate boolean expression.
- * @param expr		expression to parse
- * @return
- */
-RPM_GNUC_INTERNAL
-int parseExpressionBoolean(const char * expr);
-
 /** \ingroup rpmbuild
  * Run a build script, assembled from spec file scriptlet section.
  *
@@ -490,11 +482,10 @@ rpmRC rpmfcGenerateDepends(const rpmSpec spec, Package pkg);
  * @retval *sb_stdoutp	helper output
  * @param failnonzero	IS non-zero helper exit status a failure?
  * @param buildRoot	buildRoot directory (or NULL)
- * @param dup		duplicate output (or NULL)
  */
 RPM_GNUC_INTERNAL
 int rpmfcExec(ARGV_const_t av, StringBuf sb_stdin, StringBuf * sb_stdoutp,
-		int failnonzero, const char *buildRoot, FILE *dup);
+		int failnonzero, const char *buildRoot);
 
 /** \ingroup rpmbuild
  * Post-build processing for policies in binary package(s).
diff --git a/build/rpmfc.c b/build/rpmfc.c
index 80da96f3a1..abfee83324 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -260,7 +260,7 @@ static rpmds rpmdsSingleNS(rpmstrPool pool,
 static int getOutputFrom(ARGV_t argv,
 			 const char * writePtr, size_t writeBytesLeft,
 			 StringBuf sb_stdout,
-			 int failNonZero, const char *buildRoot, FILE *dup)
+			 int failNonZero, const char *buildRoot)
 {
     pid_t child, reaped;
     int toProg[2] = { -1, -1 };
@@ -268,8 +268,9 @@ static int getOutputFrom(ARGV_t argv,
     int status;
     int myerrno = 0;
     int ret = 1; /* assume failure */
+    int doio = (writePtr || sb_stdout);
 
-    if (pipe(toProg) < 0 || pipe(fromProg) < 0) {
+    if (doio && (pipe(toProg) < 0 || pipe(fromProg) < 0)) {
 	rpmlog(RPMLOG_ERR, _("Couldn't create pipe for %s: %m\n"), argv[0]);
 	return -1;
     }
@@ -303,6 +304,9 @@ static int getOutputFrom(ARGV_t argv,
 	return -1;
     }
 
+    if (!doio)
+	goto reap;
+
     close(toProg[0]);
     close(fromProg[1]);
 
@@ -365,8 +369,6 @@ static int getOutputFrom(ARGV_t argv,
 	    buf[iorc] = '\0';
 	    if (sb_stdout)
 		appendStringBuf(sb_stdout, buf);
-	    if (dup)
-		fprintf(dup, "%s", buf);
 	}
     }
 
@@ -376,6 +378,7 @@ static int getOutputFrom(ARGV_t argv,
     if (fromProg[0] >= 0)
 	close(fromProg[0]);
 
+reap:
     /* Collect status from prog */
     reaped = waitpid(child, &status, 0);
     rpmlog(RPMLOG_DEBUG, "\twaitpid(%d) rc %d status %x\n",
@@ -397,7 +400,7 @@ static int getOutputFrom(ARGV_t argv,
 }
 
 int rpmfcExec(ARGV_const_t av, StringBuf sb_stdin, StringBuf * sb_stdoutp,
-		int failnonzero, const char *buildRoot, FILE *dup)
+		int failnonzero, const char *buildRoot)
 {
     char * s = NULL;
     ARGV_t xav = NULL;
@@ -443,7 +446,7 @@ int rpmfcExec(ARGV_const_t av, StringBuf sb_stdin, StringBuf * sb_stdoutp,
 	sb = newStringBuf();
     }
     ec = getOutputFrom(xav, buf_stdin, buf_stdin_len, sb,
-		       failnonzero, buildRoot, dup);
+		       failnonzero, buildRoot);
     if (ec) {
 	sb = freeStringBuf(sb);
 	goto exit;
@@ -493,7 +496,7 @@ static ARGV_t runCmd(const char *cmd,
     argvAdd(&av, cmd);
 
     appendLineStringBuf(sb_stdin, fn);
-    if (rpmfcExec(av, sb_stdin, &sb_stdout, 0, buildRoot, NULL) == 0) {
+    if (rpmfcExec(av, sb_stdin, &sb_stdout, 0, buildRoot) == 0) {
 	argvSplit(&output, getStringBuf(sb_stdout), "\n\r");
     }
 
@@ -1354,7 +1357,7 @@ static rpmRC rpmfcApplyExternal(rpmfc fc)
 	free(s);
 
 	if (rpmfcExec(dm->argv, sb_stdin, &sb_stdout,
-			failnonzero, fc->buildRoot, NULL) == -1)
+			failnonzero, fc->buildRoot) == -1)
 	    continue;
 
 	if (sb_stdout == NULL) {
diff --git a/build/spec.c b/build/spec.c
index f7de3d1d12..81506b4e91 100644
--- a/build/spec.c
+++ b/build/spec.c
@@ -207,7 +207,7 @@ static rpm_time_t getBuildTime(void)
     char *endptr;
 
     srcdate = getenv("SOURCE_DATE_EPOCH");
-    if (srcdate) {
+    if (srcdate && rpmExpandNumeric("%{?use_source_date_epoch_as_buildtime}")) {
         errno = 0;
         epoch = strtol(srcdate, &endptr, 10);
         if (srcdate == endptr || *endptr || errno != 0)
diff --git a/ci/Dockerfile b/ci/Dockerfile
index 511659106c..d1a45d4349 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -6,6 +6,8 @@ COPY . .
 
 RUN echo -e "deltarpm=0\ninstall_weak_deps=0\ntsflags=nodocs" >> /etc/dnf/dnf.conf
 RUN rm -f /etc/yum.repos.d/*modular.repo
+# dummy for controlling per-repo gpgcheck via Semaphore setup
+RUN sed -i -e "s:^gpgcheck=.$:gpgcheck=1:g" /etc/yum.repos.d/*.repo
 RUN dnf -y update
 RUN dnf -y install \
   autoconf \
diff --git a/configure.ac b/configure.ac
index da8e741d46..f05ac623a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.61)
-AC_INIT(rpm, 4.15.0-beta, rpm-maint@lists.rpm.org)
+AC_INIT(rpm, 4.15.0-rc1, rpm-maint@lists.rpm.org)
 
 AC_CONFIG_SRCDIR([rpm.c])
 AC_CONFIG_HEADERS([config.h])
diff --git a/doc/manual/macros b/doc/manual/macros
index 6bac8292f6..19c5d17e2c 100644
--- a/doc/manual/macros
+++ b/doc/manual/macros
@@ -93,6 +93,7 @@ to perform useful operations. The current list is
 	%{load:...}	load a macro file
 	%{lua:...}	expand using the embedded Lua interpreter
 	%{expand:...}	like eval, expand ... to <body> and (re-)expand <body>
+	%{expr:...}	evaluate an expression
 	%{shrink:...}	trim leading and trailing whitespace, reduce
 			intermediate whitespace to a single space
 	%{quote:...}	quote a parametric macro argument, needed to pass
@@ -108,6 +109,49 @@ In addition, rpm itself defines numerous macros. To display the current
 set, add "%dump" to the beginning of any spec file, process with rpm, and
 examine the output from stderr.
 
+\section conditionally_expanded_macros Conditionally Expanded Macros
+
+Sometimes it is useful to test whether a macro is defined or not. Syntax
+\verbatim
+%{?macro_name:value}
+%{?!macro_name:value}
+\endverbatim
+can be used for this purpose. %{?macro_name:value} is expanded to "value"
+if "macro_name" is defined, otherwise it is expanded to the empty string.
+%{?!macro_name:value} is the negative variant. It is expanded to "value" if
+"macro_name" not is defined. Otherwise it is expanded to the empty string.
+
+Frequently used conditionally expanded macros are e.g.
+Define a macro if it is not defined:
+\verbatim
+%{?!with_python3: %global with_python3 1}
+\endverbatim
+A macro that is expanded to 1 if "with_python3" is defined and 0 otherwise:
+\verbatim
+%{?with_python3:1}%{!?with_python3:0}
+\endverbatim
+or shortly
+\verbatim
+0%{!?with_python3:1}
+\endverbatim
+
+%"{?macro_name}" is a shortcut for "%{?macro_name:%macro_name}".
+
+For "macro_name" that is builtin macro conditionally expanded macros
+behave differently. In such a case both macro "%{?builtin_macro:value}" and
+its negative version "%{?!builtin_macro:value}" are expanded exactly like
+the macro without exclamation mark and question mark "%{builtin_macro:value}".
+There is a special case among builtin macros:
+/verbatim
+%{?load:file}
+/verbatim
+it works like "%{load:file}" with the difference that the expansion does not
+emit an error if the file fails to load.
+
+For more complex tests it is possible to use conditionals like %if, %ifarch or
+%ifos. But the conditionals are not macros thus they are not described here.
+For more information please refer to spec manual.
+
 \section macros_example Example of a Macro
 
 Here is an example %patch definition from /usr/lib/rpm/macros:
diff --git a/doc/rpmsign.8 b/doc/rpmsign.8
index 80ffb6a322..d895a3b8c7 100644
--- a/doc/rpmsign.8
+++ b/doc/rpmsign.8
@@ -21,6 +21,9 @@ options generate and insert new signatures for each package
 existing signatures. There are two options for historical reasons,
 there is no difference in behavior currently.
 
+To create a signature rpm needs to verify the package's checksum. As a result
+packages with a MD5/SHA1 checksums cannot be signed in FIPS mode.
+
 \fBrpm\fR \fB--delsign\fR \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
 
 .PP
diff --git a/lib/depends.c b/lib/depends.c
index f8a6084ab6..672a562c39 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -66,12 +66,6 @@ const int rpmFLAGS = RPMSENSE_EQUAL;
 #undef HASHTYPE
 #undef HTKEYTYPE
 
-enum addOp_e {
-    RPMTE_INSTALL	= 0,
-    RPMTE_UPGRADE	= 1,
-    RPMTE_REINSTALL	= 2,
-};
-
 /**
  * Check for supported payload format in header.
  * @param h		header to check
@@ -126,7 +120,7 @@ static int removePackage(rpmts ts, Header h, rpmte depends)
 	return 0;
     }
 
-    p = rpmteNew(ts, h, TR_REMOVED, NULL, NULL);
+    p = rpmteNew(ts, h, TR_REMOVED, NULL, NULL, 0);
     if (p == NULL)
 	return 1;
 
@@ -178,23 +172,22 @@ static int addSelfErasures(rpmts ts, rpm_color_t tscolor, int op,
     Header oh;
     rpmdbMatchIterator mi = rpmtsInitIterator(ts, RPMDBI_NAME, rpmteN(p), 0);
     int rc = 0;
-    int cmp;
 
     while ((oh = rpmdbNextIterator(mi)) != NULL) {
 	/* Ignore colored packages not in our rainbow. */
 	if (skipColor(tscolor, hcolor, headerGetNumber(oh, RPMTAG_HEADERCOLOR)))
 	    continue;
 
-	cmp = rpmVersionCompare(h, oh);
-
-	/* On upgrade, skip packages that contain identical NEVR. */
-	if ((op == RPMTE_UPGRADE) && (cmp == 0))
-	    continue;
+	/* On reinstall, skip packages with differing NEVRA. */
+	if (op != RPMTE_UPGRADE) {
+	    char * ohNEVRA = headerGetAsString(oh, RPMTAG_NEVRA);
+	    if (!rstreq(rpmteNEVRA(p), ohNEVRA)) {
+		free(ohNEVRA);
+		continue;
+	    }
+	    free(ohNEVRA);
+	}
 
-	/* On reinstall, skip packages with differing NEVR. */
-	if ((op == RPMTE_REINSTALL) && (cmp != 0))
-	    continue;
-	
 	if (removePackage(ts, oh, p)) {
 	    rc = 1;
 	    break;
@@ -222,17 +215,8 @@ static int addObsoleteErasures(rpmts ts, rpm_color_t tscolor, rpmte p)
 	mi = rpmtsPrunedIterator(ts, RPMDBI_NAME, Name, 1);
 
 	while ((oh = rpmdbNextIterator(mi)) != NULL) {
-	    const char *oarch = headerGetString(oh, RPMTAG_ARCH);
 	    int match;
 
-	    /* avoid self-obsoleting packages */
-	    if (rstreq(rpmteN(p), Name) && rstreq(rpmteA(p), oarch)) {
-		char * ohNEVRA = headerGetAsString(oh, RPMTAG_NEVRA);
-		rpmlog(RPMLOG_DEBUG, "  Not obsoleting: %s\n", ohNEVRA);
-		free(ohNEVRA);
-		continue;
-	    }
-
 	    /*
 	     * Rpm prior to 3.0.3 does not have versioned obsoletes.
 	     * If no obsoletes version info is available, match all names.
@@ -438,7 +422,7 @@ static int addPackage(rpmts ts, Header h,
 	    goto exit;
     }
 
-    p = rpmteNew(ts, h, TR_ADDED, key, relocs);
+    p = rpmteNew(ts, h, TR_ADDED, key, relocs, op);
     if (p == NULL) {
 	ec = 1;
 	goto exit;
diff --git a/lib/header.c b/lib/header.c
index 33623884a4..9ec7ed0e44 100644
--- a/lib/header.c
+++ b/lib/header.c
@@ -2015,7 +2015,7 @@ rpmRC hdrblobGet(hdrblob blob, uint32_t tag, rpmtd td)
     memset(&einfo, 0, sizeof(einfo));
     rpmtdReset(td);
 
-    for (int i = 1; i < blob->il; i++, pe++) {
+    for (int i = 0; i < blob->il; i++, pe++) {
 	if (pe->tag != ntag)
 	    continue;
 	ei2h(pe, &einfo);
diff --git a/lib/rpmte.c b/lib/rpmte.c
index 542e8f5d97..0551a0fcc9 100644
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -70,6 +70,7 @@ struct rpmte_s {
     uint8_t *badrelocs;		/*!< (TR_ADDED) Bad relocations (or NULL) */
     FD_t fd;			/*!< (TR_ADDED) Payload file descriptor. */
     int verified;		/*!< (TR_ADDED) Verification status */
+    int addop;			/*!< (TR_ADDED) RPMTE_INSTALL/UPDATE/REINSTALL */
 
 #define RPMTE_HAVE_PRETRANS	(1 << 0)
 #define RPMTE_HAVE_POSTTRANS	(1 << 1)
@@ -246,11 +247,12 @@ rpmte rpmteFree(rpmte te)
 }
 
 rpmte rpmteNew(rpmts ts, Header h, rpmElementType type, fnpyKey key,
-	       rpmRelocation * relocs)
+	       rpmRelocation * relocs, int addop)
 {
     rpmte p = xcalloc(1, sizeof(*p));
     p->ts = ts;
     p->type = type;
+    p->addop = addop;
     p->verified = RPMSIG_UNVERIFIED_TYPE;
 
     if (addTE(p, h, key, relocs)) {
@@ -774,6 +776,11 @@ int rpmteVerified(rpmte te)
     return (te != NULL) ? te->verified : 0;
 }
 
+int rpmteAddOp(rpmte te)
+{
+    return te->addop;
+}
+
 int rpmteProcess(rpmte te, pkgGoal goal, int num)
 {
     /* Only install/erase resets pkg file info */
diff --git a/lib/rpmte_internal.h b/lib/rpmte_internal.h
index 8e9b0663fc..8a8b197f33 100644
--- a/lib/rpmte_internal.h
+++ b/lib/rpmte_internal.h
@@ -23,6 +23,12 @@ typedef enum pkgGoal_e {
  */
 typedef struct tsortInfo_s *		tsortInfo;
 
+enum addOp_e {
+  RPMTE_INSTALL       = 0,
+  RPMTE_UPGRADE       = 1,
+  RPMTE_REINSTALL     = 2,
+};
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -34,11 +40,12 @@ extern "C" {
  * @param type		TR_ADDED/TR_REMOVED/TR_RPMDB
  * @param key		(TR_ADDED) package retrieval key (e.g. file name)
  * @param relocs	(TR_ADDED) package file relocations
+ * @param addop         (TR_ADDED) RPMTE_INSTALL/UPGRADE/REINSTALL
  * @return		new transaction element
  */
 RPM_GNUC_INTERNAL
 rpmte rpmteNew(rpmts ts, Header h, rpmElementType type, fnpyKey key,
-	       rpmRelocation * relocs);
+	       rpmRelocation * relocs, int addop);
 
 /** \ingroup rpmte
  * Destroy a transaction element.
@@ -107,6 +114,9 @@ unsigned int rpmteHeaderSize(rpmte te);
 RPM_GNUC_INTERNAL
 rpmRC rpmpsmRun(rpmts ts, rpmte te, pkgGoal goal);
 
+RPM_GNUC_INTERNAL
+int rpmteAddOp(rpmte te);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/transaction.c b/lib/transaction.c
index 4f888d3258..e51cff25a3 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -1226,8 +1226,10 @@ static int vfyCb(struct rpmsinfo_s *sinfo, void *cbdata)
 	 */
 	if (!(vd->vfylevel & RPMSIG_SIGNATURE_TYPE))
 	    sinfo->rc = RPMRC_OK;
+	/* fallthrough */
     default:
-	vd->msg = rpmsinfoMsg(sinfo);
+	if (sinfo->rc)
+	    vd->msg = rpmsinfoMsg(sinfo);
 	break;
     }
     return (sinfo->rc == 0);
@@ -1328,10 +1330,10 @@ static rpmps checkProblems(rpmts ts)
 	    rpmdbFreeIterator(mi);
 	}
 
-	if (!(probFilter & RPMPROB_FILTER_REPLACEPKG)) {
+	if (!(probFilter & RPMPROB_FILTER_REPLACEPKG) && rpmteAddOp(p) != RPMTE_REINSTALL) {
 	    Header h;
 	    rpmdbMatchIterator mi;
-	    mi = rpmtsPrunedIterator(ts, RPMDBI_NAME, rpmteN(p), 1);
+	    mi = rpmtsInitIterator(ts, RPMDBI_NAME, rpmteN(p), 0);
 	    rpmdbSetIteratorRE(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP, rpmteE(p));
 	    rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_STRCMP, rpmteV(p));
 	    rpmdbSetIteratorRE(mi, RPMTAG_RELEASE, RPMMIRE_STRCMP, rpmteR(p));
@@ -1602,7 +1604,7 @@ rpmRC runScript(rpmts ts, rpmte te, Header h, ARGV_const_t prefixes,
 
     /* Create a temporary transaction element for triggers from rpmdb */
     if (te == NULL) {
-	te = rpmteNew(ts, h, TR_RPMDB, NULL, NULL);
+	te = rpmteNew(ts, h, TR_RPMDB, NULL, NULL, 0);
 	rpmteSetHeader(te, h);
     }
 
diff --git a/lib/verify.c b/lib/verify.c
index b135e85480..469328d9f7 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -246,7 +246,7 @@ static int rpmVerifyScript(rpmts ts, Header h)
 
     if (headerIsEntry(h, RPMTAG_VERIFYSCRIPT)) {
 	/* fake up a transaction element */
-	rpmte p = rpmteNew(ts, h, TR_RPMDB, NULL, NULL);
+	rpmte p = rpmteNew(ts, h, TR_RPMDB, NULL, NULL, 0);
 
 	if (p != NULL) {
 	    rpmteSetHeader(p, h);
diff --git a/macros.in b/macros.in
index 50fe044c19..fe9803aad3 100644
--- a/macros.in
+++ b/macros.in
@@ -238,6 +238,11 @@ package or when debugging this package.\
 #	to the timestamp of the topmost changelog entry
 %source_date_epoch_from_changelog 0
 
+#	If true, make sure that buildtime in built rpms
+#	is set to the value of SOURCE_DATE_EPOCH.
+#	Is ignored when SOURCE_DATE_EPOCH is not set.
+%use_source_date_epoch_as_buildtime 0
+
 #	If true, make sure that timestamps in built rpms
 #	are not later than the value of SOURCE_DATE_EPOCH.
 #	Is ignored when SOURCE_DATE_EPOCH is not set.
@@ -379,6 +384,7 @@ package or when debugging this package.\
 #		"w6.xzdio"	xz level 6, xz's default.
 #		"w7T16.xzdio"	xz level 7 using 16 thread (xz only)
 #		"w6.lzdio"	lzma-alone level 6, lzma's default
+#		"w3.zstdio"	zstd level 3, zstd's default
 #		"w.ufdio"	uncompressed
 #
 #%_source_payload	w9.gzdio
@@ -1020,17 +1026,17 @@ package or when debugging this package.\
 %build_fflags %{optflags} %{?_fmoddir:-I%{_fmoddir}}
 
 # Link editor flags.  This is usually called LDFLAGS in makefiles.
-#%build_ldflags -Wl,-z,relro %{?_lto_cflags}
+#%build_ldflags -Wl,-z,relro
 
 # Expands to shell code to seot the compiler/linker environment
 # variables CFLAGS, CXXFLAGS, FFLAGS, FCFLAGS, LDFLAGS if they have
 # not been set already.
 %set_build_flags \
-  CFLAGS="${CFLAGS:-%{build_cflags}}" ; export CFLAGS ; \
-  CXXFLAGS="${CXXFLAGS:-%{build_cxxflags}}" ; export CXXFLAGS ; \
-  FFLAGS="${FFLAGS:-%{build_fflags}}" ; export FFLAGS ; \
-  FCFLAGS="${FCFLAGS:-%{build_fflags}}" ; export FCFLAGS ; \
-  LDFLAGS="${LDFLAGS:-%{build_ldflags}}" ; export LDFLAGS
+  CFLAGS="${CFLAGS:-%{?build_cflags}}" ; export CFLAGS ; \
+  CXXFLAGS="${CXXFLAGS:-%{?build_cxxflags}}" ; export CXXFLAGS ; \
+  FFLAGS="${FFLAGS:-%{?build_fflags}}" ; export FFLAGS ; \
+  FCFLAGS="${FCFLAGS:-%{?build_fflags}}" ; export FCFLAGS ; \
+  LDFLAGS="${LDFLAGS:-%{?build_ldflags}}" ; export LDFLAGS
 
 #==============================================================================
 # ---- specfile macros.
@@ -1066,9 +1072,13 @@ package or when debugging this package.\
 # Output synchronization for parallel make:
 %_make_output_sync %(! %{__make} --version -O >/dev/null 2>&1 || echo -O)
 
+#------------------------------------------------------------------------------
+# Verbosity options passed to make
+%_make_verbose V=1 VERBOSE=1
+
 #------------------------------------------------------------------------------
 # The "make" analogue, hiding the _smp_mflags magic from specs
-%make_build %{__make} %{_make_output_sync} %{?_smp_mflags} V=1 VERBOSE=1
+%make_build %{__make} %{_make_output_sync} %{?_smp_mflags} %{_make_verbose}
 
 #------------------------------------------------------------------------------
 # The make install analogue of %configure for modern autotools:
diff --git a/platform.in b/platform.in
index e1efc42b0c..61f5e18a07 100644
--- a/platform.in
+++ b/platform.in
@@ -59,8 +59,10 @@
 
 %_smp_mflags -j%{_smp_build_ncpus}
 
-# Enable LTO optimization with a maximal parallelism
-%_lto_cflags -flto=%{_smp_build_ncpus}
+# Maximum number of threads to use when building, 0 for unlimited
+#%_smp_nthreads_max 0
+
+%_smp_build_nthreads %{_smp_build_ncpus}
 
 #==============================================================================
 # ---- Build policy macros.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 147c14887a..e9372cb40e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,7 +9,6 @@ rpm.c
 rpmsign.c
 rpmspec.c
 build/build.c
-build/expression.c
 build/files.c
 build/misc.c
 build/pack.c
@@ -79,6 +78,7 @@ python/rpmts-py.c
 rpmio/argv.c
 rpmio/digest.c
 rpmio/digest_nss.c
+rpmio/expression.c
 rpmio/macro.c
 rpmio/rpmfileutil.c
 rpmio/rpmio.c
diff --git a/po/ar.po b/po/ar.po
index 9a88ee90b0..92e03fde80 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:49+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/rpm-team/rpm/language/ar/)\n"
@@ -615,31 +615,31 @@ msgstr "خيارات المُحدّد:"
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "يجري تنفيذ(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "نهاية غير سليمة في %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr ""
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -654,55 +654,6 @@ msgstr ""
 "\n"
 "أخطاء بناء الحزمة:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr ""
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr ""
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr ""
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr ""
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr ""
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr ""
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr ""
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr ""
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr ""
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -822,174 +773,179 @@ msgstr ""
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, c-format
+msgid "Can't read content of file: %s\n"
+msgstr ""
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr ""
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1123,18 +1079,18 @@ msgstr ""
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1347,42 +1303,42 @@ msgstr ""
 msgid "Bad source: %s: %s\n"
 msgstr "مصدر خاطئ: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr ""
@@ -1467,17 +1423,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr ""
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1492,76 +1448,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s: السّطر: %s\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "%s: السّطر: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1637,65 +1593,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr ""
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "تعذّر تنفيذ %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "يجري إبجاد  %s: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "تعذّر إيجاد %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1821,22 +1777,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
@@ -2077,7 +2033,7 @@ msgstr ""
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3471,7 +3427,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3514,15 +3470,15 @@ msgstr ""
 msgid "Unknown format"
 msgstr "صيغة غير معروفة"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "ثبّت"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "أزِل"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3636,11 +3592,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "مُستثناة"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr ""
 
@@ -3681,6 +3637,55 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+msgid "syntax error while parsing =="
+msgstr ""
+
+#: rpmio/expression.c:254
+msgid "syntax error while parsing &&"
+msgstr ""
+
+#: rpmio/expression.c:263
+msgid "syntax error while parsing ||"
+msgstr ""
+
+#: rpmio/expression.c:313
+msgid "parse error in expression"
+msgstr ""
+
+#: rpmio/expression.c:350
+msgid "unmatched ("
+msgstr ""
+
+#: rpmio/expression.c:382
+msgid "- only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:398
+msgid "! only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+msgid "types must match"
+msgstr ""
+
+#: rpmio/expression.c:457
+msgid "* and / not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:513
+msgid "- not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:670
+msgid "&& and || not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+msgid "syntax error in expression"
+msgstr ""
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3691,73 +3696,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
diff --git a/po/br.po b/po/br.po
index f60979fbb2..fdd33aae88 100644
--- a/po/br.po
+++ b/po/br.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:52+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Breton (http://www.transifex.com/rpm-team/rpm/language/br/)\n"
@@ -613,31 +613,31 @@ msgstr "Dibaboù Spec :"
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "O seveniñ(%s) : %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr ""
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -649,55 +649,6 @@ msgid ""
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr ""
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr ""
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr ""
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr ""
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr ""
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr ""
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr ""
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr ""
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr ""
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -817,174 +768,179 @@ msgstr "N'eo ket bet kavet ar rstr : %s\n"
 msgid "Not a directory: %s\n"
 msgstr "N'eo ket ur renkell: %s\n"
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "N'hell ket bet lennet ar restr %s : %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr ""
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr "Fazi en ur lenn %%files eus ar restr %s : %m\n"
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr "Muioc'h evit ur restr war ul linenn : %s\n"
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "N'eo ket ur restr mat : %s : %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1118,18 +1074,18 @@ msgstr ""
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1342,42 +1298,42 @@ msgstr ""
 msgid "Bad source: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s : %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr ""
@@ -1462,17 +1418,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr ""
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1487,76 +1443,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "fazi en ur zigeriñ %s : %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "linenn %d : %s : %s\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "linenn %d : %s : %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1632,65 +1588,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr ""
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "N'hell bet bet sevenet %s : %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "sac'het eo bet %s : %x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "sac'het eo bet magic_open(0x%x) : %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "sac'het eo bet magic_load : %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "O klask  %s : %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Sac'het eo bet klask %s :\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1816,22 +1772,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "Un Delta RPM eo %s neuez ne c'hell ket bezañ staliet\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "Bet eo ouzhpennet ar pakad %s dija, o tremen e-biou %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "Bet eo ouzhpennet ar pakad %s dija, o erlec'hiañ gant %s\n"
@@ -2072,7 +2028,7 @@ msgstr ""
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3466,7 +3422,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3509,15 +3465,15 @@ msgstr ""
 msgid "Unknown format"
 msgstr "Furmad dianav"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "staliañ"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "lemel"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3631,11 +3587,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "tremenet en e biou"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "sac'het"
 
@@ -3676,6 +3632,55 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+msgid "syntax error while parsing =="
+msgstr ""
+
+#: rpmio/expression.c:254
+msgid "syntax error while parsing &&"
+msgstr ""
+
+#: rpmio/expression.c:263
+msgid "syntax error while parsing ||"
+msgstr ""
+
+#: rpmio/expression.c:313
+msgid "parse error in expression"
+msgstr ""
+
+#: rpmio/expression.c:350
+msgid "unmatched ("
+msgstr ""
+
+#: rpmio/expression.c:382
+msgid "- only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:398
+msgid "! only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+msgid "types must match"
+msgstr ""
+
+#: rpmio/expression.c:457
+msgid "* and / not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:513
+msgid "- not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:670
+msgid "&& and || not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+msgid "syntax error in expression"
+msgstr ""
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3686,73 +3691,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index c33cb148d5..07d1f811a0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2018-02-15 09:14+0000\n"
 "Last-Translator: Robert Antoni Buj Gelonch <robert.buj@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/rpm-team/rpm/language/ca/)\n"
@@ -679,31 +679,31 @@ msgstr "Opcions de spec:"
 msgid "no arguments given for parse"
 msgstr "no s'ha proporcionat arguments per analitzar sintàcticament"
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr "No es pot obrir el fitxer temporal: %s\n"
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr "No es pot obrir el flux: %s\n"
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Execució(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Estat incorrecte de sortida de %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Han fallat les dependències de la construcció:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -718,55 +718,6 @@ msgstr ""
 "\n"
 "Errors de construcció del RPM:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "error de sintaxi mentre s'analitzava ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "error de sintaxi mentre s'analitzava &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "error de sintaxi mentre s'analitzava ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "error d'anàlisi a l'expressió\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "no hi ha hagut coincidències (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- només als nombres\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! només als nombres\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "els tipus han de coincidir\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / no és disponible per a les cadenes\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- no és disponible per a les cadenes\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& i || no són disponibles per a les cadenes\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "error de sintaxi a l'expressió\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -886,152 +837,157 @@ msgstr "No s'ha trobat el fitxer: %s\n"
 msgid "Not a directory: %s\n"
 msgstr "No és un directori: %s\n"
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "Ha fallat la lectura del pitxer de política: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s: no es pot carregar l'etiqueta incorrecta (%d).\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: ha fallat la lectura de la clau pública.\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: no és una clau pública armada.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s: ha fallat la codificació\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "no s'ha pogut crear el directori"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "El fitxer necessita el «/» principal: %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "No s'ha pogut obrir el fitxer %s del %%files: %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr "S'ha produït un error en llegir %%files del fitxer %s: %m\n"
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "El glob no ha trobat el fitxer: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr "Més d'un fitxer en una línia: %s\n"
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Fitxer incorrecte: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Comprovació per si hi ha fitxers no empaquetats: %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -1040,22 +996,22 @@ msgstr ""
 "Hi ha fitxers instal·lats però no empaquetats:\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Processament dels fitxers: %s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Els binaris dependents de l'arquitectura estan en el paquet noarch\n"
 
@@ -1189,20 +1145,20 @@ msgstr "sense descripció al %%changelog\n"
 msgid "line %d: second %%changelog\n"
 msgstr "línia %d: segon %%changelog\n"
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 "línia %d: S'ha produït un error en analitzar sintàcticament el "
 "%%description: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "línia %d: Opció %s incorrecta: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1418,42 +1374,42 @@ msgstr "%%{buildroot} no pot ser \"/\"\n"
 msgid "Bad source: %s: %s\n"
 msgstr "Fonts incorrectes: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "No existeix el pedaç número %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "No existeix la font número %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "S'ha produït un error en analitzar sintàcticament el %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "línia %d: Argument incorrecte al %%setup: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "línia %d: Opció %s incorrecta del %%setup: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "El número de pedaç %s no és vàlid: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "línia %d: segon %%prep\n"
@@ -1538,17 +1494,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "línia %d: Segon %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "línia %d: el script intern no està disponible: %s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1563,76 +1519,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "No es pot obrir %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr "%s:%d: S'esperava l'argument per %s\n"
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr "línia %d: %%if sense tancar\n"
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: s'ha obtingut un %%else sense %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "línia %d: %s: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%s:%d: condició incorrecta del %%if\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "No s'ha trobat cap arquitectura compatible per a la construcció\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "El paquet no té %%description: %s\n"
@@ -1708,65 +1664,65 @@ msgstr "Processament de les polítiques: %s\n"
 msgid "Ignoring invalid regex %s\n"
 msgstr "S'ignora l'expressió regular incorrecta %s\n"
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "No s'ha pogut crear la canonada per a %s: %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "No s'ha pogut executar %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "No s'ha pogut crear el procés fill de «%s»: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "ha fallat %s: %x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr "ha fallat l'escriptura de totes les dades a %s: %s\n"
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr "Classificador buit de fitxer\n"
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr "Sense atributs de fitxer configurats\n"
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "Ha fallat magic_open(0x%x): %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "Ha fallat magic_load: %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "Ha fallat el reconeixement del fitxer «%s»: mode %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "S'està cercant %s: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Ha fallat la cerca de %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1896,22 +1852,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s és un Delta RPM i no es pot instal·lar directament\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Càrrega (%s) no admesa al paquet %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "el paquet %s ja es va afegir i s'ignora %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "el paquet %s ja es va afegir, s'està substituint amb %s\n"
@@ -2152,7 +2108,7 @@ msgstr "s'esperava | al final de l'expressió"
 msgid "array iterator used with different sized arrays"
 msgstr "iterador de seqüència que s'utilitza amb seqüències de diferents mides"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3571,7 +3527,7 @@ msgstr "No s'ha cridat cap exec() després del fork() a l'scriptlet de lua\n"
 msgid "Unable to restore current directory: %m"
 msgstr "No s'ha pogut restaurar el directori actual: %m"
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr "no s'ha construït amb la compatibilitat cap als scriptlets <lua>\n"
 
@@ -3614,15 +3570,15 @@ msgstr "Ha fallat el scriptlet %s, estat de sortida %d\n"
 msgid "Unknown format"
 msgstr "Format desconegut"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "instal·la"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "esborra"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3736,11 +3692,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "s'ha ignorat"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "ha fallat"
 
@@ -3781,6 +3737,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "error de sintaxi mentre s'analitzava ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "error de sintaxi mentre s'analitzava &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "error de sintaxi mentre s'analitzava ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "error d'anàlisi a l'expressió\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "no hi ha hagut coincidències (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- només als nombres\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! només als nombres\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "els tipus han de coincidir\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / no és disponible per a les cadenes\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- no és disponible per a les cadenes\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& i || no són disponibles per a les cadenes\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "error de sintaxi a l'expressió\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3791,57 +3808,52 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(buit)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "La macro %%%s té opcions inacabades\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "La macro %%%s té un cos inacabat\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "La macro %%%s té un cos buit\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr "La macro %%%s necessita un espai en blanc abans del cos\n"
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Ha fallat l'expansió de la macro %%%s\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr "S'ha definit la macro %%%s però no s'utilitza dins de l'àmbit\n"
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Opció desconeguda %c a %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr "ha fallat la càrrega del fitxer de les macros %s"
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
@@ -3849,17 +3861,17 @@ msgstr ""
 "Hi ha massa nivells de recursivitat en l'expansió de la macro. És probable "
 "que sigui a causa de la declaració recursiva de la macro.\n"
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c sense terminar: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Un %% precedeix una macro que no es pot analitzar\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== actiu %d buit %d\n"
@@ -4099,6 +4111,9 @@ msgstr "%s: ha fallat la lectura del manifest: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "no verifiquis la signatura de la capçalera i la càrrega"
 
+#~ msgid "failed to load macro file %s"
+#~ msgstr "ha fallat la càrrega del fitxer de les macros %s"
+
 #~ msgid "Exec of %s failed (%s): %s\n"
 #~ msgstr "Ha fallat l'execució de %s (%s): %s\n"
 
diff --git a/po/cmn.po b/po/cmn.po
index dae6120d33..eff2f24c28 100644
--- a/po/cmn.po
+++ b/po/cmn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Chinese (Mandarin) (http://www.transifex.com/rpm-team/rpm/"
@@ -617,31 +617,31 @@ msgstr "規格選項："
 msgid "no arguments given for parse"
 msgstr "沒有任何引數用於剖析"
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr "無法開啟暫存檔案：%s\n"
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr "無法開啟串流：%s\n"
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "正在執行(%s)：%s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "來自 %s 的不當離開狀態 (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "相依性建置失敗：\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -656,55 +656,6 @@ msgstr ""
 "\n"
 "RPM 建置錯誤：\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "剖析 == 時有語法錯誤\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "剖析 && 時有語法錯誤\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "剖析 || 時有語法錯誤\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "表述式剖析錯誤\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "不符合的 (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- 只能用於數字\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! 只能用於數字\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "類型必須符合\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "字串不支援 *、/\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "字串不支援 -\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "字串不支援 && 和 ||\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "表述式中有語法錯誤\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -824,152 +775,157 @@ msgstr "找不到檔案：%s\n"
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "讀取策略檔案時失敗：%s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s：無法呼叫不明的標籤 (%d)。\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s：公鑰讀入失敗。\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s：不是一個受保護的公鑰。\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s：編碼失敗\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "無法建立目錄"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "檔案需要以「/」開頭：%s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr "%%dev 不允許透過 glob 解析：%s\n"
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "無法開啟 %%files 檔案 %s：%m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr "讀取 %%files 檔案 %s 時發生錯誤：%m\n"
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr "不合法的 _docdir_fmt %s：%s\n"
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "透過 glob 解析找不到檔案：%s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr "無法混合特殊 %s 與其他表單：%s\n"
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr "一列中超過一個檔案：%s\n"
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "不當檔案：%s：%s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "正在檢查未打包的檔案：%s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -978,22 +934,22 @@ msgstr ""
 "找到已安裝 (但未打包) 的檔案：\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "正在處理檔案：%s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr "二進位架構 (%d) 無法匹配套件架構 (%d)。\n"
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "noarch 套件中有依賴架構的二進位檔\n"
 
@@ -1127,18 +1083,18 @@ msgstr "%%changelog 中沒有描述\n"
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "第 %d 列：剖析 %%description 時發生錯誤：%s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "第 %d 列：不當選項 %s：%s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1351,42 +1307,42 @@ msgstr "%%{buildroot} 不可為「/」\n"
 msgid "Bad source: %s: %s\n"
 msgstr "不當原始碼：%s：%s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "沒有修補編號 %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "沒有原始碼編號 %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "剖析 %%setup 時發生錯誤：%s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "第 %d 列：%%setup 中出現不當引數：%s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "第 %d 列：不當 %%setup 選項 %s：%s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "無效的修補編號 %s：%s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "第 %d 列：第二個 %%prep\n"
@@ -1471,17 +1427,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "第 %d 列：第二個 %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "第 %d 列：不支援的內部指令稿：%s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr "第 %d 列：解譯器引數不允許存在觸發器中：%s\n"
@@ -1496,76 +1452,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "無法開啟 %s：%s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr "%s:%d：預期用於 %s 的引數\n"
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr "第 %d 列：未關閉的 %%if\n"
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr "第 %d 列：未關閉的巨集或不當的列延續\n"
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d：有個 %%else 沒有對應 %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "第 %d 列：%s：%s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%s:%d：不當的 %%if 條件\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr "%s:%d：異常的 %%include 敘述\n"
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "找不到可供建置的相容架構\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "套件沒有 %%description：%s\n"
@@ -1641,65 +1597,65 @@ msgstr "處理策略：%s\n"
 msgid "Ignoring invalid regex %s\n"
 msgstr "忽略無效的正規表示式 %s\n"
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "無法為 %s 建立管線：%m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "無法執行 %s：%s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "無法分支 %s：%s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "%s 失敗：%x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr "無法寫入所有資料至 %s：%s\n"
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr "空的檔案分類器\n"
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr "無設定檔案特性\n"
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) 失敗：%s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load 失敗：%s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "檔案「%s」辨識失敗：模式 %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "正在尋找 %s：%s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "找不到 %s：\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1825,22 +1781,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s 是個差異 RPM 而無法直接安裝\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "未支援的酬載 (%s) 於套件 %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "套件 %s 已被加入，跳過 %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "套件 %s 已被加入，以 %s 替換\n"
@@ -2081,7 +2037,7 @@ msgstr "| 預期於表述式的結尾"
 msgid "array iterator used with different sized arrays"
 msgstr "用於不同大小陣列的陣列迭代器"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, fuzzy, c-format
 msgid "failed to load macro file %s\n"
 msgstr "讀取策略檔案時失敗：%s\n"
@@ -3485,7 +3441,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr "無法還原目前的目錄：%m"
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr "<lua> 指令稿片段支援未內建\n"
 
@@ -3528,15 +3484,15 @@ msgstr "%s 指令稿片段失敗，離開狀態 %d\n"
 msgid "Unknown format"
 msgstr "不明格式"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "安裝"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "抹除"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3651,11 +3607,11 @@ msgstr "(不是個 OpenPGP 簽名)"
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "已跳過"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "已失敗"
 
@@ -3696,6 +3652,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "剖析 == 時有語法錯誤\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "剖析 && 時有語法錯誤\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "剖析 || 時有語法錯誤\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "表述式剖析錯誤\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "不符合的 (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- 只能用於數字\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! 只能用於數字\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "類型必須符合\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "字串不支援 *、/\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "字串不支援 -\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "字串不支援 && 和 ||\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "表述式中有語法錯誤\n"
+
 #: rpmio/macro.c:334
 #, fuzzy, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3706,73 +3723,68 @@ msgstr "%3d>%*s(清空)"
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(清空)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, fuzzy, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr "巨集 %%%s 具有未終結的選項\n"
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "巨集 %%%s 具有未終結的選項\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "巨集 %%%s 具有未終結的主體\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "巨集 %%%s 具有空的主體\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "巨集 %%%s 展開時失敗\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "在 %2$s(%3$s) 中有不明的選項 %1$c\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr "在巨集展開中有太多層的遞迴。它似乎是遞迴的巨集宣告所造成的。\n"
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "未終結的 %c：%s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "在無法剖析的巨集之後跟著一個 %%\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== 作用中 %d 清空 %d\n"
diff --git a/po/cs.po b/po/cs.po
index 0fa566b83f..ffa769f71e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:49+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Czech (http://www.transifex.com/rpm-team/rpm/language/cs/)\n"
@@ -626,31 +626,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Provádění(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Špatný návratový kód z %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Chybné závislosti při sestavování:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -665,55 +665,6 @@ msgstr ""
 "\n"
 "chyby sestavení RPM:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "chyba syntaxe při zpracování ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "chyba syntaxe při zpracování &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "chyba syntaxe při zpracování ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "chyba při parsování ve výrazu\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "nedoplněná (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- jen na číslech\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! jen na číslech\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "typy musí souhlasit\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / nejsou podporovány pro řetězce\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- není podporováno pro řetězce\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& a || není podporováno pro řetězce\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "chyba syntaxe ve výrazu\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -833,152 +784,157 @@ msgstr "Soubor nenalezen: %s\n"
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "%s: čtení seznamu selhalo: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s: nemohu nahrát neznámou značku (%d).\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: čtení veřejného klíče selhalo.\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: není obrněný veřejný klíč.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr ""
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Soubor potřebuje úvodní \"/\": %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Nemohu otevřít %%files soubor %s: %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Soubor nenalezen globem: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Špatný soubor: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Kontroluji nezabalené soubory: %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -987,22 +943,22 @@ msgstr ""
 "Nalezeny instalované, ale nezabalené soubory:\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1136,18 +1092,18 @@ msgstr "žádný popis v %%changelog\n"
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "řádek %d: Chyba při parsování %%description: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "řádek %d: špatná volba %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1360,42 +1316,42 @@ msgstr ""
 msgid "Bad source: %s: %s\n"
 msgstr "Špatný zdrojový soubor: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Chyba při parsování %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "řádek %d: Špatný parametr v %%setup: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "řádek %d: Špatná volba v %%setup %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "Neplatné číslo záplaty %s: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "řádek %d: druhý %%prep\n"
@@ -1480,17 +1436,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "řádek %d: Druhý %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "řádek %d: nepodporovaný interní skript: %s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1505,76 +1461,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Nemohu otevřít %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: %%else bez počítečního %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "řádek %d: Špatné určení %s: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "řádek %d: Špatná volba v %%setup %s: %s\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Nenalezeny žádné kompatibilní architektury pro sestavení\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Balíček nemá žádné %%description: %s\n"
@@ -1650,65 +1606,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "Nemohu vytvořit rouru pro %s: %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Nemohu spustit %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Nemohu provést fork %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) selhalo: %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load selhal: %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Hledám   %s: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Selhalo vyhledání %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1834,22 +1790,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s is a Delta RPM a nemůže být přímo instalován\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Nepodporovaný payload (%s) in balíčku %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "balíček %s byl již přidán, přeskakuji %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "balíček %s byl již přidán, nahrazuji ho s %s\n"
@@ -2090,7 +2046,7 @@ msgstr "na konci výrazu je očekáváno |"
 msgid "array iterator used with different sized arrays"
 msgstr "iterátor pole použitý s poli jiné délky"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3489,7 +3445,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3532,15 +3488,15 @@ msgstr "provedení %s skripletu selhalo, návratový kód: %d\n"
 msgid "Unknown format"
 msgstr ""
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr ""
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3654,11 +3610,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr ""
 
@@ -3699,6 +3655,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "chyba syntaxe při zpracování ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "chyba syntaxe při zpracování &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "chyba syntaxe při zpracování ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "chyba při parsování ve výrazu\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "nedoplněná (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- jen na číslech\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! jen na číslech\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "typy musí souhlasit\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / nejsou podporovány pro řetězce\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- není podporováno pro řetězce\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& a || není podporováno pro řetězce\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "chyba syntaxe ve výrazu\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3709,73 +3726,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(prázdné)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s má neukončené parametry\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s má neukončené tělo\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makro %%%s má prázdné tělo\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Selhalo vyhodnocení makra %%%s\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Neznámý parametr %c v %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Neukončené %c: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Po %% následuje nezpracovatelné makro\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktivní %d prázdné %d\n"
diff --git a/po/da.po b/po/da.po
index ad85f2c309..2046cd4a62 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:49+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Danish (http://www.transifex.com/rpm-team/rpm/language/da/)\n"
@@ -618,31 +618,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Udfører(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Fejl-afslutningsstatus fra %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr ""
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -657,55 +657,6 @@ msgstr ""
 "\n"
 "RPM opbygningsfejl:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "syntaksfejl under tolkning af ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "syntaksfejl under tolkning af &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "syntaksfejl under tolkning af ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "tolkningsfejl i udtryk\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "uparret (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- kun for tal\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! kun for tal\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "typer skal passe sammen\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / understøttes ikke for strenge\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- understøttes ikke for strenge\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& og || understøttes ikke for strenge\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "syntaksfejl i udtryk\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -825,174 +776,179 @@ msgstr "Fil ikke fundet: %s\n"
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "%s: læs manifest mislykkedes: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr ""
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Fil kræver foranstillet \"/\": %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Fil ikke fundet med glob: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ugyldig fil: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1126,18 +1082,18 @@ msgstr "ingen beskrivelse i %%changelog\n"
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "linie %d: Fejl ved tolkning af %%description: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "linie %d: Ugyldigt tilvalg %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1350,42 +1306,42 @@ msgstr ""
 msgid "Bad source: %s: %s\n"
 msgstr "Ugyldig kilde: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Fejl ved tolking af %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "linie %d: Ugyldigt '%%setup'-tilvalg %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "linie %d: anden %%prep\n"
@@ -1470,17 +1426,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "linie %d: Anden %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1495,78 +1451,78 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 "Kunne ikke åbne %s: %s\n"
 "\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: Fik et %%else uden et %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "linie %d: Ugyldig %s: angivere: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "linie %d: Ugyldigt '%%setup'-tilvalg %s: %s\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Pakke har ingen %%description: %s\n"
@@ -1642,65 +1598,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr ""
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Kunne ikke udføre %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Kunne ikke fraspalte ny proces til %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Kunne ikke finde %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1826,22 +1782,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
@@ -2082,7 +2038,7 @@ msgstr "| forventet ved slutningen af udtryk"
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3486,7 +3442,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3529,15 +3485,15 @@ msgstr ""
 msgid "Unknown format"
 msgstr ""
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr ""
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3651,11 +3607,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr ""
 
@@ -3696,6 +3652,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "syntaksfejl under tolkning af ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "syntaksfejl under tolkning af &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "syntaksfejl under tolkning af ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "tolkningsfejl i udtryk\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "uparret (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- kun for tal\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! kun for tal\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "typer skal passe sammen\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / understøttes ikke for strenge\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- understøttes ikke for strenge\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& og || understøttes ikke for strenge\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "syntaksfejl i udtryk\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3706,73 +3723,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(tom)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makroen %%%s har uafsluttede parametre\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makroen %%%s har et uafsluttet indhold (body)\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makroen %%%s har intet indhold\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makroen %%%s kunne ikke udfoldes\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Ukendt tilvalg %c i %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Uafsluttet %c: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Et %% efterfølges af en makro, der ikke kan tolkes\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktiv %d tom %d\n"
diff --git a/po/de.po b/po/de.po
index 08cc1b78eb..09d7f65226 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2019-03-24 03:53+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: German (http://www.transifex.com/rpm-team/rpm/language/de/)\n"
@@ -661,31 +661,31 @@ msgstr "Spec-Optionen:"
 msgid "no arguments given for parse"
 msgstr "Keine Argumente zur Auswertung angegeben"
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr "Temp-Datei konnte nicht geöffnet werden: %s\n"
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr "Datenstrom konnte nicht geöffnet werden: %s\n"
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Ausführung(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Fehler-Status beim Beenden von %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Fehlgeschlagene Paket-Abhängigkeiten:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr "Einstellung %s=%s\n"
@@ -700,55 +700,6 @@ msgstr ""
 "\n"
 "Fehler beim Bauen des RPM:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "Syntax-Fehler beim Auswerten von ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "Syntax-Fehler beim Auswerten von &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "Syntax-Fehler beim Auswerten von ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "Fehler beim Auswerten des Ausdrucks\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "Unerwartete (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- nur bei Zahlen\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! nur bei Zahlen\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "Typen müssen übereinstimmen\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / nicht unterstützt für Zeichenketten\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- nicht unterstützt für Zeichenketten\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& und || nicht unterstützt für Zeichenketten\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "Syntax-Fehler im Ausdruck\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -868,152 +819,157 @@ msgstr "Datei nicht gefunden: %s\n"
 msgid "Not a directory: %s\n"
 msgstr "Kein Verzeichnis: %s\n"
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "Lesen der Richtlinien-Datei fehlgeschlagen: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s: Unbekannter Tag (%d) kann nicht geladen werden.\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: Lesen des öffentlichen Schlüssels fehlgeschlagen.\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: Ist kein gepanzerter öffentlicher Schlüssel.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s: Verschlüsselung fehlgeschlagen\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr "Fehler beim Lesen der build-id in %s: %s\n"
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr "build-id fehlt in %s\n"
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr "in %s gefundene build-id ist zu klein\n"
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr "in %s gefundene build-id ist zu groß\n"
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "Erzeugen des Verzeichnisses fehlgeschlagen"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Datei benötigt führenden »/«: %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr "%%dev-glob ist unzulässig: %s\n"
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Datei %s aus %%files konnte nicht geöffnet werden: %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr "Leere Datei %s in %%files\n"
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr "Fehler beim Lesen der Datei %s in %%files: %m\n"
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr "Ungültiges _docdir_fmt %s: %s\n"
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Datei von »glob« nicht gefunden: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr "Spezielles %s kann nicht mit anderen Formen gemischt werden: %s\n"
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr "Mehr als eine Datei in einer Zeile: %s\n"
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ungültige Datei: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Auf nicht gepackte Datei(en) wird geprüft: %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -1022,24 +978,24 @@ msgstr ""
 "Installierte (aber nicht gepackte) Datei(en) gefunden:\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr "%s wurde mehreren Dateinamen zugewiesen"
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Dateien werden verarbeitet: %s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 "Architektur der Binärdateien (%d) entspricht nicht der Paketarchitektur "
 "(%d).\n"
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Architekturabhängige Binärdateien in »noarch«-Paket\n"
 
@@ -1173,18 +1129,18 @@ msgstr "Keine Beschreibung im %%changelog\n"
 msgid "line %d: second %%changelog\n"
 msgstr "Zeile %d: zweites %%changelog\n"
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "Zeile %d: Fehler beim Auswerten von %%description: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "Zeile %d: Ungültige Option %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1400,42 +1356,42 @@ msgstr "%%{buildroot} kann nicht »/« sein\n"
 msgid "Bad source: %s: %s\n"
 msgstr "Ungültige Quelle: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "Kein Patch mit der Nummer %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "Keine Quelle mit der Nummer %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Fehler beim Auswerten von %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "Zeile %d: Ungültiges Argument für %%setup: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "Zeile %d: Ungültige %%setup-Option %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "Ungültige Patch-Nummer %s: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "Zeile %d: Zweites %%prep\n"
@@ -1522,17 +1478,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "Zeile %d: Zweites %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "Zeile %d: Nicht unterstütztes internes Skript: %s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr "Zeile %d: Interpreter-Argumente sind in Triggern nicht erlaubt: %s\n"
@@ -1547,76 +1503,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr "%s:%d: Argument wurde für %s erwartet\n"
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr "Zeile %d: Nicht geschlossenes %%if\n"
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr "Zeile %d: Nicht geschlossenes Makro oder ungültige Zeilenfortsetzung\n"
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: %%else ohne %%if erhalten\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "Zeile %d: %s: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%s:%d: Ungültige %%if-Bedingung\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr "%s:%d: missgebildete %%include-Anweisung\n"
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr "Kodierung %s wird vom System nicht unterstützt\n"
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr "Pakt %s: Ungültige %s-Kodierung in %s: %s - %s\n"
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Keine für das Bauen kompatiblen Architekturen gefunden\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paket hat keine %%description: %s\n"
@@ -1700,65 +1656,65 @@ msgstr "Richtlinien werden verarbeitet: %s\n"
 msgid "Ignoring invalid regex %s\n"
 msgstr "Ungültiger regulärer Ausdruck %s wird ignoriert\n"
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "Pipe für %s konnte nicht erzeugt werden: %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "%s konnte nicht ausgeführt werden: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "fork %s konnte nicht ausgeführt werden: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "%s fehlgeschlagen: %x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr "Nicht alle Daten konnten nach %s geschrieben werden: %s\n"
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr "Leerer Dateiklassifizierer\n"
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr "Keine Dateiattribute konfiguriert\n"
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) fehlgeschlagen: %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load fehlgeschlagen: %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "Erkennung der Datei »%s« fehlgeschlagen: Modus %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "%s wird gesucht: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "%s konnte nicht gefunden werden:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1886,22 +1842,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s ist ein Delta-RPM und kann nicht direkt installiert werden\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Nicht unterstütze Nutzdaten (%s) in Paket %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "Paket %s wurde bereits hinzugefügt, %s wird übersprungen\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "Paket %s wurde bereits hinzugefügt, wird durch %s ersetzt\n"
@@ -2142,7 +2098,7 @@ msgstr "| am Ende des Ausdrucks erwartet"
 msgid "array iterator used with different sized arrays"
 msgstr "Zählvariable wird mit ungleich großem Array benutzt"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3561,7 +3517,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr "Aktuelles Verzeichnis kann nicht wiederhergestellt werden: %m"
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr "<lua>-Scriptlet-Unterstützung nicht eingebaut\n"
 
@@ -3604,15 +3560,15 @@ msgstr "%s Scriptlet fehlgeschlagen, Beenden-Status %d\n"
 msgid "Unknown format"
 msgstr "Unbekanntes Format"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "installieren"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "löschen"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3726,11 +3682,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "übersprungen"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "fehlgeschlagen"
 
@@ -3771,6 +3727,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "Syntax-Fehler beim Auswerten von ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "Syntax-Fehler beim Auswerten von &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "Syntax-Fehler beim Auswerten von ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "Fehler beim Auswerten des Ausdrucks\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "Unerwartete (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- nur bei Zahlen\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! nur bei Zahlen\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "Typen müssen übereinstimmen\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / nicht unterstützt für Zeichenketten\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- nicht unterstützt für Zeichenketten\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& und || nicht unterstützt für Zeichenketten\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "Syntax-Fehler im Ausdruck\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3781,58 +3798,53 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(leer)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s hat nicht terminierte Optionen\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s hat einen nicht terminierten Hauptteil\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makro %%%s hat einen leeren Hauptteil\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr "Makro %%%s benötigt Leerzeichen vor dem Hauptteil\n"
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makro %%%s konnte nicht erweitert werden\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 "Makro %%%s ist definiert, wird aber nicht innerhalb des Bereichs verwendet\n"
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Unbekannte Option %c in %s (%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr "Laden der Makro-Datei %s ist fehlgeschlagen"
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
@@ -3840,17 +3852,17 @@ msgstr ""
 "Zu viele Rekursionsebenen bei der Expansion des Makros. Dies wird "
 "wahrscheinlich durch eine rekursive Makro-Deklaration verursacht.\n"
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Nicht terminiertes %c: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Auf %% folgt ein nicht auswertbares Makro\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktiv %d  leer %d\n"
@@ -4090,6 +4102,9 @@ msgstr "%s: Lesen der Paket-Liste fehlgeschlagen: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "Keine Überprüfung der Header- und Nutzdaten-Signatur"
 
+#~ msgid "failed to load macro file %s"
+#~ msgstr "Laden der Makro-Datei %s ist fehlgeschlagen"
+
 #~ msgid "Exec of %s failed (%s): %s\n"
 #~ msgstr "Ausführung von %s fehlgeschlagen (%s): %s\n"
 
diff --git a/po/el.po b/po/el.po
index 6a1e421023..22f6cafabc 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Greek (http://www.transifex.com/rpm-team/rpm/language/el/)\n"
@@ -615,31 +615,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr ""
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -651,55 +651,6 @@ msgid ""
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr ""
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr ""
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr ""
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr ""
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr ""
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr ""
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr ""
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr ""
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr ""
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -819,174 +770,179 @@ msgstr ""
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, c-format
+msgid "Can't read content of file: %s\n"
+msgstr ""
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr ""
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1120,18 +1076,18 @@ msgstr ""
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1344,42 +1300,42 @@ msgstr ""
 msgid "Bad source: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr ""
@@ -1464,17 +1420,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr ""
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1489,76 +1445,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr ""
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1634,65 +1590,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr ""
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1818,22 +1774,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
@@ -2074,7 +2030,7 @@ msgstr ""
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3468,7 +3424,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3511,15 +3467,15 @@ msgstr ""
 msgid "Unknown format"
 msgstr ""
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr ""
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3633,11 +3589,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr ""
 
@@ -3678,6 +3634,55 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+msgid "syntax error while parsing =="
+msgstr ""
+
+#: rpmio/expression.c:254
+msgid "syntax error while parsing &&"
+msgstr ""
+
+#: rpmio/expression.c:263
+msgid "syntax error while parsing ||"
+msgstr ""
+
+#: rpmio/expression.c:313
+msgid "parse error in expression"
+msgstr ""
+
+#: rpmio/expression.c:350
+msgid "unmatched ("
+msgstr ""
+
+#: rpmio/expression.c:382
+msgid "- only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:398
+msgid "! only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+msgid "types must match"
+msgstr ""
+
+#: rpmio/expression.c:457
+msgid "* and / not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:513
+msgid "- not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:670
+msgid "&& and || not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+msgid "syntax error in expression"
+msgstr ""
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3688,73 +3693,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
diff --git a/po/eo.po b/po/eo.po
index 1a919ebf80..a2ba7ff797 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:51+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Esperanto (http://www.transifex.com/rpm-team/rpm/language/"
@@ -636,31 +636,31 @@ msgstr "Spec-elektoj:"
 msgid "no arguments given for parse"
 msgstr "neniuj parametroj donitaj por analizi"
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr "Ne eblas malfermi provizoran dosieron: %s\n"
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr "Ne eblas malfermi fluon: %s\n"
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Plenumiganta (%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Misa elirstato el %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Malsukcesintaj muntaj dependaĵoj:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -675,55 +675,6 @@ msgstr ""
 "\n"
 "Muntaj eraroj ĉe RPM:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "sintaksa eraro dum analizi ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "sintaksa eraro dum analizi &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "Sintaksa eraro dum analizi ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "analiza eraro ĉe esprimo\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "( sen )\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- nur por nobroj\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! nur por nombroj\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "tipoj devas esti kongruaj\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / ne por ĉenoj\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- no por ĉenoj\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& kaj || ne por ĉenoj\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "sintaksa eraro en esprimo\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -843,152 +794,157 @@ msgstr "Dosiero ne trovita: %s\n"
 msgid "Not a directory: %s\n"
 msgstr "Ne dosierujo: %s\n"
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "Malsukcesis legi konduto-dosieron: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s: ne eblas ŝargi nekonatan etikedon (%d).\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: legi publikan ŝlosilon malsukcesis.\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: ne ŝirmita publika ŝlosilo.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s: malsukcesis kodiĝi\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "malsukcesis krei dosierujon"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Dosiero devas havi antaŭan \"/\": %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr "Amaso %%dev ne permesata:%s\n"
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Ne eblis malfermi %%files file %s: %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr "Vaka dosiero %%files %s\n"
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr "eraro dum legi dosieron %%files %s: %m\n"
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr "nepermesita _docdir_fmt %s: %s\n"
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Dosiero ne trovita laŭ amaso: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr "Ne eblas kunmiksi specialan %s-on kun aliaj formoj: %s\n"
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr "Pli ol unu dosiero en linio: %s\n"
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Fuŝa dosiero: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Kontrolanta ne pakita(j)n dosiero(j)n: %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -997,24 +953,24 @@ msgstr ""
 "Insalita(j) (sed ne pakita(j) dosiero(j) trovita(j):\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Procedanta dosierojn: %s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 "Platformo (%d) de la plenumebla dosiero ne kongruas la pakaĵan platformon "
 "(%d).\n"
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Platformo-dependaj dosieroj en platformo-sendependa pakaĵo\n"
 
@@ -1148,18 +1104,18 @@ msgstr "neniu priskribo en %%changelog\n"
 msgid "line %d: second %%changelog\n"
 msgstr "linio %d: dua %%changelog\n"
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "linio %d: Eraro dum analizo de %%description: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "linio %d: Fuŝa elekto %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1372,42 +1328,42 @@ msgstr "ne eblas, ke %%{buildroot} estu \"/\"\n"
 msgid "Bad source: %s: %s\n"
 msgstr "Fuŝa fonto: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "Neniu flikaĵa numero %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "Neniu fonta numero %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Eraro dum analizo de %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "linio %d: Fuŝa elekto ĉe %%setup: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "linio %d: Fuŝa elekto ĉe %%setup %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "Nevalida flikaĵo-numero %s: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "linio %d: dua %%prep\n"
@@ -1494,17 +1450,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "linio %d: Dua %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "linio %d: ne rekonas internan skripton: %s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1520,76 +1476,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr "Makroo etendita en komento en linio %d: %s\n"
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Ne eblas malfermi: %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr "%s: %d: Parametroj anticipitaj por %s\n"
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr "linio %d: Nefermita %%if\n"
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr "linio %d: nefinita makroo aŭ fuŝa linio-daŭrigo\n"
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d %%else sen %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "linio %d: %s: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%s:%d: fuŝa kondiĉo ĉe %%if\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr "%s:%d: misformita frazo %%include\n"
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr "kodoprezento %s ne regata de sistemo\n"
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr "Pakaĵo %s: nevalida kodoprezento %s en %s: %s - %s\n"
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Neniuj kongruaj platformoj trovitaj por muntaĵo\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Pakaĵo ne enhavas: %%description: %s\n"
@@ -1667,65 +1623,65 @@ msgstr "Traktanta kondutojn: %s\n"
 msgid "Ignoring invalid regex %s\n"
 msgstr "Ignoris nevalidan regulesprimon %s\n"
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "Ne eblis krei tubon por %s: %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Ne eblis plenumigi: %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Ne eblis forki: %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "%s malsukcesis: %x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr "malsukcesis skribi ĉiujn datumojn al %s: %s\n"
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr "Vaka dosiero-klasifikilo\n"
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr "Neniuj dosieraj atributoj elektitaj\n"
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) malsukcesis: %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load malsukcesis: %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "Rekono de dosiero \"%s\" malsukcesis: reĝimo %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Serĉi:  %s: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Malsukcesis trovi: %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1853,22 +1809,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s estas Pera RPM kaj ne estas rekte instalebla\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Ne komprenata ŝarĝo (%s) en pakaĵo %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "pakaĵo %s jam aldoniĝis, preterlasanta %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "pakaĵo %s jam aldoniĝis, anstataŭigante per %s\n"
@@ -2109,7 +2065,7 @@ msgstr "| atendita je la fino de la esprimo"
 msgid "array iterator used with different sized arrays"
 msgstr "tabela iteraciilo uzata kun tabeloj kun diversaj grandoj"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3511,7 +3467,7 @@ msgstr "Neniu exec() vokita post fork() en lua-skripteto\n"
 msgid "Unable to restore current directory: %m"
 msgstr "Ne eblas restarigi nunan dosierujon: %m"
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr "rego por <lua>-programetojn ne estas integraj\n"
 
@@ -3554,15 +3510,15 @@ msgstr "skripteto %s malsukcesis, elira stato %d\n"
 msgid "Unknown format"
 msgstr "nekonata formato"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "instali"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "forviŝi"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3676,11 +3632,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "preterlasita"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "malsukcesa"
 
@@ -3721,6 +3677,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "sintaksa eraro dum analizi ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "sintaksa eraro dum analizi &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "Sintaksa eraro dum analizi ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "analiza eraro ĉe esprimo\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "( sen )\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- nur por nobroj\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! nur por nombroj\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "tipoj devas esti kongruaj\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / ne por ĉenoj\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- no por ĉenoj\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& kaj || ne por ĉenoj\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "sintaksa eraro en esprimo\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3731,57 +3748,52 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(vaka)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makroo %%%s havas nefinitajn elektojn\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makroo %%%s havas nefinitan korpon\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makroo %%%s havas vakan korpon\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr "Makroo %%%s postulas blankspacon antaŭ korpo\n"
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makroo %%%s malsukcesis etendiĝi\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr "Makroo %%%s difinita sed ne uzata en amplekso\n"
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Nekonata elekto %c en %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr "malsukcesis ŝargi makroan dosieron %s"
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
@@ -3789,17 +3801,17 @@ msgstr ""
 "Tro da niveloj de rekursioj en makroa etendado. Verŝajne kaŭzate de rekursia "
 "makro-deklaro.\n"
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Nefinita %c: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "%% estas sekvata de sensenca makroo\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktiva %d vaka %d\n"
@@ -4039,6 +4051,9 @@ msgstr "%s: legi manifeston malsukcesis: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "ne konstati pretendojn de kapo+ŝarĝo"
 
+#~ msgid "failed to load macro file %s"
+#~ msgstr "malsukcesis ŝargi makroan dosieron %s"
+
 #~ msgid "Exec of %s failed (%s): %s\n"
 #~ msgstr "Plenumigo de %s malsukcesis (%s): %s\n"
 
diff --git a/po/es.po b/po/es.po
index cce636e84b..355f9a9c9a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:51+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/rpm-team/rpm/language/es/)\n"
@@ -666,31 +666,31 @@ msgstr "Opciones de spec:"
 msgid "no arguments given for parse"
 msgstr "no se han ofrecido argumentos para analizar"
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr "No es posible abrir el archivo temporal: %s\n"
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr "No es posible abrir flujo: %s\n"
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Ejecutando(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Estado de salida erróneo de %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Fallo al construir las dependencias:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -705,55 +705,6 @@ msgstr ""
 "\n"
 "Errores de construcción RPM:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "error de sintaxis durante el análisis ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "error de sintaxis durante el análisis &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "error de sintaxis durante el análisis ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "error de análisis en la expresión\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "no coincidente (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- solo en números\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! solo en números\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "los tipos deben coincidir\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / no está soportado en cadenas\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- no está soportado en cadenas\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& y || no están soportados en cadenas\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "error de sintaxis en la expresión\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -873,152 +824,157 @@ msgstr "Archivo no encontrado: %s\n"
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "Falló al leer el archivo de política: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s: no se puede cargar, etiqueta (%d) desconocida.\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: falló la lectura de la clave publica.\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: no es una clave pública con armadura.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s: falló la codificación\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "falló al crear el directorio"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "El archivo necesita comenzar con \"/\": %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr "%%dev glob no permitido: %s\n"
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "No se pudo abrir el archivo %%files %s: %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr "Error leyendo %%files archivo %s: %m\n"
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr "illegal _docdir_fmt %s: %s\n"
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Archivo no encontrado por glob: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr "No se puede mezclar el %s especial con otros formatos: %s\n"
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr "Más de un archivo en una línea: %s\n"
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Archivo erróneo: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Comprobando si hay archivos desempaquetados: %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -1027,23 +983,23 @@ msgstr ""
 "Se encontraron archivos instalados (pero desempaquetados):\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Procesando archivos: %s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 "Los archivos binarios (%d) no coinciden con los archivos del paquete (%d).\n"
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 "Binarios dependientes de la arquitectura en paquetes sin arquitectura\n"
@@ -1179,18 +1135,18 @@ msgstr "ninguna descripción en %%changelog\n"
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "línea %d: Error al analizar %%description: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "línea %d: Opción errónea %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1403,42 +1359,42 @@ msgstr "%%{BuildRoot} no puede ser \"/\"\n"
 msgid "Bad source: %s: %s\n"
 msgstr "Fuente errónea: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "Ningún número de parche %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "Ningún número fuente %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Error al analizar %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "línea %d: Argumento erróneo para %%setup: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "línea %d: opción %%setup errónea %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "Número de parche %s inválido: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "línea %d: segundo %%prep\n"
@@ -1525,17 +1481,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "línea %d: Segundo %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "línea %d: script interno no soportado: %s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1552,76 +1508,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "No ha sido posible abrir %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr "%s:%d: Argumento esperado para %s\n"
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr "línea %d: %%if no cerrado\n"
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr "línea %d: macro no cerrado o continuación de línea errónea\n"
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: Tiene un %%else sin %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "línea %d: %s: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%s:%d: mal %%si condición\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr "%s:%d: instrucción %%include con formato incorrecto\n"
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "No se encontraron arquitecturas compatibles para la construcción\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "El paquete no tiene %%description: %s\n"
@@ -1701,65 +1657,65 @@ msgstr "Procesando políticas: %s\n"
 msgid "Ignoring invalid regex %s\n"
 msgstr "Ignorando regex no válido %s\n"
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "No se pudo crear una tuberia para %s: %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "No se pudo ejecutar la llamada exec %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "No se pudo ejecutar la llamada al sistema fork para %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "Falló %s: %x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr "falló la escritura de todos los datos a %s: %s\n"
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr "Clasificador de archivo vacío\n"
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr "No han sido configurados atributos de archivo\n"
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "falló magic_open(0x%x): %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "falló magic_load: %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "Falló la identificación del archivo \"%s\": modo %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Buscando %s: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Falló la búsqueda de %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1887,22 +1843,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s es un RPM Delta y no puede ser instalado directamente\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Carga útil (%s) no soportada en el paquete %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "el paquete %s ya fue añadido, omitiendo %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "el paquete %s ya fue añadido, reemplazando con %s\n"
@@ -2143,7 +2099,7 @@ msgstr "se esperaba | al final de la expresión"
 msgid "array iterator used with different sized arrays"
 msgstr "iterador de arreglo usado con arreglos de diferente tamaño"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3564,7 +3520,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr "No es posible restaurar el directorio actual: %m"
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 "soporte interno para macro de inclución de guiones <lua>, no fue construido\n"
@@ -3608,15 +3564,15 @@ msgstr "%s: macro de ejecución de guión fallido, estado de terminación %d\n"
 msgid "Unknown format"
 msgstr "formato desconocido"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "instalar "
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "borrar"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3730,11 +3686,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "ignorado"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "falló"
 
@@ -3775,6 +3731,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "error de sintaxis durante el análisis ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "error de sintaxis durante el análisis &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "error de sintaxis durante el análisis ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "error de análisis en la expresión\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "no coincidente (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- solo en números\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! solo en números\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "los tipos deben coincidir\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / no está soportado en cadenas\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- no está soportado en cadenas\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& y || no están soportados en cadenas\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "error de sintaxis en la expresión\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3785,57 +3802,52 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(vacío)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "El macro %%%s tiene opciones no terminadas\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "El macro %%%s tiene un cuerpo incompleto\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "El macro %%%s tiene un cuerpo vacío\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Falló la expansión del macro macro %%%s\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Opción desconocida %c en %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
@@ -3843,17 +3855,17 @@ msgstr ""
 "Demasiados niveles de recursión en la expansión macro. Esto seguramente haya "
 "sido provocado por una declaración macro recursiva.\n"
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "No terminado %c: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Un %% está seguido por un macro no analizable\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== activo %d vacío %d\n"
diff --git a/po/fi.po b/po/fi.po
index 9795f41509..f812fc083d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Finnish (http://www.transifex.com/rpm-team/rpm/language/fi/)\n"
@@ -624,31 +624,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Suoritetaan(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Puuttuvia käännösriippuvuuksia:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -662,55 +662,6 @@ msgstr ""
 "\n"
 "RPM käännösvirheitä:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "syntaksivirhe jäsentäessä ==:aa\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "syntaksivirhe jäsentäessä &&:aa\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "syntaksivirhe jäsentäessä ||:aa\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "jäsennysvirhe lausekkeessa\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "pariton (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- vain numeroissa\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! vain numeroissa\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "tyyppien täytyy olla yhtenevät\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / ei tuettu merkkijonoille\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- ei tuettu merkkijoinoille\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& ja || ei tuettu merkkijoinoille\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "syntaksivirhe lausekkeessa\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -830,152 +781,157 @@ msgstr "Tiedostoa ei löytynyt: %s\n"
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "%s: pakettilistan luku epäonnistui: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: julkisen avaimen luku epäonnistui\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: ei ole panssaroitu julkinen avain.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "hakemiston luonti epäonnistui"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Tiedosto tarvitsee aloitusmerkin \"/\": %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "%%files tiedostoa %s ei voitu avata: %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Tiedostoa ei löytynyt täydennyksellä: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Virheellinen tiedosto: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Tarkistetaan paketoimattomia tiedostoja: %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -984,22 +940,22 @@ msgstr ""
 "Löytyi asennettuja (mutta paketoimattomia) tiedostoja:\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Käsitellään tiedostoja: %s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1133,18 +1089,18 @@ msgstr "ei kuvausta %%changelog:issa\n"
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "rivi %d: virhe jäsennettäessä %%description-osiota %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "rivi %d: virheellinen valinta %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1357,42 +1313,42 @@ msgstr "%%{buildroot} ei voi olla \"/\"\n"
 msgid "Bad source: %s: %s\n"
 msgstr "Virheellinen lähde: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "Ei patchia numero %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "Ei lähdettä numero %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Virhe jäsennettäessä %%setup-osiota: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "rivi %d: virheellinen argumentti %%setup:ille: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "rivi %d: virheellinen %%setup valitsin %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "Virheellinen patch-numero %s: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "rivi %d: toinen %%prep-osio\n"
@@ -1477,17 +1433,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "rivi %d: toinen %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1502,76 +1458,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Ei voi avata %s:ää: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: %%else ilman %%if:iä\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "%s: rivi: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "rivi %d: virheellinen %%setup valitsin %s: %s\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Ei yhteensopivia arkkitehtureeja käännökselle\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paketissa ei ole %%description-osiota: %s\n"
@@ -1647,65 +1603,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "Ei voitu luoda putkea %s:lle: %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Ei voitu suorittaa %s:ää: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Ei voitu suorittaa %s:ää: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) epäonnistui: %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load epäonnistui: %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "Tiedoston \"%s\" tunnistaminen epäonnistui: moodi %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Etsitään %s:ää: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "%s:ää ei löytynyt\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1831,22 +1787,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s on Delta RPM eikä sitä voida suoraan asentaa\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Tuntematon kuorma (%s) paketissa %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "paketti %s on jo lisätty, ohitetaan %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "paketti %s oli jo lisätty, korvataan %s:lla\n"
@@ -2087,7 +2043,7 @@ msgstr "odotin '}'-merkkiä ilmauksen lopussa"
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3489,7 +3445,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3532,15 +3488,15 @@ msgstr "%s skripti epäonnistui, palautti %d\n"
 msgid "Unknown format"
 msgstr "Tuntematon formaatti"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr ""
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3654,11 +3610,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "epäonnistui"
 
@@ -3699,6 +3655,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "syntaksivirhe jäsentäessä ==:aa\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "syntaksivirhe jäsentäessä &&:aa\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "syntaksivirhe jäsentäessä ||:aa\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "jäsennysvirhe lausekkeessa\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "pariton (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- vain numeroissa\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! vain numeroissa\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "tyyppien täytyy olla yhtenevät\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / ei tuettu merkkijonoille\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- ei tuettu merkkijoinoille\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& ja || ei tuettu merkkijoinoille\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "syntaksivirhe lausekkeessa\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3709,73 +3726,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(tyhjä)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makrossa %%%s on päättämättömiä valitsimia\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makrossa %%%s on päättämätön runko\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makron %%%s runko on tyhjä\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makron %%%s laajennos ei onnistunut\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Tuntematon valitsin %c %s(%s):ssä\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Päättämätön %c: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "%% seuraa makro jota ei voida jäsentää\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktiivisia %d tyhjiä %d\n"
diff --git a/po/fr.po b/po/fr.po
index 7dbbcaf32d..082d3197a5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: French (http://www.transifex.com/rpm-team/rpm/language/fr/)\n"
@@ -656,31 +656,31 @@ msgstr "Options spec :"
 msgid "no arguments given for parse"
 msgstr "pas d'arguments donnés pour analyser"
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr "Impossible d'ouvrir le fichier temporaire : %s\n"
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr "Impossible d'ouvrir le flux : %s\n"
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Exécution_de(%s) : %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Mauvais statut de sortie pour %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Dépendances de construction manquantes:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -695,55 +695,6 @@ msgstr ""
 "\n"
 "Erreur de construction de RPM :\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "erreur de syntaxe en analysant ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "erreur de syntaxe en analysant &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "erreur de syntaxe en analysant ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "erreur de syntaxe dans l'expression\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "( non fermée\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- seulement sur des nombres\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! seulement sur des nombres\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "les types doivent correspondre\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / non supportés sur des chaînes de caractères\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- non prix en charge sur des chaînes de caractères\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& et || ne sont pas prix en charge sur des chaînes de caractères\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "erreur de syntaxe dans l'expression\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -863,152 +814,157 @@ msgstr "Fichier non trouvé : %s\n"
 msgid "Not a directory: %s\n"
 msgstr "Pas de répertoire: %s\n"
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "Impossible de lire les fichier de stratégie : %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s : ne peut pas charger le tag (%d) inconnu.\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s : échec de la lecture de la clé publique.\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s : n'est pas une clé publique blindée.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s : échec de l'encodage.\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "échec de création du répertoire"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Le fichier non précédé d'un \"/\": %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr "globale %%dev non autorisée : %s\n"
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Impossible d'ouvrir le fichier %%files %s : %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr "Erreur de lecture du fichiers %%files %s : %m\n"
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr "illegal _docdir_fmt %s: %s\n"
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Fichier non trouvé par la substitution : %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr "Impossible de mélanger un %s spécial avec d'autres formes : %s\n"
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr "Plus d'un fichier sur la ligne : %s\n"
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Mauvais fichier : %s : %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Vérification des fichiers non empaquetés : %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -1017,23 +973,23 @@ msgstr ""
 "Fichier(s) installé(s) (mais non empaquetés) :\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Traitement des fichiers : %s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 "L'architecture de binaire (%d) ne correspond pas à celle du paquet (%d).\n"
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Binaires dépendants d'une arch dans un paquet noarch\n"
 
@@ -1167,18 +1123,18 @@ msgstr "absence de description dans le %%changelog\n"
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "ligne %d : erreur dans l'analyse syntaxique de la %%description : %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "ligne %d : mauvaise option %s : %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1391,42 +1347,42 @@ msgstr "%%{buildroot} ne peut pas être « / »\n"
 msgid "Bad source: %s: %s\n"
 msgstr "Mauvaise source : %s : %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "Pas de numéro de patch %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "Pas de numéro de source %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Erreur d'analyse syntaxique du %%setup : %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "ligne %d : mauvais argument à %%setup : %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "ligne %d : mauvaise option à %%setup %s : %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s : %s : %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "Numéro du patch invalide %s :%s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "ligne %d : deuxième %%prep\n"
@@ -1513,17 +1469,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "ligne %d : deuxième %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "ligne %d : script interne non pris en charge :%s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1539,76 +1495,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Impossible d'ouvrir %s : %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr "%s :%d : argument attendu pour %s\n"
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr "ligne %d : %%if non terminé\n"
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr "ligne %d : macro non fermée ou mauvaise continuation de ligne\n"
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s : %d : j'ai là un %%else sans %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "ligne %d : %s : %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%s : %d : mauvaise condition %%if\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr "%s:%d: directive %%include mal-formée\n"
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Pas d'architecture compatible pour construction\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Le paquet n'a pas de %%description : %s\n"
@@ -1687,65 +1643,65 @@ msgstr "Traitement de la stratégie : %s\n"
 msgid "Ignoring invalid regex %s\n"
 msgstr "Ignorer l'expression régulière %s invalide\n"
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "Impossible de créer le pipe pour %s : %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Impossible d'exécuter %s : %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Impossible de forker %s : %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "%s a échoué : %x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr "échec de l'écriture de toutes les données de %s : %s\n"
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr "Classificateur de fichier vide\n"
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr "Aucun fichier attributs configurés\n"
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) a échoué : %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load a échoué : %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "La reconnaissance du fichier « %s » a échoué : mode %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Trouver %s : %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Impossible de trouver %s :\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1873,22 +1829,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s est un Delta RPM et ne peut être installé directement\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Charge (%s) non pris en charge dans le paquet %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "le paquet %s a déjà été rajouté, %s ignoré\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "le paquet %s a déjà été rajouté, replacé par %s\n"
@@ -2129,7 +2085,7 @@ msgstr "| attendu a la fin de l'expression"
 msgid "array iterator used with different sized arrays"
 msgstr "itérateur de tableau utilisé avec des tableaux de tailles différentes"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3558,7 +3514,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr "Impossible de restaurer le répertoire courant : %m"
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr "le support du scriptlet <lua> n'est pas intégrer\n"
 
@@ -3601,15 +3557,15 @@ msgstr "%s scriptlet échoué, état de sortie %d\n"
 msgid "Unknown format"
 msgstr "Format inconnu"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "installer"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "effacer"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3723,11 +3679,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "sauté"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "échoué"
 
@@ -3768,6 +3724,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "erreur de syntaxe en analysant ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "erreur de syntaxe en analysant &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "erreur de syntaxe en analysant ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "erreur de syntaxe dans l'expression\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "( non fermée\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- seulement sur des nombres\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! seulement sur des nombres\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "les types doivent correspondre\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / non supportés sur des chaînes de caractères\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- non prix en charge sur des chaînes de caractères\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& et || ne sont pas prix en charge sur des chaînes de caractères\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "erreur de syntaxe dans l'expression\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3778,57 +3795,52 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(vide)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "La macro %%%s a des options non-terminées\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "La macro %%%s a un corps sans fin\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "La macro %%%s a un corps vide\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr "La macro %%%s a besoin d'un espace avant le corps\n"
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "La macro %%%s ne peut être expansée\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr "Macro %%%s définie mais non utilisée sans portée\n"
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Option inconnue %c dans %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr "Impossible de charger le fichier macro %s"
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
@@ -3836,17 +3848,17 @@ msgstr ""
 "Trop de niveaux de récursivité dans l'expansion de la macro. Il est "
 "probablement causée par une déclaration de macro récursive.\n"
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c non terminé: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Un %% est suivi d'une macro in-analysable\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== %d actif(s) %d vide(s)\n"
@@ -4086,6 +4098,9 @@ msgstr "%s : échec de la lecture de la liste de paquetages : %s\n"
 msgid "don't verify header+payload signature"
 msgstr "ne pas vérifier la signature de l'entête+charge_utile"
 
+#~ msgid "failed to load macro file %s"
+#~ msgstr "Impossible de charger le fichier macro %s"
+
 #~ msgid "Exec of %s failed (%s): %s\n"
 #~ msgstr "L'exec de %s a échoué (%s): %s\n"
 
diff --git a/po/id.po b/po/id.po
index 2a33c7fc78..007070aee3 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/rpm-team/rpm/language/"
@@ -636,31 +636,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr ""
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -672,55 +672,6 @@ msgid ""
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr ""
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr ""
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr ""
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr ""
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr ""
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr ""
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr ""
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr ""
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr ""
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -840,174 +791,179 @@ msgstr ""
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, c-format
+msgid "Can't read content of file: %s\n"
+msgstr ""
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr ""
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1141,18 +1097,18 @@ msgstr ""
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1365,42 +1321,42 @@ msgstr ""
 msgid "Bad source: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr ""
@@ -1485,17 +1441,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr ""
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1510,76 +1466,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr ""
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1655,65 +1611,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr ""
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1839,22 +1795,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
@@ -2095,7 +2051,7 @@ msgstr ""
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3489,7 +3445,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3532,15 +3488,15 @@ msgstr ""
 msgid "Unknown format"
 msgstr ""
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr ""
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3654,11 +3610,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr ""
 
@@ -3699,6 +3655,55 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+msgid "syntax error while parsing =="
+msgstr ""
+
+#: rpmio/expression.c:254
+msgid "syntax error while parsing &&"
+msgstr ""
+
+#: rpmio/expression.c:263
+msgid "syntax error while parsing ||"
+msgstr ""
+
+#: rpmio/expression.c:313
+msgid "parse error in expression"
+msgstr ""
+
+#: rpmio/expression.c:350
+msgid "unmatched ("
+msgstr ""
+
+#: rpmio/expression.c:382
+msgid "- only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:398
+msgid "! only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+msgid "types must match"
+msgstr ""
+
+#: rpmio/expression.c:457
+msgid "* and / not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:513
+msgid "- not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:670
+msgid "&& and || not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+msgid "syntax error in expression"
+msgstr ""
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3709,73 +3714,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index a8f957a365..86119a2dfa 100644
--- a/po/is.po
+++ b/po/is.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Icelandic (http://www.transifex.com/rpm-team/rpm/language/"
@@ -613,31 +613,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr ""
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -649,55 +649,6 @@ msgid ""
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr ""
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr ""
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr ""
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr ""
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr ""
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr ""
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr ""
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr ""
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr ""
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -817,174 +768,179 @@ msgstr "Skráin fannst ekki: %s\n"
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "ekki yfirfara eiganda skráa"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr ""
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Skráin fannst ekki með 'glob': %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ógild skrá %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1118,18 +1074,18 @@ msgstr ""
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "lína %d: Óleyfilegur rofi %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1342,42 +1298,42 @@ msgstr ""
 msgid "Bad source: %s: %s\n"
 msgstr "Slæmt ílag: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "lína %d: Ógilt viðfang við %%setup: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr ""
@@ -1462,17 +1418,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr ""
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1487,76 +1443,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Get ekki opnað %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "lína %d: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "lína %d: Óleyfilegur rofi %s: %s\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1632,65 +1588,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr ""
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Gat ekki keyrt %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Gat ekki búið til undirferli (fork) %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "gat ekki fundið %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1816,22 +1772,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
@@ -2072,7 +2028,7 @@ msgstr ""
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3466,7 +3422,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3509,15 +3465,15 @@ msgstr ""
 msgid "Unknown format"
 msgstr ""
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr ""
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3631,11 +3587,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr ""
 
@@ -3676,6 +3632,55 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+msgid "syntax error while parsing =="
+msgstr ""
+
+#: rpmio/expression.c:254
+msgid "syntax error while parsing &&"
+msgstr ""
+
+#: rpmio/expression.c:263
+msgid "syntax error while parsing ||"
+msgstr ""
+
+#: rpmio/expression.c:313
+msgid "parse error in expression"
+msgstr ""
+
+#: rpmio/expression.c:350
+msgid "unmatched ("
+msgstr ""
+
+#: rpmio/expression.c:382
+msgid "- only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:398
+msgid "! only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+msgid "types must match"
+msgstr ""
+
+#: rpmio/expression.c:457
+msgid "* and / not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:513
+msgid "- not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:670
+msgid "&& and || not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+msgid "syntax error in expression"
+msgstr ""
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3686,73 +3691,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(tómt)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Óþekkt viðfang %c í %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== virkt %d tómt %d\n"
diff --git a/po/it.po b/po/it.po
index 73f219e723..eee8ae2132 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Italian (http://www.transifex.com/rpm-team/rpm/language/it/)\n"
@@ -659,31 +659,31 @@ msgstr "Opzioni specfile:"
 msgid "no arguments given for parse"
 msgstr "nessun argomento passato per il parsing"
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr "Impossibile aprire il file temporaneo: %s\n"
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr "Impossibile aprire lo stream: %s\n"
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Esecuzione(%s) in corso: %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Stato d'uscita errato da %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Dipendenze di build fallite:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -698,55 +698,6 @@ msgstr ""
 "\n"
 "Errori di compilazione RPM:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "errore di sintassi durante il parsing di ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "errore di sintassi durante il parsing di &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "errore di sintassi durante il parsing di ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "errore durante il parsing dell'espressione\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "non corrispondente (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- solo sui numeri\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! solo sui numeri\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "i diversi tipi devono corrispondere\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / non supportato per le stringhe\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- non supportato per le stringhe\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& e || non supportati per le stringhe\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "errore di sintassi nell'espressione\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -866,154 +817,159 @@ msgstr "File non trovato: %s\n"
 msgid "Not a directory: %s\n"
 msgstr "Non è una directory: %s\n"
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "Impossibile leggere il file policy: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s: impossibile caricare tag sconosciuto (%d).\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: lettura chiave pubblica fallita.\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: non è una chiave pubblica con formato 'armored'.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s: errore durante l'encoding\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "impossibile creare la directory"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Il file deve essere preceduto da \"/\": %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr "glob %%dev non consentito: %s\n"
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Impossibile aprire %%files file %s: %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 "File %s vuoto nella sezione %%files\n"
 "\n"
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr "Errore nella lettura del file %s in %%files: %m\n"
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr "_docdir_fmt %s non valido: %s\n"
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "File non trovato dal glob: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr "Impossibile unire %s speciali con altre forme: %s\n"
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr "Più di un file su una riga: %s\n"
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "File errato: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Controllo per file non pacchettizzati in corso: %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -1022,23 +978,23 @@ msgstr ""
 "Trovati file installati (ma non inclusi nel pacchetto):\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Elaborazione file: %s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 "L'architettura dei binari (%d) non corrisponde a quella del pacchetto (%d).\n"
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Binari dipendenti dall'architettura presenti in un pacchetto noarch\n"
 
@@ -1172,18 +1128,18 @@ msgstr "nessuna descrizione in %%changelog\n"
 msgid "line %d: second %%changelog\n"
 msgstr "linea %d: seconda sezione %%changelog\n"
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "riga %d: Errore durante il parsing di %%description: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "riga  %d: Opzione %s errata: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1396,42 +1352,42 @@ msgstr "%%{buildroot} non può essere \"/\"\n"
 msgid "Bad source: %s: %s\n"
 msgstr "Sorgenti non validi: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "Nessuna patch con numero %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "Nessun sorgente con numero %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Errore nel parsing di %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "riga %d: Argomento errato su %%setup: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "riga %d: Opzione di %%setup errata %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "Numero patch non valido %s: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "riga %d: secondo %%prep\n"
@@ -1517,17 +1473,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "riga %d: Secondo %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "linea %d: script interno non supportato: %s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr "linea %d: argomenti dell'interprete non consentiti nei trigger: %s\n"
@@ -1542,79 +1498,79 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Impossibile aprire %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr "%s:%d: argomento necessario per %s\n"
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 "riga %d: %%if non bilanciato\n"
 "\n"
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr "linea %d: macro non chiusa o errata continuazione linea\n"
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: Trovato un %%else con nessun %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "linea %d: %s: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%s:%d: condizione %%if errata\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr "%s: %d: istruzione %%include malformata\n"
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr "la codifica %s non è supportata dal sistema\n"
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr "Pacchetto %s: codifica %s non valida in %s: %s - %s\n"
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr ""
 "Non è stata trovata alcuna architettura compatibile per la compilazione\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Il pacchetto non possiede alcuna %%description: %s\n"
@@ -1692,65 +1648,65 @@ msgstr "Elaborazione policies: %s\n"
 msgid "Ignoring invalid regex %s\n"
 msgstr "Viene ignorata la regex non valida %s\n"
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "Impossibile creare la pipe per %s: %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Impossibile eseguire %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Impossibile biforcare %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "%s fallito: %x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr "impossibile salvare tutti i dati su %s: %s\n"
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr "File classifier vuoto\n"
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr "Non è configurato alcun attributo dei file\n"
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) fallita: %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load fallita: %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "Identificazione file \"%s\" fallita: modalità %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Ricerca di %s in corso: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Impossibile trovare %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1877,22 +1833,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s è un Delta RPM e non può essere installato direttamente\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Payload non supportato (%s) nel pacchetto %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "il pacchetto %s è già stato aggiunto, salto %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "il pacchetto %s è stato già aggiunto, sostituzione con %s in corso\n"
@@ -2133,7 +2089,7 @@ msgstr "| previsto alla fine dell'espressione"
 msgid "array iterator used with different sized arrays"
 msgstr "iteratore di array usato con array di dimensioni differenti"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3558,7 +3514,7 @@ msgstr "Funzione exec() non chiamata dopo fork() nello scriptlet lua\n"
 msgid "Unable to restore current directory: %m"
 msgstr "Impossibile tornare alla direcotry corrente: %m"
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr "supporto agli scriptlet <lua> non disponibile\n"
 
@@ -3601,15 +3557,15 @@ msgstr "scriptlet %s fallita, uscita con stato %d\n"
 msgid "Unknown format"
 msgstr "Formato sconosciuto"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "installa"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "elimina"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3723,11 +3679,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "saltato"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "fallito"
 
@@ -3768,6 +3724,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "errore di sintassi durante il parsing di ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "errore di sintassi durante il parsing di &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "errore di sintassi durante il parsing di ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "errore durante il parsing dell'espressione\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "non corrispondente (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- solo sui numeri\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! solo sui numeri\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "i diversi tipi devono corrispondere\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / non supportato per le stringhe\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- non supportato per le stringhe\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& e || non supportati per le stringhe\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "errore di sintassi nell'espressione\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3778,57 +3795,52 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(vuoto)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "La macro %%%s presenta delle opzioni incomplete\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "La macro %%%s presenta un corpo incompleto\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "La macro %%%s presenta contenuto vuoto\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr "La Macro %%%s richiede whitespace prima del corpo\n"
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Impossibile espandere la macro %%%s\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr "Macro %%%s definita ma non usata nello scope\n"
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Opzione %c sconosciuta in %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr "impossibile caricare il file di macro %s"
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
@@ -3836,17 +3848,17 @@ msgstr ""
 "Troppo livelli di ricorsione nell'espansione della macro. Si tratta "
 "probabilmente di una macro definita ricorsivamente.\n"
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c non terminato: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Un %% è seguito da una macro non parsabile\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== %d attivo %d vuoto\n"
@@ -4086,6 +4098,9 @@ msgstr "%s: lettura manifesto fallita: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "non verificare firma header+payload"
 
+#~ msgid "failed to load macro file %s"
+#~ msgstr "impossibile caricare il file di macro %s"
+
 #~ msgid "Exec of %s failed (%s): %s\n"
 #~ msgstr "Esecuzione di %s fallita (%s): %s\n"
 
diff --git a/po/ja.po b/po/ja.po
index 7094ae68c2..b068ddc36c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/rpm-team/rpm/language/"
@@ -631,31 +631,31 @@ msgstr "specのオプション:"
 msgid "no arguments given for parse"
 msgstr "構文解析する引数がありません"
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr "一時ファイルを開けません: %s\n"
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr "ストリームを開けません: %s\n"
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "実行中(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "%s の不正な終了ステータス (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "ビルド依存性の失敗:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -670,55 +670,6 @@ msgstr ""
 "\n"
 "RPM ビルドのエラー:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "構文解析中の文法エラー ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "構文解析中の文法エラー &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "構文解析中の文法エラー ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "式中で構文解析エラー\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "( が一致しません\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- は数のみ使用可能です\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! は数にのみ使用可能です\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "型は一致していなければなりません\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / は文字列には使えません\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- は文字列には使えません\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& と || は文字列には使えません\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "式中で文法エラー\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -840,152 +791,157 @@ msgstr "ファイルが見つかりません: %s\n"
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "ポリシーファイルの読み込みに失敗しました。: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s: 不明なタグ (%d) を読み込めませんでした。\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: 公開鍵の読み込みに失敗しました。\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: ASCII 形式の公開鍵ではありません。\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s: エンコードに失敗\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "ディレクトリーの作成に失敗しました"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "ファイルは先頭に \"/\" が必要です: %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr "%%dev グロブは許可されません: %s\n"
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "%%files のファイル %s を開けません: %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr "%%files ファイル %s の読み込み中にエラー: %m\n"
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr "不正な _docdir_fmt %s: %s\n"
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "ファイルが見つかりません (by glob): %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr "他の形式で特別な %s を混ぜることはできません: %s\n"
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr "１ 行に複数のファイル: %s\n"
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "不正なファイル: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "パッケージに含まれないファイルの検査中: %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -994,24 +950,24 @@ msgstr ""
 "インストール済み(ただしパッケージに含まれない)ファイルが見つかりました:\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "ファイルの処理中: %s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 "バイナリのアーキテクチャー (%d) がパッケージのアーキテクチャー (%d) と一致し"
 "ません。\n"
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "noarch パッケージ内にアーキテクチャ依存のバイナリー\n"
 
@@ -1145,18 +1101,18 @@ msgstr "%%changelog 中に説明がありません\n"
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "%d 行目: %%description の構文解析エラー: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "%d 行目: 不正なオプション %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1369,42 +1325,42 @@ msgstr "%%{buildroot} を \"\" にすることができません\n"
 msgid "Bad source: %s: %s\n"
 msgstr "不正なソース: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "パッチ番号 %u はありません\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "ソース番号 %u はありません\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "%%setup の構文解析エラー: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "%d 行目: %%setup への不正な引数: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "%d 行目: 不正な %%setup オプション %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "無効なパッケージ番号 %s: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "%d 行目: ふたつ目の %%prep\n"
@@ -1490,17 +1446,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "%d 行目: 2番目の %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "%d 行目: 未サポートの内部スクリプト: %s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr "%d 行目: インタープリター引数はトリガーにおいて許可されません: %s\n"
@@ -1515,76 +1471,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "%s を開けません: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr "%s:%d: %s に対して期待される引数\n"
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr "%d 行目: %%if が閉じていません\n"
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr "%d 行目: 終了していないマクロまたは行の不正な継続\n"
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: %%if がないのに %%else があります\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "%d 行目: %s: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%s:%d: 不正な %%if 条件\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr "%s:%d: 不正な形式の %%include 文\n"
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "作成(build)可能な互換アーキテクチャはありません\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "パッケージには %%description がありません: %s\n"
@@ -1664,65 +1620,65 @@ msgstr "ポリシーの処理中: %s\n"
 msgid "Ignoring invalid regex %s\n"
 msgstr "不正な正規表現 %s を無視します\n"
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "%s のためのパイプ作成ができません: %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "%s を実行できませんでした: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "%s のフォークに失敗しました: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "%s は失敗しました。 %x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr "%s へ全データの書き込みに失敗しました: %s\n"
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr "空のファイル分類子\n"
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr "構成すべきファイル属性がありません。\n"
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) に失敗しました: %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load に失敗しました: %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "ファイル \"%s\" の承認に失敗しました: モード %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "%s を検索しています: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "%s の検索に失敗しました:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1848,22 +1804,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s はデルタ RPM で、直接インストールできません。\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "パッケージ %s 内にサポートしていないペイロード (%s) です。\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "パッケージ %s は既に追加されています。%s を飛ばします。\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "パッケージ %s は既に追加されています。 %s と置換します。\n"
@@ -2104,7 +2060,7 @@ msgstr "式の終わりに | が期待されます。"
 msgid "array iterator used with different sized arrays"
 msgstr "配列の繰り返し指定が、サイズが異なる配列の間で使用されています"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3515,7 +3471,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr "カレントディレクトリを戻せません: %m"
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr "<lua> スクリプトは組み込みでサポートしていません\n"
 
@@ -3558,15 +3514,15 @@ msgstr "%s スクリプトの実行に失敗しました。終了ステータス
 msgid "Unknown format"
 msgstr "不明な書式"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "インストール"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "削除"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3680,11 +3636,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "スキップした"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "失敗"
 
@@ -3725,6 +3681,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "構文解析中の文法エラー ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "構文解析中の文法エラー &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "構文解析中の文法エラー ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "式中で構文解析エラー\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "( が一致しません\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- は数のみ使用可能です\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! は数にのみ使用可能です\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "型は一致していなければなりません\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / は文字列には使えません\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- は文字列には使えません\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& と || は文字列には使えません\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "式中で文法エラー\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3735,57 +3752,52 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(空)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "マクロ %%%s はオプションが終端されていません。\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "マクロ %%%s はボディが終端していません。\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "マクロ %%%s のボディは空です。\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "マクロ %%%s の展開に失敗しました。\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "不明なオプション %c (%s(%s)中に)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
@@ -3793,17 +3805,17 @@ msgstr ""
 "マクロ展開の再帰呼び出しが深すぎます。これは再帰的マクロ定義が原因で発生して"
 "いる可能性があります。\n"
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "終端されていない %c: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "%% の後ろに構文解析できないマクロが続いています。\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== 有効 %d 空 %d\n"
diff --git a/po/ko.po b/po/ko.po
index c15532f20e..bda7567aa7 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Korean (http://www.transifex.com/rpm-team/rpm/language/ko/)\n"
@@ -621,31 +621,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "실행 중(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "%s의 잘못된 종료 상황 (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr ""
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -660,55 +660,6 @@ msgstr ""
 "\n"
 "RPM 제작 오류:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "'==' 을 처리(parsing)하는 도중 구문 오류가 발생했습니다\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "'&&' 을 처리(parsing)하는 도중 구문 오류가 발생했습니다\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "'||' 을 처리(parsing)하는 도중 구문 오류가 발생했습니다\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "표현식에서 오류가 발생했습니다\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "'(' 가 일치하지 않습니다\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "'-' 는 숫자에만 사용합니다\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "'!' 는 숫자에만 사용합니다\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "유형은 반드시 일치해야 합니다\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "'* /' 는 문자열에서 사용할 수 없습니다\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "'-' 는 문자열에서 사용할 수 없습니다\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "'&&' 와 '||' 는 문자열에서 사용할 수 없습니다\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "표현식에서 구문 오류가 발생했습니다\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -828,174 +779,179 @@ msgstr "파일을 찾을 수 없음: %s\n"
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "%s: 읽는데 실패했습니다: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr ""
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "파일은 \"/\" 로 시작해야함: %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "glob으로 파일을 찾을 수 없음: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "잘못된 파일: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1129,18 +1085,18 @@ msgstr "%%changelog에 내용(description)이 없습니다\n"
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "%d 번째 행: %%description에서 오류가 발생했습니다: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "%d 번째 행: %s(은)는 잘못된 옵션입니다: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1353,42 +1309,42 @@ msgstr ""
 msgid "Bad source: %s: %s\n"
 msgstr "잘못된 소스: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "%%setup에서 오류 발생: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "%d 번째 행: %%setup에 잘못된 인수가 있습니다: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "%d 번째 행: %%setup에 잘못된 %s 옵션: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "%d 번째 행: 두번째 %%prep\n"
@@ -1473,17 +1429,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "%d 번째 행: 두번째 %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1498,76 +1454,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "%s(을)를 열 수 없음: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: %%else가 %%if 없이 사용되었습니다\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "%d 번째 행: 잘못된 %s: 수식자(qualifier): %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%d 번째 행: %%setup에 잘못된 %s 옵션: %s\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "패키지 제작에 호환하는 아키텍쳐를 찾을 수 없습니다\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "패키지에 %%description이 없음: %s\n"
@@ -1643,65 +1599,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr ""
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "%s(을)를 실행할 수 없음: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "%s(을)를 fork 할 수 없음: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "%s(을)를 찾는데 실패함:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1828,22 +1784,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
@@ -2084,7 +2040,7 @@ msgstr "표현식의 끝부분에 '|' 가 와야합니다"
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3491,7 +3447,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3534,15 +3490,15 @@ msgstr ""
 msgid "Unknown format"
 msgstr ""
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr ""
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3656,11 +3612,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr ""
 
@@ -3701,6 +3657,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "'==' 을 처리(parsing)하는 도중 구문 오류가 발생했습니다\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "'&&' 을 처리(parsing)하는 도중 구문 오류가 발생했습니다\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "'||' 을 처리(parsing)하는 도중 구문 오류가 발생했습니다\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "표현식에서 오류가 발생했습니다\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "'(' 가 일치하지 않습니다\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "'-' 는 숫자에만 사용합니다\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "'!' 는 숫자에만 사용합니다\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "유형은 반드시 일치해야 합니다\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "'* /' 는 문자열에서 사용할 수 없습니다\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "'-' 는 문자열에서 사용할 수 없습니다\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "'&&' 와 '||' 는 문자열에서 사용할 수 없습니다\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "표현식에서 구문 오류가 발생했습니다\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3711,73 +3728,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(비어있음)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "매크로 %%%s에 종료되지 않은 옵션이 있습니다\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "매크로 %%%s에 종료되지 않은 내용(body)이 있습니다\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "매크로 %%%s에 비어있는 내용(body)이 있습니다\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "매크로 %%%s(을)를 확장(expand)하는데 실패했습니다\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "%2$s(%3$s)에 알 수 없는 옵션 %1$c(이)가 있습니다\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c(이)가 종료되지 않음: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "'%%' 다음에 처리할 수 없는(unparseable) 매크로가 있습니다\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== %d 활성 %d 비어있음\n"
diff --git a/po/ms.po b/po/ms.po
index 5161014937..c45fc85a01 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Malay (http://www.transifex.com/rpm-team/rpm/language/ms/)\n"
@@ -612,31 +612,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr ""
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -648,55 +648,6 @@ msgid ""
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr ""
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr ""
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr ""
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr ""
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr ""
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr ""
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr ""
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr ""
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr ""
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -816,174 +767,179 @@ msgstr ""
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "%s: gagal membaca manifest: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr ""
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1117,18 +1073,18 @@ msgstr ""
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1341,42 +1297,42 @@ msgstr ""
 msgid "Bad source: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr ""
@@ -1461,17 +1417,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr ""
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1486,76 +1442,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr ""
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1631,65 +1587,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr ""
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1815,22 +1771,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
@@ -2071,7 +2027,7 @@ msgstr "| dijangka pada penghujung ungkapan"
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3465,7 +3421,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3508,15 +3464,15 @@ msgstr ""
 msgid "Unknown format"
 msgstr ""
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr ""
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3630,11 +3586,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr ""
 
@@ -3675,6 +3631,57 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+msgid "syntax error while parsing =="
+msgstr ""
+
+#: rpmio/expression.c:254
+msgid "syntax error while parsing &&"
+msgstr ""
+
+#: rpmio/expression.c:263
+msgid "syntax error while parsing ||"
+msgstr ""
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "? dijangka dalam ungkapan"
+
+#: rpmio/expression.c:350
+msgid "unmatched ("
+msgstr ""
+
+#: rpmio/expression.c:382
+msgid "- only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:398
+msgid "! only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+msgid "types must match"
+msgstr ""
+
+#: rpmio/expression.c:457
+msgid "* and / not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:513
+msgid "- not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:670
+msgid "&& and || not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "? dijangka dalam ungkapan"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3685,73 +3692,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(kosong)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makro %%%s gagal untuk mengembang\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Pilihan tidak diketahui %c dalam %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktif %d kosong %d\n"
diff --git a/po/nb.po b/po/nb.po
index 701d76667e..c1358818c0 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/rpm-team/rpm/"
@@ -621,31 +621,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Kjører(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Ugyldig sluttstatus fra %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr ""
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -660,55 +660,6 @@ msgstr ""
 "\n"
 "RPM-feil under bygging:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "syntaksfeil under lesing av ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "syntaksfeil under lesing av &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "syntaksfeil under lesing av ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "feil under lesing av uttrykk\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "ubalansert (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- kun på tall\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! kun på tall\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "typene må være like\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / ikke støttet for strenger\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- ikke støttet for strenger\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& og || ikke støttet for strenger\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "syntaksfeil i uttrykk\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -828,174 +779,179 @@ msgstr "Fil ikke funnet: %s\n"
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "%s: lesing av manifest feilet: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr ""
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ugyldig fil %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1129,18 +1085,18 @@ msgstr ""
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "linje %d: Ugyldig flagg %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1353,42 +1309,42 @@ msgstr ""
 msgid "Bad source: %s: %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Feil under lesing av %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "linje %d: Ugyldig argument til %%setup: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "linje %d: Ugyldig %%setup flagg %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "linje %d: %%prep for andre gang\n"
@@ -1473,17 +1429,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "linje %d: Andre %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1498,76 +1454,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Kan ikke åpne %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: %%else uten %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "linje %d: Ugyldig %s: kvalifikatorer: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "linje %d: Ugyldig %%setup flagg %s: %s\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Ingen kompatible arkitekturer funnet for bygging\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Pakken har ingen %%description: %s\n"
@@ -1643,65 +1599,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr ""
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Kunne ikke kjøre %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "klarte ikke å åpne %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Klarte ikke å finne %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1827,22 +1783,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
@@ -2083,7 +2039,7 @@ msgstr ""
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3481,7 +3437,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3524,15 +3480,15 @@ msgstr ""
 msgid "Unknown format"
 msgstr ""
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr ""
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3646,11 +3602,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr ""
 
@@ -3691,6 +3647,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "syntaksfeil under lesing av ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "syntaksfeil under lesing av &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "syntaksfeil under lesing av ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "feil under lesing av uttrykk\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "ubalansert (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- kun på tall\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! kun på tall\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "typene må være like\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / ikke støttet for strenger\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- ikke støttet for strenger\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& og || ikke støttet for strenger\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "syntaksfeil i uttrykk\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3701,73 +3718,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 3939971a4f..2e5a767845 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/rpm-team/rpm/language/nl/)\n"
@@ -612,31 +612,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr ""
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -648,55 +648,6 @@ msgid ""
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr ""
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr ""
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr ""
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr ""
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr ""
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr ""
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr ""
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr ""
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr ""
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -816,174 +767,179 @@ msgstr ""
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, c-format
+msgid "Can't read content of file: %s\n"
+msgstr ""
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr ""
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1117,18 +1073,18 @@ msgstr ""
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1341,42 +1297,42 @@ msgstr ""
 msgid "Bad source: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr ""
@@ -1461,17 +1417,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr ""
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1486,76 +1442,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s: regel: %s\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "%s: regel: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1631,65 +1587,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr ""
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1815,22 +1771,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
@@ -2071,7 +2027,7 @@ msgstr ""
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3465,7 +3421,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3508,15 +3464,15 @@ msgstr ""
 msgid "Unknown format"
 msgstr ""
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr ""
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3630,11 +3586,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr ""
 
@@ -3675,6 +3631,57 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+msgid "syntax error while parsing =="
+msgstr ""
+
+#: rpmio/expression.c:254
+msgid "syntax error while parsing &&"
+msgstr ""
+
+#: rpmio/expression.c:263
+msgid "syntax error while parsing ||"
+msgstr ""
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "? verwacht in expressie"
+
+#: rpmio/expression.c:350
+msgid "unmatched ("
+msgstr ""
+
+#: rpmio/expression.c:382
+msgid "- only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:398
+msgid "! only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+msgid "types must match"
+msgstr ""
+
+#: rpmio/expression.c:457
+msgid "* and / not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:513
+msgid "- not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:670
+msgid "&& and || not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "? verwacht in expressie"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3685,73 +3692,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(leeg)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Onbekende optie %c in %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== actief %d leeg %d\n"
diff --git a/po/pl.po b/po/pl.po
index cd2c8f6748..ca9248e0fa 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2019-01-17 10:09+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/rpm-team/rpm/language/pl/)\n"
@@ -652,31 +652,31 @@ msgstr "Opcje pliku spec:"
 msgid "no arguments given for parse"
 msgstr "nie podano parametrów do przetworzenia"
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr "Nie można otworzyć pliku tymczasowego: %s\n"
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr "Nie można otworzyć strumienia: %s\n"
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Wykonywanie(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Błędny stan wyjścia z %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Niespełnione zależności budowania:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr "ustawianie %s=%s\n"
@@ -691,55 +691,6 @@ msgstr ""
 "\n"
 "Błędy budowania pakietu RPM:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "błąd składni podczas przetwarzania ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "błąd składni podczas przetwarzania &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "błąd składni podczas przetwarzania ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "błąd przetwarzania w wyrażeniu\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "niesparowane (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- tylko na liczbach\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! tylko na liczbach\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "typy muszą się zgadzać\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / nie są obsługiwane dla ciągów\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- nie jest obsługiwane dla ciągów\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& i || nie są obsługiwane dla ciągów\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "błąd składni w wyrażeniu\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -859,156 +810,161 @@ msgstr "Nie odnaleziono pliku: %s\n"
 msgid "Not a directory: %s\n"
 msgstr "Nie jest katalogiem: %s\n"
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "Odczytanie pliku polityki się nie powiodło: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s: nie można wczytać nieznanego znacznika (%d).\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: odczytanie klucza publicznego się nie powiodło.\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: nie jest opakowanym kluczem publicznym.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s: odkodowanie się nie powiodło\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr "dowiązanie symboliczne się nie powiodło"
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr "Podwójny identyfikator budowania, stat %s: %m\n"
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr "Podwójne identyfikatory budowania %s i %s\n"
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr "Nie ustawiono makra _build_id_links, przyjmowanie „compat”\n"
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr "Ustawiono makro _build_id_links na nieznaną wartość „%s”\n"
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr "błąd podczas odczytywania identyfikatora budowania w %s: %s\n"
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr "Brak identyfikatora budowania w %s\n"
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr "Identyfikator budowania odnaleziony w %s jest za mały\n"
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr "Identyfikator budowania odnaleziony w %s jest za duży\n"
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "utworzenie katalogu się nie powiodło"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr "Mieszanie głównych plików ELF i plików debugowania w pakiecie"
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Plik musi zaczynać się od „/”: %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr "Wyrażenie regularne %%dev nie jest dozwolone: %s\n"
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 "Wyrażenie regularne nie odnalazło katalogu: %s. Próbowanie bez wyrażenia "
 "regularnego.\n"
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 "Wyrażenie regularne nie odnalazło pliku: %s. Próbowanie bez wyrażenia "
 "regularnego.\n"
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Nie można otworzyć pliku %s w %%files: %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr "Pusty plik %s w %%files\n"
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr "Błąd podczas odczytywania pliku %s w %%files: %m\n"
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr "illegal _docdir_fmt %s: %s\n"
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Nie odnaleziono pliku przez wyrażenie regularne: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr "Plik specjalny na utworzonej liście plików: %s\n"
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr "Nie można mieszać specjalnego %s z innymi formami: %s\n"
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr "Więcej niż jeden plik na wiersz: %s\n"
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr "Tworzenie dowiązań identyfikatorów budowania się nie powiodło\n"
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Błędny plik: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Sprawdzanie niespakietowanych plików: %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -1017,24 +973,24 @@ msgstr ""
 "Odnaleziono zainstalowane (ale niespakietowane) pliki:\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr "%s zostało przydzielone do wielu nazw plików"
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Przetwarzanie plików: %s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 "Architektura plików binarnych (%d) nie zgadza się z architekturą pakietu "
 "(%d).\n"
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Pliki binarne zależne od architektury w pakiecie noarch\n"
 
@@ -1168,18 +1124,18 @@ msgstr "brak opisu w %%changelog\n"
 msgid "line %d: second %%changelog\n"
 msgstr "%d. wiersz: drugi %%changelog\n"
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "%d. wiersz: błąd podczas przetwarzania %%description: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "%d. wiersz: błędna opcja %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1392,42 +1348,42 @@ msgstr "%%{buildroot} nie może być „/”\n"
 msgid "Bad source: %s: %s\n"
 msgstr "Błędne źródło: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "Brak łaty numer %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "Brak źródła numer %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Błąd podczas przetwarzania %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "%d. wiersz: błędny parametr dla %%setup: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "%d. wiersz: błędna opcja %%setup %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "Nieprawidłowy numer łaty %s: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "%d. wiersz: drugie %%prep\n"
@@ -1514,17 +1470,17 @@ msgstr "%d. wiersz: priorytety są dozwolone tylko w wyzwalaczach plików: %s\n
 msgid "line %d: Second %s\n"
 msgstr "%d. wiersz: drugie %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "%d. wiersz: wewnętrzny skrypt jest nieobsługiwany: %s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr "%d. wiersz: warunek wyzwalacza pliku musi zaczynać się od „/”: %s"
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1540,76 +1496,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr "Makro rozszerzone w komentarzu w %d. wierszu: %s\n"
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Nie można otworzyć %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr "%s:%d: oczekiwano parametru dla %s\n"
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr "%d. wiersz: niezamknięte %%if\n"
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr "%d. wiersz: niezamknięte makro lub błędna kontynuacja wiersza\n"
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: napotkano %%else bez %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "%d. wiersz: %s: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%s:%d: błędny warunek %%if\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr "%s:%d: błędnie sformatowany zwrot %%include\n"
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr "kodowanie %s nie jest obsługiwane przez system\n"
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr "Pakiet %s: nieprawidłowe kodowanie %s w %s: %s — %s\n"
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr "%d. wiersz: %%end nie przyjmuje żadnych parametrów: %s\n"
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr "%d. wiersz: nieoczekiwane %%end, nie ma sekcji do zamknięcia: %s\n"
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr "%d. wiersz nie należy do żadnej sekcji: %s\n"
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Nie odnaleziono zgodnych architektur do zbudowania\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Pakiet nie ma %%description: %s\n"
@@ -1687,65 +1643,65 @@ msgstr "Przetwarzanie polityk: %s\n"
 msgid "Ignoring invalid regex %s\n"
 msgstr "Ignorowanie nieprawidłowego wyrażenia regularnego %s\n"
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "Nie można utworzyć potoku dla %s: %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Nie można wykonać %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Nie można rozdzielić %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "%s się nie powiodło: %x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr "zapisanie wszystkich danych do %s się nie powiodło: %s\n"
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr "Pusty klasyfikator pliku\n"
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr "Brak skonfigurowanych atrybutów plików\n"
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) się nie powiodło: %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load się nie powiodło: %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "Rozpoznanie pliku „%s” się nie powiodło: tryb %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Wyszukiwanie %s: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Odnalezienie %s się nie powiodło:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr "Używany jest przestarzały zewnętrzny generator zależności.\n"
 
@@ -1877,23 +1833,23 @@ msgstr ""
 "Odnaleziono bazę danych Packages BDB podczas próby użycia mechanizmu %s: "
 "używanie mechanizmu bdb.\n"
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 "%s jest pakietem RPM Delta i nie może zostać bezpośrednio zainstalowany\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Nieobsługiwane dane (%s) w pakiecie %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "pakiet %s został już dodany, pomijanie %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "pakiet %s został już dodany, zastępowanie %s\n"
@@ -2134,7 +2090,7 @@ msgstr "oczekiwano | na końcu wyrażenia"
 msgid "array iterator used with different sized arrays"
 msgstr "iterator tablicy użyty na tablicach o różnych rozmiarach"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr "wczytanie pliku makra %s się nie powiodło\n"
@@ -3546,7 +3502,7 @@ msgstr "Nie wywołano exec() po fork() w skrypcie Lua\n"
 msgid "Unable to restore current directory: %m"
 msgstr "Nie można przywrócić bieżącego katalogu: %m"
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr "Obsługa skryptów <lua> nie jest wbudowana\n"
 
@@ -3589,15 +3545,15 @@ msgstr "Skrypt %s się nie powiódł, stan wyjścia %d\n"
 msgid "Unknown format"
 msgstr "Nieznany format"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "instalacja"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "usunięcie"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr "rpmdb"
 
@@ -3711,11 +3667,11 @@ msgstr "brak podpisu"
 msgid "no digest"
 msgstr "brak skrótu"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "pominięto"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "się nie powiodło"
 
@@ -3757,6 +3713,67 @@ msgid "Failed to register fork handler: %m\n"
 msgstr ""
 "Zarejestrowanie programu obsługującego rozdzielanie się nie powiodło: %m\n"
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "błąd składni podczas przetwarzania ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "błąd składni podczas przetwarzania &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "błąd składni podczas przetwarzania ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "błąd przetwarzania w wyrażeniu\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "niesparowane (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- tylko na liczbach\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! tylko na liczbach\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "typy muszą się zgadzać\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / nie są obsługiwane dla ciągów\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- nie jest obsługiwane dla ciągów\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& i || nie są obsługiwane dla ciągów\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "błąd składni w wyrażeniu\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3767,57 +3784,52 @@ msgstr "%3d>%*s(puste)\n"
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(puste)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr "Makro %%%s ma niedozwoloną nazwę (%s)\n"
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr "Makro %%%s jest wbudowane (%s)\n"
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s ma niezakończone opcje\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s ma niezakończoną treść\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makro %%%s ma pustą treść\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr "Makro %%%s wymaga spacji przed treścią\n"
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Rozwinięcie makra %%%s się nie powiodło\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr "Określono makro %%%s, ale nie jest używane w ramach zakresu\n"
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Nieznana opcja %c w %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr "wczytanie pliku makra %s się nie powiodło"
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
@@ -3825,17 +3837,17 @@ msgstr ""
 "Za dużo poziomów rekurencji w rozwinięciu makra. Prawdopodobnie jest to "
 "spowodowane rekurencyjną deklaracją makra.\n"
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Niezakończone %c: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Makro niemożliwe do przetworzenia po %%\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktywne %d puste %d\n"
@@ -4075,6 +4087,9 @@ msgstr "%s: odczytanie manifestu się nie powiodło: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "bez sprawdzania podpisu nagłówka+danych"
 
+#~ msgid "failed to load macro file %s"
+#~ msgstr "wczytanie pliku makra %s się nie powiodło"
+
 #~ msgid "Exec of %s failed (%s): %s\n"
 #~ msgstr "Wykonanie %s się nie powiodło (%s): %s\n"
 
diff --git a/po/pt.po b/po/pt.po
index bfd8dadad9..15b72344e1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/rpm-team/rpm/language/"
@@ -631,31 +631,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "A executar(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Código de saída inválido do %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr ""
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -670,55 +670,6 @@ msgstr ""
 "\n"
 "Erros de criação do RPM:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "erro de sintaxe ao analisar o ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "erro de sintaxe ao analisar o &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "erro de sintaxe ao analisar o ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "erro de análise na expressão\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "( não correspondido\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- só em números\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! só em números\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "os tipos têm de corresponder\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / não suportados em cadeias de caracteres\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- não suportado em cadeias de caracteres\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& e || não suportados em cadeias de caracteres\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "erro de sintaxe na expressão\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -838,174 +789,179 @@ msgstr "Ficheiro não encontrado: %s\n"
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "%s: a leitura do manifesto falhou: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr ""
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "O ficheiro precisa de começar por \"/\": %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Ficheiro não encontrado pelo glob: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ficheiro inválido: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1139,18 +1095,18 @@ msgstr "falta a descrição no %%changelog\n"
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "linha %d: Erro ao analisar a %%description: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "linha %d: Opção inválida %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1363,42 +1319,42 @@ msgstr ""
 msgid "Bad source: %s: %s\n"
 msgstr "Código-fonte inválido: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Erro ao analisar o %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "linha %d: Argumento inválido para %%setup: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "linha %d: Opção inválida do %%setup %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "linha %d: segundo %%prep\n"
@@ -1483,17 +1439,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "linha %d: Segundo %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1508,76 +1464,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Incapaz de aceder ao %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: Descobri um %%else sem um %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "linha %d: Qualificadores %s: inválidos: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "linha %d: Opção inválida do %%setup %s: %s\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Não foram encontradas arquitecturas compatíveis para as quais criar\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "O pacote não tem uma %%description: %s\n"
@@ -1653,65 +1609,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr ""
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Não consegui executar o %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Não consegui executar à parte o %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Não consegui encontrar o %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1837,22 +1793,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
@@ -2093,7 +2049,7 @@ msgstr "esperado um | no fim da expressão"
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, fuzzy, c-format
 msgid "failed to load macro file %s\n"
 msgstr "Não consegui ler o ficheiro spec do %s\n"
@@ -3505,7 +3461,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3548,15 +3504,15 @@ msgstr ""
 msgid "Unknown format"
 msgstr ""
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr ""
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3670,11 +3626,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr ""
 
@@ -3715,6 +3671,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "erro de sintaxe ao analisar o ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "erro de sintaxe ao analisar o &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "erro de sintaxe ao analisar o ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "erro de análise na expressão\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "( não correspondido\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- só em números\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! só em números\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "os tipos têm de corresponder\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / não suportados em cadeias de caracteres\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- não suportado em cadeias de caracteres\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& e || não suportados em cadeias de caracteres\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "erro de sintaxe na expressão\n"
+
 #: rpmio/macro.c:334
 #, fuzzy, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3725,73 +3742,68 @@ msgstr "%3d>%*s(vazio)"
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(vazio)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, fuzzy, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr "A macro %%%s tem as opções incompletas\n"
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "A macro %%%s tem as opções incompletas\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "A macro %%%s tem o conteúdo incompleto\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "A macro %%%s tem o conteúdo em branco\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "A macro %%%s não conseguiu ser expandida\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Opção desconhecida %c em %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c não terminado: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Segue-se uma macro impossível de analisar ao %%\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== activo %d vazio %d\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c0c999543f..131324b761 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rpm-team/rpm/"
@@ -648,31 +648,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Executando (%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Status de saída de %s inválido (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Falha ao construir dependências:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -687,55 +687,6 @@ msgstr ""
 "\n"
 "Erros na construção do RPM:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "erro de sintaxe ao analisar ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "erro de sintaxe ao analisar &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "erro de sintaxe ao analisar ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "erro de análise na expressão\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "( sem correspondência\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- somente em números\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! somente em números\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "os tipos devem corresponder\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / não são suportados para strings\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- não é suportado para strings\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& e || não são suportados para strings\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "erro de sintaxe na expressão\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -857,152 +808,157 @@ msgstr "Arquivo não encontrado: %s\n"
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "%s: falha na leitura do manifesto: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s: não foi possível carregar a etiqueta desconhecida (%d).\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: falha ao ler a chave pública.\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: não é uma chave pública blindada.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s: falha ao codificar\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "falha ao criar o diretório"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "O arquivo precisa da \"/\" inicial: %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Não foi possível abrir %%files arquivo %s: %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "O arquivo não foi encontrado pelo glob: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Arquivo inválido: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Procurando por arquivos desempacotados: %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -1011,22 +967,22 @@ msgstr ""
 "Arquivo(s) instalado(s) (mas não empacotado(s)) encontrado(s):\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Processando arquivos: %s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Binários dependentes de arquitetura no pacote noarch\n"
 
@@ -1161,18 +1117,18 @@ msgstr "nenhuma descrição no %%changelog\n"
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "linha %d: Erro ao analisar %%description: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "linha %d: Opção inválida %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1385,42 +1341,42 @@ msgstr "%%{buildroot} não pode ser \"/\"\n"
 msgid "Bad source: %s: %s\n"
 msgstr "Fonte inválida: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "Nenhum número de patch %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "Nenhum número de fonte %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Erro ao analisar %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "linha %d: Argumento inválido para %%setup: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "linha %d: Opção inválida %s de %%setup: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "número da correção %s inválido: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "linha %d: segundo %%prep\n"
@@ -1505,17 +1461,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "linha %d: Segundo %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "linha %d: script interno não suportado: %s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1530,76 +1486,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Não foi possível abrir %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: Há um %%else sem um %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "linha %d: %s inválido: qualificadores: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "linha %d: Opção inválida %s de %%setup: %s\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Nenhuma arquitetura compatível encontrada para a construção\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "O pacote não tem %%description: %s\n"
@@ -1675,65 +1631,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr "Ignorar regex inválida %s\n"
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "Não foi possível criar um pipe para %s: %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Não foi possível executar %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Não foi possível bifurcar %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr "Os atributos do arquivo não foram configurados\n"
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) falhou: %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load falhou: %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "Falha no reconhecimento do arquivo \"%s\": modo %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Localizando %s: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Falha ao localizar %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1859,22 +1815,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s é um Delta RPM e não pode ser instalado diretamente\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Carga útil (%s) não suportada no pacote %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "o pacote %s já foi adicionado, ignorando %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "o pacote %s já foi adicionado, substituindo por %s\n"
@@ -2115,7 +2071,7 @@ msgstr "| esperado no fim da expressão"
 msgid "array iterator used with different sized arrays"
 msgstr "iterador da matriz utilizado com diferentes tamanhos de matrizes"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3527,7 +3483,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr "suporte a scriptlet <lua> não embutido\n"
 
@@ -3570,15 +3526,15 @@ msgstr "o scriptlet %s falhou, status de saída %d\n"
 msgid "Unknown format"
 msgstr "Formato desconhecido"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "instalar"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "apagar"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3692,11 +3648,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "ignorado"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "falhou"
 
@@ -3737,6 +3693,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "erro de sintaxe ao analisar ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "erro de sintaxe ao analisar &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "erro de sintaxe ao analisar ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "erro de análise na expressão\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "( sem correspondência\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- somente em números\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! somente em números\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "os tipos devem corresponder\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / não são suportados para strings\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- não é suportado para strings\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& e || não são suportados para strings\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "erro de sintaxe na expressão\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3747,73 +3764,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(vazio)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "O macro %%%s tem opções incompletas\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "O macro %%%s tem um corpo incompleto\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "O macro %%%s tem um corpo vazio\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "O macro %%%s falhou ao expandir\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Opção desconhecida %c em %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c incompleto: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Um %% é seguido por um macro não analisável\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== %d ativo %d vazio\n"
diff --git a/po/rpm.pot b/po/rpm.pot
index a71ccc7c8c..e329d50e11 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -610,31 +610,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr ""
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -646,55 +646,6 @@ msgid ""
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr ""
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr ""
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr ""
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr ""
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr ""
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr ""
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr ""
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr ""
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr ""
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -814,174 +765,179 @@ msgstr ""
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, c-format
+msgid "Can't read content of file: %s\n"
+msgstr ""
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr ""
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1115,18 +1071,18 @@ msgstr ""
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1339,42 +1295,42 @@ msgstr ""
 msgid "Bad source: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr ""
@@ -1459,17 +1415,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr ""
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1484,76 +1440,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr ""
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1629,65 +1585,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr ""
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1813,22 +1769,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
@@ -2069,7 +2025,7 @@ msgstr ""
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3463,7 +3419,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3506,15 +3462,15 @@ msgstr ""
 msgid "Unknown format"
 msgstr ""
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr ""
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3628,11 +3584,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr ""
 
@@ -3673,6 +3629,55 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+msgid "syntax error while parsing =="
+msgstr ""
+
+#: rpmio/expression.c:254
+msgid "syntax error while parsing &&"
+msgstr ""
+
+#: rpmio/expression.c:263
+msgid "syntax error while parsing ||"
+msgstr ""
+
+#: rpmio/expression.c:313
+msgid "parse error in expression"
+msgstr ""
+
+#: rpmio/expression.c:350
+msgid "unmatched ("
+msgstr ""
+
+#: rpmio/expression.c:382
+msgid "- only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:398
+msgid "! only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+msgid "types must match"
+msgstr ""
+
+#: rpmio/expression.c:457
+msgid "* and / not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:513
+msgid "- not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:670
+msgid "&& and || not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+msgid "syntax error in expression"
+msgstr ""
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3683,73 +3688,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 56d555b799..197af872af 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Russian (http://www.transifex.com/rpm-team/rpm/language/ru/)\n"
@@ -641,31 +641,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Выполняется(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Неверный код возврата из %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Неудовлетворенные зависимости сборки:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -680,55 +680,6 @@ msgstr ""
 "\n"
 "Ошибки сборки пакетов:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "синтаксическая ошибка при анализе ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "синтаксическая ошибка при анализе &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "синтаксическая ошибка при анализе ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "ошибка анализа выражения\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "незакрытая (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- только для чисел\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! только для чисел\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "типы должны совпадать\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / не поддерживается для строк\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- не поддерживается для строк\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& и || не поддерживаются для строк\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "синтаксическая ошибка в выражении\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -848,152 +799,157 @@ msgstr "Файл не найден: %s\n"
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "%s: ошибка чтения списка файлов: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: это не открытый ключ.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "не удалось создать каталог"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Файл должен начинаться с \"/\": %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Файл не найден: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Неверный файл %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Проверка на неупакованный(е) файл(ы): %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -1002,22 +958,22 @@ msgstr ""
 "Обнаружен(ы) установленный(е) (но не упакованный(е)) файл(ы):\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Двоичные данные с архитектурой в пакете noarch\n"
 
@@ -1151,18 +1107,18 @@ msgstr "нет описания в %%changelog\n"
 msgid "line %d: second %%changelog\n"
 msgstr "строка %d: %%changelog повторно\n"
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "строка %d: Ошибка анализа %%description: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "строка %d: Неверный параметр %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1375,42 +1331,42 @@ msgstr "%%{buildroot} не может быть \"/\"\n"
 msgid "Bad source: %s: %s\n"
 msgstr "Неверный исходник: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "Нет заплаты номер %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "Нет исходника номер %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Ошибка анализа %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "строка %d: Неверный аргумент для %%setup %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "строка %d: Неверный параметр %%setup %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "строка %d: второй %%prep\n"
@@ -1495,17 +1451,17 @@ msgstr "строка %d: Приоритеты разрешены только д
 msgid "line %d: Second %s\n"
 msgstr "строка %d: Второе %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1520,76 +1476,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Невозможно открыть %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr "%s:%d: Для %s требуется аргумент\n"
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: Найден %%else без %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "строка %d: %s: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%s:%d: плохое %%if условие\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr "кодировка %s не поддерживается системой\n"
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Не найдены совместимые архитектуры для сборки.\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Пакет не имеет %%description: %s\n"
@@ -1665,65 +1621,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr ""
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Невозможно выполнить %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Сбой ветвления %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "%s не удалось: %x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr "не удалось записать все данные в %s: %s\n"
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Идет поиск  %s: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Невозможно найти %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1850,22 +1806,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s является Delta RPM и не может быть установлен напрямую\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "пакет %s был уже добавлен, пропускаем %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "пакет %s уже был добавлен, заменяется %s\n"
@@ -2106,7 +2062,7 @@ msgstr "в конце выражения ожидался \"|\""
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3508,7 +3464,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3551,15 +3507,15 @@ msgstr ""
 msgid "Unknown format"
 msgstr "Неизвестный формат"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "установить"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "стереть"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3673,11 +3629,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "пропущено"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "не удалось"
 
@@ -3718,6 +3674,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "синтаксическая ошибка при анализе ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "синтаксическая ошибка при анализе &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "синтаксическая ошибка при анализе ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "ошибка анализа выражения\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "незакрытая (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- только для чисел\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! только для чисел\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "типы должны совпадать\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / не поддерживается для строк\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- не поддерживается для строк\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& и || не поддерживаются для строк\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "синтаксическая ошибка в выражении\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3728,73 +3745,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(пусто)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Незакрытые параметры в макросе %%%s\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Незакрытый макрос %%%s\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Макрос %%%s пуст\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Невозможно раскрыть макрос %%%s\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Неизвестный параметр %c в %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Незакрытая %c: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "непонятный макрос после %%\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "====================== активных %d пустых %d\n"
diff --git a/po/sk.po b/po/sk.po
index 0711f1d4db..bfba899c11 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:50+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Slovak (http://www.transifex.com/rpm-team/rpm/language/sk/)\n"
@@ -635,31 +635,31 @@ msgstr "Spec možnosti:"
 msgid "no arguments given for parse"
 msgstr "žiadne argumenty pre parsovanie"
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr "Nie je možné otvoriť dočasný súbor: %s\n"
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr "Nie je možné otvoriť prúd: %s\n"
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Vykonávanie(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Chybný návratový kód z %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Chybné závislosti pri zostavovaní:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -674,55 +674,6 @@ msgstr ""
 "\n"
 "Chyby zostavenia RPM:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "chyba syntaxe pri spracovaní ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "chyba syntaxe pri spracovaní &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "chyba syntaxe pri spracovaní ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "chyba spracovania vo výraze\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "nedoplnená (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- len na číslach\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! len na číslach\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "typy musia súhlasiť\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / nie sú podporované pre reťazce\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- nie je podporované pre reťazce\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& a || nie sú podporované pre reťazce\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "chyba syntaxe vo výraze\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -842,152 +793,157 @@ msgstr "Súbor nenájdený: %s\n"
 msgid "Not a directory: %s\n"
 msgstr "Toto nie je adresár: %s\n"
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "Chyba čítania súboru politiky: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s: nie je možné načítať neznámu značku (%d).\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: čítanie verejného kľúča zlyhalo.\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: nie je obrnený verejný kľúč.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s: zlyhalo kódovanie\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "vytvorenie priečinka zlyhalo"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Súbor potrebuje úvodný \"/\": %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr "%%dev glob nie je povolený: %s\n"
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Nie je možné otvoriť %%files súbor %s: %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr "Chyba čítania %%files súboru %s: %m\n"
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Súbor nenájdený globom: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr "Viac než jeden súbor na riadku: %s\n"
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Zlý súbor: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Kontrolujú sa nezabalené súbory: %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -996,22 +952,22 @@ msgstr ""
 "Nájdené nainštalované (ale nezabalené) súbory:\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Spracovávajú sa súbory: %s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Binárky závislé na architektúre v bezarchitektúrnom balíčku\n"
 
@@ -1145,18 +1101,18 @@ msgstr "žiadny popis v %%changelog\n"
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "riadok %d: Chyba pri parsovaní %%description: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "riadok %d: zlá možnosť %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1369,42 +1325,42 @@ msgstr "%%{buildroot} nemôže byť \"/\"\n"
 msgid "Bad source: %s: %s\n"
 msgstr "Zlý zdroj: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "Bez čísla záplaty %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "Bez čísla zdroja %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Chyba pri parsovaní %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "riadok %d: Zlý parameter v %%setup: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "riadok %d: Zlá možnosť v %%setup %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "Neplatné číslo záplaty %s: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "riadok %d: druhý %%prep\n"
@@ -1489,17 +1445,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "riadok %d: Druhý %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "riadok %d: nepodporovaný interný skript: %s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr "riadok %d: argumenty interpretera nie sú v triggeroch povolené: %s\n"
@@ -1514,76 +1470,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Nie je možné otvoriť %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr "%s:%d: Očakávaný argument pre %s\n"
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr "riadok %d: neuzatvorené makro alebo zlá náväznosť riadka\n"
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: %%else bez počiatočného %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "riadok %d: %s: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%s:%d: zlá kondícia %%if\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Nenájdené žiadne kompatibilné architektúry pre zostavenie\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Balíček neobsahuje %%description: %s\n"
@@ -1660,65 +1616,65 @@ msgstr "Vykonávaná politika: %s\n"
 msgid "Ignoring invalid regex %s\n"
 msgstr "Ignorovanie neplatného regexu %s\n"
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "Nie je možné vytvoriť rúru pre %s: %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Nie je možné spustiť %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Nie je možné vykonať fork %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "%s zlyhalo: %x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr "nie je možné zapísať všetky dáta do %s: %s\n"
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr "Klasifikátor prázdneho súboru\n"
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr "Nenastavené žiadne atribúty\n"
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) zlyhalo: %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load zlyhal: %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "Rozpoznávanie súboru \"%s\" zlyhalo: režim %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Hľadá sa  %s: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Zlyhalo vyhľadávanie %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1844,22 +1800,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s je Delta RPM a nemôže byž priamo inštalovaný\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Nepodporovaný payload (%s) v balíčku %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "balíček %s už bol pridaný, %s sa preskakuje\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "balíček %s už bol pridaný, nahradzuje sa s %s\n"
@@ -2100,7 +2056,7 @@ msgstr "| očakávené na konci výrazu"
 msgid "array iterator used with different sized arrays"
 msgstr "iterátor poľa použitý s poľami inej veľkosti"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3501,7 +3457,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr "Nie je možné obnoviť aktuálny priečinok: %m"
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr "nie je zabudovaná podpora pre skriptlety <lua>\n"
 
@@ -3544,15 +3500,15 @@ msgstr "%s skriplet zlyhal, návratový kód: %d\n"
 msgid "Unknown format"
 msgstr "Neznámy formát"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "inštalovať"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "zmazať"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3666,11 +3622,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "preskočené"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "zlyhané"
 
@@ -3711,6 +3667,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "chyba syntaxe pri spracovaní ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "chyba syntaxe pri spracovaní &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "chyba syntaxe pri spracovaní ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "chyba spracovania vo výraze\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "nedoplnená (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- len na číslach\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! len na číslach\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "typy musia súhlasiť\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / nie sú podporované pre reťazce\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- nie je podporované pre reťazce\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& a || nie sú podporované pre reťazce\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "chyba syntaxe vo výraze\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3721,57 +3738,52 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(prázdne)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s má neukončené parametre\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s má neukončené telo\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makro %%%s má prázdné telo\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Zlyhalo vyhodnotenie makra %%%s\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Neznáma možnosť %c v %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
@@ -3779,17 +3791,17 @@ msgstr ""
 "Príliž veľa úrovní rekurzie v rozbaľovaní makra. Zrejme je to spôsobené "
 "vyhlásením rekurzívneho makra.\n"
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Neukončené %c: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Po %% nasleduje nespracovateľné makro\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktívnych %d prázdnych %d\n"
diff --git a/po/sl.po b/po/sl.po
index d6d379391f..19097a8470 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:51+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Slovenian (http://www.transifex.com/rpm-team/rpm/language/"
@@ -614,31 +614,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Izvajanje(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr ""
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -650,55 +650,6 @@ msgid ""
 "RPM build errors:\n"
 msgstr ""
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr ""
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr ""
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr ""
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr ""
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr ""
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr ""
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr ""
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr ""
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr ""
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -818,174 +769,179 @@ msgstr ""
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "odpiranje %s je bilo neuspešno: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr ""
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1119,18 +1075,18 @@ msgstr ""
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1343,42 +1299,42 @@ msgstr ""
 msgid "Bad source: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr ""
@@ -1463,17 +1419,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr ""
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1488,76 +1444,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Ni možno odpreti %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "vrstica %d: Napačno število %s: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1633,65 +1589,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr ""
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1819,22 +1775,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
@@ -2075,7 +2031,7 @@ msgstr "na koncu izraza je pričakovan |"
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3475,7 +3431,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3518,15 +3474,15 @@ msgstr ""
 msgid "Unknown format"
 msgstr ""
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr ""
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3640,11 +3596,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr ""
 
@@ -3685,6 +3641,57 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+msgid "syntax error while parsing =="
+msgstr ""
+
+#: rpmio/expression.c:254
+msgid "syntax error while parsing &&"
+msgstr ""
+
+#: rpmio/expression.c:263
+msgid "syntax error while parsing ||"
+msgstr ""
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "v izrazu je pričakovan ?"
+
+#: rpmio/expression.c:350
+msgid "unmatched ("
+msgstr ""
+
+#: rpmio/expression.c:382
+msgid "- only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:398
+msgid "! only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+msgid "types must match"
+msgstr ""
+
+#: rpmio/expression.c:457
+msgid "* and / not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:513
+msgid "- not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:670
+msgid "&& and || not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "v izrazu je pričakovan ?"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3695,73 +3702,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(prazni)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktivni %d prazni %d\n"
diff --git a/po/sr.po b/po/sr.po
index 714b78c5bf..c57c90a8dd 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Serbian (http://www.transifex.com/rpm-team/rpm/language/sr/)\n"
@@ -625,31 +625,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Извршавам(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Лош статус излаза из %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Неуспело прављење зависности:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -664,55 +664,6 @@ msgstr ""
 "\n"
 "Грешке RPM прављења:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "синтаксна грешка при рашчлањивању ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "синтаксна грешка при рашчлањивању &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "синтаксна грешка при рашчлањивању ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "грешка рашчлањивања у изразу\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "неупарена (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- само код бројева\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! само код бројева\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "врсте се морају поклапати\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / није подржано за стрингове\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- није подржано за стрингове\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& и || нису подржани за стрингове\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "синтаксна грешка у изразу\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -832,152 +783,157 @@ msgstr "Датотека није пронађена: %s\n"
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "%s: неуспело читање манифеста: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s: не могу да учитам непознату ознаку (%d).\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: неуспело читање јавног кључа.\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: јавни кључ није ојачан.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "неуспело креирање директоријума"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Испред датотеке је потребно да стоји „/“: %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Не могу да отворим %%files датотеку %s: %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Датотека није пронађена поклапањем: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Лоша датотека: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Проверавам за незапаковане датотеке: %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -986,22 +942,22 @@ msgstr ""
 "Пронађене су инсталиране (али незапаковане) датотеке:\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Бинарне датотеке зависне од архитектуре у noarch пакету\n"
 
@@ -1135,18 +1091,18 @@ msgstr "нема описа у %%changelog\n"
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "ред %d: Грешка при тумачењу %%description: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "ред %d: Лоша опција %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1359,42 +1315,42 @@ msgstr "%%{buildroot} не може бити „/“\n"
 msgid "Bad source: %s: %s\n"
 msgstr "Лош извор: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "Нема закрпе број %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "Нема извора број %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Грешка у тумачењу %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "ред %d: Лош аргумент за %%setup: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "ред %d: Лоша %%setup опција %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "Неисправан број закрпе %s: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "ред %d: други %%prep\n"
@@ -1479,17 +1435,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "ред %d: Други %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "ред %d: неподржана интерна скрипта: %s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1504,76 +1460,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Не могу да отворим %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: Добио %%else без %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "ред %d: Лоши %s: квалификатори: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "ред %d: Лоша %%setup опција %s: %s\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Нису пронађене усаглашене архитектуре за прављење\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Пакет нема %%description: %s\n"
@@ -1649,65 +1605,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "Не могу да направим цев за %s: %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Не могу да извршим %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Не могу да одвојим %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) није успело: %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load није успело: %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "Препознавање датотеке „%s“ није успело: режим %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Проналазак %s: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Неуспело тражење %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1833,22 +1789,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s је Делта RPM и не може се директно инсталирати\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Неподржан терет (%s) у пакету %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "пакет %s је већ додат, прескачем %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "пакет %s је већ додат, замењујем са %s\n"
@@ -2089,7 +2045,7 @@ msgstr "| очекиван на крају израза"
 msgid "array iterator used with different sized arrays"
 msgstr "показивач низа коришћен са низовима различитих величина"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, fuzzy, c-format
 msgid "failed to load macro file %s\n"
 msgstr "Неуспело читање датотеке спецификације из %s\n"
@@ -3500,7 +3456,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr "није уграђена подршка <lua> скриптица\n"
 
@@ -3543,15 +3499,15 @@ msgstr "%s скриптица није успела, излазни статус
 msgid "Unknown format"
 msgstr "Непознат облик"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr ""
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3666,11 +3622,11 @@ msgstr "(није OpenPGP потпис)"
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr ""
 
@@ -3711,6 +3667,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "синтаксна грешка при рашчлањивању ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "синтаксна грешка при рашчлањивању &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "синтаксна грешка при рашчлањивању ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "грешка рашчлањивања у изразу\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "неупарена (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- само код бројева\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! само код бројева\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "врсте се морају поклапати\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / није подржано за стрингове\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- није подржано за стрингове\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& и || нису подржани за стрингове\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "синтаксна грешка у изразу\n"
+
 #: rpmio/macro.c:334
 #, fuzzy, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3721,73 +3738,68 @@ msgstr "%3d>%*s(празно)"
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(празно)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, fuzzy, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr "Макро %%%s има незавршене опције\n"
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Макро %%%s има незавршене опције\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Макро %%%s има незавршено тело\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Макро %%%s има празно тело\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Макро %%%s није могао да се прошири\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Непозната опција %c у %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Неограничено %c: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "%% је праћена са макроом кога није могуће рашчланити\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== активно %d празно %d\n"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 545831a5ec..8c9121adf9 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/rpm-team/rpm/"
@@ -627,31 +627,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Izvršavam(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Loš status izlaza iz %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Neuspelo pravljenje zavisnosti:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -666,55 +666,6 @@ msgstr ""
 "\n"
 "Greške RPM pravljenja:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "sintaksna greška pri raščlanjivanju ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "sintaksna greška pri raščlanjivanju &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "sintaksna greška pri raščlanjivanju ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "greška raščlanjivanja u izrazu\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "neuparena (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- samo kod brojeva\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! samo kod brojeva\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "vrste se moraju poklapati\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / nije podržano za stringove\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- nije podržano za stringove\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& i || nisu podržani za stringove\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "sintaksna greška u izrazu\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -834,152 +785,157 @@ msgstr "Datoteka nije pronađena: %s\n"
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "%s: neuspelo čitanje manifesta: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s: ne mogu da učitam nepoznatu oznaku (%d).\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: neuspelo čitanje javnog ključa.\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: javni ključ nije ojačan.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "neuspelo kreiranje direktorijuma"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Ispred datoteke je potrebno da stoji „/“: %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Ne mogu da otvorim %%files datoteku %s: %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Datoteka nije pronađena poklapanjem: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Loša datoteka: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Proveravam za nezapakovane datoteke: %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -988,22 +944,22 @@ msgstr ""
 "Pronađene su instalirane (ali nezapakovane) datoteke:\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Binarne datoteke zavisne od arhitekture u noarch paketu\n"
 
@@ -1137,18 +1093,18 @@ msgstr "nema opisa u %%changelog\n"
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "red %d: Greška pri tumačenju %%description: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "red %d: Loša opcija %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1361,42 +1317,42 @@ msgstr "%%{buildroot} ne može biti „/“\n"
 msgid "Bad source: %s: %s\n"
 msgstr "Loš izvor: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "Nema zakrpe broj %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "Nema izvora broj %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Greška u tumačenju %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "red %d: Loš argument za %%setup: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "red %d: Loša %%setup opcija %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "Neispravan broj zakrpe %s: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "red %d: drugi %%prep\n"
@@ -1481,17 +1437,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "red %d: Drugi %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "red %d: nepodržana interna skripta: %s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1506,76 +1462,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Ne mogu da otvorim %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: Dobio %%else bez %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "red %d: Loši %s: kvalifikatori: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "red %d: Loša %%setup opcija %s: %s\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Nisu pronađene usaglašene arhitekture za pravljenje\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paket nema %%description: %s\n"
@@ -1651,65 +1607,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "Ne mogu da napravim cev za %s: %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Ne mogu da izvršim %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Ne mogu da odvojim %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) nije uspelo: %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load nije uspelo: %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "Prepoznavanje datoteke „%s“ nije uspelo: režim %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Pronalazak %s: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Neuspelo traženje %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1835,22 +1791,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s je Delta RPM i ne može se direktno instalirati\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Nepodržan teret (%s) u paketu %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "paket %s je već dodat, preskačem %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "paket %s je već dodat, zamenjujem sa %s\n"
@@ -2091,7 +2047,7 @@ msgstr "| očekivan na kraju izraza"
 msgid "array iterator used with different sized arrays"
 msgstr "pokazivač niza korišćen sa nizovima različitih veličina"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, fuzzy, c-format
 msgid "failed to load macro file %s\n"
 msgstr "Neuspelo čitanje datoteke specifikacije iz %s\n"
@@ -3503,7 +3459,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr "nije ugrađena podrška <lua> skriptica\n"
 
@@ -3546,15 +3502,15 @@ msgstr "%s skriptica nije uspela, izlazni status %d\n"
 msgid "Unknown format"
 msgstr "Nepoznat oblik"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr ""
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3669,11 +3625,11 @@ msgstr "(nije OpenPGP potpis)"
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr ""
 
@@ -3714,6 +3670,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "sintaksna greška pri raščlanjivanju ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "sintaksna greška pri raščlanjivanju &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "sintaksna greška pri raščlanjivanju ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "greška raščlanjivanja u izrazu\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "neuparena (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- samo kod brojeva\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! samo kod brojeva\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "vrste se moraju poklapati\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / nije podržano za stringove\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- nije podržano za stringove\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& i || nisu podržani za stringove\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "sintaksna greška u izrazu\n"
+
 #: rpmio/macro.c:334
 #, fuzzy, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3724,73 +3741,68 @@ msgstr "%3d>%*s(prazno)"
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(prazno)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, fuzzy, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr "Makro %%%s ima nezavršene opcije\n"
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makro %%%s ima nezavršene opcije\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makro %%%s ima nezavršeno telo\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makro %%%s ima prazno telo\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makro %%%s nije mogao da se proširi\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Nepoznata opcija %c u %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Neograničeno %c: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "%% je praćena sa makroom koga nije moguće raščlaniti\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktivno %d prazno %d\n"
diff --git a/po/sv.po b/po/sv.po
index fcdbca32b3..2fffab4819 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-11-26 04:02+0000\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish (http://www.transifex.com/rpm-team/rpm/language/sv/)\n"
@@ -634,31 +634,31 @@ msgstr "Spec-flaggor:"
 msgid "no arguments given for parse"
 msgstr "inga parametrar angivna för tolkning"
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr "Kan inte öppna temporär fil: %s\n"
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr "Kan inte öppna ström: %s\n"
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Kör(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Dålig slutstatus från %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Ouppfyllda byggberoenden:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr "sätter %s=%s\n"
@@ -673,55 +673,6 @@ msgstr ""
 "\n"
 "RPM-byggfel:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "syntaxfel vid tolkning av ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "syntaxfel vid tolkning av &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "syntaxfel vid tolkning av ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "tolkningsfel i uttryck\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "ensam (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- endast i tal\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! endast på tal\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "typer måste passa ihop\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / stöds inte för strängar\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- stöds inte för strängar\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& och || stöds inte för strängar\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "syntaxfel i uttryck\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -841,153 +792,158 @@ msgstr "Filen hittades inte: %s\n"
 msgid "Not a directory: %s\n"
 msgstr "Inte en katalog: %s\n"
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "Misslyckades med att läsa policyfil: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s: kan inte läsa okänd tagg (%d).\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: läsning av publik nyckel misslyckades.\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: inte en publik nyckel med skal.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s: misslyckades att koda\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr "misslyckad symlänk"
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr "Dubblerat bygg-id, stat %s: %m\n"
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr "Dubblerade bygg-id:n %s och %s\n"
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr "makrot _build_id_links är inte satt, antar ”compat”\n"
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr "makrot _build_id_links är satt till det okända värdet ”%s”\n"
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr "fel när bygg-id lästes i %s: %s\n"
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr "Bygg-id saknas i %s\n"
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr "Bygg-id hittat i %s är för litet\n"
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr "Bygg-id hittat i %s är för stort\n"
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "misslyckades att skapa katalog"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr "Blandning av huvud-ELF och felsökningsfiler i paketet"
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Filen behöver inledande ”/”: %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr "%%dev-matchning inte tillåten: %s\n"
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 "Hittade ingen katalog vid matchningen: %s.  Försöker utan att matcha.\n"
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr "Hittade ingen fil vid matchningen: %s.  Försöker utan att matcha.\n"
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Kunde inte öppna %%files-fil %s: %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr "Tom %%files-fil %s\n"
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr "Fel vid läsning av %%files-fil %s: %m\n"
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr "ogiltigt _docdir_fmt: %s: %s\n"
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Hittade ingen fil vid matchningen: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr "Specialfil i genererad fillista: %s\n"
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr "Kan inte blanda special %s med andra former: %s\n"
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr "Mer än en fil på en rad: %s\n"
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr "Att generera bygg-id-länkar misslyckades\n"
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Felaktig fil: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Letar efter opackade fil(er): %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -996,22 +952,22 @@ msgstr ""
 "Installerade (men opaketerade) filer funna:\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr "%s mappades till flera filnamn"
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Bearbetar filer: %s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr "Binärers arkitektur (%d) matchar inte paketarkitekturen (%d).\n"
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Arkitekturberoende binärfiler i noarch-paket\n"
 
@@ -1145,18 +1101,18 @@ msgstr "ingen beskrivning i %%changelog\n"
 msgid "line %d: second %%changelog\n"
 msgstr "rad %d: andra %%changelog\n"
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "rad %d: Fel i tolkning av %%description: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "rad %d: otillåten flagga %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1369,42 +1325,42 @@ msgstr "%%{buildroot} kan inte vara ”/”\n"
 msgid "Bad source: %s: %s\n"
 msgstr "Dålig källa: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "Inget patch-nummer %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "Inget källkodsnummer %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Fel i tolkning av %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "rad %d: Felaktigt argument till %%setup: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "rad %d: Felaktig %%setup-flagga %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "Felaktigt patch-nummer %s: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "rad %d: andra %%prep\n"
@@ -1489,17 +1445,17 @@ msgstr "rad %d: prioriteter är endast tillåta för filutlösare: %s\n"
 msgid "line %d: Second %s\n"
 msgstr "rad %d: En andra %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "rad %d: ej stött internt skript: %s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr "rad %d: filtriggervillkor måste börja med ”/”: %s"
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr "rad %d: argument till tolken tillåts inte i utlösare: %s\n"
@@ -1514,76 +1470,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr "Makro expanderat i kommentar på rad %d: %s\n"
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Kan inte öppna %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr "%s:%d: Argument förväntades för %s\n"
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr "rad %d: Oavslutat %%if\n"
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr "rad %d: oavslutat makro eller felaktig fortsättning på rad\n"
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: Fick ett %%else utan något %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "rad %d: %s: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%s:%d: felaktigt %%if-villkor\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr "%s:%d: felformaterad %%include-sats\n"
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr "kodningen %s stödjs inte av systemet\n"
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr "Paketet %s: felaktig %s-kodning i %s: %s — %s\n"
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr "rad %d: %%end tar inte några argument: %s\n"
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr "rad %d: %%end förväntades inte här, ingen sektion att avsluta: %s\n"
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr "rad %d tillhör inte någon sektion: %s\n"
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Hittade inga kompatibla arkitekturer att bygga\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paketet har ingen %%description: %s\n"
@@ -1660,65 +1616,65 @@ msgstr "Bearbetning policyer: %s\n"
 msgid "Ignoring invalid regex %s\n"
 msgstr "Ignorerar ogiltigt reguttr %s\n"
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "Kunde inte öppna rör för %s: %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Kunde inte köra %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Kunde inte grena (fork) %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "%s misslyckades: %x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr "misslyckades med att skriva all data till %s: %s\n"
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr "Tom filklassificerare\n"
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr "Inga filattribut konfigurerade\n"
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) misslyckades: %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load misslyckades: %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "Igenkänning av filen ”%s” misslyckades: läge %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Letar efter %s: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Misslyckades med att hitta %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr "Föråldrad extern beroendegenerator används!\n"
 
@@ -1844,22 +1800,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s är en delta-RPM och kan inte installeras direkt\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Ej stödd last (%s) i paket %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "paket %s var redan tillagt, hoppar över %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "paket %s är redan tillagt, ersätter med %s\n"
@@ -2100,7 +2056,7 @@ msgstr "| förväntades vid slutet på uttryck"
 msgid "array iterator used with different sized arrays"
 msgstr "vektoriterator använd med vektor av annan storlek"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3502,7 +3458,7 @@ msgstr "Ingen exec() anropad efter fork() i lua-skript\n"
 msgid "Unable to restore current directory: %m"
 msgstr "Det går inte att återställa aktuell katalog: %m"
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr "<lua>-skriptstöd är inte inbyggt\n"
 
@@ -3545,15 +3501,15 @@ msgstr "%s-skript misslyckades, slutstatus %d\n"
 msgid "Unknown format"
 msgstr "Okänt format"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "installera"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "radera"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3667,11 +3623,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "hoppade över"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "misslyckades"
 
@@ -3712,6 +3668,67 @@ msgstr "Misslyckades med att initiera NSS-biblioteket\n"
 msgid "Failed to register fork handler: %m\n"
 msgstr "Misslyckades med att registrera greningshanteraren: %m\n"
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "syntaxfel vid tolkning av ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "syntaxfel vid tolkning av &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "syntaxfel vid tolkning av ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "tolkningsfel i uttryck\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "ensam (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- endast i tal\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! endast på tal\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "typer måste passa ihop\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / stöds inte för strängar\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- stöds inte för strängar\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& och || stöds inte för strängar\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "syntaxfel i uttryck\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3722,57 +3739,52 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(tom)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr "Makrot %%%s har ett otillåtet namn (%s)\n"
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Makrot %%%s har oavslutade flaggor\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Makrot %%%s har oavslutad kropp\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Makrot %%%s har tom kropp\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr "Makrot %%%s måste ha blanksteg före kroppen\n"
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Makro %%%s misslyckades att expandera\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr "Makrot %%%s definierat men inte använt i sin räckvidd\n"
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Okänd flagga %c i %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr "misslyckades med att läsa in makrofilen %s"
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
@@ -3780,17 +3792,17 @@ msgstr ""
 "Alltför många nivåer av rekursion i en makroexpansion.  Det beror sannolikt "
 "på en rekursiv makrodeklaration.\n"
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Oavslutad %c: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Ett %% följs av ett makro som inte kan tolkas\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== aktiva %d tomma %d\n"
@@ -4030,6 +4042,9 @@ msgstr "%s: läsning av paketlista misslyckades: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "verifiera inte huvud+lastsignatur"
 
+#~ msgid "failed to load macro file %s"
+#~ msgstr "misslyckades med att läsa in makrofilen %s"
+
 #~ msgid "Exec of %s failed (%s): %s\n"
 #~ msgstr "Körning (exec) av %s misslyckades (%s): %s\n"
 
diff --git a/po/te.po b/po/te.po
index 7e9717e65c..07e5e71a87 100644
--- a/po/te.po
+++ b/po/te.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:51+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Telugu (http://www.transifex.com/rpm-team/rpm/language/te/)\n"
@@ -614,31 +614,31 @@ msgstr ""
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr ""
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -653,55 +653,6 @@ msgstr ""
 "\n"
 "RPM నిర్మాణ దోషాలు:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr ""
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr ""
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr ""
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr ""
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr ""
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr ""
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr ""
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr ""
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr ""
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr ""
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -821,174 +772,179 @@ msgstr "ఫైలు కనపడలేదు: %s\n"
 msgid "Not a directory: %s\n"
 msgstr ""
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, c-format
+msgid "Can't read content of file: %s\n"
+msgstr ""
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr ""
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr ""
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr ""
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "చెడ్డ ఫైలు: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1122,18 +1078,18 @@ msgstr ""
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr ""
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1346,42 +1302,42 @@ msgstr ""
 msgid "Bad source: %s: %s\n"
 msgstr "చెడ్డ వనరు: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr ""
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr ""
@@ -1466,17 +1422,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr ""
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr ""
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1491,76 +1447,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr ""
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr ""
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr ""
@@ -1636,65 +1592,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr ""
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr ""
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1820,22 +1776,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
@@ -2076,7 +2032,7 @@ msgstr ""
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3470,7 +3426,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3513,15 +3469,15 @@ msgstr ""
 msgid "Unknown format"
 msgstr ""
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr ""
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr ""
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3635,11 +3591,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr ""
 
@@ -3680,6 +3636,55 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+msgid "syntax error while parsing =="
+msgstr ""
+
+#: rpmio/expression.c:254
+msgid "syntax error while parsing &&"
+msgstr ""
+
+#: rpmio/expression.c:263
+msgid "syntax error while parsing ||"
+msgstr ""
+
+#: rpmio/expression.c:313
+msgid "parse error in expression"
+msgstr ""
+
+#: rpmio/expression.c:350
+msgid "unmatched ("
+msgstr ""
+
+#: rpmio/expression.c:382
+msgid "- only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:398
+msgid "! only on numbers"
+msgstr ""
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+msgid "types must match"
+msgstr ""
+
+#: rpmio/expression.c:457
+msgid "* and / not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:513
+msgid "- not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:670
+msgid "&& and || not supported for strings"
+msgstr ""
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+msgid "syntax error in expression"
+msgstr ""
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3690,73 +3695,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr ""
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr ""
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr ""
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr ""
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr ""
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr ""
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr ""
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 5b39b10c8c..621544576c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:51+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Turkish (http://www.transifex.com/rpm-team/rpm/language/tr/)\n"
@@ -639,31 +639,31 @@ msgstr "Belirtim seçenekleri:"
 msgid "no arguments given for parse"
 msgstr ""
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr ""
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr ""
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "%s icra ediliyor: %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "%s çıkışında hata (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr ""
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -678,55 +678,6 @@ msgstr ""
 "\n"
 "RPM derleme hataları:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "== çözümlenirken sözdizimi hatası bulundu\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "&& çözümlenirken sözdizimi hatası bulundu\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "|| çözümlenirken sözdizimi hatası bulundu\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "ifadede çözümleme hatası\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "uyumsuz (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- sadece sayılarda\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! sadece sayılarda\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "türler eşleşmeli\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / dizgelerde desteklenmez\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- dizgelerde desteklenmez\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& ve || dizgelerde desteklenmez\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "ifadede sözdizimi hatası\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -846,174 +797,179 @@ msgstr "Dosya bulunamadı: %s\n"
 msgid "Not a directory: %s\n"
 msgstr "Dizin değil: %s\n"
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "dosyaların sahipleri doğrulanmaz"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr ""
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: genel anahtar okuması başarısız oldu.\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s: kodlama başarısız oldu\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr ""
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Dosya \"/\" ile içermeli: %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr ""
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr ""
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr ""
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Dosya glob tarafından bulunamadı: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr ""
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Dosya hatalı: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Dosyalar işleniyor: %s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1147,18 +1103,18 @@ msgstr "%%changelog içinde açıklama yok\n"
 msgid "line %d: second %%changelog\n"
 msgstr ""
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "satır %d: %%description ayrıştırılırken hata: %s \n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "satır %d: %s seçeneği hatalı: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1371,42 +1327,42 @@ msgstr ""
 msgid "Bad source: %s: %s\n"
 msgstr "Kaynak hatalı: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr ""
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "%%setup çözümlenirken hata: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "satır %d: %%setup argumanı hatalı: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "satır %d: %%setup seçeneği %s hatalı: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "Geçersiz yama numarası %s: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "satır %d: %%prep saniye\n"
@@ -1491,17 +1447,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "satır %d: %s saniye\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "satır %d: desteklenmeyen içsel betik: %s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1516,76 +1472,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "%s açılamadı: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr ""
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr ""
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: %%if'siz bir  %%else alındı\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "satır %d: %s hatalı: niteleyiciler: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "satır %d: %%setup seçeneği %s hatalı: %s\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr ""
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr ""
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Kurgulamak için uyumlu mimari yok\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Paket %%description içermiyor: %s\n"
@@ -1661,65 +1617,65 @@ msgstr ""
 msgid "Ignoring invalid regex %s\n"
 msgstr ""
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr ""
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "%s icra edilemedi: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "%s ayrılamadı: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr ""
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr ""
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr ""
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr ""
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "%s bulunamadı:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1845,22 +1801,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
@@ -2101,7 +2057,7 @@ msgstr "ifadenin sonunda | gerekli"
 msgid "array iterator used with different sized arrays"
 msgstr ""
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3501,7 +3457,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr ""
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 
@@ -3544,15 +3500,15 @@ msgstr ""
 msgid "Unknown format"
 msgstr "Bilinmeyen biçim"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "kur"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "sil"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3666,11 +3622,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "atlandı"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "başarısız oldu"
 
@@ -3711,6 +3667,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "== çözümlenirken sözdizimi hatası bulundu\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "&& çözümlenirken sözdizimi hatası bulundu\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "|| çözümlenirken sözdizimi hatası bulundu\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "ifadede çözümleme hatası\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "uyumsuz (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- sadece sayılarda\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! sadece sayılarda\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "türler eşleşmeli\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / dizgelerde desteklenmez\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- dizgelerde desteklenmez\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& ve || dizgelerde desteklenmez\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "ifadede sözdizimi hatası\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3721,73 +3738,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(boş)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "%%%s makrosunu seçenekleri sonlandırılmamış\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "%%%s makrosunun gövdesi sonlandırılmamış\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "%%%s makrosu boş\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr ""
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "%%%s makrosu genişletmede başarısız\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "%c seçeneği %s(%s) de anlaşılamadı\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr "makro dosyası %s'in yüklenmesi başarısız oldu"
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr ""
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c sonlandırılmamış: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Bir ayrıştırılamayan makro tarafından bir %% izlendi\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== %d etkin %d boş\n"
@@ -4027,6 +4039,9 @@ msgstr ""
 msgid "don't verify header+payload signature"
 msgstr ""
 
+#~ msgid "failed to load macro file %s"
+#~ msgstr "makro dosyası %s'in yüklenmesi başarısız oldu"
+
 #~ msgid "Exec of %s failed (%s): %s\n"
 #~ msgstr "%s 'in icrası başarısız (%s): %s\n"
 
diff --git a/po/uk.po b/po/uk.po
index 83d64f8457..a6099be841 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:51+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/rpm-team/rpm/language/"
@@ -655,31 +655,31 @@ msgstr "Параметри spec:"
 msgid "no arguments given for parse"
 msgstr "не вказано аргументів обробки"
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr "Не вдалося відкрити файл тимчасових даних: %s\n"
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr "Не вдалося відкрити потік даних: %s\n"
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Виконання(%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Отримано стан виходу з помилкою від %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Не вдалося зібрати залежності:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -694,55 +694,6 @@ msgstr ""
 "\n"
 "Помилки збирання RPM:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "синтаксична помилка під час обробки ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "синтаксична помилка під час обробки &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "синтаксична помилка під час обробки ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "помилка обробки у виразі\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "незакрита дужка (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- лише для чисел\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! лише для чисел\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "типи мають збігатися\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / не підтримується для рядків\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- не підтримується для рядків\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& і || не підтримуються для рядків\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "синтаксична помилка у виразі\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -864,152 +815,157 @@ msgstr "Файл не знайдено: %s\n"
 msgid "Not a directory: %s\n"
 msgstr "Не є каталогом: %s\n"
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "Не вдалося прочитати файл правил: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s: не вдалося завантажити невідомий теґ (%d).\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: невдала спроба читання відкритого ключа.\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: не є захищеним відкритим ключем.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s: не вдалося закодувати\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "не вдалося створити каталог"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Назва файла має починатися з «/»: %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr "Не можна використовувати glob %%dev: %s\n"
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Не вдалося відкрити файл %%files %s: %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr "Порожній файл %%files %s\n"
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr "Помилка під час спроби читання файла %%files %s: %m\n"
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr "некоректний формат каталогу документації %s: %s\n"
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "У glob файла не виявлено: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr "Не можна змішувати спеціальний %s з іншими формами: %s\n"
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr "Декілька файлів у одному рядку: %s\n"
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Помилковий файл: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Пошук незапакованих файлів: %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -1018,24 +974,24 @@ msgstr ""
 "Виявлено встановлені (але не запаковані) файли:\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Обробка файлів: %s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 "Архітектура виконуваних файлів (%d) не збігається з архітектурою пакунка "
 "(%d).\n"
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Виявлено залежні від архітектури бінарні файли у пакунку noarch\n"
 
@@ -1169,18 +1125,18 @@ msgstr "у %%changelog не вказано опису\n"
 msgid "line %d: second %%changelog\n"
 msgstr "рядок %d: другий запис %%changelog\n"
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "рядок %d: помилка під час обробки %%description: %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "рядок %d: помилковий параметр %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1393,42 +1349,42 @@ msgstr "%%{buildroot} не може приймати значення «/»\n"
 msgid "Bad source: %s: %s\n"
 msgstr "Помилкове джерело: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "Латки з номером %u не існує\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "Джерела з номером %u не існує\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Помилка під час обробки %%setup: %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "рядок %d: помилковий аргумент %%setup: %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "рядок %d: помилковий параметр %%setup %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "Некоректний номер латки %s: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "рядок %d: друге %%prep\n"
@@ -1516,17 +1472,17 @@ msgstr ""
 msgid "line %d: Second %s\n"
 msgstr "рядок %d: друге %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "рядок %d: непідтримуваний вбудований скрипт: %s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr ""
@@ -1543,76 +1499,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr "Макрос розгорнуто у коментарі у рядку %d: %s\n"
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Не вдалося відкрити %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr "%s:%d: мало бути вказано аргумент для %s\n"
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr "рядок %d: незавершена команда %%if\n"
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr "рядок %d: незавершений макрос або помилкове продовження рядка\n"
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: вказано %%else без %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "рядок %d: %s: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%s:%d: помилкова умова %%if\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr "%s:%d: помилкове форматування інструкції %%include\n"
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr "у системі не передбачено підтримки кодування %s\n"
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr "Пакунок %s: некоректне кодування %s у %s: %s - %s\n"
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Не знайдено сумісних архітектур для збирання\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "У пакунка немає поля %%description: %s\n"
@@ -1690,65 +1646,65 @@ msgstr "Обробка правил: %s\n"
 msgid "Ignoring invalid regex %s\n"
 msgstr "Ігноруємо некоректний формальний вираз %s\n"
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "Не вдалося створити канал для %s: %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Не вдалося виконати %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Не вдалося розгалуження %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "Помилка %s: %x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr "Не вдалося записати всі дані до %s: %s\n"
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr "Порожній класифікатор файла\n"
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr "Не вказано атрибутів файла\n"
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "помилка magic_open(0x%x): %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "помилка magic_load: %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "Спроба розпізнавання файла «%s» зазнала невдачі: режим %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Пошук %s: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Не вдалося знайти %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1877,23 +1833,23 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr ""
 "%s належить до типу Delta RPM, його не можна встановлювати безпосередньо\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Непідтримуваний вміст (%s) у пакунку %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "пакунок %s вже було додано, пропускаємо %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "пакунок %s вже було додано, замінюємо на %s\n"
@@ -2134,7 +2090,7 @@ msgstr "вираз має завершуватися символом |"
 msgid "array iterator used with different sized arrays"
 msgstr "ітератор масиву використано з двома масивами різної розмірності"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3549,7 +3505,7 @@ msgstr "У скрипті Lua не викликано exec() після fork()\n
 msgid "Unable to restore current directory: %m"
 msgstr "Не вдалося відновити поточний каталог: %m"
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr ""
 "підтримку допоміжних скриптів мовою <lua> не було передбачено під час "
@@ -3594,15 +3550,15 @@ msgstr "помилка допоміжного скрипту %s, стан вих
 msgid "Unknown format"
 msgstr "Невідомий формат"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "встановити"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "вилучити"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3716,11 +3672,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "пропущено"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "невдача"
 
@@ -3761,6 +3717,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "синтаксична помилка під час обробки ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "синтаксична помилка під час обробки &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "синтаксична помилка під час обробки ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "помилка обробки у виразі\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "незакрита дужка (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- лише для чисел\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! лише для чисел\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "типи мають збігатися\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / не підтримується для рядків\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- не підтримується для рядків\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& і || не підтримуються для рядків\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "синтаксична помилка у виразі\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3771,57 +3788,52 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(порожньо)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Запис параметрів макросу %%%s не завершено\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Запис макросу %%%s не завершено\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Тіло макросу %%%s є порожнім\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr "У макросі %%%s мало бути використано пробіл перед текстом макросу\n"
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Не вдалося розгорнути макрос %%%s\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr "Макрос %%%s визначено, але не використано у області видимості\n"
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Невідомий параметр %c у %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr "не вдалося завантажити файл макросу %s"
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
@@ -3829,17 +3841,17 @@ msgstr ""
 "Забагато рівнів вкладеності у макросі. Ймовірно, це викликано рекурсивним "
 "оголошенням макросу.\n"
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "Не закрито %c: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "За %% вказано непридатний до обробки макрос\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "=================== активних %d порожніх %d\n"
@@ -4080,6 +4092,9 @@ msgstr "%s: помилка читання маніфесту: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "не перевіряти підпис заголовка та вмісту"
 
+#~ msgid "failed to load macro file %s"
+#~ msgstr "не вдалося завантажити файл макросу %s"
+
 #~ msgid "Exec of %s failed (%s): %s\n"
 #~ msgstr "Не вдалося виконати %s (%s): %s\n"
 
diff --git a/po/vi.po b/po/vi.po
index 52b104ed24..bdd5060459 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2017-10-13 05:51+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/rpm-team/rpm/language/"
@@ -671,31 +671,31 @@ msgstr "Tùy chọn đặc tả:"
 msgid "no arguments given for parse"
 msgstr "chưa đưa ra đối số để phân tích"
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr "Không thể mở tập tin tạm: %s\n"
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr "Không thể mở luồng dữ liệu: %s\n"
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Đang thực hiện (%s): %s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Trạng thái thoát sai từ %s (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "Gặp lỗi khi xây dựng các thành phần phụ thuộc:\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr ""
@@ -710,55 +710,6 @@ msgstr ""
 "\n"
 "Lỗi xây dựng RPM:\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "gặp lỗi cú pháp khi phân tích ==\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "gặp lỗi cú pháp khi phân tích &&\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "gặp lỗi cú pháp khi phân tích ||\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "gặp lỗi phân tích trong biểu thức\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "có dấu ngoặc mở “(” lẻ đôi\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- chỉ với con số\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! chỉ với con số\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "các kiểu phải tương ứng\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / không được hỗ trợ cho chuỗi\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- không được hỗ trợ cho chuỗi\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& và || không được hỗ trợ cho chuỗi\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "gặp lỗi cú pháp trong biểu thức\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -878,152 +829,157 @@ msgstr "Không tìm thấy tập tin: %s\n"
 msgid "Not a directory: %s\n"
 msgstr "Không phải là một thư mục: %s\n"
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "Gặp lỗi khi đọc tập tin chính sách: %s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s: không thể nạp thẻ bất thường (%d).\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s: gặp lỗi khi đọc khóa công.\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: không phải là khóa công dạng văn bản.\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s: gặp lỗi khi giải mã\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr ""
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "gặp lỗi khi tạo thư mục"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Tập tin cần có dấu sổ chéo “/” đi trước: %s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr "không cho phép %%dev glob: %s\n"
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "Không thể mở tập tin %%files %s: %m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr "Tập tin %%files trống rỗng %s\n"
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr "Gặp lỗi khi đang đọc tập tin %%files %s: %m\n"
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr "_docdir_fmt không hợp lệ %s: %s\n"
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Glob (chức năng mở rộng mẫu khi tìm kiếm) không tìm thấy tập tin: %s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr "Không thể trộn lẫn %s đặc biệt với dạng khác: %s\n"
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr "Nhiều hơn một tập tin mỗi dòng: %s\n"
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Tập tin sai: %s: %s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Đang kiểm tra có tập tin chưa đóng gói: %s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -1032,22 +988,22 @@ msgstr ""
 "Tìm thấy tập tin đã cài đặt (nhưng chưa đóng gói):\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Đang xử lý tập tin: %s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr "Kiến trúc nhị phân (%d) không khớp với kiến trúc gói (%d).\n"
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Nhị phân phụ thuộc kiến trúc trong gói không phụ thuộc kiến trúc\n"
 
@@ -1181,18 +1137,18 @@ msgstr "không có mô tả trong bản ghi thay đổi (%%changelog)\n"
 msgid "line %d: second %%changelog\n"
 msgstr "dòng %d: %%changelog thứ hai\n"
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "dòng %d: Gặp lỗi khi phân tích mô tả (%%description): %s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "dòng %d: Tùy chọn sai %s: %s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1406,42 +1362,42 @@ msgstr "%%{buildroot} không thể là \"/\"\n"
 msgid "Bad source: %s: %s\n"
 msgstr "Nguồn sai: %s: %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "Không có miếng và số %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "Không có số nguồn %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "Lỗi phân tích thiết lập (%%setup): %s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "dòng %d: Đối số sai tới thiết lập (%%setup): %s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "dòng %d: Tùy chọn thiết lập (%%setup) sai %s: %s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "Miếng và sô %s không hợp lệ: %s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "dòng %d: chuẩn bị (%%prep) thứ hai\n"
@@ -1529,17 +1485,17 @@ msgstr "dòng %d: Ưu tiên chỉ cho phép với các bẫy tập tin: %s\n"
 msgid "line %d: Second %s\n"
 msgstr "dòng %d: %s thứ hai\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "dòng %d: văn lệnh nội bộ không được hỗ trợ: %s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr "dòng %d: phiên dịch tham số không được phép trong bẫy: %s\n"
@@ -1554,76 +1510,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr "Vĩ lệnh được khai triển trong phần ghi chú trên dòng %d: %s\n"
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "Không thể mở %s: %s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr "%s:%d: Cần đối số cho %s\n"
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr "dòng %d: Chưa đóng %%if\n"
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr "dòng %d: chưa đóng vĩ lệnh hoặc dòng kéo dài sai\n"
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d: Có một toán tử %%else (nếu không) mà không có %%if (nếu)\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "dòng %d: %s: %s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%s:%d: điều kiện %%if sai\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr "%s:%d: câu lệnh bao gồm (%%include) sai dạng\n"
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr "bảng mã %s không được hệ thống hỗ trợ\n"
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr "Gói %s: bảng mã %s không hợp lệ trong %s: %s - %s\n"
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "Không tìm thấy kiến trúc tương thích để xây dựng\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "Gói không có mô tả (%%description): %s\n"
@@ -1701,65 +1657,65 @@ msgstr "Thực hiện các chính sách: %s\n"
 msgid "Ignoring invalid regex %s\n"
 msgstr "Bỏ qua biểu thức chính quy không hợp lệ %s\n"
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "Không thể tạo ống dẫn cho %s: %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "Không thể thực hiện %s: %s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "Không thể tạo tiến trình con %s: %s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "%s bị lỗi: %x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr "gặp lỗi khi toàn bộ dữ liệu vào %s: %s\n"
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr "Phân loại tập tin trống rỗng\n"
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr "Chưa có các thuộc tính tập tin được cấu hình\n"
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) bị lỗi: %s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load gặp lỗi: %s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "Gặp lỗi khi chấp nhận tập tin \"%s\": chế độ %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "Đang tìm  %s: %s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "Gặp lỗi khi tìm %s:\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1885,22 +1841,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s là một Delta RPM và không thể được cài đặt trực tiếp\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "Không hỗ trợ phần tải (%s) trong gói %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "gói %s đã được thêm vào nên bỏ qua %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "gói %s đã được thêm vào nên thay thế bằng %s\n"
@@ -2141,7 +2097,7 @@ msgstr "cần ký hiệu ống dẫn “|” ở kết thúc của biểu thức
 msgid "array iterator used with different sized arrays"
 msgstr "đồ lặp lại mảng được sử dụng với các mảng có kích cỡ khác nhau"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3552,7 +3508,7 @@ msgstr "Không có lệnh gọi exec() sau fork() trong lua scriptlet\n"
 msgid "Unable to restore current directory: %m"
 msgstr "Không thể phục hồi thư mục hiện tại: %m"
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr "chưa hỗ trợ <lua> scriptlet dựng sẵn\n"
 
@@ -3595,15 +3551,15 @@ msgstr "%s scriptlet gặp lỗi, trạng thái thoát %d\n"
 msgid "Unknown format"
 msgstr "Không hiểu định dạng"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "cài đặt"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "tẩy"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3717,11 +3673,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "bị bỏ qua"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "gặp lỗi"
 
@@ -3762,6 +3718,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "gặp lỗi cú pháp khi phân tích ==\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "gặp lỗi cú pháp khi phân tích &&\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "gặp lỗi cú pháp khi phân tích ||\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "gặp lỗi phân tích trong biểu thức\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "có dấu ngoặc mở “(” lẻ đôi\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- chỉ với con số\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! chỉ với con số\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "các kiểu phải tương ứng\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / không được hỗ trợ cho chuỗi\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- không được hỗ trợ cho chuỗi\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& và || không được hỗ trợ cho chuỗi\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "gặp lỗi cú pháp trong biểu thức\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3772,58 +3789,53 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s (trống)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "Vĩ lệnh %%%s có tùy chọn chưa chấm dứt\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "Vĩ lệnh %%%s có thân chưa chấm dứt\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "Vĩ lệnh %%%s có thân rỗng\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr "Vĩ lệnh %%%s cần có dấu cách trước phần thân\n"
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "Vĩ lệnh %%%s không mở rộng được\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr ""
 "Vĩ lệnh %%%s được định nghĩa nhưng lại không được dùng trong phạm vi của nó\n"
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "Không hiểu tùy chọn %c trong %s(%s)\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr "gặp lỗi khi tải tập tin vĩ lệnh %s"
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
@@ -3831,17 +3843,17 @@ msgstr ""
 "Quá nhiều mức đệ quy trong khai triển vĩ lệnh. Nó giống như là có nguyên "
 "nhân bởi khai báo vĩ lệnh đệ quy.\n"
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "%c chưa chấm dứt: %s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "Một dấu %% đi trước một vĩ lệnh không thể phân tích được\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== hoạt động %d trống %d\n"
@@ -4083,6 +4095,9 @@ msgstr "%s: gặp lỗi khi đọc manifest: %s\n"
 msgid "don't verify header+payload signature"
 msgstr "không nên thẩm tra chữ ký phần_đầu+trọng_tải"
 
+#~ msgid "failed to load macro file %s"
+#~ msgstr "gặp lỗi khi tải tập tin vĩ lệnh %s"
+
 #~ msgid "Exec of %s failed (%s): %s\n"
 #~ msgstr "Gặp lỗi khi thực thi %s (%s): %s\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3e88580271..cab350dc88 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2018-11-08 09:09+0000\n"
 "Last-Translator: Taiki Akita <taiki_akita@163.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rpm-team/rpm/"
@@ -635,31 +635,31 @@ msgstr "Spec 选项："
 msgid "no arguments given for parse"
 msgstr "没有给出参数用于分析"
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr "无法打开临时文件：%s\n"
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr "无法打开流：%s\n"
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "正在执行(%s)：%s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "%s (%s) 退出状态不好\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "构建依赖失败：\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr "设置 %s=%s\n"
@@ -674,55 +674,6 @@ msgstr ""
 "\n"
 "RPM 构建错误：\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "== 语法解析错误\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "&& 语法解析错误\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "解析 || 时有语法错误\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "表达式解析错误\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "不匹配的 (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- 只用于数字\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! 只用于数字\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "类型必须匹配\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "* / 不支持字符串\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "- 不支持字符串\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "&& 和 || 不支持字符串\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "表达式语法错误\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -842,152 +793,157 @@ msgstr "没有找到文件：%s\n"
 msgid "Not a directory: %s\n"
 msgstr "此路径不是一个目录：%s\n"
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "无法读取策略文件：%s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s：无法加载未知标签(%d)。\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s：公钥读取失败。\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: 不是带装甲的(armored)公钥。\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s：编码失败\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr "无法创建符号连接"
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr ""
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr ""
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr ""
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr ""
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr ""
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr ""
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr ""
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr ""
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "创建目录失败"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr ""
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "文件需要 \"/\" 开头：%s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr "%%dev glob 不被允许：%s\n"
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr ""
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "无法打开 %%files 文件 %s：%m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr "空 %%file 文件 %s\n"
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr "读取 %%files 文件 %s 失败：%m\n"
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr "illegal _docdir_fmt %s: %s\n"
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "无法通过通配符查找文件：%s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr ""
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr "特殊 %s 与其他形式不能混合使用: %s\n"
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr "一行中有多个文件： %s\n"
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr ""
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "损坏的文件：%s：%s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "检查未打包文件：%s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -996,22 +952,22 @@ msgstr ""
 "发现已安装(但未打包的)文件：\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "处理文件：%s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr "二进制架构 (%d) 和软件包构架 (%d)不匹配。\n"
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "noarch 软件包中有架构相关的二进制文件\n"
 
@@ -1145,18 +1101,18 @@ msgstr "%%changelog 中没有描述\n"
 msgid "line %d: second %%changelog\n"
 msgstr "行 %d: 第二个 %%changelog\n"
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "行 %d：解析 %%description 时发生错误：%s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "行 %d：错误的选项 %s：%s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1369,42 +1325,42 @@ msgstr "%%{buildroot} 不能为 \"/\"\n"
 msgid "Bad source: %s: %s\n"
 msgstr "问题来源： %s： %s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "没有 %u 补丁\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "没有 %u 源码\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "解析 %%setup 时发生错误：%s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "行 %d：%%setup 中存在坏的参数：%s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "行 %d：错误的 %%setup 选项 %s：%s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s：%s：%s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "无效的补丁编号 %s：%s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "行 %d：第二个 %%prep\n"
@@ -1489,17 +1445,17 @@ msgstr "行 %d：仅文件触发器中允许使用优先级：%s\n"
 msgid "line %d: Second %s\n"
 msgstr "列 %d：第二个 %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "行 %d：不支持的内部脚本：%s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr ""
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr "行 %d：触发器中不允许使用解释器参数：%s\n"
@@ -1514,76 +1470,76 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr "展开行 %d 注释中的宏：%s\n"
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "不能打开 %s：%s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr "%s：%d：%s 需要参数\n"
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr "行 %d：未结束的 %%if\n"
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr "行 %d：宏未闭合，或换行文本出错\n"
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s：%d：有一个 %%else 没有对应的 %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "行 %d：%s：%s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%s：%d：%%if 条件句有误\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr "%s：%d：%%include 语句格式错误\n"
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr "系统不支持编码 %s\n"
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr "软件包 %s：无效的 %s 编码于 %s：%s - %s\n"
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr ""
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "没有找到可供构建的兼容构架\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "软件包没有 %%description：%s\n"
@@ -1659,65 +1615,65 @@ msgstr "处理策略：%s\n"
 msgid "Ignoring invalid regex %s\n"
 msgstr "忽略无效的正则表达式 %s\n"
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "无法为 %s建立管道： %m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "无法执行%s：%s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "无法抽取分支 %s：%s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "%s 失败：%x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr "无法写入所有的数据到 %s：%s\n"
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr "空文件分类\n"
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr "没有配置文件属性\n"
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) 失败：%s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load 失败：%s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "文件 \"%s\" 辨识失败：模式 %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "正在查找 %s：%s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "查找 %s 失败：\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr ""
 
@@ -1845,22 +1801,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s 是一个 Delta RPM 并且无法直接被安装。\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr ""
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "软件包 %s 已被加入，跳过 %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "软件包 %s 已被加入，以 %s 替换\n"
@@ -2101,7 +2057,7 @@ msgstr "| 预期于表达式结尾"
 msgid "array iterator used with different sized arrays"
 msgstr "使用不同大小数组的数组的迭代器"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3498,7 +3454,7 @@ msgstr ""
 msgid "Unable to restore current directory: %m"
 msgstr "无法恢复当前目录：%m"
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr "<lua> 脚本支持未内建\n"
 
@@ -3541,15 +3497,15 @@ msgstr "%s 脚本执行失败，退出状态码为 %d\n"
 msgid "Unknown format"
 msgstr "未知格式"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "安裝"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "删除"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3663,11 +3619,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "已跳过"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "已失败"
 
@@ -3708,6 +3664,67 @@ msgstr ""
 msgid "Failed to register fork handler: %m\n"
 msgstr ""
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "== 语法解析错误\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "&& 语法解析错误\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "解析 || 时有语法错误\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "表达式解析错误\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "不匹配的 (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- 只用于数字\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! 只用于数字\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "类型必须匹配\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "* / 不支持字符串\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "- 不支持字符串\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "&& 和 || 不支持字符串\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "表达式语法错误\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3718,73 +3735,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(清空)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "宏 %%%s 具有未结束的选项\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "宏 %%%s 主体未结束\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "宏 %%%s 中存在空内容\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr "宏 %%%s 在结构之前需要空格\n"
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "宏 %%%s 展开失败\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr "宏 %%%s 已经定义但是没有使用\n"
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "在 %2$s(%3$s) 中存在未知的选项 %1$c\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr "载入宏文件 %s 失败"
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr "宏扩展中存在太多层的递归。这有可能是由宏的递归声明引起的。\n"
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "未结束的 %c：%s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "在一个不可解析的宏之之后跟着 %%\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== 作用中 %d 清空 %d\n"
@@ -4024,6 +4036,9 @@ msgstr "%s：读取 manifest 文件失败：%s\n"
 msgid "don't verify header+payload signature"
 msgstr "不验证报头+净负荷签名"
 
+#~ msgid "failed to load macro file %s"
+#~ msgstr "载入宏文件 %s 失败"
+
 #~ msgid "Exec of %s failed (%s): %s\n"
 #~ msgstr "执行 %s 失败(%s)：%s\n"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 59da3dd1a2..9311405b0d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2019-06-26 17:41+0300\n"
+"POT-Creation-Date: 2019-08-28 11:48+0300\n"
 "PO-Revision-Date: 2018-04-23 12:38+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/rpm-team/rpm/"
@@ -619,31 +619,31 @@ msgstr "規格選項："
 msgid "no arguments given for parse"
 msgstr "沒有可供解析的參數"
 
-#: build/build.c:119
+#: build/build.c:118
 #, c-format
 msgid "Unable to open temp file: %s\n"
 msgstr "無法開啟暫存檔案：%s\n"
 
-#: build/build.c:124
+#: build/build.c:123
 #, c-format
 msgid "Unable to open stream: %s\n"
 msgstr "無法開啟串流：%s\n"
 
-#: build/build.c:157
+#: build/build.c:156
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "正在執行(%s)：%s\n"
 
-#: build/build.c:160
+#: build/build.c:159
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "來自 %s 不良的離開狀態 (%s)\n"
 
-#: build/build.c:234
+#: build/build.c:229
 msgid "Failed build dependencies:\n"
 msgstr "相依性建置失敗：\n"
 
-#: build/build.c:262
+#: build/build.c:260
 #, c-format
 msgid "setting %s=%s\n"
 msgstr "%s = %s 設定中\n"
@@ -658,55 +658,6 @@ msgstr ""
 "\n"
 "RPM 建置錯誤：\n"
 
-#: build/expression.c:215
-msgid "syntax error while parsing ==\n"
-msgstr "解析 == 時有語法錯誤\n"
-
-#: build/expression.c:245
-msgid "syntax error while parsing &&\n"
-msgstr "解析 && 時有語法錯誤\n"
-
-#: build/expression.c:254
-msgid "syntax error while parsing ||\n"
-msgstr "解析 || 時有語法錯誤\n"
-
-#: build/expression.c:304
-msgid "parse error in expression\n"
-msgstr "表述式解析錯誤\n"
-
-#: build/expression.c:340
-msgid "unmatched (\n"
-msgstr "不符合的 (\n"
-
-#: build/expression.c:372
-msgid "- only on numbers\n"
-msgstr "- 只能用於數字\n"
-
-#: build/expression.c:388
-msgid "! only on numbers\n"
-msgstr "! 只能用於數字\n"
-
-#: build/expression.c:434 build/expression.c:487 build/expression.c:550
-#: build/expression.c:647
-msgid "types must match\n"
-msgstr "類型必須符合\n"
-
-#: build/expression.c:447
-msgid "* / not suported for strings\n"
-msgstr "字串不支援 *、/\n"
-
-#: build/expression.c:503
-msgid "- not suported for strings\n"
-msgstr "字串不支援 -\n"
-
-#: build/expression.c:660
-msgid "&& and || not suported for strings\n"
-msgstr "字串不支援 && 和 ||\n"
-
-#: build/expression.c:695
-msgid "syntax error in expression\n"
-msgstr "表述式中有語法錯誤\n"
-
 #: build/files.c:343 build/files.c:524 build/files.c:743
 #, c-format
 msgid "Missing '(' in %s %s\n"
@@ -826,152 +777,157 @@ msgstr "找不到檔案：%s\n"
 msgid "Not a directory: %s\n"
 msgstr "不是一個目錄：%s\n"
 
-#: build/files.c:1617
+#: build/files.c:1578
+#, fuzzy, c-format
+msgid "Can't read content of file: %s\n"
+msgstr "無法讀取策略檔案：%s\n"
+
+#: build/files.c:1619
 #, c-format
 msgid "%s: can't load unknown tag (%d).\n"
 msgstr "%s：無法呼叫不明的標籤 (%d)。\n"
 
-#: build/files.c:1623
+#: build/files.c:1625
 #, c-format
 msgid "%s: public key read failed.\n"
 msgstr "%s：公鑰讀入失敗。\n"
 
-#: build/files.c:1627
+#: build/files.c:1629
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s：不是一個受保護的公鑰。\n"
 
-#: build/files.c:1636
+#: build/files.c:1638
 #, c-format
 msgid "%s: failed to encode\n"
 msgstr "%s：編碼失敗\n"
 
-#: build/files.c:1682
+#: build/files.c:1684
 msgid "failed symlink"
 msgstr "錯誤的軟連結"
 
-#: build/files.c:1738 build/files.c:1741
+#: build/files.c:1740 build/files.c:1743
 #, c-format
 msgid "Duplicate build-id, stat %s: %m\n"
 msgstr "重複的 build-id，狀態 %s：%m\n"
 
-#: build/files.c:1748
+#: build/files.c:1750
 #, c-format
 msgid "Duplicate build-ids %s and %s\n"
 msgstr "重複的 build-id %s 與 %s\n"
 
-#: build/files.c:1802
+#: build/files.c:1804
 msgid "_build_id_links macro not set, assuming 'compat'\n"
 msgstr "_build_id_links 巨集尚未設定，假設為「compat」\n"
 
-#: build/files.c:1815
+#: build/files.c:1817
 #, c-format
 msgid "_build_id_links macro set to unknown value '%s'\n"
 msgstr "_build_id_links 巨集設定了一個未知的值「%s」\n"
 
-#: build/files.c:1904
+#: build/files.c:1906
 #, c-format
 msgid "error reading build-id in %s: %s\n"
 msgstr "無法讀取 build-id 於 %s：%s\n"
 
-#: build/files.c:1908
+#: build/files.c:1910
 #, c-format
 msgid "Missing build-id in %s\n"
 msgstr "%s 遺失 build-id\n"
 
-#: build/files.c:1913
+#: build/files.c:1915
 #, c-format
 msgid "build-id found in %s too small\n"
 msgstr "%s 中找到的 build-id 太小\n"
 
-#: build/files.c:1914
+#: build/files.c:1916
 #, c-format
 msgid "build-id found in %s too large\n"
 msgstr "%s 中找到的 build-id 太大\n"
 
-#: build/files.c:1929 rpmio/rpmfileutil.c:443
+#: build/files.c:1931 rpmio/rpmfileutil.c:443
 msgid "failed to create directory"
 msgstr "無法建立目錄"
 
-#: build/files.c:1947
+#: build/files.c:1949
 msgid "Mixing main ELF and debug files in package"
 msgstr "在軟體包內混合主要 ELF 與偵錯檔案"
 
-#: build/files.c:2148
+#: build/files.c:2150
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "檔案需要以「/」開頭：%s\n"
 
-#: build/files.c:2172
+#: build/files.c:2174
 #, c-format
 msgid "%%dev glob not permitted: %s\n"
 msgstr "%%dev glob 尚未允許：%s\n"
 
-#: build/files.c:2184
+#: build/files.c:2186
 #, c-format
 msgid "Directory not found by glob: %s. Trying without globbing.\n"
 msgstr "無法透過 glob 找到資料夾：%s。嘗試以非 glob 方式搜尋。\n"
 
-#: build/files.c:2186
+#: build/files.c:2188
 #, c-format
 msgid "File not found by glob: %s. Trying without globbing.\n"
 msgstr "無法透過 glob 找到檔案：%s。嘗試以非 glob 方式搜尋。\n"
 
-#: build/files.c:2222
+#: build/files.c:2224
 #, c-format
 msgid "Could not open %%files file %s: %m\n"
 msgstr "無法開啟 %%files 檔案 %s：%m\n"
 
-#: build/files.c:2245
+#: build/files.c:2247
 #, c-format
 msgid "Empty %%files file %s\n"
 msgstr "空的 %%files 檔案 %s\n"
 
-#: build/files.c:2251
+#: build/files.c:2253
 #, c-format
 msgid "Error reading %%files file %s: %m\n"
 msgstr "讀取 %%files 檔案 %s 失敗：%m\n"
 
-#: build/files.c:2277
+#: build/files.c:2279
 #, c-format
 msgid "illegal _docdir_fmt %s: %s\n"
 msgstr "illegal _docdir_fmt %s: %s\n"
 
-#: build/files.c:2399 lib/rpminstall.c:461
+#: build/files.c:2401 lib/rpminstall.c:461
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "透過 glob 解析找不到檔案：%s\n"
 
-#: build/files.c:2486
+#: build/files.c:2488
 #, c-format
 msgid "Special file in generated file list: %s\n"
 msgstr "特殊檔案於生成的檔案列表：%s\n"
 
-#: build/files.c:2510
+#: build/files.c:2512
 #, c-format
 msgid "Can't mix special %s with other forms: %s\n"
 msgstr "無法將特殊 %s 與其他形式混合：%s\n"
 
-#: build/files.c:2526
+#: build/files.c:2528
 #, c-format
 msgid "More than one file on a line: %s\n"
 msgstr "一列上超過一個檔案：%s\n"
 
-#: build/files.c:2595
+#: build/files.c:2597
 msgid "Generating build-id links failed\n"
 msgstr "生成 build-id 連結時失敗\n"
 
-#: build/files.c:2712
+#: build/files.c:2714
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "不良檔案：%s：%s\n"
 
-#: build/files.c:2780
+#: build/files.c:2782
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "正在檢查未打包的檔案：%s\n"
 
-#: build/files.c:2793
+#: build/files.c:2795
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -980,22 +936,22 @@ msgstr ""
 "找到已安裝 (但未打包) 的檔案：\n"
 "%s"
 
-#: build/files.c:2908
+#: build/files.c:2910
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr "%s 被映射至多檔案名稱"
 
-#: build/files.c:3157
+#: build/files.c:3159
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "正在處理檔案：%s\n"
 
-#: build/files.c:3179
+#: build/files.c:3181
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr "二進位檔案架構 (%d) 無法符合軟體包架構 (%d)。\n"
 
-#: build/files.c:3185
+#: build/files.c:3187
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "noarch 軟體包中有架構依賴二進位檔\n"
 
@@ -1129,18 +1085,18 @@ msgstr "%%changelog 中沒有描述\n"
 msgid "line %d: second %%changelog\n"
 msgstr "第 %d 列：第二個 %%changelog\n"
 
-#: build/parseDescription.c:32
+#: build/parseDescription.c:33
 #, c-format
 msgid "line %d: Error parsing %%description: %s\n"
 msgstr "列 %d：解析 %%description 時發生錯誤：%s\n"
 
-#: build/parseDescription.c:45 build/parseFiles.c:46 build/parsePolicies.c:45
+#: build/parseDescription.c:46 build/parseFiles.c:46 build/parsePolicies.c:45
 #: build/parseScript.c:320
 #, c-format
 msgid "line %d: Bad option %s: %s\n"
 msgstr "列 %d：不良選項 %s：%s\n"
 
-#: build/parseDescription.c:56 build/parseFiles.c:57 build/parsePolicies.c:55
+#: build/parseDescription.c:57 build/parseFiles.c:57 build/parsePolicies.c:55
 #: build/parseScript.c:331
 #, c-format
 msgid "line %d: Too many names: %s\n"
@@ -1353,42 +1309,42 @@ msgstr "%%{buildroot} 不能為「/」\n"
 msgid "Bad source: %s: %s\n"
 msgstr "不良源碼：%s：%s\n"
 
-#: build/parsePrep.c:67
+#: build/parsePrep.c:68
 #, c-format
 msgid "No patch number %u\n"
 msgstr "沒有修補編號 %u\n"
 
-#: build/parsePrep.c:135
+#: build/parsePrep.c:137
 #, c-format
 msgid "No source number %u\n"
 msgstr "沒有源碼編號 %u\n"
 
-#: build/parsePrep.c:259
+#: build/parsePrep.c:261
 #, c-format
 msgid "Error parsing %%setup: %s\n"
 msgstr "解析 %%setup 時發生錯誤：%s\n"
 
-#: build/parsePrep.c:270
+#: build/parsePrep.c:272
 #, c-format
 msgid "line %d: Bad arg to %%setup: %s\n"
 msgstr "列 %d：%%setup 中出現不良引數：%s\n"
 
-#: build/parsePrep.c:285
+#: build/parsePrep.c:287
 #, c-format
 msgid "line %d: Bad %%setup option %s: %s\n"
 msgstr "列 %d：不良 %%setup 選項 %s：%s\n"
 
-#: build/parsePrep.c:455
+#: build/parsePrep.c:458
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s: %s: %s\n"
 
-#: build/parsePrep.c:468
+#: build/parsePrep.c:471
 #, c-format
 msgid "Invalid patch number %s: %s\n"
 msgstr "無效的修補編號 %s：%s\n"
 
-#: build/parsePrep.c:495
+#: build/parsePrep.c:498
 #, c-format
 msgid "line %d: second %%prep\n"
 msgstr "列 %d：第二個 %%prep\n"
@@ -1473,17 +1429,17 @@ msgstr "第 %d 列：優先級只允許在檔案觸發器上：%s\n"
 msgid "line %d: Second %s\n"
 msgstr "列 %d：第二個 %s\n"
 
-#: build/parseScript.c:371
+#: build/parseScript.c:374
 #, c-format
 msgid "line %d: unsupported internal script: %s\n"
 msgstr "列 %d：不支援的內部指令小稿：%s\n"
 
-#: build/parseScript.c:389
+#: build/parseScript.c:392
 #, c-format
 msgid "line %d: file trigger condition must begin with '/': %s"
 msgstr "第 %d 列：檔案觸發器條件必須以「/」為開頭：%s"
 
-#: build/parseScript.c:395
+#: build/parseScript.c:398
 #, c-format
 msgid "line %d: interpreter arguments not allowed in triggers: %s\n"
 msgstr "第 %d 列：「翻譯員」參數不允許在觸發器內：%s\n"
@@ -1498,80 +1454,80 @@ msgstr ""
 msgid "Macro expanded in comment on line %d: %s\n"
 msgstr "變數在第 %d 列的留言中擴展：%s\n"
 
-#: build/parseSpec.c:369
+#: build/parseSpec.c:385
 #, c-format
 msgid "Unable to open %s: %s\n"
 msgstr "無法開啟 %s：%s\n"
 
-#: build/parseSpec.c:403
+#: build/parseSpec.c:419
 #, c-format
 msgid "%s:%d: Argument expected for %s\n"
 msgstr "%s:%d：為 %s 的預料中參數\n"
 
-#: build/parseSpec.c:428
+#: build/parseSpec.c:444
 #, c-format
 msgid "line %d: Unclosed %%if\n"
 msgstr "第 %d 行：未關閉的 %%if\n"
 
-#: build/parseSpec.c:433
+#: build/parseSpec.c:449
 #, c-format
 msgid "line %d: unclosed macro or bad line continuation\n"
 msgstr ""
 "第 %d 行：未關閉的巨集、或是錯誤的變數被繼續。\n"
 "\n"
 
-#: build/parseSpec.c:464
+#: build/parseSpec.c:477
 #, fuzzy, c-format
 msgid "%s: line %d: %s with no %%if\n"
 msgstr "%s:%d：有個 %%else 沒有對應 %%if\n"
 
-#: build/parseSpec.c:467
+#: build/parseSpec.c:480
 #, fuzzy, c-format
 msgid "%s: line %d: %s after %s\n"
 msgstr "第 %d 行：%s：%s\n"
 
-#: build/parseSpec.c:494
+#: build/parseSpec.c:507
 #, fuzzy, c-format
 msgid "%s:%d: bad %s condition: %s\n"
 msgstr "%s:%d：錯誤的 %%if 條件\n"
 
-#: build/parseSpec.c:522
+#: build/parseSpec.c:535
 #, c-format
 msgid "%s:%d: malformed %%include statement\n"
 msgstr "%s:%d：異常的 %%include 聲明\n"
 
-#: build/parseSpec.c:750
+#: build/parseSpec.c:763
 #, c-format
 msgid "encoding %s not supported by system\n"
 msgstr ""
 "系統不支援編碼 %s\n"
 "\n"
 
-#: build/parseSpec.c:779
+#: build/parseSpec.c:792
 #, c-format
 msgid "Package %s: invalid %s encoding in %s: %s - %s\n"
 msgstr "%s 軟體包：於 %s: %s - %s 中無效的 %s 編碼\n"
 
-#: build/parseSpec.c:815
+#: build/parseSpec.c:828
 #, c-format
 msgid "line %d: %%end doesn't take any arguments: %s\n"
 msgstr "第 %d 行：%%end 沒有任何參數：%s\n"
 
-#: build/parseSpec.c:822
+#: build/parseSpec.c:835
 #, c-format
 msgid "line %d: %%end not expected here, no section to close: %s\n"
 msgstr "第 %d 行：非期望的 %%end，沒有區段供關閉：%s\n"
 
-#: build/parseSpec.c:838
+#: build/parseSpec.c:851
 #, c-format
 msgid "line %d doesn't belong to any section: %s\n"
 msgstr "第 %d 行並不屬於任何區段：%s\n"
 
-#: build/parseSpec.c:999
+#: build/parseSpec.c:1012
 msgid "No compatible architectures found for build\n"
 msgstr "找不到可供建置的相容架構\n"
 
-#: build/parseSpec.c:1041
+#: build/parseSpec.c:1067
 #, c-format
 msgid "Package has no %%description: %s\n"
 msgstr "軟體包沒有 %%description：%s\n"
@@ -1649,65 +1605,65 @@ msgstr "處理策略中：%s\n"
 msgid "Ignoring invalid regex %s\n"
 msgstr "忽略無效的正規表達式 %s\n"
 
-#: build/rpmfc.c:273
+#: build/rpmfc.c:274
 #, c-format
 msgid "Couldn't create pipe for %s: %m\n"
 msgstr "無法為 %s 建立導管：%m\n"
 
-#: build/rpmfc.c:296
+#: build/rpmfc.c:297
 #, c-format
 msgid "Couldn't exec %s: %s\n"
 msgstr "無法執行 %s：%s\n"
 
-#: build/rpmfc.c:301 lib/rpmscript.c:322
+#: build/rpmfc.c:302 lib/rpmscript.c:322
 #, c-format
 msgid "Couldn't fork %s: %s\n"
 msgstr "無法分支 %s：%s\n"
 
-#: build/rpmfc.c:385
+#: build/rpmfc.c:388
 #, c-format
 msgid "%s failed: %x\n"
 msgstr "%s 失敗：%x\n"
 
-#: build/rpmfc.c:389
+#: build/rpmfc.c:392
 #, c-format
 msgid "failed to write all data to %s: %s\n"
 msgstr "無法寫入所有資料至 %s：%s\n"
 
-#: build/rpmfc.c:1070
+#: build/rpmfc.c:1073
 msgid "Empty file classifier\n"
 msgstr "空的檔案分類\n"
 
-#: build/rpmfc.c:1079
+#: build/rpmfc.c:1082
 msgid "No file attributes configured\n"
 msgstr "無設定檔案特性\n"
 
-#: build/rpmfc.c:1103
+#: build/rpmfc.c:1106
 #, c-format
 msgid "magic_open(0x%x) failed: %s\n"
 msgstr "magic_open(0x%x) 失敗：%s\n"
 
-#: build/rpmfc.c:1109
+#: build/rpmfc.c:1112
 #, c-format
 msgid "magic_load failed: %s\n"
 msgstr "magic_load 失敗：%s\n"
 
-#: build/rpmfc.c:1152
+#: build/rpmfc.c:1155
 #, c-format
 msgid "Recognition of file \"%s\" failed: mode %06o %s\n"
 msgstr "檔案「%s」辨識失敗：模式 %06o %s\n"
 
-#: build/rpmfc.c:1353
+#: build/rpmfc.c:1356
 #, c-format
 msgid "Finding  %s: %s\n"
 msgstr "正在尋找 %s：%s\n"
 
-#: build/rpmfc.c:1362 build/rpmfc.c:1371
+#: build/rpmfc.c:1365 build/rpmfc.c:1374
 #, c-format
 msgid "Failed to find %s:\n"
 msgstr "找不到 %s：\n"
 
-#: build/rpmfc.c:1410
+#: build/rpmfc.c:1413
 msgid "Deprecated external dependency generator is used!\n"
 msgstr "不推薦使用外部的相依性生成器！\n"
 
@@ -1833,22 +1789,22 @@ msgid ""
 "Found BDB Packages database while attempting %s backend: using bdb backend.\n"
 msgstr ""
 
-#: lib/depends.c:93
+#: lib/depends.c:87
 #, c-format
 msgid "%s is a Delta RPM and cannot be directly installed\n"
 msgstr "%s 為增量 RPM 且不能直接安裝\n"
 
-#: lib/depends.c:97
+#: lib/depends.c:91
 #, c-format
 msgid "Unsupported payload (%s) in package %s\n"
 msgstr "不支援的有效負荷 (%s) 於套件 %s\n"
 
-#: lib/depends.c:378
+#: lib/depends.c:362
 #, c-format
 msgid "package %s was already added, skipping %s\n"
 msgstr "軟體包 %s 已被加入，跳過 %s\n"
 
-#: lib/depends.c:379
+#: lib/depends.c:363
 #, c-format
 msgid "package %s was already added, replacing with %s\n"
 msgstr "軟體包 %s 已被加入，以 %s 替換\n"
@@ -2089,7 +2045,7 @@ msgstr "| 預期於表述式的結尾"
 msgid "array iterator used with different sized arrays"
 msgstr "用於不同大小陣列的陣列迭代器"
 
-#: lib/poptALL.c:144
+#: lib/poptALL.c:144 rpmio/macro.c:1199
 #, c-format
 msgid "failed to load macro file %s\n"
 msgstr ""
@@ -3486,7 +3442,7 @@ msgstr "Lua 指令小稿 沒有任何 exec() 在 fork() 之後呼叫\n"
 msgid "Unable to restore current directory: %m"
 msgstr "無法恢復目前的目錄：%m"
 
-#: lib/rpmscript.c:162 rpmio/macro.c:1029
+#: lib/rpmscript.c:162 rpmio/macro.c:1030
 msgid "<lua> scriptlet support not built in\n"
 msgstr "<lua> 指令小稿 不支援內建\n"
 
@@ -3529,15 +3485,15 @@ msgstr "%s 指令小稿 失敗，離開狀態碼 %d\n"
 msgid "Unknown format"
 msgstr "未知格式"
 
-#: lib/rpmte.c:755
+#: lib/rpmte.c:757
 msgid "install"
 msgstr "安裝"
 
-#: lib/rpmte.c:756
+#: lib/rpmte.c:758
 msgid "erase"
 msgstr "抹除"
 
-#: lib/rpmte.c:757
+#: lib/rpmte.c:759
 msgid "rpmdb"
 msgstr ""
 
@@ -3651,11 +3607,11 @@ msgstr ""
 msgid "no digest"
 msgstr ""
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "skipped"
 msgstr "已跳過"
 
-#: lib/transaction.c:1540
+#: lib/transaction.c:1542
 msgid "failed"
 msgstr "已失敗"
 
@@ -3696,6 +3652,67 @@ msgstr "無法初始化 NSS 的函式庫\n"
 msgid "Failed to register fork handler: %m\n"
 msgstr "無法註冊 fork 處理器：%m\n"
 
+#: rpmio/expression.c:224
+#, fuzzy
+msgid "syntax error while parsing =="
+msgstr "解析 == 時有語法錯誤\n"
+
+#: rpmio/expression.c:254
+#, fuzzy
+msgid "syntax error while parsing &&"
+msgstr "解析 && 時有語法錯誤\n"
+
+#: rpmio/expression.c:263
+#, fuzzy
+msgid "syntax error while parsing ||"
+msgstr "解析 || 時有語法錯誤\n"
+
+#: rpmio/expression.c:313
+#, fuzzy
+msgid "parse error in expression"
+msgstr "表述式解析錯誤\n"
+
+#: rpmio/expression.c:350
+#, fuzzy
+msgid "unmatched ("
+msgstr "不符合的 (\n"
+
+#: rpmio/expression.c:382
+#, fuzzy
+msgid "- only on numbers"
+msgstr "- 只能用於數字\n"
+
+#: rpmio/expression.c:398
+#, fuzzy
+msgid "! only on numbers"
+msgstr "! 只能用於數字\n"
+
+#: rpmio/expression.c:444 rpmio/expression.c:497 rpmio/expression.c:560
+#: rpmio/expression.c:657
+#, fuzzy
+msgid "types must match"
+msgstr "類型必須符合\n"
+
+#: rpmio/expression.c:457
+#, fuzzy
+msgid "* and / not supported for strings"
+msgstr "字串不支援 *、/\n"
+
+#: rpmio/expression.c:513
+#, fuzzy
+msgid "- not supported for strings"
+msgstr "字串不支援 -\n"
+
+#: rpmio/expression.c:670
+#, fuzzy
+msgid "&& and || not supported for strings"
+msgstr "字串不支援 && 和 ||\n"
+
+#: rpmio/expression.c:705 rpmio/expression.c:749
+#, fuzzy
+msgid "syntax error in expression"
+msgstr "表述式中有語法錯誤\n"
+
 #: rpmio/macro.c:334
 #, c-format
 msgid "%3d>%*s(empty)\n"
@@ -3706,73 +3723,68 @@ msgstr ""
 msgid "%3d<%*s(empty)\n"
 msgstr "%3d<%*s(清空)\n"
 
-#: rpmio/macro.c:597
+#: rpmio/macro.c:598
 #, c-format
 msgid "Macro %%%s has illegal name (%s)\n"
 msgstr "巨集 %%%s 擁有非法名稱（%s）\n"
 
-#: rpmio/macro.c:602
+#: rpmio/macro.c:603
 #, c-format
 msgid "Macro %%%s is a built-in (%s)\n"
 msgstr ""
 
-#: rpmio/macro.c:647
+#: rpmio/macro.c:648
 #, c-format
 msgid "Macro %%%s has unterminated opts\n"
 msgstr "巨集 %%%s 具有未終結的選項\n"
 
-#: rpmio/macro.c:658 rpmio/macro.c:695
+#: rpmio/macro.c:659 rpmio/macro.c:696
 #, c-format
 msgid "Macro %%%s has unterminated body\n"
 msgstr "巨集 %%%s 具有未終結的主體\n"
 
-#: rpmio/macro.c:715
+#: rpmio/macro.c:716
 #, c-format
 msgid "Macro %%%s has empty body\n"
 msgstr "巨集 %%%s 具有空的主體\n"
 
-#: rpmio/macro.c:720
+#: rpmio/macro.c:721
 #, c-format
 msgid "Macro %%%s needs whitespace before body\n"
 msgstr "巨集 %%%s 需要在內容以前有一個空白\n"
 
-#: rpmio/macro.c:724
+#: rpmio/macro.c:725
 #, c-format
 msgid "Macro %%%s failed to expand\n"
 msgstr "巨集 %%%s 展開時失敗\n"
 
-#: rpmio/macro.c:811
+#: rpmio/macro.c:812
 #, c-format
 msgid "Macro %%%s defined but not used within scope\n"
 msgstr "巨集 %%%s 被定義但未使用於 scope 中\n"
 
-#: rpmio/macro.c:935
+#: rpmio/macro.c:936
 #, c-format
 msgid "Unknown option %c in %s(%s)\n"
 msgstr "在 %2$s(%3$s) 中有未知的選項 %1$c\n"
 
-#: rpmio/macro.c:1190
-#, c-format
-msgid "failed to load macro file %s"
-msgstr "無法載入巨集檔案 %s"
-
-#: rpmio/macro.c:1270
+#: rpmio/macro.c:1279
 msgid ""
 "Too many levels of recursion in macro expansion. It is likely caused by "
 "recursive macro declaration.\n"
 msgstr "巨集附加元件中太多遞迴階級。這可能是因為遞迴巨集聲明而造成。\n"
 
-#: rpmio/macro.c:1329 rpmio/macro.c:1344
+#: rpmio/macro.c:1338 rpmio/macro.c:1353
 #, c-format
 msgid "Unterminated %c: %s\n"
 msgstr "未終結的 %c：%s\n"
 
-#: rpmio/macro.c:1375
+#: rpmio/macro.c:1384
 #, c-format
 msgid "A %% is followed by an unparseable macro\n"
 msgstr "在無法解析的巨集之後跟著一個 %%\n"
 
-#: rpmio/macro.c:1703
+#: rpmio/macro.c:1712
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr "======================== 作用中 %d 清空 %d\n"
@@ -4012,6 +4024,9 @@ msgstr "%s：讀取清單失敗：%s\n"
 msgid "don't verify header+payload signature"
 msgstr "不驗證表頭+酬載簽署"
 
+#~ msgid "failed to load macro file %s"
+#~ msgstr "無法載入巨集檔案 %s"
+
 #~ msgid "Exec of %s failed (%s): %s\n"
 #~ msgstr "執行 %s 失敗 (%s)：%s\n"
 
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index cedd784de7..a093e31ad5 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -16,7 +16,7 @@ AM_CPPFLAGS += -DLOCALSTATEDIR="\"$(localstatedir)\""
 usrlibdir = $(libdir)
 usrlib_LTLIBRARIES = librpmio.la
 librpmio_la_SOURCES = \
-	argv.c base64.c digest.h digest.c macro.c \
+	argv.c base64.c digest.h digest.c expression.c macro.c \
 	rpmhook.c rpmio.c rpmlog.c rpmmalloc.c \
 	rpmpgp.c rpmsq.c rpmsw.c url.c \
 	rpmio_internal.h rpmhook.h \
diff --git a/build/expression.c b/rpmio/expression.c
similarity index 85%
rename from build/expression.c
rename to rpmio/expression.c
index f0d4dcf5cf..193ae303ca 100644
--- a/build/expression.c
+++ b/rpmio/expression.c
@@ -14,7 +14,7 @@
 #include "system.h"
 
 #include <rpm/rpmlog.h>
-#include "build/rpmbuild_internal.h"
+#include <rpm/rpmmacro.h>
 #include "debug.h"
 
 /* #define DEBUG_PARSER 1 */
@@ -102,11 +102,20 @@ static void valueDump(const char *msg, Value v, FILE *fp)
  */
 typedef struct _parseState {
     char *str;		/*!< expression string */
-    char *p;		/*!< current position in expression string */
+    const char *p;	/*!< current position in expression string */
     int nextToken;	/*!< current lookahead token */
     Value tokenValue;	/*!< valid when TOK_INTEGER or TOK_STRING */
 } *ParseState;
 
+static void exprErr(const struct _parseState *state, const char *msg,
+		    const char *p)
+{
+    rpmlog(RPMLOG_ERR, "%s: %s\n", msg, state->str);
+    if (p) {
+	int l = p - state->str + strlen(msg) + 2;
+	rpmlog(RPMLOG_ERR, "%*s\n", l, "^");
+    }
+}
 
 /**
  * \name Parser tokens
@@ -179,7 +188,7 @@ static int rdToken(ParseState state)
 {
   int token;
   Value v = NULL;
-  char *p = state->p;
+  const char *p = state->p;
 
   /* Skip whitespace before the next token. */
   while (*p && risspace(*p)) p++;
@@ -212,7 +221,7 @@ static int rdToken(ParseState state)
       token = TOK_EQ;
       p++;
     } else {
-      rpmlog(RPMLOG_ERR, _("syntax error while parsing ==\n"));
+      exprErr(state, _("syntax error while parsing =="), p+2);
       goto err;
     }
     break;
@@ -242,7 +251,7 @@ static int rdToken(ParseState state)
       token = TOK_LOGICAL_AND;
       p++;
     } else {
-      rpmlog(RPMLOG_ERR, _("syntax error while parsing &&\n"));
+      exprErr(state, _("syntax error while parsing &&"), p+2);
       goto err;
     }
     break;
@@ -251,7 +260,7 @@ static int rdToken(ParseState state)
       token = TOK_LOGICAL_OR;
       p++;
     } else {
-      rpmlog(RPMLOG_ERR, _("syntax error while parsing ||\n"));
+      exprErr(state, _("syntax error while parsing ||"), p+2);
       goto err;
     }
     break;
@@ -301,7 +310,7 @@ static int rdToken(ParseState state)
       free(temp);
 
     } else {
-      rpmlog(RPMLOG_ERR, _("parse error in expression\n"));
+      exprErr(state, _("parse error in expression"), p+1);
       goto err;
     }
   }
@@ -322,6 +331,7 @@ static int rdToken(ParseState state)
 
 static Value doLogical(ParseState state);
 
+
 /**
  * @param state		expression parser state
  */
@@ -337,7 +347,7 @@ static Value doPrimary(ParseState state)
       goto err;
     v = doLogical(state);
     if (state->nextToken != TOK_CLOSE_P) {
-      rpmlog(RPMLOG_ERR, _("unmatched (\n"));
+      exprErr(state, _("unmatched ("), NULL);
       goto err;
     }
     if (rdToken(state))
@@ -369,7 +379,7 @@ static Value doPrimary(ParseState state)
       goto err;
 
     if (! valueIsInteger(v)) {
-      rpmlog(RPMLOG_ERR, _("- only on numbers\n"));
+      exprErr(state, _("- only on numbers"), NULL);
       goto err;
     }
 
@@ -385,7 +395,7 @@ static Value doPrimary(ParseState state)
       goto err;
 
     if (! valueIsInteger(v)) {
-      rpmlog(RPMLOG_ERR, _("! only on numbers\n"));
+      exprErr(state, _("! only on numbers"), NULL);
       goto err;
     }
 
@@ -431,7 +441,7 @@ static Value doMultiplyDivide(ParseState state)
       goto err;
 
     if (! valueSameType(v1, v2)) {
-      rpmlog(RPMLOG_ERR, _("types must match\n"));
+      exprErr(state, _("types must match"), NULL);
       goto err;
     }
 
@@ -444,7 +454,7 @@ static Value doMultiplyDivide(ParseState state)
       else
 	v1 = valueMakeInteger(i1 / i2);
     } else {
-      rpmlog(RPMLOG_ERR, _("* / not suported for strings\n"));
+      exprErr(state, _("* and / not supported for strings"), NULL);
       goto err;
     }
   }
@@ -484,7 +494,7 @@ static Value doAddSubtract(ParseState state)
       goto err;
 
     if (! valueSameType(v1, v2)) {
-      rpmlog(RPMLOG_ERR, _("types must match\n"));
+      exprErr(state, _("types must match"), NULL);
       goto err;
     }
 
@@ -500,7 +510,7 @@ static Value doAddSubtract(ParseState state)
       char *copy;
 
       if (op == TOK_MINUS) {
-	rpmlog(RPMLOG_ERR, _("- not suported for strings\n"));
+        exprErr(state, _("- not supported for strings"), NULL);
         goto err;
       }
 
@@ -547,7 +557,7 @@ static Value doRelational(ParseState state)
       goto err;
 
     if (! valueSameType(v1, v2)) {
-      rpmlog(RPMLOG_ERR, _("types must match\n"));
+      exprErr(state, _("types must match"), NULL);
       goto err;
     }
 
@@ -644,7 +654,7 @@ static Value doLogical(ParseState state)
       goto err;
 
     if (! valueSameType(v1, v2)) {
-      rpmlog(RPMLOG_ERR, _("types must match\n"));
+      exprErr(state, _("types must match"), NULL);
       goto err;
     }
 
@@ -657,7 +667,7 @@ static Value doLogical(ParseState state)
       else
 	v1 = valueMakeInteger(i1 || i2);
     } else {
-      rpmlog(RPMLOG_ERR, _("&& and || not suported for strings\n"));
+      exprErr(state, _("&& and || not supported for strings"), NULL);
       goto err;
     }
   }
@@ -671,7 +681,7 @@ static Value doLogical(ParseState state)
   return NULL;
 }
 
-int parseExpressionBoolean(const char *expr)
+int rpmExprBool(const char *expr)
 {
   struct _parseState state;
   int result = -1;
@@ -692,7 +702,7 @@ int parseExpressionBoolean(const char *expr)
 
   /* If the next token is not TOK_EOF, we have a syntax error. */
   if (state.nextToken != TOK_EOF) {
-    rpmlog(RPMLOG_ERR, _("syntax error in expression\n"));
+    exprErr(&state, _("syntax error in expression"), state.p);
     goto exit;
   }
 
@@ -714,3 +724,47 @@ int parseExpressionBoolean(const char *expr)
   valueFree(v);
   return result;
 }
+
+char *rpmExprStr(const char *expr)
+{
+  struct _parseState state;
+  char *result = NULL;
+  Value v;
+
+  DEBUG(printf("parseExprString(?, '%s')\n", expr));
+
+  /* Initialize the expression parser state. */
+  state.p = state.str = xstrdup(expr);
+  state.nextToken = 0;
+  state.tokenValue = NULL;
+  (void) rdToken(&state);
+
+  /* Parse the expression. */
+  v = doLogical(&state);
+  if (!v)
+    goto exit;
+
+  /* If the next token is not TOK_EOF, we have a syntax error. */
+  if (state.nextToken != TOK_EOF) {
+    exprErr(&state, _("syntax error in expression"), state.p);
+    goto exit;
+  }
+
+  DEBUG(valueDump("parseExprString:", v, stdout));
+
+  switch (v->type) {
+  case VALUE_TYPE_INTEGER: {
+    rasprintf(&result, "%d", v->data.i);
+  } break;
+  case VALUE_TYPE_STRING:
+    result = xstrdup(v->data.s);
+    break;
+  default:
+    break;
+  }
+
+exit:
+  state.str = _free(state.str);
+  valueFree(v);
+  return result;
+}
diff --git a/rpmio/macro.c b/rpmio/macro.c
index c4f92bec21..3e6f1d2abe 100644
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -539,6 +539,7 @@ static struct builtins_s {
     { STR_AND_LEN("echo"),	doOutput,	NULL },
     { STR_AND_LEN("error"),	doOutput,	NULL },
     { STR_AND_LEN("expand"),	doFoo,		NULL },
+    { STR_AND_LEN("expr"),	doFoo,		NULL },
     { STR_AND_LEN("getconfdir"),doFoo,		NULL },
     { STR_AND_LEN("getenv"),	doFoo,		NULL },
     { STR_AND_LEN("getncpus"),	doFoo,		NULL },
@@ -1101,6 +1102,14 @@ doFoo(MacroBuf mb, int chkexist, int negate, const char * f, size_t fn,
 	    b++;
     } else if (STREQ("expand", f, fn) || STREQ("verbose", f, fn)) {
 	b = buf;
+    } else if (STREQ("expr", f, fn)) {
+	char *expr = rpmExprStr(buf);
+	if (expr) {
+	    free(buf);
+	    b = buf = expr;
+	} else {
+	    mb->error = 1;
+	}
     } else if (STREQ("url2path", f, fn) || STREQ("u2p", f, fn)) {
 	(void)urlPath(buf, (const char **)&b);
 	if (*b == '\0') b = "/";
@@ -1187,7 +1196,7 @@ static void doLoad(MacroBuf mb, int chkexist, int negate,
     if (g && gn > 0 && expandThis(mb, g, gn, &arg) == 0) {
 	/* Print failure iff %{load:...} or %{!?load:...} */
 	if (loadMacroFile(mb->mc, arg) && chkexist == negate) {
-	    mbErr(mb, 1, _("failed to load macro file %s"), arg);
+	    mbErr(mb, 1, _("failed to load macro file %s\n"), arg);
 	}
     }
     free(arg);
diff --git a/rpmio/rpmmacro.h b/rpmio/rpmmacro.h
index a31beb76a2..a6f65d9305 100644
--- a/rpmio/rpmmacro.h
+++ b/rpmio/rpmmacro.h
@@ -153,6 +153,21 @@ int	rpmExpandNumeric (const char * arg);
  */
 const char *rpmConfigDir(void);
 
+/** \ingroup rpmmacro
+ * Evaluate boolean expression.
+ * @param expr		expression to parse
+ * @return
+ */
+int rpmExprBool(const char * expr);
+
+/** \ingroup rpmmacro
+ * Evaluate string expression.
+ * @param expr		expression to parse
+ * @return
+ */
+char * rpmExprStr(const char * expr);
+
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index 061751a4de..46cd0f31a1 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -1289,9 +1289,10 @@ static pgpArmor decodePkts(uint8_t *b, uint8_t **pkt, size_t *pktlen)
 		goto exit;
 	    }
 	    t += (sizeof("-----")-1);
-	    if (t >= te) continue;
+	    /* Handle EOF without EOL here, *t == '\0' at EOF */
+	    if (*t && (t >= te)) continue;
 	    /* XXX permitting \r here is not RFC-2440 compliant <shrug> */
-	    if (!(*t == '\n' || *t == '\r')) continue;
+	    if (!(*t == '\n' || *t == '\r' || *t == '\0')) continue;
 
 	    crcdec = NULL;
 	    crclen = 0;
diff --git a/scripts/brp-compress b/scripts/brp-compress
index e4307eff71..1a5692ff88 100755
--- a/scripts/brp-compress
+++ b/scripts/brp-compress
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # If using normal root, avoid changing anything.
-if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
+if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_BUILD_ROOT" = "/" ]; then
 	exit 0
 fi
 
diff --git a/scripts/brp-java-gcjcompile b/scripts/brp-java-gcjcompile
index ec9b93a931..79612d19ef 100644
--- a/scripts/brp-java-gcjcompile
+++ b/scripts/brp-java-gcjcompile
@@ -1,14 +1,14 @@
 #!/bin/sh
 
 # If using normal root, avoid changing anything.
-[ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ] && exit 0
+[ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_BUILD_ROOT" = "/" ] && exit 0
 
 # If we are a noarch package, avoid changing anything.
 [ "$RPM_ARCH" = "noarch" ] && exit 0
 
 # If we don't have the required executables, avoid changing anything.
 gcj=${1:-/usr/bin/gcj}
-[ ! -x "$gcj" -o ! -x "$gcj-dbtool" ] && exit 0
+[ ! -x "$gcj" ] || [ ! -x "$gcj-dbtool" ] && exit 0
 
 # Now get to work...
 libdir="/usr/lib" # XXX need to sed this in or something
diff --git a/scripts/brp-python-bytecompile b/scripts/brp-python-bytecompile
index c06bdfafe3..d9c4832dc3 100644
--- a/scripts/brp-python-bytecompile
+++ b/scripts/brp-python-bytecompile
@@ -3,7 +3,7 @@ errors_terminate=$2
 extra=$3
 
 # If using normal root, avoid changing anything.
-if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
+if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_BUILD_ROOT" = "/" ]; then
 	exit 0
 fi
 
@@ -11,7 +11,7 @@ fi
 # number and hope it's enough, but somewhere, somebody's sure to run into it.
 depth=`(find "$RPM_BUILD_ROOT" -type f -name "*.py" -print0 ; echo /) | \
        xargs -0 -n 1 dirname | sed 's,[^/],,g' | sort -u | tail -n 1 | wc -c`
-if [ -z "$depth" -o "$depth" -le "1" ]; then
+if [ -z "$depth" ] || [ "$depth" -le "1" ]; then
 	exit 0
 fi
 
@@ -66,14 +66,14 @@ do
 
 	# Generate normal (.pyc) byte-compiled files.
 	python_bytecompile "" "$python_binary" "" "$python_libdir" "$depth" "$real_libdir"
-	if [ $? -ne 0 -a 0$errors_terminate -ne 0 ]; then
+	if [ $? -ne 0 ] && [ 0$errors_terminate -ne 0 ]; then
 		# One or more of the files had a syntax error
 		exit 1
 	fi
 
 	# Generate optimized (.pyo) byte-compiled files.
 	python_bytecompile "-O" "$python_binary" "" "$python_libdir" "$depth" "$real_libdir"
-	if [ $? -ne 0 -a 0$errors_terminate -ne 0 ]; then
+	if [ $? -ne 0 ] && [ 0$errors_terminate -ne 0 ]; then
 		# One or more of the files had a syntax error
 		exit 1
 	fi
@@ -98,14 +98,14 @@ find "$RPM_BUILD_ROOT" -type f -name "*.py" | grep -Ev "/bin/|/sbin/|/usr/lib(64
 
 # Generate normal (.pyc) byte-compiled files.
 python_bytecompile "" $default_python "/bin/|/sbin/|/usr/lib(64)?/python[0-9]\.[0-9]|/usr/share/doc" "$RPM_BUILD_ROOT" "$depth" "/"
-if [ $? -ne 0 -a 0$errors_terminate -ne 0 ]; then
+if [ $? -ne 0 ] && [ 0$errors_terminate -ne 0 ]; then
 	# One or more of the files had a syntax error
 	exit 1
 fi
 
 # Generate optimized (.pyo) byte-compiled files.
 python_bytecompile "-O" $default_python "/bin/|/sbin/|/usr/lib(64)?/python[0-9]\.[0-9]|/usr/share/doc" "$RPM_BUILD_ROOT" "$depth" "/"
-if [ $? -ne 0 -a 0$errors_terminate -ne 0 ]; then
+if [ $? -ne 0 ] && [ 0$errors_terminate -ne 0 ]; then
 	# One or more of the files had a syntax error
 	exit 1
 fi
diff --git a/scripts/brp-python-hardlink b/scripts/brp-python-hardlink
index 949c9c32d2..5fd1b43bb8 100755
--- a/scripts/brp-python-hardlink
+++ b/scripts/brp-python-hardlink
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # If using normal root, avoid changing anything.
-if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
+if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_BUILD_ROOT" = "/" ]; then
 	exit 0
 fi
 
diff --git a/scripts/brp-strip b/scripts/brp-strip
index 5e645669cf..a9d04d315a 100755
--- a/scripts/brp-strip
+++ b/scripts/brp-strip
@@ -1,6 +1,6 @@
 #!/bin/sh
 # If using normal root, avoid changing anything.
-if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
+if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_BUILD_ROOT" = "/" ]; then
 	exit 0
 fi
 
diff --git a/scripts/brp-strip-comment-note b/scripts/brp-strip-comment-note
index 833ac78e51..a90be71090 100755
--- a/scripts/brp-strip-comment-note
+++ b/scripts/brp-strip-comment-note
@@ -1,6 +1,6 @@
 #!/bin/sh
 # If using normal root, avoid changing anything.
-if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
+if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_BUILD_ROOT" = "/" ]; then
 	exit 0
 fi
 
diff --git a/scripts/brp-strip-shared b/scripts/brp-strip-shared
index 51d10d5b3d..94113a4b2a 100644
--- a/scripts/brp-strip-shared
+++ b/scripts/brp-strip-shared
@@ -3,7 +3,7 @@
 # Thu Apr 20 - Guilherme Manika <gwm@conectiva.com.br>
 #              Created file
 
-if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
+if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_BUILD_ROOT" = "/" ]; then
 	exit 0
 fi
 
diff --git a/scripts/brp-strip-static-archive b/scripts/brp-strip-static-archive
index f7fb26b87e..37ab511a99 100755
--- a/scripts/brp-strip-static-archive
+++ b/scripts/brp-strip-static-archive
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
+if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_BUILD_ROOT" = "/" ]; then
 	exit 0
 fi
 
diff --git a/scripts/check-buildroot b/scripts/check-buildroot
index f91dc767bf..d69867b459 100755
--- a/scripts/check-buildroot
+++ b/scripts/check-buildroot
@@ -18,7 +18,7 @@
 
 test -z "$QA_SKIP_BUILD_ROOT" || exit 0
 
-if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
+if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_BUILD_ROOT" = "/" ]; then
         exit 0
 fi
 
diff --git a/scripts/check-rpaths b/scripts/check-rpaths
index b94630bb1b..c3d8600500 100755
--- a/scripts/check-rpaths
+++ b/scripts/check-rpaths
@@ -21,7 +21,7 @@ test -z "$QA_SKIP_RPATHS" || {
     exit 0
 }
 
-if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then
+if [ -z "$RPM_BUILD_ROOT" ] || [ "$RPM_BUILD_ROOT" = "/" ]; then
         exit 0
 fi
 
diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
index 2e9d765315..212f127910 100755
--- a/scripts/find-debuginfo.sh
+++ b/scripts/find-debuginfo.sh
@@ -157,7 +157,7 @@ while [ $# -gt 0 ]; do
     include_gdb_index=true
     ;;
   -o)
-    if [ -z "${lists[$nout]}" -a -z "${ptns[$nout]}" ]; then
+    if [ -z "${lists[$nout]}" ] && [ -z "${ptns[$nout]}" ]; then
       out=$2
     else
       outs[$nout]=$2
@@ -213,7 +213,7 @@ if test -n "$build_id_seed" -a "$no_recompute_build_id" = "true"; then
   exit 2
 fi
 
-if [ "$strip_g" = "true" -a "$strip_glibs" = "true" ]; then
+if [ "$strip_g" = "true" ] && [ "$strip_glibs" = "true" ]; then
   echo >&2 "*** ERROR: -g  and --g-libs cannot be used together"
   exit 2
 fi
@@ -428,7 +428,7 @@ do_file()
   # strip -g implies we have full symtab, don't add mini symtab in that case.
   # It only makes sense to add a minisymtab for executables and shared
   # libraries. Other executable ELF files (like kernel modules) don't need it.
-  if [ "$include_minidebug" = "true" -a "$strip_g" = "false" ]; then
+  if [ "$include_minidebug" = "true" ] && [ "$strip_g" = "false" ]; then
     skip_mini=true
     if [ "$strip_glibs" = "false" ]; then
       case "$(file -bi "$f")" in
@@ -539,10 +539,6 @@ if $run_dwz \
     echo "original debug info size: ${size_before}kB, size after compression: ${size_after}kB"
     # Remove .dwz directory if empty
     rmdir "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz" 2>/dev/null
-    if [ -f "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}" ]; then
-      id="`readelf -Wn "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}" \
-	     2>/dev/null | sed -n 's/^    Build ID: \([0-9a-f]\+\)/\1/p'`"
-    fi
 
     # dwz invalidates .gnu_debuglink CRC32 in the main files.
     cat "$ELFBINSFILE" |
@@ -587,7 +583,7 @@ if [ -s "$SOURCEFILE" ]; then
   xargs --no-run-if-empty -0 chmod 0755
 fi
 
-if [ -d "${RPM_BUILD_ROOT}/usr/lib" -o -d "${RPM_BUILD_ROOT}/usr/src" ]; then
+if [ -d "${RPM_BUILD_ROOT}/usr/lib" ] || [ -d "${RPM_BUILD_ROOT}/usr/src" ]; then
   ((nout > 0)) ||
   test ! -d "${RPM_BUILD_ROOT}/usr/lib" ||
   (cd "${RPM_BUILD_ROOT}/usr/lib"; find debug -type d) |
diff --git a/scripts/find-lang.sh b/scripts/find-lang.sh
index fdca18ec4e..1542a43fb3 100755
--- a/scripts/find-lang.sh
+++ b/scripts/find-lang.sh
@@ -184,7 +184,7 @@ s:%lang(C) ::
 /^$/d' >> $MO_NAME
 
 KDE3_HTML=`kde-config --expandvars --install html 2>/dev/null`
-if [ x"$KDE3_HTML" != x -a -d "$TOP_DIR$KDE3_HTML" ]; then
+if [ x"$KDE3_HTML" != x ] && [ -d "$TOP_DIR$KDE3_HTML" ]; then
 find "$TOP_DIR$KDE3_HTML" -type d|sed '
 s:'"$TOP_DIR"'::
 '"$NO_ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'/\)::
@@ -197,7 +197,7 @@ s:%lang(C) ::
 fi
 
 KDE4_HTML=`kde4-config --expandvars --install html 2>/dev/null`
-if [ x"$KDE4_HTML" != x -a -d "$TOP_DIR$KDE4_HTML" ]; then
+if [ x"$KDE4_HTML" != x ] && [ -d "$TOP_DIR$KDE4_HTML" ]; then
 find "$TOP_DIR$KDE4_HTML" -type d|sed '
 s:'"$TOP_DIR"'::
 '"$NO_ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'/\)::
@@ -210,7 +210,7 @@ s:%lang(C) ::
 fi
 
 KF5_HTML=`kf5-config --expandvars --install html 2>/dev/null`
-if [ x"$KF5_HTML" != x -a -d "$TOP_DIR$KF5_HTML" ]; then
+if [ x"$KF5_HTML" != x ] && [ -d "$TOP_DIR$KF5_HTML" ]; then
 find "$TOP_DIR$KF5_HTML" -type d|sed '
 s:'"$TOP_DIR"'::
 '"$NO_ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'/\)::
diff --git a/scripts/gendiff b/scripts/gendiff
index a8cd1209e2..ae083dcd12 100644
--- a/scripts/gendiff
+++ b/scripts/gendiff
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -z "$1" -o -z "$2" ] && {
+[ -z "$1" ] || [ -z "$2" ] && {
 # usage
   echo "usage: $0 <directory> <diff-extension>" 1>&2
   exit 1
diff --git a/scripts/rpm2cpio.sh b/scripts/rpm2cpio.sh
index a883562ac2..4531271cc0 100755
--- a/scripts/rpm2cpio.sh
+++ b/scripts/rpm2cpio.sh
@@ -6,7 +6,7 @@ fatal() {
 }
 
 pkg="$1"
-[ -n "$pkg" -a -e "$pkg" ] ||
+[ -n "$pkg" ] && [ -e "$pkg" ] ||
 	fatal "No package supplied"
 
 _dd() {
diff --git a/scripts/rpmdb_loadcvt b/scripts/rpmdb_loadcvt
index aa701065f2..bb21b03372 100755
--- a/scripts/rpmdb_loadcvt
+++ b/scripts/rpmdb_loadcvt
@@ -28,7 +28,7 @@ loadfmt="${5%%:}"
     exit 0
 }
 
-[ "$ac" != "0" -o "`/usr/bin/id -u`" != "0" ] && {
+[ "$ac" != "0" ] || [ "`/usr/bin/id -u`" != "0" ] && {
     echo "$cmd: Convert $rpmdb files to db-$loadfmt format."
     echo "$cmd: Must be run as root, takes no arguments."
     exit 1
diff --git a/scripts/tgpg b/scripts/tgpg
index 238cffbb43..fabba80465 100755
--- a/scripts/tgpg
+++ b/scripts/tgpg
@@ -3,7 +3,7 @@
 
 for pkg in $*
 do
-    if [ "$pkg" = "" -o ! -e "$pkg" ]; then
+    if [ "$pkg" = "" ] || [ ! -e "$pkg" ]; then
 	echo "no package supplied" 1>&2
 	exit 1
     fi
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 046c9121d8..94ffd8da3c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -59,11 +59,13 @@ EXTRA_DIST += data/SPECS/filedep.spec
 EXTRA_DIST += data/SPECS/flangtest.spec
 EXTRA_DIST += data/SPECS/hlinktest.spec
 EXTRA_DIST += data/SPECS/iftest.spec
+EXTRA_DIST += data/SPECS/ifmultiline.spec
 EXTRA_DIST += data/SPECS/eliftest.spec
 EXTRA_DIST += data/SPECS/symlinktest.spec
 EXTRA_DIST += data/SPECS/deptest.spec
 EXTRA_DIST += data/SPECS/verifyscript.spec
 EXTRA_DIST += data/SPECS/fakeshell.spec
+EXTRA_DIST += data/SPECS/mini.spec
 EXTRA_DIST += data/SPECS/scripts.spec
 EXTRA_DIST += data/SPECS/scriptfail.spec
 EXTRA_DIST += data/SPECS/selfconflict.spec
@@ -79,6 +81,7 @@ EXTRA_DIST += data/SPECS/test-subpackages.spec
 EXTRA_DIST += data/SPECS/test-subpackages-exclude.spec
 EXTRA_DIST += data/SPECS/test-subpackages-pathpostfixes.spec
 EXTRA_DIST += data/SPECS/vattrtest.spec
+EXTRA_DIST += data/SPECS/weirdnames.spec
 EXTRA_DIST += data/SOURCES/buildrequires-1.0.tar.gz
 EXTRA_DIST += data/SOURCES/hello-1.0-modernize.patch
 EXTRA_DIST += data/SOURCES/hello-1.0-install.patch
diff --git a/tests/data/SPECS/ifmultiline.spec b/tests/data/SPECS/ifmultiline.spec
new file mode 100644
index 0000000000..76a9694c47
--- /dev/null
+++ b/tests/data/SPECS/ifmultiline.spec
@@ -0,0 +1,28 @@
+Name:           ifmultiline
+Version:         1.0
+Release:        1
+Group:          Testing
+License:        GPL
+BuildArch:      noarch
+Summary: Test multiline if conditions
+
+%description
+%{summary}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+mkdir -p $RPM_BUILD_ROOT/a
+echo "x" > $RPM_BUILD_ROOT/a/empty\
+Caps1
+
+%if 1 && ( 9|| \
+1)
+
+%endif
+
+%files -n %{name}
+/a/emptyCaps1
+
+
+%changelog
\ No newline at end of file
diff --git a/tests/data/SPECS/mini.spec b/tests/data/SPECS/mini.spec
new file mode 100644
index 0000000000..41b5ec1deb
--- /dev/null
+++ b/tests/data/SPECS/mini.spec
@@ -0,0 +1,7 @@
+Name: mini
+Version: 1
+Release: 1
+License: k
+Summary: Minimal spec
+
+%description
diff --git a/tests/data/SPECS/weirdnames.spec b/tests/data/SPECS/weirdnames.spec
new file mode 100644
index 0000000000..e241e4c264
--- /dev/null
+++ b/tests/data/SPECS/weirdnames.spec
@@ -0,0 +1,37 @@
+%bcond_with illegal
+
+Name:		weirdnames
+Version:	1.0
+Release:	1
+Summary:	Testing weird filename behavior
+License:	GPL
+BuildArch:	noarch
+
+%description
+%{summary}
+
+%install
+mkdir -p %{buildroot}/opt
+cd %{buildroot}/opt
+touch "foo'ed" 'bar"ed' "just space" "\$talks" \
+	"to?be" "the * are falling" '#nocomment' "(maybe)" \
+	"perhaps;not" "true:false" "!absolutely" "&ground" \
+	"after{all}" "index[this]" "equals=not" "tee|two" "~right" \
+	"<namehere>"
+%if %{with illegal}
+touch "only	time"
+# the dependency generator cannot handle newlines in filenames
+touch "new
+line"
+
+%endif
+for f in *; do
+    echo -e "#!/bin/ary\ndada\n" > ${f}
+done
+chmod a+x *
+
+# script.req fails on the backslash
+touch "\.back"
+
+%files
+/opt/*
diff --git a/tests/data/macros.testfile b/tests/data/macros.testfile
index a914a17221..86fd883fc4 100644
--- a/tests/data/macros.testfile
+++ b/tests/data/macros.testfile
@@ -14,3 +14,9 @@ me
 %comment2 see\
 %dnl comment\
 this
+
+%comment3 %{expand:
+read
+%dnl expansion depends on the braces inside %dnl line
+%dnl e.g. '}' change this meaning
+me}
diff --git a/tests/rpmbuild.at b/tests/rpmbuild.at
index 88ff5e5713..7d4e590b8e 100644
--- a/tests/rpmbuild.at
+++ b/tests/rpmbuild.at
@@ -98,6 +98,50 @@ run rpmbuild \
 ])
 AT_CLEANUP
 
+# weird filename survival test
+AT_SETUP([rpmbuild package with weird filenames])
+AT_KEYWORDS([build])
+AT_CHECK([
+rm -rf ${TOPDIR}
+
+runroot rpmbuild -bb --quiet /data/SPECS/weirdnames.spec
+runroot rpm -qpl /build/RPMS/noarch/weirdnames-1.0-1.noarch.rpm
+],
+[0],
+[/opt/!absolutely
+/opt/#nocomment
+/opt/$talks
+/opt/&ground
+/opt/(maybe)
+/opt/<namehere>
+/opt/\.back
+/opt/after{all}
+/opt/bar"ed
+/opt/equals=not
+/opt/foo'ed
+/opt/index[[this]]
+/opt/just space
+/opt/perhaps;not
+/opt/tee|two
+/opt/the * are falling
+/opt/to?be
+/opt/true:false
+/opt/~right
+],
+[])
+AT_CLEANUP
+
+AT_SETUP([rpmbuild package with illegal filenames])
+AT_KEYWORDS([build])
+AT_CHECK([
+# XXX current output is not well suited for grab + compare, just ignore
+runroot rpmbuild -bb --quiet --with illegal /data/SPECS/weirdnames.spec
+],
+[1],
+[],
+[ignore])
+AT_CLEANUP
+
 # ------------------------------
 # Check if tar build works
 # TODO: test that the rpms are actually created...
@@ -347,6 +391,7 @@ AT_KEYWORDS([build])
 AT_CHECK([
 
 runroot rpmbuild -bb --quiet \
+		--define "_binary_payload w9.gzdio" \
 		/data/SPECS/filedep.spec
 echo Requires:
 runroot rpm  -qp --requires /build/RPMS/noarch/filedep-1.0-1.noarch.rpm
@@ -1554,3 +1599,134 @@ run rpmbuild \
 [error: Bad source: ${TOPDIR}/SOURCES/hello-1.0.tar.gz: No such file or directory
 ])
 AT_CLEANUP
+
+AT_SETUP([rpmbuild minimal spec])
+AT_KEYWORDS([build])
+AT_CHECK_UNQUOTED([
+rm -rf ${TOPDIR}
+
+run rpmbuild \
+  -bb --quiet "${abs_srcdir}"/data/SPECS/mini.spec
+],
+[0],
+[],
+[])
+AT_CLEANUP
+
+AT_SETUP([%if, %else, %elif test basic])
+AT_KEYWORDS([if else elif build])
+AT_CHECK([
+runroot rpmbuild -ba --quiet \
+    --define "testif 0"      \
+   /data/SPECS/iftest.spec
+],
+[0],
+[])
+AT_CLEANUP
+
+AT_SETUP([%if, %else, %elif test existing script])
+AT_KEYWORDS([if else elif build])
+AT_CHECK([
+runroot rpmbuild -ba --quiet  \
+    --define "testif 2"       \
+    --define "fedora 1"       \
+   /data/SPECS/iftest.spec
+],
+[0],
+[])
+AT_CLEANUP
+
+AT_SETUP([%if, %else, %elif test 1])
+AT_KEYWORDS([if else elif build])
+AT_CHECK([
+runroot rpmbuild -ba --quiet \
+ --define "testif 1"         \
+ --define "variable1 1"      \
+ --define "variable2 1"      \
+ --define "variable3 1"      \
+ --define "action1 echo 0"   \
+ --define "action2 %if 1"    \
+ --define "action3 %if 1"    \
+ --define "action4 %if 1"    \
+   /data/SPECS/eliftest.spec
+],
+[0],
+[])
+AT_CLEANUP
+
+
+
+AT_SETUP([%if, %else, %elif test 2])
+AT_KEYWORDS([if else elif build])
+AT_CHECK([
+runroot rpmbuild -ba --quiet   \
+ --define "testif 1"           \
+ --define "variable1 0"        \
+ --define "variable2 0"        \
+ --define "variable3 1"        \
+ --define "action1 echo 0"     \
+ --define "action2 echo 0"     \
+ --define "action3 %if 1"      \
+ --define "action4 echo 0"     \
+   /data/SPECS/eliftest.spec > /dev/null 2>&1
+],
+[1],
+[])
+AT_CLEANUP
+
+
+
+AT_SETUP([%if, %else, %elif test 3])
+AT_KEYWORDS([if else elif build])
+AT_CHECK([
+runroot rpmbuild -ba --quiet      \
+ --define "testif 1"              \
+ --define "variable1 0"           \
+ --define "variable2 1"           \
+ --define "variable3 rubbish:4-3" \
+ --define "action1 %if 1"         \
+ --define "action2 echo 0"        \
+ --define "action3 %if 1"         \
+ --define "action4 %if 1"         \
+   /data/SPECS/eliftest.spec
+],
+[0],
+[])
+AT_CLEANUP
+
+
+AT_SETUP([%if, %else, %elif test 4])
+AT_KEYWORDS([if else elif build])
+AT_CHECK([
+runroot rpmbuild -ba --quiet      \
+ --define "testif 1"              \
+ --define "variable1 0"           \
+ --define "variable2 rubbish:4-3" \
+ --define "variable3 1"           \
+ --define "action1 exit 1"        \
+ --define "action2 echo 0"        \
+ --define "action3 exit 1"        \
+ --define "action4 exit 1"        \
+   /data/SPECS/eliftest.spec
+],
+[1],
+[],
+[error: parse error in expression:  rubbish:4-3
+
+error:                                    ^
+error: /data/SPECS/eliftest.spec:40: bad %elif condition:  rubbish:4-3
+
+])
+AT_CLEANUP
+
+
+AT_SETUP([multiline %if test])
+AT_KEYWORDS([if macros build])
+AT_CHECK([
+runroot rpmbuild -ba --quiet      \
+ data/SPECS/ifmultiline.spec
+],
+[0],
+[],
+[])
+AT_CLEANUP
diff --git a/tests/rpmdb.at b/tests/rpmdb.at
index e1893c7cd7..f26c09c7c9 100644
--- a/tests/rpmdb.at
+++ b/tests/rpmdb.at
@@ -129,7 +129,6 @@ AT_SETUP([rpm -U --replacepkgs 2])
 AT_KEYWORDS([rpmdb install])
 
 AT_CHECK([
-AT_XFAIL_IF([test $RPM_XFAIL -ne 0])
 RPMDB_CLEAR
 RPMDB_INIT
 
diff --git a/tests/rpmmacro.at b/tests/rpmmacro.at
index f99bca745a..b425a6980a 100644
--- a/tests/rpmmacro.at
+++ b/tests/rpmmacro.at
@@ -245,6 +245,45 @@ runroot rpm \
 ])
 AT_CLEANUP
 
+AT_SETUP([expr macro 1])
+AT_KEYWORDS([macros])
+AT_CHECK([
+runroot rpm \
+    --define "aaa 5" \
+    --define "bbb 0" \
+    --eval '%{expr:4*1024}' \
+    --eval '%{expr:5 < 1}' \
+    --eval '%{expr:(4 + 5) * 2 == 18}' \
+    --eval '%{expr:%{aaa} || %{bbb}}' \
+    --eval '%{expr:%{aaa} && %{bbb}}'
+],
+[0],
+[4096
+0
+1
+1
+0
+],
+[])
+AT_CLEANUP
+
+AT_SETUP([expr macro 2])
+AT_KEYWORDS([macros])
+AT_CHECK([
+runroot rpm --eval '%{expr:a*1}'
+runroot rpm --eval '%{expr:(5+1)*4)}'
+runroot rpm --eval '%{expr:a=!b}'
+],
+[1],
+[],
+[error: types must match: a*1
+error: syntax error in expression: (5+1)*4)
+error:                                    ^
+error: syntax error while parsing ==: a=!b
+error:                                  ^
+])
+AT_CLEANUP
+
 AT_SETUP([shell expansion])
 AT_KEYWORDS([macros])
 AT_CHECK([
@@ -534,106 +573,18 @@ this
 [])
 AT_CLEANUP
 
-AT_SETUP([%if, %else, %elif test basic])
-AT_KEYWORDS([if, else, elif])
-AT_CHECK([
-runroot rpmbuild -ba --quiet \
-    --define "testif 0"      \
-   /data/SPECS/iftest.spec
-],
-[0],
-[])
-AT_CLEANUP
-
-AT_SETUP([%if, %else, %elif test existing script])
-AT_KEYWORDS([if, else, elif])
-AT_CHECK([
-runroot rpmbuild -ba --quiet  \
-    --define "testif 2"       \
-    --define "fedora 1"       \
-   /data/SPECS/iftest.spec
-],
-[0],
-[])
-AT_CLEANUP
-
-AT_SETUP([%if, %else, %elif test 1])
-AT_KEYWORDS([if, else, elif])
+AT_SETUP([macro comments 2])
+AT_KEYWORDS([macros])
 AT_CHECK([
-runroot rpmbuild -ba --quiet \
- --define "testif 1"         \
- --define "variable1 1"      \
- --define "variable2 1"      \
- --define "variable3 1"      \
- --define "action1 echo 0"   \
- --define "action2 %if 1"    \
- --define "action3 %if 1"    \
- --define "action4 %if 1"    \
-   /data/SPECS/eliftest.spec
+runroot rpm \
+	--macros /data/macros.testfile \
+	--eval "%{comment3}"
 ],
 [0],
-[])
-AT_CLEANUP
-
-
-
-AT_SETUP([%if, %else, %elif test 2])
-AT_KEYWORDS([if, else, elif])
-AT_CHECK([
-runroot rpmbuild -ba --quiet   \
- --define "testif 1"           \
- --define "variable1 0"        \
- --define "variable2 0"        \
- --define "variable3 1"        \
- --define "action1 echo 0"     \
- --define "action2 echo 0"     \
- --define "action3 %if 1"      \
- --define "action4 echo 0"     \
-   /data/SPECS/eliftest.spec > /dev/null 2>&1
-],
-[1],
-[])
-AT_CLEANUP
-
-
-
-AT_SETUP([%if, %else, %elif test 3])
-AT_KEYWORDS([if, else, elif])
-AT_CHECK([
-runroot rpmbuild -ba --quiet      \
- --define "testif 1"              \
- --define "variable1 0"           \
- --define "variable2 1"           \
- --define "variable3 rubbish:4-3" \
- --define "action1 %if 1"         \
- --define "action2 echo 0"        \
- --define "action3 %if 1"         \
- --define "action4 %if 1"         \
-   /data/SPECS/eliftest.spec
+[
+read
+' change this meaning
 ],
-[0],
 [])
 AT_CLEANUP
 
-
-AT_SETUP([%if, %else, %elif test 4])
-AT_KEYWORDS([if, else, elif])
-AT_CHECK([
-runroot rpmbuild -ba --quiet      \
- --define "testif 1"              \
- --define "variable1 0"           \
- --define "variable2 rubbish:4-3" \
- --define "variable3 1"           \
- --define "action1 exit 1"        \
- --define "action2 echo 0"        \
- --define "action3 exit 1"        \
- --define "action4 exit 1"        \
-   /data/SPECS/eliftest.spec
-],
-[1],
-[],
-[error: parse error in expression
-error: /data/SPECS/eliftest.spec:40: bad %elif condition:  rubbish:4-3
-
-])
-AT_CLEANUP