Preparing for rpm 4.14.0-rc2rpm-4.14.0-rc2

37 files changed, 1981 insertions, 1693 deletions

diff --git a/configure.ac b/configure.ac
index d640b405d..eb5696399 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.61)
-AC_INIT(rpm, 4.14.0-rc1, rpm-maint@lists.rpm.org)
+AC_INIT(rpm, 4.14.0-rc2, rpm-maint@lists.rpm.org)
 
 AC_CONFIG_SRCDIR([rpmqv.c])
 AC_CONFIG_HEADERS([config.h])
diff --git a/po/ar.po b/po/ar.po
index 9c9ce668f..d06dfad06 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Arabic (http://www.transifex.com/rpm-team/rpm/language/ar/)\n"
@@ -952,22 +952,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1867,19 +1867,19 @@ msgstr ""
 msgid "normal"
 msgstr "عادية"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "مُستبدلة"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "غير مثبّتة"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "لون خاطئ"
 
@@ -1891,26 +1891,26 @@ msgstr "مفقودة"
 msgid "(unknown)"
 msgstr "(غير معروفة)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s حُفت كـ %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s أُنشئت كـ %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr "دليل"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr "ملف"
 
@@ -2972,104 +2972,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr ""
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr ""
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr ""
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr ""
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " فشل - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3524,30 +3532,30 @@ msgstr "مُستثناة"
 msgid "failed"
 msgstr ""
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "مفقود   %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr ""
diff --git a/po/br.po b/po/br.po
index 9e5a91e85..269f5988e 100644
--- a/po/br.po
+++ b/po/br.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Breton (http://www.transifex.com/rpm-team/rpm/language/br/)\n"
@@ -947,22 +947,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1862,19 +1862,19 @@ msgstr ""
 msgid "normal"
 msgstr "reizh"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "erlec'hiet"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "ket staliet"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "ket rannet"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1886,26 +1886,26 @@ msgstr "mankout a ra"
 msgid "(unknown)"
 msgstr "(dianav)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr "%s %s : sac'het eo bet lemel : %s\n"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr "renkell"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr "restr"
 
@@ -2967,104 +2967,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr ""
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr ""
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr ""
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr ""
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " sac'het - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3519,30 +3527,30 @@ msgstr "tremenet en e biou"
 msgid "failed"
 msgstr "sac'het"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "mankout a ra  %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 94592880d..0b1ae1d12 100644
--- a/po/ca.po
+++ b/po/ca.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/rpm-team/rpm/language/ca/)\n"
@@ -1014,22 +1014,22 @@ msgstr ""
 "Hi ha fitxers instal·lats però no empaquetats:\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Processament dels fitxers: %s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Els binaris dependents de l'arquitectura estan en el paquet noarch\n"
 
@@ -1938,19 +1938,19 @@ msgstr "Data no vàlida %u"
 msgid "normal"
 msgstr "normal"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "substituït"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "no instal·lat"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "compartit per xarxa"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "color incorrecte"
 
@@ -1962,26 +1962,26 @@ msgstr "falta"
 msgid "(unknown)"
 msgstr "(desconegut)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s s'ha desat com a %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s s'ha creat com a %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr "%s %s: ha fallat la supressió: %s\n"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr "directori"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr "fitxer"
 
@@ -3061,105 +3061,113 @@ msgstr "op desconegut de dependència enriquida '%.*s'"
 msgid "Name required"
 msgstr "Cal el nom"
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr "La dependència enriquida no comença amb '('"
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr "Falten argument a l'op de la dependència enriquida"
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr "Dependència enriquida buida"
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr "Dependència enriquida sense acabar: %s"
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr "No es poden encadenar diferents ops"
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 #, fuzzy
 msgid "Can only chain and/or/with ops"
 msgstr "Únicament es poden encadenar ops AND i OR"
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Valor incorrecte del magic"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Capçalera incorrecta o il·legible"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "La mida de la capçalera és massa gran"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr "El fitxer és massa gran per a l'arxiu"
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Tipus de fitxer desconegut"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr "Falten fitxers"
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "No hi ha coincidència de resums"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Error intern"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "El fitxer de l'arxiu no és a la capçalera"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " ha fallat - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr "%s: (error 0x%x)"
@@ -3620,30 +3628,30 @@ msgstr "s'ha ignorat"
 msgid "failed"
 msgstr "ha fallat"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr "Duplica el nom de l'usuari o l'UID per a l'usuari %s\n"
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr "Duplica el nom del grup o el GID per al grup %s\n"
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr "sense estat"
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr "estat desconegut"
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "falta   %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Dependències insatisfetes per a %s:\n"
diff --git a/po/cmn.po b/po/cmn.po
index 930f761e1..068bfdb4c 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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+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/"
@@ -954,22 +954,22 @@ msgstr ""
 "找到已安裝 (但未打包) 的檔案：\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "正在處理檔案：%s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr "二進位架構 (%d) 無法匹配套件架構 (%d)。\n"
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "noarch 套件中有依賴架構的二進位檔\n"
 
@@ -1869,19 +1869,19 @@ msgstr "無效的日期 %u"
 msgid "normal"
 msgstr "一般"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "已替換"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "未安裝"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "已網路分享"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "錯誤色彩"
 
@@ -1893,26 +1893,26 @@ msgstr "遺失"
 msgid "(unknown)"
 msgstr "(不明)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s 已被另存為 %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s 已建立為 %s \n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr "%s %s：移除失敗：%s\n"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr "目錄"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr "檔案"
 
@@ -2976,104 +2976,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "不當魔法數字"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "不當或無法讀取的標頭"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "標頭尺寸過大"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr "檔案太大而無法封存"
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "不明檔案類型"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "摘要不符"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "內部錯誤"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "在標頭中沒有封存檔"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " 失敗 - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3528,30 +3536,30 @@ msgstr "已跳過"
 msgid "failed"
 msgstr "已失敗"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "遺漏      %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "未滿足 %s 的依存性：\n"
diff --git a/po/cs.po b/po/cs.po
index 60820f952..c1d441506 100644
--- a/po/cs.po
+++ b/po/cs.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Czech (http://www.transifex.com/rpm-team/rpm/language/cs/)\n"
@@ -962,22 +962,22 @@ msgstr ""
 "Nalezeny instalované, ale nezabalené soubory:\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1877,19 +1877,19 @@ msgstr ""
 msgid "normal"
 msgstr ""
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr ""
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr ""
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1901,26 +1901,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s uloženo jako %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s vytvořen jako %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2987,104 +2987,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Špatné magické číslo"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Špatná nebo nečitelná hlavička"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Velikost hlavičky je přiliš velká"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Neznámý typ souboru"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Interní chyba"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "Soubor z archivu není v hlavičce"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr "selhal - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3539,30 +3547,30 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "chybí     %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Nesplněné závislosti pro %s:\n"
diff --git a/po/da.po b/po/da.po
index dce0b287a..e09551a2f 100644
--- a/po/da.po
+++ b/po/da.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Danish (http://www.transifex.com/rpm-team/rpm/language/da/)\n"
@@ -952,22 +952,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1869,19 +1869,19 @@ msgstr ""
 msgid "normal"
 msgstr ""
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr ""
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr ""
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1893,26 +1893,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s gemt som %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s oprettet som %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2981,104 +2981,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Ugyldigt magisk tal"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Ugyldigt/ulæseligt hoved"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Hovedstørrelse er for stor"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Ukendt filtype"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Intern fejl"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr ""
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " mislykkedes - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3536,30 +3544,30 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr ""
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index dcaa515ea..c24afbd17 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: German (http://www.transifex.com/rpm-team/rpm/language/de/)\n"
@@ -992,24 +992,24 @@ msgstr ""
 "Installierte (aber nicht gepackte) Datei(en) gefunden:\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Dateien werden verarbeitet: %s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, 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:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Architekturabhängige Binärdateien in »noarch«-Paket\n"
 
@@ -1924,19 +1924,19 @@ msgstr "Ungültiges Datum %u"
 msgid "normal"
 msgstr "normal"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "ersetzt"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "nicht installiert"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "Netzwerk-Mitbenutzung"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "Falsche Farbe"
 
@@ -1948,26 +1948,26 @@ msgstr "fehlt"
 msgid "(unknown)"
 msgstr "(unbekannt)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s als %s gesichert\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s erstellt als %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr "%s %s: Entfernen fehlgeschlagen: %s\n"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr "Verzeichnis"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr "Datei"
 
@@ -3048,104 +3048,112 @@ msgstr ""
 msgid "Name required"
 msgstr "Name wird benötigt"
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Ungültige Magic"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Ungültiger oder unlesbarer Header"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Header zu groß"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr "Datei ist zu groß für das Archiv"
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Unbekannter Datei-Typ"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr "Fehlende Datei(en)"
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "Prüfsummen stimmen nicht überein"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "Archiv-Datei nicht im Header"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " fehlgeschlagen - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr "%s: (Fehler 0x%x)"
@@ -3606,30 +3614,30 @@ msgstr "übersprungen"
 msgid "failed"
 msgstr "fehlgeschlagen"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr "Doppelter Benutzername oder Benutzer-ID für Benutzer %s\n"
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr "Doppelter Gruppenname oder Gruppen-ID für Gruppe %s\n"
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr "kein Status"
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr "unbekannter Status"
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "fehlend   %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Unerfüllte Abhängigkeiten für %s:\n"
diff --git a/po/el.po b/po/el.po
index d97358609..256312bd1 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Greek (http://www.transifex.com/rpm-team/rpm/language/el/)\n"
@@ -949,22 +949,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1864,19 +1864,19 @@ msgstr ""
 msgid "normal"
 msgstr ""
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr ""
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr ""
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1888,26 +1888,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2969,104 +2969,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr ""
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Το μέγεθος της κεφαλίδας είναι πολύ μεγάλο"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Άγνωστος τύπος αρχείου"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Εσωτερικό σφάλμα"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr ""
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr ""
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3521,30 +3529,30 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr ""
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr ""
diff --git a/po/eo.po b/po/eo.po
index 775052d82..8d9541697 100644
--- a/po/eo.po
+++ b/po/eo.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Esperanto (http://www.transifex.com/rpm-team/rpm/language/"
@@ -972,24 +972,24 @@ msgstr ""
 "Insalita(j) (sed ne pakita(j) dosiero(j) trovita(j):\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Procedanta dosierojn: %s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, 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:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Platformo-dependaj dosieroj en platformo-sendependa pakaĵo\n"
 
@@ -1896,19 +1896,19 @@ msgstr "Nevalida dato %u"
 msgid "normal"
 msgstr "normala"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "anstataŭita"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "ne instalita"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "rete kunuzita"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "malĝusta koloro"
 
@@ -1920,26 +1920,26 @@ msgstr "manka"
 msgid "(unknown)"
 msgstr "(nekonata)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s konservita kiel %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s kreita kiel %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr "%s %s: forigo malsukcesis: %s\n"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr "dosierujo"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr "dosiero"
 
@@ -3008,105 +3008,113 @@ msgstr "Nekonata riĉdependaĵa operacio '%.*s'"
 msgid "Name required"
 msgstr "Nomo postulata"
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr "Riĉa dependaĵo ne komenciĝas per '('"
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr "Mankanta argumento al riĉdependaĵa operacio"
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr "Vaka riĉa dependaĵo"
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr "Nefinita riĉa dependaĵo: %s"
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr "Ne eblas ĉenigi diversajn operaciojn"
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 #, fuzzy
 msgid "Can only chain and/or/with ops"
 msgstr "Eblas ĉenigi nur la operaciojn AND kaj OR"
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr "Rubo post riĉa dependaĵo"
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Fuŝa magiaĵo"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Fuŝa kapo"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Kapo-grando tro granda"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr "Dosiero tro granda por arkivo"
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Nekonata dosiertipo"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr "Mankanta(j) dosiero(j)"
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "Malkongrueco ĉe resumo"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Interna eraro"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "Arkivo-dosiero ne en kapo"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " malsukcesis - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr "%s: eroro 0x%x)"
@@ -3561,30 +3569,30 @@ msgstr "preterlasita"
 msgid "failed"
 msgstr "malsukcesa"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr "Duobligita salutnomo aŭ identigilo por uzanto %s\n"
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr "Duobligita grupnomo aŭ identigilo por grupo %s\n"
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr "neniu stato"
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr "nekonato stato"
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "manka   %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Malkontentaj dependaĵoj por %s:\n"
diff --git a/po/es.po b/po/es.po
index e89beb62a..0e0953777 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/rpm-team/rpm/language/es/)\n"
@@ -1002,23 +1002,23 @@ msgstr ""
 "Se encontraron archivos instalados (pero desempaquetados):\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Procesando archivos: %s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, 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:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 "Binarios dependientes de la arquitectura en paquetes sin arquitectura\n"
@@ -1930,19 +1930,19 @@ msgstr "Fecha no válida %u"
 msgid "normal"
 msgstr "normal        "
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "reemplazado"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "no instalado"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "compartido en red"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "color incorrecto"
 
@@ -1954,26 +1954,26 @@ msgstr "no se encuentra"
 msgid "(unknown)"
 msgstr "(desconocido) "
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s guardado como %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s creado como %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr "%s %s: falló al eliminar: %s\n"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr "directorio"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr "archivo"
 
@@ -3055,104 +3055,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Magic erróneo"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Encabezado erróneo/imposible de leer"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "El tamaño del encabezado es demasiado extenso"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr "Archivo muy grande para compactar"
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Tipo de archivo desconocido"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "El digest no coincide"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Error interno"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "El fichero del archivo no se encuentra en el encabezado"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " falló - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3615,30 +3623,30 @@ msgstr "ignorado"
 msgid "failed"
 msgstr "falló"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "falta %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Dependencias no satisfechas para %s:\n"
diff --git a/po/fi.po b/po/fi.po
index 91d748d05..86a9bcd96 100644
--- a/po/fi.po
+++ b/po/fi.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Finnish (http://www.transifex.com/rpm-team/rpm/language/fi/)\n"
@@ -959,22 +959,22 @@ msgstr ""
 "Löytyi asennettuja (mutta paketoimattomia) tiedostoja:\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Käsitellään tiedostoja: %s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1874,19 +1874,19 @@ msgstr ""
 msgid "normal"
 msgstr "normaali"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "korvattu"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "ei asennettu"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "verkkojaettu"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "väärä väri"
 
@@ -1898,26 +1898,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr "(tuntematon)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s talletettiin %s:nä\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s luotu %s:na\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2985,104 +2985,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr ""
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Virheellinen otsikkotieto"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Otsikkotieto liian suuri"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Tuntematon tiedostotyyppi"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "Tarkistussumma ei täsmää"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Sisäinen virhe"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr ""
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " epäonnistui - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3539,30 +3547,30 @@ msgstr ""
 msgid "failed"
 msgstr "epäonnistui"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "puuttuva  %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Tyydyttämättömiä riippuvuuksia %s:lle:\n"
diff --git a/po/fr.po b/po/fr.po
index fe7af8ced..9cead8e0e 100644
--- a/po/fr.po
+++ b/po/fr.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:40+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: French (http://www.transifex.com/rpm-team/rpm/language/fr/)\n"
@@ -992,23 +992,23 @@ msgstr ""
 "Fichier(s) installé(s) (mais non empaquetés) :\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Traitement des fichiers : %s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, 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:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Binaires dépendants d'une arch dans un paquet noarch\n"
 
@@ -1916,19 +1916,19 @@ msgstr "Date invalide %u"
 msgid "normal"
 msgstr "normal"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "remplacé"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "pas installé"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "sur le réseau"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "fausse couleur"
 
@@ -1940,26 +1940,26 @@ msgstr "manquant"
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s sauvé en tant que %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s créé en tant que %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr "%s %s : échec de la suppression : %s\n"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr "répertoire"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr "fichier"
 
@@ -3045,104 +3045,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Mauvaise magie, blah"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Entête mauvais ou illisible"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Entête trop gros"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr "Fichier trop grand pour l'archive"
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Type de fichier inconnu"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr "Fichier(s) manquant(s)"
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "Digest ne correspond pas"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "L'entête ne contient pas le fichier archive"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " échec - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr "%s: (erreur 0x%x)"
@@ -3608,30 +3616,30 @@ msgstr "sauté"
 msgid "failed"
 msgstr "échoué"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr "pas d'état"
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr "état inconnu"
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "manque   %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Dépendances non satisfaites pour %s :\n"
diff --git a/po/id.po b/po/id.po
index 15105f3c2..376cbc850 100644
--- a/po/id.po
+++ b/po/id.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Indonesian (http://www.transifex.com/rpm-team/rpm/language/"
@@ -967,22 +967,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1882,19 +1882,19 @@ msgstr ""
 msgid "normal"
 msgstr ""
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr ""
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr ""
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1906,26 +1906,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2987,104 +2987,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr ""
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr ""
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr ""
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr ""
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr ""
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3539,30 +3547,30 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr ""
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 6ef533563..1ff813d94 100644
--- a/po/is.po
+++ b/po/is.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Icelandic (http://www.transifex.com/rpm-team/rpm/language/"
@@ -947,22 +947,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1862,19 +1862,19 @@ msgstr ""
 msgid "normal"
 msgstr ""
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr ""
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr ""
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1886,26 +1886,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s vistað sem %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s búið til sem %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2967,104 +2967,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr ""
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr ""
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr ""
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr ""
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr ""
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3519,30 +3527,30 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr ""
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 1f8a30716..fb7328549 100644
--- a/po/it.po
+++ b/po/it.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Italian (http://www.transifex.com/rpm-team/rpm/language/it/)\n"
@@ -997,23 +997,23 @@ msgstr ""
 "Trovati file installati (ma non inclusi nel pacchetto):\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Elaborazione file: %s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, 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:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Binari dipendenti dall'architettura presenti in un pacchetto noarch\n"
 
@@ -1920,19 +1920,19 @@ msgstr "Formato data %u non corretto"
 msgid "normal"
 msgstr "normale"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "sostituito"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "non installato"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "condivisa su rete"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "colore errato"
 
@@ -1944,26 +1944,26 @@ msgstr "mancanti"
 msgid "(unknown)"
 msgstr "(sconosciuto)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s salvato come %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s creato come %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr "%s %s: rimozione fallita: %s\n"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr "directory"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr "file"
 
@@ -3047,104 +3047,112 @@ msgstr ""
 msgid "Name required"
 msgstr "Nome richiesto"
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Bad magic"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Intestazione  errata/illeggibile"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Dimensione intestazione troppo grande"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr "FIle troppo grande per l'archivio"
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Tipo di file sconosciuto"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr "File mancante(i)"
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "Digest non corrispondente"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "File archive non è nell'intestazione"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " fallito - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr "%s: (errore 0x%x)"
@@ -3608,30 +3616,30 @@ msgstr "saltato"
 msgid "failed"
 msgstr "fallito"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr "Nome utente o UID duplicato per l'utente %s\n"
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr "Nome gruppo o GID duplicato per il gruppo %s\n"
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr "nessuno stato"
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr "stato sconosciuto"
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "%c %s  mancanti"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Dipendenze non soddisfatte per %s:\n"
diff --git a/po/ja.po b/po/ja.po
index 89074cc9a..0f4e76c12 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/rpm-team/rpm/language/"
@@ -969,24 +969,24 @@ msgstr ""
 "インストール済み(ただしパッケージに含まれない)ファイルが見つかりました:\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "ファイルの処理中: %s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 "バイナリのアーキテクチャー (%d) がパッケージのアーキテクチャー (%d) と一致し"
 "ません。\n"
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "noarch パッケージ内にアーキテクチャ依存のバイナリー\n"
 
@@ -1891,19 +1891,19 @@ msgstr "無効な日付 %u"
 msgid "normal"
 msgstr "通常"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "置換"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "未インストール"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "ネット共有"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "間違った色"
 
@@ -1915,26 +1915,26 @@ msgstr "見つかりません"
 msgid "(unknown)"
 msgstr "(不明)  "
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s は %s として保存されました。\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s は %s として作成されました。\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr "%s %s: 削除に失敗しました: %s\n"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr "ディレクトリー"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr "ファイル"
 
@@ -3006,104 +3006,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "不正なマジック"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "不正な/不可読なヘッダー"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "ヘッダーサイズが大きすぎます。"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr "ファイルがアーカイブのために大きすぎます"
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "不明なファイルタイプ"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "ダイジェストが適合しません"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "内部エラー"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "アーカイブファイルがヘッダーにありません。"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr "失敗 - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3565,30 +3573,30 @@ msgstr "スキップした"
 msgid "failed"
 msgstr "失敗"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "%c %s が見つかりません。"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "%s のための依存性を満たしていません。\n"
diff --git a/po/ko.po b/po/ko.po
index a037100b5..c20168ad0 100644
--- a/po/ko.po
+++ b/po/ko.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Korean (http://www.transifex.com/rpm-team/rpm/language/ko/)\n"
@@ -955,22 +955,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1871,19 +1871,19 @@ msgstr ""
 msgid "normal"
 msgstr ""
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr ""
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr ""
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1895,26 +1895,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s(이)가 %s(으)로 저장되었습니다\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s(이)가 %s(으)로 생성되었습니다\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2988,104 +2988,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "잘못된 magic 입니다"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "잘못된/읽을 수 없는 헤더입니다"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "헤더의 크기가 너무 큽니다"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "알 수 없는 파일 유형입니다"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "내부 오류"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "헤더에 아카이브 파일이 없습니다"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " 실패함 - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3541,30 +3549,30 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr ""
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 100f3b820..e3f9387de 100644
--- a/po/ms.po
+++ b/po/ms.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Malay (http://www.transifex.com/rpm-team/rpm/language/ms/)\n"
@@ -946,22 +946,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1861,19 +1861,19 @@ msgstr ""
 msgid "normal"
 msgstr ""
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr ""
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr ""
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1885,26 +1885,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2966,104 +2966,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr ""
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr ""
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr ""
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr ""
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr ""
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3518,30 +3526,30 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr ""
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Kebergantungan tidak dipenuhi untuk %s:\n"
diff --git a/po/nb.po b/po/nb.po
index 20d9d591d..5efbe52bf 100644
--- a/po/nb.po
+++ b/po/nb.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/rpm-team/rpm/"
@@ -957,22 +957,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1872,19 +1872,19 @@ msgstr ""
 msgid "normal"
 msgstr ""
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr ""
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr ""
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1896,26 +1896,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s lagret som %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s opprettet som %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2981,104 +2981,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Ugyldig magi"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Ugyldig/ulesbar header"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "For stor header"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Ukjent filtype"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr ""
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " feilet - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3533,30 +3541,30 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr ""
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 446cc7024..ebdc384a3 100644
--- a/po/nl.po
+++ b/po/nl.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Dutch (http://www.transifex.com/rpm-team/rpm/language/nl/)\n"
@@ -946,22 +946,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1861,19 +1861,19 @@ msgstr ""
 msgid "normal"
 msgstr ""
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr ""
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr ""
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1885,26 +1885,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2966,104 +2966,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr ""
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr ""
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Onbekend bestandstype"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Interne fout"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr ""
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " mislukt - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3518,30 +3526,30 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "ontbrekende   %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index e5fba2ebb..3551e5fbb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Polish (http://www.transifex.com/rpm-team/rpm/language/pl/)\n"
@@ -980,24 +980,24 @@ msgstr ""
 "Odnaleziono zainstalowane (ale niespakietowane) pliki:\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Przetwarzanie plików: %s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, 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:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Pliki binarne zależne od architektury w pakiecie noarch\n"
 
@@ -1903,19 +1903,19 @@ msgstr "Nieprawidłowa data %u"
 msgid "normal"
 msgstr "zwykły"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "zastąpiony"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "niezainstalowany"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "udostępniony w sieci"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "błędny kolor"
 
@@ -1927,26 +1927,26 @@ msgstr "brak"
 msgid "(unknown)"
 msgstr "(nieznany)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s zapisano jako %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s utworzono jako %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr "%s %s: usunięcie się nie powiodło: %s\n"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr "katalog"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr "plik"
 
@@ -3021,105 +3021,113 @@ msgstr "Nieznany operator złożonej zależności „%.*s”"
 msgid "Name required"
 msgstr "Nazwa jest wymagana"
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr "Złożona zależność nie zaczyna się od „(”"
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr "Brak parametru dla operatora złożonej zależności"
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr "Pusta złożona zależność"
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr "Niezakończona złożona zależność: %s"
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr "Nie można połączyć różnych operatorów"
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 #, fuzzy
 msgid "Can only chain and/or/with ops"
 msgstr "Można połączyć tylko operatory AND i OR"
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr "Błędne dane po złożonej zależności"
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Błędne magic"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Błędny/nieczytelny nagłówek"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Rozmiar nagłówka jest za duży"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr "Plik jest za duży dla archiwum"
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Nieznany typ pliku"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr "Brak plików"
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "Skrót nie zgadza się"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Wewnętrzny błąd"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "Plik archiwum nie znajduje się w nagłówku"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " się nie powiodło — "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr "%s: (błąd 0x%x)"
@@ -3575,30 +3583,30 @@ msgstr "pominięto"
 msgid "failed"
 msgstr "się nie powiodło"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr "Podwójna nazwa użytkownika lub UID dla użytkownika %s\n"
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr "Podwójna nazwa grupy lub GID dla grupy %s\n"
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr "brak stanu"
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr "nieznany stan"
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "brak   %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Niespełnione zależności dla %s:\n"
diff --git a/po/pt.po b/po/pt.po
index 52b0a0338..5aa0d2a0d 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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+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/"
@@ -966,22 +966,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1881,19 +1881,19 @@ msgstr ""
 msgid "normal"
 msgstr ""
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr ""
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr ""
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1905,26 +1905,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s gravado como %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s criado como %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2995,104 +2995,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Código de integridade inválido"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Cabeçalho inválido/ilegível"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Tamanho do cabeçalho demasiado grande"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Tipo de ficheiro desconhecido"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "Ficheiro de arquivo não está no cabeçalho"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " falhou - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3550,30 +3558,30 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr ""
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 53cf47823..9aaa90d2b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/rpm-team/rpm/"
@@ -986,22 +986,22 @@ msgstr ""
 "Arquivo(s) instalado(s) (mas não empacotado(s)) encontrado(s):\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Processando arquivos: %s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Binários dependentes de arquitetura no pacote noarch\n"
 
@@ -1902,19 +1902,19 @@ msgstr ""
 msgid "normal"
 msgstr "normal"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "substituído"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "não instalado"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "compartilhado pela rede"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "cor errada"
 
@@ -1926,26 +1926,26 @@ msgstr "faltando"
 msgid "(unknown)"
 msgstr "(desconhecido)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s salvo como %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s criado como %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -3022,104 +3022,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Magic inválido"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Cabeçalho inválido/impossível de ler"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Tamanho do cabeçalho muito grande"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Tipo de arquivo desconhecido"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "Digest incompatível"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "Arquivo de pacote não está no cabeçalho"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " falhou - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3577,30 +3585,30 @@ msgstr "ignorado"
 msgid "failed"
 msgstr "falhou"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "%c %s faltando"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Dependências não satisfeitas para %s:\n"
diff --git a/po/rpm.pot b/po/rpm.pot
index 1aac26934..d9f019fcc 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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+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"
@@ -946,22 +946,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1861,19 +1861,19 @@ msgstr ""
 msgid "normal"
 msgstr ""
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr ""
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr ""
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1885,26 +1885,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2966,104 +2966,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr ""
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr ""
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr ""
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr ""
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr ""
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3518,30 +3526,30 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr ""
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 07c4e47ac..f560c51b7 100644
--- a/po/ru.po
+++ b/po/ru.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Russian (http://www.transifex.com/rpm-team/rpm/language/ru/)\n"
@@ -977,22 +977,22 @@ msgstr ""
 "Обнаружен(ы) установленный(е) (но не упакованный(е)) файл(ы):\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Двоичные данные с архитектурой в пакете noarch\n"
 
@@ -1893,19 +1893,19 @@ msgstr "Неверная дата %u"
 msgid "normal"
 msgstr "нормальный"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "перемещен"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "не установлен"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1917,26 +1917,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr "(неизвестный)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s сохранен как %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s создан как %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -3005,104 +3005,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Неверный magic"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Неверный/нечитаемый заголовок"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Заголовок слишком велик"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Неизвестный тип файла"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr "Отсутствует файл(ы)"
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "Файл архива не найден в заголовке пакета"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " не удалось - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr "%s: (ошибка 0x%x)"
@@ -3558,30 +3566,30 @@ msgstr "пропущено"
 msgid "failed"
 msgstr "не удалось"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr ""
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 5ecc9e1c3..864b58433 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Slovak (http://www.transifex.com/rpm-team/rpm/language/sk/)\n"
@@ -971,22 +971,22 @@ msgstr ""
 "Nájdené nainštalované (ale nezabalené) súbory:\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Spracovávajú sa súbory: %s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Binárky závislé na architektúre v bezarchitektúrnom balíčku\n"
 
@@ -1887,19 +1887,19 @@ msgstr ""
 msgid "normal"
 msgstr "normálny"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "nahradený"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "nenainštalovaný"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "zdieľaný sieťou"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "zlá farba"
 
@@ -1911,26 +1911,26 @@ msgstr "chýbajúci"
 msgid "(unknown)"
 msgstr "(neznámy)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s uložený ako %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s vytvorený ako %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2998,104 +2998,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Chybné magické číslo"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Chybná/nečitateľná hlavička"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Priveľká hlavička"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Neznámy typ súboru"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "Prehľad sa nezhoduje"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Interná chyba"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "Súbor z archívu nie je v hlavičke"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " zlyhalo - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3551,30 +3559,30 @@ msgstr "preskočené"
 msgid "failed"
 msgstr "zlyhané"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "chýba   %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Nesplené závislosti pre %s:\n"
diff --git a/po/sl.po b/po/sl.po
index 87e7b8744..ed419fb3c 100644
--- a/po/sl.po
+++ b/po/sl.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Slovenian (http://www.transifex.com/rpm-team/rpm/language/"
@@ -948,22 +948,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1865,19 +1865,19 @@ msgstr ""
 msgid "normal"
 msgstr ""
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr ""
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr ""
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1889,26 +1889,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2976,104 +2976,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Napačno magično število"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Poškodovana/neberljiva glava"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Glava je predolga"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Neznan tip datoteke"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Notranja napaka"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr ""
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " neuspešno - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3528,30 +3536,30 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr ""
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 4b4cd1794..0cf6aa400 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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+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"
@@ -962,22 +962,22 @@ msgstr ""
 "Пронађене су инсталиране (али незапаковане) датотеке:\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Бинарне датотеке зависне од архитектуре у noarch пакету\n"
 
@@ -1877,19 +1877,19 @@ msgstr ""
 msgid "normal"
 msgstr ""
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr ""
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr ""
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1901,26 +1901,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s сачувано као %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s направљено као %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2991,104 +2991,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Лош magic"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Лоше/нечитљиво  заглавље"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Превелика величина заглавља"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Непозната врста датотеке"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Интерна грешка"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "Датотека архиве није у заглављу"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " неуспело - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3544,30 +3552,30 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "недостаје   %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Незадовољене зависности за %s:\n"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 7dc13922e..ed9460108 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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+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/"
@@ -964,22 +964,22 @@ msgstr ""
 "Pronađene su instalirane (ali nezapakovane) datoteke:\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Binarne datoteke zavisne od arhitekture u noarch paketu\n"
 
@@ -1879,19 +1879,19 @@ msgstr ""
 msgid "normal"
 msgstr ""
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr ""
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr ""
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1903,26 +1903,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s sačuvano kao %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s napravljeno kao %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2994,104 +2994,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Loš magic"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Loše/nečitljivo  zaglavlje"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Prevelika veličina zaglavlja"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Nepoznata vrsta datoteke"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Interna greška"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "Datoteka arhive nije u zaglavlju"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " neuspelo - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3547,30 +3555,30 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "nedostaje   %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Nezadovoljene zavisnosti za %s:\n"
diff --git a/po/sv.po b/po/sv.po
index a048518b5..d04c56a52 100644
--- a/po/sv.po
+++ b/po/sv.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/rpm-team/rpm/language/sv/)\n"
@@ -967,22 +967,22 @@ msgstr ""
 "Installerade (men opaketerade) filer funna:\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Bearberar filer: %s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, 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:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Arkitekturberoende binärfiler i noarch-paket\n"
 
@@ -1883,19 +1883,19 @@ msgstr "Ogiltig tidpunkt %u"
 msgid "normal"
 msgstr "normal"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "ersatt"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "inte installerad"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "nätdelad"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "fel färg"
 
@@ -1907,26 +1907,26 @@ msgstr "saknas"
 msgid "(unknown)"
 msgstr "(okänd)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s sparades som %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s skapades som %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr "%s %s: borttagande misslyckades: %s\n"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr "katalog"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr "fil"
 
@@ -2994,105 +2994,113 @@ msgstr "Okänt rikt-beroende-op ”%.*s”"
 msgid "Name required"
 msgstr "Namn behövs"
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr "Rikt beroende börjar inte med ”(”"
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr "Argument saknas till rikt-beroende-op"
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr "Tomt rikt beroende"
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr "Oavslutat rikt beroende: %s"
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr "Kan inte kedja olika operatorer"
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 #, fuzzy
 msgid "Can only chain and/or/with ops"
 msgstr "Kan endast kedja AND- och OR-operatorer"
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr "Skräp efter rikt beroende"
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Felaktigt magiskt tal"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Felaktigt/oläsbart huvud"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Huvudstorleken för stor"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr "Filen är för stor att arkivera"
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Okänd filtyp"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr "Saknade filer"
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "Kontrollsumman stämmer inte"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Internt fel"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "Ingen arkivfilen i huvud"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " misslyckades - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr "%s: (fel 0x%x)"
@@ -3547,30 +3555,30 @@ msgstr "hoppade över"
 msgid "failed"
 msgstr "misslyckades"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr "Dubblerat användarnamn eller UID för användaren %s\n"
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr "Dubblerat gruppnamn eller GID för gruppen %s\n"
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr "inget tillstånd"
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr "okänt tillstånd"
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "saknas    %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Ouppfyllda beroenden för %s:\n"
diff --git a/po/te.po b/po/te.po
index d4c169036..4070eba68 100644
--- a/po/te.po
+++ b/po/te.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Telugu (http://www.transifex.com/rpm-team/rpm/language/te/)\n"
@@ -951,22 +951,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr ""
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1866,19 +1866,19 @@ msgstr ""
 msgid "normal"
 msgstr ""
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr ""
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr ""
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr ""
 
@@ -1890,26 +1890,26 @@ msgstr ""
 msgid "(unknown)"
 msgstr ""
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr ""
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr ""
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2971,104 +2971,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr ""
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr ""
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr ""
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "తెలియని ఫైల్ రకం"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr ""
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr ""
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr ""
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3523,30 +3531,30 @@ msgstr ""
 msgid "failed"
 msgstr ""
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr ""
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index a986efd72..0fe7c4d6d 100644
--- a/po/tr.po
+++ b/po/tr.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Turkish (http://www.transifex.com/rpm-team/rpm/language/tr/)\n"
@@ -973,22 +973,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Dosyalar işleniyor: %s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr ""
 
@@ -1888,19 +1888,19 @@ msgstr ""
 msgid "normal"
 msgstr "normal"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr ""
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "kurulmamış"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr ""
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "yanlış renk"
 
@@ -1912,26 +1912,26 @@ msgstr "eksik"
 msgid "(unknown)"
 msgstr "(bilinmiyor)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s %s olarak kaydedildi\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s %s olarak oluşturuldu\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr "dizin"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr "dosya"
 
@@ -2999,104 +2999,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Magic hatalı"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Hatalı/okunamayan başlık"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Başlık çok uzun"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr "Dosya arşiv için çok büyük"
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Bilinmeyen dosya türü"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr ""
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "İç hata"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr ""
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " başarısız - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3551,30 +3559,30 @@ msgstr "atlandı"
 msgid "failed"
 msgstr "başarısız oldu"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr "bilinmeyen durum"
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "eksik   %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 3dfb8dea8..655f659d2 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/rpm-team/rpm/language/"
@@ -992,24 +992,24 @@ msgstr ""
 "Виявлено встановлені (але не запаковані) файли:\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Обробка файлів: %s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 "Архітектура виконуваних файлів (%d) не збігається з архітектурою пакунка "
 "(%d).\n"
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "Виявлено залежні від архітектури бінарні файли у пакунку noarch\n"
 
@@ -1920,19 +1920,19 @@ msgstr "Некоректна дата %u"
 msgid "normal"
 msgstr "звичайний"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "замінено"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "не встановлено"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "мережевий"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "помилковий колір"
 
@@ -1944,26 +1944,26 @@ msgstr "немає"
 msgid "(unknown)"
 msgstr "(невідомо)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s збережено як %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s створено як %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr "%s %s: спроба вилучення зазнала невдачі: %s\n"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr "каталог"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr "файл"
 
@@ -3044,105 +3044,113 @@ msgstr "Невідома дія для розширеної залежності
 msgid "Name required"
 msgstr "Потрібна назва"
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr "Розширена залежність не починається з «(»"
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr "Пропущено аргумент до дії із розширеною залежністю"
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr "Порожня розширена залежність"
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr "Незавершений запис розширеної залежності: %s"
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr "Не можна створювати ланцюжок із різних дій"
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 #, fuzzy
 msgid "Can only chain and/or/with ops"
 msgstr "Ланцюжок можна створювати лише з дій AND і OR"
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr "Зайві дані після запису розширеної залежності"
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Помилкове значення magic"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Помилковий/Непридатний до читання заголовок"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Розмір заголовка занадто великий"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr "Файл є занадто великим для архівування"
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Невідомий тип файла"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr "Не вистачає файлів"
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "Невідповідність контрольних сум"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "Файла архіву не вказано у заголовку"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " помилка - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr "%s: (помилка 0x%x)"
@@ -3600,30 +3608,30 @@ msgstr "пропущено"
 msgid "failed"
 msgstr "невдача"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr "Дублювання імені користувача або UID для користувача %s\n"
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr "Дублювання назви групи або GID для групи %s\n"
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr "немає стану"
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr "невідомий стан"
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "не вистачає   %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Незадоволені залежності для %s:\n"
diff --git a/po/vi.po b/po/vi.po
index 69a259273..19932d102 100644
--- a/po/vi.po
+++ b/po/vi.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/rpm-team/rpm/language/"
@@ -1007,22 +1007,22 @@ msgstr ""
 "Tìm thấy tập tin đã cài đặt (nhưng chưa đóng gói):\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "Đang xử lý tập tin: %s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, 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:3094
+#: build/files.c:3124
 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"
 
@@ -1928,19 +1928,19 @@ msgstr "Ngày không hợp lệ %u"
 msgid "normal"
 msgstr "thông thường"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "đã thay thế"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "chưa cài đặt"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "chia sẻ qua mạng"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "màu sai"
 
@@ -1952,26 +1952,26 @@ msgstr "thiếu"
 msgid "(unknown)"
 msgstr "(không hiểu)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s được lưu dạng %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s được tạo dạng %s\n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr "%s %s: gặp lỗi khi gỡ bỏ: %s\n"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr "thư mục"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr "tập tin"
 
@@ -3049,105 +3049,113 @@ msgstr "Không hiểu toán tử phụ thuộc dồi dào '%.*s'"
 msgid "Name required"
 msgstr "Cần có tên"
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr "Phụ thuộc dồi dào không bắt đầu bằng “(”"
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr "Thiếu tham số cho toán tử phụ thuộc dồi dào"
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr "Phần phụ thuộc dồi dào trống rỗng"
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr "Phần phụ thuộc dồi dào chưa chấm dứt: %s"
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr "Không thể móc xích các toán tử khác nhau"
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 #, fuzzy
 msgid "Can only chain and/or/with ops"
 msgstr "Chỉ có thể móc xích toán tử AND và OR"
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr "Gặp rác ở cuối phần phụ thuộc dồi dào"
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Ma thuật sai"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "Phần đầu sai hoặc không đọc được"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "Kích cỡ phần đầu quá lớn "
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr "Tập tin quá lớn để nén"
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "Không rõ kiểu tập tin"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr "Thiếu các tập tin"
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "Mã băm tập tin không khớp"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "Lỗi nội bộ"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "Tập tin kho lưu không phải trong phần đầu"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " bị lỗi — "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr "%s: (lỗi 0x%x)"
@@ -3602,30 +3610,30 @@ msgstr "bị bỏ qua"
 msgid "failed"
 msgstr "gặp lỗi"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr "Trùng tài khoản hoặc mã số người dùng cho tài khoản %s\n"
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr "Trùng tên nhóm hoặc mã số nhóm cho nhóm %s\n"
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr "không có tình trạng"
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr "trạng thái không rõ"
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "thiếu   %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "Quan hệ phụ thuộc chưa thỏa đối với %s:\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b6540bbf8..6ae9e342f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM\n"
 "Report-Msgid-Bugs-To: rpm-maint@lists.rpm.org\n"
-"POT-Creation-Date: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/rpm-team/rpm/"
@@ -970,22 +970,22 @@ msgstr ""
 "发现已安装(但未打包的)文件：\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "处理文件：%s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr "二进制架构 (%d) 和软件包构架 (%d)不匹配。\n"
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "noarch 软件包中有架构相关的二进制文件\n"
 
@@ -1887,19 +1887,19 @@ msgstr "无效日期%u"
 msgid "normal"
 msgstr "正常"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "已被替换"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "未安装"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "网络共享"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "错误颜色"
 
@@ -1911,26 +1911,26 @@ msgstr "丢失"
 msgid "(unknown)"
 msgstr "(未知)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s 已另存为 %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s 已建立为 %s \n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr "%s %s：移除失败：%s\n"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr "目录"
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr "文件"
 
@@ -2994,104 +2994,112 @@ msgstr "未知的富依赖关系操作符“%.*s”"
 msgid "Name required"
 msgstr "名称是必填项"
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr "富依赖关系未以“(”开头"
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr "富依赖关系操作符缺少参数"
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr "富依赖关系为空"
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr "富依赖关系缺少结尾：%s"
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr "富依赖关系后有多余内容"
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "Bad magic"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "错误/不可读的  头部"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "头部太大"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr "对于压缩文件来说文件太大了"
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "未知文件类型"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr "丢失文件"
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "摘要不匹配"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "内部错误"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "在头中不存在归档"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " 失败 - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr "%s：(错误 0x%x)"
@@ -3546,30 +3554,30 @@ msgstr "已跳过"
 msgid "failed"
 msgstr "已失败"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr "用户 %s 存在重复的用户名或 UID\n"
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr "用户组 %s 存在重复的组名或 GID\n"
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr "没有状态"
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr "未知状态"
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "遗漏   %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr "未满足的依赖关系 %s：\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d6ee9dde3..8540ef813 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.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: 2017-09-06 14:15+0300\n"
+"POT-Creation-Date: 2017-09-28 16:29+0300\n"
 "PO-Revision-Date: 2017-08-10 07:39+0000\n"
 "Last-Translator: pmatilai <pmatilai@laiskiainen.org>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/rpm-team/rpm/"
@@ -954,22 +954,22 @@ msgstr ""
 "找到已安裝 (但未打包) 的檔案：\n"
 "%s"
 
-#: build/files.c:2843
+#: build/files.c:2847
 #, c-format
 msgid "%s was mapped to multiple filenames"
 msgstr ""
 
-#: build/files.c:3067
+#: build/files.c:3096
 #, c-format
 msgid "Processing files: %s\n"
 msgstr "正在處理檔案：%s\n"
 
-#: build/files.c:3088
+#: build/files.c:3118
 #, c-format
 msgid "Binaries arch (%d) not matching the package arch (%d).\n"
 msgstr ""
 
-#: build/files.c:3094
+#: build/files.c:3124
 msgid "Arch dependent binaries in noarch package\n"
 msgstr "noarch 軟體包中有架構依賴二進位檔\n"
 
@@ -1869,19 +1869,19 @@ msgstr ""
 msgid "normal"
 msgstr "一般"
 
-#: lib/formats.c:420 lib/verify.c:383
+#: lib/formats.c:420 lib/verify.c:392
 msgid "replaced"
 msgstr "已替換"
 
-#: lib/formats.c:423 lib/verify.c:377
+#: lib/formats.c:423 lib/verify.c:386
 msgid "not installed"
 msgstr "未安裝"
 
-#: lib/formats.c:426 lib/verify.c:379
+#: lib/formats.c:426 lib/verify.c:388
 msgid "net shared"
 msgstr "已網路分享"
 
-#: lib/formats.c:429 lib/verify.c:381
+#: lib/formats.c:429 lib/verify.c:390
 msgid "wrong color"
 msgstr "錯誤色彩"
 
@@ -1893,26 +1893,26 @@ msgstr "遺失"
 msgid "(unknown)"
 msgstr "(未知)"
 
-#: lib/fsm.c:711
+#: lib/fsm.c:742
 #, c-format
 msgid "%s saved as %s\n"
 msgstr "%s 已被另存為 %s\n"
 
-#: lib/fsm.c:764
+#: lib/fsm.c:795
 #, c-format
 msgid "%s created as %s\n"
 msgstr "%s 已建立為 %s \n"
 
-#: lib/fsm.c:1046
+#: lib/fsm.c:1077
 #, c-format
 msgid "%s %s: remove failed: %s\n"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "directory"
 msgstr ""
 
-#: lib/fsm.c:1047
+#: lib/fsm.c:1078
 msgid "file"
 msgstr ""
 
@@ -2976,104 +2976,112 @@ msgstr ""
 msgid "Name required"
 msgstr ""
 
-#: lib/rpmds.c:1489
+#: lib/rpmds.c:1488
+msgid "Illegal ops in with/without"
+msgstr ""
+
+#: lib/rpmds.c:1495
+msgid "Illegal context for 'unless', please use 'or' instead"
+msgstr ""
+
+#: lib/rpmds.c:1500
+msgid "Illegal context for 'if', please use 'and' instead"
+msgstr ""
+
+#: lib/rpmds.c:1516
 msgid "Rich dependency does not start with '('"
 msgstr ""
 
-#: lib/rpmds.c:1497
+#: lib/rpmds.c:1524
 msgid "Missing argument to rich dependency op"
 msgstr ""
 
-#: lib/rpmds.c:1499
+#: lib/rpmds.c:1526
 msgid "Empty rich dependency"
 msgstr ""
 
-#: lib/rpmds.c:1513
+#: lib/rpmds.c:1544
 #, c-format
 msgid "Unterminated rich dependency: %s"
 msgstr ""
 
-#: lib/rpmds.c:1525
+#: lib/rpmds.c:1559
 msgid "Cannot chain different ops"
 msgstr ""
 
-#: lib/rpmds.c:1531
+#: lib/rpmds.c:1564
 msgid "Can only chain and/or/with ops"
 msgstr ""
 
-#: lib/rpmds.c:1543
-msgid "Illegal ops in with/without"
-msgstr ""
-
-#: lib/rpmds.c:1632
+#: lib/rpmds.c:1695
 msgid "Junk after rich dependency"
 msgstr ""
 
-#: lib/rpmfi.c:804
+#: lib/rpmfi.c:810
 #, c-format
 msgid "user %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:811
+#: lib/rpmfi.c:817
 #, c-format
 msgid "group %s does not exist - using %s\n"
 msgstr ""
 
-#: lib/rpmfi.c:1368
+#: lib/rpmfi.c:1374
 #, c-format
 msgid "Wrong number of entries for tag %s: %u found but %u expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:1373
+#: lib/rpmfi.c:1379
 #, c-format
 msgid "Malformed data for tag %s: %u bytes found but %lu expected.\n"
 msgstr ""
 
-#: lib/rpmfi.c:2341
+#: lib/rpmfi.c:2348
 msgid "Bad magic"
 msgstr "不良魔法數字"
 
-#: lib/rpmfi.c:2342
+#: lib/rpmfi.c:2349
 msgid "Bad/unreadable  header"
 msgstr "不良或無法讀取的表頭"
 
-#: lib/rpmfi.c:2365
+#: lib/rpmfi.c:2372
 msgid "Header size too big"
 msgstr "表頭大小過大"
 
-#: lib/rpmfi.c:2366
+#: lib/rpmfi.c:2373
 msgid "File too large for archive"
 msgstr ""
 
-#: lib/rpmfi.c:2367
+#: lib/rpmfi.c:2374
 msgid "Unknown file type"
 msgstr "未知檔案類型"
 
-#: lib/rpmfi.c:2368
+#: lib/rpmfi.c:2375
 msgid "Missing file(s)"
 msgstr ""
 
-#: lib/rpmfi.c:2369
+#: lib/rpmfi.c:2376
 msgid "Digest mismatch"
 msgstr "摘要不符"
 
-#: lib/rpmfi.c:2370
+#: lib/rpmfi.c:2377
 msgid "Internal error"
 msgstr "內部錯誤"
 
-#: lib/rpmfi.c:2371
+#: lib/rpmfi.c:2378
 msgid "Archive file not in header"
 msgstr "在表頭中沒有封存檔"
 
-#: lib/rpmfi.c:2375
+#: lib/rpmfi.c:2382
 msgid "File from package already exists as a directory in system"
 msgstr ""
 
-#: lib/rpmfi.c:2382
+#: lib/rpmfi.c:2389
 msgid " failed - "
 msgstr " 失敗 - "
 
-#: lib/rpmfi.c:2385
+#: lib/rpmfi.c:2392
 #, c-format
 msgid "%s: (error 0x%x)"
 msgstr ""
@@ -3528,30 +3536,30 @@ msgstr "已跳過"
 msgid "failed"
 msgstr "已失敗"
 
-#: lib/verify.c:254
+#: lib/verify.c:263
 #, c-format
 msgid "Duplicate username or UID for user %s\n"
 msgstr ""
 
-#: lib/verify.c:275
+#: lib/verify.c:284
 #, c-format
 msgid "Duplicate groupname or GID for group %s\n"
 msgstr ""
 
-#: lib/verify.c:385
+#: lib/verify.c:394
 msgid "no state"
 msgstr ""
 
-#: lib/verify.c:387
+#: lib/verify.c:396
 msgid "unknown state"
 msgstr ""
 
-#: lib/verify.c:438
+#: lib/verify.c:447
 #, c-format
 msgid "missing   %c %s"
 msgstr "遺漏      %c %s"
 
-#: lib/verify.c:488
+#: lib/verify.c:497
 #, c-format
 msgid "Unsatisfied dependencies for %s:\n"
 msgstr ""