trivial: Sync translations and remove line numbers

This will mean we get smaller release diffs in the future.

30 files changed, 6111 insertions, 10686 deletions

diff --git a/RELEASE b/RELEASE
index 106c939..d010181 100644
--- a/RELEASE
+++ b/RELEASE
@@ -21,6 +21,9 @@ Bugfixes:
 ninja-build appstream-glib-pot
 zanata push
 zanata pull --min-doc-percent=5
+for f in po/*.po; do
+msgattrib --no-location --translated --no-wrap --sort-output $f --output-file=$f
+done
 git add po/*.po
 
 3. Update library version if new ABI or API in meson.build
diff --git a/po/ca.po b/po/ca.po
index b435bcc..dd7bce2 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2018-04-29 01:49+0000\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/freedesktop/appstream-glib/language/ca/)\n"
@@ -24,506 +24,399 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Mostra la informació extra de depuració"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Afegeix les icones HiDPI als arxius tar"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Afegeix un id. de memòria cau a cadascun dels components"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Inclou els resultats fallits a la sortida"
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "Afegeix un idioma a un fitxer d'origen"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Afegeix les icones HiDPI als arxius tar"
+#. TRANSLATORS: command description
+msgid "Add a provide to a source file"
+msgstr "Afegeix un proporciona a un fitxer d'origen"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Afegeix les icones codificades al XML"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "No comprimeix les icones en un arxiu tar"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Estableix el directori d'enregistrament"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Afegit"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Estableix el directori dels paquets"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Àlies a %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Estableix el directori temporal"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Utilitat d'AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Estableix el directori de la sortida"
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "Cancel·lat"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Estableix el directori de les icones"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Comprova les dades de les aplicacions instal·lades"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Estableix el directori de la memòria cau"
+msgid "Command not found, valid commands are:"
+msgstr "No s'ha trobat l'ordre, les ordres vàlides són:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Estableix la base dels noms per als fitxers de sortida"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Compara el contingut de dos fitxers AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Estableix el nom d'origen"
+#. TRANSLATORS: command description
+msgid "Compare version numbers"
+msgstr "Compara els números de les versions"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Estableix el nombre de fils d'execució"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "La conversió de %s a %s no està implementada"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Estableix la mida màxima de la icona en píxels"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Converteix un fitxer AppData al format NEWS"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Estableix la ubicació de les metadades antigues"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Converteix un fitxer NEWS al format AppData"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "No facis cas de certs tipus de vetos"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Converteix les metadades AppStream d'una versió a una altra"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "No s'han pogut analitzar els arguments"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Crea un document CSV de l'estat"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "No s'ha pogut preparar el constructor"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Crea una pàgina HTML amb la taula"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "No s'han pogut obrir els paquets"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Crea una pàgina HTML de l'estat"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "S'estan escanejant els paquets..."
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Crea un fitxer Appdata d'exemple des d'un fitxer .desktop"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "No s'ha pogut afegir el paquet"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Mostra els marcadors de cerca de l'aplicació"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr "S'han analitzat %u/%u fitxers..."
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "No comprimeix les icones en un arxiu tar"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "No s'han pogut generar les metadades"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "No utilitzis l'accés a la xarxa"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Fet!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "S'està desant la icona"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Bolca les aplicacions a les metadades AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Estableix el prefix"
+msgid "Enable profiling"
+msgstr "Habilita el perfilament"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "S'està processant l'aplicació"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "S'ha produït un error en crear el directori de sortida"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "S'ha produït un error en carregar el fitxer AppData"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "S'ha produït un error en analitzar sintàcticament les transaccions"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "S'ha produït un error en carregar el fitxer d'escriptori"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "S'ha produït un error en analitzar sintàcticament kudos"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "S'ha produït un error en analitzar sintàcticament provides"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "S'ha produït un error en carregar el fitxer d'escriptori"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "S'ha produït un error en crear el directori de sortida"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "S'està desant l'AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "S'ha produït un error en analitzar sintàcticament les transaccions"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "S'ha produït un error en desar el fitxer d'AppStream"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Àlies a %s"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "No s'ha trobat l'ordre, les ordres vàlides són:"
+#. TRANSLATORS: command description
+msgid "Exports the agreement to text"
+msgstr "Exporta l'acord al text"
 
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr ""
-"Si us plau, reviseu el fitxer i corregiu qualsevol dels elements «FIXME»"
+#. list failures
+msgid "FAILED"
+msgstr "FALLIT"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Versió antiga de l'API"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "No s'ha pogut afegir el paquet"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Nova versió de l'API"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "No s'han pogut generar les metadades"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "No hi ha prou arguments, s'esperaven els fitxers antic.xml nou.xml"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "No s'han pogut obrir els paquets"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "La conversió de %s a %s no està implementada"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "No s'han pogut analitzar els arguments"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "No hi ha prou arguments, s'esperava el fitxer.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "No s'ha pogut preparar el constructor"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "No es pot actualitzar el format de fitxer «%s»"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Format no reconegut"
 
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Genera un GUID a partir d'una cadena de text"
+
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "No facis cas de certs tipus de vetos"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Importa un fitxer al llenguatge de marques d'AppStream"
+
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "Inclou els resultats fallits a la sortida"
+
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "Incorpora dades extres des d'un fitxer extern"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Instal·la les metadades AppStream"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Instal·la les metadades AppStream amb un origen nou"
+
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Llista les aplicacions que no compten amb el suport dels paquets"
+
+#. TRANSLATORS: command description
+msgid "Merge several files to an AppStream file"
+msgstr "Combina diversos fitxers a un fitxer AppStream"
+
+#. TRANSLATORS: command description
+msgid "Mirror upstream screenshots"
+msgstr "Crea una rèplica de les captures de pantalla de la línia de treball principal"
+
+#. TRANSLATORS: command description
+msgid "Modify an AppData file"
+msgstr "Modifica un fitxer AppStream"
+
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Nova versió de l'API"
+
 #. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
 msgid "No desktop applications found"
 msgstr "No s'han trobat aplicacions d'escriptori"
 
+msgid "Not enough arguments, expected file.xml"
+msgstr "No hi ha prou arguments, s'esperava el fitxer.xml"
+
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "No hi ha prou arguments, s'esperaven els fitxers antic.xml nou.xml"
+
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "CORRECTE"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "FALLIT"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Versió antiga de l'API"
 
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Ha fallat la validació"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %u/%u files..."
+msgstr "S'han analitzat %u/%u fitxers..."
 
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Ha fallat la validació dels fitxers"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Si us plau, reviseu el fitxer i corregiu qualsevol dels elements «FIXME»"
+
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "S'està processant l'aplicació"
 
 #. TRANSLATORS: application was removed
-#: client/as-util.c:4053
 msgid "Removed"
 msgstr "Suprimit"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Afegit"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "Cancel·lat"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "No utilitzis l'accés a la xarxa"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Mostra la versió"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Habilita el perfilament"
-
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Converteix les metadades AppStream d'una versió a una altra"
+msgid "Replace screenshots in source file"
+msgstr "Substitueix les captures de pantalles en un fitxer d'origen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr ""
-"Actualitza a nivell de llançament les metadades AppData a l'última versió"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "S'està desant l'AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Crea un fitxer Appdata d'exemple des d'un fitxer .desktop"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "S'està desant la icona"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Bolca les aplicacions a les metadades AppStream"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "S'estan escanejant els paquets..."
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
 msgid "Search for AppStream applications"
 msgstr "Cerca aplicacions AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "Cerca aplicacions AppStream pel nom del paquet"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "Mostra totes les aplicacions AppStream instal·lades"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
 msgid "Search for AppStream applications by category name"
 msgstr "Cerca aplicacions AppStream pel nom de la categoria"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Mostra els marcadors de cerca de l'aplicació"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Instal·la les metadades AppStream"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Instal·la les metadades AppStream amb un origen nou"
+msgid "Search for AppStream applications by package name"
+msgstr "Cerca aplicacions AppStream pel nom del paquet"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Desinstal·la les metadades AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Estableix la base dels noms per als fitxers de sortida"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Crea una pàgina HTML de l'estat"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Estableix el directori de la memòria cau"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Crea un document CSV de l'estat"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Estableix el directori de les icones"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Crea una pàgina HTML amb la taula"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Estableix el directori d'enregistrament"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Llista les aplicacions que no compten amb el suport dels paquets"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Estableix la mida màxima de la icona en píxels"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Valida un fitxer AppData o AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Estableix el nombre de fils d'execució"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Valida un fitxer AppData o AppStream (relaxat)"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Estableix la ubicació de les metadades antigues"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr "Exporta l'acord al text"
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Estableix el nom d'origen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Valida un fitxer AppData o AppStream (estricte)"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Estableix el directori de la sortida"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Converteix un fitxer AppData al format NEWS"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Estableix el directori dels paquets"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Converteix un fitxer NEWS al format AppData"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Estableix el prefix"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Comprova les dades de les aplicacions instal·lades"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Estableix el directori temporal"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr "comprova una aplicació instal·lada"
+msgid "Show all installed AppStream applications"
+msgstr "Mostra totes les aplicacions AppStream instal·lades"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Substitueix les captures de pantalles en un fitxer d'origen"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Mostra la informació extra de depuració"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr "Afegeix un proporciona a un fitxer d'origen"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Mostra la versió"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "Afegeix un idioma a un fitxer d'origen"
+msgid "Split an AppStream file to AppData and Metainfo files"
+msgstr "Descompon un fitxer AppStream als fitxers AppData i Metainfo"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr ""
-"Crea una rèplica de les captures de pantalla de la línia de treball "
-"principal"
+msgid "Test a regular expression"
+msgstr "Prova una expressió regular"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Crea una rèplica dels fitxers locals de microprogramari"
+msgid "Uninstalls AppStream metadata"
+msgstr "Desinstal·la les metadades AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Incorpora dades extres des d'un fitxer extern"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Actualitza a nivell de llançament les metadades AppData a l'última versió"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Compara el contingut de dos fitxers AppStream"
+msgid "Validate an AppData or AppStream file"
+msgstr "Valida un fitxer AppData o AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Genera un GUID a partir d'una cadena de text"
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Valida un fitxer AppData o AppStream (relaxat)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Modifica un fitxer AppStream"
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Valida un fitxer AppData o AppStream (estricte)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr "Descompon un fitxer AppStream als fitxers AppData i Metainfo"
+msgid "Validation failed"
+msgstr "Ha fallat la validació"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Combina diversos fitxers a un fitxer AppStream"
+msgid "Validation of files failed"
+msgstr "Ha fallat la validació dels fitxers"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Importa un fitxer al llenguatge de marques d'AppStream"
+msgid "Version:"
+msgstr "Versió:"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
 msgid "Watch AppStream locations for changes"
 msgstr "Observa les ubicacions AppStream per si hi ha canvis"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr "Compara els números de les versions"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr "Prova una expressió regular"
-
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Utilitat d'AppStream"
-
-#: client/as-util.c:4705
-msgid "Version:"
-msgstr "Versió:"
+msgid "check an installed application"
+msgstr "comprova una aplicació instal·lada"
diff --git a/po/cs.po b/po/cs.po
index 9df1248..868ef7a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,13 +9,14 @@
 # Zdenek <chmelarz@gmail.com>, 2016. #zanata
 # Daniel Rusek <mail@asciiwolf.com>, 2017. #zanata
 # Zdenek <chmelarz@gmail.com>, 2017. #zanata
+# Michal Konečný <michalkonec666@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
-"PO-Revision-Date: 2017-06-26 07:20+0000\n"
-"Last-Translator: Daniel Rusek <mail@asciiwolf.com>\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
+"PO-Revision-Date: 2018-06-06 02:23+0000\n"
+"Last-Translator: Michal Konečný <michalkonec666@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/freedesktop/appstream-glib/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,502 +26,399 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Zobrazovat doplňující informace pro ladění"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Přidat do balíčku tarball ikony s vysokým rozlišením"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Přidat ID mezipaměti do každé komponenty"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Do výstupu zahrnout i výsledky, které selhaly"
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "Přidání jazyka do zdrojového souboru"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Přidat do balíčku tarball ikony s vysokým rozlišením"
+#. TRANSLATORS: command description
+msgid "Add a provide to a source file"
+msgstr "Přidání poskytovatele do zdrojového souboru"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Přidat do XML zakódované ikony"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Nekomprimovat ikony do balíčku tarball"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Nastavit adresář pro záznam"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Přidáno"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Nastavit adresář pro balíčky"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Alias pro %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Nastavit adresář pro dočasné soubory"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Pomůcka pro AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Nastavit výstupní adresář"
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "Zrušeno"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Nastavit adresář s ikonami"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Zkontrolovat nainstalovaná data aplikací"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Nastavit adresář pro mezipaměť"
+msgid "Command not found, valid commands are:"
+msgstr "Příkaz nebyl nalezen, platné příkazy jsou:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Nastavit základní název pro výstupní soubory"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Porovnat obsah dvou souborů AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Nastavit původní název"
+#. TRANSLATORS: command description
+msgid "Compare version numbers"
+msgstr "Porovnat čísla verzí"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Nastavit počet vláken"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "Převod %s na %s není implementován"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Nastavit minimální velikost ikony v pixelech"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Převést soubor AppData do formátu NEWS"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Nastavit umístění starých metadat"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Převést soubor NEWS do formátu AppData"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Ignorovat určité typy zamítnutí"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Převést metadata AppStream z jedné verze do jiné"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Selhalo zpracování argumentů"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Vytvořit dokument CSV s informacemi o stavu"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Selhalo vytvoření sestavení"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Vytvořit stránku HTML s tabulkou"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Selhalo otevření balíčků"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Vytvořit stránku HTML s informacemi o stavu"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Procházejí se balíčky…"
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Vytvořit ukázkový soubor AppData ze souboru .desktop"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Selhalo přidání balíčku"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Zobrazit slova indexovaná pro hledání aplikací"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr "Zpracovány soubory %u/%u…"
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Nekomprimovat ikony do balíčku tarball"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Selhalo generování metadat"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Nepoužívat přístup k síti"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Hotovo!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Ukládá se ikona"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Vypsat aplikace z metadat AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Nastavit prefix"
+msgid "Enable profiling"
+msgstr "Povolit profilování"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Zpracovává se aplikace"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Chyba při vytváření výstupního adresáře"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Chyba při načítání souboru AppData"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Chyba při zpracování překladů"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Chyba při načítání souboru .desktop"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Chyba při zpracování renomé"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Chyba při zpracování, co poskytuje"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Chyba při načítání souboru .desktop"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Chyba při vytváření výstupního adresáře"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "Ukládá se AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Chyba při zpracování překladů"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Chyba při ukládání souboru AppStream"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Alias pro %s"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Příkaz nebyl nalezen, platné příkazy jsou:"
+#. TRANSLATORS: command description
+msgid "Exports the agreement to text"
+msgstr "Exportovat smlouvu jako text"
 
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Projděte prosím soubor a opravte položky označené „FIXME“"
+#. list failures
+msgid "FAILED"
+msgstr "SELHALO"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Stará verze API"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Selhalo přidání balíčku"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Nová verze API"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Selhalo generování metadat"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Nedostatečný počet argumentů, očekávány: starý.mxl nový.xml verze"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Selhalo otevření balíčků"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "Převod %s na %s není implementován"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Selhalo zpracování argumentů"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Nedostatečný počet argumentů, očekáván: soubor.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Selhalo vytvoření sestavení"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "Formát souboru „%s“ nelze převést na novější verzi"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Formát nebyl rozpoznán"
 
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Vygenerovat GUID ze vstupního řetězce"
+
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "Ignorovat určité typy zamítnutí"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Importovat soubor do značkovacího jazyka AppStream"
+
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "Do výstupu zahrnout i výsledky, které selhaly"
+
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "Začlenit doplňující metadata z externího souboru"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Nainstalovat metadata AppStream"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Instalovat metadata AppStream s novým původem"
+
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Vypsat aplikace, které nejsou obsažené v balíčcích"
+
+#. TRANSLATORS: command description
+msgid "Merge several files to an AppStream file"
+msgstr "Sloučit několik souborů do souboru AppStream"
+
+#. TRANSLATORS: command description
+msgid "Mirror upstream screenshots"
+msgstr "Zrcadlit snímky obrazovky z hlavního zdroje aplikace"
+
+#. TRANSLATORS: command description
+msgid "Modify an AppData file"
+msgstr "Upravit soubor AppData"
+
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Nová verze API"
+
 #. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
 msgid "No desktop applications found"
 msgstr "Nebyly nalezeny žádné aplikace pro grafické prostředí"
 
+msgid "Not enough arguments, expected file.xml"
+msgstr "Nedostatečný počet argumentů, očekáván: soubor.xml"
+
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Nedostatečný počet argumentů, očekávány: starý.mxl nový.xml verze"
+
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "V POŘÁDKU"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "SELHALO"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Stará verze API"
 
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Ověření selhalo"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %u/%u files..."
+msgstr "Zpracovány soubory %u/%u…"
 
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Ověření souborů selhalo"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Projděte prosím soubor a opravte položky označené „FIXME“"
+
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Zpracovává se aplikace"
 
 #. TRANSLATORS: application was removed
-#: client/as-util.c:4053
 msgid "Removed"
 msgstr "Odebráno"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Přidáno"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "Zrušeno"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Nepoužívat přístup k síti"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Zobrazit verzi"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Povolit profilování"
-
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Převést metadata AppStream z jedné verze do jiné"
+msgid "Replace screenshots in source file"
+msgstr "Nahradit snímky obrazovky ve zdrojovém souboru"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Povýšit metadata AppData na nejnovější verzi"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "Ukládá se AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Vytvořit ukázkový soubor AppData ze souboru .desktop"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Ukládá se ikona"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Vypsat aplikace z metadat AppStream"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Procházejí se balíčky…"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
 msgid "Search for AppStream applications"
 msgstr "Vyhledat v AppStream aplikace"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "Vyhledat v AppStream aplikace podle jména balíčku"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "Zobrazit všechny nainstalované AppStream aplikace"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
 msgid "Search for AppStream applications by category name"
 msgstr "Vyhledat v AppStream aplikace podle jména kategorie"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Zobrazit slova indexovaná pro hledání aplikací"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Nainstalovat metadata AppStream"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Instalovat metadata AppStream s novým původem"
+msgid "Search for AppStream applications by package name"
+msgstr "Vyhledat v AppStream aplikace podle jména balíčku"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Odinstalovat metadata AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Nastavit základní název pro výstupní soubory"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Vytvořit stránku HTML s informacemi o stavu"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Nastavit adresář pro mezipaměť"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Vytvořit dokument CSV s informacemi o stavu"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Nastavit adresář s ikonami"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Vytvořit stránku HTML s tabulkou"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Nastavit adresář pro záznam"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Vypsat aplikace, které nejsou obsažené v balíčcích"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Nastavit minimální velikost ikony v pixelech"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Ověřit soubor AppData nebo AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Nastavit počet vláken"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Ověřit soubor AppData nebo AppStream (volně)"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Nastavit umístění starých metadat"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Nastavit původní název"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Ověřit soubor AppData nebo AppStream (striktně)"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Nastavit výstupní adresář"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Převést soubor AppData do formátu NEWS"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Nastavit adresář pro balíčky"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Převést soubor NEWS do formátu AppData"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Nastavit prefix"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Zkontrolovat nainstalovaná data aplikací"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Nastavit adresář pro dočasné soubory"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr "zkontrolovat nainstalovanou aplikaci"
+msgid "Show all installed AppStream applications"
+msgstr "Zobrazit všechny nainstalované AppStream aplikace"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Nahradit snímky obrazovky ve zdrojovém souboru"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Zobrazovat doplňující informace pro ladění"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr "Přidání poskytovatele do zdrojového souboru"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Zobrazit verzi"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "Přidání jazyka do zdrojového souboru"
+msgid "Split an AppStream file to AppData and Metainfo files"
+msgstr "Rozdělit soubor AppStream na soubory AppData a Metainfo"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Zrcadlit snímky obrazovky z hlavního zdroje aplikace"
+msgid "Test a regular expression"
+msgstr "Testovat regulární výraz"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Místně zrcadlit soubory s firmwary"
+msgid "Uninstalls AppStream metadata"
+msgstr "Odinstalovat metadata AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Začlenit doplňující metadata z externího souboru"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Povýšit metadata AppData na nejnovější verzi"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Porovnat obsah dvou souborů AppStream"
+msgid "Validate an AppData or AppStream file"
+msgstr "Ověřit soubor AppData nebo AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Vygenerovat GUID ze vstupního řetězce"
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Ověřit soubor AppData nebo AppStream (volně)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Upravit soubor AppData"
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Ověřit soubor AppData nebo AppStream (striktně)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr "Rozdělit soubor AppStream na soubory AppData a Metainfo"
+msgid "Validation failed"
+msgstr "Ověření selhalo"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Sloučit několik souborů do souboru AppStream"
+msgid "Validation of files failed"
+msgstr "Ověření souborů selhalo"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Importovat soubor do značkovacího jazyka AppStream"
+msgid "Version:"
+msgstr "Verze:"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
 msgid "Watch AppStream locations for changes"
 msgstr "Sledovat umístění AppStream na změny"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr "Porovnat čísla verzí"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr "Testovat regulární výraz"
-
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Pomůcka pro AppStream"
-
-#: client/as-util.c:4705
-msgid "Version:"
-msgstr "Verze:"
+msgid "check an installed application"
+msgstr "zkontrolovat nainstalovanou aplikaci"
diff --git a/po/da.po b/po/da.po
index e6ea676..19e4f41 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2016-08-06 02:59+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Danish (http://www.transifex.com/freedesktop/appstream-glib/language/da/)\n"
@@ -21,502 +21,178 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Vis ekstra fejlsøgningsinformation"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Tilføj et cache-id til hver komponent"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:102
-msgid "Add encoded icons to the XML"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Angiv logningsmappen"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Alias til %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Angiv pakkemappen"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "AppStream-redskab"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Angiv den midlertidige mappe"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Kontroller installerede programdata"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Angiv uddatamappe"
+msgid "Command not found, valid commands are:"
+msgstr "Kommandoen blev ikke fundet, gyldige kommandoer er:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Konverterer AppStream-metadata fra en version til en anden"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Angiv cache-mappe"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Opretter et CSV-statusdokument"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Opretter en HTML-statusside"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Angiv origin-navn"
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Opretter et eksempel på en Appdata-fil fra en .desktop-fil"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Angiv antallet af tråde"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Brug ikke netværksadgang"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr ""
+#. success
+#. TRANSLATORS: information message
+msgid "Done!"
+msgstr "Færdig!"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Angiv den gamle metadataplacering"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Dumper programmer i AppStream-metadataene"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr ""
+#. list failures
+msgid "FAILED"
+msgstr "Mislykkedes"
 
 #. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Kunne ikke fortolke argumenter"
+msgid "Failed to add package"
+msgstr "Kunne ikke tilføje pakke"
 
 #. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Kunne ikke sætte byggeren op"
+msgid "Failed to generate metadata"
+msgstr "Kunne ikke oprette metadata"
 
 #. TRANSLATORS: error message
-#: client/as-builder.c:279
 msgid "Failed to open packages"
 msgstr "Kunne ikke åbne pakker"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Skanner pakker ..."
-
 #. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Kunne ikke tilføje pakke"
-
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr ""
+msgid "Failed to parse arguments"
+msgstr "Kunne ikke fortolke argumenter"
 
 #. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Kunne ikke oprette metadata"
-
-#. success
-#. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
-msgid "Done!"
-msgstr "Færdig!"
-
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr ""
-
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr ""
-
-#. TRANSLATORS: the .appdata.xml file could not
-#. * be loaded
-#: client/as-compose.c:425
-msgid "Error loading AppData file"
-msgstr ""
-
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr ""
-
-#. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
-msgid "Error parsing kudos"
-msgstr ""
-
-#. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
-msgid "Error parsing provides"
-msgstr ""
-
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr ""
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr ""
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr ""
-
-#. TRANSLATORS: this is when the destination file
-#. * cannot be saved for some reason
-#: client/as-compose.c:542
-msgid "Error saving AppStream file"
-msgstr ""
-
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Alias til %s"
+msgid "Failed to set up builder"
+msgstr "Kunne ikke sætte byggeren op"
 
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Kommandoen blev ikke fundet, gyldige kommandoer er:"
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Installerer AppStream-metadata"
 
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Gennemse venligst filen og ret eventuelle »FIXME«-punkter"
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Installerer AppStream-metadata med ny oprindelse (origin)"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Vis programmer ikke bakket op af pakker"
 
 #. TRANSLATORS: information message
-#: client/as-util.c:508
 msgid "New API version"
 msgstr "Ny API-version"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Ikke nok argumenter, forventede gammel.xml ny.xml version"
-
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr ""
-
-#: client/as-util.c:580
 msgid "Not enough arguments, expected file.xml"
 msgstr "Ikke nok argumenter, forventede fil.xml"
 
-#. TRANSLATORS: %s is a file type,
-#. * e.g. 'appdata'
-#: client/as-util.c:606
-#, c-format
-msgid "File format '%s' cannot be upgraded"
-msgstr ""
-
-#. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
-msgid "Format not recognised"
-msgstr ""
-
-#. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
-msgid "No desktop applications found"
-msgstr ""
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Ikke nok argumenter, forventede gammel.xml ny.xml version"
 
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "O.k."
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "Mislykkedes"
-
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Validering mislykkedes"
-
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Validering af filer mislykkedes"
-
-#. TRANSLATORS: application was removed
-#: client/as-util.c:4053
-msgid "Removed"
-msgstr ""
-
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr ""
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr ""
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Gennemse venligst filen og ret eventuelle »FIXME«-punkter"
 
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Brug ikke netværksadgang"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Skanner pakker ..."
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Vis version"
+msgid "Set the cache directory"
+msgstr "Angiv cache-mappe"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Konverterer AppStream-metadata fra en version til en anden"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Opgrader AppData-metadata til den seneste version"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Opretter et eksempel på en Appdata-fil fra en .desktop-fil"
+msgid "Set the logging directory"
+msgstr "Angiv logningsmappen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Dumper programmer i AppStream-metadataene"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Angiv antallet af tråde"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4464
-msgid "Search for AppStream applications"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Angiv den gamle metadataplacering"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Angiv origin-navn"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Angiv uddatamappe"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
-msgid "Search for AppStream applications by category name"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Angiv pakkemappen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Angiv den midlertidige mappe"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Installerer AppStream-metadata"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Vis ekstra fejlsøgningsinformation"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Installerer AppStream-metadata med ny oprindelse (origin)"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Vis version"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4506
 msgid "Uninstalls AppStream metadata"
 msgstr "Afinstallerer AppStream-metadata"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Opretter en HTML-statusside"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Opretter et CSV-statusdokument"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Vis programmer ikke bakket op af pakker"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Opgrader AppData-metadata til den seneste version"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4536
 msgid "Validate an AppData or AppStream file"
 msgstr "Valider en AppData- eller AppStream-fil"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4542
 msgid "Validate an AppData or AppStream file (relaxed)"
 msgstr "Valider en AppData- eller AppStream-fil (afslappet)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
 msgid "Validate an AppData or AppStream file (strict)"
 msgstr "Valider en AppData- eller AppStream-fil (strengt)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Kontroller installerede programdata"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4656
-msgid "Watch AppStream locations for changes"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr ""
+msgid "Validation failed"
+msgstr "Validering mislykkedes"
 
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "AppStream-redskab"
+msgid "Validation of files failed"
+msgstr "Validering af filer mislykkedes"
 
-#: client/as-util.c:4705
 msgid "Version:"
 msgstr "Version:"
diff --git a/po/de.po b/po/de.po
index 12fa3b1..1007a5e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2016-09-29 07:16+0000\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/freedesktop/appstream-glib/language/de/)\n"
@@ -22,503 +22,367 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Zusätzliche Fehlerdiagnoseinformationen anzeigen"
+msgid "Add HiDPI icons to the tarball"
+msgstr "HiDPI-Symbole zum Tarball hinzufügen"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Cachekennung zu jeder Komponente hinzufügen"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Fehlgeschlagene Ergebnisse in die Ausgabe miteinbeziehen"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "HiDPI-Symbole zum Tarball hinzufügen"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Kodierte Symbole zur XML hinzufügen"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Symbole nicht in einen Tarball komprimieren"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Protokollierungsverzeichnis festlegen"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Paketeverzeichnis festlegen"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Temporäres Verzeichnis festlegen"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Hinzugefügt"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Ausgabeverzeichnis festlegen"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Alias zu %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Symbolverzeichnis festlegen"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "AppStream-Dienstprogramm"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Cacheverzeichnis festlegen"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Installierte Anwendungsdaten überprüfen"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Basisnamen der Ausgabedateien festlegen"
+msgid "Command not found, valid commands are:"
+msgstr "Befehl nicht gefunden, gültige Befehle sind:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Ursprungsname festlegen"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Inhalt zweier AppStream-Dateien vergleichen"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Anzahl an Threads festlegen"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "Konvertierung %s zu %s ist nicht implementiert"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Minimale Symbolgröße in Pixel festlegen"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "AppData-Datei in NEWS-Format konvertieren"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Alte Metadatenadresse festlegen"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "NEWS-Datei in AppData-Format konvertieren"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Bestimmte Arten von Veto ignorieren"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Konvertiert AppStream-Metadaten von einer Version in eine andere"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Fehler beim Auswerten der Argumente"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "CSV-Statusdokument erstellen"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Fehler beim Einrichten des Builders"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "HTML-Matrixseite erstellen"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Fehler beim Öffnen der Pakete"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "HTML-Statusseite erstellen"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Pakete werden eingelesen …"
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Erstellt eine Beispiel-Appdata-Datei aus einer .desktop-Datei"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Fehler beim Hinzufügen des Pakets"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Anwendungssuchinformation anzeigen"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr "%u von %u Dateien wurde ausgewertet …"
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Symbole nicht in einen Tarball komprimieren"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Fehler beim Erzeugen der Metadaten"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Keinen Netzwerkzugriff verwenden"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Fertig!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Symbol wird gespeichert"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Gibt die Anwendungen in den AppStream-Metadaten aus"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Präfix festlegen"
+msgid "Enable profiling"
+msgstr "Profilbildung aktivieren"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Anwendung wird verarbeitet"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Fehler beim Erstellen des Ausgabeverzeichnisses"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Fehler beim Laden der AppData-Datei"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Fehler beim Auswerten der Übersetzungen"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Fehler beim Laden der desktop-Datei"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Fehler beim Auswerten von kudos"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Fehler beim Auswerten der »Provides«"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Fehler beim Laden der desktop-Datei"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Fehler beim Erstellen des Ausgabeverzeichnisses"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "AppStream wird gespeichert"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Fehler beim Auswerten der Übersetzungen"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Fehler beim Speichern der AppStream-Datei"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Alias zu %s"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Befehl nicht gefunden, gültige Befehle sind:"
-
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr ""
-"Bitte begutachten Sie die Datei und beheben Sie etwaige \"FIXME\"-Einträge"
+#. list failures
+msgid "FAILED"
+msgstr "FEHLGESCHLAGEN"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Alte API-Version"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Fehler beim Hinzufügen des Pakets"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Neue API-Version"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Fehler beim Erzeugen der Metadaten"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Nicht genügend Argumente, alt.xml neu.xml Version erwartet"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Fehler beim Öffnen der Pakete"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "Konvertierung %s zu %s ist nicht implementiert"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Fehler beim Auswerten der Argumente"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Nicht genügend Argumente, Datei.xml erwartet"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Fehler beim Einrichten des Builders"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "Dateiformat »%s« kann nicht aktualisiert werden"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Format nicht erkannt"
 
-#. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
-msgid "No desktop applications found"
-msgstr "Keine Desktop-Anwendungen gefunden"
-
-#. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
-msgid "OK"
-msgstr "OK"
-
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "FEHLGESCHLAGEN"
-
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Validierung fehlgeschlagen"
-
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Validierung der Dateien ist fehlgeschlagen"
-
-#. TRANSLATORS: application was removed
-#: client/as-util.c:4053
-msgid "Removed"
-msgstr "Entfernt"
-
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Hinzugefügt"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr ""
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Keinen Netzwerkzugriff verwenden"
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Eine GUID aus einer Eingabezeichenfolge erzeugen"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Version anzeigen"
+msgid "Ignore certain types of veto"
+msgstr "Bestimmte Arten von Veto ignorieren"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Eine Datei in die AppStream-Auszeichnung importieren"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Profilbildung aktivieren"
+msgid "Include failed results in the output"
+msgstr "Fehlgeschlagene Ergebnisse in die Ausgabe miteinbeziehen"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Konvertiert AppStream-Metadaten von einer Version in eine andere"
+msgid "Incorporate extra metadata from an external file"
+msgstr "Zusätzliche Metadaten aus einer externen Datei integrieren"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "AppData-Metadaten auf die neueste Version aktualisieren"
+msgid "Installs AppStream metadata"
+msgstr "Installiert AppStream-Metadaten"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Erstellt eine Beispiel-Appdata-Datei aus einer .desktop-Datei"
+msgid "Installs AppStream metadata with new origin"
+msgstr "Installiert AppStream-Metadaten mit neuer Quelle"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Gibt die Anwendungen in den AppStream-Metadaten aus"
+msgid "List applications not backed by packages"
+msgstr "Nicht durch Pakete abgedeckte Anwendungen auflisten"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
-msgid "Search for AppStream applications"
-msgstr "Nach AppStream-Anwendungen suchen"
+msgid "Merge several files to an AppStream file"
+msgstr "Mehrere Dateien zu einer AppStream-Datei zusammenführen"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "Nach AppStream-Anwendungen mit Paketname suchen"
+msgid "Mirror upstream screenshots"
+msgstr "Vorgeschaltete Bildschirmfotos spiegeln"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "Alle installierten Appstream-Anwendungen anzeigen"
+msgid "Modify an AppData file"
+msgstr "Ändern einer AppData-Datei"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
-msgid "Search for AppStream applications by category name"
-msgstr "Nach installierten Appstream-Anwendungen nach Kategorienamen suchen"
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Neue API-Version"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Anwendungssuchinformation anzeigen"
+#. TRANSLATORS: probably wrong XML
+msgid "No desktop applications found"
+msgstr "Keine Desktop-Anwendungen gefunden"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Installiert AppStream-Metadaten"
+msgid "Not enough arguments, expected file.xml"
+msgstr "Nicht genügend Argumente, Datei.xml erwartet"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Installiert AppStream-Metadaten mit neuer Quelle"
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Nicht genügend Argumente, alt.xml neu.xml Version erwartet"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Deinstalliert AppStream-Metadaten"
+#. TRANSLATORS: the file is valid
+msgid "OK"
+msgstr "OK"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "HTML-Statusseite erstellen"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Alte API-Version"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "CSV-Statusdokument erstellen"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %u/%u files..."
+msgstr "%u von %u Dateien wurde ausgewertet …"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "HTML-Matrixseite erstellen"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Bitte begutachten Sie die Datei und beheben Sie etwaige \"FIXME\"-Einträge"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Nicht durch Pakete abgedeckte Anwendungen auflisten"
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Anwendung wird verarbeitet"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "AppData- oder AppStream-Datei validieren"
+#. TRANSLATORS: application was removed
+msgid "Removed"
+msgstr "Entfernt"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "AppData- oder AppStream-Datei validieren (locker)"
+msgid "Replace screenshots in source file"
+msgstr "Bildschirmfotos in Quelldatei ersetzen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "AppStream wird gespeichert"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "AppData- oder AppStream-Datei (strikt) validieren"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Symbol wird gespeichert"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "AppData-Datei in NEWS-Format konvertieren"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Pakete werden eingelesen …"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "NEWS-Datei in AppData-Format konvertieren"
+msgid "Search for AppStream applications"
+msgstr "Nach AppStream-Anwendungen suchen"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Installierte Anwendungsdaten überprüfen"
+msgid "Search for AppStream applications by category name"
+msgstr "Nach installierten Appstream-Anwendungen nach Kategorienamen suchen"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr ""
+msgid "Search for AppStream applications by package name"
+msgstr "Nach AppStream-Anwendungen mit Paketname suchen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Bildschirmfotos in Quelldatei ersetzen"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Basisnamen der Ausgabedateien festlegen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Cacheverzeichnis festlegen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Symbolverzeichnis festlegen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Vorgeschaltete Bildschirmfotos spiegeln"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Protokollierungsverzeichnis festlegen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Lokale Firmware-Dateien spiegeln"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Minimale Symbolgröße in Pixel festlegen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Zusätzliche Metadaten aus einer externen Datei integrieren"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Anzahl an Threads festlegen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Inhalt zweier AppStream-Dateien vergleichen"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Alte Metadatenadresse festlegen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Eine GUID aus einer Eingabezeichenfolge erzeugen"
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Ursprungsname festlegen"
+
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Ausgabeverzeichnis festlegen"
+
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Paketeverzeichnis festlegen"
+
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Präfix festlegen"
+
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Temporäres Verzeichnis festlegen"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Ändern einer AppData-Datei"
+msgid "Show all installed AppStream applications"
+msgstr "Alle installierten Appstream-Anwendungen anzeigen"
+
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Zusätzliche Fehlerdiagnoseinformationen anzeigen"
+
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Version anzeigen"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4638
 msgid "Split an AppStream file to AppData and Metainfo files"
 msgstr "Eine AppStream-Datei in AppData- und Metainfo-Dateien aufspalten"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Mehrere Dateien zu einer AppStream-Datei zusammenführen"
+msgid "Uninstalls AppStream metadata"
+msgstr "Deinstalliert AppStream-Metadaten"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Eine Datei in die AppStream-Auszeichnung importieren"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "AppData-Metadaten auf die neueste Version aktualisieren"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
-msgid "Watch AppStream locations for changes"
-msgstr ""
+msgid "Validate an AppData or AppStream file"
+msgstr "AppData- oder AppStream-Datei validieren"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr ""
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "AppData- oder AppStream-Datei validieren (locker)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr ""
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "AppData- oder AppStream-Datei (strikt) validieren"
 
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "AppStream-Dienstprogramm"
+msgid "Validation failed"
+msgstr "Validierung fehlgeschlagen"
+
+msgid "Validation of files failed"
+msgstr "Validierung der Dateien ist fehlgeschlagen"
 
-#: client/as-util.c:4705
 msgid "Version:"
 msgstr "Version:"
diff --git a/po/en_GB.po b/po/en_GB.po
index 2b819ad..db91b63 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2016-08-06 02:59+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/freedesktop/appstream-glib/language/en_GB/)\n"
@@ -22,502 +22,354 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Show extra debugging information"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Add HiDPI icons to the tarball"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Add a cache ID to each component"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Include failed results in the output"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Add HiDPI icons to the tarball"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Add encoded icons to the XML"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Do not compress the icons into a tarball"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Set the logging directory"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Set the packages directory"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Set the temporary directory"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Added"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Set the output directory"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Alias to %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Set the icons directory"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "AppStream Utility"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Set the cache directory"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Check installed application data"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Set the basenames of the output files"
+msgid "Command not found, valid commands are:"
+msgstr "Command not found, valid commands are:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Set the origin name"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Compare the contents of two AppStream files"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Set the number of threads"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "Conversion %s to %s is not implemented"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Set the minimum icon size in pixels"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Convert an AppData file to NEWS format"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Set the old metadata location"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Convert an NEWS file to AppData format"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Ignore certain types of veto"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Converts AppStream metadata from one version to another"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Failed to parse arguments"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Create an CSV status document"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Failed to set up builder"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Create an HTML matrix page"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Failed to open packages"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Create an HTML status page"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Scanning packages..."
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Creates an example Appdata file from a .desktop file"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Failed to add package"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Display application search tokens"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Do not compress the icons into a tarball"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Failed to generate metadata"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Do not use network access"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Done!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Saving icon"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Dumps the applications in the AppStream metadata"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Set the prefix"
+msgid "Enable profiling"
+msgstr "Enable profiling"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Processing application"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Error creating output directory"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Error loading AppData file"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Error parsing translations"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Error loading desktop file"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Error parsing kudos"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Error parsing provides"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Error loading desktop file"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Error creating output directory"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "Saving AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Error parsing translations"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Error saving AppStream file"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Alias to %s"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Command not found, valid commands are:"
-
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Please review the file and fix any 'FIXME' items"
+#. list failures
+msgid "FAILED"
+msgstr "FAILED"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Old API version"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Failed to add package"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "New API version"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Failed to generate metadata"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Not enough arguments, expected old.xml new.xml version"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Failed to open packages"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "Conversion %s to %s is not implemented"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Failed to parse arguments"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Not enough arguments, expected file.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Failed to set up builder"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "File format '%s' cannot be upgraded"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Format not recognised"
 
-#. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
-msgid "No desktop applications found"
-msgstr "No desktop applications found"
-
-#. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
-msgid "OK"
-msgstr "OK"
-
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "FAILED"
-
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Validation failed"
-
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Validation of files failed"
-
-#. TRANSLATORS: application was removed
-#: client/as-util.c:4053
-msgid "Removed"
-msgstr "Removed"
-
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Added"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr ""
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Do not use network access"
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Generate a GUID from an input string"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Show version"
+msgid "Ignore certain types of veto"
+msgstr "Ignore certain types of veto"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Import a file to AppStream markup"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Enable profiling"
+msgid "Include failed results in the output"
+msgstr "Include failed results in the output"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Converts AppStream metadata from one version to another"
+msgid "Incorporate extra metadata from an external file"
+msgstr "Incorporate extra metadata from an external file"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Upgrade AppData metadata to the latest version"
+msgid "Installs AppStream metadata"
+msgstr "Installs AppStream metadata"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Creates an example Appdata file from a .desktop file"
+msgid "Installs AppStream metadata with new origin"
+msgstr "Installs AppStream metadata with new origin"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Dumps the applications in the AppStream metadata"
+msgid "List applications not backed by packages"
+msgstr "List applications not backed by packages"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
-msgid "Search for AppStream applications"
-msgstr "Search for AppStream applications"
+msgid "Merge several files to an AppStream file"
+msgstr "Merge several files to an AppStream file"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "Search for AppStream applications by package name"
+msgid "Mirror upstream screenshots"
+msgstr "Mirror upstream screenshots"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr ""
+msgid "Modify an AppData file"
+msgstr "Modify an AppData file"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
-msgid "Search for AppStream applications by category name"
-msgstr ""
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "New API version"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Display application search tokens"
+#. TRANSLATORS: probably wrong XML
+msgid "No desktop applications found"
+msgstr "No desktop applications found"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Installs AppStream metadata"
+msgid "Not enough arguments, expected file.xml"
+msgstr "Not enough arguments, expected file.xml"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Installs AppStream metadata with new origin"
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Not enough arguments, expected old.xml new.xml version"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Uninstalls AppStream metadata"
+#. TRANSLATORS: the file is valid
+msgid "OK"
+msgstr "OK"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Create an HTML status page"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Old API version"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Create an CSV status document"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Please review the file and fix any 'FIXME' items"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Create an HTML matrix page"
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Processing application"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "List applications not backed by packages"
+#. TRANSLATORS: application was removed
+msgid "Removed"
+msgstr "Removed"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Validate an AppData or AppStream file"
+msgid "Replace screenshots in source file"
+msgstr "Replace screenshots in source file"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Validate an AppData or AppStream file (relaxed)"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "Saving AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Saving icon"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Validate an AppData or AppStream file (strict)"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Scanning packages..."
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Convert an AppData file to NEWS format"
+msgid "Search for AppStream applications"
+msgstr "Search for AppStream applications"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Convert an NEWS file to AppData format"
+msgid "Search for AppStream applications by package name"
+msgstr "Search for AppStream applications by package name"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Check installed application data"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Set the basenames of the output files"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Set the cache directory"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Replace screenshots in source file"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Set the icons directory"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Set the logging directory"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Set the minimum icon size in pixels"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Mirror upstream screenshots"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Set the number of threads"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Mirror local firmware files"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Set the old metadata location"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Incorporate extra metadata from an external file"
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Set the origin name"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Compare the contents of two AppStream files"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Set the output directory"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Generate a GUID from an input string"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Set the packages directory"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Modify an AppData file"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Set the prefix"
+
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Set the temporary directory"
+
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Show extra debugging information"
+
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Show version"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4638
 msgid "Split an AppStream file to AppData and Metainfo files"
 msgstr "Split an AppStream file to AppData and Metainfo files"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Merge several files to an AppStream file"
+msgid "Uninstalls AppStream metadata"
+msgstr "Uninstalls AppStream metadata"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Import a file to AppStream markup"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Upgrade AppData metadata to the latest version"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
-msgid "Watch AppStream locations for changes"
-msgstr ""
+msgid "Validate an AppData or AppStream file"
+msgstr "Validate an AppData or AppStream file"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr ""
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Validate an AppData or AppStream file (relaxed)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr ""
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Validate an AppData or AppStream file (strict)"
 
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "AppStream Utility"
+msgid "Validation failed"
+msgstr "Validation failed"
+
+msgid "Validation of files failed"
+msgstr "Validation of files failed"
 
-#: client/as-util.c:4705
 msgid "Version:"
 msgstr "Version:"
diff --git a/po/es.po b/po/es.po
index b075557..acb7273 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2017-12-31 11:05+0000\n"
 "Last-Translator: Máximo Castañeda Riloba <mcrcctm@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/freedesktop/appstream-glib/language/es/)\n"
@@ -25,503 +25,395 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Mostrar información de depuración adicional"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Agregar iconos HiDPI en el tarball"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Añadir un identificador de caché a cada componente"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Incluir resultados fallidos en la salida"
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "Añade un idioma a un archivo de origen"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Agregar iconos HiDPI en el tarball"
+#. TRANSLATORS: command description
+msgid "Add a provide to a source file"
+msgstr "Agrega un suministro a un archivo de origen"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Añadir iconos codificados al XML"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "No comprimir los iconos en un tarball"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Establecer el directorio de bitácoras"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Añadida"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Establecer el directorio de paquetes"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Alias a %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Establecer el directorio temporal"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Utilitario AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Establecer el directorio de salida"
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "Cancelado"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Establecer el directorio de íconos"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Comprobar los datos de aplicación instalados"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Establecer el directorio de caché"
+msgid "Command not found, valid commands are:"
+msgstr "No se encontró el comando, los comandos válidos son:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Establecer el nombre base de los ficheros de salida"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Comparar el contenido de dos ficheros AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Establecer el nombre del origen"
+#. TRANSLATORS: command description
+msgid "Compare version numbers"
+msgstr "Compara números de versiones"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Establecer la cantidad de hilos"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "Conversión %s a %s no está implementada"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Establecer el tamaño mínimo en píxeles"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Convertir un fichero AppData a formato NEWS"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Establecer la ubicación de los metadatos anteriores"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Convertir un archivo NEWS a formato AppData"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Ignorar ciertos tipos de veto"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Convertir metadatos de AppStream de una versión a otra"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "No se pudo analizar los argumentos"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Crear un documento de estado en CSV"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "No se pudo configurar el constructor"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Crear la página de matriz en HTML"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "No se pudo abrir los paquetes"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Crear una página de estado en HTML"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Examinando los paquetes…"
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Crear un fichero de ejemplo de AppData a partir de un fichero .desktop"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "No se pudo añadir el paquete"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Mostrando tokens de búsqueda de aplicaciones"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr "Leídos %u/%u archivos..."
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "No comprimir los iconos en un tarball"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "No se pudo generar los metadatos"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "No usar acceso a la red"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "¡Hecho!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Guardando icono"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Respalda las aplicaciones en la metadata de AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Establecer el prefijo"
+msgid "Enable profiling"
+msgstr "Habilitar perfilado"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Procesando aplicación"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Error creando directorio de salida"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Error cargando el fichero AppData"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Error analizando traducciones"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Error cargando fichero de escritorio"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Error analizando prestigios"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Error analizando aprovisionamientos"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Error cargando fichero de escritorio"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Error creando directorio de salida"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "Guardando AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Error analizando traducciones"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Error guardando fichero AppStream"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Alias a %s"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "No se encontró el comando, los comandos válidos son:"
-
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Por favor, revise el fichero y corrija todos los elementos 'FIXME'"
+#. list failures
+msgid "FAILED"
+msgstr "FALLIDO"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Versión de API anterior"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "No se pudo añadir el paquete"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Versión de API nueva"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "No se pudo generar los metadatos"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Argumentos insuficientes, esperando viejo.xml nuevo.xml version"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "No se pudo abrir los paquetes"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "Conversión %s a %s no está implementada"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "No se pudo analizar los argumentos"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Argumentos insuficientes, esperando fichero.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "No se pudo configurar el constructor"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "Formato de fichero '%s' no puede ser actualizado"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Formato no reconocido"
 
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Generar un GUID de una cadena de entrada"
+
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "Ignorar ciertos tipos de veto"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Importar un fichero a marcado AppStream"
+
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "Incluir resultados fallidos en la salida"
+
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "Incorporar metadata extra desde un archivo externo"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Instala los metadatos de AppStream"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Instala metadatos de AppStream con nuevo origen"
+
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Lista de aplicaciones no soportadas por paquetes"
+
+#. TRANSLATORS: command description
+msgid "Merge several files to an AppStream file"
+msgstr "Combinar varios ficheros en un fichero AppStream"
+
+#. TRANSLATORS: command description
+msgid "Mirror upstream screenshots"
+msgstr "Pantallazos de espejos upstream"
+
+#. TRANSLATORS: command description
+msgid "Modify an AppData file"
+msgstr "Modificar un fichero AppData"
+
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Versión de API nueva"
+
 #. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
 msgid "No desktop applications found"
 msgstr "No se encontró aplicaciones de escritorio"
 
+msgid "Not enough arguments, expected file.xml"
+msgstr "Argumentos insuficientes, esperando fichero.xml"
+
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Argumentos insuficientes, esperando viejo.xml nuevo.xml version"
+
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "OK"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "FALLIDO"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Versión de API anterior"
 
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Falló la validación"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %u/%u files..."
+msgstr "Leídos %u/%u archivos..."
 
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Falló la validación de los ficheros"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Por favor, revise el fichero y corrija todos los elementos 'FIXME'"
+
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Procesando aplicación"
 
 #. TRANSLATORS: application was removed
-#: client/as-util.c:4053
 msgid "Removed"
 msgstr "Eliminada"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Añadida"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "No usar acceso a la red"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Mostrar versión"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Habilitar perfilado"
-
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Convertir metadatos de AppStream de una versión a otra"
+msgid "Replace screenshots in source file"
+msgstr "Sustituir las captura de pantalla en el archivo de origen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Actualizar metadatos de AppData a la versión más reciente"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "Guardando AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr ""
-"Crear un fichero de ejemplo de AppData a partir de un fichero .desktop"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Guardando icono"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Respalda las aplicaciones en la metadata de AppStream"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Examinando los paquetes…"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
 msgid "Search for AppStream applications"
 msgstr "Buscar aplicaciones AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "Buscar aplicaciones AppStream por nombre de paquete"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "Mostras todas las aplicaciones AppStream instaladas"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
 msgid "Search for AppStream applications by category name"
 msgstr "Buscar aplicaciones AppStream por nombre de categoría"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Mostrando tokens de búsqueda de aplicaciones"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Instala los metadatos de AppStream"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Instala metadatos de AppStream con nuevo origen"
+msgid "Search for AppStream applications by package name"
+msgstr "Buscar aplicaciones AppStream por nombre de paquete"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Desinstala los metadatos de AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Establecer el nombre base de los ficheros de salida"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Crear una página de estado en HTML"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Establecer el directorio de caché"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Crear un documento de estado en CSV"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Establecer el directorio de íconos"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Crear la página de matriz en HTML"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Establecer el directorio de bitácoras"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Lista de aplicaciones no soportadas por paquetes"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Establecer el tamaño mínimo en píxeles"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Validar un AppData o fichero AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Establecer la cantidad de hilos"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Validar un AppData o fichero AppStream (relajado)"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Establecer la ubicación de los metadatos anteriores"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Establecer el nombre del origen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Validar un AppData o fichero AppStream (estricto)"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Establecer el directorio de salida"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Convertir un fichero AppData a formato NEWS"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Establecer el directorio de paquetes"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Convertir un archivo NEWS a formato AppData"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Establecer el prefijo"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Comprobar los datos de aplicación instalados"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Establecer el directorio temporal"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr "Comprobar una aplicación instalada"
+msgid "Show all installed AppStream applications"
+msgstr "Mostras todas las aplicaciones AppStream instaladas"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Sustituir las captura de pantalla en el archivo de origen"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Mostrar información de depuración adicional"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr "Agrega un suministro a un archivo de origen"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Mostrar versión"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "Añade un idioma a un archivo de origen"
+msgid "Split an AppStream file to AppData and Metainfo files"
+msgstr "Separar un fichero AppStream en ficheros AppData y Metainfo"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Pantallazos de espejos upstream"
+msgid "Test a regular expression"
+msgstr "Prueba una expresión regular"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Ficheros de firmware de espejo local"
+msgid "Uninstalls AppStream metadata"
+msgstr "Desinstala los metadatos de AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Incorporar metadata extra desde un archivo externo"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Actualizar metadatos de AppData a la versión más reciente"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Comparar el contenido de dos ficheros AppStream"
+msgid "Validate an AppData or AppStream file"
+msgstr "Validar un AppData o fichero AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Generar un GUID de una cadena de entrada"
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Validar un AppData o fichero AppStream (relajado)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Modificar un fichero AppData"
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Validar un AppData o fichero AppStream (estricto)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr "Separar un fichero AppStream en ficheros AppData y Metainfo"
+msgid "Validation failed"
+msgstr "Falló la validación"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Combinar varios ficheros en un fichero AppStream"
+msgid "Validation of files failed"
+msgstr "Falló la validación de los ficheros"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Importar un fichero a marcado AppStream"
+msgid "Version:"
+msgstr "Versión:"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
 msgid "Watch AppStream locations for changes"
 msgstr "Espera las localizaciones de AppStream para los cambios"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr "Compara números de versiones"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr "Prueba una expresión regular"
-
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Utilitario AppStream"
-
-#: client/as-util.c:4705
-msgid "Version:"
-msgstr "Versión:"
+msgid "check an installed application"
+msgstr "Comprobar una aplicación instalada"
diff --git a/po/fi.po b/po/fi.po
index ad6c63d..ab21c88 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2017-03-26 08:23+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (http://www.transifex.com/freedesktop/appstream-glib/language/fi/)\n"
@@ -22,503 +22,118 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Zanata 4.4.5\n"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:93
-msgid "Add a cache ID to each component"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:102
-msgid "Add encoded icons to the XML"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr ""
-
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "Lisää kieli lähdetiedostoon"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr ""
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Lisätty"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr ""
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "Peruttu"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr ""
+msgid "Command not found, valid commands are:"
+msgstr "Komentoa ei löydy, kelvolliset komennot ovat:"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Paketin lisääminen epäonnistui"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Luo CSV-tila-asiakirja"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Luo HTML-tilasivu"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Luo tyhjän Appdata-esimerkkiteidoston .desktop-tiedostosta"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Valmis!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Tallennetaan kuvake"
-
-#. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr ""
-
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr ""
-
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Virhe ladatessa AppData-tiedostoa"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Virhe jäsentäessä kielikäännöksiä"
-
-#. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
-msgid "Error parsing kudos"
-msgstr ""
-
-#. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
-msgid "Error parsing provides"
-msgstr ""
-
 #. TRANSLATORS: the .desktop file could not
 #. * be loaded
-#: client/as-compose.c:495
 msgid "Error loading desktop file"
 msgstr "Virhe ladatessa desktop-tiedostoa"
 
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr ""
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "Tallennetaan AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Virhe jäsentäessä kielikäännöksiä"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Virhe tallentaessa AppStream-tiedostoa"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr ""
+#. list failures
+msgid "FAILED"
+msgstr "EPÄONNISTUI"
 
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Komentoa ei löydy, kelvolliset komennot ovat:"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Paketin lisääminen epäonnistui"
 
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr ""
+#. TRANSLATORS: not a recognised file type
+msgid "Format not recognised"
+msgstr "Muotoa ei tunnistettu"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Vanha API-versio"
+#. TRANSLATORS: command description
+msgid "Merge several files to an AppStream file"
+msgstr "Yhdistä useita tiedostoja AppStream-tiedostoon"
+
+#. TRANSLATORS: command description
+msgid "Modify an AppData file"
+msgstr "Muokkaa AppData-tiedostoa"
 
 #. TRANSLATORS: information message
-#: client/as-util.c:508
 msgid "New API version"
 msgstr "Uusi API-versio"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr ""
-
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr ""
-
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr ""
-
-#. TRANSLATORS: %s is a file type,
-#. * e.g. 'appdata'
-#: client/as-util.c:606
-#, c-format
-msgid "File format '%s' cannot be upgraded"
-msgstr ""
-
-#. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
-msgid "Format not recognised"
-msgstr "Muotoa ei tunnistettu"
-
-#. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
-msgid "No desktop applications found"
-msgstr ""
-
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "OK"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "EPÄONNISTUI"
-
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Vahvistaminen epäonnistui"
-
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Tiedostojen vahvistaminen epäonnistui"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Vanha API-versio"
 
 #. TRANSLATORS: application was removed
-#: client/as-util.c:4053
 msgid "Removed"
 msgstr "Poistettu"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Lisätty"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "Peruttu"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Näytä versio"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Luo tyhjän Appdata-esimerkkiteidoston .desktop-tiedostosta"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "Tallennetaan AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr ""
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Tallennetaan kuvake"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
 msgid "Search for AppStream applications"
 msgstr "Etsi AppStream-sovelluksia"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
 msgid "Show all installed AppStream applications"
 msgstr "Näytä kaikki asennetut AppStream-sovellukset"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
-msgid "Search for AppStream applications by category name"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Luo HTML-tilasivu"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Luo CSV-tila-asiakirja"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "Lisää kieli lähdetiedostoon"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Muokkaa AppData-tiedostoa"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Yhdistä useita tiedostoja AppStream-tiedostoon"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4656
-msgid "Watch AppStream locations for changes"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Näytä versio"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr ""
+msgid "Validation failed"
+msgstr "Vahvistaminen epäonnistui"
 
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr ""
+msgid "Validation of files failed"
+msgstr "Tiedostojen vahvistaminen epäonnistui"
 
-#: client/as-util.c:4705
 msgid "Version:"
 msgstr "Versio:"
diff --git a/po/fr.po b/po/fr.po
index b0de5bf..ea63cc0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2017-04-24 05:43+0000\n"
 "Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
 "Language-Team: French (http://www.transifex.com/freedesktop/appstream-glib/language/fr/)\n"
@@ -22,505 +22,384 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Affiche des informations de débogage supplémentaires"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Ajoute les icônes haute définition dans l’archive tar"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Ajoute un identifiant de cache à chaque composant"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Inclut les résultats qui ont échoué dans la sortie"
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "Ajoute une langue à un fichier source"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Ajoute les icônes haute définition dans l’archive tar"
+#. TRANSLATORS: command description
+#, fuzzy
+msgid "Add a provide to a source file"
+msgstr "Ajoute une fourniture à un fichier source"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Ajoute les icônes codées dans le XML"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Ne compresse pas les icônes dans une archive tar"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Définit le répertoire de journalisation"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Définit le répertoire des paquets"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Ajoutée"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Définit le répertoire temporaire"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Alias de %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Définit le répertoire de sortie"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Utilitaire AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Définit le répertoire des icônes"
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "Annulé"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Définit le répertoire de cache"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Vérifie les données des applications installées"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Définit les noms de base des fichiers de sortie"
+msgid "Command not found, valid commands are:"
+msgstr "Commande introuvable, les commandes valides sont :"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Définit le nom d’origine"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Compare le contenu de deux fichiers AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Définit le nombre de fils d’exécution"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "La conversion de %s vers %s n’est pas implémentée"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Définit la taille minimale des icônes en pixels"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Convertit un fichier AppData au format NEWS"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Définit l’ancien emplacement des métadonnées"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Convertit un fichier NEWS au format AppData"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Ignore certains types de veto"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Convertit les métadonnées AppStream d’une version à une autre"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Échec de l’analyse des paramètres"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Crée un document de synthèse CSV"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Échec de configuration du constructeur"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Crée une page HTML avec matrice"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Échec d’ouverture des paquets"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Crée une page de synthèse HTML"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Analyse des paquets…"
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Crée un fichier Appdata exemple à partir d’un fichier .desktop"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "L’ajout du paquet a échoué"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Affiche les jetons de recherche des applications"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr "%u/%u fichiers analysés…"
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Ne compresse pas les icônes dans une archive tar"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "La génération de métadonnées a échoué"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Ne pas utiliser l’accès réseau"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Terminé !"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Enregistrement de l’icône"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Exporte les applications dans les métadonnées AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Définit le préfixe"
+msgid "Enable profiling"
+msgstr "Active le profilage"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Traitement de l’application"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Erreur lors de la création du répertoire de sortie"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Erreur lors du chargement du fichier AppData"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Erreur lors de l’analyse des traductions"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Erreur lors du chargement du fichier desktop"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Erreur lors de l’analyse des kudos"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
-msgstr ""
-"Erreur lors de l’analyse des fournitures apportées par les paquets RPM"
-
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Erreur lors du chargement du fichier desktop"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Erreur lors de la création du répertoire de sortie"
+msgstr "Erreur lors de l’analyse des fournitures apportées par les paquets RPM"
 
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "Enregistrement de AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Erreur lors de l’analyse des traductions"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Erreur lors de l’enregistrement du fichier AppStream"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Alias de %s"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Commande introuvable, les commandes valides sont :"
-
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Veuillez réviser le fichier et résoudre les éléments « FIXME »"
+#. list failures
+msgid "FAILED"
+msgstr "ÉCHEC"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Ancienne version d’API"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "L’ajout du paquet a échoué"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Nouvelle version d’API"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "La génération de métadonnées a échoué"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Paramètres insuffisants, indiquez ancien.xml nouveau.xml version"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Échec d’ouverture des paquets"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "La conversion de %s vers %s n’est pas implémentée"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Échec de l’analyse des paramètres"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Paramètres insuffisants, file.xml est attendu"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Échec de configuration du constructeur"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "Le format de fichier « %s » ne peut pas être mis à niveau"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Format non reconnu"
 
-#. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
-msgid "No desktop applications found"
-msgstr "Aucune application de bureau trouvée"
-
-#. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
-msgid "OK"
-msgstr "OK"
-
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "ÉCHEC"
-
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "La validation a échoué"
-
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "La validation des fichiers a échoué"
-
-#. TRANSLATORS: application was removed
-#: client/as-util.c:4053
-msgid "Removed"
-msgstr "Supprimée"
-
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Ajoutée"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "Annulé"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Ne pas utiliser l’accès réseau"
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Génère un GUID à partir d’une chaîne fournie"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Affiche la version"
+msgid "Ignore certain types of veto"
+msgstr "Ignore certains types de veto"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Importe un fichier en balisage AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Active le profilage"
+msgid "Include failed results in the output"
+msgstr "Inclut les résultats qui ont échoué dans la sortie"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Convertit les métadonnées AppStream d’une version à une autre"
+msgid "Incorporate extra metadata from an external file"
+msgstr "Incorpore des métadonnées supplémentaires à partir d’un fichier externe"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Met à jour les métadonnées AppData à la dernière version"
+msgid "Installs AppStream metadata"
+msgstr "Installe les métadonnées AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Crée un fichier Appdata exemple à partir d’un fichier .desktop"
+msgid "Installs AppStream metadata with new origin"
+msgstr "Installe les métadonnées AppStream d’une nouvelle origine"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Exporte les applications dans les métadonnées AppStream"
+msgid "List applications not backed by packages"
+msgstr "Liste les applications non basées sur des paquets"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
-msgid "Search for AppStream applications"
-msgstr "Recherche des applications AppStream"
+msgid "Merge several files to an AppStream file"
+msgstr "Fusionne plusieurs fichiers en un fichier AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "Recherche des applications AppStream par nom de paquet"
+msgid "Mirror upstream screenshots"
+msgstr "Réplique les captures d’écran amont"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "Affiche toutes les applications AppStream installées"
+msgid "Modify an AppData file"
+msgstr "Modifie un fichier AppData"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
-msgid "Search for AppStream applications by category name"
-msgstr "Recherche des applications AppStream par nom de catégorie"
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Nouvelle version d’API"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Affiche les jetons de recherche des applications"
+#. TRANSLATORS: probably wrong XML
+msgid "No desktop applications found"
+msgstr "Aucune application de bureau trouvée"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Installe les métadonnées AppStream"
+msgid "Not enough arguments, expected file.xml"
+msgstr "Paramètres insuffisants, file.xml est attendu"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Installe les métadonnées AppStream d’une nouvelle origine"
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Paramètres insuffisants, indiquez ancien.xml nouveau.xml version"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Désinstalle les métadonnées AppStream"
+#. TRANSLATORS: the file is valid
+msgid "OK"
+msgstr "OK"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Crée une page de synthèse HTML"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Ancienne version d’API"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Crée un document de synthèse CSV"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %u/%u files..."
+msgstr "%u/%u fichiers analysés…"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Crée une page HTML avec matrice"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Veuillez réviser le fichier et résoudre les éléments « FIXME »"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Liste les applications non basées sur des paquets"
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Traitement de l’application"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Valide un fichier AppData ou AppStream"
+#. TRANSLATORS: application was removed
+msgid "Removed"
+msgstr "Supprimée"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Valide un fichier AppData ou AppStream (laxiste)"
+msgid "Replace screenshots in source file"
+msgstr "Remplace les captures d’écran dans le fichier source"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "Enregistrement de AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Valide un fichier AppData ou AppStream (strict)"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Enregistrement de l’icône"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Convertit un fichier AppData au format NEWS"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Analyse des paquets…"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Convertit un fichier NEWS au format AppData"
+msgid "Search for AppStream applications"
+msgstr "Recherche des applications AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Vérifie les données des applications installées"
+msgid "Search for AppStream applications by category name"
+msgstr "Recherche des applications AppStream par nom de catégorie"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr ""
+msgid "Search for AppStream applications by package name"
+msgstr "Recherche des applications AppStream par nom de paquet"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Remplace les captures d’écran dans le fichier source"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Définit les noms de base des fichiers de sortie"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-#, fuzzy
-msgid "Add a provide to a source file"
-msgstr "Ajoute une fourniture à un fichier source"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Définit le répertoire de cache"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "Ajoute une langue à un fichier source"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Définit le répertoire des icônes"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Réplique les captures d’écran amont"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Définit le répertoire de journalisation"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Réplique les fichiers de micrologiciels locaux"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Définit la taille minimale des icônes en pixels"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr ""
-"Incorpore des métadonnées supplémentaires à partir d’un fichier externe"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Définit le nombre de fils d’exécution"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Compare le contenu de deux fichiers AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Définit l’ancien emplacement des métadonnées"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Génère un GUID à partir d’une chaîne fournie"
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Définit le nom d’origine"
+
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Définit le répertoire de sortie"
+
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Définit le répertoire des paquets"
+
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Définit le préfixe"
+
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Définit le répertoire temporaire"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Modifie un fichier AppData"
+msgid "Show all installed AppStream applications"
+msgstr "Affiche toutes les applications AppStream installées"
+
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Affiche des informations de débogage supplémentaires"
+
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Affiche la version"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4638
 msgid "Split an AppStream file to AppData and Metainfo files"
 msgstr "Divise un fichier AppStream en fichiers AppData et Metainfo"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Fusionne plusieurs fichiers en un fichier AppStream"
+msgid "Uninstalls AppStream metadata"
+msgstr "Désinstalle les métadonnées AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Importe un fichier en balisage AppStream"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Met à jour les métadonnées AppData à la dernière version"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
-msgid "Watch AppStream locations for changes"
-msgstr "Surveille les modifications dans les emplacements AppStream"
+msgid "Validate an AppData or AppStream file"
+msgstr "Valide un fichier AppData ou AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr ""
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Valide un fichier AppData ou AppStream (laxiste)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr ""
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Valide un fichier AppData ou AppStream (strict)"
 
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Utilitaire AppStream"
+msgid "Validation failed"
+msgstr "La validation a échoué"
+
+msgid "Validation of files failed"
+msgstr "La validation des fichiers a échoué"
 
-#: client/as-util.c:4705
 msgid "Version:"
 msgstr "Version :"
+
+#. TRANSLATORS: command description
+msgid "Watch AppStream locations for changes"
+msgstr "Surveille les modifications dans les emplacements AppStream"
diff --git a/po/fur.po b/po/fur.po
index 0ec8abf..e2ec806 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2018-03-21 04:19+0000\n"
 "Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
 "Language-Team: Friulian\n"
@@ -16,502 +16,395 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Mostre informazions di debug adizionâls"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Zonte iconis HiDPI al tarball"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Zonte un ID di cache par ogni component"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Inclût i risultâts falîts te jessude/stampe"
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "Zonte une lenghe a un file sorzint"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Zonte iconis HiDPI al tarball"
+#. TRANSLATORS: command description
+msgid "Add a provide to a source file"
+msgstr "Zonte une furnidure a un file sorzint"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Zonte iconis codificadis al XML"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "No sta comprimi lis iconis intun tarball"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Stabilìs la cartele di regjistrazion"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Zontade"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Stabilìs la cartele dai pachets"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Alias a %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Stabilìs la cartele temporanie"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Utilitât AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Stabilìs la cartele di jessude"
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "Anulade"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Stabilìs la cartele des iconis"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Controle i dâts de aplicazion instalade"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Stabilìs la cartele de cache"
+msgid "Command not found, valid commands are:"
+msgstr "Comant no cjatât, i comants valits a son:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Stabilìs il non di base dai file di jessude"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Confronte i contignûts di doi file AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Stabilìs il non de origjin"
+#. TRANSLATORS: command description
+msgid "Compare version numbers"
+msgstr "Confronte numars di version"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Stabilìs il numar di thread"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "La conversion %s a %s no je implementade"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Stabilìs la dimension di icone minime in pixel"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Convertìs un file AppData al formât NEWS"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Stabilìs la vecje posizion dai metadâts"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Convertìs un file NEWS al formât AppData"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Ignore cierts gjenars di veto"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Al convertìs i metadâts AppStream di une version a une altre"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "No si è rivâts a analizâ i argoments"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Cree un document di stât in formât CSV"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "No si è rivâts a meti impins il gjeneradôr"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Cree une pagjine di matriç in formât HTML"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "No si è rivâts a vierzi i pachets"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Cree une pagjine di stât in formât HTML"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Analisi dai pachets..."
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Al cree un file Appdata di esempli partint di un file .desktop"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "No si è rivâts a zontâ il pachet"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Mostre i token di ricercje aplicazions"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr "Analizât %u/%u file..."
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "No sta comprimi lis iconis intun tarball"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "No si è rivâts a gjenerâ i metadâts"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "No sta doprâ l'acès ae rêt"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Fat!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Salvament icone"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Al discjarie lis aplicazions tai metadâts AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Stabilìs il prefìs"
+msgid "Enable profiling"
+msgstr "Abilite il profilament"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Elaborazion aplicazion"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Erôr tal creâ la cartele di jessude"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Erôr tal cjariâ il file AppData"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Erôr tal analizâ lis traduzions"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Erôr tal cjariâ il file desktop"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Erôr tal analizâ i kudos"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Erôr tal analizâ i provides"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Erôr tal cjariâ il file desktop"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Erôr tal creâ la cartele di jessude"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "Salvament AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Erôr tal analizâ lis traduzions"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Erôr tal salvâ il file AppStream"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Alias a %s"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Comant no cjatât, i comants valits a son:"
-
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Controle il file e comede ducj i elements 'FIXME'"
+#. list failures
+msgid "FAILED"
+msgstr "FALÎT"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Version de API vecje"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "No si è rivâts a zontâ il pachet"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Version de API gnove"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "No si è rivâts a gjenerâ i metadâts"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "No vonde argoments, si spietave version vieli.xml gnûf.xml"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "No si è rivâts a vierzi i pachets"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "La conversion %s a %s no je implementade"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "No si è rivâts a analizâ i argoments"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "No vonde argoments, si spietave file.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "No si è rivâts a meti impins il gjeneradôr"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "Il formât di file '%s' nol pues jessi inzornât"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Formât no ricognossût"
 
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Gjenere un GUID partint di une stringhe di jentrade"
+
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "Ignore cierts gjenars di veto"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Impuarte un file a segnalazion(markup) AppStream"
+
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "Inclût i risultâts falîts te jessude/stampe"
+
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "Incorpore metadâts adizionâi di un file esterni"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Al instale metadâts AppStream"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Al Instale metadâts AppStream cun gnove origjin"
+
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Liste di aplicazions no supuartadis di pachets"
+
+#. TRANSLATORS: command description
+msgid "Merge several files to an AppStream file"
+msgstr "Unìs plui file intun file AppStream"
+
+#. TRANSLATORS: command description
+msgid "Mirror upstream screenshots"
+msgstr "Copie lis caturis di schermi upstream"
+
+#. TRANSLATORS: command description
+msgid "Modify an AppData file"
+msgstr "Modifiche un file AppData"
+
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Version de API gnove"
+
 #. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
 msgid "No desktop applications found"
 msgstr "Nissune aplicazion scritori cjatade"
 
+msgid "Not enough arguments, expected file.xml"
+msgstr "No vonde argoments, si spietave file.xml"
+
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "No vonde argoments, si spietave version vieli.xml gnûf.xml"
+
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "OK"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "FALÎT"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Version de API vecje"
 
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Validazion falide"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %u/%u files..."
+msgstr "Analizât %u/%u file..."
 
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "No si è rivâts a validâ i file"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Controle il file e comede ducj i elements 'FIXME'"
+
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Elaborazion aplicazion"
 
 #. TRANSLATORS: application was removed
-#: client/as-util.c:4053
 msgid "Removed"
 msgstr "Gjavade"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Zontade"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "Anulade"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "No sta doprâ l'acès ae rêt"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Mostre version"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Abilite il profilament"
-
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Al convertìs i metadâts AppStream di une version a une altre"
+msgid "Replace screenshots in source file"
+msgstr "Sostituìs une cature di schermi tal file sorzint"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Inzorne i metadâts AppData ae ultime version"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "Salvament AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Al cree un file Appdata di esempli partint di un file .desktop"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Salvament icone"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Al discjarie lis aplicazions tai metadâts AppStream"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Analisi dai pachets..."
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
 msgid "Search for AppStream applications"
 msgstr "Cîr aplicazions AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "Cîr aplicazions AppStream par non di pachet"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "Mostre dutis lis aplicazions AppStream instaladis"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
 msgid "Search for AppStream applications by category name"
 msgstr "Cîr aplicazions AppStream par non di categorie"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Mostre i token di ricercje aplicazions"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Al instale metadâts AppStream"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Al Instale metadâts AppStream cun gnove origjin"
+msgid "Search for AppStream applications by package name"
+msgstr "Cîr aplicazions AppStream par non di pachet"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Al disinstale metadâts AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Stabilìs il non di base dai file di jessude"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Cree une pagjine di stât in formât HTML"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Stabilìs la cartele de cache"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Cree un document di stât in formât CSV"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Stabilìs la cartele des iconis"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Cree une pagjine di matriç in formât HTML"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Stabilìs la cartele di regjistrazion"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Liste di aplicazions no supuartadis di pachets"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Stabilìs la dimension di icone minime in pixel"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Valide un AppData o un file AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Stabilìs il numar di thread"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Valide un AppData o un file AppStream (rilassât)"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Stabilìs la vecje posizion dai metadâts"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Stabilìs il non de origjin"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Valide un AppData o un file AppStream (rigorôs)"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Stabilìs la cartele di jessude"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Convertìs un file AppData al formât NEWS"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Stabilìs la cartele dai pachets"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Convertìs un file NEWS al formât AppData"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Stabilìs il prefìs"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Controle i dâts de aplicazion instalade"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Stabilìs la cartele temporanie"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr "controle une aplicazion instalade"
+msgid "Show all installed AppStream applications"
+msgstr "Mostre dutis lis aplicazions AppStream instaladis"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Sostituìs une cature di schermi tal file sorzint"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Mostre informazions di debug adizionâls"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr "Zonte une furnidure a un file sorzint"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Mostre version"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "Zonte une lenghe a un file sorzint"
+msgid "Split an AppStream file to AppData and Metainfo files"
+msgstr "Divît un file AppStream in file AppData e Metainfo"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Copie lis caturis di schermi upstream"
+msgid "Test a regular expression"
+msgstr "Prove une espression regolâr"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Copie i file firmware locâi"
+msgid "Uninstalls AppStream metadata"
+msgstr "Al disinstale metadâts AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Incorpore metadâts adizionâi di un file esterni"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Inzorne i metadâts AppData ae ultime version"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Confronte i contignûts di doi file AppStream"
+msgid "Validate an AppData or AppStream file"
+msgstr "Valide un AppData o un file AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Gjenere un GUID partint di une stringhe di jentrade"
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Valide un AppData o un file AppStream (rilassât)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Modifiche un file AppData"
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Valide un AppData o un file AppStream (rigorôs)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr "Divît un file AppStream in file AppData e Metainfo"
+msgid "Validation failed"
+msgstr "Validazion falide"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Unìs plui file intun file AppStream"
+msgid "Validation of files failed"
+msgstr "No si è rivâts a validâ i file"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Impuarte un file a segnalazion(markup) AppStream"
+msgid "Version:"
+msgstr "Version:"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
 msgid "Watch AppStream locations for changes"
 msgstr "Ten di voli lis posizions di AppStream par modifichis"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr "Confronte numars di version"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr "Prove une espression regolâr"
-
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Utilitât AppStream"
-
-#: client/as-util.c:4705
-msgid "Version:"
-msgstr "Version:"
+msgid "check an installed application"
+msgstr "controle une aplicazion instalade"
diff --git a/po/gl.po b/po/gl.po
index ae06fed..1bb00de 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2016-08-06 02:59+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Galician (http://www.transifex.com/freedesktop/appstream-glib/language/gl/)\n"
@@ -21,502 +21,246 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Mostra información de depuración adicional"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Engadir iconas HiDPI ao tarball"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Engadir un ID de caché para cada compoñente"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Incluír os resultados fallidos na saída"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Engadir iconas HiDPI ao tarball"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Engadir iconas codificadas ao XML"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Non comprimir as iconas nun tarball"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Estabelece o directorio de rexistro"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Estabelece o directorio de paquetes"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Estabelece o directorio temporal"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Estabelece o directorio de saída"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Estabelecer o cartafol das iconas"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Alias a %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Estabelece o directorio de caché"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Utilidade de AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Estabelecer os nomes base dos ficheiros de saída"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Comproba os datos de aplicativo instalados"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Estabelece o nome de orixe"
+msgid "Command not found, valid commands are:"
+msgstr "Orde non atopada, as ordes válidas son:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Estabelece o número de fíos"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Comparar os contidos de dous ficheiros AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Estabelecer o tamaño de icona mínimo nos píxeles"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Conveter un ficheiro AppData ao formato NEWS"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Estabelece a localización de metadatos antigos"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Converter un ficheiro NEWS ao formato AppData"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Ignorar certos tipos de veto"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Convirte os metadatos AppStream dunha versión a outra"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Produciuse un fallo ao analizar os argumentos"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Crea un documento de estado CSV"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Produciuse un fallo ao configurar o construtor"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Crear unha páxina de matriz de HTML"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Produciuse un fallo ao abrir os paquetes"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Crea unha páxina de estado HTML"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Analizando paquetes…"
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Crea un ficheiro Appdata de exemplo para un ficheiro .desktop"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Produciuse un fallo ao engadir o paquete"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Mostrar tokens de busca de aplicativo"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Non comprimir as iconas nun tarball"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Produciuse un fallo ao xerar os metadatos"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Non usar o acceso á rede"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Feito!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Emborca os aplicativos nos metadatos AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr ""
-
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr ""
+msgid "Enable profiling"
+msgstr "Engadir perfilado"
 
-#. TRANSLATORS: the .appdata.xml file could not
-#. * be loaded
-#: client/as-compose.c:425
-msgid "Error loading AppData file"
-msgstr ""
+#. list failures
+msgid "FAILED"
+msgstr "FALLIDA"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr ""
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Produciuse un fallo ao engadir o paquete"
 
-#. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
-msgid "Error parsing kudos"
-msgstr ""
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Produciuse un fallo ao xerar os metadatos"
 
-#. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
-msgid "Error parsing provides"
-msgstr ""
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Produciuse un fallo ao abrir os paquetes"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr ""
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Produciuse un fallo ao analizar os argumentos"
 
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr ""
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Produciuse un fallo ao configurar o construtor"
 
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "Ignorar certos tipos de veto"
 
-#. TRANSLATORS: this is when the destination file
-#. * cannot be saved for some reason
-#: client/as-compose.c:542
-msgid "Error saving AppStream file"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "Incluír os resultados fallidos na saída"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Alias a %s"
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "Incorporar metadatos adicionais desde un ficheiro externo"
 
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Orde non atopada, as ordes válidas son:"
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Instala os metadatos de AppStream"
 
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Por favor revise o ficheiro e arranxe calquera elemento «FIXME»"
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Instala os metadatos de AppStream con un novo orixe"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Lista os aplicativos que non teñen un paquete"
 
 #. TRANSLATORS: information message
-#: client/as-util.c:508
 msgid "New API version"
 msgstr "Nova versión da API"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Non hai argumentos dabondo, agardábase a versión antiga.xml nova.xml"
-
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr ""
-
-#: client/as-util.c:580
 msgid "Not enough arguments, expected file.xml"
 msgstr "Non hai argumentos dabondo, agardábase ficheiro.xml"
 
-#. TRANSLATORS: %s is a file type,
-#. * e.g. 'appdata'
-#: client/as-util.c:606
-#, c-format
-msgid "File format '%s' cannot be upgraded"
-msgstr ""
-
-#. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
-msgid "Format not recognised"
-msgstr ""
-
-#. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
-msgid "No desktop applications found"
-msgstr ""
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Non hai argumentos dabondo, agardábase a versión antiga.xml nova.xml"
 
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "OK"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "FALLIDA"
-
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Validación fallida"
-
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Validación dos ficheiros fallida"
-
-#. TRANSLATORS: application was removed
-#: client/as-util.c:4053
-msgid "Removed"
-msgstr ""
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Por favor revise o ficheiro e arranxe calquera elemento «FIXME»"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Replace screenshots in source file"
+msgstr "Substituír capturas de pantallas no ficheiro de orixe"
 
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr ""
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Analizando paquetes…"
 
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Non usar o acceso á rede"
+#. TRANSLATORS: command description
+msgid "Search for AppStream applications"
+msgstr "Buscar aplicativos AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Mostra a versión"
+msgid "Set the basenames of the output files"
+msgstr "Estabelecer os nomes base dos ficheiros de saída"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Engadir perfilado"
+msgid "Set the cache directory"
+msgstr "Estabelece o directorio de caché"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Convirte os metadatos AppStream dunha versión a outra"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Estabelecer o cartafol das iconas"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Anovar os metadatos de AppData á última versión"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Estabelece o directorio de rexistro"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Crea un ficheiro Appdata de exemplo para un ficheiro .desktop"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Estabelecer o tamaño de icona mínimo nos píxeles"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Emborca os aplicativos nos metadatos AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Estabelece o número de fíos"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4464
-msgid "Search for AppStream applications"
-msgstr "Buscar aplicativos AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Estabelece a localización de metadatos antigos"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Estabelece o nome de orixe"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Estabelece o directorio de saída"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
-msgid "Search for AppStream applications by category name"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Estabelece o directorio de paquetes"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Mostrar tokens de busca de aplicativo"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Estabelece o directorio temporal"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Instala os metadatos de AppStream"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Mostra información de depuración adicional"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Instala os metadatos de AppStream con un novo orixe"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Mostra a versión"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4506
 msgid "Uninstalls AppStream metadata"
 msgstr "Desinstala os metadatos de AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Crea unha páxina de estado HTML"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Crea un documento de estado CSV"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Crear unha páxina de matriz de HTML"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Lista os aplicativos que non teñen un paquete"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Anovar os metadatos de AppData á última versión"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4536
 msgid "Validate an AppData or AppStream file"
 msgstr "Valida un ficheiro de AppData ou AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4542
 msgid "Validate an AppData or AppStream file (relaxed)"
 msgstr "Valida un ficheiro de AppData ou AppStream (relaxado)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
 msgid "Validate an AppData or AppStream file (strict)"
 msgstr "Valida un ficheiro de AppData ou AppStream (estricto)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Conveter un ficheiro AppData ao formato NEWS"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Converter un ficheiro NEWS ao formato AppData"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Comproba os datos de aplicativo instalados"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Substituír capturas de pantallas no ficheiro de orixe"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Incorporar metadatos adicionais desde un ficheiro externo"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Comparar os contidos de dous ficheiros AppStream"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4656
-msgid "Watch AppStream locations for changes"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr ""
+msgid "Validation failed"
+msgstr "Validación fallida"
 
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Utilidade de AppStream"
+msgid "Validation of files failed"
+msgstr "Validación dos ficheiros fallida"
 
-#: client/as-util.c:4705
 msgid "Version:"
 msgstr "Versión:"
diff --git a/po/hu.po b/po/hu.po
index 90abcf1..d8e1305 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2017-07-16 04:07+0000\n"
 "Last-Translator: Meskó Balázs <meskobalazs@gmail.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/freedesktop/appstream-glib/language/hu/)\n"
@@ -25,502 +25,395 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "További hibakeresési információk megjelenítése"
+msgid "Add HiDPI icons to the tarball"
+msgstr "HiDPI ikonok hozzáadása a tömörített fájlhoz"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Gyorsítótár-azonosító hozzáadása minden komponenshez"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Sikertelen találatok felvétele a kimenetbe"
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "Nyelv hozzáadása a forrásfájlhoz"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "HiDPI ikonok hozzáadása a tömörített fájlhoz"
+#. TRANSLATORS: command description
+msgid "Add a provide to a source file"
+msgstr "Hozzáadás a forrásfájlhoz fájlt"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Kódolt ikonok hozzáadása az XML-hez"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Ne tömörítse az ikonokat a tömörített fájlba"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "A naplózási könyvtár beállítása"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Hozzáadva"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "A csomagkönyvtár beállítása"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Álnév erre: %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Az átmeneti könyvtár beállítása"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "AppStream segédprogram"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "A kimeneti könyvtár beállítása"
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "Visszavonva"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Az ikonkönyvtár beállítása"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Telepített alkalmazások adatainak ellenőrzése"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "A gyorsítótár könyvtár beállítása"
+msgid "Command not found, valid commands are:"
+msgstr "A parancs nem található, az érvényes parancsok:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "A kimeneti fájlok alapneveinek beállítása"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Két AppStream fájl tartalmának összehasonlítása"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Az eredet nevének beállítása"
+#. TRANSLATORS: command description
+msgid "Compare version numbers"
+msgstr "Verziószámok összehasonlítása"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "A szálak számának beállítása"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "A(z) %s – %s átalakítás nincs megvalósítva"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "A legkisebb ikonméret beállítása képpontokban"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Egy AppData fájl átalakítása NEWS formátumra"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "A régi metaadatok helyének beállítása"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Egy NEWS fájl átalakítása AppData formátumra"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Bizonyos vétótípusok mellőzése"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Átalakítja az AppStream metaadatokat az egyik verzióról a másikra"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Nem sikerült az argumentumok feldolgozása"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Egy CSV állapotdokumentum létrehozása"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Nem sikerült a fordító beállítása"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Egy HTML mátrixoldal létrehozása"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Nem sikerült a csomagok megnyitása"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Egy HTML állapotoldal létrehozása"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Csomagok keresése…"
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Létrehoz egy példa Appdata fájlt egy .desktop fájlból"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Nem sikerült a csomag hozzáadása"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Alkalmazáskeresési jelsorok megjelenítése"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr "%u / %u fájl feldolgozva…"
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Ne tömörítse az ikonokat a tömörített fájlba"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Nem sikerült a metaadatok előállítása"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Ne használjon hálózati hozzáférést"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Kész!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Ikon mentése"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Kiírja az alkalmazásokat az AppStream metaadatokba"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Előtag beállítása"
+msgid "Enable profiling"
+msgstr "Profilalkotás engedélyezése"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Alkalmazás feldolgozása"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Hiba a kimeneti könyvtár létrehozásakor"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Hiba az AppData fájl betöltésekor"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Hiba a fordítások feldolgozásakor"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Hiba a desktop fájl betöltésekor"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Hiba a kudos feldolgozásakor"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Hiba a biztosítottak feldolgozásakor"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Hiba a desktop fájl betöltésekor"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Hiba a kimeneti könyvtár létrehozásakor"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "AppStream mentése"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Hiba a fordítások feldolgozásakor"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Hiba az AppStream fájl mentésekor"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Álnév erre: %s"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "A parancs nem található, az érvényes parancsok:"
-
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Nézze át a fájlt, és javítson minden „FIXME” elemet"
+#. list failures
+msgid "FAILED"
+msgstr "SIKERTELEN"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Régi API verzió"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Nem sikerült a csomag hozzáadása"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Új API verzió"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Nem sikerült a metaadatok előállítása"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Nincs elég argumentum, a következő az elvárt: old.xml new.xml verzió"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Nem sikerült a csomagok megnyitása"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "A(z) %s – %s átalakítás nincs megvalósítva"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Nem sikerült az argumentumok feldolgozása"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Nincs elég argumentum, a következő az elvárt: file.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Nem sikerült a fordító beállítása"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "A(z) „%s” fájlformátum nem frissíthető"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "A formátum ismeretlen"
 
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "GUID előállítása egy bemeneti szövegből"
+
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "Bizonyos vétótípusok mellőzése"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Fájl importálása AppStream jelölőnyelvbe"
+
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "Sikertelen találatok felvétele a kimenetbe"
+
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "Extra metaadatok egyesítése egy külső fájlból"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Telepíti az AppStream metaadatokat"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Telepíti az AppStream metaadatokat egy új eredettel"
+
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Alkalmazások felsorolása, amelyeket nem másoltak a csomagok"
+
+#. TRANSLATORS: command description
+msgid "Merge several files to an AppStream file"
+msgstr "Több fájl egy AppStream fájlba fésülése"
+
+#. TRANSLATORS: command description
+msgid "Mirror upstream screenshots"
+msgstr "A fő tároló képernyőképeinek tükrözése"
+
+#. TRANSLATORS: command description
+msgid "Modify an AppData file"
+msgstr "Egy AppData fájl módosítása"
+
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Új API verzió"
+
 #. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
 msgid "No desktop applications found"
 msgstr "Nem találhatók asztali alkalmazások"
 
+msgid "Not enough arguments, expected file.xml"
+msgstr "Nincs elég argumentum, a következő az elvárt: file.xml"
+
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Nincs elég argumentum, a következő az elvárt: old.xml new.xml verzió"
+
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "OK"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "SIKERTELEN"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Régi API verzió"
 
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Az ellenőrzés nem sikerült"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %u/%u files..."
+msgstr "%u / %u fájl feldolgozva…"
 
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "A fájlok ellenőrzése nem sikerült"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Nézze át a fájlt, és javítson minden „FIXME” elemet"
+
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Alkalmazás feldolgozása"
 
 #. TRANSLATORS: application was removed
-#: client/as-util.c:4053
 msgid "Removed"
 msgstr "Eltávolítva"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Hozzáadva"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "Visszavonva"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Ne használjon hálózati hozzáférést"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Verzió megjelenítése"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Profilalkotás engedélyezése"
-
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Átalakítja az AppStream metaadatokat az egyik verzióról a másikra"
+msgid "Replace screenshots in source file"
+msgstr "Képernyőképek cseréje a forrásfájlban"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Az AppData metaadatok frissítése a legújabb verzióra"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "AppStream mentése"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Létrehoz egy példa Appdata fájlt egy .desktop fájlból"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Ikon mentése"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Kiírja az alkalmazásokat az AppStream metaadatokba"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Csomagok keresése…"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
 msgid "Search for AppStream applications"
 msgstr "AppStream alkalmazások keresése"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "AppStream alkalmazások keresése csomagnév alapján"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "Megjeleníti a telepített AppStream alkalmazásokat"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
 msgid "Search for AppStream applications by category name"
 msgstr "Appstream alkalmazások keresése kategória nevek alapján"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Alkalmazáskeresési jelsorok megjelenítése"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Telepíti az AppStream metaadatokat"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Telepíti az AppStream metaadatokat egy új eredettel"
+msgid "Search for AppStream applications by package name"
+msgstr "AppStream alkalmazások keresése csomagnév alapján"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Eltávolítja az AppStream metaadatokat"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "A kimeneti fájlok alapneveinek beállítása"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Egy HTML állapotoldal létrehozása"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "A gyorsítótár könyvtár beállítása"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Egy CSV állapotdokumentum létrehozása"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Az ikonkönyvtár beállítása"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Egy HTML mátrixoldal létrehozása"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "A naplózási könyvtár beállítása"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Alkalmazások felsorolása, amelyeket nem másoltak a csomagok"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "A legkisebb ikonméret beállítása képpontokban"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Egy AppData vagy AppStream fájl ellenőrzése"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "A szálak számának beállítása"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Egy AppData vagy AppStream fájl ellenőrzése (megengedő)"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "A régi metaadatok helyének beállítása"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Az eredet nevének beállítása"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Egy AppData vagy AppStream fájl ellenőrzése (szigorú)"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "A kimeneti könyvtár beállítása"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Egy AppData fájl átalakítása NEWS formátumra"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "A csomagkönyvtár beállítása"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Egy NEWS fájl átalakítása AppData formátumra"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Előtag beállítása"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Telepített alkalmazások adatainak ellenőrzése"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Az átmeneti könyvtár beállítása"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr "egy telepített alkalmazás ellenőrzése"
+msgid "Show all installed AppStream applications"
+msgstr "Megjeleníti a telepített AppStream alkalmazásokat"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Képernyőképek cseréje a forrásfájlban"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "További hibakeresési információk megjelenítése"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr "Hozzáadás a forrásfájlhoz fájlt"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Verzió megjelenítése"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "Nyelv hozzáadása a forrásfájlhoz"
+msgid "Split an AppStream file to AppData and Metainfo files"
+msgstr "Egy AppStream fájl felosztása AppData és Metainfo fájlokká"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "A fő tároló képernyőképeinek tükrözése"
+msgid "Test a regular expression"
+msgstr "Egy reguláris kifejezés tesztelése"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Helyi firmware-fájlok tükrözése"
+msgid "Uninstalls AppStream metadata"
+msgstr "Eltávolítja az AppStream metaadatokat"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Extra metaadatok egyesítése egy külső fájlból"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Az AppData metaadatok frissítése a legújabb verzióra"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Két AppStream fájl tartalmának összehasonlítása"
+msgid "Validate an AppData or AppStream file"
+msgstr "Egy AppData vagy AppStream fájl ellenőrzése"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "GUID előállítása egy bemeneti szövegből"
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Egy AppData vagy AppStream fájl ellenőrzése (megengedő)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Egy AppData fájl módosítása"
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Egy AppData vagy AppStream fájl ellenőrzése (szigorú)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr "Egy AppStream fájl felosztása AppData és Metainfo fájlokká"
+msgid "Validation failed"
+msgstr "Az ellenőrzés nem sikerült"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Több fájl egy AppStream fájlba fésülése"
+msgid "Validation of files failed"
+msgstr "A fájlok ellenőrzése nem sikerült"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Fájl importálása AppStream jelölőnyelvbe"
+msgid "Version:"
+msgstr "Verzió:"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
 msgid "Watch AppStream locations for changes"
 msgstr "AppStream helyek változásainak figyelése"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr "Verziószámok összehasonlítása"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr "Egy reguláris kifejezés tesztelése"
-
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "AppStream segédprogram"
-
-#: client/as-util.c:4705
-msgid "Version:"
-msgstr "Verzió:"
+msgid "check an installed application"
+msgstr "egy telepített alkalmazás ellenőrzése"
diff --git a/po/id.po b/po/id.po
index 2b8f5fc..0dc7c75 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2017-09-01 05:13+0000\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/freedesktop/appstream-glib/language/id/)\n"
@@ -22,502 +22,395 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Tampilkan informasi debug ekstra"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Tambah ikon HiDPI ke tarball"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Tambahkan ID singgahan ke setiap komponen"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Sertakan hasil gagal dalam keluaran"
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "Tambahkan bahasa ke suatu berkas sumber"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Tambah ikon HiDPI ke tarball"
+#. TRANSLATORS: command description
+msgid "Add a provide to a source file"
+msgstr "Tambahkan penyedia ke suatu berkas sumber"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Tambah ikon terenkode ke XML"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Jangan mampatkan ikon ke dalam tarball"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Tata direktori log"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Ditambahkan"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Atur direktori paket"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Alias untuk %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Atur direktori temporer"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Utilitas AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Atur direktori keluaran"
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "Dibatalkan"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Atur direktori ikon"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Periksa data aplikasi yang terpasang"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Atur direktori singgahan"
+msgid "Command not found, valid commands are:"
+msgstr "Perintah tak ditemukan, perintah yang valid adalah:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Atur nama basis dari berkas keluaran"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Bandingkan isi dari dua berkas AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Atur nama asli"
+#. TRANSLATORS: command description
+msgid "Compare version numbers"
+msgstr "Bandingkan nomor-nomor versi"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Atur cacah thread"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "Konversi %s ke %s tidak diimplementasi"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Atur ukuran ikon minimum dalam piksel"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Konversikan berkas AppData ke format NEWS"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Atur lokasi metadata lama"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Konversikan berkas NEWS ke format AppData"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Abaikan tipe veto tertentu"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Konversikan metadata AppStream dari satu versi ke lainnya"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Gagal mengurai argumen"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Buat sebuah dokumen status CSV"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Gagal menyiapkan builder"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Buat sebuah halaman matriks HTML"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Gagal membuka paket"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Buat sebuah halaman status HTML"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Memindai paket..."
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Membuat contoh berkas Appdata dari suatu berkas .desktop"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Gagal menambah paket"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Tampilkan token pencarian aplikasi"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr "Diurai %u/%u berkas..."
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Jangan mampatkan ikon ke dalam tarball"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Gagal menghasilkan metadata"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Jangan pakai akses jaringan"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Selesai!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Menyimpan ikon"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Mencurahkan aplikasi dalam metadata AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Atur prefiks"
+msgid "Enable profiling"
+msgstr "Fungsikan pemrofilan"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Memroses aplikasi"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Kesalahan saat membuat direktori keluaran"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Kesalahan saat memuat berkas AppData"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Kesalahan saat mengurai terjemahan"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Kesalahan saat memuat berkas desktop"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Kesalahan mengurai pujian"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Kesalahan saat mengurai penyedia"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Kesalahan saat memuat berkas desktop"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Kesalahan saat membuat direktori keluaran"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "Menyimpan AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Kesalahan saat mengurai terjemahan"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Kesalahan saat menyimpan berkas AppStream"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Alias untuk %s"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Perintah tak ditemukan, perintah yang valid adalah:"
-
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Harap periksa berkas dan perbaiki sebarang butir 'FIXME'"
+#. list failures
+msgid "FAILED"
+msgstr "GAGAL"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Versi API lama"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Gagal menambah paket"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Versi API baru"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Gagal menghasilkan metadata"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Argumen tidak cukup, yang diharapkan lama.xml baru.xml versi"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Gagal membuka paket"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "Konversi %s ke %s tidak diimplementasi"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Gagal mengurai argumen"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Argumen tidak cukup yang diharapkan berkas.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Gagal menyiapkan builder"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "Format berkas '%s' tidak bisa ditingkatkan"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Format tidak dikenali"
 
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Buat suatu GUID dari string masukan"
+
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "Abaikan tipe veto tertentu"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Impor sebuah berkas ke markup AppStream"
+
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "Sertakan hasil gagal dalam keluaran"
+
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "Sertakan medatada ekstra dari berkas eksternal"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Pasang metadata AppStream"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Pasang metadata AppStream dengan origin baru"
+
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Daftar aplikasi yang tidak didukung oleh paket"
+
+#. TRANSLATORS: command description
+msgid "Merge several files to an AppStream file"
+msgstr "Gabungkan beberapa berkas ke sebuh berkas AppStream"
+
+#. TRANSLATORS: command description
+msgid "Mirror upstream screenshots"
+msgstr "Cerminkan cuplikan layar upstream"
+
+#. TRANSLATORS: command description
+msgid "Modify an AppData file"
+msgstr "Ubah berkas AppData"
+
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Versi API baru"
+
 #. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
 msgid "No desktop applications found"
 msgstr "Tidak ditemukan aplikasi desktop"
 
+msgid "Not enough arguments, expected file.xml"
+msgstr "Argumen tidak cukup yang diharapkan berkas.xml"
+
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Argumen tidak cukup, yang diharapkan lama.xml baru.xml versi"
+
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "OK"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "GAGAL"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Versi API lama"
 
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Validasi gagal"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %u/%u files..."
+msgstr "Diurai %u/%u berkas..."
 
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Validasi berkas gagal"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Harap periksa berkas dan perbaiki sebarang butir 'FIXME'"
+
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Memroses aplikasi"
 
 #. TRANSLATORS: application was removed
-#: client/as-util.c:4053
 msgid "Removed"
 msgstr "Dihapus"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Ditambahkan"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "Dibatalkan"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Jangan pakai akses jaringan"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Tampilkan versi"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Fungsikan pemrofilan"
-
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Konversikan metadata AppStream dari satu versi ke lainnya"
+msgid "Replace screenshots in source file"
+msgstr "Gantikan cuplikan layar dalam berkas sumber"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Tingkatkan metadata AppData ke versi terakhir"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "Menyimpan AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Membuat contoh berkas Appdata dari suatu berkas .desktop"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Menyimpan ikon"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Mencurahkan aplikasi dalam metadata AppStream"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Memindai paket..."
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
 msgid "Search for AppStream applications"
 msgstr "Mencari aplikasi AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "Mencari aplikasi AppStream menurut namanya"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "Tampilkan semua aplikasi AppStream yang terpasang"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
 msgid "Search for AppStream applications by category name"
 msgstr "Cari aplikasi AppStream berdasarkan nama kategori"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Tampilkan token pencarian aplikasi"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Pasang metadata AppStream"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Pasang metadata AppStream dengan origin baru"
+msgid "Search for AppStream applications by package name"
+msgstr "Mencari aplikasi AppStream menurut namanya"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Bongkar metadata AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Atur nama basis dari berkas keluaran"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Buat sebuah halaman status HTML"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Atur direktori singgahan"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Buat sebuah dokumen status CSV"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Atur direktori ikon"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Buat sebuah halaman matriks HTML"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Tata direktori log"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Daftar aplikasi yang tidak didukung oleh paket"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Atur ukuran ikon minimum dalam piksel"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Validasikan sebuah berkas AppData atau AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Atur cacah thread"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Validasikan sebuah berkas AppData atau AppStream (longgar)"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Atur lokasi metadata lama"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Atur nama asli"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Validasikan sebuah berkas AppData atau AppSteram (ketat)"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Atur direktori keluaran"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Konversikan berkas AppData ke format NEWS"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Atur direktori paket"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Konversikan berkas NEWS ke format AppData"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Atur prefiks"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Periksa data aplikasi yang terpasang"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Atur direktori temporer"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr "memeriksa suatu aplikasi yang terpasang"
+msgid "Show all installed AppStream applications"
+msgstr "Tampilkan semua aplikasi AppStream yang terpasang"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Gantikan cuplikan layar dalam berkas sumber"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Tampilkan informasi debug ekstra"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr "Tambahkan penyedia ke suatu berkas sumber"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Tampilkan versi"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "Tambahkan bahasa ke suatu berkas sumber"
+msgid "Split an AppStream file to AppData and Metainfo files"
+msgstr "Pecah berkas AppData ke berkas Metainfo dan AppData"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Cerminkan cuplikan layar upstream"
+msgid "Test a regular expression"
+msgstr "Uji suatu ekspresi reguler"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Cerminkan berkas firmware lokal"
+msgid "Uninstalls AppStream metadata"
+msgstr "Bongkar metadata AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Sertakan medatada ekstra dari berkas eksternal"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Tingkatkan metadata AppData ke versi terakhir"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Bandingkan isi dari dua berkas AppStream"
+msgid "Validate an AppData or AppStream file"
+msgstr "Validasikan sebuah berkas AppData atau AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Buat suatu GUID dari string masukan"
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Validasikan sebuah berkas AppData atau AppStream (longgar)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Ubah berkas AppData"
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Validasikan sebuah berkas AppData atau AppSteram (ketat)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr "Pecah berkas AppData ke berkas Metainfo dan AppData"
+msgid "Validation failed"
+msgstr "Validasi gagal"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Gabungkan beberapa berkas ke sebuh berkas AppStream"
+msgid "Validation of files failed"
+msgstr "Validasi berkas gagal"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Impor sebuah berkas ke markup AppStream"
+msgid "Version:"
+msgstr "Versi:"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
 msgid "Watch AppStream locations for changes"
 msgstr "Amati lokasi AppStream atas adanya perubahan"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr "Bandingkan nomor-nomor versi"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr "Uji suatu ekspresi reguler"
-
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Utilitas AppStream"
-
-#: client/as-util.c:4705
-msgid "Version:"
-msgstr "Versi:"
+msgid "check an installed application"
+msgstr "memeriksa suatu aplikasi yang terpasang"
diff --git a/po/it.po b/po/it.po
index 4a4fd98..f81f991 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
-"PO-Revision-Date: 2018-02-20 03:53+0000\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
+"PO-Revision-Date: 2018-06-20 09:22+0000\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian (http://www.transifex.com/freedesktop/appstream-glib/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -21,502 +21,399 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Mostra informazioni aggiuntive di debug"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Aggiunge icone HiDPI al tarball"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Aggiunge un ID cache a ciascun componente"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Include i risultati non riusciti nell'output"
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "Aggiunge una lingua a un file sorgente"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Aggiunge icone HiDPI al tarball"
+#. TRANSLATORS: command description
+msgid "Add a provide to a source file"
+msgstr "Aggiunge un fornitore a un file sorgente"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Aggiunge icone codificate all'XML"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Non comprime le icone nel tarball"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Imposta la directory di registrazione"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Aggiunta"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Imposta la directory dei pacchetti"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Alias a %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Imposta la directory temporanea"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Strumento AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Imposta la directory di uscita"
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "Annullato"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Imposta la directory delle icone"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Verifica i dati dell'applicazione installata"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Imposta la directory della cache"
+msgid "Command not found, valid commands are:"
+msgstr "Comando non trovato. Comandi validi sono:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Imposta il nome di base dei file di uscita"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Compare i contenuti di due file AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Imposta il nome dell'origine"
+#. TRANSLATORS: command description
+msgid "Compare version numbers"
+msgstr "Confronta i numeri di versione"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Imposta il numero di thread"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "La conversione di %s in %s non è implementata"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Imposta la dimensione minima in pixel delle icone"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Converte un file AppData nel formato NEWS"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Imposta la vecchia posizione dei metadati"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Converte un file NEWS nel formato AppData"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Ignora certi tipi di veto"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Converte i metadati AppStream da una versione all'altra"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Analisi argomenti non riuscita"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Crea un documento di stato in formato CSV"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Impostazione del generatore non riuscita"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Crea una pagina matrice in formato HTML"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Apertura dei pacchetti non riuscita"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Crea una pagina di stato in formato HTML"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Analisi dei pacchetti..."
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Crea un file AppData di esempio da un file .desktop"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Aggiunta pacchetto non riuscita"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Visualizza i token di ricerca applicazione"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr "Analizzati %u/%u file..."
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Non comprime le icone nel tarball"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Generazione metadati non riuscita"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Non usa la rete"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Fatto"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Salvataggio icona"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Registra le applicazioni nei metadati AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Impostazione prefisso"
+msgid "Enable profiling"
+msgstr "Abilita profiling"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Elaborazione applicazione"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Errore nel creare la directory di output"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Errore nel caricare il file AppData"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Errore nell'analizzare le traduzioni"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Errore nel caricare il file desktop"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Errore nell'analizzare i kudos"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Errore nell'analizzare i provides"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Errore nel caricare il file desktop"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Errore nel creare la directory di output"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "Salvataggio AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Errore nell'analizzare le traduzioni"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Errore nel salvare il file AppStream"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Alias a %s"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Comando non trovato. Comandi validi sono:"
+#. TRANSLATORS: command description
+msgid "Exports the agreement to text"
+msgstr "Esporta il testo dell'accordo"
 
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Controllare il file e correggere gli elementi \"FIXME\""
+#. list failures
+msgid "FAILED"
+msgstr "Non riuscito"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Vecchia versione di API"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Aggiunta pacchetto non riuscita"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Nuova versione API"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Generazione metadati non riuscita"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Argomenti non sufficienti: atteso vecchio.xml nuovo.xml versione"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Apertura dei pacchetti non riuscita"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "La conversione di %s in %s non è implementata"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Analisi argomenti non riuscita"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Argomenti non sufficienti: atteso file.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Impostazione del generatore non riuscita"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "Il formato di file «%s» non può essere aggiornato"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Formato non riconosciuto"
 
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Genera uno GUID da una stringa in ingresso"
+
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "Ignora certi tipi di veto"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Importa un file in sintassi AppStream"
+
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "Include i risultati non riusciti nell'output"
+
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "Incorpora meta-dati aggiuntivi da un file esterno"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Installa i metadati AppStream"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Installa i metadati AppStream con nuova origine"
+
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Elenca le applicazioni non supportate da pacchetti"
+
+#. TRANSLATORS: command description
+msgid "Merge several files to an AppStream file"
+msgstr "Unisce più file in un unico file AppStream"
+
+#. TRANSLATORS: command description
+msgid "Mirror upstream screenshots"
+msgstr "Copia le schermate upstream"
+
+#. TRANSLATORS: command description
+msgid "Modify an AppData file"
+msgstr "Modifica un file AppData"
+
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Nuova versione API"
+
 #. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
 msgid "No desktop applications found"
 msgstr "Nessuna applicazione desktop trovata"
 
+msgid "Not enough arguments, expected file.xml"
+msgstr "Argomenti non sufficienti: atteso file.xml"
+
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Argomenti non sufficienti: atteso vecchio.xml nuovo.xml versione"
+
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "Ok"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "Non riuscito"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Vecchia versione di API"
 
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Validazione non riuscita"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %u/%u files..."
+msgstr "Analizzati %u/%u file..."
 
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Validazione dei file non riuscita"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Controllare il file e correggere gli elementi \"FIXME\""
+
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Elaborazione applicazione"
 
 #. TRANSLATORS: application was removed
-#: client/as-util.c:4053
 msgid "Removed"
 msgstr "Rimossa"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Aggiunta"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "Annullato"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Non usa la rete"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Mostra la versione"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Abilita profiling"
-
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Converte i metadati AppStream da una versione all'altra"
+msgid "Replace screenshots in source file"
+msgstr "Sostituisce le schermate nel file sorgente"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Aggiorna i metadati AppData all'ultima versione"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "Salvataggio AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Crea un file AppData di esempio da un file .desktop"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Salvataggio icona"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Registra le applicazioni nei metadati AppStream"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Analisi dei pacchetti..."
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
 msgid "Search for AppStream applications"
 msgstr "Cerca applicazioni AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "Cerca applicazioni AppStream per nome di pacchetto"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "Mostra tutte le applicazioni AppStream installate"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
 msgid "Search for AppStream applications by category name"
 msgstr "Cerca applicazioni AppStream per categoria"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Visualizza i token di ricerca applicazione"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Installa i metadati AppStream"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Installa i metadati AppStream con nuova origine"
+msgid "Search for AppStream applications by package name"
+msgstr "Cerca applicazioni AppStream per nome di pacchetto"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Rimuove i metadati AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Imposta il nome di base dei file di uscita"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Crea una pagina di stato in formato HTML"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Imposta la directory della cache"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Crea un documento di stato in formato CSV"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Imposta la directory delle icone"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Crea una pagina matrice in formato HTML"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Imposta la directory di registrazione"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Elenca le applicazioni non supportate da pacchetti"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Imposta la dimensione minima in pixel delle icone"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Valida un file AppData o AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Imposta il numero di thread"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Valida un file AppData o AppStream (relaxed)"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Imposta la vecchia posizione dei metadati"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Imposta il nome dell'origine"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Valida un file AppData o AppStream (strict)"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Imposta la directory di uscita"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Converte un file AppData nel formato NEWS"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Imposta la directory dei pacchetti"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Converte un file NEWS nel formato AppData"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Impostazione prefisso"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Verifica i dati dell'applicazione installata"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Imposta la directory temporanea"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr "Verifica un'applicazione installata"
+msgid "Show all installed AppStream applications"
+msgstr "Mostra tutte le applicazioni AppStream installate"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Sostituisce le schermate nel file sorgente"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Mostra informazioni aggiuntive di debug"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr "Aggiunge un fornitore a un file sorgente"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Mostra la versione"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "Aggiunge una lingua a un file sorgente"
+msgid "Split an AppStream file to AppData and Metainfo files"
+msgstr "Divide un file AppStream nei file AppData e Metainfo"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Copia le schermate upstream"
+msgid "Test a regular expression"
+msgstr "Verifica un'espressione regolare"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Copia i file firmware locali"
+msgid "Uninstalls AppStream metadata"
+msgstr "Rimuove i metadati AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Incorpora meta-dati aggiuntivi da un file esterno"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Aggiorna i metadati AppData all'ultima versione"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Compare i contenuti di due file AppStream"
+msgid "Validate an AppData or AppStream file"
+msgstr "Valida un file AppData o AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Genera uno GUID da una stringa in ingresso"
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Valida un file AppData o AppStream (relaxed)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Modifica un file AppData"
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Valida un file AppData o AppStream (strict)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr "Divide un file AppStream nei file AppData e Metainfo"
+msgid "Validation failed"
+msgstr "Validazione non riuscita"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Unisce più file in un unico file AppStream"
+msgid "Validation of files failed"
+msgstr "Validazione dei file non riuscita"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Importa un file in sintassi AppStream"
+msgid "Version:"
+msgstr "Versione:"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
 msgid "Watch AppStream locations for changes"
 msgstr "Controlla le modifiche sulle posizioni AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr "Confronta i numeri di versione"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr "Verifica un'espressione regolare"
-
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Strumento AppStream"
-
-#: client/as-util.c:4705
-msgid "Version:"
-msgstr "Versione:"
+msgid "check an installed application"
+msgstr "Verifica un'applicazione installata"
diff --git a/po/ko.po b/po/ko.po
index 755d0fc..b4100b3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2016-08-06 03:00+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Korean (http://www.transifex.com/freedesktop/appstream-glib/language/ko/)\n"
@@ -23,502 +23,354 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "추가 디버깅 정보 보이기"
+msgid "Add HiDPI icons to the tarball"
+msgstr "타르볼에 초고해상도 아이콘 추가"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "각각 구성 요소에 캐시 ID 추가"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "출력 내용에 실패 결과 포함"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "타르볼에 초고해상도 아이콘 추가"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "XML에 인코딩한 아이콘 추가"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "타르볼에 아이콘 압축 안 함"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "로그 디렉터리 지정"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "꾸러미 디렉터리 설정"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "임시 디렉터리 설정"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "추가함"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "출력 디렉터리 설정"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "%s의 명령 별칭"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "아이콘 디렉터리 설정"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "AppStream 유틸리티"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "캐시 디렉터리 설정"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "설치된 프로그램 데이터 검사"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "출력 파일 기본 이름 설정"
+msgid "Command not found, valid commands are:"
+msgstr "명령이 존재하지 않습니다. 유효한 명령은 다음과 같습니다:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "원본 이름 설정"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "두 AppStream 파일 내용 비교"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "스레드 개수 설정"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "%s에서 %s(으)로의 변환은 아직 지원하지 않습니다"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "픽셀 단위 최소 아이콘 크기 설정"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "AppData 파일을 NEWS 형식으로 변환 "
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "과거 메타데이터 위치 설정"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "NEWS 파일을 AppData 형식으로 변환"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "veto 형식 무시"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "AppStream 메타데이터 버전을 변환"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "인자 해석에 실패함"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "CSV 상태 문서 생성"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "빌더를 설정할 수 없음"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "HTML 매트릭스 페이지 만들기"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "꾸러미를 열 수 없음"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "HTML 상태 페이지 생성"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "꾸러미 검사 중..."
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr ".desktop 파일에서 AppData 파일 생성"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "꾸러미를 추가할 수 없음"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "프로그램 검색 토큰 표시"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "타르볼에 아이콘 압축 안 함"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "메타데이터를 생성할 수 없음"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "네트워크 접근 사용하지 않음"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "완료!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "아이콘 저장중"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "AppStream 메타데이터의 프로그램을 모두 출력"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "접두부 설정"
+msgid "Enable profiling"
+msgstr "프로파일링 활성화"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "프로그램 처리중"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "출력 디렉터리 만드는 중 오류"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "AppData 파일 불러오는 중 오류"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "번역 해석중 오류"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "desktop 파일 불러오는 중 오류"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "kudos 해석중 오류"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "제공 요소 해석중 오류"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "desktop 파일 불러오는 중 오류"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "출력 디렉터리 만드는 중 오류"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "AppStream 저장중"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "번역 해석중 오류"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "AppStream 파일 저장중 오류"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "%s의 명령 별칭"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "명령이 존재하지 않습니다. 유효한 명령은 다음과 같습니다:"
-
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "파일을 확인하여 'FIXME' 항목을 수정하십시오"
+#. list failures
+msgid "FAILED"
+msgstr "실패"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "오래된 API 버전"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "꾸러미를 추가할 수 없음"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "새 API 버전"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "메타데이터를 생성할 수 없음"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "인자가 충분하지 않습니다. old.xml new.xml version이 필요합니다"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "꾸러미를 열 수 없음"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "%s에서 %s(으)로의 변환은 아직 지원하지 않습니다"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "인자 해석에 실패함"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "인자가 충분하지 않습니다. file.xml이 필요합니다"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "빌더를 설정할 수 없음"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "'%s' 파일 형식을 업그레이드할 수 없습니다"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "인식할 수 없는 형식"
 
-#. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
-msgid "No desktop applications found"
-msgstr "데스크톱 프로그램이 없습니다"
-
-#. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
-msgid "OK"
-msgstr "확인"
-
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "실패"
-
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "검증 실패"
-
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "파일 검증 실패"
-
-#. TRANSLATORS: application was removed
-#: client/as-util.c:4053
-msgid "Removed"
-msgstr "제거함"
-
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "추가함"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr ""
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "네트워크 접근 사용하지 않음"
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "입력 문자열의 GUID 만들기"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "버전 표시"
+msgid "Ignore certain types of veto"
+msgstr "veto 형식 무시"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "AppStream 마크업으로 파일 가져오기"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "프로파일링 활성화"
+msgid "Include failed results in the output"
+msgstr "출력 내용에 실패 결과 포함"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "AppStream 메타데이터 버전을 변환"
+msgid "Incorporate extra metadata from an external file"
+msgstr "외부 파일에서 추가 메타데이터 가져오기"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "AppData 메타데이터를 최신 버전으로 업그레이드"
+msgid "Installs AppStream metadata"
+msgstr "AppStream 메타데이터 설치"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr ".desktop 파일에서 AppData 파일 생성"
+msgid "Installs AppStream metadata with new origin"
+msgstr "새로운 위치에서 AppStream 메타데이터 설치"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "AppStream 메타데이터의 프로그램을 모두 출력"
+msgid "List applications not backed by packages"
+msgstr "꾸러미가 없는 프로그램 목록 출력"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
-msgid "Search for AppStream applications"
-msgstr " AppStream 프로그램 검색"
+msgid "Merge several files to an AppStream file"
+msgstr "여러 파일을 AppStream 파일에 병합"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "꾸러미 이름으로 AppStream 프로그램 검색"
+msgid "Mirror upstream screenshots"
+msgstr "업스트림 스크린샷 반전"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr ""
+msgid "Modify an AppData file"
+msgstr "AppData 파일 수정"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
-msgid "Search for AppStream applications by category name"
-msgstr ""
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "새 API 버전"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "프로그램 검색 토큰 표시"
+#. TRANSLATORS: probably wrong XML
+msgid "No desktop applications found"
+msgstr "데스크톱 프로그램이 없습니다"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "AppStream 메타데이터 설치"
+msgid "Not enough arguments, expected file.xml"
+msgstr "인자가 충분하지 않습니다. file.xml이 필요합니다"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "새로운 위치에서 AppStream 메타데이터 설치"
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "인자가 충분하지 않습니다. old.xml new.xml version이 필요합니다"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "AppStream 메타데이터 삭제"
+#. TRANSLATORS: the file is valid
+msgid "OK"
+msgstr "확인"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "HTML 상태 페이지 생성"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "오래된 API 버전"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "CSV 상태 문서 생성"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "파일을 확인하여 'FIXME' 항목을 수정하십시오"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "HTML 매트릭스 페이지 만들기"
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "프로그램 처리중"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "꾸러미가 없는 프로그램 목록 출력"
+#. TRANSLATORS: application was removed
+msgid "Removed"
+msgstr "제거함"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "AppData 또는 AppStream 파일 검증"
+msgid "Replace screenshots in source file"
+msgstr "원본 파일 스크린샷 바꾸기"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "AppData 또는 AppStream 파일 검증(유연)"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "AppStream 저장중"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "아이콘 저장중"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "AppData 또는 AppStream 파일 검증(엄격)"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "꾸러미 검사 중..."
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "AppData 파일을 NEWS 형식으로 변환 "
+msgid "Search for AppStream applications"
+msgstr " AppStream 프로그램 검색"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "NEWS 파일을 AppData 형식으로 변환"
+msgid "Search for AppStream applications by package name"
+msgstr "꾸러미 이름으로 AppStream 프로그램 검색"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "설치된 프로그램 데이터 검사"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "출력 파일 기본 이름 설정"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "캐시 디렉터리 설정"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "원본 파일 스크린샷 바꾸기"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "아이콘 디렉터리 설정"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "로그 디렉터리 지정"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "픽셀 단위 최소 아이콘 크기 설정"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "업스트림 스크린샷 반전"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "스레드 개수 설정"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "로컬 펌웨어 파일 미러링"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "과거 메타데이터 위치 설정"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "외부 파일에서 추가 메타데이터 가져오기"
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "원본 이름 설정"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "두 AppStream 파일 내용 비교"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "출력 디렉터리 설정"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "입력 문자열의 GUID 만들기"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "꾸러미 디렉터리 설정"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "AppData 파일 수정"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "접두부 설정"
+
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "임시 디렉터리 설정"
+
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "추가 디버깅 정보 보이기"
+
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "버전 표시"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4638
 msgid "Split an AppStream file to AppData and Metainfo files"
 msgstr "AppStream 파일을 AppData 파일과 Metainfo 파일로 분리"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "여러 파일을 AppStream 파일에 병합"
+msgid "Uninstalls AppStream metadata"
+msgstr "AppStream 메타데이터 삭제"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "AppStream 마크업으로 파일 가져오기"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "AppData 메타데이터를 최신 버전으로 업그레이드"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
-msgid "Watch AppStream locations for changes"
-msgstr ""
+msgid "Validate an AppData or AppStream file"
+msgstr "AppData 또는 AppStream 파일 검증"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr ""
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "AppData 또는 AppStream 파일 검증(유연)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr ""
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "AppData 또는 AppStream 파일 검증(엄격)"
 
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "AppStream 유틸리티"
+msgid "Validation failed"
+msgstr "검증 실패"
+
+msgid "Validation of files failed"
+msgstr "파일 검증 실패"
 
-#: client/as-util.c:4705
 msgid "Version:"
 msgstr "버전:"
diff --git a/po/lt.po b/po/lt.po
index 6a3d090..a81365d 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
-"PO-Revision-Date: 2018-02-13 02:02+0000\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
+"PO-Revision-Date: 2018-06-26 09:31+0000\n"
 "Last-Translator: Moo <hazap@hotmail.com>\n"
 "Language-Team: Lithuanian\n"
 "MIME-Version: 1.0\n"
@@ -15,502 +15,399 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Rodyti papildomą derinimo informaciją"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Pridėti į TAR paką HiDPI piktogramas"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Pridėti kiekvienam komponentui podėlio ID"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Įtraukti į išvestį nepavykusius rezultatus"
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "Pridėti kalbą į šaltinio failą"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Pridėti į TAR paką HiDPI piktogramas"
+#. TRANSLATORS: command description
+msgid "Add a provide to a source file"
+msgstr "Pridėti pateikimą į šaltinio failą"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Pridėti į XML koduotas piktogramas"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Neglaudinti piktogramų į TAR paką"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Nustatyti registravimo katalogą"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Pridėta"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Nustatyti paketų katalogą"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Alternatyvusis %s pavadinimas"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Nustatyti laikinąjį katalogą"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "AppStream paslaugų programa"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Nustatyti išvesties katalogą"
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "Atsisakyta"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Nustatyti piktogramų katalogą"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Tikrinti įdiegtus programos duomenis"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Nustatyti podėlio katalogą"
+msgid "Command not found, valid commands are:"
+msgstr "Komanda nerasta, teisingos komandos yra:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Nustatyti pagrindinius išvesties failų pavadinimus"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Palyginti dviejų AppStream failų turinį"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Nustatyti kilmės pavadinimą"
+#. TRANSLATORS: command description
+msgid "Compare version numbers"
+msgstr "Palyginti versijų numerius"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Nustatyti gijų skaičių"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "Konvertavimas %s į %s nėra įgyvendintas"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Nustatyti mažiausią piktogramos dydį, pikseliais"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Konvertuoti AppData failą į NEWS formatą"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Nustatyti seną metaduomenų vietą"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Konvertuoti NEWS failą į AppData formatą"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Nepaisyti tam tikrų veto tipų"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Konvertuoja AppStream metaduomenis iš vienos versijos į kitą"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Nepavyko išnagrinėti argumentų"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Sukurti CSV būsenos dokumentą"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Nepavyko nustatyti kūrėjo"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Sukurti HTML matricos puslapį"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Nepavyko atverti paketų"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Sukurti HTML būsenos puslapį"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Peržiūrimi paketai..."
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Sukuria pavyzdinį Appdata failą iš .desktop failo"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Nepavyko pridėti paketo"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Rodyti programų paieškos prieigos raktus"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr "Išnagrinėta %u/%u failų..."
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Neglaudinti piktogramų į TAR paką"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Nepavyko sugeneruoti metaduomenų"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Nenaudoti tinklo prieigos"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Atlikta!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Įrašoma piktograma"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Padaro programų išklotinę AppStream metaduomenyse"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Nustatyti priešdėlį"
+msgid "Enable profiling"
+msgstr "Įjungti profiliavimą"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Apdorojama programa"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Klaida kuriant išvesties katalogą"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Klaida įkeliant AppData failą"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Klaida nagrinėjant vertimus"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Klaida įkeliant darbalaukio failą"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Klaida nagrinėjant kudo"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Klaida nagrinėjant pateikimus"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Klaida įkeliant darbalaukio failą"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Klaida kuriant išvesties katalogą"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "Įrašoma AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Klaida nagrinėjant vertimus"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Klaida įrašant AppStream failą"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Alternatyvusis %s pavadinimas"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Komanda nerasta, teisingos komandos yra:"
+#. TRANSLATORS: command description
+msgid "Exports the agreement to text"
+msgstr "Eksportuoja sutikimą į tekstą"
 
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Peržiūrėkite failą ir pataisykite visus \"FIXME\" elementus"
+#. list failures
+msgid "FAILED"
+msgstr "NEPAVYKO"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Sena API versija"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Nepavyko pridėti paketo"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Nauja API versija"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Nepavyko sugeneruoti metaduomenų"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Nepakanka argumentų, buvo tikėtasi senas.xml naujas.xml versijos"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Nepavyko atverti paketų"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "Konvertavimas %s į %s nėra įgyvendintas"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Nepavyko išnagrinėti argumentų"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Nepakanka argumentų, buvo tikėtasi failas.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Nepavyko nustatyti kūrėjo"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "Failo formatas \"%s\" negali būti atnaujintas"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Neatpažintas formatas"
 
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Generuoti GUID iš įvesties eilutės"
+
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "Nepaisyti tam tikrų veto tipų"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Importuoti failą į AppStream ženklinimą"
+
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "Įtraukti į išvestį nepavykusius rezultatus"
+
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "Prijungti papildomus metaduomenis iš išorinio failo"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Įdiegia AppStream metaduomenis"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Įdiegia AppStream metaduomenis su nauja kilme"
+
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Išvardyti programas, kurios nėra palaikomos paketų"
+
+#. TRANSLATORS: command description
+msgid "Merge several files to an AppStream file"
+msgstr "Sulieti kelis failus į AppStream failą"
+
+#. TRANSLATORS: command description
+msgid "Mirror upstream screenshots"
+msgstr "Dubliuoti pirminio kūrimo srauto ekrano kopijas"
+
+#. TRANSLATORS: command description
+msgid "Modify an AppData file"
+msgstr "Modifikuoti AppData failą"
+
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Nauja API versija"
+
 #. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
 msgid "No desktop applications found"
 msgstr "Nerasta jokių darbalaukio programų"
 
+msgid "Not enough arguments, expected file.xml"
+msgstr "Nepakanka argumentų, buvo tikėtasi failas.xml"
+
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Nepakanka argumentų, buvo tikėtasi senas.xml naujas.xml versijos"
+
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "GERAI"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "NEPAVYKO"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Sena API versija"
 
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Patvirtinimas nepavyko"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %u/%u files..."
+msgstr "Išnagrinėta %u/%u failų..."
 
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Failų patvirtinimas nepavyko"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Peržiūrėkite failą ir pataisykite visus \"FIXME\" elementus"
+
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Apdorojama programa"
 
 #. TRANSLATORS: application was removed
-#: client/as-util.c:4053
 msgid "Removed"
 msgstr "Pašalinta"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Pridėta"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "Atsisakyta"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Nenaudoti tinklo prieigos"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Rodyti versiją"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Įjungti profiliavimą"
-
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Konvertuoja AppStream metaduomenis iš vienos versijos į kitą"
+msgid "Replace screenshots in source file"
+msgstr "Pakeisti ekrano kopijas šaltinio faile"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Naujinti AppData metaduomenis į naujausią versiją"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "Įrašoma AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Sukuria pavyzdinį Appdata failą iš .desktop failo"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Įrašoma piktograma"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Padaro programų išklotinę AppStream metaduomenyse"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Peržiūrimi paketai..."
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
 msgid "Search for AppStream applications"
 msgstr "Ieškoti AppStream programų"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "Ieškoti AppStream programų pagal paketo pavadinimą"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "Rodyti visas įdiegtas AppStream programas"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
 msgid "Search for AppStream applications by category name"
 msgstr "Ieškoti AppStream programų pagal kategorijos pavadinimą"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Rodyti programų paieškos prieigos raktus"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Įdiegia AppStream metaduomenis"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Įdiegia AppStream metaduomenis su nauja kilme"
+msgid "Search for AppStream applications by package name"
+msgstr "Ieškoti AppStream programų pagal paketo pavadinimą"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Pašalina AppStream metaduomenis"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Nustatyti pagrindinius išvesties failų pavadinimus"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Sukurti HTML būsenos puslapį"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Nustatyti podėlio katalogą"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Sukurti CSV būsenos dokumentą"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Nustatyti piktogramų katalogą"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Sukurti HTML matricos puslapį"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Nustatyti registravimo katalogą"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Išvardyti programas, kurios nėra palaikomos paketų"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Nustatyti mažiausią piktogramos dydį, pikseliais"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Patvirtinti AppData ar AppStream failą"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Nustatyti gijų skaičių"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Patvirtinti AppData ar AppStream failą (atpalaiduotas)"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Nustatyti seną metaduomenų vietą"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Nustatyti kilmės pavadinimą"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Patvirtinti AppData ar AppStream failą (griežtas)"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Nustatyti išvesties katalogą"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Konvertuoti AppData failą į NEWS formatą"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Nustatyti paketų katalogą"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Konvertuoti NEWS failą į AppData formatą"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Nustatyti priešdėlį"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Tikrinti įdiegtus programos duomenis"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Nustatyti laikinąjį katalogą"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr "tikrinti įdiegtą programą"
+msgid "Show all installed AppStream applications"
+msgstr "Rodyti visas įdiegtas AppStream programas"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Pakeisti ekrano kopijas šaltinio faile"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Rodyti papildomą derinimo informaciją"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr "Pridėti pateikimą į šaltinio failą"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Rodyti versiją"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "Pridėti kalbą į šaltinio failą"
+msgid "Split an AppStream file to AppData and Metainfo files"
+msgstr "Padalyti AppStream failą į AppData ir metainformacijos failą"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Dubliuoti pirminio kūrimo srauto ekrano kopijas"
+msgid "Test a regular expression"
+msgstr "Išbandyti reguliarųjį reiškinį"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Dubliuoti vietinius programinės aparatinės įrangos failus"
+msgid "Uninstalls AppStream metadata"
+msgstr "Pašalina AppStream metaduomenis"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Prijungti papildomus metaduomenis iš išorinio failo"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Naujinti AppData metaduomenis į naujausią versiją"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Palyginti dviejų AppStream failų turinį"
+msgid "Validate an AppData or AppStream file"
+msgstr "Patvirtinti AppData ar AppStream failą"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Generuoti GUID iš įvesties eilutės"
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Patvirtinti AppData ar AppStream failą (atpalaiduotas)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Modifikuoti AppData failą"
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Patvirtinti AppData ar AppStream failą (griežtas)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr "Padalyti AppStream failą į AppData ir metainformacijos failą"
+msgid "Validation failed"
+msgstr "Patvirtinimas nepavyko"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Sulieti kelis failus į AppStream failą"
+msgid "Validation of files failed"
+msgstr "Failų patvirtinimas nepavyko"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Importuoti failą į AppStream ženklinimą"
+msgid "Version:"
+msgstr "Versija:"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
 msgid "Watch AppStream locations for changes"
 msgstr "Stebėti ar AppStream vietose yra pakeitimų"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr "Palyginti versijų numerius"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr "Išbandyti reguliarųjį reiškinį"
-
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "AppStream paslaugų programa"
-
-#: client/as-util.c:4705
-msgid "Version:"
-msgstr "Versija:"
+msgid "check an installed application"
+msgstr "tikrinti įdiegtą programą"
diff --git a/po/oc.po b/po/oc.po
index 840560e..dafdeab 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Cédric Valmary <cvalmary@yahoo.fr>, 2015
 # Cédric Valmary <cvalmary@yahoo.fr>, 2016
@@ -23,295 +23,173 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: command line option
-msgid "Show extra debugging information"
-msgstr "Aficha d'informacions de desbugatge suplementàrias"
-
-#. TRANSLATORS: command line option
 msgid "Add a cache ID to each component"
 msgstr "Apond un identificant de cache a cada component"
 
-#. TRANSLATORS: command line option
-msgid "Include failed results in the output"
-msgstr ""
-
-#. TRANSLATORS: command line option
-msgid "Add HiDPI icons to the tarball"
-msgstr ""
-
-#. TRANSLATORS: command line option
-msgid "Add encoded icons to the XML"
-msgstr ""
-
-#. TRANSLATORS: command line option
-msgid "Do not compress the icons into a tarball"
-msgstr ""
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Apondut"
 
-#. TRANSLATORS: command line option
-msgid "Set the logging directory"
-msgstr "Definís lo repertòri de jornalizacion"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Aliàs de %s"
 
-#. TRANSLATORS: command line option
-msgid "Set the packages directory"
-msgstr "Definís lo repertòri dels paquets"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Utilitari AppStream"
 
-#. TRANSLATORS: command line option
-msgid "Set the temporary directory"
-msgstr "Definís lo repertòri temporari"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Verificar las donadas d'aplicacions installadas"
 
-#. TRANSLATORS: command line option
-msgid "Set the output directory"
-msgstr "Definís lo repertòri de sortida"
+msgid "Command not found, valid commands are:"
+msgstr "Comanda introbabla, las comandas validas son :"
 
-#. TRANSLATORS: command line option
-msgid "Set the icons directory"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Convertís las metadonadas AppStream d'una version a una autra"
 
-#. TRANSLATORS: command line option
-msgid "Set the cache directory"
-msgstr "Definís lo repertòri de cache"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Crear un document de sintèsi CSV"
 
-#. TRANSLATORS: command line option
-msgid "Set the basenames of the output files"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Crear una pagina de sintèsi HTML"
 
-#. TRANSLATORS: command line option
-msgid "Set the origin name"
-msgstr "Definís lo nom d'origina"
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Crèa un fichièr Appdata exemple a partir d'un fichièr .desktop"
 
-#. TRANSLATORS: command line option
-msgid "Set the number of threads"
-msgstr "Definís lo nombre de fials d'execucion"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Utilizatz pas l'accès ret"
 
-#. TRANSLATORS: command line option
-msgid "Set the minimum icon size in pixels"
-msgstr ""
+#. success
+#. TRANSLATORS: information message
+msgid "Done!"
+msgstr "Acabat !"
 
-#. TRANSLATORS: command line option
-msgid "Set the old metadata location"
-msgstr "Definís l'ancian emplaçament de las metadonadas"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Expòrta las aplicacions dins las metadonadas AppStream"
 
-#. TRANSLATORS: command line option
-msgid "Ignore certain types of veto"
-msgstr ""
+#. list failures
+msgid "FAILED"
+msgstr "FRACÀS"
 
 #. TRANSLATORS: error message
-msgid "Failed to parse arguments"
-msgstr "Fracàs d'analisi dels paramètres"
+msgid "Failed to add package"
+msgstr "L'apondon del paquet a fracassat"
 
 #. TRANSLATORS: error message
-msgid "Failed to set up builder"
-msgstr "Fracàs de configuracion del constructor"
+msgid "Failed to generate metadata"
+msgstr "La generacion de metadonadas a fracassat"
 
 #. TRANSLATORS: error message
 msgid "Failed to open packages"
 msgstr "Fracàs de dobertura dels paquets"
 
-#. TRANSLATORS: information message
-msgid "Scanning packages..."
-msgstr "Analisi dels paquets…"
-
 #. TRANSLATORS: error message
-msgid "Failed to add package"
-msgstr "L'apondon del paquet a fracassat"
-
-#. TRANSLATORS: information message
-#, c-format
-msgid "Parsed %i/%i files..."
-msgstr "%i/%i fichièrs analisats…"
+msgid "Failed to parse arguments"
+msgstr "Fracàs d'analisi dels paramètres"
 
 #. TRANSLATORS: error message
-msgid "Failed to generate metadata"
-msgstr "La generacion de metadonadas a fracassat"
-
-#. success
-#. TRANSLATORS: information message
-msgid "Done!"
-msgstr "Acabat !"
-
-#. TRANSLATORS: we've saving the icon file to disk
-msgid "Saving icon"
-msgstr ""
-
-#. TRANSLATORS: command line option
-msgid "Set the prefix"
-msgstr ""
-
-#. TRANSLATORS: we're generating the AppStream data
-msgid "Processing application"
-msgstr ""
-
-#. TRANSLATORS: the .appdata.xml file could not
-#. * be loaded
-msgid "Error loading AppData file"
-msgstr ""
-
-#. TRANSLATORS: the .mo files could not be parsed
-msgid "Error parsing translations"
-msgstr ""
-
-#. TRANSLATORS: we could not auto-add the kudo
-msgid "Error parsing kudos"
-msgstr ""
-
-#. TRANSLATORS: we could not auto-add the provides
-msgid "Error parsing provides"
-msgstr ""
-
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-msgid "Error loading desktop file"
-msgstr ""
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-msgid "Error creating output directory"
-msgstr ""
-
-#. TRANSLATORS: we've saving the XML file to disk
-msgid "Saving AppStream"
-msgstr ""
-
-#. TRANSLATORS: this is when the destination file
-#. * cannot be saved for some reason
-msgid "Error saving AppStream file"
-msgstr ""
-
-#. TRANSLATORS: this is a command alias
-#, c-format
-msgid "Alias to %s"
-msgstr "Aliàs de %s"
+msgid "Failed to set up builder"
+msgstr "Fracàs de configuracion del constructor"
 
-msgid "Command not found, valid commands are:"
-msgstr "Comanda introbabla, las comandas validas son :"
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Installa las metadonadas AppStream"
 
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Revisatz lo fichièr e resolvètz los elements « FIXME »"
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Installa las metadonadas AppStream d'una novèla origina"
 
-#. TRANSLATORS: information message
-msgid "Old API version"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Lista de las aplicacions non basadas sus de paquets"
 
 #. TRANSLATORS: information message
 msgid "New API version"
 msgstr "Novèla version d'API"
 
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Paramètres insufisents, indicatz ancian.xml novel.xml version"
-
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr ""
-
 msgid "Not enough arguments, expected file.xml"
 msgstr "Paramètres insufisents, file.xml es esperat"
 
-#. TRANSLATORS: %s is a file type,
-#. * e.g. 'appdata'
-#, c-format
-msgid "File format '%s' cannot be upgraded"
-msgstr ""
-
-#. TRANSLATORS: not a recognised file type
-msgid "Format not recognised"
-msgstr ""
-
-#. TRANSLATORS: probably wrong XML
-msgid "No desktop applications found"
-msgstr ""
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Paramètres insufisents, indicatz ancian.xml novel.xml version"
 
 #. TRANSLATORS: the file is valid
 msgid "OK"
 msgstr "D'ACÒRDI"
 
-#. list failures
-msgid "FAILED"
-msgstr "FRACÀS"
-
-msgid "Validation failed"
-msgstr "La validacion a fracassat"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %i/%i files..."
+msgstr "%i/%i fichièrs analisats…"
 
-msgid "Validation of files failed"
-msgstr "La validacion dels fichièrs a fracassat"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Revisatz lo fichièr e resolvètz los elements « FIXME »"
 
 #. TRANSLATORS: application was removed
 msgid "Removed"
 msgstr "Suprimit"
 
-#. TRANSLATORS: application was added
-msgid "Added"
-msgstr "Apondut"
-
-#. TRANSLATORS: this is the --nonet argument
-msgid "Do not use network access"
-msgstr "Utilizatz pas l'accès ret"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Analisi dels paquets…"
 
 #. TRANSLATORS: command line option
-msgid "Show version"
-msgstr "Afichar la version"
+msgid "Set the cache directory"
+msgstr "Definís lo repertòri de cache"
 
 #. TRANSLATORS: command line option
-msgid "Enable profiling"
-msgstr ""
-
-#. TRANSLATORS: command description
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Convertís las metadonadas AppStream d'una version a una autra"
+msgid "Set the logging directory"
+msgstr "Definís lo repertòri de jornalizacion"
 
-#. TRANSLATORS: command description
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Met a jorn las metadonadas AppData a la darrièra version"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Definís lo nombre de fials d'execucion"
 
-#. TRANSLATORS: command description
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Crèa un fichièr Appdata exemple a partir d'un fichièr .desktop"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Definís l'ancian emplaçament de las metadonadas"
 
-#. TRANSLATORS: command description
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Expòrta las aplicacions dins las metadonadas AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Definís lo nom d'origina"
 
-#. TRANSLATORS: command description
-msgid "Search for AppStream applications"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Definís lo repertòri de sortida"
 
-#. TRANSLATORS: command description
-msgid "Search for AppStream applications by package name"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Definís lo repertòri dels paquets"
 
-#. TRANSLATORS: command description
-msgid "Display application search tokens"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Definís lo repertòri temporari"
 
-#. TRANSLATORS: command description
-msgid "Installs AppStream metadata"
-msgstr "Installa las metadonadas AppStream"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Aficha d'informacions de desbugatge suplementàrias"
 
-#. TRANSLATORS: command description
-msgid "Installs AppStream metadata with new origin"
-msgstr "Installa las metadonadas AppStream d'una novèla origina"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Afichar la version"
 
 #. TRANSLATORS: command description
 msgid "Uninstalls AppStream metadata"
 msgstr "Desinstalla las metadonadas AppStream"
 
 #. TRANSLATORS: command description
-msgid "Create an HTML status page"
-msgstr "Crear una pagina de sintèsi HTML"
-
-#. TRANSLATORS: command description
-msgid "Create an CSV status document"
-msgstr "Crear un document de sintèsi CSV"
-
-#. TRANSLATORS: command description
-msgid "Create an HTML matrix page"
-msgstr ""
-
-#. TRANSLATORS: command description
-msgid "List applications not backed by packages"
-msgstr "Lista de las aplicacions non basadas sus de paquets"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Met a jorn las metadonadas AppData a la darrièra version"
 
 #. TRANSLATORS: command description
 msgid "Validate an AppData or AppStream file"
@@ -325,61 +203,11 @@ msgstr "Validar un fichièr AppData o AppStream (laxista)"
 msgid "Validate an AppData or AppStream file (strict)"
 msgstr "Validar un fichièr AppData o AppStream (estricte)"
 
-#. TRANSLATORS: command description
-msgid "Convert an AppData file to NEWS format"
-msgstr ""
-
-#. TRANSLATORS: command description
-msgid "Convert an NEWS file to AppData format"
-msgstr ""
-
-#. TRANSLATORS: command description
-msgid "Check installed application data"
-msgstr "Verificar las donadas d'aplicacions installadas"
-
-#. TRANSLATORS: command description
-msgid "Replace screenshots in source file"
-msgstr ""
-
-#. TRANSLATORS: command description
-msgid "Mirror upstream screenshots"
-msgstr ""
-
-#. TRANSLATORS: command description
-msgid "Mirror local firmware files"
-msgstr ""
-
-#. TRANSLATORS: command description
-msgid "Incorporate extra metadata from an external file"
-msgstr ""
-
-#. TRANSLATORS: command description
-msgid "Compare the contents of two AppStream files"
-msgstr ""
-
-#. TRANSLATORS: command description
-msgid "Generate a GUID from an input string"
-msgstr ""
-
-#. TRANSLATORS: command description
-msgid "Modify an AppData file"
-msgstr ""
-
-#. TRANSLATORS: command description
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr ""
-
-#. TRANSLATORS: command description
-msgid "Merge several files to an AppStream file"
-msgstr ""
-
-#. TRANSLATORS: command description
-msgid "Import a file to AppStream markup"
-msgstr ""
+msgid "Validation failed"
+msgstr "La validacion a fracassat"
 
-#. TRANSLATORS: program name
-msgid "AppStream Utility"
-msgstr "Utilitari AppStream"
+msgid "Validation of files failed"
+msgstr "La validacion dels fichièrs a fracassat"
 
 msgid "Version:"
 msgstr "Version :"
diff --git a/po/pl.po b/po/pl.po
index 617c22f..23285a1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2018-04-20 09:53+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/freedesktop/appstream-glib/language/pl/)\n"
@@ -24,502 +24,399 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Wyświetla dodatkowe informacje debugowania"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Dodaje ikony HiDPI do archiwum tar"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Dodaje identyfikator pamięci podręcznej do każdego składnika"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Dołącza niepowodzenia w wyjściu"
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "Dodaje język do pliku źródłowego"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Dodaje ikony HiDPI do archiwum tar"
+#. TRANSLATORS: command description
+msgid "Add a provide to a source file"
+msgstr "Dodaje element dostarczany do pliku źródłowego"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Dodaje zakodowane ikony do pliku XML"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Bez kompresji ikon do archiwum tar"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Ustawia katalog dziennika"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Dodano"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Ustawia katalog pakietów"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Alias dla %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Ustawia katalog tymczasowy"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Narzędzie AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Ustawia katalog wyjściowy"
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "Anulowano"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Ustawia katalog ikon"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Sprawdza dane zainstalowanego programu"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Ustawia katalog pamięci podręcznej"
+msgid "Command not found, valid commands are:"
+msgstr "Nie odnaleziono polecenia. Prawidłowe polecenia:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Ustawia podstawowe nazwy plików wyjściowych"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Porównuje zawartość dwóch plików AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Ustawia pierwotną nazwę"
+#. TRANSLATORS: command description
+msgid "Compare version numbers"
+msgstr "Porównuje numery wersji"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Ustawia liczbę wątków"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "Konwersja %s na %s nie jest zaimplementowana"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Ustawia minimalne wymiary ikony w pikselach"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Konwertuje plik AppData do formatu NEWS"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Ustawia położenie poprzednich metadanych"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Konwertuje plik NEWS do formatu AppData"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Ignoruje podane typy weta"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Konwertuje metadane AppStream z jednej wersji na inną"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Przetworzenie parametrów się nie powiodło"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Tworzy dokument stanu CSV"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Utworzenie budowania się nie powiodło"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Tworzy stronę macierzy HTML"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Otwarcie pakietów się nie powiodło"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Tworzy stronę stanu HTML"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Skanowanie pakietów…"
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Tworzy przykładowy plik AppData z pliku .desktop"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Dodanie pakietu się nie powiodło"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Wyświetla tokeny wyszukiwania programów"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr "Przetworzono pliki: %u/%u…"
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Bez kompresji ikon do archiwum tar"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Utworzenie metadanych się nie powiodło"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Bez używania dostępu do sieci"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Gotowe."
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Zapisywanie ikony"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Zrzuca aplikacje w metadanych AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Ustawia przedrostek"
+msgid "Enable profiling"
+msgstr "Włącza profilowanie"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Przetwarzanie programu"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Błąd podczas tworzenia katalogu wyjściowego"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Błąd podczas wczytywania pliku AppData"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Błąd podczas przetwarzania tłumaczeń"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Błąd podczas wczytywania pliku .desktop"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Błąd podczas przetwarzania punktów"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Błąd podczas przetwarzania elementów dostarczanych"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Błąd podczas wczytywania pliku .desktop"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Błąd podczas tworzenia katalogu wyjściowego"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "Zapisywanie pliku AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Błąd podczas przetwarzania tłumaczeń"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Błąd podczas zapisywania pliku AppStream"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Alias dla %s"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Nie odnaleziono polecenia. Prawidłowe polecenia:"
+#. TRANSLATORS: command description
+msgid "Exports the agreement to text"
+msgstr "Eksportuje umowę jako tekst"
 
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Proszę przejrzeć plik i naprawić elementy oznaczone jako „FIXME”"
+#. list failures
+msgid "FAILED"
+msgstr "NIEPOWODZENIE"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Poprzednia wersja API"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Dodanie pakietu się nie powiodło"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Nowa wersja API"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Utworzenie metadanych się nie powiodło"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Za mało parametrów, oczekiwano wersji poprzedniej.xml nowej.xml"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Otwarcie pakietów się nie powiodło"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "Konwersja %s na %s nie jest zaimplementowana"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Przetworzenie parametrów się nie powiodło"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Za mało parametrów, oczekiwano pliku.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Utworzenie budowania się nie powiodło"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "Nie można zaktualizować formatu pliku „%s”"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Nie rozpoznano formatu"
 
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Tworzy GUID z ciągu wejściowego"
+
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "Ignoruje podane typy weta"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Importuje plik do języka znaczników AppStream"
+
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "Dołącza niepowodzenia w wyjściu"
+
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "Dołącza dodatkowe metadane z zewnętrznego pliku"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Instaluje metadane AppStream"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Instaluje metadane AppStream z nowym pochodzeniem"
+
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Wyświetla listę aplikacji niezawartych w pakietach"
+
+#. TRANSLATORS: command description
+msgid "Merge several files to an AppStream file"
+msgstr "Łączy kilka plików w jeden plik AppStream"
+
+#. TRANSLATORS: command description
+msgid "Mirror upstream screenshots"
+msgstr "Używa zrzutów ekranu nadrzędnego projektu"
+
+#. TRANSLATORS: command description
+msgid "Modify an AppData file"
+msgstr "Modyfikuje plik AppData"
+
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Nowa wersja API"
+
 #. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
 msgid "No desktop applications found"
 msgstr "Nie odnaleziono żadnych programów"
 
+msgid "Not enough arguments, expected file.xml"
+msgstr "Za mało parametrów, oczekiwano pliku.xml"
+
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Za mało parametrów, oczekiwano wersji poprzedniej.xml nowej.xml"
+
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "OK"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "NIEPOWODZENIE"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Poprzednia wersja API"
 
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Sprawdzenie się nie powiodło"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %u/%u files..."
+msgstr "Przetworzono pliki: %u/%u…"
 
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Sprawdzenie plików się nie powiodło"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Proszę przejrzeć plik i naprawić elementy oznaczone jako „FIXME”"
+
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Przetwarzanie programu"
 
 #. TRANSLATORS: application was removed
-#: client/as-util.c:4053
 msgid "Removed"
 msgstr "Usunięto"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Dodano"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "Anulowano"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Bez używania dostępu do sieci"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Wyświetla wersję"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Włącza profilowanie"
-
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Konwertuje metadane AppStream z jednej wersji na inną"
+msgid "Replace screenshots in source file"
+msgstr "Zastępuje zrzuty ekranu w pliku źródłowym"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Aktualizuje metadane AppData do najnowszej wersji"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "Zapisywanie pliku AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Tworzy przykładowy plik AppData z pliku .desktop"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Zapisywanie ikony"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Zrzuca aplikacje w metadanych AppStream"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Skanowanie pakietów…"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
 msgid "Search for AppStream applications"
 msgstr "Wyszukuje programy AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "Wyszukuje programy AppStream według nazw pakietów"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "Wyświetla wszystkie zainstalowane programy AppStream"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
 msgid "Search for AppStream applications by category name"
 msgstr "Wyszukuje programy AppStream według nazw kategorii"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Wyświetla tokeny wyszukiwania programów"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Instaluje metadane AppStream"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Instaluje metadane AppStream z nowym pochodzeniem"
+msgid "Search for AppStream applications by package name"
+msgstr "Wyszukuje programy AppStream według nazw pakietów"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Odinstalowuje metadane AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Ustawia podstawowe nazwy plików wyjściowych"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Tworzy stronę stanu HTML"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Ustawia katalog pamięci podręcznej"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Tworzy dokument stanu CSV"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Ustawia katalog ikon"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Tworzy stronę macierzy HTML"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Ustawia katalog dziennika"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Wyświetla listę aplikacji niezawartych w pakietach"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Ustawia minimalne wymiary ikony w pikselach"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Sprawdza poprawność pliku AppData lub AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Ustawia liczbę wątków"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Sprawdza poprawność pliku AppData lub AppStream (rozluźnione)"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Ustawia położenie poprzednich metadanych"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr "Eksportuje umowę jako tekst"
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Ustawia pierwotną nazwę"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Sprawdza poprawność pliku AppData lub AppStream (ścisłe)"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Ustawia katalog wyjściowy"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Konwertuje plik AppData do formatu NEWS"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Ustawia katalog pakietów"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Konwertuje plik NEWS do formatu AppData"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Ustawia przedrostek"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Sprawdza dane zainstalowanego programu"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Ustawia katalog tymczasowy"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr "sprawdza zainstalowany program"
+msgid "Show all installed AppStream applications"
+msgstr "Wyświetla wszystkie zainstalowane programy AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Zastępuje zrzuty ekranu w pliku źródłowym"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Wyświetla dodatkowe informacje debugowania"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr "Dodaje element dostarczany do pliku źródłowego"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Wyświetla wersję"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "Dodaje język do pliku źródłowego"
+msgid "Split an AppStream file to AppData and Metainfo files"
+msgstr "Dzieli plik AppStream na pliki AppData i Metainfo"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Używa zrzutów ekranu nadrzędnego projektu"
+msgid "Test a regular expression"
+msgstr "Testuje wyrażenie regularne"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Używa lokalnych plików oprogramowania sprzętowego"
+msgid "Uninstalls AppStream metadata"
+msgstr "Odinstalowuje metadane AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Dołącza dodatkowe metadane z zewnętrznego pliku"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Aktualizuje metadane AppData do najnowszej wersji"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Porównuje zawartość dwóch plików AppStream"
+msgid "Validate an AppData or AppStream file"
+msgstr "Sprawdza poprawność pliku AppData lub AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Tworzy GUID z ciągu wejściowego"
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Sprawdza poprawność pliku AppData lub AppStream (rozluźnione)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Modyfikuje plik AppData"
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Sprawdza poprawność pliku AppData lub AppStream (ścisłe)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr "Dzieli plik AppStream na pliki AppData i Metainfo"
+msgid "Validation failed"
+msgstr "Sprawdzenie się nie powiodło"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Łączy kilka plików w jeden plik AppStream"
+msgid "Validation of files failed"
+msgstr "Sprawdzenie plików się nie powiodło"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Importuje plik do języka znaczników AppStream"
+msgid "Version:"
+msgstr "Wersja:"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
 msgid "Watch AppStream locations for changes"
 msgstr "Obserwuje zmiany w położeniach AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr "Porównuje numery wersji"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr "Testuje wyrażenie regularne"
-
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Narzędzie AppStream"
-
-#: client/as-util.c:4705
-msgid "Version:"
-msgstr "Wersja:"
+msgid "check an installed application"
+msgstr "sprawdza zainstalowany program"
diff --git a/po/pt.po b/po/pt.po
index d0c46b9..8737542 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2016-08-06 03:00+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Portuguese (http://www.transifex.com/freedesktop/appstream-glib/language/pt/)\n"
@@ -21,502 +21,250 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Mostrar informação extra de depuração"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Adicionar ícones HiDPI ao tarball"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Adicionar uma ID de cache a cada componente"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Incluir resultados falhados na saída"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Adicionar ícones HiDPI ao tarball"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Adicionar ícones codificados ao XML"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Não comprimir os ícones num tarball"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Definir a pasta de diário"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Definir a pasta de pacotes"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Definir a pasta temporária"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Definir a pasta de saída"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Definir a pasta de ícones"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Aliás de %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Definir a pasta de cache"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Utilitário AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Definir os nomes base dos ficheiros de saída"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Verificar dados da aplicação instalada"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Definir o nome de origem"
+msgid "Command not found, valid commands are:"
+msgstr "Comando não encontrado, comandos válidos são:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Definir o número de linhas"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Comparar o conteúdo de dois ficheiros AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Definir o tamanho mínimo do ícone, em pixels"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Converter um ficheiro AppData em formato NEWS"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Definir a localização de metadados antigos"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Converter um ficheiro NEWS em formato AppData"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Ignorar certos tipos de veto"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Converte metadados do AppStream de uma versão para outra"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Falha ao processar argumentos"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Cria um documento CSV de estado"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Falha ao configurar o construtor"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Cria uma página HTML de matriz"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Falha ao abrir os pacotes"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Cria uma página HTML de estado"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "A analisar os pacotes..."
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Cria um ficheiro exemplo Appdata a partir de um ficheiro .desktop"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Falha ao adicionar pacote"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Mostrar símbolos de procura de aplicações"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Não comprimir os ícones num tarball"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Falha ao gerar metadados"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Não usar acesso à rede"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Terminado!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Despeja as aplicações nos metadados do AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr ""
+msgid "Enable profiling"
+msgstr "Ativar análise de perfil"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr ""
+#. list failures
+msgid "FAILED"
+msgstr "FALHA"
 
-#. TRANSLATORS: the .appdata.xml file could not
-#. * be loaded
-#: client/as-compose.c:425
-msgid "Error loading AppData file"
-msgstr ""
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Falha ao adicionar pacote"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr ""
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Falha ao gerar metadados"
 
-#. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
-msgid "Error parsing kudos"
-msgstr ""
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Falha ao abrir os pacotes"
 
-#. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
-msgid "Error parsing provides"
-msgstr ""
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Falha ao processar argumentos"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr ""
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Falha ao configurar o construtor"
 
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "Ignorar certos tipos de veto"
 
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "Incluir resultados falhados na saída"
 
-#. TRANSLATORS: this is when the destination file
-#. * cannot be saved for some reason
-#: client/as-compose.c:542
-msgid "Error saving AppStream file"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "Incorporar metadados extra a partir de ficheiro externo"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Aliás de %s"
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Instala metadados do AppStream"
 
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Comando não encontrado, comandos válidos são:"
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Instala metadados do AppStream com nova origem"
 
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Por favor, reveja o ficheiro e repare quaisquer itens \"FIXME\""
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Listar aplicações não suportadas por pacotes"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Mirror upstream screenshots"
+msgstr "Espelhar capturas de ecrã"
 
 #. TRANSLATORS: information message
-#: client/as-util.c:508
 msgid "New API version"
 msgstr "Nova versão do API"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Sem argumentos suficientes, esperadas versões old.xml e new.xml"
-
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr ""
-
-#: client/as-util.c:580
 msgid "Not enough arguments, expected file.xml"
 msgstr "Sem argumentos suficientes, esperada file.xml"
 
-#. TRANSLATORS: %s is a file type,
-#. * e.g. 'appdata'
-#: client/as-util.c:606
-#, c-format
-msgid "File format '%s' cannot be upgraded"
-msgstr ""
-
-#. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
-msgid "Format not recognised"
-msgstr ""
-
-#. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
-msgid "No desktop applications found"
-msgstr ""
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Sem argumentos suficientes, esperadas versões old.xml e new.xml"
 
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "CORRETO"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "FALHA"
-
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Validação falhada"
-
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "A validação dos ficheiros falhou"
-
-#. TRANSLATORS: application was removed
-#: client/as-util.c:4053
-msgid "Removed"
-msgstr ""
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Por favor, reveja o ficheiro e repare quaisquer itens \"FIXME\""
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Replace screenshots in source file"
+msgstr "Substituir capturas de ecrã no ficheiro origem"
 
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr ""
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "A analisar os pacotes..."
 
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Não usar acesso à rede"
+#. TRANSLATORS: command description
+msgid "Search for AppStream applications"
+msgstr "Procurar aplicações AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Mostrar versão"
+msgid "Set the basenames of the output files"
+msgstr "Definir os nomes base dos ficheiros de saída"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Ativar análise de perfil"
+msgid "Set the cache directory"
+msgstr "Definir a pasta de cache"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Converte metadados do AppStream de uma versão para outra"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Definir a pasta de ícones"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Atualizar metadados AppStream para a última versão"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Definir a pasta de diário"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Cria um ficheiro exemplo Appdata a partir de um ficheiro .desktop"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Definir o tamanho mínimo do ícone, em pixels"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Despeja as aplicações nos metadados do AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Definir o número de linhas"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4464
-msgid "Search for AppStream applications"
-msgstr "Procurar aplicações AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Definir a localização de metadados antigos"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Definir o nome de origem"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Definir a pasta de saída"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
-msgid "Search for AppStream applications by category name"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Definir a pasta de pacotes"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Mostrar símbolos de procura de aplicações"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Definir a pasta temporária"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Instala metadados do AppStream"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Mostrar informação extra de depuração"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Instala metadados do AppStream com nova origem"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Mostrar versão"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4506
 msgid "Uninstalls AppStream metadata"
 msgstr "Desinstala metadados do AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Cria uma página HTML de estado"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Cria um documento CSV de estado"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Cria uma página HTML de matriz"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Listar aplicações não suportadas por pacotes"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Atualizar metadados AppStream para a última versão"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4536
 msgid "Validate an AppData or AppStream file"
 msgstr "Validar um ficheiro AppData ou AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4542
 msgid "Validate an AppData or AppStream file (relaxed)"
 msgstr "Validar um ficheiro AppData ou AppStream (relaxado)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
 msgid "Validate an AppData or AppStream file (strict)"
 msgstr "Validar um ficheiro AppData ou AppStream (estrito)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Converter um ficheiro AppData em formato NEWS"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Converter um ficheiro NEWS em formato AppData"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Verificar dados da aplicação instalada"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Substituir capturas de ecrã no ficheiro origem"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Espelhar capturas de ecrã"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Espelhar ficheiros de firmware locais"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Incorporar metadados extra a partir de ficheiro externo"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Comparar o conteúdo de dois ficheiros AppStream"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4656
-msgid "Watch AppStream locations for changes"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr ""
+msgid "Validation failed"
+msgstr "Validação falhada"
 
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Utilitário AppStream"
+msgid "Validation of files failed"
+msgstr "A validação dos ficheiros falhou"
 
-#: client/as-util.c:4705
 msgid "Version:"
 msgstr "Versão:"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8c60eb4..6927c83 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2017-12-24 10:19+0000\n"
 "Last-Translator: Antonio Lisbôa  <antonion.2048@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/freedesktop/appstream-glib/language/pt_BR/)\n"
@@ -23,502 +23,395 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Mostrar informações extra de  depuração"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Adiciona ícones HiDPI para o tarball"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Adiciona um ID de cache para cada componente"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Inclui resultados falhos na saída"
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "Adicione um idioma a um arquivo de origem"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Adiciona ícones HiDPI para o tarball"
+#. TRANSLATORS: command description
+msgid "Add a provide to a source file"
+msgstr "Adicione um fornecedor a um arquivo de origem"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Adiciona ícones codificados ao XML"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Não comprime os ícones em um tarball"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Define o diretório de log"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Adicionado"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Define o diretório de pacotes"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Alias para %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Define o diretório temporário"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Utilitário AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Define o diretório de saída"
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "Cancelado"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Define o diretório de ícones"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Verifica dados de aplicativo instalado"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Define o diretório do cache"
+msgid "Command not found, valid commands are:"
+msgstr "Comando não encontrado, comandos válidos para:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Define os nomes base dos arquivos de saída"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Compara os conteúdos de dois arquivos AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Define o nome de origem"
+#. TRANSLATORS: command description
+msgid "Compare version numbers"
+msgstr "Compare os números da versão"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Define o número de fluxos"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "A conversão de %s para %s não está implementada"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Define o tamanho mínimo do ícone em pixels"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Converte um arquivo AppData para formato NEWS"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Define a localização de metadados antigos"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Converte um arquivo NEWS para formato AppData"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Ignora certos tipos de veto"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Converte metadados AppStream de uma versão para outra"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Falha ao analisar argumentos"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Cria um documento de status em CSV"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Falha ao definir um compilador"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Cria uma página de matriz em HTML"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Falha ao abrir pacotes"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Cria uma página de status em HTML"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Verificando pacotes..."
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Cria um arquivo AppData de exemplo de um arquivo .desktop"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Falha ao adicionar pacote"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Exibe tokens de pesquisa por aplicativos"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr "Arquivos %u/%u analizados..."
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Não comprime os ícones em um tarball"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Falha ao gerar metadados"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Não usar acesso por rede"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Pronto!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Salvando o ícone"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Despeja os aplicativos nos metadados do AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Define o prefixo"
+msgid "Enable profiling"
+msgstr "Habilita perfilamento"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Processando o aplicativo"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Erro ao criar diretório de saída"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Erro ao carregar o arquivo AppData"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Erro ao analisar traduções"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Erro ao carregar o arquivo desktop"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Erro ao analisar kudos"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Erro ao analisar o provides"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Erro ao carregar o arquivo desktop"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Erro ao criar diretório de saída"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "Salvando o AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Erro ao analisar traduções"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Erro ao salvar o arquivo de AppStream"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Alias para %s"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Comando não encontrado, comandos válidos para:"
-
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Por favor, reveja o arquivo e corrija quaisquer itens \"FIXME\""
+#. list failures
+msgid "FAILED"
+msgstr "FALHOU"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Versão antiga da API"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Falha ao adicionar pacote"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Nova versão da API"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Falha ao gerar metadados"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Argumentos insuficientes, esperava versão antiga.xml nova.xml"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Falha ao abrir pacotes"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "A conversão de %s para %s não está implementada"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Falha ao analisar argumentos"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Argumentos insuficientes, esperava arquivo.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Falha ao definir um compilador"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "O formato de arquivo \"%s\" não pôde ser atualizado"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Formato não reconhecido"
 
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Gera um GUID a partir de um texto de entrada"
+
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "Ignora certos tipos de veto"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Importar um arquivo de marcação AppStream"
+
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "Inclui resultados falhos na saída"
+
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "Incorpora metadados extra de um arquivo externo"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Instala metadados de AppStream"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Instala metadados do AppStream com nova origem"
+
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Lista aplicativos não fornecidos por pacotes"
+
+#. TRANSLATORS: command description
+msgid "Merge several files to an AppStream file"
+msgstr "Mesclar diversos arquivos em um arquivo AppStream"
+
+#. TRANSLATORS: command description
+msgid "Mirror upstream screenshots"
+msgstr "Espelha capturas de tela do upstream"
+
+#. TRANSLATORS: command description
+msgid "Modify an AppData file"
+msgstr "Modifica um arquivo AppData"
+
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Nova versão da API"
+
 #. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
 msgid "No desktop applications found"
 msgstr "Nenhum aplicativo desktop encontrado"
 
+msgid "Not enough arguments, expected file.xml"
+msgstr "Argumentos insuficientes, esperava arquivo.xml"
+
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Argumentos insuficientes, esperava versão antiga.xml nova.xml"
+
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "OK"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "FALHOU"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Versão antiga da API"
 
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Validação falhou"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %u/%u files..."
+msgstr "Arquivos %u/%u analizados..."
 
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Validação de arquivos falhou"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Por favor, reveja o arquivo e corrija quaisquer itens \"FIXME\""
+
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Processando o aplicativo"
 
 #. TRANSLATORS: application was removed
-#: client/as-util.c:4053
 msgid "Removed"
 msgstr "Removido"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Adicionado"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Não usar acesso por rede"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Mostra versão"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Habilita perfilamento"
-
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Converte metadados AppStream de uma versão para outra"
+msgid "Replace screenshots in source file"
+msgstr "Substitui capturas de tela no arquivo fonte"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Atualiza metadados do AppData para a última versão"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "Salvando o AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Cria um arquivo AppData de exemplo de um arquivo .desktop"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Salvando o ícone"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Despeja os aplicativos nos metadados do AppStream"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Verificando pacotes..."
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
 msgid "Search for AppStream applications"
 msgstr "Pesquisa por aplicativos do AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "Procurar aplicativos AppStream pelo nome do pacote"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "Mostrar todos os aplicativos AppStream instalados"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
 msgid "Search for AppStream applications by category name"
 msgstr "Procure aplicativos AppStream pelo nome da categoria"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Exibe tokens de pesquisa por aplicativos"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Instala metadados de AppStream"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Instala metadados do AppStream com nova origem"
+msgid "Search for AppStream applications by package name"
+msgstr "Procurar aplicativos AppStream pelo nome do pacote"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Desinstala metadados do AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Define os nomes base dos arquivos de saída"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Cria uma página de status em HTML"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Define o diretório do cache"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Cria um documento de status em CSV"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Define o diretório de ícones"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Cria uma página de matriz em HTML"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Define o diretório de log"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Lista aplicativos não fornecidos por pacotes"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Define o tamanho mínimo do ícone em pixels"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Valida um arquivo AppData ou AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Define o número de fluxos"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Valida um arquivo de AppData ou AppStream (relaxado)"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Define a localização de metadados antigos"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Define o nome de origem"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Valida um arquivo de AppData ou AppStream (estrito)"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Define o diretório de saída"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Converte um arquivo AppData para formato NEWS"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Define o diretório de pacotes"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Converte um arquivo NEWS para formato AppData"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Define o prefixo"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Verifica dados de aplicativo instalado"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Define o diretório temporário"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr "Verifique um aplicativo instalado"
+msgid "Show all installed AppStream applications"
+msgstr "Mostrar todos os aplicativos AppStream instalados"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Substitui capturas de tela no arquivo fonte"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Mostrar informações extra de  depuração"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr "Adicione um fornecedor a um arquivo de origem"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Mostra versão"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "Adicione um idioma a um arquivo de origem"
+msgid "Split an AppStream file to AppData and Metainfo files"
+msgstr "Dividir um arquivo AppStream em arquivos AppData e Metainfo"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Espelha capturas de tela do upstream"
+msgid "Test a regular expression"
+msgstr "Teste uma expressão regular"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Espelha arquivos de firmware locais"
+msgid "Uninstalls AppStream metadata"
+msgstr "Desinstala metadados do AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Incorpora metadados extra de um arquivo externo"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Atualiza metadados do AppData para a última versão"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Compara os conteúdos de dois arquivos AppStream"
+msgid "Validate an AppData or AppStream file"
+msgstr "Valida um arquivo AppData ou AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Gera um GUID a partir de um texto de entrada"
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Valida um arquivo de AppData ou AppStream (relaxado)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Modifica um arquivo AppData"
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Valida um arquivo de AppData ou AppStream (estrito)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr "Dividir um arquivo AppStream em arquivos AppData e Metainfo"
+msgid "Validation failed"
+msgstr "Validação falhou"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Mesclar diversos arquivos em um arquivo AppStream"
+msgid "Validation of files failed"
+msgstr "Validação de arquivos falhou"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Importar um arquivo de marcação AppStream"
+msgid "Version:"
+msgstr "Versão:"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
 msgid "Watch AppStream locations for changes"
 msgstr "Locais para mudanças do AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr "Compare os números da versão"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr "Teste uma expressão regular"
-
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Utilitário AppStream"
-
-#: client/as-util.c:4705
-msgid "Version:"
-msgstr "Versão:"
+msgid "check an installed application"
+msgstr "Verifique um aplicativo instalado"
diff --git a/po/ru.po b/po/ru.po
index 31bac97..4cf85d2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2016-08-06 03:00+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Russian (http://www.transifex.com/freedesktop/appstream-glib/language/ru/)\n"
@@ -22,503 +22,354 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Показывать дополнительную отладочную информацию"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Добавить пиктограммы высокого разрешения в архивный файл"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Добавить идентификатор кэша в каждый компонент"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Включить неудачные результаты в вывод"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Добавить пиктограммы высокого разрешения в архивный файл"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Добавить закодированные пиктограммы в XML"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Не сжимать пиктограммы в архивный файл"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Задать каталог журналов"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Задать каталог пакетов"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Задать временный каталог"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Добавлено"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Задать каталог вывода данных"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Псевдоним к %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Задать каталог пиктограмм"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Устилита AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Задать каталог кэша"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Проверить данные установленного приложения"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Задать базовые названия выходных файлов"
+msgid "Command not found, valid commands are:"
+msgstr "Команда не найдена, корректные команды:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Задать название происхождения"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Сравнить содержимое двух файлов AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Задать количество потоков"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "Преобразование из %s в %s не реализовано"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Задать минимальный размер пиктограмм в пикселях"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Преобразовать файл AppData в формат NEWS"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Задать нахождение старых метаданных"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Преобразовать файл NEWS в формат AppData"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Игнорировать определенные типы вето"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Конвертирует AppStream метаданные из одной версии в другую"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Ошибка при распознавании аргументов"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Создать документ состояния в формате CSV"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Не удалось настроить средство сборки"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Создать страницу матрицы в формате HTML"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Не удалось открыть пакеты"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Создать страницу состояния в формате HTML"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Сканируем пакеты…"
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Создаёт файл-пример Appdata из .desktop-файла"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Не удалось добавить пакет"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Показать токены поиска приложений"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Не сжимать пиктограммы в архивный файл"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Не удалось создать метаданные"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Не использовать доступ к сети"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Выполнено!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Сохраняем пиктограмму"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Создаёт дамп приложений в метаданные AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Установить префикс"
+msgid "Enable profiling"
+msgstr "Включить профилирование"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Выполняем приложение"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Ошибка при создании каталога результатов"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Ошибка при загрузке файла AppData"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Ошибка при обработке переводов"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Ошибка при загрузе файла desktop"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Ошибка при обработке благодарностей"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Ошибка при обработке обеспечений"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Ошибка при загрузе файла desktop"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Ошибка при создании каталога результатов"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "Сохраняем AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Ошибка при обработке переводов"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Ошибка при сохранении файла AppStream"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Псевдоним к %s"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Команда не найдена, корректные команды:"
-
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr ""
-"Пожалуйста, просмотрите файл и исправьте пункты, к которым добавлено «FIXME»"
+#. list failures
+msgid "FAILED"
+msgstr "ОШИБКА"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Старая версия API"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Не удалось добавить пакет"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Новая версия API"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Не удалось создать метаданные"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Недостаточно аргументов, ожидалось old.xml new.xml version"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Не удалось открыть пакеты"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "Преобразование из %s в %s не реализовано"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Ошибка при распознавании аргументов"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Недостаточно аргументов, ожидался file.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Не удалось настроить средство сборки"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "Файл формата '%s' не может быть обновлён"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Нераспознанный формат"
 
-#. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
-msgid "No desktop applications found"
-msgstr "Приложения не найдены"
-
-#. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
-msgid "OK"
-msgstr "ОК"
-
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "ОШИБКА"
-
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Проверка прошла неудачно"
-
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Проверка файлов прошла неудачно"
-
-#. TRANSLATORS: application was removed
-#: client/as-util.c:4053
-msgid "Removed"
-msgstr "Удалено"
-
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Добавлено"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr ""
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Не использовать доступ к сети"
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Создать GUID из строки входных данных"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Показать версию"
+msgid "Ignore certain types of veto"
+msgstr "Игнорировать определенные типы вето"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Импортировать файл в AppStream-разметку"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Включить профилирование"
+msgid "Include failed results in the output"
+msgstr "Включить неудачные результаты в вывод"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Конвертирует AppStream метаданные из одной версии в другую"
+msgid "Incorporate extra metadata from an external file"
+msgstr "Включить дополнительные метаданные из внешнего файла"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Обновить метаданные AppData до последней версии"
+msgid "Installs AppStream metadata"
+msgstr "Устанавливает метаданные AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Создаёт файл-пример Appdata из .desktop-файла"
+msgid "Installs AppStream metadata with new origin"
+msgstr "Устанавливает метаданные AppStream с новым происхождением"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Создаёт дамп приложений в метаданные AppStream"
+msgid "List applications not backed by packages"
+msgstr "Список приложений не из пакетов"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
-msgid "Search for AppStream applications"
-msgstr "Поиск приложений AppStream"
+msgid "Merge several files to an AppStream file"
+msgstr "Объединить несколько файлов в файл AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "Поиск приложений AppStream по названию пакета"
+msgid "Mirror upstream screenshots"
+msgstr "Отзеркалить снимки экрана из основной ветки разработки"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr ""
+msgid "Modify an AppData file"
+msgstr "Изменить файл AppData"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
-msgid "Search for AppStream applications by category name"
-msgstr ""
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Новая версия API"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Показать токены поиска приложений"
+#. TRANSLATORS: probably wrong XML
+msgid "No desktop applications found"
+msgstr "Приложения не найдены"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Устанавливает метаданные AppStream"
+msgid "Not enough arguments, expected file.xml"
+msgstr "Недостаточно аргументов, ожидался file.xml"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Устанавливает метаданные AppStream с новым происхождением"
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Недостаточно аргументов, ожидалось old.xml new.xml version"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Удаляет метаданные AppStream"
+#. TRANSLATORS: the file is valid
+msgid "OK"
+msgstr "ОК"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Создать страницу состояния в формате HTML"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Старая версия API"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Создать документ состояния в формате CSV"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Пожалуйста, просмотрите файл и исправьте пункты, к которым добавлено «FIXME»"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Создать страницу матрицы в формате HTML"
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Выполняем приложение"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Список приложений не из пакетов"
+#. TRANSLATORS: application was removed
+msgid "Removed"
+msgstr "Удалено"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Проверить корректность AppData или AppStream файла"
+msgid "Replace screenshots in source file"
+msgstr "Заменить снимки экрана в исходном файле"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Проверить корректность AppData или AppStream файла (мягко)"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "Сохраняем AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Сохраняем пиктограмму"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Проверить корректность AppData или AppStream файла (строго)"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Сканируем пакеты…"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Преобразовать файл AppData в формат NEWS"
+msgid "Search for AppStream applications"
+msgstr "Поиск приложений AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Преобразовать файл NEWS в формат AppData"
+msgid "Search for AppStream applications by package name"
+msgstr "Поиск приложений AppStream по названию пакета"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Проверить данные установленного приложения"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Задать базовые названия выходных файлов"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Задать каталог кэша"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Заменить снимки экрана в исходном файле"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Задать каталог пиктограмм"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Задать каталог журналов"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Задать минимальный размер пиктограмм в пикселях"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Отзеркалить снимки экрана из основной ветки разработки"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Задать количество потоков"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Отзеркалить локальные файлы микрокода"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Задать нахождение старых метаданных"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Включить дополнительные метаданные из внешнего файла"
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Задать название происхождения"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Сравнить содержимое двух файлов AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Задать каталог вывода данных"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Создать GUID из строки входных данных"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Задать каталог пакетов"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Изменить файл AppData"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Установить префикс"
+
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Задать временный каталог"
+
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Показывать дополнительную отладочную информацию"
+
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Показать версию"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4638
 msgid "Split an AppStream file to AppData and Metainfo files"
 msgstr "Разделить файл AppStream на AppData и MetaInfo файлы"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Объединить несколько файлов в файл AppStream"
+msgid "Uninstalls AppStream metadata"
+msgstr "Удаляет метаданные AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Импортировать файл в AppStream-разметку"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Обновить метаданные AppData до последней версии"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
-msgid "Watch AppStream locations for changes"
-msgstr ""
+msgid "Validate an AppData or AppStream file"
+msgstr "Проверить корректность AppData или AppStream файла"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr ""
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Проверить корректность AppData или AppStream файла (мягко)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr ""
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Проверить корректность AppData или AppStream файла (строго)"
 
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Устилита AppStream"
+msgid "Validation failed"
+msgstr "Проверка прошла неудачно"
+
+msgid "Validation of files failed"
+msgstr "Проверка файлов прошла неудачно"
 
-#: client/as-util.c:4705
 msgid "Version:"
 msgstr "Версия:"
diff --git a/po/sk.po b/po/sk.po
index fdf9adb..d2cb865 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2016-08-06 03:00+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Slovak (http://www.transifex.com/freedesktop/appstream-glib/language/sk/)\n"
@@ -22,503 +22,346 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Zobrazovať ďalšie ladiace informácie"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Pridá ikony HiDPI do archívu tarball"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Pridať ID vyrovnávacej pamäte každému komponentu"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Zahrnie výsledky zlyhaní do výstupu"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Pridá ikony HiDPI do archívu tarball"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Pridá dekodované ikony do XML"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Nebude komprimovať ikony do archívu tarball"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Nastaviť adresár pre protokol"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Nastaviť adresár pre balíky"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Nastaviť dočasný adresár"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Pridaná"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Nastaviť výstupný adresár"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Alias pre %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Nastaví adresár s ikonami"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Nástroj AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Nastaviť adresár vyrovnávacej pamäte"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Skontrolovať nainštalované dáta aplikácie"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Nastaví základné názvy výstupných súborov"
+msgid "Command not found, valid commands are:"
+msgstr "Príkaz nebol nájdený, platné príkazy sú:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Nastaviť pôvodné meno"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Porovná obsahy dvoch súborov AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Nastaviť počet vlákien"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "Konverzia %s na %s nie je implementovaná"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Nastaví minimálnu veľkosť ikony v pixeloch"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Skonvertuje súbor AppData do formátu NEWS"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Nastaviť umiestnenie starých metadát"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Skonvertuje súbor NEWS do formátu AppData"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Bude ignorovať určité typy veta"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Konvertuje metadáta AppStream z jednej verzie na inú"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Nepodarilo sa spracovať argumenty"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Vytvoriť dokument CSV so stavom"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Nepodarilo sa nastaviť zostavovanie"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Vytvorí stránku HTML s maticou"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Nepodarilo sa otvoriť balíky"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Vytvoriť stránku HTML so stavom"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Prehľadávajú sa balíky..."
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Vytvorí príklad súboru Appdata zo súboru .desktop"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Nepodarilo sa pridať balík"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Zobrazí tokeny vyhľadávania aplikácií"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Nebude komprimovať ikony do archívu tarball"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Nepodarilo sa vytvoriť metadáta"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Nepoužívať prístup k sieti"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Hotovo!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Ukladá sa ikona"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Pridá aplikácie do metadát AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Nastaviť predponu"
+msgid "Enable profiling"
+msgstr "Povolí profilovanie"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Spracováva sa aplikácia"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Chyba pri vytváraní výstupného adresára"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Chyba pri načítavaní súboru AppData"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Chyba pri analyzovaní prekladov"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Chyba pri načítavaní süboru desktop"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Chyba pri analýze systému kudos"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Chyba pri analýze systému provides"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Chyba pri načítavaní süboru desktop"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Chyba pri vytváraní výstupného adresára"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "Ukladá sa AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Chyba pri analyzovaní prekladov"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Chyba pri ukladaní súboru AppStream"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Alias pre %s"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Príkaz nebol nájdený, platné príkazy sú:"
-
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Prosím, skontrolujte súbor a opravte prípadné položky „FIXME“"
+#. list failures
+msgid "FAILED"
+msgstr "ZLYHALO"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Stará verzia API"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Nepodarilo sa pridať balík"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Nová verzia API"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Nepodarilo sa vytvoriť metadáta"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr ""
-"Nedostatočný počet argumentov. Očakávali sa: starý.xml nový.xml verzia"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Nepodarilo sa otvoriť balíky"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "Konverzia %s na %s nie je implementovaná"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Nepodarilo sa spracovať argumenty"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Nedostatočný počet argumentov. Očakávali sa: súbor.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Nepodarilo sa nastaviť zostavovanie"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "Formát súboru \"%s\" nemôže byť aktualizovaný"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Formát nebol rozpoznaný"
 
-#. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
-msgid "No desktop applications found"
-msgstr "Nenašli sa žiadne aplikácie pracovného prostredia"
-
-#. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
-msgid "OK"
-msgstr "OK"
-
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "ZLYHALO"
-
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Overenie zlyhalo"
-
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Overenie súborov zlyhalo"
-
-#. TRANSLATORS: application was removed
-#: client/as-util.c:4053
-msgid "Removed"
-msgstr "Odstránená"
-
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Pridaná"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr ""
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Nepoužívať prístup k sieti"
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Vygenerovať identifikátor GUID zo vstupného reťazca"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Zobraziť verziu"
+msgid "Ignore certain types of veto"
+msgstr "Bude ignorovať určité typy veta"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Povolí profilovanie"
+msgid "Include failed results in the output"
+msgstr "Zahrnie výsledky zlyhaní do výstupu"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Konvertuje metadáta AppStream z jednej verzie na inú"
+msgid "Incorporate extra metadata from an external file"
+msgstr "Zahrnie metaúdaje navyše z externého súboru"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Aktualizovať metadáta AppStream na najnovšiu verziu"
+msgid "Installs AppStream metadata"
+msgstr "Nainštaluje metadáta AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Vytvorí príklad súboru Appdata zo súboru .desktop"
+msgid "Installs AppStream metadata with new origin"
+msgstr "Nainštaluje metadáta AppStream s novým pôvodom"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Pridá aplikácie do metadát AppStream"
+msgid "List applications not backed by packages"
+msgstr "Zoznam aplikácií, ktoré nepochádzajú z balíkov"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
-msgid "Search for AppStream applications"
-msgstr "Vyhľadá aplikácie AppStream"
+msgid "Merge several files to an AppStream file"
+msgstr "Zlúči niekoľko súborov do súboru AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr ""
+msgid "Mirror upstream screenshots"
+msgstr "Bude zrkadliť najnovšie snímky obrazoviek"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr ""
+msgid "Modify an AppData file"
+msgstr "Upraviť súbor AppData"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
-msgid "Search for AppStream applications by category name"
-msgstr ""
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Nová verzia API"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Zobrazí tokeny vyhľadávania aplikácií"
+#. TRANSLATORS: probably wrong XML
+msgid "No desktop applications found"
+msgstr "Nenašli sa žiadne aplikácie pracovného prostredia"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Nainštaluje metadáta AppStream"
+msgid "Not enough arguments, expected file.xml"
+msgstr "Nedostatočný počet argumentov. Očakávali sa: súbor.xml"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Nainštaluje metadáta AppStream s novým pôvodom"
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Nedostatočný počet argumentov. Očakávali sa: starý.xml nový.xml verzia"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Odinštaluje metadáta AppStream"
+#. TRANSLATORS: the file is valid
+msgid "OK"
+msgstr "OK"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Vytvoriť stránku HTML so stavom"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Stará verzia API"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Vytvoriť dokument CSV so stavom"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Prosím, skontrolujte súbor a opravte prípadné položky „FIXME“"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Vytvorí stránku HTML s maticou"
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Spracováva sa aplikácia"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Zoznam aplikácií, ktoré nepochádzajú z balíkov"
+#. TRANSLATORS: application was removed
+msgid "Removed"
+msgstr "Odstránená"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Overiť súbor AppData alebo AppStream"
+msgid "Replace screenshots in source file"
+msgstr "Nahradí snímký obrazoviek v zdrojovom súbore"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Overiť (voľnejšie) súbor AppData alebo AppStream"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "Ukladá sa AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Ukladá sa ikona"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Overiť (prísne) súbor AppData alebo AppStream"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Prehľadávajú sa balíky..."
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Skonvertuje súbor AppData do formátu NEWS"
+msgid "Search for AppStream applications"
+msgstr "Vyhľadá aplikácie AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Skonvertuje súbor NEWS do formátu AppData"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Nastaví základné názvy výstupných súborov"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Skontrolovať nainštalované dáta aplikácie"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Nastaviť adresár vyrovnávacej pamäte"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Nastaví adresár s ikonami"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Nahradí snímký obrazoviek v zdrojovom súbore"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Nastaviť adresár pre protokol"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Nastaví minimálnu veľkosť ikony v pixeloch"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Nastaviť počet vlákien"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Bude zrkadliť najnovšie snímky obrazoviek"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Nastaviť umiestnenie starých metadát"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Bude zrkadliť miestne súbory firmvérov"
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Nastaviť pôvodné meno"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Zahrnie metaúdaje navyše z externého súboru"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Nastaviť výstupný adresár"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Porovná obsahy dvoch súborov AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Nastaviť adresár pre balíky"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Vygenerovať identifikátor GUID zo vstupného reťazca"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Nastaviť predponu"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Upraviť súbor AppData"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Nastaviť dočasný adresár"
+
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Zobrazovať ďalšie ladiace informácie"
+
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Zobraziť verziu"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4638
 msgid "Split an AppStream file to AppData and Metainfo files"
 msgstr "Rozdelí súbor AppStream na súbory AppData a Metainfo"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Zlúči niekoľko súborov do súboru AppStream"
+msgid "Uninstalls AppStream metadata"
+msgstr "Odinštaluje metadáta AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr ""
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Aktualizovať metadáta AppStream na najnovšiu verziu"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
-msgid "Watch AppStream locations for changes"
-msgstr ""
+msgid "Validate an AppData or AppStream file"
+msgstr "Overiť súbor AppData alebo AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr ""
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Overiť (voľnejšie) súbor AppData alebo AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr ""
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Overiť (prísne) súbor AppData alebo AppStream"
 
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Nástroj AppStream"
+msgid "Validation failed"
+msgstr "Overenie zlyhalo"
+
+msgid "Validation of files failed"
+msgstr "Overenie súborov zlyhalo"
 
-#: client/as-util.c:4705
 msgid "Version:"
 msgstr "Verzia:"
diff --git a/po/sl.po b/po/sl.po
index 9632cd8..e34f74d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2016-08-06 03:00+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Slovenian (http://www.transifex.com/freedesktop/appstream-glib/language/sl/)\n"
@@ -21,502 +21,178 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Pokaži dodatne podatke razhroščevanja"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Dodaj ID predpomnilnika vsaki komponenti"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:102
-msgid "Add encoded icons to the XML"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Določite mapo beleženja"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Vzdevek za %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Določite mapo paketov"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Pripomoček AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Določite začasno mapo"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Preveri podatke nameščenega programa"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Določite izhodno mapo"
+msgid "Command not found, valid commands are:"
+msgstr "Ukaza ni mogoče najti, veljavni ukazi so:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Pretvori metapodatke AppStream iz ene različice v drugo"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Določite mapo predpomnilnika"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Ustvari dokument stanja CSV"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Ustvari stran HTML s stanjem"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Določite ime izvora"
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Ustvari primer datoteke AppData iz datoteke .desktop"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Določite število niti"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Ne uporabi omrežnega dostopa"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr ""
+#. success
+#. TRANSLATORS: information message
+msgid "Done!"
+msgstr "Opravljeno!"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Določite staro mesto metapodatkov"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Izmeče programe v metapodatkih AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr ""
+#. list failures
+msgid "FAILED"
+msgstr "SPODLETELO"
 
 #. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Razčlenjevanje argumentov je spodletelo"
+msgid "Failed to add package"
+msgstr "Dodajanje paketa je spodletelo"
 
 #. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Vzpostavitev graditelja je spodletela"
+msgid "Failed to generate metadata"
+msgstr "Izdelava metapodatkov je spodletela"
 
 #. TRANSLATORS: error message
-#: client/as-builder.c:279
 msgid "Failed to open packages"
 msgstr "Odpiranje paketov je spodletelo"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Pregledovanje paketov ..."
-
 #. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Dodajanje paketa je spodletelo"
-
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr ""
+msgid "Failed to parse arguments"
+msgstr "Razčlenjevanje argumentov je spodletelo"
 
 #. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Izdelava metapodatkov je spodletela"
-
-#. success
-#. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
-msgid "Done!"
-msgstr "Opravljeno!"
-
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr ""
-
-#. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr ""
-
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr ""
-
-#. TRANSLATORS: the .appdata.xml file could not
-#. * be loaded
-#: client/as-compose.c:425
-msgid "Error loading AppData file"
-msgstr ""
-
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr ""
-
-#. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
-msgid "Error parsing kudos"
-msgstr ""
-
-#. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
-msgid "Error parsing provides"
-msgstr ""
-
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr ""
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr ""
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr ""
-
-#. TRANSLATORS: this is when the destination file
-#. * cannot be saved for some reason
-#: client/as-compose.c:542
-msgid "Error saving AppStream file"
-msgstr ""
-
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Vzdevek za %s"
+msgid "Failed to set up builder"
+msgstr "Vzpostavitev graditelja je spodletela"
 
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Ukaza ni mogoče najti, veljavni ukazi so:"
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Namesti metapodatke AppStream"
 
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Preglejte datoteko in popravite vse elemene \"POPRAVIME\" (\"FIXME\")"
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Namesti metapodatke AppStream z novim izvorom"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Izpiši programe, ki jih paketi ne podpirajo"
 
 #. TRANSLATORS: information message
-#: client/as-util.c:508
 msgid "New API version"
 msgstr "Različica novega API-ja"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Premalo parametrov, pričakovano stari.xml novi.xml različica"
-
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr ""
-
-#: client/as-util.c:580
 msgid "Not enough arguments, expected file.xml"
 msgstr "Premalo parametrov, pričakovana datoteka.xml"
 
-#. TRANSLATORS: %s is a file type,
-#. * e.g. 'appdata'
-#: client/as-util.c:606
-#, c-format
-msgid "File format '%s' cannot be upgraded"
-msgstr ""
-
-#. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
-msgid "Format not recognised"
-msgstr ""
-
-#. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
-msgid "No desktop applications found"
-msgstr ""
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Premalo parametrov, pričakovano stari.xml novi.xml različica"
 
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "V REDU"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "SPODLETELO"
-
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Potrjevanje je spodletelo"
-
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Potrjevanje datotek je spodletelo"
-
-#. TRANSLATORS: application was removed
-#: client/as-util.c:4053
-msgid "Removed"
-msgstr ""
-
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr ""
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr ""
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Preglejte datoteko in popravite vse elemene \"POPRAVIME\" (\"FIXME\")"
 
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Ne uporabi omrežnega dostopa"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Pregledovanje paketov ..."
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Pokaži različico"
+msgid "Set the cache directory"
+msgstr "Določite mapo predpomnilnika"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Pretvori metapodatke AppStream iz ene različice v drugo"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Posodobi metapodatke AppData na najnovejšo različico"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Ustvari primer datoteke AppData iz datoteke .desktop"
+msgid "Set the logging directory"
+msgstr "Določite mapo beleženja"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Izmeče programe v metapodatkih AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Določite število niti"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4464
-msgid "Search for AppStream applications"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Določite staro mesto metapodatkov"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Določite ime izvora"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Določite izhodno mapo"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
-msgid "Search for AppStream applications by category name"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Določite mapo paketov"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Določite začasno mapo"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Namesti metapodatke AppStream"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Pokaži dodatne podatke razhroščevanja"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Namesti metapodatke AppStream z novim izvorom"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Pokaži različico"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4506
 msgid "Uninstalls AppStream metadata"
 msgstr "Odstrani metapodatke AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Ustvari stran HTML s stanjem"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Ustvari dokument stanja CSV"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Izpiši programe, ki jih paketi ne podpirajo"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Posodobi metapodatke AppData na najnovejšo različico"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4536
 msgid "Validate an AppData or AppStream file"
 msgstr "Preveri datoteko AppData ali AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4542
 msgid "Validate an AppData or AppStream file (relaxed)"
 msgstr "Preveri datoteko AppData ali AppStream (površno)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
 msgid "Validate an AppData or AppStream file (strict)"
 msgstr "Preveri datoteko AppData ali AppStream (strogo)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Preveri podatke nameščenega programa"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4656
-msgid "Watch AppStream locations for changes"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr ""
+msgid "Validation failed"
+msgstr "Potrjevanje je spodletelo"
 
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Pripomoček AppStream"
+msgid "Validation of files failed"
+msgstr "Potrjevanje datotek je spodletelo"
 
-#: client/as-util.c:4705
 msgid "Version:"
 msgstr "Različica:"
diff --git a/po/sr.po b/po/sr.po
index d549955..adb4d09 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2016-08-06 03:00+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Serbian (http://www.transifex.com/freedesktop/appstream-glib/language/sr/)\n"
@@ -23,504 +23,346 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Приказује додатне податке за исправљање грешака у програму"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Додај „HiDPi“ иконице у архиву"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Додаје ИБ оставе сваком састојку"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Укључи неуспешне резултате у излаз"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Додај „HiDPi“ иконице у архиву"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Додај кодиране иконицу у „XML“"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Не пакуј иконице унутар архиве"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Подешава директоријум дневника"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Подешава директоријум пакета"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Подешава привремени директоријум"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Додат"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Подешава директоријум излаза"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Други назив за „%s“"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Постави фасциклу са иконицама"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Алатка Програмског тока"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Подешава директоријум оставе"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Проверава инсталиране податке програма"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Постави основно име за излазне датотеке"
+msgid "Command not found, valid commands are:"
+msgstr "Нисам нашао наредбу, исправне наредбе су:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Подешава назив порекла"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Упореди садржај две датотеке Програмског тока"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Подешава број нити"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "Претварање „%s“ у „%s“ није примењено"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Постави најмању величину иконице у пикселима"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Претвори „AppData“ датотеку у „NEWS“ формат"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Подешава старо место метаподатака"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Претвори „NEWS“ датотеку у „AppData“ формат"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Занемари одређене врсте вета"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Претвара метаподатке Програмског тока из једног издања у друго"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Не могу да обрадим аргументе"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Прави CSV документ стања"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Не могу да подесим програм за изградњу"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Направи матричну ХТМЛ страницу"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Не могу да отворим пакет"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Прави ХТМЛ страницу стања"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Прегледам пакете..."
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Прави примерак датотеке Програмског тока из „.desktop“ датотеке"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Не могу да додам пакет"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Прикажи жетоне претраге програма"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Не пакуј иконице унутар архиве"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Не могу да направим метаподатке"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Не користи приступ мрежи"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Готово!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Чувам иконицу"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Исписује програме у метаподацима Програмског тока"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Подеси префикс"
+msgid "Enable profiling"
+msgstr "Укључи профилисање"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Обрађујем програм"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Грешка прављења излазног директоријума"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Грешка учитавања датотеке програмских података"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Грешка обраде превода"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Грешка учитавања датотеке радне површи"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Грешка обраде кудос-а"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Грешка обраде достављања"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Грешка учитавања датотеке радне површи"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Грешка прављења излазног директоријума"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "Чувам Програмски ток"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Грешка обраде превода"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Грешка чувања датотеке Програмског тока"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Други назив за „%s“"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Нисам нашао наредбу, исправне наредбе су:"
-
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Прегледајте датотеку и поправите сваку ставку „FIXME“"
+#. list failures
+msgid "FAILED"
+msgstr "НЕУСПЕХ"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Старо издање АПИ-ја"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Не могу да додам пакет"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Ново издање АПИ-ја"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Не могу да направим метаподатке"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Нема довољно аргумената, очекивах „стари.xml нови.xml“ издање"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Не могу да отворим пакет"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "Претварање „%s“ у „%s“ није примењено"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Не могу да обрадим аргументе"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Нема довољно аргумената, очекивах „датотека.xml“"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Не могу да подесим програм за изградњу"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "Запис датотеке „%s“ се не може надоградити"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Запис није препознат"
 
-#. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
-msgid "No desktop applications found"
-msgstr "Нисам пронашао програме радне површи"
-
-#. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
-msgid "OK"
-msgstr "У реду"
-
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "НЕУСПЕХ"
-
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Потврђивање није успело"
-
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Потврђивање датотека није успело"
-
-#. TRANSLATORS: application was removed
-#: client/as-util.c:4053
-msgid "Removed"
-msgstr "Уклоњен"
-
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Додат"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr ""
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Не користи приступ мрежи"
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Ствара ГУИБ из улазне ниске"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Приказује издање"
+msgid "Ignore certain types of veto"
+msgstr "Занемари одређене врсте вета"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Увози датотеку у означавање Програмског тока"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Укључи профилисање"
+msgid "Include failed results in the output"
+msgstr "Укључи неуспешне резултате у излаз"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Претвара метаподатке Програмског тока из једног издања у друго"
+msgid "Incorporate extra metadata from an external file"
+msgstr "Уврсти додатне метаподатке из спољне датотеке"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Надограђује метаподатке Програмског тока на најновије издање"
+msgid "Installs AppStream metadata"
+msgstr "Инсталира метаподатке Програмског тока"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Прави примерак датотеке Програмског тока из „.desktop“ датотеке"
+msgid "Installs AppStream metadata with new origin"
+msgstr "Инсталира метаподатке Програмског тока са новим пореклом"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Исписује програме у метаподацима Програмског тока"
+msgid "List applications not backed by packages"
+msgstr "Исписује програме за које пакети нису направили резерву"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
-msgid "Search for AppStream applications"
-msgstr "Потражи програме Програмског тока"
+msgid "Mirror upstream screenshots"
+msgstr "Дуплирај узводне снимке екрана"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr ""
+msgid "Modify an AppData file"
+msgstr "Мења датотеку програмских података"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr ""
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Ново издање АПИ-ја"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
-msgid "Search for AppStream applications by category name"
-msgstr ""
+#. TRANSLATORS: probably wrong XML
+msgid "No desktop applications found"
+msgstr "Нисам пронашао програме радне површи"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Прикажи жетоне претраге програма"
+msgid "Not enough arguments, expected file.xml"
+msgstr "Нема довољно аргумената, очекивах „датотека.xml“"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Инсталира метаподатке Програмског тока"
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Нема довољно аргумената, очекивах „стари.xml нови.xml“ издање"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Инсталира метаподатке Програмског тока са новим пореклом"
+#. TRANSLATORS: the file is valid
+msgid "OK"
+msgstr "У реду"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Уклања метаподатке Програмског тока"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Старо издање АПИ-ја"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Прави ХТМЛ страницу стања"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Прегледајте датотеку и поправите сваку ставку „FIXME“"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Прави CSV документ стања"
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Обрађујем програм"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Направи матричну ХТМЛ страницу"
+#. TRANSLATORS: application was removed
+msgid "Removed"
+msgstr "Уклоњен"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Исписује програме за које пакети нису направили резерву"
+msgid "Replace screenshots in source file"
+msgstr "Замени снимке екрана у изворној датотеци"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Потврђује Програмске податке или датотеку Програмског тока"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "Чувам Програмски ток"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Потврђује Програмске податке или датотеку Програмског тока(опуштено)"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Чувам иконицу"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Прегледам пакете..."
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Потврђује Програмске податке или датотеку Програмског тока(изричито)"
+msgid "Search for AppStream applications"
+msgstr "Потражи програме Програмског тока"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Претвори „AppData“ датотеку у „NEWS“ формат"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Постави основно име за излазне датотеке"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Претвори „NEWS“ датотеку у „AppData“ формат"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Подешава директоријум оставе"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Проверава инсталиране податке програма"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Постави фасциклу са иконицама"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Подешава директоријум дневника"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Замени снимке екрана у изворној датотеци"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Постави најмању величину иконице у пикселима"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Подешава број нити"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Подешава старо место метаподатака"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Дуплирај узводне снимке екрана"
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Подешава назив порекла"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Дуплирај локалне датотеке са фирмвером"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Подешава директоријум излаза"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Уврсти додатне метаподатке из спољне датотеке"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Подешава директоријум пакета"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Упореди садржај две датотеке Програмског тока"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Подеси префикс"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Ствара ГУИБ из улазне ниске"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Подешава привремени директоријум"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Мења датотеку програмских података"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Приказује додатне податке за исправљање грешака у програму"
+
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Приказује издање"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4638
 msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr ""
-"Дели датотеку Програмског тока на програмске податке и на датотеке "
-"метаподатака"
+msgstr "Дели датотеку Програмског тока на програмске податке и на датотеке метаподатака"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr ""
+msgid "Uninstalls AppStream metadata"
+msgstr "Уклања метаподатке Програмског тока"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Увози датотеку у означавање Програмског тока"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Надограђује метаподатке Програмског тока на најновије издање"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
-msgid "Watch AppStream locations for changes"
-msgstr ""
+msgid "Validate an AppData or AppStream file"
+msgstr "Потврђује Програмске податке или датотеку Програмског тока"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr ""
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Потврђује Програмске податке или датотеку Програмског тока(опуштено)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr ""
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Потврђује Програмске податке или датотеку Програмског тока(изричито)"
 
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Алатка Програмског тока"
+msgid "Validation failed"
+msgstr "Потврђивање није успело"
+
+msgid "Validation of files failed"
+msgstr "Потврђивање датотека није успело"
 
-#: client/as-util.c:4705
 msgid "Version:"
 msgstr "Издање:"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 695cd29..db4c98a 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2016-08-06 03:00+0000\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/freedesktop/appstream-glib/language/sr@latin/)\n"
@@ -23,502 +23,250 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Prikazuje dodatne podatke za ispravljanje grešaka u programu"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Dodaj „HiDPi“ ikonice u arhivu"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Dodaje IB ostave svakom sastojku"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Uključi neuspešne rezultate u izlaz"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Dodaj „HiDPi“ ikonice u arhivu"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Dodaj kodirane ikonicu u „XML“"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Ne pakuj ikonice unutar arhive"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Podešava direktorijum dnevnika"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Podešava direktorijum paketa"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Podešava privremeni direktorijum"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Podešava direktorijum izlaza"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Postavi fasciklu sa ikonicama"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Drugi naziv za „%s“"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Podešava direktorijum ostave"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Alatka Programskog toka"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Postavi osnovno ime za izlazne datoteke"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Proverava instalirane podatke programa"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Podešava naziv porekla"
+msgid "Command not found, valid commands are:"
+msgstr "Nisam našao naredbu, ispravne naredbe su:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Podešava broj niti"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Uporedi sadržaj dve datoteke Programskog toka"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Postavi najmanju veličinu ikonice u pikselima"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Pretvori „AppData“ datoteku u „NEWS“ format"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Podešava staro mesto metapodataka"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Pretvori „NEWS“ datoteku u „AppData“ format"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Zanemari određene vrste veta"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Pretvara metapodatke Programskog toka iz jednog izdanja u drugo"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Ne mogu da obradim argumente"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Pravi CSV dokument stanja"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Ne mogu da podesim program za izgradnju"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Napravi matričnu HTML stranicu"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Ne mogu da otvorim paket"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Pravi HTML stranicu stanja"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Pregledam pakete..."
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Pravi primerak datoteke Programskog toka iz „.desktop“ datoteke"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Ne mogu da dodam paket"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Prikaži žetone pretrage programa"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Ne pakuj ikonice unutar arhive"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Ne mogu da napravim metapodatke"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Ne koristi pristup mreži"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Gotovo!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Ispisuje programe u metapodacima Programskog toka"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr ""
+msgid "Enable profiling"
+msgstr "Uključi profilisanje"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr ""
+#. list failures
+msgid "FAILED"
+msgstr "NEUSPEH"
 
-#. TRANSLATORS: the .appdata.xml file could not
-#. * be loaded
-#: client/as-compose.c:425
-msgid "Error loading AppData file"
-msgstr ""
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Ne mogu da dodam paket"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr ""
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Ne mogu da napravim metapodatke"
 
-#. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
-msgid "Error parsing kudos"
-msgstr ""
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Ne mogu da otvorim paket"
 
-#. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
-msgid "Error parsing provides"
-msgstr ""
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Ne mogu da obradim argumente"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr ""
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Ne mogu da podesim program za izgradnju"
 
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "Zanemari određene vrste veta"
 
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "Uključi neuspešne rezultate u izlaz"
 
-#. TRANSLATORS: this is when the destination file
-#. * cannot be saved for some reason
-#: client/as-compose.c:542
-msgid "Error saving AppStream file"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "Uvrsti dodatne metapodatke iz spoljne datoteke"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Drugi naziv za „%s“"
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Instalira metapodatke Programskog toka"
 
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Nisam našao naredbu, ispravne naredbe su:"
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Instalira metapodatke Programskog toka sa novim poreklom"
 
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Pregledajte datoteku i popravite svaku stavku „FIXME“"
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Ispisuje programe za koje paketi nisu napravili rezervu"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Mirror upstream screenshots"
+msgstr "Dupliraj uzvodne snimke ekrana"
 
 #. TRANSLATORS: information message
-#: client/as-util.c:508
 msgid "New API version"
 msgstr "Novo izdanje API-ja"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Nema dovoljno argumenata, očekivah „stari.xml novi.xml“ izdanje"
-
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr ""
-
-#: client/as-util.c:580
 msgid "Not enough arguments, expected file.xml"
 msgstr "Nema dovoljno argumenata, očekivah „datoteka.xml“"
 
-#. TRANSLATORS: %s is a file type,
-#. * e.g. 'appdata'
-#: client/as-util.c:606
-#, c-format
-msgid "File format '%s' cannot be upgraded"
-msgstr ""
-
-#. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
-msgid "Format not recognised"
-msgstr ""
-
-#. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
-msgid "No desktop applications found"
-msgstr ""
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Nema dovoljno argumenata, očekivah „stari.xml novi.xml“ izdanje"
 
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "U redu"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "NEUSPEH"
-
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Potvrđivanje nije uspelo"
-
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Potvrđivanje datoteka nije uspelo"
-
-#. TRANSLATORS: application was removed
-#: client/as-util.c:4053
-msgid "Removed"
-msgstr ""
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Pregledajte datoteku i popravite svaku stavku „FIXME“"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr ""
+#. TRANSLATORS: command description
+msgid "Replace screenshots in source file"
+msgstr "Zameni snimke ekrana u izvornoj datoteci"
 
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr ""
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Pregledam pakete..."
 
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Ne koristi pristup mreži"
+#. TRANSLATORS: command description
+msgid "Search for AppStream applications"
+msgstr "Potraži programe Programskog toka"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Prikazuje izdanje"
+msgid "Set the basenames of the output files"
+msgstr "Postavi osnovno ime za izlazne datoteke"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Uključi profilisanje"
+msgid "Set the cache directory"
+msgstr "Podešava direktorijum ostave"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Pretvara metapodatke Programskog toka iz jednog izdanja u drugo"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Postavi fasciklu sa ikonicama"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Nadograđuje metapodatke Programskog toka na najnovije izdanje"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Podešava direktorijum dnevnika"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Pravi primerak datoteke Programskog toka iz „.desktop“ datoteke"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Postavi najmanju veličinu ikonice u pikselima"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Ispisuje programe u metapodacima Programskog toka"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Podešava broj niti"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4464
-msgid "Search for AppStream applications"
-msgstr "Potraži programe Programskog toka"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Podešava staro mesto metapodataka"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Podešava naziv porekla"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Podešava direktorijum izlaza"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
-msgid "Search for AppStream applications by category name"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Podešava direktorijum paketa"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Prikaži žetone pretrage programa"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Podešava privremeni direktorijum"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Instalira metapodatke Programskog toka"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Prikazuje dodatne podatke za ispravljanje grešaka u programu"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Instalira metapodatke Programskog toka sa novim poreklom"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Prikazuje izdanje"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4506
 msgid "Uninstalls AppStream metadata"
 msgstr "Uklanja metapodatke Programskog toka"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Pravi HTML stranicu stanja"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Pravi CSV dokument stanja"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Napravi matričnu HTML stranicu"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Ispisuje programe za koje paketi nisu napravili rezervu"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Nadograđuje metapodatke Programskog toka na najnovije izdanje"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4536
 msgid "Validate an AppData or AppStream file"
 msgstr "Potvrđuje Programske podatke ili datoteku Programskog toka"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4542
 msgid "Validate an AppData or AppStream file (relaxed)"
 msgstr "Potvrđuje Programske podatke ili datoteku Programskog toka(opušteno)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
 msgid "Validate an AppData or AppStream file (strict)"
 msgstr "Potvrđuje Programske podatke ili datoteku Programskog toka(izričito)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Pretvori „AppData“ datoteku u „NEWS“ format"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Pretvori „NEWS“ datoteku u „AppData“ format"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Proverava instalirane podatke programa"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Zameni snimke ekrana u izvornoj datoteci"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Dupliraj uzvodne snimke ekrana"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Dupliraj lokalne datoteke sa firmverom"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Uvrsti dodatne metapodatke iz spoljne datoteke"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Uporedi sadržaj dve datoteke Programskog toka"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4656
-msgid "Watch AppStream locations for changes"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr ""
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr ""
+msgid "Validation failed"
+msgstr "Potvrđivanje nije uspelo"
 
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Alatka Programskog toka"
+msgid "Validation of files failed"
+msgstr "Potvrđivanje datoteka nije uspelo"
 
-#: client/as-util.c:4705
 msgid "Version:"
 msgstr "Izdanje:"
diff --git a/po/sv.po b/po/sv.po
index f01897d..4099f9a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2018-05-12 02:56+0000\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
 "Language-Team: Swedish (http://www.transifex.com/freedesktop/appstream-glib/language/sv/)\n"
@@ -25,502 +25,399 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Visa extra felsökningsinformation"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Lägg till HiDPI-ikoner till tar-arkivet"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Lägg till ett cache-ID till varje komponent"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Inkludera misslyckade resultat i utmatningen"
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "Lägg till ett språk till en källfil"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Lägg till HiDPI-ikoner till tar-arkivet"
+#. TRANSLATORS: command description
+msgid "Add a provide to a source file"
+msgstr "Lägg till ett tillhandahållande till en källfil"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Lägg till kodade ikoner till XML:en"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Komprimera inte ikonerna till ett tar-arkiv"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Sätt loggningskatalogen"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Tillagt"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Sätt paketkatalogen"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Alias för %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Sätt den temporära katalogen"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "AppStream Utility"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Sätt utdatakatalogen"
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "Avbrutet"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Ställ in ikonkatalogen"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Kontrollera installerad programdata"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Sätt cachekatalogen"
+msgid "Command not found, valid commands are:"
+msgstr "Hittade inte kommando, giltiga kommandon är:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Ställ in grundnamnet för de utmatade filerna"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Jämför innehåll från två AppStream-filer"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Sätt ursprungsnamnet"
+#. TRANSLATORS: command description
+msgid "Compare version numbers"
+msgstr "Jämför versionsnummer"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Sätt antalet trådar"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "Konvertering från %s to %s är inte implementerad"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Ställ in den minimala storleken för ikoner i pixlar"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Konvertera en AppData-fil till NEWS-format"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Sätt platsen för det gamla metadatat"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Konvertera en NEWS-fil till AppData-format"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Ignorera vissa typer av veto"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Konverterar AppStream-metadata från en version till en annan"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Misslyckades med att tolka argument"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Skapa ett CSV-statusdokument"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Misslyckades med att ställa in builder"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Skapa en HTML-matrissida"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Misslyckades med att öppna paket"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Skapa en HTML-statussida"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Söker av paket…"
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Skapar en exempel-Appdata-fil från en .desktop-fil"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Misslyckades med att lägga till paket"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Visa sökelement för program"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr "Tolkade %u/%u filer …"
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Komprimera inte ikonerna till ett tar-arkiv"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Misslyckades med att generera metadata"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Använd inte nätverksåtkomst"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Klar!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Sparningsikon"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Dumpar programmen i AppStream-metadatat"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Ställ in prefixet"
+msgid "Enable profiling"
+msgstr "Aktivera profilering"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Behandlar program"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Fel vid skapande av utdatakatalog"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Fel vid inläsning av AppData-fil"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Fel vid tolkning av översättningar"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Fel vid inläsning av skrivbordsfil"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Fel vid tolkning av kudos"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Fel vid tolkning av tillhandahåller"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Fel vid inläsning av skrivbordsfil"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Fel vid skapande av utdatakatalog"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "Sparar AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Fel vid tolkning av översättningar"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Fel vid sparning av AppStream-fil"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Alias för %s"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Hittade inte kommando, giltiga kommandon är:"
+#. TRANSLATORS: command description
+msgid "Exports the agreement to text"
+msgstr "Exporterar överenskommelsen till text"
 
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "Vänligen granska filen och fixa ”FIXME”-objekt"
+#. list failures
+msgid "FAILED"
+msgstr "MISSLYCKADES"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Gammal API-version"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Misslyckades med att lägga till paket"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Ny API-version"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Misslyckades med att generera metadata"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Inte nog med argument, förväntade old.xml new.xml version"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Misslyckades med att öppna paket"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "Konvertering från %s to %s är inte implementerad"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Misslyckades med att tolka argument"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Inte nog med argument, förväntade file.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Misslyckades med att ställa in builder"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "Filformat ”%s” kan inte uppgraderas"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Format kan inte identifieras"
 
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Generera ett GUID från en inmatad sträng"
+
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "Ignorera vissa typer av veto"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Importera en fil till AppStream-uppmärkning"
+
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "Inkludera misslyckade resultat i utmatningen"
+
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "Bädda in extra metadata från en extern fil"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Installerar AppStream-metadata"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Installerar AppStream-metadata med nytt ursprung"
+
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Lista program utan motsvarande paket"
+
+#. TRANSLATORS: command description
+msgid "Merge several files to an AppStream file"
+msgstr "Sammanfoga flera filer till en AppStream-fil"
+
+#. TRANSLATORS: command description
+msgid "Mirror upstream screenshots"
+msgstr "Spegla skärmdumparna från uppström"
+
+#. TRANSLATORS: command description
+msgid "Modify an AppData file"
+msgstr "Modifiera en AppData-fil"
+
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Ny API-version"
+
 #. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
 msgid "No desktop applications found"
 msgstr "Inga skrivbordsprogram hittades"
 
+msgid "Not enough arguments, expected file.xml"
+msgstr "Inte nog med argument, förväntade file.xml"
+
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Inte nog med argument, förväntade old.xml new.xml version"
+
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "OK"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "MISSLYCKADES"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Gammal API-version"
 
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Validering misslyckades"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %u/%u files..."
+msgstr "Tolkade %u/%u filer …"
 
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Validering av filer misslyckades"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Vänligen granska filen och fixa ”FIXME”-objekt"
+
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Behandlar program"
 
 #. TRANSLATORS: application was removed
-#: client/as-util.c:4053
 msgid "Removed"
 msgstr "Borttaget"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Tillagt"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "Avbrutet"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Använd inte nätverksåtkomst"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Visa version"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Aktivera profilering"
-
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Konverterar AppStream-metadata från en version till en annan"
+msgid "Replace screenshots in source file"
+msgstr "Ersätt skärmdumpar i källfil"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Uppgradera AppStream-metadata till den senaste versionen"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "Sparar AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Skapar en exempel-Appdata-fil från en .desktop-fil"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Sparningsikon"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Dumpar programmen i AppStream-metadatat"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Söker av paket…"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
 msgid "Search for AppStream applications"
 msgstr "Sök efter AppStream-program"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "Sök efter AppStream-program efter paketnamn"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "Visa alla installerade AppStream-program"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
 msgid "Search for AppStream applications by category name"
 msgstr "Sök efter AppStream-program efter kategorinamn"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Visa sökelement för program"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Installerar AppStream-metadata"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Installerar AppStream-metadata med nytt ursprung"
+msgid "Search for AppStream applications by package name"
+msgstr "Sök efter AppStream-program efter paketnamn"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Avinstallerar AppStream-metadata"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Ställ in grundnamnet för de utmatade filerna"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Skapa en HTML-statussida"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Sätt cachekatalogen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Skapa ett CSV-statusdokument"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Ställ in ikonkatalogen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Skapa en HTML-matrissida"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Sätt loggningskatalogen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Lista program utan motsvarande paket"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Ställ in den minimala storleken för ikoner i pixlar"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Validera en AppData- eller AppStream-fil"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Sätt antalet trådar"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Validera en AppData- eller AppStream-fil (löst)"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Sätt platsen för det gamla metadatat"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr "Exporterar överenskommelsen till text"
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Sätt ursprungsnamnet"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Validera en AppData- eller AppStream-fil (strikt)"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Sätt utdatakatalogen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Konvertera en AppData-fil till NEWS-format"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Sätt paketkatalogen"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Konvertera en NEWS-fil till AppData-format"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Ställ in prefixet"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Kontrollera installerad programdata"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Sätt den temporära katalogen"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr "kontrollera ett installerat program"
+msgid "Show all installed AppStream applications"
+msgstr "Visa alla installerade AppStream-program"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Ersätt skärmdumpar i källfil"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Visa extra felsökningsinformation"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr "Lägg till ett tillhandahållande till en källfil"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Visa version"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "Lägg till ett språk till en källfil"
+msgid "Split an AppStream file to AppData and Metainfo files"
+msgstr "Dela upp en AppStream-fil i AppData- och Metainfo-filer"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Spegla skärmdumparna från uppström"
+msgid "Test a regular expression"
+msgstr "Testa ett reguljärt uttryck"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Spegla lokala fastprogramvarufiler"
+msgid "Uninstalls AppStream metadata"
+msgstr "Avinstallerar AppStream-metadata"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Bädda in extra metadata från en extern fil"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Uppgradera AppStream-metadata till den senaste versionen"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Jämför innehåll från två AppStream-filer"
+msgid "Validate an AppData or AppStream file"
+msgstr "Validera en AppData- eller AppStream-fil"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Generera ett GUID från en inmatad sträng"
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Validera en AppData- eller AppStream-fil (löst)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Modifiera en AppData-fil"
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Validera en AppData- eller AppStream-fil (strikt)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr "Dela upp en AppStream-fil i AppData- och Metainfo-filer"
+msgid "Validation failed"
+msgstr "Validering misslyckades"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Sammanfoga flera filer till en AppStream-fil"
+msgid "Validation of files failed"
+msgstr "Validering av filer misslyckades"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Importera en fil till AppStream-uppmärkning"
+msgid "Version:"
+msgstr "Version:"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
 msgid "Watch AppStream locations for changes"
 msgstr "Övervaka AppStream-platser för ändringar"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr "Jämför versionsnummer"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr "Testa ett reguljärt uttryck"
-
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "AppStream Utility"
-
-#: client/as-util.c:4705
-msgid "Version:"
-msgstr "Version:"
+msgid "check an installed application"
+msgstr "kontrollera ett installerat program"
diff --git a/po/tr.po b/po/tr.po
index a94fc5d..e1a680e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
-"PO-Revision-Date: 2018-05-01 03:49+0000\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
+"PO-Revision-Date: 2018-05-01 03:48+0000\n"
 "Last-Translator: Muhammet Kara <muhammet.k@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/freedesktop/appstream-glib/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -24,504 +24,395 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Ek hata ayıklama bilgisi göster"
+msgid "Add HiDPI icons to the tarball"
+msgstr "HiDPI simgeleri Tar dosyasına ekle"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Her bileşene bir bellek kimliği ekle"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Başarısız sonuçları çıktıya dahil et"
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "Kaynak dosyaya dil ekle"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "HiDPI simgeleri Tar dosyasına ekle"
+#. TRANSLATORS: command description
+msgid "Add a provide to a source file"
+msgstr "Kaynak dosyaya sağlanan ekle"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Kodlanmış simgeleri XML'e ekle"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Simgeleri Tar dosyasına sıkıştırma"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Günlük kaydı dizinini ayarla"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Eklendi"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Paketler dizinini ayarla"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "%s için takma ad"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Geçici dizini ayarla"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "AppStream Uygulaması"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Çıktı dizinini ayarla"
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "İptal edildi"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Simgeler dizinini belirle"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Kurulu uygulama verisini kontrol et"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Bellek dizini ayarla"
+msgid "Command not found, valid commands are:"
+msgstr "Komut bulunamadı, geçerli komutlar şunlar:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Çıktı dosyalarının temel adını belirle"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "İki AppStream dosyasının içeriklerini karşılaştır"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Köken adını ayarla"
+#. TRANSLATORS: command description
+msgid "Compare version numbers"
+msgstr "Sürüm numaralarını karşılaştır"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Süreç sayısını ayarla"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "%s türünden %s türüne dönüşüm hayata geçirilmedi"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "En küçük simge boyutunu piksel türünde belirle"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "AppData dosyasını NEWS biçimine dönüştür"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Eski üst veri konumunu ayarla"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "NEWS dosyasını AppData biçimine dönüştür"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Bazı tür retleri görmezden gel"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "AppStream üst verisini bir sürümden diğerine dönüştürür"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Argüman ayrıştırması başarısız"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Bir CSV durum belgesi oluştur"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "İnşa edici kurulumu başarısız oldu"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Bir HTML matris sayfası oluştur"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Paketler açılamadı"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Bir HTML durum sayfası oluşturur"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Paketler taranıyor..."
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Bir .desktop dosyasından bir örnek Appdata dosyası oluşturur"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Paket ekleme başarısız"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Uygulama arama jetonlarını görüntüle"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr "%u/%u dosya ayıklandı..."
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Simgeleri Tar dosyasına sıkıştırma"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Üst veri üretilemedi"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Ağ erişimini kullanma"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Tamamlandı!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Simge kaydediliyor"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "AppStream üst verisindeki uygulamaları döker"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Öneki belirle"
+msgid "Enable profiling"
+msgstr "Profillemeyi etkinleştir"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Uygulama işleniyor"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Çıktı dizini oluşturulurken hata"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "AppData dosyası yüklenirken hata"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Çeviriler ayıklanırken hata"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Masaüstü dosyası yüklenirken hata"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Kudo'lar ayıklanırken hata"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Sağlananlar ayıklanırken hata"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Masaüstü dosyası yüklenirken hata"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Çıktı dizini oluşturulurken hata"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "AppStream kaydediliyor"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Çeviriler ayıklanırken hata"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "AppStream dosyasını kaydederken hata"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "%s için takma ad"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Komut bulunamadı, geçerli komutlar şunlar:"
+#. TRANSLATORS: command description
+msgid "Exports the agreement to text"
+msgstr "Sözleşmeyi metin olarak dışa aktarır"
 
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr ""
-"Lütfen dosyayı gözden geçirin ve 'FIXME' olarak işaretlenmiş ögeleri "
-"düzeltin"
+#. list failures
+msgid "FAILED"
+msgstr "BAŞARISIZ"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Eski API sürümü"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Paket ekleme başarısız"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Yeni API sürümü"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Üst veri üretilemedi"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Yeterli argüman yok, old.xml new.xml sürümleri bekleniyor"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Paketler açılamadı"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "%s türünden %s türüne dönüşüm hayata geçirilmedi"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Argüman ayrıştırması başarısız"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Yeterli argüman yok, file.xml bekleniyor"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "İnşa edici kurulumu başarısız oldu"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "'%s' dosya biçimi yükseltilemiyor"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Biçim tanınmadı"
 
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Girdi dizgesinden GUID oluştur"
+
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "Bazı tür retleri görmezden gel"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "AppStream biçimlendirmesine dosya aktar"
+
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "Başarısız sonuçları çıktıya dahil et"
+
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "Dış dosyadan ek üst veri kat"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "AppStream üst verisini yükler"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "AppStream üst verisini yeni bir köken ile yükler"
+
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Paketler tarafından desteklenmeyen uygulamaları listele"
+
+#. TRANSLATORS: command description
+msgid "Merge several files to an AppStream file"
+msgstr "Birkaç dosyayı AppStream dosyasında birleştir"
+
+#. TRANSLATORS: command description
+msgid "Modify an AppData file"
+msgstr "AppData dosyasını düzenle"
+
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Yeni API sürümü"
+
 #. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
 msgid "No desktop applications found"
 msgstr "Hiçbir masaüstü uygulaması bulunamadı"
 
+msgid "Not enough arguments, expected file.xml"
+msgstr "Yeterli argüman yok, file.xml bekleniyor"
+
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Yeterli argüman yok, old.xml new.xml sürümleri bekleniyor"
+
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "Tamam"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "BAŞARISIZ"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Eski API sürümü"
 
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Doğrulama başarısız"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %u/%u files..."
+msgstr "%u/%u dosya ayıklandı..."
 
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Dosyaların doğrulaması başarısız"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Lütfen dosyayı gözden geçirin ve 'FIXME' olarak işaretlenmiş ögeleri düzeltin"
+
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Uygulama işleniyor"
 
 #. TRANSLATORS: application was removed
-#: client/as-util.c:4053
 msgid "Removed"
 msgstr "Kaldırıldı"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Eklendi"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "İptal edildi"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Ağ erişimini kullanma"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Sürümü göster"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Profillemeyi etkinleştir"
-
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "AppStream üst verisini bir sürümden diğerine dönüştürür"
+msgid "Replace screenshots in source file"
+msgstr "Kaynak dosyadaki ekran görüntülerini değiştir"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "AppStream üst verisini son sürüme günceller"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "AppStream kaydediliyor"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Bir .desktop dosyasından bir örnek Appdata dosyası oluşturur"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Simge kaydediliyor"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "AppStream üst verisindeki uygulamaları döker"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Paketler taranıyor..."
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
 msgid "Search for AppStream applications"
 msgstr "AppStream uygulamalarını ara"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "AppStream uygulamalarını paket adına göre ara"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "Tüm kurulu AppStream uygulamalarını göster"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
 msgid "Search for AppStream applications by category name"
 msgstr "AppStream uygulamalarını kategori adına göre ara"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Uygulama arama jetonlarını görüntüle"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "AppStream üst verisini yükler"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "AppStream üst verisini yeni bir köken ile yükler"
+msgid "Search for AppStream applications by package name"
+msgstr "AppStream uygulamalarını paket adına göre ara"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "AppStream üst verisini kaldırır"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Çıktı dosyalarının temel adını belirle"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Bir HTML durum sayfası oluşturur"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Bellek dizini ayarla"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Bir CSV durum belgesi oluştur"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Simgeler dizinini belirle"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Bir HTML matris sayfası oluştur"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Günlük kaydı dizinini ayarla"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Paketler tarafından desteklenmeyen uygulamaları listele"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "En küçük simge boyutunu piksel türünde belirle"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Bir AppData veya AppStream dosyasını doğrula"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Süreç sayısını ayarla"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Bir AppData veya AppStream dosyasını doğrula (gevşek)"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Eski üst veri konumunu ayarla"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr "Sözleşmeyi metin olarak dışa aktarır"
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Köken adını ayarla"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Bir AppData veya AppStream dosyasını doğrula (sıkı)"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Çıktı dizinini ayarla"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "AppData dosyasını NEWS biçimine dönüştür"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Paketler dizinini ayarla"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "NEWS dosyasını AppData biçimine dönüştür"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Öneki belirle"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Kurulu uygulama verisini kontrol et"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Geçici dizini ayarla"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr "kurulu uygulamayı denetle"
+msgid "Show all installed AppStream applications"
+msgstr "Tüm kurulu AppStream uygulamalarını göster"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Kaynak dosyadaki ekran görüntülerini değiştir"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Ek hata ayıklama bilgisi göster"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr "Kaynak dosyaya sağlanan ekle"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Sürümü göster"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "Kaynak dosyaya dil ekle"
+msgid "Split an AppStream file to AppData and Metainfo files"
+msgstr "AppStream dosyasını AppData ve Metainfo dosyalarına ayır"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr ""
+msgid "Test a regular expression"
+msgstr "Düzenli ifadeyi sına"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Yerel ürün yazılımı dosyalarını yansıla"
+msgid "Uninstalls AppStream metadata"
+msgstr "AppStream üst verisini kaldırır"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Dış dosyadan ek üst veri kat"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "AppStream üst verisini son sürüme günceller"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "İki AppStream dosyasının içeriklerini karşılaştır"
+msgid "Validate an AppData or AppStream file"
+msgstr "Bir AppData veya AppStream dosyasını doğrula"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Girdi dizgesinden GUID oluştur"
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Bir AppData veya AppStream dosyasını doğrula (gevşek)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "AppData dosyasını düzenle"
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Bir AppData veya AppStream dosyasını doğrula (sıkı)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr "AppStream dosyasını AppData ve Metainfo dosyalarına ayır"
+msgid "Validation failed"
+msgstr "Doğrulama başarısız"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Birkaç dosyayı AppStream dosyasında birleştir"
+msgid "Validation of files failed"
+msgstr "Dosyaların doğrulaması başarısız"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "AppStream biçimlendirmesine dosya aktar"
+msgid "Version:"
+msgstr "Sürüm:"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
 msgid "Watch AppStream locations for changes"
 msgstr "AppStream konumlarını değişiklikler için gözle"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr "Sürüm numaralarını karşılaştır"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr "Düzenli ifadeyi sına"
-
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "AppStream Uygulaması"
-
-#: client/as-util.c:4705
-msgid "Version:"
-msgstr "Sürüm:"
+msgid "check an installed application"
+msgstr "kurulu uygulamayı denetle"
diff --git a/po/uk.po b/po/uk.po
index 26b7f23..5ac183a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2018-04-20 11:58+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/freedesktop/appstream-glib/language/uk/)\n"
@@ -24,503 +24,399 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "Показати додаткові діагностичні дані"
+msgid "Add HiDPI icons to the tarball"
+msgstr "Додати до архіву піктограми HiDPI"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "Додавати ідентифікатор кешу до кожного з компонентів"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "Включити до виведення результати з помилками"
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "Додати мову до файла початкового коду"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "Додати до архіву піктограми HiDPI"
+#. TRANSLATORS: command description
+msgid "Add a provide to a source file"
+msgstr "Додати надання залежностей до файла початкового коду"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "Додати до XML закодовані піктограми"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "Не стискати піктограми до архіву"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "Встановити каталог для журналу"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "Додано"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "Встановити каталог для пакунків"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "Псевдонім %s"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "Встановити адресу тимчасового каталогу"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "Інструмент AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "Встановити каталог для виведення даних"
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "Скасовано"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "Встановити каталог піктограм"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "Перевірити дані встановлених програм"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "Встановити каталог кешу"
+msgid "Command not found, valid commands are:"
+msgstr "Такої команди не знайдено. Можливі команди:"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "Встановити базові назви для виведених файлів"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "Порівняти вміст двох файлів AppStream"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "Встановити назву походження"
+#. TRANSLATORS: command description
+msgid "Compare version numbers"
+msgstr "Порівняти номери версій"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "Встановити кількість потоків виконання"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "Перетворення з %s у %s не реалізовано"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "Встановити мінімальний розмір піктограми у пікселях"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "Перетворити файл AppData у формат NEWS"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "Встановити розташування старих метаданих"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "Перетворити файл NEWS у формат AppData"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "Ігнорувати певні типи вето"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "Перетворити метадані AppStream з однієї версії до іншої"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "Не вдалося обробити аргументи"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "Створити документ щодо стану у форматі CSV"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "Не вдалося налаштувати засіб збирання"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "Створити сторінку матриці у форматі HTML"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "Не вдалося відкрити пакунки"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "Створити сторінку щодо стану у форматі HTML"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "Скануємо пакунки…"
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "Створити приклад файла Appdata на основі файла .desktop"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "Не вдалося додати пакунок"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "Виводити ключі пошуку програм"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr "Оброблено %u з %u файлів…"
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "Не стискати піктограми до архіву"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "Не вдалося створити метадані"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "Не використовувати доступ до мережі"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "Виконано!"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "Зберігаємо піктограму"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "Створити дамп програм у метаданих AppStream"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "Встановити префікс"
+msgid "Enable profiling"
+msgstr "Увімкнути профілювання"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "Обробляємо програму"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "Помилка під час спроби створення каталогу результатів"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "Помилка під час спроби завантажити файл AppData"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "Помилка під час спроби обробити переклади"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "Помилка під час спроби завантажити файл desktop"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "Помилка під час спроби обробити запис подяк"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "Помилка під час спроби обробити запис вмісту (provides)"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "Помилка під час спроби завантажити файл desktop"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "Помилка під час спроби створення каталогу результатів"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "Зберігаємо AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "Помилка під час спроби обробити переклади"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "Помилка під час спроби зберегти файл AppStream"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "Псевдонім %s"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "Такої команди не знайдено. Можливі команди:"
+#. TRANSLATORS: command description
+msgid "Exports the agreement to text"
+msgstr "Експортує угоду у текстовому форматі"
 
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr ""
-"Будь ласка, перегляньте файл і виправте записи, до яких додано «FIXME»"
+#. list failures
+msgid "FAILED"
+msgstr "ПОМИЛКА"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "Стара версія програмного інтерфейсу"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "Не вдалося додати пакунок"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "Нова версія програмного інтерфейсу"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "Не вдалося створити метадані"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "Недостатньо аргументів: мало бути вказано старий.xml і новий.xml"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "Не вдалося відкрити пакунки"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "Перетворення з %s у %s не реалізовано"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "Не вдалося обробити аргументи"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "Недостатньо аргументів: мало бути вказано файл.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "Не вдалося налаштувати засіб збирання"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "Дані у форматі файлів «%s» не може бути оновлено"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "Нерозпізнаний формат"
 
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "Створити GUID на основі рядка вхідних даних"
+
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "Ігнорувати певні типи вето"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "Імпортувати файл до розмітки AppStream"
+
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "Включити до виведення результати з помилками"
+
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "Включити додаткові метадані із зовнішнього файла"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "Встановити метадані AppStream"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "Встановити метадані AppStream з новим походженням"
+
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "Показати список програм, які не супроводжуються пакунками"
+
+#. TRANSLATORS: command description
+msgid "Merge several files to an AppStream file"
+msgstr "Об’єднати декілька файлів до файла AppStream"
+
+#. TRANSLATORS: command description
+msgid "Mirror upstream screenshots"
+msgstr "Віддзеркалити знімки вікон із основної гілки розробки"
+
+#. TRANSLATORS: command description
+msgid "Modify an AppData file"
+msgstr "Внести зміни до файла AppData"
+
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "Нова версія програмного інтерфейсу"
+
 #. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
 msgid "No desktop applications found"
 msgstr "Не знайдено стільничних програм"
 
+msgid "Not enough arguments, expected file.xml"
+msgstr "Недостатньо аргументів: мало бути вказано файл.xml"
+
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "Недостатньо аргументів: мало бути вказано старий.xml і новий.xml"
+
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "Гаразд"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "ПОМИЛКА"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "Стара версія програмного інтерфейсу"
 
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "Спроба перевірки зазнала невдачі"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %u/%u files..."
+msgstr "Оброблено %u з %u файлів…"
 
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "Файли не пройшли перевірку"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "Будь ласка, перегляньте файл і виправте записи, до яких додано «FIXME»"
+
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "Обробляємо програму"
 
 #. TRANSLATORS: application was removed
-#: client/as-util.c:4053
 msgid "Removed"
 msgstr "Вилучено"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "Додано"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "Скасовано"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "Не використовувати доступ до мережі"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "Показати дані щодо версії"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "Увімкнути профілювання"
-
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "Перетворити метадані AppStream з однієї версії до іншої"
+msgid "Replace screenshots in source file"
+msgstr "Замінити знімки вікон у початковому файлі"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "Оновити метадані AppData до найсвіжішої версії"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "Зберігаємо AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "Створити приклад файла Appdata на основі файла .desktop"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "Зберігаємо піктограму"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "Створити дамп програм у метаданих AppStream"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "Скануємо пакунки…"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
 msgid "Search for AppStream applications"
 msgstr "Шукати програми AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "Шукати програми AppStream за назвою пакунка"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "Показати усі встановлені програми AppStream"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
 msgid "Search for AppStream applications by category name"
 msgstr "Шукати програми AppStream за назвою категорії"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "Виводити ключі пошуку програм"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "Встановити метадані AppStream"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "Встановити метадані AppStream з новим походженням"
+msgid "Search for AppStream applications by package name"
+msgstr "Шукати програми AppStream за назвою пакунка"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "Вилучити метадані AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "Встановити базові назви для виведених файлів"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "Створити сторінку щодо стану у форматі HTML"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "Встановити каталог кешу"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "Створити документ щодо стану у форматі CSV"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "Встановити каталог піктограм"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "Створити сторінку матриці у форматі HTML"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "Встановити каталог для журналу"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "Показати список програм, які не супроводжуються пакунками"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "Встановити мінімальний розмір піктограми у пікселях"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "Перевірити файл AppData або AppStream"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "Встановити кількість потоків виконання"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "Перевірити файл AppData або AppStream (нестрого)"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "Встановити розташування старих метаданих"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr "Експортує угоду у текстовому форматі"
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "Встановити назву походження"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "Перевірити файл AppData або AppStream (строго)"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "Встановити каталог для виведення даних"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "Перетворити файл AppData у формат NEWS"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "Встановити каталог для пакунків"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "Перетворити файл NEWS у формат AppData"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "Встановити префікс"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "Перевірити дані встановлених програм"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "Встановити адресу тимчасового каталогу"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr "перевірити встановлену програму"
+msgid "Show all installed AppStream applications"
+msgstr "Показати усі встановлені програми AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "Замінити знімки вікон у початковому файлі"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "Показати додаткові діагностичні дані"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr "Додати надання залежностей до файла початкового коду"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "Показати дані щодо версії"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "Додати мову до файла початкового коду"
+msgid "Split an AppStream file to AppData and Metainfo files"
+msgstr "Розділити файл AppStream на файли AppData і Metainfo"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "Віддзеркалити знімки вікон із основної гілки розробки"
+msgid "Test a regular expression"
+msgstr "Перевірити формальний вираз"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "Віддзеркалити локальні файли мікрокоду"
+msgid "Uninstalls AppStream metadata"
+msgstr "Вилучити метадані AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "Включити додаткові метадані із зовнішнього файла"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "Оновити метадані AppData до найсвіжішої версії"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "Порівняти вміст двох файлів AppStream"
+msgid "Validate an AppData or AppStream file"
+msgstr "Перевірити файл AppData або AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "Створити GUID на основі рядка вхідних даних"
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "Перевірити файл AppData або AppStream (нестрого)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "Внести зміни до файла AppData"
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "Перевірити файл AppData або AppStream (строго)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr "Розділити файл AppStream на файли AppData і Metainfo"
+msgid "Validation failed"
+msgstr "Спроба перевірки зазнала невдачі"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "Об’єднати декілька файлів до файла AppStream"
+msgid "Validation of files failed"
+msgstr "Файли не пройшли перевірку"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "Імпортувати файл до розмітки AppStream"
+msgid "Version:"
+msgstr "Версія:"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
 msgid "Watch AppStream locations for changes"
 msgstr "Спостерігати за змінами у місцях AppStream"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr "Порівняти номери версій"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr "Перевірити формальний вираз"
-
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "Інструмент AppStream"
-
-#: client/as-util.c:4705
-msgid "Version:"
-msgstr "Версія:"
+msgid "check an installed application"
+msgstr "перевірити встановлену програму"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c083bd7..cfab0bb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
 "PO-Revision-Date: 2017-07-23 03:30+0000\n"
 "Last-Translator: cheng ye <18969068329@163.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/freedesktop/appstream-glib/language/zh_CN/)\n"
@@ -26,503 +26,379 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "显示额外的调试信息"
+msgid "Add HiDPI icons to the tarball"
+msgstr "将高分辨率（HiDPI）图标添加进 tarball"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "向每一个组件添加一个缓存 ID"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "在输出中列出失败的结果"
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "向源文件添加语言"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "将高分辨率（HiDPI）图标添加进 tarball"
+#. TRANSLATORS: command description
+#, fuzzy
+msgid "Add a provide to a source file"
+msgstr "向源文件添加其所提供"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "将已编码的图标加入 XML"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "不要将图标压缩至 tarball 中"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "设置日志用目录"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "已添加"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "设置软件包目录"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "%s 的别名"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "设置临时目录"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "AppStream 实用工具"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "设置输出目录"
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "已取消"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "设置图标用目录"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "检查安装的应用程序数据"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "设置缓存目录"
+msgid "Command not found, valid commands are:"
+msgstr "命令未找到，有效的命令有："
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "设置输出文件的基础名称"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "比较两份 AppStream 文件的内容"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "设置来源名称"
+#. TRANSLATORS: command description
+msgid "Compare version numbers"
+msgstr "比较版本号"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "设置线程的数目"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "将 %s 转换成 %s 还未执行"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "设置图标的最小像素大小"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "将 AppData 文件转换成 NEWS 格式"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "设置旧的元数据位置"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "将 NEWS 文件转换成 AppData 格式"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "忽略特定类型的否认值"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "将 AppStream 元数据从一个版本转换成另一个版本"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "参数解析失败"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "创建一个 CSV 状态文档"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "设置构建程序失败"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "创建 HTML matrix 表格页面"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "软件包打开失败"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "创建一个 HTML 状态页面"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "正在扫描软件包……"
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "从一个 .desktop 文件创建一个示例 Appdata 文件"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "软件包添加失败"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "显示应用程序搜索令牌"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "不要将图标压缩至 tarball 中"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "元数据生成失败"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "不要使用网络连接"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "完成！"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "正在保存图标"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "将应用程序转储到 AppStream 元数据中"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "设置前缀"
+msgid "Enable profiling"
+msgstr "启用性能分析"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "正在处理应用程序"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "创建输出目录出错"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "载入 AppData 文件出错"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "解析翻译出错"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "载入 desktop 文件出错"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "解析 kudos 值出错"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "解析 provides 值出错"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "载入 desktop 文件出错"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "创建输出目录出错"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "正在保存 AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "解析翻译出错"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "保存 AppStream 文件出错"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "%s 的别名"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "命令未找到，有效的命令有："
-
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "请检查文件并修复任何标有“FIXME”的项目"
+#. list failures
+msgid "FAILED"
+msgstr "失败"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "旧 API 版本"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "软件包添加失败"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "新 API 版本"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "元数据生成失败"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "参数不够，预期为 old.xml new.xml [版本]"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "软件包打开失败"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "将 %s 转换成 %s 还未执行"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "参数解析失败"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "参数不足，预期 file.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "设置构建程序失败"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "文件格式 “%s” 无法被升级"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "格式未识别"
 
-#. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
-msgid "No desktop applications found"
-msgstr "未发现桌面应用程序"
-
-#. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
-msgid "OK"
-msgstr "成功"
-
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "失败"
-
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "验证失败"
-
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "文件验证失败"
-
-#. TRANSLATORS: application was removed
-#: client/as-util.c:4053
-msgid "Removed"
-msgstr "已移除"
-
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "已添加"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "已取消"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "不要使用网络连接"
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "从输入字符串创建 GUID"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "显示版本"
+msgid "Ignore certain types of veto"
+msgstr "忽略特定类型的否认值"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "导入文件到 AppStream 标记"
 
 #. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "启用性能分析"
+msgid "Include failed results in the output"
+msgstr "在输出中列出失败的结果"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "将 AppStream 元数据从一个版本转换成另一个版本"
+msgid "Incorporate extra metadata from an external file"
+msgstr "从外部文件集成额外元数据"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "升级 AppData 元数据至最新版本"
+msgid "Installs AppStream metadata"
+msgstr "安装 AppStream 元数据"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "从一个 .desktop 文件创建一个示例 Appdata 文件"
+msgid "Installs AppStream metadata with new origin"
+msgstr "从新的来源安装 AppStream 元数据"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "将应用程序转储到 AppStream 元数据中"
+msgid "List applications not backed by packages"
+msgstr "列出未受软件包支持的应用程序"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
-msgid "Search for AppStream applications"
-msgstr "搜索 AppStream 应用程序"
+msgid "Merge several files to an AppStream file"
+msgstr "合并多个文件到一 AppStream 文件上"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "按包名搜索 AppStream 应用程序"
+msgid "Mirror upstream screenshots"
+msgstr "镜像上游快照"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "显示所有已安装的 Appstream 应用"
+msgid "Modify an AppData file"
+msgstr "编辑 AppData 文件"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
-msgid "Search for AppStream applications by category name"
-msgstr "以类别名搜索 for AppStream 应用"
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "新 API 版本"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "显示应用程序搜索令牌"
+#. TRANSLATORS: probably wrong XML
+msgid "No desktop applications found"
+msgstr "未发现桌面应用程序"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "安装 AppStream 元数据"
+msgid "Not enough arguments, expected file.xml"
+msgstr "参数不足，预期 file.xml"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "从新的来源安装 AppStream 元数据"
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "参数不够，预期为 old.xml new.xml [版本]"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "卸载 AppStream 元数据"
+#. TRANSLATORS: the file is valid
+msgid "OK"
+msgstr "成功"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "创建一个 HTML 状态页面"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "旧 API 版本"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "创建一个 CSV 状态文档"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "请检查文件并修复任何标有“FIXME”的项目"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "创建 HTML matrix 表格页面"
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "正在处理应用程序"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "列出未受软件包支持的应用程序"
+#. TRANSLATORS: application was removed
+msgid "Removed"
+msgstr "已移除"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "验证 AppData 或 AppStream 文件"
+msgid "Replace screenshots in source file"
+msgstr "替换源文件内的画面快照"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "验证 AppData 或 AppStream 文件 (宽松检验)"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "正在保存 AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "正在保存图标"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "验证 AppData 或 AppStream 文件 (严格检验)"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "正在扫描软件包……"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "将 AppData 文件转换成 NEWS 格式"
+msgid "Search for AppStream applications"
+msgstr "搜索 AppStream 应用程序"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "将 NEWS 文件转换成 AppData 格式"
+msgid "Search for AppStream applications by category name"
+msgstr "以类别名搜索 for AppStream 应用"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "检查安装的应用程序数据"
+msgid "Search for AppStream applications by package name"
+msgstr "按包名搜索 AppStream 应用程序"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "设置输出文件的基础名称"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "替换源文件内的画面快照"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "设置缓存目录"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-#, fuzzy
-msgid "Add a provide to a source file"
-msgstr "向源文件添加其所提供"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "设置图标用目录"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "向源文件添加语言"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "设置日志用目录"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "镜像上游快照"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "设置图标的最小像素大小"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "镜像本地固件文件"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "设置线程的数目"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "从外部文件集成额外元数据"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "设置旧的元数据位置"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "比较两份 AppStream 文件的内容"
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "设置来源名称"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "从输入字符串创建 GUID"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "设置输出目录"
+
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "设置软件包目录"
+
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "设置前缀"
+
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "设置临时目录"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "编辑 AppData 文件"
+msgid "Show all installed AppStream applications"
+msgstr "显示所有已安装的 Appstream 应用"
+
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "显示额外的调试信息"
+
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "显示版本"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4638
 msgid "Split an AppStream file to AppData and Metainfo files"
 msgstr "将 AppStream 文件分割为 AppData 和 Metainfo 文件"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "合并多个文件到一 AppStream 文件上"
+msgid "Uninstalls AppStream metadata"
+msgstr "卸载 AppStream 元数据"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "导入文件到 AppStream 标记"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "升级 AppData 元数据至最新版本"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
-msgid "Watch AppStream locations for changes"
-msgstr ""
+msgid "Validate an AppData or AppStream file"
+msgstr "验证 AppData 或 AppStream 文件"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr "比较版本号"
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "验证 AppData 或 AppStream 文件 (宽松检验)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr ""
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "验证 AppData 或 AppStream 文件 (严格检验)"
 
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "AppStream 实用工具"
+msgid "Validation failed"
+msgstr "验证失败"
+
+msgid "Validation of files failed"
+msgstr "文件验证失败"
 
-#: client/as-util.c:4705
 msgid "Version:"
 msgstr "版本："
diff --git a/po/zh_TW.po b/po/zh_TW.po
index cdd8b8e..c706170 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,13 +8,14 @@
 # Ding-Yi Chen <dingyichen@gmail.com>, 2016. #zanata
 # Richard Hughes <richard@hughsie.com>, 2016. #zanata
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2017. #zanata
+# Peter Pan <pan93412@gmail.com>, 2018. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: appstream-glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-04 11:35+0100\n"
-"PO-Revision-Date: 2017-08-27 11:42+0000\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
+"POT-Creation-Date: 2018-07-11 19:18+0100\n"
+"PO-Revision-Date: 2018-06-17 07:57+0000\n"
+"Last-Translator: Peter Pan <pan93412@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/freedesktop/appstream-glib/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,502 +25,399 @@ msgstr ""
 "X-Generator: Zanata 4.4.5\n"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:90 client/as-compose.c:344 client/as-util.c:4404
-msgid "Show extra debugging information"
-msgstr "顯示額外的除錯用資訊"
+msgid "Add HiDPI icons to the tarball"
+msgstr "將 HiDPI 圖示加入 Tarball 中"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:93
 msgid "Add a cache ID to each component"
 msgstr "加入快取 ID 至各個組件"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:96
-msgid "Include failed results in the output"
-msgstr "在輸出中列入失敗的結果"
+#. TRANSLATORS: command description
+msgid "Add a language to a source file"
+msgstr "加入語言到來源檔中"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:99
-msgid "Add HiDPI icons to the tarball"
-msgstr "將 HiDPI 圖示加入 Tarball 中"
+#. TRANSLATORS: command description
+msgid "Add a provide to a source file"
+msgstr "加入提供者到來源檔中"
 
 #. TRANSLATORS: command line option
-#: client/as-builder.c:102
 msgid "Add encoded icons to the XML"
 msgstr "將編碼的圖示加到 XML 中"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:105
-msgid "Do not compress the icons into a tarball"
-msgstr "不要將圖示壓縮到 Tarball 中"
-
-#. TRANSLATORS: command line option
-#: client/as-builder.c:108
-msgid "Set the logging directory"
-msgstr "設定紀錄用目錄"
+#. TRANSLATORS: application was added
+msgid "Added"
+msgstr "已加入"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:111
-msgid "Set the packages directory"
-msgstr "設定軟體包目錄"
+#. TRANSLATORS: this is a command alias
+#, c-format
+msgid "Alias to %s"
+msgstr "%s 的別名"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:114
-msgid "Set the temporary directory"
-msgstr "設定暫存目錄"
+#. TRANSLATORS: program name
+msgid "AppStream Utility"
+msgstr "AppStream 公用程式"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:117 client/as-compose.c:350
-msgid "Set the output directory"
-msgstr "設定輸出目錄"
+#. TRANSLATORS: this is when a device ctrl+c's a watch
+msgid "Cancelled"
+msgstr "已取消"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:120 client/as-compose.c:353
-msgid "Set the icons directory"
-msgstr "設定圖示目錄"
+#. TRANSLATORS: command description
+msgid "Check installed application data"
+msgstr "檢查安裝的應用程式資料"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:123
-msgid "Set the cache directory"
-msgstr "設定快取目錄"
+msgid "Command not found, valid commands are:"
+msgstr "找不到指令，有效的指令有："
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:126 client/as-compose.c:362
-msgid "Set the basenames of the output files"
-msgstr "設定輸出檔案的基礎名稱"
+#. TRANSLATORS: command description
+msgid "Compare the contents of two AppStream files"
+msgstr "比較兩份 AppStream 檔案的內容"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:129 client/as-compose.c:356
-msgid "Set the origin name"
-msgstr "設定來源名稱"
+#. TRANSLATORS: command description
+msgid "Compare version numbers"
+msgstr "比較版本號"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:132
-msgid "Set the number of threads"
-msgstr "設定執行緒的數目"
+#. TRANSLATORS: the %s and %s are file types,
+#. * e.g. "appdata" to "appstream"
+#, c-format
+msgid "Conversion %s to %s is not implemented"
+msgstr "尚未實作從 %s 至 %s 的轉換"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:135 client/as-compose.c:359
-msgid "Set the minimum icon size in pixels"
-msgstr "設定圖示的最小像素大小"
+#. TRANSLATORS: command description
+msgid "Convert an AppData file to NEWS format"
+msgstr "將 AppData 檔轉換成 NEWS 格式"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:138
-msgid "Set the old metadata location"
-msgstr "設定舊的中介資料位置"
+#. TRANSLATORS: command description
+msgid "Convert an NEWS file to AppData format"
+msgstr "將 NEWS 檔轉換成 AppData 格式"
 
-#. TRANSLATORS: command line option
-#: client/as-builder.c:141
-msgid "Ignore certain types of veto"
-msgstr "忽略特定類型的 veto"
+#. TRANSLATORS: command description
+msgid "Converts AppStream metadata from one version to another"
+msgstr "將 AppStream 中介資料從一個版本轉換成另一個版本"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:155 client/as-compose.c:376 client/as-util.c:4687
-msgid "Failed to parse arguments"
-msgstr "無法解析引數"
+#. TRANSLATORS: command description
+msgid "Create an CSV status document"
+msgstr "建立 CSV 狀態文件"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:260
-msgid "Failed to set up builder"
-msgstr "無法設置組建程式"
+#. TRANSLATORS: command description
+msgid "Create an HTML matrix page"
+msgstr "建立 HTML matrix 頁面"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:279
-msgid "Failed to open packages"
-msgstr "無法開啟軟體包"
+#. TRANSLATORS: command description
+msgid "Create an HTML status page"
+msgstr "建立 HTML 狀態網頁"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:289
-msgid "Scanning packages..."
-msgstr "正在掃描軟體包..."
+#. TRANSLATORS: command description
+msgid "Creates an example Appdata file from a .desktop file"
+msgstr "從 .desktop 檔建立樣本 Appdata 檔案"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:299
-msgid "Failed to add package"
-msgstr "無法加入軟體包"
+#. TRANSLATORS: command description
+msgid "Display application search tokens"
+msgstr "顯示應用程式搜尋代符"
 
-#. TRANSLATORS: information message
-#: client/as-builder.c:305
-#, c-format
-msgid "Parsed %u/%u files..."
-msgstr "已解析 %u/%u 份檔案..."
+#. TRANSLATORS: command line option
+msgid "Do not compress the icons into a tarball"
+msgstr "不要將圖示壓縮到 Tarball 中"
 
-#. TRANSLATORS: error message
-#: client/as-builder.c:315
-msgid "Failed to generate metadata"
-msgstr "無法生成中介資料"
+#. TRANSLATORS: this is the --nonet argument
+msgid "Do not use network access"
+msgstr "不要使用網路存取"
 
 #. success
 #. TRANSLATORS: information message
-#: client/as-builder.c:322 client/as-compose.c:548
 msgid "Done!"
 msgstr "完成！"
 
-#. TRANSLATORS: we've saving the icon file to disk
-#: client/as-compose.c:125 client/as-compose.c:181
-msgid "Saving icon"
-msgstr "正在儲存圖示"
+#. TRANSLATORS: command description
+msgid "Dumps the applications in the AppStream metadata"
+msgstr "將應用程式傾印到 AppStream 中介資料中"
 
 #. TRANSLATORS: command line option
-#: client/as-compose.c:347
-msgid "Set the prefix"
-msgstr "設定前綴"
+msgid "Enable profiling"
+msgstr "啟用評測"
 
-#. TRANSLATORS: we're generating the AppStream data
-#: client/as-compose.c:419
-msgid "Processing application"
-msgstr "正在處理應用程式"
+#. TRANSLATORS: this is when the folder could
+#. * not be created
+msgid "Error creating output directory"
+msgstr "建立輸出目錄時發生錯誤"
 
 #. TRANSLATORS: the .appdata.xml file could not
 #. * be loaded
-#: client/as-compose.c:425
 msgid "Error loading AppData file"
 msgstr "載入 AppData 檔案時發生錯誤"
 
-#. TRANSLATORS: the .mo files could not be parsed
-#: client/as-compose.c:438
-msgid "Error parsing translations"
-msgstr "解析翻譯時發生錯誤"
+#. TRANSLATORS: the .desktop file could not
+#. * be loaded
+msgid "Error loading desktop file"
+msgstr "載入桌面檔時發生錯誤"
 
 #. TRANSLATORS: we could not auto-add the kudo
-#: client/as-compose.c:449
 msgid "Error parsing kudos"
 msgstr "解析嘉許時發生錯誤"
 
 #. TRANSLATORS: we could not auto-add the provides
-#: client/as-compose.c:460
 msgid "Error parsing provides"
 msgstr "解析提供項時發生錯誤"
 
-#. TRANSLATORS: the .desktop file could not
-#. * be loaded
-#: client/as-compose.c:495
-msgid "Error loading desktop file"
-msgstr "載入桌面檔時發生錯誤"
-
-#. TRANSLATORS: this is when the folder could
-#. * not be created
-#: client/as-compose.c:523
-msgid "Error creating output directory"
-msgstr "建立輸出目錄時發生錯誤"
-
-#. TRANSLATORS: we've saving the XML file to disk
-#: client/as-compose.c:532
-msgid "Saving AppStream"
-msgstr "正在儲存 AppStream"
+#. TRANSLATORS: the .mo files could not be parsed
+msgid "Error parsing translations"
+msgstr "解析翻譯時發生錯誤"
 
 #. TRANSLATORS: this is when the destination file
 #. * cannot be saved for some reason
-#: client/as-compose.c:542
 msgid "Error saving AppStream file"
 msgstr "儲存 AppStream 檔案時發生錯誤"
 
-#. TRANSLATORS: this is a command alias
-#: client/as-util.c:104
-#, c-format
-msgid "Alias to %s"
-msgstr "%s 的別名"
-
-#: client/as-util.c:186
-msgid "Command not found, valid commands are:"
-msgstr "找不到指令，有效的指令有："
+#. TRANSLATORS: command description
+msgid "Exports the agreement to text"
+msgstr "將同意條款輸出至文字檔案"
 
-#. TRANSLATORS: any manual changes required?
-#. * also note: FIXME is a hardcoded string
-#: client/as-util.c:478
-msgid "Please review the file and fix any 'FIXME' items"
-msgstr "請檢閱檔案並修正任何有「FIXME」的項目"
+#. list failures
+msgid "FAILED"
+msgstr "失敗"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:496
-msgid "Old API version"
-msgstr "舊 API 版本"
+#. TRANSLATORS: error message
+msgid "Failed to add package"
+msgstr "無法加入軟體包"
 
-#. TRANSLATORS: information message
-#: client/as-util.c:508
-msgid "New API version"
-msgstr "新 API 版本"
+#. TRANSLATORS: error message
+msgid "Failed to generate metadata"
+msgstr "無法生成中介資料"
 
-#: client/as-util.c:527
-msgid "Not enough arguments, expected old.xml new.xml version"
-msgstr "引數不夠，預期 old.xml new.xml 版本"
+#. TRANSLATORS: error message
+msgid "Failed to open packages"
+msgstr "無法開啟軟體包"
 
-#. TRANSLATORS: the %s and %s are file types,
-#. * e.g. "appdata" to "appstream"
-#: client/as-util.c:563
-#, c-format
-msgid "Conversion %s to %s is not implemented"
-msgstr "尚未實作從 %s 至 %s 的轉換"
+#. TRANSLATORS: error message
+msgid "Failed to parse arguments"
+msgstr "無法解析引數"
 
-#: client/as-util.c:580
-msgid "Not enough arguments, expected file.xml"
-msgstr "引數不足，預期 file.xml"
+#. TRANSLATORS: error message
+msgid "Failed to set up builder"
+msgstr "無法設置組建程式"
 
 #. TRANSLATORS: %s is a file type,
 #. * e.g. 'appdata'
-#: client/as-util.c:606
 #, c-format
 msgid "File format '%s' cannot be upgraded"
 msgstr "無法升級「%s」格式"
 
 #. TRANSLATORS: not a recognised file type
-#: client/as-util.c:648 client/as-util.c:1048 client/as-util.c:1149
 msgid "Format not recognised"
 msgstr "無法辨別格式"
 
+#. TRANSLATORS: command description
+msgid "Generate a GUID from an input string"
+msgstr "從輸入字串生成 GUID"
+
+#. TRANSLATORS: command line option
+msgid "Ignore certain types of veto"
+msgstr "忽略特定類型的 veto"
+
+#. TRANSLATORS: command description
+msgid "Import a file to AppStream markup"
+msgstr "匯入檔案到 AppStream 標記"
+
+#. TRANSLATORS: command line option
+msgid "Include failed results in the output"
+msgstr "在輸出中列入失敗的結果"
+
+#. TRANSLATORS: command description
+msgid "Incorporate extra metadata from an external file"
+msgstr "從外部檔案整合額外中介資料"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata"
+msgstr "安裝 AppStream 中介資料"
+
+#. TRANSLATORS: command description
+msgid "Installs AppStream metadata with new origin"
+msgstr "以新來源安裝 AppStream 中介資料"
+
+#. TRANSLATORS: command description
+msgid "List applications not backed by packages"
+msgstr "列出未受軟體包支持的應用程式"
+
+#. TRANSLATORS: command description
+msgid "Merge several files to an AppStream file"
+msgstr "將多個檔案合併成一份 AppStream 檔"
+
+#. TRANSLATORS: command description
+msgid "Mirror upstream screenshots"
+msgstr "同步使用上游畫面快照"
+
+#. TRANSLATORS: command description
+msgid "Modify an AppData file"
+msgstr "修改 AppData 檔"
+
+#. TRANSLATORS: information message
+msgid "New API version"
+msgstr "新 API 版本"
+
 #. TRANSLATORS: probably wrong XML
-#: client/as-util.c:1989
 msgid "No desktop applications found"
 msgstr "找不到桌面應用程式"
 
+msgid "Not enough arguments, expected file.xml"
+msgstr "引數不足，預期 file.xml"
+
+msgid "Not enough arguments, expected old.xml new.xml version"
+msgstr "引數不夠，預期 old.xml new.xml 版本"
+
 #. TRANSLATORS: the file is valid
-#: client/as-util.c:2720
 msgid "OK"
 msgstr "確定"
 
-#. list failures
-#: client/as-util.c:2725
-msgid "FAILED"
-msgstr "失敗"
+#. TRANSLATORS: information message
+msgid "Old API version"
+msgstr "舊 API 版本"
 
-#: client/as-util.c:2821
-msgid "Validation failed"
-msgstr "驗證失敗"
+#. TRANSLATORS: information message
+#, c-format
+msgid "Parsed %u/%u files..."
+msgstr "已解析 %u/%u 份檔案..."
 
-#: client/as-util.c:2865
-msgid "Validation of files failed"
-msgstr "檔案驗證失敗"
+#. TRANSLATORS: any manual changes required?
+#. * also note: FIXME is a hardcoded string
+msgid "Please review the file and fix any 'FIXME' items"
+msgstr "請檢閱檔案並修正任何有「FIXME」的項目"
+
+#. TRANSLATORS: we're generating the AppStream data
+msgid "Processing application"
+msgstr "正在處理應用程式"
 
 #. TRANSLATORS: application was removed
-#: client/as-util.c:4053
 msgid "Removed"
 msgstr "已移除"
 
-#. TRANSLATORS: application was added
-#: client/as-util.c:4066
-msgid "Added"
-msgstr "已加入"
-
-#. TRANSLATORS: this is when a device ctrl+c's a watch
-#: client/as-util.c:4349
-msgid "Cancelled"
-msgstr "已取消"
-
-#. TRANSLATORS: this is the --nonet argument
-#: client/as-util.c:4401
-msgid "Do not use network access"
-msgstr "不要使用網路存取"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4407
-msgid "Show version"
-msgstr "顯示版本"
-
-#. TRANSLATORS: command line option
-#: client/as-util.c:4410
-msgid "Enable profiling"
-msgstr "啟用評測"
-
 #. TRANSLATORS: command description
-#: client/as-util.c:4440
-msgid "Converts AppStream metadata from one version to another"
-msgstr "將 AppStream 中介資料從一個版本轉換成另一個版本"
+msgid "Replace screenshots in source file"
+msgstr "替換源檔內的畫面快照"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4446
-msgid "Upgrade AppData metadata to the latest version"
-msgstr "將 AppData 中介資料升級至最新版"
+#. TRANSLATORS: we've saving the XML file to disk
+msgid "Saving AppStream"
+msgstr "正在儲存 AppStream"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4452
-msgid "Creates an example Appdata file from a .desktop file"
-msgstr "從 .desktop 檔建立樣本 Appdata 檔案"
+#. TRANSLATORS: we've saving the icon file to disk
+msgid "Saving icon"
+msgstr "正在儲存圖示"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4458
-msgid "Dumps the applications in the AppStream metadata"
-msgstr "將應用程式傾印到 AppStream 中介資料中"
+#. TRANSLATORS: information message
+msgid "Scanning packages..."
+msgstr "正在掃描軟體包..."
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4464
 msgid "Search for AppStream applications"
 msgstr "搜尋 AppStream 應用程式"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4470
-msgid "Search for AppStream applications by package name"
-msgstr "依據軟體包名稱搜尋 AppStream 應用程式"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4476
-msgid "Show all installed AppStream applications"
-msgstr "顯示所有安裝的 AppStream 應用程式"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4482
 msgid "Search for AppStream applications by category name"
 msgstr "依據類別名稱搜尋 AppStream 應用程式"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4488
-msgid "Display application search tokens"
-msgstr "顯示應用程式搜尋代符"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4494
-msgid "Installs AppStream metadata"
-msgstr "安裝 AppStream 中介資料"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4500
-msgid "Installs AppStream metadata with new origin"
-msgstr "以新來源安裝 AppStream 中介資料"
+msgid "Search for AppStream applications by package name"
+msgstr "依據軟體包名稱搜尋 AppStream 應用程式"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4506
-msgid "Uninstalls AppStream metadata"
-msgstr "解除 AppStream 中介資料的安裝"
+#. TRANSLATORS: command line option
+msgid "Set the basenames of the output files"
+msgstr "設定輸出檔案的基礎名稱"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4512
-msgid "Create an HTML status page"
-msgstr "建立 HTML 狀態網頁"
+#. TRANSLATORS: command line option
+msgid "Set the cache directory"
+msgstr "設定快取目錄"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4518
-msgid "Create an CSV status document"
-msgstr "建立 CSV 狀態文件"
+#. TRANSLATORS: command line option
+msgid "Set the icons directory"
+msgstr "設定圖示目錄"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4524
-msgid "Create an HTML matrix page"
-msgstr "建立 HTML matrix 頁面"
+#. TRANSLATORS: command line option
+msgid "Set the logging directory"
+msgstr "設定紀錄用目錄"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4530
-msgid "List applications not backed by packages"
-msgstr "列出未受軟體包支持的應用程式"
+#. TRANSLATORS: command line option
+msgid "Set the minimum icon size in pixels"
+msgstr "設定圖示的最小像素大小"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4536
-msgid "Validate an AppData or AppStream file"
-msgstr "驗證 AppData 或 AppStream 檔案"
+#. TRANSLATORS: command line option
+msgid "Set the number of threads"
+msgstr "設定執行緒的數目"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4542
-msgid "Validate an AppData or AppStream file (relaxed)"
-msgstr "驗證 AppData 或 AppStream 檔案 (寬鬆檢驗)"
+#. TRANSLATORS: command line option
+msgid "Set the old metadata location"
+msgstr "設定舊的中介資料位置"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4548
-msgid "Exports the agreement to text"
-msgstr ""
+#. TRANSLATORS: command line option
+msgid "Set the origin name"
+msgstr "設定來源名稱"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4554
-msgid "Validate an AppData or AppStream file (strict)"
-msgstr "驗證 AppData 或 AppStream 檔案 (嚴格檢驗)"
+#. TRANSLATORS: command line option
+msgid "Set the output directory"
+msgstr "設定輸出目錄"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4560
-msgid "Convert an AppData file to NEWS format"
-msgstr "將 AppData 檔轉換成 NEWS 格式"
+#. TRANSLATORS: command line option
+msgid "Set the packages directory"
+msgstr "設定軟體包目錄"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4566
-msgid "Convert an NEWS file to AppData format"
-msgstr "將 NEWS 檔轉換成 AppData 格式"
+#. TRANSLATORS: command line option
+msgid "Set the prefix"
+msgstr "設定前綴"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4572
-msgid "Check installed application data"
-msgstr "檢查安裝的應用程式資料"
+#. TRANSLATORS: command line option
+msgid "Set the temporary directory"
+msgstr "設定暫存目錄"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4578
-msgid "check an installed application"
-msgstr "檢查安裝的應用程式"
+msgid "Show all installed AppStream applications"
+msgstr "顯示所有安裝的 AppStream 應用程式"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4584
-msgid "Replace screenshots in source file"
-msgstr "替換源檔內的畫面快照"
+#. TRANSLATORS: command line option
+msgid "Show extra debugging information"
+msgstr "顯示額外的除錯用資訊"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4590
-msgid "Add a provide to a source file"
-msgstr "加入提供者到來源檔中"
+#. TRANSLATORS: command line option
+msgid "Show version"
+msgstr "顯示版本"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4596
-msgid "Add a language to a source file"
-msgstr "加入語言到來源檔中"
+msgid "Split an AppStream file to AppData and Metainfo files"
+msgstr "將 AppStream 檔案切分為 AppData 和 Metainfo 檔案"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4602
-msgid "Mirror upstream screenshots"
-msgstr "同步使用上游畫面快照"
+msgid "Test a regular expression"
+msgstr "測試常規表述式"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4608
-msgid "Mirror local firmware files"
-msgstr "同步使用本地端的韌體檔案"
+msgid "Uninstalls AppStream metadata"
+msgstr "解除 AppStream 中介資料的安裝"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4614
-msgid "Incorporate extra metadata from an external file"
-msgstr "從外部檔案整合額外中介資料"
+msgid "Upgrade AppData metadata to the latest version"
+msgstr "將 AppData 中介資料升級至最新版"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4620
-msgid "Compare the contents of two AppStream files"
-msgstr "比較兩份 AppStream 檔案的內容"
+msgid "Validate an AppData or AppStream file"
+msgstr "驗證 AppData 或 AppStream 檔案"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4626
-msgid "Generate a GUID from an input string"
-msgstr "從輸入字串生成 GUID"
+msgid "Validate an AppData or AppStream file (relaxed)"
+msgstr "驗證 AppData 或 AppStream 檔案 (寬鬆檢驗)"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4632
-msgid "Modify an AppData file"
-msgstr "修改 AppData 檔"
+msgid "Validate an AppData or AppStream file (strict)"
+msgstr "驗證 AppData 或 AppStream 檔案 (嚴格檢驗)"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4638
-msgid "Split an AppStream file to AppData and Metainfo files"
-msgstr "將 AppStream 檔案切分為 AppData 和 Metainfo 檔案"
+msgid "Validation failed"
+msgstr "驗證失敗"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4644
-msgid "Merge several files to an AppStream file"
-msgstr "將多個檔案合併成一份 AppStream 檔"
+msgid "Validation of files failed"
+msgstr "檔案驗證失敗"
 
-#. TRANSLATORS: command description
-#: client/as-util.c:4650
-msgid "Import a file to AppStream markup"
-msgstr "匯入檔案到 AppStream 標記"
+msgid "Version:"
+msgstr "版本："
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4656
 msgid "Watch AppStream locations for changes"
 msgstr "監看 AppStream 位置是否有變動"
 
 #. TRANSLATORS: command description
-#: client/as-util.c:4662
-msgid "Compare version numbers"
-msgstr "比較版本號"
-
-#. TRANSLATORS: command description
-#: client/as-util.c:4668
-msgid "Test a regular expression"
-msgstr "測試常規表述式"
-
-#. TRANSLATORS: program name
-#: client/as-util.c:4681
-msgid "AppStream Utility"
-msgstr "AppStream 公用程式"
-
-#: client/as-util.c:4705
-msgid "Version:"
-msgstr "版本："
+msgid "check an installed application"
+msgstr "檢查安裝的應用程式"