From 5c136d85dbf42e56f2ef0e6a60288669bd806c38 Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Tue, 23 Feb 2016 12:56:40 +1000
Subject: Pull translation updates from Transifex

Signed-off-by: Allan McRae <allan@archlinux.org>
---
 lib/libalpm/po/ar.po       |  26 +--
 lib/libalpm/po/br.po       |  42 ++--
 lib/libalpm/po/ca.po       |  53 ++---
 lib/libalpm/po/cs.po       |  26 +--
 lib/libalpm/po/da.po       |  42 ++--
 lib/libalpm/po/de.po       |  52 ++---
 lib/libalpm/po/el.po       |  36 +--
 lib/libalpm/po/en_GB.po    |  21 +-
 lib/libalpm/po/eo.po       |  39 +---
 lib/libalpm/po/es.po       |  65 ++----
 lib/libalpm/po/es_419.po   |  69 ++----
 lib/libalpm/po/fi.po       |  37 +--
 lib/libalpm/po/fr.po       |  67 ++----
 lib/libalpm/po/gl.po       |  64 ++----
 lib/libalpm/po/hr.po       |  58 ++---
 lib/libalpm/po/hu.po       |  36 +--
 lib/libalpm/po/id.po       |  22 +-
 lib/libalpm/po/is.po       |   8 +-
 lib/libalpm/po/it.po       |  65 ++----
 lib/libalpm/po/ja.po       |  37 +--
 lib/libalpm/po/ka.po       |  12 +-
 lib/libalpm/po/kk.po       |  25 +--
 lib/libalpm/po/ko.po       |  19 +-
 lib/libalpm/po/lt.po       |  37 +--
 lib/libalpm/po/nb.po       |  22 +-
 lib/libalpm/po/nl.po       |  30 +--
 lib/libalpm/po/pl.po       |  36 +--
 lib/libalpm/po/pt.po       |  81 +++----
 lib/libalpm/po/pt_BR.po    |  48 ++--
 lib/libalpm/po/ro.po       |  53 ++---
 lib/libalpm/po/ru.po       |  33 +--
 lib/libalpm/po/sk.po       |  34 +--
 lib/libalpm/po/sl.po       |  41 +---
 lib/libalpm/po/sr.po       |  22 +-
 lib/libalpm/po/sr@latin.po |  25 +--
 lib/libalpm/po/sv.po       |  40 +---
 lib/libalpm/po/tr.po       |  48 ++--
 lib/libalpm/po/uk.po       |  30 +--
 lib/libalpm/po/zh_CN.po    |  23 +-
 lib/libalpm/po/zh_TW.po    |  16 +-
 scripts/po/ar.po           | 100 +++++----
 scripts/po/ast.po          |  12 +-
 scripts/po/az_AZ.po        |  97 ++++----
 scripts/po/bg.po           |  12 +-
 scripts/po/br.po           | 290 +++++++++---------------
 scripts/po/ca.po           | 458 +++++++++++++------------------------
 scripts/po/cs.po           | 230 ++++++++-----------
 scripts/po/da.po           | 301 +++++++++++--------------
 scripts/po/de.po           | 455 ++++++++++++-------------------------
 scripts/po/el.po           | 313 ++++++++++----------------
 scripts/po/en_GB.po        | 237 ++++++++-----------
 scripts/po/eo.po           | 298 +++++++++---------------
 scripts/po/es.po           | 458 ++++++++++++-------------------------
 scripts/po/es_419.po       | 429 ++++++++++++-----------------------
 scripts/po/eu.po           |  12 +-
 scripts/po/fi.po           | 208 +++++++----------
 scripts/po/fr.po           | 503 +++++++++++++----------------------------
 scripts/po/gl.po           | 549 ++++++++++++++++-----------------------------
 scripts/po/hr.po           | 103 +++++----
 scripts/po/hu.po           | 345 ++++++++++------------------
 scripts/po/id.po           | 270 ++++++++--------------
 scripts/po/is.po           |  98 ++++----
 scripts/po/it.po           | 360 ++++++++++-------------------
 scripts/po/ja.po           | 280 +++++++++--------------
 scripts/po/ka.po           |  97 ++++----
 scripts/po/kk.po           | 141 ++++++------
 scripts/po/ko.po           | 234 ++++++++-----------
 scripts/po/lt.po           | 330 ++++++++++-----------------
 scripts/po/nb.po           | 281 +++++++++--------------
 scripts/po/nl.po           | 310 +++++++++----------------
 scripts/po/pl.po           | 289 +++++++++---------------
 scripts/po/pt.po           | 509 +++++++++++++++--------------------------
 scripts/po/pt_BR.po        | 423 ++++++++++++----------------------
 scripts/po/ro.po           | 388 +++++++++++---------------------
 scripts/po/ru.po           | 262 ++++++++-------------
 scripts/po/sk.po           | 260 +++++++++------------
 scripts/po/sl.po           | 241 ++++++++------------
 scripts/po/sr.po           | 277 +++++++++--------------
 scripts/po/sr@latin.po     | 281 +++++++++--------------
 scripts/po/sv.po           | 232 ++++++++-----------
 scripts/po/tr.po           | 294 +++++++++---------------
 scripts/po/uk.po           | 301 +++++++++----------------
 scripts/po/uz.po           |  12 +-
 scripts/po/zh_CN.po        | 158 ++++++-------
 scripts/po/zh_TW.po        | 161 ++++++-------
 src/pacman/po/ar.po        | 105 +++------
 src/pacman/po/az_AZ.po     |  28 +--
 src/pacman/po/br.po        | 177 +++++----------
 src/pacman/po/ca.po        | 273 +++++++---------------
 src/pacman/po/cs.po        | 185 +++++----------
 src/pacman/po/da.po        | 196 +++++-----------
 src/pacman/po/de.po        | 241 ++++++--------------
 src/pacman/po/el.po        | 214 ++++++------------
 src/pacman/po/en_GB.po     | 154 ++++---------
 src/pacman/po/eo.po        | 193 +++++-----------
 src/pacman/po/es.po        | 313 +++++++-------------------
 src/pacman/po/es_419.po    | 280 ++++++-----------------
 src/pacman/po/fa.po        |  34 ++-
 src/pacman/po/fi.po        | 205 +++++------------
 src/pacman/po/fr.po        | 264 ++++++----------------
 src/pacman/po/gl.po        | 334 +++++++++------------------
 src/pacman/po/hr.po        | 356 +++++++----------------------
 src/pacman/po/hu.po        | 210 +++++------------
 src/pacman/po/id.po        | 136 ++++-------
 src/pacman/po/is.po        |  23 +-
 src/pacman/po/it.po        | 250 ++++++---------------
 src/pacman/po/ja.po        | 184 +++++----------
 src/pacman/po/ka.po        |  83 +++----
 src/pacman/po/kk.po        | 168 ++++----------
 src/pacman/po/ko.po        | 166 +++++---------
 src/pacman/po/lt.po        | 218 +++++-------------
 src/pacman/po/nb.po        | 175 +++++----------
 src/pacman/po/nl.po        | 233 ++++++-------------
 src/pacman/po/pl.po        | 248 +++++++-------------
 src/pacman/po/pt.po        | 329 +++++++++------------------
 src/pacman/po/pt_BR.po     | 264 ++++++----------------
 src/pacman/po/ro.po        | 247 ++++++--------------
 src/pacman/po/ru.po        | 169 ++++----------
 src/pacman/po/sk.po        | 194 +++++-----------
 src/pacman/po/sl.po        | 190 +++++-----------
 src/pacman/po/sr.po        | 193 +++++-----------
 src/pacman/po/sr@latin.po  | 197 +++++-----------
 src/pacman/po/sv.po        | 182 +++++----------
 src/pacman/po/th.po        |  22 +-
 src/pacman/po/tr.po        | 263 ++++++++--------------
 src/pacman/po/uk.po        | 209 ++++++-----------
 src/pacman/po/vi.po        |  22 +-
 src/pacman/po/zh_CN.po     |  80 +++----
 src/pacman/po/zh_TW.po     |  88 +++-----
 129 files changed, 7324 insertions(+), 14410 deletions(-)

diff --git a/lib/libalpm/po/ar.po b/lib/libalpm/po/ar.po
index 390fcbc5..8a9454f2 100644
--- a/lib/libalpm/po/ar.po
+++ b/lib/libalpm/po/ar.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # kraim <biskraim@gmail.com>, 2013
 # سند <0otibi0@gmail.com>, 2013
@@ -19,14 +19,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-18 18:30+0000\n"
 "Last-Translator: صفا الفليج <safaalfulaij@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ar/)\n"
-"Language: ar\n"
+"Language-Team: Arabic (http://www.transifex.com/toofishes/archlinux-pacman/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: lib/libalpm/add.c:86
 #, c-format
@@ -73,18 +71,14 @@ msgstr ""
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"صلاحيات المجلد تختلف عن %s\n"
-"نظام الملفات: %o  الحزمة: %o\n"
+msgstr "صلاحيات المجلد تختلف عن %s\nنظام الملفات: %o  الحزمة: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"ملكية المجلد تختلف عن  %s\n"
-"ملفات النظام: %u:%u الحزمة: %u:%u\n"
+msgstr "ملكية المجلد تختلف عن  %s\nملفات النظام: %u:%u الحزمة: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -674,9 +668,7 @@ msgstr "يجري حذف %s من قائمة الأهداف\n"
 #: lib/libalpm/remove.c:343
 #, c-format
 msgid "cannot remove file '%s': %s\n"
-msgstr ""
-"تعذر إزالة  الملف '%s': %s\n"
-"\n"
+msgstr "تعذر إزالة  الملف '%s': %s\n\n"
 
 #: lib/libalpm/remove.c:383
 #, c-format
@@ -776,9 +768,7 @@ msgstr "تعذّر نسخ الملف المؤقّت إلى %s (%s)\n"
 #: lib/libalpm/trans.c:404
 #, c-format
 msgid "could not remove %s\n"
-msgstr ""
-"تعذر إزالة %s\n"
-"\n"
+msgstr "تعذر إزالة %s\n\n"
 
 #: lib/libalpm/trans.c:408
 #, c-format
diff --git a/lib/libalpm/po/br.po b/lib/libalpm/po/br.po
index 96e53675..bf43f9c0 100644
--- a/lib/libalpm/po/br.po
+++ b/lib/libalpm/po/br.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Gwenn M <tornoz@laposte.net>, 2015
 # Gwenn M <tornoz@laposte.net>, 2015
@@ -12,12 +12,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-17 23:31+0000\n"
 "Last-Translator: Gwenn M <tornoz@laposte.net>\n"
-"Language-Team: Breton (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/br/)\n"
-"Language: br\n"
+"Language-Team: Breton (http://www.transifex.com/toofishes/archlinux-pacman/language/br/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -53,9 +52,7 @@ msgstr "n'haller ket adenvel %s e %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"n'eo ket bet kavet ar restr er roll restroù evit ar pakad %s. o tremen "
-"eztennadur %s\n"
+msgstr "n'eo ket bet kavet ar restr er roll restroù evit ar pakad %s. o tremen eztennadur %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -67,18 +64,14 @@ msgstr "n'haller ket eztennañ %s%s : re hir eo an treug"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"disheñvel eo an aotreoù kavlec'hioù war %s\n"
-"reizhad restroù : %o pakad : %o\n"
+msgstr "disheñvel eo an aotreoù kavlec'hioù war %s\nreizhad restroù : %o pakad : %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"disheñvel eo perc'henniezh ar c'havlec'hioù evit %s\n"
-"reizhad restroù : %u:%u pakad : %u:%u\n"
+msgstr "disheñvel eo perc'henniezh ar c'havlec'hioù evit %s\nreizhad restroù : %u:%u pakad : %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -172,8 +165,7 @@ msgstr "digantalc'hek eo ar stlennvon %s : digenglotus eo anvioù ar pakad %s\n"
 #: lib/libalpm/be_local.c:718 lib/libalpm/be_sync.c:636
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"digantalc'hek eo ar stlennvon %s : digenglotus eo handelvioù ar pakad %s\n"
+msgstr "digantalc'hek eo ar stlennvon %s : digenglotus eo handelvioù ar pakad %s\n"
 
 #: lib/libalpm/be_local.c:759
 #, c-format
@@ -234,14 +226,12 @@ msgstr "o dilemel ar restr direizh : %s\n"
 #: lib/libalpm/be_sync.c:502
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"n'haller ket dezrannañ ar restr deskrivadur pakadoù '%s' adalek ar sv '%s'\n"
+msgstr "n'haller ket dezrannañ ar restr deskrivadur pakadoù '%s' adalek ar sv '%s'\n"
 
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"digantalc'hek eo ar stlennvon %s : didalvoudek eo anv restr ar pakad %s\n"
+msgstr "digantalc'hek eo ar stlennvon %s : didalvoudek eo anv restr ar pakad %s\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
@@ -311,8 +301,7 @@ msgstr "n'haller ket despizañ ar poentoù kenstrollañ evit ar restr %s\n"
 #: lib/libalpm/diskspace.c:354
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %ju blocks free\n"
-msgstr ""
-"Re leun eo ar parzhad %s : %jd a vloc'hoù dleet, %ju a vloc'hoù dieub\n"
+msgstr "Re leun eo ar parzhad %s : %jd a vloc'hoù dleet, %ju a vloc'hoù dieub\n"
 
 #: lib/libalpm/diskspace.c:379 lib/libalpm/diskspace.c:433
 #, c-format
@@ -357,9 +346,7 @@ msgstr "fazi en ur adkavout ar restr '%s' adalek %s : %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"fazi en ur adkavout ar restr '%s' adalek %s : re vras eo ment ar "
-"pellgargadur\n"
+msgstr "fazi en ur adkavout ar restr '%s' adalek %s : re vras eo ment ar pellgargadur\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -514,8 +501,7 @@ msgstr "n'eo ket kenglotus an oberatadenn gant doare an treuzkas"
 #: lib/libalpm/error.c:102
 #, c-format
 msgid "transaction commit attempt when database is not locked"
-msgstr ""
-"klasket eo bet erounit an treuzkas padal ne oa ket prennet ar stlennvon"
+msgstr "klasket eo bet erounit an treuzkas padal ne oa ket prennet ar stlennvon"
 
 #: lib/libalpm/error.c:104
 #, c-format
@@ -845,6 +831,4 @@ msgstr "n'eus krubuilh %s ebet, o krouiñ...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"n'haller ket kavout pe implijout ar c'hrubuilh pakad, oc'h implijout %s e "
-"plas\n"
+msgstr "n'haller ket kavout pe implijout ar c'hrubuilh pakad, oc'h implijout %s e plas\n"
diff --git a/lib/libalpm/po/ca.po b/lib/libalpm/po/ca.po
index 0175991d..d5f32107 100644
--- a/lib/libalpm/po/ca.po
+++ b/lib/libalpm/po/ca.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Alberto Sánchez Molero <alsamolero@gmail.com>, 2013
 # Dan McGee <dpmcgee@gmail.com>, 2011
@@ -19,12 +19,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-09 16:51+0000\n"
 "Last-Translator: Davidmp <medipas@gmail.com>\n"
-"Language-Team: Catalan (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ca/)\n"
-"Language: ca\n"
+"Language-Team: Catalan (http://www.transifex.com/toofishes/archlinux-pacman/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -60,9 +59,7 @@ msgstr "no s'ha pogut canviar el nom %s a %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"fitxer no trobat a la llista de fitxers per al paquet %s. S'omet l'extracció "
-"de %s\n"
+msgstr "fitxer no trobat a la llista de fitxers per al paquet %s. S'omet l'extracció de %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -74,18 +71,14 @@ msgstr "no es pot extreure %s%s: camí massa llarg"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"els permisos del directori difereixen a %s\n"
-"sistema de fitxers: %o paquet: %o\n"
+msgstr "els permisos del directori difereixen a %s\nsistema de fitxers: %o paquet: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"els permisos del directori difereixen a %s\n"
-"sistema de fitxers: %u:%u paquet: %u:%u\n"
+msgstr "els permisos del directori difereixen a %s\nsistema de fitxers: %u:%u paquet: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -240,9 +233,7 @@ msgstr "s'està esborrant el fitxer no vàlid: %s\n"
 #: lib/libalpm/be_sync.c:502
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"no s'ha pogut analitzar el fitxer de descripció de paquet \"%s\" de la base "
-"de dades \"%s'\"\n"
+msgstr "no s'ha pogut analitzar el fitxer de descripció de paquet \"%s\" de la base de dades \"%s'\"\n"
 
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
@@ -252,8 +243,7 @@ msgstr "La base de dades %s és inconsistent: nom erroni al paquet %s\\n\n"
 #: lib/libalpm/be_sync.c:545
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
-msgstr ""
-"La base de dades %s és inconsistent: el nom del paquet %s és massa llarg\\n\n"
+msgstr "La base de dades %s és inconsistent: el nom del paquet %s és massa llarg\\n\n"
 
 #: lib/libalpm/be_sync.c:611
 #, c-format
@@ -318,14 +308,12 @@ msgstr "no s'ha pogut determinar el punt de muntatge per al fitxer %s\n"
 #: lib/libalpm/diskspace.c:354
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %ju blocks free\n"
-msgstr ""
-"La partició %s és massa plena: %jd blocs necessaris, %ju blocs lliures\n"
+msgstr "La partició %s és massa plena: %jd blocs necessaris, %ju blocs lliures\n"
 
 #: lib/libalpm/diskspace.c:379 lib/libalpm/diskspace.c:433
 #, c-format
 msgid "could not determine filesystem mount points\n"
-msgstr ""
-"no s'han pogut determinar els punts de muntatge dels sistemes de fitxers\n"
+msgstr "no s'han pogut determinar els punts de muntatge dels sistemes de fitxers\n"
 
 #: lib/libalpm/diskspace.c:385
 #, c-format
@@ -335,8 +323,7 @@ msgstr "no s'ha pogut determinar el punt de muntatge cachedir %s\n"
 #: lib/libalpm/diskspace.c:438
 #, c-format
 msgid "could not determine root mount point %s\n"
-msgstr ""
-"no s'ha pogut determinar el punt de muntatge del directori d'arrel %s\n"
+msgstr "no s'ha pogut determinar el punt de muntatge del directori d'arrel %s\n"
 
 #: lib/libalpm/diskspace.c:486
 #, c-format
@@ -366,9 +353,7 @@ msgstr "ha fallat l'obtenció del fitxer \"%s\" des de %s: %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"ha fallat l'obtenció del fitxer \"%s\" des de %s: mida de la descàrrega "
-"superior a l'esperada\n"
+msgstr "ha fallat l'obtenció del fitxer \"%s\" des de %s: mida de la descàrrega superior a l'esperada\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -523,8 +508,7 @@ msgstr "l'operació no és compatible amb el tipus de transacció"
 #: lib/libalpm/error.c:102
 #, c-format
 msgid "transaction commit attempt when database is not locked"
-msgstr ""
-"intent de publicació de la transacció amb la base de dades no bloquejada"
+msgstr "intent de publicació de la transacció amb la base de dades no bloquejada"
 
 #: lib/libalpm/error.c:104
 #, c-format
@@ -669,8 +653,7 @@ msgstr "no s'ha pogut eliminar el fitxer de bloqueig %s\n"
 #: lib/libalpm/package.c:568
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr ""
-"no s'han pogut carregar completament les metadades per al paquet %s-%s\n"
+msgstr "no s'han pogut carregar completament les metadades per al paquet %s-%s\n"
 
 #: lib/libalpm/remove.c:118
 #, c-format
@@ -745,9 +728,7 @@ msgstr "s'ha detectat un paquet amb un conflicte impossible de resoldre\n"
 #: lib/libalpm/sync.c:556
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr ""
-"s'està eliminant \"%s\" de la llista d'objectius perquè té conflictes amb "
-"\"%s\"\n"
+msgstr "s'està eliminant \"%s\" de la llista d'objectius perquè té conflictes amb \"%s\"\n"
 
 #: lib/libalpm/sync.c:1014
 #, c-format
@@ -857,6 +838,4 @@ msgstr "no existeix la memòria cau %s, s'està creant...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"no s'ha trobat o creat el paquet de memòria cau, s'està usant "
-"alternativament %s\n"
+msgstr "no s'ha trobat o creat el paquet de memòria cau, s'està usant alternativament %s\n"
diff --git a/lib/libalpm/po/cs.po b/lib/libalpm/po/cs.po
index 9fb4df61..44fdd415 100644
--- a/lib/libalpm/po/cs.po
+++ b/lib/libalpm/po/cs.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011
 # David Kolibáč <david@kolibac.cz>, 2011
@@ -18,12 +18,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-12 18:41+0000\n"
 "Last-Translator: Jaroslav Lichtblau <dragonlord@seznam.cz>\n"
-"Language-Team: Czech (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/cs/)\n"
-"Language: cs\n"
+"Language-Team: Czech (http://www.transifex.com/toofishes/archlinux-pacman/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: lib/libalpm/add.c:86
@@ -59,8 +58,7 @@ msgstr "nelze přejmenovat %s na %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"soubor nenalezen v seznamu souborů balíčku %s. přeskakuje se rozbalení %s\n"
+msgstr "soubor nenalezen v seznamu souborů balíčku %s. přeskakuje se rozbalení %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -72,18 +70,14 @@ msgstr "nelze rozbalit %s%s: příliš dlouhá cesta"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"přístupová práva adresáře %s se neshodují\n"
-"souborový systém: %o   balíček: %o\n"
+msgstr "přístupová práva adresáře %s se neshodují\nsouborový systém: %o   balíček: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"rozdílný vlastník adresáře %s\n"
-"souborový systém: %u:%u balíček: %u:%u\n"
+msgstr "rozdílný vlastník adresáře %s\nsouborový systém: %u:%u balíček: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -358,9 +352,7 @@ msgstr "selhalo získání souboru '%s' z %s: %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"selhalo získání souboru '%s' z %s : překročení očekávané velikosti "
-"stahování\n"
+msgstr "selhalo získání souboru '%s' z %s : překročení očekávané velikosti stahování\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -845,6 +837,4 @@ msgstr "neexistuje mezipaměť %s, vytváří se...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"nepodařilo se najít nebo vytvořit mezipaměť pro balíčky, používám místo toho "
-"%s\n"
+msgstr "nepodařilo se najít nebo vytvořit mezipaměť pro balíčky, používám místo toho %s\n"
diff --git a/lib/libalpm/po/da.po b/lib/libalpm/po/da.po
index a775dfe2..3544d9b7 100644
--- a/lib/libalpm/po/da.po
+++ b/lib/libalpm/po/da.po
@@ -1,10 +1,10 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Chris Darnell <chris@cedeel.com>, 2013
-# Chris Darnell <chris@cedeel.com>, 2013-2014
+# Chris Darnell <chris@cedeel.com>, 2013-2014,2016
 # jakobw <jakob.wadsager@gmail.com>, 2012
 # jakobw <jakob.wadsager@gmail.com>, 2012
 # Joe Hansen <joedalton2@yahoo.dk>, 2011,2013
@@ -13,14 +13,13 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
-"PO-Revision-Date: 2015-12-09 06:03+0000\n"
-"Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Danish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/da/)\n"
-"Language: da\n"
+"PO-Revision-Date: 2016-02-22 22:03+0000\n"
+"Last-Translator: Chris Darnell <chris@cedeel.com>\n"
+"Language-Team: Danish (http://www.transifex.com/toofishes/archlinux-pacman/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -56,31 +55,26 @@ msgstr "kunne ikke omdøbe %s til %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"fil ikke fundet i fillisten for pakke %s. springer over udpakkelse af %s\n"
+msgstr "fil ikke fundet i fillisten for pakke %s. springer over udpakkelse af %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
 msgid "unable to extract %s%s: path too long"
-msgstr ""
+msgstr "kan ikke pakke %s%s ud: sti for lang"
 
 #: lib/libalpm/add.c:241
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"mapperettigheder er forskellige for %s\n"
-"filsystem: %o  pakke: %o\n"
+msgstr "mapperettigheder er forskellige for %s\nfilsystem: %o  pakke: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"mapperettigheder er forskellige for %s\n"
-"filsystem: %u:%u pakke: %u:%u\n"
+msgstr "mapperettigheder er forskellige for %s\nfilsystem: %u:%u pakke: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -90,7 +84,7 @@ msgstr "udtræk: overskriver ikke mappe med fil %s\n"
 #: lib/libalpm/add.c:300
 #, c-format
 msgid "unable to extract %s.pacnew: path too long"
-msgstr ""
+msgstr "kan ikke pakke %s.pacnew ud: sti for lang"
 
 #: lib/libalpm/add.c:501 lib/libalpm/util.c:331 lib/libalpm/util.c:567
 #, c-format
@@ -300,7 +294,7 @@ msgstr "kunne ikke hente filsysteminformation\n"
 #: lib/libalpm/diskspace.c:242
 #, c-format
 msgid "could not get file information for %s\n"
-msgstr ""
+msgstr "kunne ikke hente filinformation for %s\n"
 
 #: lib/libalpm/diskspace.c:256 lib/libalpm/diskspace.c:315
 #, c-format
@@ -310,7 +304,7 @@ msgstr "kunne ikke bestemme monteringspunkt for fil %s\n"
 #: lib/libalpm/diskspace.c:354
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %ju blocks free\n"
-msgstr ""
+msgstr "Partition %s for fuld: %jd blokke nødvendige, %ju blokke frie\n"
 
 #: lib/libalpm/diskspace.c:379 lib/libalpm/diskspace.c:433
 #, c-format
@@ -355,9 +349,7 @@ msgstr "fejlede i indhentning af fil '%s' fra %s: %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"kunne ikke indhente fil '%s' fra %s: forventet downloadstørrelse "
-"overskredet\n"
+msgstr "kunne ikke indhente fil '%s' fra %s: forventet downloadstørrelse overskredet\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -517,7 +509,7 @@ msgstr "forsøg på transaktionsindsendelse (commit) når database ikke er låst
 #: lib/libalpm/error.c:104
 #, c-format
 msgid "failed to run transaction hooks"
-msgstr ""
+msgstr "kunne ikke køre transaktionskroge"
 
 #: lib/libalpm/error.c:107
 #, c-format
@@ -787,12 +779,12 @@ msgstr "kunne ikke køre (stat) fil %s: %s\n"
 #: lib/libalpm/util.c:483
 #, c-format
 msgid "unable to write to pipe (%s)\n"
-msgstr ""
+msgstr "kan ikke skrive til pipe (%s)\n"
 
 #: lib/libalpm/util.c:542
 #, c-format
 msgid "unable to read from pipe (%s)\n"
-msgstr ""
+msgstr "kan ikke læse fra pipe (%s)\n"
 
 #: lib/libalpm/util.c:584 lib/libalpm/util.c:590
 #, c-format
diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po
index 7b9ee9f4..25df7f06 100644
--- a/lib/libalpm/po/de.po
+++ b/lib/libalpm/po/de.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011
 # Jakob Gahde (J5lx) <j5lx@fmail.co.uk>, 2014-2015
@@ -20,12 +20,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-31 13:17+0000\n"
 "Last-Translator: Jakob Gahde (J5lx) <j5lx@fmail.co.uk>\n"
-"Language-Team: German (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/de/)\n"
-"Language: de\n"
+"Language-Team: German (http://www.transifex.com/toofishes/archlinux-pacman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -61,9 +60,7 @@ msgstr "Konnte %s nicht in %s umbenennen (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"Datei nicht in Dateiliste des Pakets %s gefunden. Überspringe Entpacken von "
-"%s\n"
+msgstr "Datei nicht in Dateiliste des Pakets %s gefunden. Überspringe Entpacken von %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -75,18 +72,14 @@ msgstr "konnte %s%s nicht entpacken: Pfad zu lang"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"Verzeichnis-Berechtigungen unterscheiden sich für %s\n"
-"Dateisystem: %o  Paket: %o\n"
+msgstr "Verzeichnis-Berechtigungen unterscheiden sich für %s\nDateisystem: %o  Paket: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"Verzeichnis-Eigentümer unterscheidet sich für %s\n"
-"Dateisystem: %u:%u  Paket: %u:%u\n"
+msgstr "Verzeichnis-Eigentümer unterscheidet sich für %s\nDateisystem: %u:%u  Paket: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -175,16 +168,12 @@ msgstr "Konnte Datei %s nicht öffnen: %s\n"
 #: lib/libalpm/be_local.c:712 lib/libalpm/be_sync.c:630
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-"Die Datenbank von %s ist inkonsistent: Die Paketnamen für %s stimmen nicht "
-"überein\n"
+msgstr "Die Datenbank von %s ist inkonsistent: Die Paketnamen für %s stimmen nicht überein\n"
 
 #: lib/libalpm/be_local.c:718 lib/libalpm/be_sync.c:636
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"Die Datenbank von %s ist inkonsistent: Die Versionsnummern für das Paket %s "
-"stimmen nicht überein\n"
+msgstr "Die Datenbank von %s ist inkonsistent: Die Versionsnummern für das Paket %s stimmen nicht überein\n"
 
 #: lib/libalpm/be_local.c:759
 #, c-format
@@ -245,22 +234,17 @@ msgstr "Entferne ungültige Datei: %s\n"
 #: lib/libalpm/be_sync.c:502
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"Konnte Paket-Beschreibungsdatei '%s' der Datenbank '%s' nicht analysieren\n"
+msgstr "Konnte Paket-Beschreibungsdatei '%s' der Datenbank '%s' nicht analysieren\n"
 
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"Datenbank %s ist inkonsistent: Der Dateiname des Paketes %s ist nicht "
-"erlaubt\n"
+msgstr "Datenbank %s ist inkonsistent: Der Dateiname des Paketes %s ist nicht erlaubt\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
-msgstr ""
-"Die Datenbank von %s ist inkonsistent: Der Dateiname des Paketes %s ist zu "
-"lang\n"
+msgstr "Die Datenbank von %s ist inkonsistent: Der Dateiname des Paketes %s ist zu lang\n"
 
 #: lib/libalpm/be_sync.c:611
 #, c-format
@@ -325,9 +309,7 @@ msgstr "Konnte keinen Einhänge-Punkt für die Datei %s ermitteln\n"
 #: lib/libalpm/diskspace.c:354
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %ju blocks free\n"
-msgstr ""
-"Partition %s ist überfüllt: %jd Blöcke werden benötigt, %ju Blöcke sind "
-"frei\n"
+msgstr "Partition %s ist überfüllt: %jd Blöcke werden benötigt, %ju Blöcke sind frei\n"
 
 #: lib/libalpm/diskspace.c:379 lib/libalpm/diskspace.c:433
 #, c-format
@@ -372,9 +354,7 @@ msgstr "Konnte Datei '%s' nicht von %s übertragen : %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"Konnte Datei '%s' nicht von %s empfangen: Erwartete Downloadgröße "
-"überschritten\n"
+msgstr "Konnte Datei '%s' nicht von %s empfangen: Erwartete Downloadgröße überschritten\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -529,8 +509,7 @@ msgstr "Operation nicht mit dem Vorgangs-Typ kompatibel"
 #: lib/libalpm/error.c:102
 #, c-format
 msgid "transaction commit attempt when database is not locked"
-msgstr ""
-"Vorgang sollte übertragen werden, während die Datenbank nicht geschlossen war"
+msgstr "Vorgang sollte übertragen werden, während die Datenbank nicht geschlossen war"
 
 #: lib/libalpm/error.c:104
 #, c-format
@@ -860,5 +839,4 @@ msgstr "Es existiert kein %s-Puffer, erstelle...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"Konnte den Paket-Puffer nicht finden oder erstellen, benutze stattdessen %s\n"
+msgstr "Konnte den Paket-Puffer nicht finden oder erstellen, benutze stattdessen %s\n"
diff --git a/lib/libalpm/po/el.po b/lib/libalpm/po/el.po
index fc0121c2..cb6a58b2 100644
--- a/lib/libalpm/po/el.po
+++ b/lib/libalpm/po/el.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Achilleas Pipinellis, 2013-2014
 # Achilleas Pipinellis, 2014
@@ -20,12 +20,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-09 08:28+0000\n"
 "Last-Translator: ifaigios <ifaigios@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/el/)\n"
-"Language: el\n"
+"Language-Team: Greek (http://www.transifex.com/toofishes/archlinux-pacman/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -61,9 +60,7 @@ msgstr "αδυναμία μετονομασίας %s σε %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"αρχείο δεν βρέθηκε στην λίστα αρχείων του πακέτου %s. παράλειψη εξαγωγής του "
-"%s\n"
+msgstr "αρχείο δεν βρέθηκε στην λίστα αρχείων του πακέτου %s. παράλειψη εξαγωγής του %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -75,18 +72,14 @@ msgstr "αδυναμία εξαγωγής %s%s: πολύ μεγάλο μήκος
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"τα δικαιώματα καταλόγου διαφέρουν στο %s\n"
-"σύστημα αρχείων: %o  πακέτο: %o\n"
+msgstr "τα δικαιώματα καταλόγου διαφέρουν στο %s\nσύστημα αρχείων: %o  πακέτο: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"κυριότητα καταλόγου διαφορετική από του %s\n"
-"σύστημα αρχείων: %u:%u πακέτου: %u:%u\n"
+msgstr "κυριότητα καταλόγου διαφορετική από του %s\nσύστημα αρχείων: %u:%u πακέτου: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -231,9 +224,7 @@ msgstr "αδυναμία ανάγνωσης αρχείου υπογραφής: %
 #: lib/libalpm/be_package.c:764 lib/libalpm/sync.c:1108
 #, c-format
 msgid "required key missing from keyring\n"
-msgstr ""
-"απόν κλειδί από τον κλειδούχο\n"
-"\n"
+msgstr "απόν κλειδί από τον κλειδούχο\n\n"
 
 #: lib/libalpm/be_sync.c:62
 #, c-format
@@ -243,8 +234,7 @@ msgstr "διαγραφή άκυρου αρχείου: %s\n"
 #: lib/libalpm/be_sync.c:502
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"αδυναμία ανάλυσης αρχείου περιγραφής πακέτου '%s' στη βάση δεδομένων '%s'\n"
+msgstr "αδυναμία ανάλυσης αρχείου περιγραφής πακέτου '%s' στη βάση δεδομένων '%s'\n"
 
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
@@ -309,9 +299,7 @@ msgstr "αδυναμία λήψης πληροφοριών συστήματος
 #: lib/libalpm/diskspace.c:242
 #, c-format
 msgid "could not get file information for %s\n"
-msgstr ""
-"αδυναμία λήψης πληροφοριών αρχείου για το %s:\n"
-"\n"
+msgstr "αδυναμία λήψης πληροφοριών αρχείου για το %s:\n\n"
 
 #: lib/libalpm/diskspace.c:256 lib/libalpm/diskspace.c:315
 #, c-format
@@ -366,8 +354,7 @@ msgstr "αποτυχία λήψης αρχείου '%s' από %s : %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"αποτυχία λήψης αρχείου '%s' από %s : υπέρβαση αναμενομένου μεγέθους λήψης\n"
+msgstr "αποτυχία λήψης αρχείου '%s' από %s : υπέρβαση αναμενομένου μεγέθους λήψης\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -742,8 +729,7 @@ msgstr "εντοπισμός ανεπίλυτων διενέξεων πακέτ
 #: lib/libalpm/sync.c:556
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr ""
-"αφαίρεση του '%s' από την λίστα διεκπεραίωσης λόγω διένεξης με το '%s'\n"
+msgstr "αφαίρεση του '%s' από την λίστα διεκπεραίωσης λόγω διένεξης με το '%s'\n"
 
 #: lib/libalpm/sync.c:1014
 #, c-format
diff --git a/lib/libalpm/po/en_GB.po b/lib/libalpm/po/en_GB.po
index 9c9f10a4..0fcb0500 100644
--- a/lib/libalpm/po/en_GB.po
+++ b/lib/libalpm/po/en_GB.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Allan McRae <allan@archlinux.org>, 2013
 # Allan McRae <allan@archlinux.org>, 2013-2015
@@ -13,12 +13,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-09 06:13+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/en_GB/)\n"
-"Language: en_GB\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/toofishes/archlinux-pacman/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -54,8 +53,7 @@ msgstr "could not rename %s to %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"file not found in file list for package %s. skipping extraction of %s\n"
+msgstr "file not found in file list for package %s. skipping extraction of %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -67,18 +65,14 @@ msgstr "unable to extract %s%s: path too long"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"directory permissions differ on %s\n"
-"filesystem: %o  package: %o\n"
+msgstr "directory permissions differ on %s\nfilesystem: %o  package: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"directory ownership differs on %s\n"
-"filesystem: %u:%u  package: %u:%u\n"
+msgstr "directory ownership differs on %s\nfilesystem: %u:%u  package: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -353,8 +347,7 @@ msgstr "failed retrieving file '%s' from %s : %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"failed retrieving file '%s' from %s : expected download size exceeded\n"
+msgstr "failed retrieving file '%s' from %s : expected download size exceeded\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
diff --git a/lib/libalpm/po/eo.po b/lib/libalpm/po/eo.po
index ac9dfb77..91222d7f 100644
--- a/lib/libalpm/po/eo.po
+++ b/lib/libalpm/po/eo.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # pizzaiolo, 2015
 # pizzaiolo, 2015
@@ -13,12 +13,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-25 12:27+0000\n"
 "Last-Translator: pizzaiolo\n"
-"Language-Team: Esperanto (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/eo/)\n"
-"Language: eo\n"
+"Language-Team: Esperanto (http://www.transifex.com/toofishes/archlinux-pacman/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -54,9 +53,7 @@ msgstr "ne eblis renomi %s al %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"dosiero ne trovita en la dosierlisto por pakaĵo %s. preterpasante eltirado "
-"de %s\n"
+msgstr "dosiero ne trovita en la dosierlisto por pakaĵo %s. preterpasante eltirado de %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -68,18 +65,14 @@ msgstr "ne eblis eltiri %s%s: la dosierindiko estas tro longa"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"dosierujaj permesoj malsamas en\n"
-"dosiersistemo %s: pakaĵo %o: %o\n"
+msgstr "dosierujaj permesoj malsamas en\ndosiersistemo %s: pakaĵo %o: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"dosieruja posedo malsamas en\n"
-"dosiersistemo %s: %u:%u pakaĵo: %u:%u\n"
+msgstr "dosieruja posedo malsamas en\ndosiersistemo %s: %u:%u pakaĵo: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -239,16 +232,12 @@ msgstr "ne eblis analizi priskriba dosiero de la pakaĵo '%s' el db '%s'\n"
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"la datumbazo %s estas malkongrua: la dosiernomo de pakaĵo %s estas "
-"malpermesata\n"
+msgstr "la datumbazo %s estas malkongrua: la dosiernomo de pakaĵo %s estas malpermesata\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
-msgstr ""
-"la datumbazo %s estas malkongrua: la dosiernomo de pakaĵo %s estas tro "
-"longa\n"
+msgstr "la datumbazo %s estas malkongrua: la dosiernomo de pakaĵo %s estas tro longa\n"
 
 #: lib/libalpm/be_sync.c:611
 #, c-format
@@ -313,9 +302,7 @@ msgstr "ne eblis scii surmetingon pri dosiero %s\n"
 #: lib/libalpm/diskspace.c:354
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %ju blocks free\n"
-msgstr ""
-"La subdisko %s estas tro plena: %jd blokoj bezonataj, %ju blokoj "
-"malokupataj\n"
+msgstr "La subdisko %s estas tro plena: %jd blokoj bezonataj, %ju blokoj malokupataj\n"
 
 #: lib/libalpm/diskspace.c:379 lib/libalpm/diskspace.c:433
 #, c-format
@@ -360,9 +347,7 @@ msgstr "malsukcesis ricevi dosieron '%s' de %s: %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"malsukcesis ricevi dosieron '%s' de %s: atendita elŝuta grando grandigis\n"
-"\n"
+msgstr "malsukcesis ricevi dosieron '%s' de %s: atendita elŝuta grando grandigis\n\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -757,9 +742,7 @@ msgstr "ne estas sufiĉe granda malokupata diskspaco\n"
 #: lib/libalpm/sync.c:1398
 #, c-format
 msgid "could not commit removal transaction\n"
-msgstr ""
-"malsukcesis enmeti forigan transakcion\n"
-"\n"
+msgstr "malsukcesis enmeti forigan transakcion\n\n"
 
 #: lib/libalpm/sync.c:1406
 #, c-format
diff --git a/lib/libalpm/po/es.po b/lib/libalpm/po/es.po
index ac448533..b7db69e3 100644
--- a/lib/libalpm/po/es.po
+++ b/lib/libalpm/po/es.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Angel Velasquez <angvp@archlinux.org>, 2011
 # Dan McGee <dpmcgee@gmail.com>, 2011
@@ -22,12 +22,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-19 21:49+0000\n"
 "Last-Translator: Pedro Román <roizheim@gmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/es/)\n"
-"Language: es\n"
+"Language-Team: Spanish (http://www.transifex.com/toofishes/archlinux-pacman/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -63,9 +62,7 @@ msgstr "no se pudo renombrar %s a %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"el archivo no figura en la lista de archivos del paquete %s. Omitiendo la "
-"extracción de %s\n"
+msgstr "el archivo no figura en la lista de archivos del paquete %s. Omitiendo la extracción de %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -77,18 +74,14 @@ msgstr "no se pudo extraer %s%s: ruta demasiado larga"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"los permisos del directorio difieren respecto de %s\n"
-"sistema de archivos: %o   paquete: %o\n"
+msgstr "los permisos del directorio difieren respecto de %s\nsistema de archivos: %o   paquete: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"la propiedad del directorio difiere respecto de %s\n"
-"sistema de archivos: %u:%u  paquete: %u:%u\n"
+msgstr "la propiedad del directorio difiere respecto de %s\nsistema de archivos: %u:%u  paquete: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -177,16 +170,12 @@ msgstr "no se pudo abrir el archivo %s: %s\n"
 #: lib/libalpm/be_local.c:712 lib/libalpm/be_sync.c:630
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-"la base de datos %s es inconsistente: nombre mal emparejado en el paquete "
-"%s\n"
+msgstr "la base de datos %s es inconsistente: nombre mal emparejado en el paquete %s\n"
 
 #: lib/libalpm/be_local.c:718 lib/libalpm/be_sync.c:636
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"la base de datos %s es inconsistente: versión mal emparejada en el paquete "
-"%s\n"
+msgstr "la base de datos %s es inconsistente: versión mal emparejada en el paquete %s\n"
 
 #: lib/libalpm/be_local.c:759
 #, c-format
@@ -247,23 +236,17 @@ msgstr "eliminando archivo no válido: %s\n"
 #: lib/libalpm/be_sync.c:502
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"no se pudo analizar el archivo de descripción del paquete «%s» de la base de "
-"datos «%s»\n"
+msgstr "no se pudo analizar el archivo de descripción del paquete «%s» de la base de datos «%s»\n"
 
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"la base de datos %s es inconsistente: el nombre del archivo del paquete %s "
-"es ilegal\n"
+msgstr "la base de datos %s es inconsistente: el nombre del archivo del paquete %s es ilegal\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
-msgstr ""
-"la base de datos %s es inconsistente: el nombre del archivo del paquete %s "
-"es demasiado largo\n"
+msgstr "la base de datos %s es inconsistente: el nombre del archivo del paquete %s es demasiado largo\n"
 
 #: lib/libalpm/be_sync.c:611
 #, c-format
@@ -328,9 +311,7 @@ msgstr "no se pudo determinar el punto de montaje para el archivo %s\n"
 #: lib/libalpm/diskspace.c:354
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %ju blocks free\n"
-msgstr ""
-"Partición %s demasiado llena: se necesitan %jd bloques, hay %ju bloques "
-"libres\n"
+msgstr "Partición %s demasiado llena: se necesitan %jd bloques, hay %ju bloques libres\n"
 
 #: lib/libalpm/diskspace.c:379 lib/libalpm/diskspace.c:433
 #, c-format
@@ -340,9 +321,7 @@ msgstr "no se puede determinar el punto de montaje del sistema de archivos\n"
 #: lib/libalpm/diskspace.c:385
 #, c-format
 msgid "could not determine cachedir mount point %s\n"
-msgstr ""
-"no se pudo determinar el punto de montaje del directorio de la memoria caché "
-"%s\n"
+msgstr "no se pudo determinar el punto de montaje del directorio de la memoria caché %s\n"
 
 #: lib/libalpm/diskspace.c:438
 #, c-format
@@ -377,9 +356,7 @@ msgstr "no se pudo obtener el archivo «%s» desde %s: %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"no se pudo obtener el archivo «%s» desde %s : tamaño de la descarga superior "
-"del esperado\n"
+msgstr "no se pudo obtener el archivo «%s» desde %s : tamaño de la descarga superior del esperado\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -534,8 +511,7 @@ msgstr "la operación no es compatible con el tipo de transacción"
 #: lib/libalpm/error.c:102
 #, c-format
 msgid "transaction commit attempt when database is not locked"
-msgstr ""
-"intento de realizar la operación cuando la base de datos no está bloqueada"
+msgstr "intento de realizar la operación cuando la base de datos no está bloqueada"
 
 #: lib/libalpm/error.c:104
 #, c-format
@@ -680,8 +656,7 @@ msgstr "no se pudo quitar el archivo de bloqueo %s\n"
 #: lib/libalpm/package.c:568
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr ""
-"no se pudieron cargar completamente los metadatos para el paquete %s-%s\n"
+msgstr "no se pudieron cargar completamente los metadatos para el paquete %s-%s\n"
 
 #: lib/libalpm/remove.c:118
 #, c-format
@@ -756,9 +731,7 @@ msgstr "se han detectado paquetes con conflictos irresolubles\n"
 #: lib/libalpm/sync.c:556
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr ""
-"quitando «%s» de la lista de objetivos debido a que tiene conflictos con "
-"«%s»\n"
+msgstr "quitando «%s» de la lista de objetivos debido a que tiene conflictos con «%s»\n"
 
 #: lib/libalpm/sync.c:1014
 #, c-format
@@ -868,6 +841,4 @@ msgstr "no existe la caché de %s, creándola…\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"no se pudo encontrar o crear la caché del paquete, en su lugar se utilizará "
-"%s\n"
+msgstr "no se pudo encontrar o crear la caché del paquete, en su lugar se utilizará %s\n"
diff --git a/lib/libalpm/po/es_419.po b/lib/libalpm/po/es_419.po
index bbe7c97a..dbb79b22 100644
--- a/lib/libalpm/po/es_419.po
+++ b/lib/libalpm/po/es_419.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Angel Velasquez <angvp@archlinux.org>, 2011
 # Dan McGee <dpmcgee@gmail.com>, 2011
@@ -18,12 +18,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-24 04:12+0000\n"
 "Last-Translator: Julio Nadal <ice.modding@gmail.com>\n"
-"Language-Team: Spanish (Latin America) (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/es_419/)\n"
-"Language: es_419\n"
+"Language-Team: Spanish (Latin America) (http://www.transifex.com/toofishes/archlinux-pacman/language/es_419/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es_419\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -59,9 +58,7 @@ msgstr "no se pudo renombrar %s a %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"el archivo no figura en la lista de archivos del paquete %s. omitiendo "
-"extracción de %s\n"
+msgstr "el archivo no figura en la lista de archivos del paquete %s. omitiendo extracción de %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -73,18 +70,14 @@ msgstr "no se pudo extraer %s%s: ruta demasiado larga"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"los permisos del directorio difieren respecto de %s\n"
-"sistema de archivos: %o   paquete: %o\n"
+msgstr "los permisos del directorio difieren respecto de %s\nsistema de archivos: %o   paquete: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"la propiedad del directorio difiere respecto de %s\n"
-"sistema de archivos: %u:%u  paquete: %u:%u\n"
+msgstr "la propiedad del directorio difiere respecto de %s\nsistema de archivos: %u:%u  paquete: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -173,16 +166,12 @@ msgstr "no se pudo abrir el archivo %s: %s\n"
 #: lib/libalpm/be_local.c:712 lib/libalpm/be_sync.c:630
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-"la base de datos %s es inconsistente: nombre mal emparejado en el paquete "
-"%s\n"
+msgstr "la base de datos %s es inconsistente: nombre mal emparejado en el paquete %s\n"
 
 #: lib/libalpm/be_local.c:718 lib/libalpm/be_sync.c:636
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"la base de datos %s es inconsistente: versión mal emparejada en el paquete "
-"%s\n"
+msgstr "la base de datos %s es inconsistente: versión mal emparejada en el paquete %s\n"
 
 #: lib/libalpm/be_local.c:759
 #, c-format
@@ -243,23 +232,17 @@ msgstr "eliminando archivo no válido: %s\n"
 #: lib/libalpm/be_sync.c:502
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"no se pudo analizar el archivo de descripción del paquete «%s» de la base de "
-"datos «%s»\n"
+msgstr "no se pudo analizar el archivo de descripción del paquete «%s» de la base de datos «%s»\n"
 
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"la base de datos %s es inconsistente: el nombre del archivo del paquete %s "
-"es ilegal\n"
+msgstr "la base de datos %s es inconsistente: el nombre del archivo del paquete %s es ilegal\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
-msgstr ""
-"la base de datos %s es inconsistente: el nombre del archivo del paquete %s "
-"es demasiado largo\n"
+msgstr "la base de datos %s es inconsistente: el nombre del archivo del paquete %s es demasiado largo\n"
 
 #: lib/libalpm/be_sync.c:611
 #, c-format
@@ -299,9 +282,7 @@ msgstr "no se pudo resolver «%s», una dependencia de «%s»\n"
 #: lib/libalpm/diskspace.c:78
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
-"no se pudo obtener información del sistema de archivos para %s: %s\n"
-"\n"
+msgstr "no se pudo obtener información del sistema de archivos para %s: %s\n\n"
 
 #: lib/libalpm/diskspace.c:108
 #, c-format
@@ -326,9 +307,7 @@ msgstr "no se pudo determinar el punto de montaje para el archivo %s\n"
 #: lib/libalpm/diskspace.c:354
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %ju blocks free\n"
-msgstr ""
-"Partición %s demasiado llena: se necesitan %jd bloques, hay %ju bloques "
-"libres\n"
+msgstr "Partición %s demasiado llena: se necesitan %jd bloques, hay %ju bloques libres\n"
 
 #: lib/libalpm/diskspace.c:379 lib/libalpm/diskspace.c:433
 #, c-format
@@ -338,9 +317,7 @@ msgstr "no se puede determinar el punto de montaje del sistema de archivos\n"
 #: lib/libalpm/diskspace.c:385
 #, c-format
 msgid "could not determine cachedir mount point %s\n"
-msgstr ""
-"no se pudo determinar el punto de montaje del directorio de la memoria caché "
-"%s\n"
+msgstr "no se pudo determinar el punto de montaje del directorio de la memoria caché %s\n"
 
 #: lib/libalpm/diskspace.c:438
 #, c-format
@@ -375,9 +352,7 @@ msgstr "no se pudo obtener el archivo «%s» desde %s: %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"no se pudo obtener el archivo «%s» desde %s : tamaño de la descarga superior "
-"del esperado\n"
+msgstr "no se pudo obtener el archivo «%s» desde %s : tamaño de la descarga superior del esperado\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -532,8 +507,7 @@ msgstr "la operación no es compatible con el tipo de transacción"
 #: lib/libalpm/error.c:102
 #, c-format
 msgid "transaction commit attempt when database is not locked"
-msgstr ""
-"intento de realizar la operación cuando la base de datos no está bloqueada"
+msgstr "intento de realizar la operación cuando la base de datos no está bloqueada"
 
 #: lib/libalpm/error.c:104
 #, c-format
@@ -678,8 +652,7 @@ msgstr "no se pudo eliminar el archivo de bloqueo %s\n"
 #: lib/libalpm/package.c:568
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr ""
-"no se pudieron cargar completamente los metadatos para el paquete %s-%s\n"
+msgstr "no se pudieron cargar completamente los metadatos para el paquete %s-%s\n"
 
 #: lib/libalpm/remove.c:118
 #, c-format
@@ -754,9 +727,7 @@ msgstr "se han detectado paquetes con conflictos irresolubles\n"
 #: lib/libalpm/sync.c:556
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr ""
-"quitando «%s» de la lista de objetivos debido a que tiene conflictos con "
-"«%s»\n"
+msgstr "quitando «%s» de la lista de objetivos debido a que tiene conflictos con «%s»\n"
 
 #: lib/libalpm/sync.c:1014
 #, c-format
@@ -866,6 +837,4 @@ msgstr "no existe la caché de %s, creándola…\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"no se pudo encontrar o crear la caché del paquete, en su lugar se utilizará "
-"%s\n"
+msgstr "no se pudo encontrar o crear la caché del paquete, en su lugar se utilizará %s\n"
diff --git a/lib/libalpm/po/fi.po b/lib/libalpm/po/fi.po
index 54437dea..f8a78dc0 100644
--- a/lib/libalpm/po/fi.po
+++ b/lib/libalpm/po/fi.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # No User, 2011
 # Dan McGee <dpmcgee@gmail.com>, 2011
@@ -19,12 +19,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-05 20:25+0000\n"
 "Last-Translator: Lasse Liehu <larso@gmx.com>\n"
-"Language-Team: Finnish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/fi/)\n"
-"Language: fi\n"
+"Language-Team: Finnish (http://www.transifex.com/toofishes/archlinux-pacman/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -60,9 +59,7 @@ msgstr "kohdetta %s ei voitu nimetä uudelleen kohteeksi %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"tiedostoa ei löydy paketin %s tiedostolistalta. ohitetaan paketin %s "
-"purkaminen\n"
+msgstr "tiedostoa ei löydy paketin %s tiedostolistalta. ohitetaan paketin %s purkaminen\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -74,18 +71,14 @@ msgstr "ei voitu purkaa %s%s: polku liian pitkä"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"kansion oikeuksissa eroavaisuuksia kohdassa %s\n"
-"tiedostojärjestelmä: %o   paketti: %o\n"
+msgstr "kansion oikeuksissa eroavaisuuksia kohdassa %s\ntiedostojärjestelmä: %o   paketti: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"kansion omistajuus eroaa tiedostossa %s\n"
-"tiedostojärjestelmä: %u:%u  paketti: %u:%u\n"
+msgstr "kansion omistajuus eroaa tiedostossa %s\ntiedostojärjestelmä: %u:%u  paketti: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -245,14 +238,12 @@ msgstr "paketin kuvaustiedostoa '%s' ei voitu jäsentää tietokannassa '%s'\n"
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"tietokanta %s on epäyhtenäinen: paketin %s tiedostonimi on virheellinen\n"
+msgstr "tietokanta %s on epäyhtenäinen: paketin %s tiedostonimi on virheellinen\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
-msgstr ""
-"tietokanta %s on epäyhtenäinen: paketin %s tiedostonimi on liian pitkä\n"
+msgstr "tietokanta %s on epäyhtenäinen: paketin %s tiedostonimi on liian pitkä\n"
 
 #: lib/libalpm/be_sync.c:611
 #, c-format
@@ -362,9 +353,7 @@ msgstr "tiedoston '%s' nouto palvelimelta %s epäonnistui : %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"tiedoston '%s' noutaminen koneelta %s epäonnistui: odotettu latauskoko "
-"ylittyi\n"
+msgstr "tiedoston '%s' noutaminen koneelta %s epäonnistui: odotettu latauskoko ylittyi\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -739,9 +728,7 @@ msgstr "ratkaisemattomia pakettiristiriitoja havaittu\n"
 #: lib/libalpm/sync.c:556
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr ""
-"poistetaan '%s' kohteiden listasta, koska se on ristiriidassa paketin '%s' "
-"kanssa\n"
+msgstr "poistetaan '%s' kohteiden listasta, koska se on ristiriidassa paketin '%s' kanssa\n"
 
 #: lib/libalpm/sync.c:1014
 #, c-format
@@ -851,6 +838,4 @@ msgstr "välimuistia %s ei ole olemassa, luodaan...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"pakettivälimuistia ei ollut olemassa eikä sitä voitu luoda. Käytetään %s sen "
-"sijaan\n"
+msgstr "pakettivälimuistia ei ollut olemassa eikä sitä voitu luoda. Käytetään %s sen sijaan\n"
diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po
index 72c867f0..6100b05c 100644
--- a/lib/libalpm/po/fr.po
+++ b/lib/libalpm/po/fr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Antoine Lubineau <antoine@lubignon.info>, 2012-2013
 # Antoine Lubineau <antoine@lubignon.info>, 2012
@@ -19,12 +19,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-09 16:03+0000\n"
 "Last-Translator: Charles Monzat <superboa@hotmail.fr>\n"
-"Language-Team: French (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/fr/)\n"
-"Language: fr\n"
+"Language-Team: French (http://www.transifex.com/toofishes/archlinux-pacman/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -60,9 +59,7 @@ msgstr "impossible de renommer %s en %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"fichier non trouvé dans la liste des fichiers du paquet %s. Extraction de %s "
-"ignorée\n"
+msgstr "fichier non trouvé dans la liste des fichiers du paquet %s. Extraction de %s ignorée\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -74,18 +71,14 @@ msgstr "impossible d'extraire %s%s : chemin trop long"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"les permissions pour le répertoire %s sont différentes\n"
-"système de fichier : %o, paquet : %o\n"
+msgstr "les permissions pour le répertoire %s sont différentes\nsystème de fichier : %o, paquet : %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"le propriétaire du répertoire %s est différent\n"
-"système de fichier : %u:%u, paquet : %u:%u\n"
+msgstr "le propriétaire du répertoire %s est différent\nsystème de fichier : %u:%u, paquet : %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -179,8 +172,7 @@ msgstr "le dépôt %s est inconsistant : noms différents pour le paquet %s\n"
 #: lib/libalpm/be_local.c:718 lib/libalpm/be_sync.c:636
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"le dépôt %s est inconsistant : versions différentes pour le paquet %s\n"
+msgstr "le dépôt %s est inconsistant : versions différentes pour le paquet %s\n"
 
 #: lib/libalpm/be_local.c:759
 #, c-format
@@ -241,21 +233,17 @@ msgstr "suppression du fichier invalide : %s\n"
 #: lib/libalpm/be_sync.c:502
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"impossible d’analyser le fichier « %s » de description du paquet depuis la "
-"base de données « %s »\n"
+msgstr "impossible d’analyser le fichier « %s » de description du paquet depuis la base de données « %s »\n"
 
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"le dépôt %s est inconsistant : le nom de fichier du paquet %s est invalide\n"
+msgstr "le dépôt %s est inconsistant : le nom de fichier du paquet %s est invalide\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
-msgstr ""
-"le dépôt %s est inconsistant : le nom de fichier du paquet %s est trop long\n"
+msgstr "le dépôt %s est inconsistant : le nom de fichier du paquet %s est trop long\n"
 
 #: lib/libalpm/be_sync.c:611
 #, c-format
@@ -295,8 +283,7 @@ msgstr "impossible de résoudre « %s », une dépendance de « %s »\n"
 #: lib/libalpm/diskspace.c:78
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
-"impossible de récupérer les informations du système de fichier pour %s : %s\n"
+msgstr "impossible de récupérer les informations du système de fichier pour %s : %s\n"
 
 #: lib/libalpm/diskspace.c:108
 #, c-format
@@ -311,9 +298,7 @@ msgstr "impossible de récupérer les informations du système de fichier\n"
 #: lib/libalpm/diskspace.c:242
 #, c-format
 msgid "could not get file information for %s\n"
-msgstr ""
-"impossible de récupérer les informations de fichier pour %s\n"
-"\n"
+msgstr "impossible de récupérer les informations de fichier pour %s\n\n"
 
 #: lib/libalpm/diskspace.c:256 lib/libalpm/diskspace.c:315
 #, c-format
@@ -323,11 +308,7 @@ msgstr "impossible de déterminer le point de montage pour le fichier %s\n"
 #: lib/libalpm/diskspace.c:354
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %ju blocks free\n"
-msgstr ""
-"Partition %s pleine : %jd blocs nécessaires, %ju blocs libres\n"
-"\n"
-"\n"
-"\n"
+msgstr "Partition %s pleine : %jd blocs nécessaires, %ju blocs libres\n\n\n\n"
 
 #: lib/libalpm/diskspace.c:379 lib/libalpm/diskspace.c:433
 #, c-format
@@ -372,9 +353,7 @@ msgstr "échec de récupération du fichier « %s » depuis %s : %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"échec de récupération du fichier « %s » depuis %s : taille attendue "
-"dépassée\n"
+msgstr "échec de récupération du fichier « %s » depuis %s : taille attendue dépassée\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -529,9 +508,7 @@ msgstr "opération incompatible avec le type de transaction"
 #: lib/libalpm/error.c:102
 #, c-format
 msgid "transaction commit attempt when database is not locked"
-msgstr ""
-"tentative de réalisation d’une transaction alors que le dépôt n’est pas "
-"verrouillé"
+msgstr "tentative de réalisation d’une transaction alors que le dépôt n’est pas verrouillé"
 
 #: lib/libalpm/error.c:104
 #, c-format
@@ -676,8 +653,7 @@ msgstr "la suppression du fichier de verrouillage %s a échoué\n"
 #: lib/libalpm/package.c:568
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr ""
-"les métadonnées pour le paquet %s-%s n’ont pas pu être totalement chargées.\n"
+msgstr "les métadonnées pour le paquet %s-%s n’ont pas pu être totalement chargées.\n"
 
 #: lib/libalpm/remove.c:118
 #, c-format
@@ -752,8 +728,7 @@ msgstr "un conflit de paquets impossible à résoudre a été détecté\n"
 #: lib/libalpm/sync.c:556
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr ""
-"supprime « %s » de la liste de cible car il est en conflit avec « %s »\n"
+msgstr "supprime « %s » de la liste de cible car il est en conflit avec « %s »\n"
 
 #: lib/libalpm/sync.c:1014
 #, c-format
@@ -808,9 +783,7 @@ msgstr "impossible de connaître l’état du fichier %s : %s\n"
 #: lib/libalpm/util.c:483
 #, c-format
 msgid "unable to write to pipe (%s)\n"
-msgstr ""
-"impossible d'écrire dans le tube (%s)\n"
-"\n"
+msgstr "impossible d'écrire dans le tube (%s)\n\n"
 
 #: lib/libalpm/util.c:542
 #, c-format
@@ -865,6 +838,4 @@ msgstr "le cache %s n’existe pas, création...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"impossible de trouver ou de créer le cache des paquets, utilisation de %s à "
-"la place\n"
+msgstr "impossible de trouver ou de créer le cache des paquets, utilisation de %s à la place\n"
diff --git a/lib/libalpm/po/gl.po b/lib/libalpm/po/gl.po
index 3b0a605b..92510b28 100644
--- a/lib/libalpm/po/gl.po
+++ b/lib/libalpm/po/gl.po
@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Adrián Chaves Fernández <adriyetichaves@gmail.com>, 2013-2014
 # Alexandre Filgueira <faidoc@gmail.com>, 2013
 # Alexandre Filgueira <faidoc@gmail.com>, 2013
 # Alexandre Filgueira <faidoc@gmail.com>, 2013
 # Daniel, 2016
+# Daniel, 2016
 # Alexandre Filgueira <faidoc@gmail.com>, 2013
 # Alexandre Filgueira <faidoc@gmail.com>, 2013
 msgid ""
@@ -17,12 +18,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-22 20:51+0000\n"
 "Last-Translator: Daniel\n"
-"Language-Team: Galician (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/gl/)\n"
-"Language: gl\n"
+"Language-Team: Galician (http://www.transifex.com/toofishes/archlinux-pacman/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -58,9 +58,7 @@ msgstr "Non foi posíbel cambiar o nome de «%s» a «%s» (%s).\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"Non se atopou o ficheiro na lista de ficheiros do paquete «%s». Non se "
-"extraerá «%s».\n"
+msgstr "Non se atopou o ficheiro na lista de ficheiros do paquete «%s». Non se extraerá «%s».\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -72,24 +70,19 @@ msgstr "non se pode extraer %s%s: ruta demasiado longa"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"Os permisos dun directorio son distintos en «%s».\n"
-"No sistema de ficheiros: «%o». No paquete: «%o».\n"
+msgstr "Os permisos dun directorio son distintos en «%s».\nNo sistema de ficheiros: «%o». No paquete: «%o».\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"O dono do cartafol «%s» non cadra.\n"
-"No sistema de ficheiros é «%u:%u», no paquete é «%u:%u».\n"
+msgstr "O dono do cartafol «%s» non cadra.\nNo sistema de ficheiros é «%u:%u», no paquete é «%u:%u».\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
-msgstr ""
-"[Extracción] Non é posíbel substituír un directorio polo ficheiro «%s».\n"
+msgstr "[Extracción] Non é posíbel substituír un directorio polo ficheiro «%s».\n"
 
 #: lib/libalpm/add.c:300
 #, c-format
@@ -168,21 +161,17 @@ msgstr "entrada dañada na base de datos '%s'\n"
 #: lib/libalpm/util.c:266
 #, c-format
 msgid "could not open file %s: %s\n"
-msgstr ""
-"non se puido abrir o arquivo %s: %s\n"
-"\n"
+msgstr "non se puido abrir o arquivo %s: %s\n\n"
 
 #: lib/libalpm/be_local.c:712 lib/libalpm/be_sync.c:630
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-"a base de datos %s é inconsistente: nome mal emparexado no paquete %s\n"
+msgstr "a base de datos %s é inconsistente: nome mal emparexado no paquete %s\n"
 
 #: lib/libalpm/be_local.c:718 lib/libalpm/be_sync.c:636
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"a base de datos %s é inconsistente: versión mal emparexada no paquete %s\n"
+msgstr "a base de datos %s é inconsistente: versión mal emparexada no paquete %s\n"
 
 #: lib/libalpm/be_local.c:759
 #, c-format
@@ -243,22 +232,17 @@ msgstr "eliminando arquivo inválido: %s\n"
 #: lib/libalpm/be_sync.c:502
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"error ao ler o arquivo de descripción '%s' do paquete da base de datos '%s'\n"
+msgstr "error ao ler o arquivo de descripción '%s' do paquete da base de datos '%s'\n"
 
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"A base de datos «%s» é inconsistente: a ruta do arquivo do paquete %s contén "
-"caracteres non permitidos.\n"
+msgstr "A base de datos «%s» é inconsistente: a ruta do arquivo do paquete %s contén caracteres non permitidos.\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
-msgstr ""
-"A base de datos «%s» é inconsistente: a ruta do arquivo do paquete %s é "
-"demasiado longa.\n"
+msgstr "A base de datos «%s» é inconsistente: a ruta do arquivo do paquete %s é demasiado longa.\n"
 
 #: lib/libalpm/be_sync.c:611
 #, c-format
@@ -323,9 +307,7 @@ msgstr "non se puido determinar o punto de montaxe para o arquivo %s\n"
 #: lib/libalpm/diskspace.c:354
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %ju blocks free\n"
-msgstr ""
-"A partición %s está moi chea: necesítanse %jd bloques, quedan %ju bloques "
-"libres\n"
+msgstr "A partición %s está moi chea: necesítanse %jd bloques, quedan %ju bloques libres\n"
 
 #: lib/libalpm/diskspace.c:379 lib/libalpm/diskspace.c:433
 #, c-format
@@ -335,8 +317,7 @@ msgstr "non se puido determinar o punto de montaxe do sistema de ficheiros\n"
 #: lib/libalpm/diskspace.c:385
 #, c-format
 msgid "could not determine cachedir mount point %s\n"
-msgstr ""
-"non foi posíbel determinar o punto de montaxe do directorio de caché «%s»\n"
+msgstr "non foi posíbel determinar o punto de montaxe do directorio de caché «%s»\n"
 
 #: lib/libalpm/diskspace.c:438
 #, c-format
@@ -371,9 +352,7 @@ msgstr "error ao obter o arquivo '%s' dende %s: %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"Non foi posíbel obter o ficheiro «%s» de «%s»: superouse o tamaño de "
-"descarga esperado.\n"
+msgstr "Non foi posíbel obter o ficheiro «%s» de «%s»: superouse o tamaño de descarga esperado.\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -528,8 +507,7 @@ msgstr "a operación non é compatible co tipo de transacción"
 #: lib/libalpm/error.c:102
 #, c-format
 msgid "transaction commit attempt when database is not locked"
-msgstr ""
-"intento de envío da transacción canda a base de datos non está bloqueada"
+msgstr "intento de envío da transacción canda a base de datos non está bloqueada"
 
 #: lib/libalpm/error.c:104
 #, c-format
@@ -749,8 +727,7 @@ msgstr "detectáronse paquetes con conflictos non resolvibles\n"
 #: lib/libalpm/sync.c:556
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr ""
-"quitando '%s' da lista de obxetivos debido a que ten conflictos con '%s'\n"
+msgstr "quitando '%s' da lista de obxetivos debido a que ten conflictos con '%s'\n"
 
 #: lib/libalpm/sync.c:1014
 #, c-format
@@ -860,5 +837,4 @@ msgstr "non existe o caché %s, creando...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"non se puido atopar ou crear a caché do paquete, en lugar utilizarase %s\n"
+msgstr "non se puido atopar ou crear a caché do paquete, en lugar utilizarase %s\n"
diff --git a/lib/libalpm/po/hr.po b/lib/libalpm/po/hr.po
index bbabe4cf..0c4179a5 100644
--- a/lib/libalpm/po/hr.po
+++ b/lib/libalpm/po/hr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Ivica  Kolić <ikoli@yahoo.com>, 2012-2015
 msgid ""
@@ -11,14 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-12 21:57+0000\n"
 "Last-Translator: Ivica  Kolić <ikoli@yahoo.com>\n"
-"Language-Team: Croatian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/hr/)\n"
-"Language: hr\n"
+"Language-Team: Croatian (http://www.transifex.com/toofishes/archlinux-pacman/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: lib/libalpm/add.c:86
 #, c-format
@@ -43,10 +41,7 @@ msgstr "dano upozorenje tijekom raspakiranja  %s (%s)\n"
 #: lib/libalpm/add.c:127 lib/libalpm/util.c:382
 #, c-format
 msgid "could not extract %s (%s)\n"
-msgstr ""
-"ne mogu raspakirati %s (%s)\n"
-"\n"
-"\n"
+msgstr "ne mogu raspakirati %s (%s)\n\n\n"
 
 #: lib/libalpm/add.c:140 lib/libalpm/dload.c:589 lib/libalpm/remove.c:520
 #, c-format
@@ -68,18 +63,14 @@ msgstr "nije moguće raspakirati %s%s: putanja je preduga"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"dozvole direktorija razlikuju se na %s\n"
-"datotečni sustav: %o paket: %o\n"
+msgstr "dozvole direktorija razlikuju se na %s\ndatotečni sustav: %o paket: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"vlasništvo direktorija se razlikuje na %s\n"
-"datotečni sustav: %u:%u paket: %u:%u\n"
+msgstr "vlasništvo direktorija se razlikuje na %s\ndatotečni sustav: %u:%u paket: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -105,23 +96,17 @@ msgstr "ne mogu promjeniti direktorij u  %s (%s)\n"
 #: lib/libalpm/add.c:545 lib/libalpm/util.c:400 lib/libalpm/util.c:731
 #, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr ""
-"ne mogu obnoviti radni direktorij (%s)\n"
-"\n"
+msgstr "ne mogu obnoviti radni direktorij (%s)\n\n"
 
 #: lib/libalpm/add.c:553
 #, c-format
 msgid "problem occurred while upgrading %s\n"
-msgstr ""
-"došlo je do greške prilikom nadogradnje %s\n"
-"\n"
+msgstr "došlo je do greške prilikom nadogradnje %s\n\n"
 
 #: lib/libalpm/add.c:559
 #, c-format
 msgid "problem occurred while installing %s\n"
-msgstr ""
-"došlo je do greške prilikom instaliranja %s\n"
-"\n"
+msgstr "došlo je do greške prilikom instaliranja %s\n\n"
 
 #: lib/libalpm/add.c:575
 #, c-format
@@ -151,9 +136,7 @@ msgstr "ne mogu napraviti direktorij %s: %s\n"
 #: lib/libalpm/be_local.c:576 lib/libalpm/be_sync.c:377
 #, c-format
 msgid "invalid name for database entry '%s'\n"
-msgstr ""
-"neispravno ime za unos baze podataka '%s'\n"
-"\n"
+msgstr "neispravno ime za unos baze podataka '%s'\n\n"
 
 #: lib/libalpm/be_local.c:584
 #, c-format
@@ -302,9 +285,7 @@ msgstr "ne mogu otvoriti datoteku: %s: %s\n"
 #: lib/libalpm/diskspace.c:146 lib/libalpm/diskspace.c:159
 #, c-format
 msgid "could not get filesystem information\n"
-msgstr ""
-"ne mogu dobiti informaciju datotečnog sustava\n"
-"\n"
+msgstr "ne mogu dobiti informaciju datotečnog sustava\n\n"
 
 #: lib/libalpm/diskspace.c:242
 #, c-format
@@ -319,8 +300,7 @@ msgstr "ne mogu odrediti točku montiranja za datoteku  %s\n"
 #: lib/libalpm/diskspace.c:354
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %ju blocks free\n"
-msgstr ""
-"Particija %s je prepuna: %jd blokova je potrebno, %ju blokova je slobodno\n"
+msgstr "Particija %s je prepuna: %jd blokova je potrebno, %ju blokova je slobodno\n"
 
 #: lib/libalpm/diskspace.c:379 lib/libalpm/diskspace.c:433
 #, c-format
@@ -690,9 +670,7 @@ msgstr "ne mogu otvoriti direktorij: %s: %s\n"
 #: lib/libalpm/remove.c:540
 #, c-format
 msgid "cannot remove %s (%s)\n"
-msgstr ""
-"ne mogu ukloniti %s (%s)\n"
-"\n"
+msgstr "ne mogu ukloniti %s (%s)\n\n"
 
 #: lib/libalpm/remove.c:713
 #, c-format
@@ -707,9 +685,7 @@ msgstr ""
 #: lib/libalpm/sync.c:98
 #, c-format
 msgid "%s: ignoring package upgrade (%s => %s)\n"
-msgstr ""
-"%s: ignoriram nadogradnju paketa (%s => %s)\n"
-"\n"
+msgstr "%s: ignoriram nadogradnju paketa (%s => %s)\n\n"
 
 #: lib/libalpm/sync.c:110
 #, c-format
@@ -754,9 +730,7 @@ msgstr "neuspjelo primanje nekin datoteka\n"
 #: lib/libalpm/sync.c:1176
 #, c-format
 msgid "%s: missing required signature\n"
-msgstr ""
-"%s: nedostaje potrebni potpis\n"
-"\n"
+msgstr "%s: nedostaje potrebni potpis\n\n"
 
 #: lib/libalpm/sync.c:1376
 #, c-format
diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po
index 3615c5e9..5fbc823a 100644
--- a/lib/libalpm/po/hu.po
+++ b/lib/libalpm/po/hu.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # György Balló <ballogy@freestart.hu>, 2014
 # Balló György <ballogyor@gmail.com>, 2011,2014
@@ -17,12 +17,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-09 06:03+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Hungarian (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/hu/)\n"
-"Language: hu\n"
+"Language-Team: Hungarian (http://www.transifex.com/toofishes/archlinux-pacman/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -58,8 +57,7 @@ msgstr "nem sikerült az átnevezés: %s -> %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"fájl nem található a(z) %s csomag fájllistájában. %s kibontásának kihagyása\n"
+msgstr "fájl nem található a(z) %s csomag fájllistájában. %s kibontásának kihagyása\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -71,18 +69,14 @@ msgstr ""
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"eltérő könyvtárjogosultságok: %s\n"
-"fájlrendszer: %o  csomag: %o\n"
+msgstr "eltérő könyvtárjogosultságok: %s\nfájlrendszer: %o  csomag: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"eltérő könyvtártulajdonos: %s\n"
-"fájlrendszer: %u:%u  csomag: %u:%u\n"
+msgstr "eltérő könyvtártulajdonos: %s\nfájlrendszer: %u:%u  csomag: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -237,9 +231,7 @@ msgstr "hibás fájl eltávolítása: %s\n"
 #: lib/libalpm/be_sync.c:502
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"nem sikerült értelmezni a(z) '%s' csomagleíró fájlját a(z) '%s' "
-"adatbázisból\n"
+msgstr "nem sikerült értelmezni a(z) '%s' csomagleíró fájlját a(z) '%s' adatbázisból\n"
 
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
@@ -324,8 +316,7 @@ msgstr "nem sikerült meghatározni a csatolási pontokat\n"
 #: lib/libalpm/diskspace.c:385
 #, c-format
 msgid "could not determine cachedir mount point %s\n"
-msgstr ""
-"nem sikerült meghatározni a %s csomaggyorsítótár-könyvtár csatolási pontját\n"
+msgstr "nem sikerült meghatározni a %s csomaggyorsítótár-könyvtár csatolási pontját\n"
 
 #: lib/libalpm/diskspace.c:438
 #, c-format
@@ -360,9 +351,7 @@ msgstr "nem sikerült a(z) '%s' fájlt letölteni a %s helyről : %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"nem sikerült a(z) '%s' fájlt letölteni a %s helyről : a várt letöltési méret "
-"túlhaladva\n"
+msgstr "nem sikerült a(z) '%s' fájlt letölteni a %s helyről : a várt letöltési méret túlhaladva\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -662,8 +651,7 @@ msgstr "nem sikerült a zárolófájl (%s) eltávolítása\n"
 #: lib/libalpm/package.c:568
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr ""
-"nem sikerült teljesen betölteni az információs fájlt a(z) %s-%s csomaghoz\n"
+msgstr "nem sikerült teljesen betölteni az információs fájlt a(z) %s-%s csomaghoz\n"
 
 #: lib/libalpm/remove.c:118
 #, c-format
@@ -848,6 +836,4 @@ msgstr "nem létezik a(z) %s gyorsítótár, létrehozás...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"nem található vagy nem hozható létre a csomaggyorsítótár, a %s könyvtárat "
-"használom helyette\n"
+msgstr "nem található vagy nem hozható létre a csomaggyorsítótár, a %s könyvtárat használom helyette\n"
diff --git a/lib/libalpm/po/id.po b/lib/libalpm/po/id.po
index 57d16117..90d9d632 100644
--- a/lib/libalpm/po/id.po
+++ b/lib/libalpm/po/id.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Ibnu Daru Aji, 2013
 # Gregori, 2013
@@ -17,12 +17,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-10 07:09+0000\n"
 "Last-Translator: Mohamad Hasan Al Banna <se7entime@openmailbox.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/id/)\n"
-"Language: id\n"
+"Language-Team: Indonesian (http://www.transifex.com/toofishes/archlinux-pacman/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: lib/libalpm/add.c:86
@@ -58,9 +57,7 @@ msgstr "tidak dapat mengubah nama %s menjadi %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"berkas tidak ditemukan pada daftar berkas untuk paket %s.  ekstraksi %s "
-"dilewati.\n"
+msgstr "berkas tidak ditemukan pada daftar berkas untuk paket %s.  ekstraksi %s dilewati.\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -72,18 +69,14 @@ msgstr "gagal mengekstrak %s%s: jalur terlalu panjang"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"izin direktori berbeda pada %s\n"
-"filesystem: %o paket: %o\n"
+msgstr "izin direktori berbeda pada %s\nfilesystem: %o paket: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"kepemilikan direktori berbeda pada %s\n"
-"sistem berkas: %u:%u paket: %u:%u\n"
+msgstr "kepemilikan direktori berbeda pada %s\nsistem berkas: %u:%u paket: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -358,8 +351,7 @@ msgstr "gagal mendapatkan berkas '%s' dari %s: %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"gagal mendapatkan berkas '%s' dari %s: ukuran unduhan melebihi perkiraan\n"
+msgstr "gagal mendapatkan berkas '%s' dari %s: ukuran unduhan melebihi perkiraan\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
diff --git a/lib/libalpm/po/is.po b/lib/libalpm/po/is.po
index 441554b7..b56a6894 100644
--- a/lib/libalpm/po/is.po
+++ b/lib/libalpm/po/is.po
@@ -1,9 +1,10 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Kristján Magnússon, 2016
+# Kristján Magnússon, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
@@ -11,12 +12,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-27 21:10+0000\n"
 "Last-Translator: Kristján Magnússon\n"
-"Language-Team: Icelandic (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/is/)\n"
-"Language: is\n"
+"Language-Team: Icelandic (http://www.transifex.com/toofishes/archlinux-pacman/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
 #: lib/libalpm/add.c:86
diff --git a/lib/libalpm/po/it.po b/lib/libalpm/po/it.po
index 045d8274..a3f38d3d 100644
--- a/lib/libalpm/po/it.po
+++ b/lib/libalpm/po/it.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrea Scarpino <inactive+bash@transifex.com>, 2014
 # Andrea Scarpino <inactive+bash@transifex.com>, 2014
@@ -16,12 +16,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-19 13:18+0000\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
-"Language-Team: Italian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/it/)\n"
-"Language: it\n"
+"Language-Team: Italian (http://www.transifex.com/toofishes/archlinux-pacman/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -37,9 +36,7 @@ msgstr "%s-%s è aggiornato ma sarà reinstallato\n"
 #: lib/libalpm/add.c:95
 #, c-format
 msgid "downgrading package %s (%s => %s)\n"
-msgstr ""
-"installazione in corso di una versione meno recente del pacchetto %s (%s => "
-"%s)\n"
+msgstr "installazione in corso di una versione meno recente del pacchetto %s (%s => %s)\n"
 
 #: lib/libalpm/add.c:124 lib/libalpm/util.c:379
 #, c-format
@@ -59,9 +56,7 @@ msgstr "impossibile rinominare %s in %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"Il file non esiste nel pacchetto %s. L'estrazione di %s sarà, quindi, "
-"ignorata\n"
+msgstr "Il file non esiste nel pacchetto %s. L'estrazione di %s sarà, quindi, ignorata\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -73,18 +68,14 @@ msgstr "impossibile estrarre %s%s: percorso troppo lungo"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"i permessi delle directory differiscono su %s\n"
-"filesystem: %o pacchetto: %o\n"
+msgstr "i permessi delle directory differiscono su %s\nfilesystem: %o pacchetto: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"i permessi della cartella %s differiscono\n"
-"disco: %u:%u pacchetto: %u:%u\n"
+msgstr "i permessi della cartella %s differiscono\ndisco: %u:%u pacchetto: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -173,15 +164,12 @@ msgstr "impossibile aprire il file %s: %s\n"
 #: lib/libalpm/be_local.c:712 lib/libalpm/be_sync.c:630
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-"il database %s è inconsistente: il nome non corrisponde con il pacchetto %s\n"
+msgstr "il database %s è inconsistente: il nome non corrisponde con il pacchetto %s\n"
 
 #: lib/libalpm/be_local.c:718 lib/libalpm/be_sync.c:636
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"il database %s è inconsistente: la versione non corrisponde con il pacchetto "
-"%s\n"
+msgstr "il database %s è inconsistente: la versione non corrisponde con il pacchetto %s\n"
 
 #: lib/libalpm/be_local.c:759
 #, c-format
@@ -242,22 +230,17 @@ msgstr "rimozione del file non valido: %s\n"
 #: lib/libalpm/be_sync.c:502
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"impossibile analizzare il file della descrizione del pacchetto '%s' dal "
-"database '%s'\n"
+msgstr "impossibile analizzare il file della descrizione del pacchetto '%s' dal database '%s'\n"
 
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"il database %s è inconsistente: il nome del pacchetto %s è illegale\n"
-" \n"
+msgstr "il database %s è inconsistente: il nome del pacchetto %s è illegale\n \n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
-msgstr ""
-"il database %s è inconsistente: il nome del pacchetto %s è troppo lungo\n"
+msgstr "il database %s è inconsistente: il nome del pacchetto %s è troppo lungo\n"
 
 #: lib/libalpm/be_sync.c:611
 #, c-format
@@ -297,8 +280,7 @@ msgstr "impossibile risolvere \"%s\", una dipendenza di \"%s\"\n"
 #: lib/libalpm/diskspace.c:78
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
-"impossibile ottenere le informazione relative al filesystem di %s: %s\n"
+msgstr "impossibile ottenere le informazione relative al filesystem di %s: %s\n"
 
 #: lib/libalpm/diskspace.c:108
 #, c-format
@@ -323,8 +305,7 @@ msgstr "impossibile determinare il punto di montaggio del file %s\n"
 #: lib/libalpm/diskspace.c:354
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %ju blocks free\n"
-msgstr ""
-"La partizione %s è troppo piena: %jd blocchi necessari, %ju blocchi liberi\n"
+msgstr "La partizione %s è troppo piena: %jd blocchi necessari, %ju blocchi liberi\n"
 
 #: lib/libalpm/diskspace.c:379 lib/libalpm/diskspace.c:433
 #, c-format
@@ -334,9 +315,7 @@ msgstr "impossibile determinare i punti di montaggio del filesystem\n"
 #: lib/libalpm/diskspace.c:385
 #, c-format
 msgid "could not determine cachedir mount point %s\n"
-msgstr ""
-"impossibile determinare il punto di montaggio della directory della cache "
-"%s\n"
+msgstr "impossibile determinare il punto di montaggio della directory della cache %s\n"
 
 #: lib/libalpm/diskspace.c:438
 #, c-format
@@ -371,9 +350,7 @@ msgstr "impossibile scaricare il pacchetto '%s' da %s : %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"impossibile scaricare il file '%s' da %s: la dimensione di download supera "
-"quella attesa\n"
+msgstr "impossibile scaricare il file '%s' da %s: la dimensione di download supera quella attesa\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -728,8 +705,7 @@ msgstr "%s: è in corso il downgrade dalla versione %s alla versione %s\n"
 #: lib/libalpm/sync.c:119
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr ""
-"%s: la versione installata (%s) è più recente di quella presente in %s (%s)\n"
+msgstr "%s: la versione installata (%s) è più recente di quella presente in %s (%s)\n"
 
 #: lib/libalpm/sync.c:160
 #, c-format
@@ -749,8 +725,7 @@ msgstr "sono stati rilevati dei conflitti irrisolvibili tra i pacchetti\n"
 #: lib/libalpm/sync.c:556
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr ""
-"rimozione di '%s' dalla lista dei pacchetti perché va in conflitto con '%s'\n"
+msgstr "rimozione di '%s' dalla lista dei pacchetti perché va in conflitto con '%s'\n"
 
 #: lib/libalpm/sync.c:1014
 #, c-format
@@ -860,6 +835,4 @@ msgstr "la cache di %s non esiste, creazione in corso...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"impossibile trovare o creare la cache del pacchetto, al suo posto sarà usato "
-"%s\n"
+msgstr "impossibile trovare o creare la cache del pacchetto, al suo posto sarà usato %s\n"
diff --git a/lib/libalpm/po/ja.po b/lib/libalpm/po/ja.po
index 9ee16794..1024b216 100644
--- a/lib/libalpm/po/ja.po
+++ b/lib/libalpm/po/ja.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # ABE Satoru <s@polamjag.info>, 2015
 msgid ""
@@ -10,13 +10,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-09 12:19+0000\n"
-"Last-Translator: kusakata <shohei@kusakata.com>\n"
-"Language-Team: Japanese (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ja/)\n"
-"Language: ja\n"
+"Last-Translator: kusakata\n"
+"Language-Team: Japanese (http://www.transifex.com/toofishes/archlinux-pacman/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: lib/libalpm/add.c:86
@@ -52,9 +51,7 @@ msgstr "%s を %s に名前を変更できませんでした (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"パッケージ %s のファイルリストに含まれているファイルが見つかりませんでし"
-"た。%s の展開をスキップします。\n"
+msgstr "パッケージ %s のファイルリストに含まれているファイルが見つかりませんでした。%s の展開をスキップします。\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -66,18 +63,14 @@ msgstr "%s%s を展開できませんでした: パスが長すぎます"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"%s のディレクトリのパーミッションが異なっています\n"
-"ファイルシステム: %o  パッケージ: %o\n"
+msgstr "%s のディレクトリのパーミッションが異なっています\nファイルシステム: %o  パッケージ: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"%s のディレクトリ所有者が異なっています\n"
-"ファイルシステム: %u:%u  パッケージ: %u:%u\n"
+msgstr "%s のディレクトリ所有者が異なっています\nファイルシステム: %u:%u  パッケージ: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -232,20 +225,17 @@ msgstr "無効なファイルを削除: %s\n"
 #: lib/libalpm/be_sync.c:502
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"パッケージ定義ファイル '%s' (データベース '%s') をパースできませんでした\n"
+msgstr "パッケージ定義ファイル '%s' (データベース '%s') をパースできませんでした\n"
 
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"%s データベースは矛盾しています: パッケージ %s のファイル名が不正です\n"
+msgstr "%s データベースは矛盾しています: パッケージ %s のファイル名が不正です\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
-msgstr ""
-"%s データベースは矛盾しています: パッケージ %s のファイル名が長すぎます\n"
+msgstr "%s データベースは矛盾しています: パッケージ %s のファイル名が長すぎます\n"
 
 #: lib/libalpm/be_sync.c:611
 #, c-format
@@ -355,9 +345,7 @@ msgstr "ファイル '%s' を %s から取得するのに失敗しました : %s
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"ファイル '%s' を %s から取得するのに失敗しました : 想定されるダウンロードサイ"
-"ズを超過しています\n"
+msgstr "ファイル '%s' を %s から取得するのに失敗しました : 想定されるダウンロードサイズを超過しています\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -842,5 +830,4 @@ msgstr "%s キャッシュが存在しません、作成します...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"パッケージキャッシュを発見・作成できませんでした、かわりに %s を使用します\n"
+msgstr "パッケージキャッシュを発見・作成できませんでした、かわりに %s を使用します\n"
diff --git a/lib/libalpm/po/ka.po b/lib/libalpm/po/ka.po
index 3406c679..cc7e76c6 100644
--- a/lib/libalpm/po/ka.po
+++ b/lib/libalpm/po/ka.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # arabuli <arabulibeqa@yahoo.com>, 2015
 # arabuli <arabulibeqa@yahoo.com>, 2015-2016
@@ -12,12 +12,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 12:50+0000\n"
 "Last-Translator: arabuli <arabulibeqa@yahoo.com>\n"
-"Language-Team: Georgian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ka/)\n"
-"Language: ka\n"
+"Language-Team: Georgian (http://www.transifex.com/toofishes/archlinux-pacman/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: lib/libalpm/add.c:86
@@ -28,10 +27,7 @@ msgstr "%s-%s მიმდინარე ვერსიაა -- ვტოვ
 #: lib/libalpm/add.c:90
 #, c-format
 msgid "%s-%s is up to date -- reinstalling\n"
-msgstr ""
-"%s-%s მიმდინარე ვერსიაა -- ხელახალი ინსტალაცია\n"
-"\n"
-"\n"
+msgstr "%s-%s მიმდინარე ვერსიაა -- ხელახალი ინსტალაცია\n\n\n"
 
 #: lib/libalpm/add.c:95
 #, c-format
diff --git a/lib/libalpm/po/kk.po b/lib/libalpm/po/kk.po
index f88baa5c..bbd0ea92 100644
--- a/lib/libalpm/po/kk.po
+++ b/lib/libalpm/po/kk.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2011,2015
 # Dan McGee <dpmcgee@gmail.com>, 2011
@@ -12,12 +12,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-09 09:12+0000\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/kk/)\n"
-"Language: kk\n"
+"Language-Team: Kazakh (http://www.transifex.com/toofishes/archlinux-pacman/language/kk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: kk\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: lib/libalpm/add.c:86
@@ -53,9 +52,7 @@ msgstr "%s атын жаңа %s атына ауыстыру мүмкін еме
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"файл %s дестесі үшін файлдар тізімінен табылмады. %s тарқатылуын аттап "
-"кетеміз\n"
+msgstr "файл %s дестесі үшін файлдар тізімінен табылмады. %s тарқатылуын аттап кетеміз\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -67,18 +64,14 @@ msgstr "%s%s тарқату мүмкін емес: жол тым ұзын"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"%s бумасының қатынау рұқсаттары әр түрлі\n"
-"файлдық жүйе: %o  десте: %o\n"
+msgstr "%s бумасының қатынау рұқсаттары әр түрлі\nфайлдық жүйе: %o  десте: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"%s ішінде бумалар иесі әр түрлі\n"
-"файлдық жүйе: %u:%u  десте: %u:%u\n"
+msgstr "%s ішінде бумалар иесі әр түрлі\nфайлдық жүйе: %u:%u  десте: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -353,8 +346,7 @@ msgstr "'%s' файлын  %s адресінен алу қатемен аяқт
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"'%s' файлын %s ішінен алу қатесі : күтілген жүктеп алу өлшемінен асып кетті\n"
+msgstr "'%s' файлын %s ішінен алу қатесі : күтілген жүктеп алу өлшемінен асып кетті\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -729,8 +721,7 @@ msgstr "дестелердің шешілмейтін ерегісі табыл
 #: lib/libalpm/sync.c:556
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr ""
-"мақсаттар тізімінен '%s' өшіріледі, өйткені ол '%s' дестесімен ерегіседі\n"
+msgstr "мақсаттар тізімінен '%s' өшіріледі, өйткені ол '%s' дестесімен ерегіседі\n"
 
 #: lib/libalpm/sync.c:1014
 #, c-format
diff --git a/lib/libalpm/po/ko.po b/lib/libalpm/po/ko.po
index f1ba0713..3617594f 100644
--- a/lib/libalpm/po/ko.po
+++ b/lib/libalpm/po/ko.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Ji-Hyeon Gim <potatogim@potatogim.net>, 2014
 # Sungjin Kang <potopro@gmail.com>, 2012-2013
@@ -17,12 +17,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-09 11:23+0000\n"
 "Last-Translator: Taegil Bae <esrevinu@gmail.com>\n"
-"Language-Team: Korean (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ko/)\n"
-"Language: ko\n"
+"Language-Team: Korean (http://www.transifex.com/toofishes/archlinux-pacman/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: lib/libalpm/add.c:86
@@ -58,9 +57,7 @@ msgstr "%s의 이름을 %s로 바꾸지 못했습니다.(%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"꾸러미 %s의 파일 목록에서 파일을 찾을 수가 없습니다. %s의 추출을 건너뜁니"
-"다.\n"
+msgstr "꾸러미 %s의 파일 목록에서 파일을 찾을 수가 없습니다. %s의 추출을 건너뜁니다.\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -72,18 +69,14 @@ msgstr "%s%s를 추출할 수 없습니다: 경로가 너무 깁니다"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"%s 디렉터리 권한이 다릅니다.\n"
-"파일시스템: %o 꾸러미: %o\n"
+msgstr "%s 디렉터리 권한이 다릅니다.\n파일시스템: %o 꾸러미: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"%s 디렉터리의 소유주가 다릅니다.\n"
-"파일시스템: %u:%u 꾸러미: %u:%u\n"
+msgstr "%s 디렉터리의 소유주가 다릅니다.\n파일시스템: %u:%u 꾸러미: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
diff --git a/lib/libalpm/po/lt.po b/lib/libalpm/po/lt.po
index 122dbd3f..0c366e64 100644
--- a/lib/libalpm/po/lt.po
+++ b/lib/libalpm/po/lt.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Algimantas Margevičius <gymka@archlinux.lt>, 2013-2014
 # Algimantas Margevičius <gymka@mail.ru>, 2011
@@ -17,14 +17,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-21 23:03+0000\n"
 "Last-Translator: Moo\n"
-"Language-Team: Lithuanian (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/lt/)\n"
-"Language: lt\n"
+"Language-Team: Lithuanian (http://www.transifex.com/toofishes/archlinux-pacman/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: lib/libalpm/add.c:86
 #, c-format
@@ -59,8 +57,7 @@ msgstr "nepavyko pervadint %s į %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"paketo %s failų sąraše failas nerastas. praledžiama %s išarchyvavimas\n"
+msgstr "paketo %s failų sąraše failas nerastas. praledžiama %s išarchyvavimas\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -72,18 +69,14 @@ msgstr "nepavyko išskleisti %s%s: per ilgas kelias"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"%s aplanko leidimai skiriasi\n"
-"failų sistema: %o  paketas: %o\n"
+msgstr "%s aplanko leidimai skiriasi\nfailų sistema: %o  paketas: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"aplanko nuosavybės teisės skiriasi %s\n"
-"failų sistema: %u:%u paketas: %u:%u\n"
+msgstr "aplanko nuosavybės teisės skiriasi %s\nfailų sistema: %u:%u paketas: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -172,14 +165,12 @@ msgstr "nepavyko atverti failo %s: %s\n"
 #: lib/libalpm/be_local.c:712 lib/libalpm/be_sync.c:630
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-"%s duomenų bazės nesuderinamumas: pavadinimas neatitinka nurodyto pakete %s\n"
+msgstr "%s duomenų bazės nesuderinamumas: pavadinimas neatitinka nurodyto pakete %s\n"
 
 #: lib/libalpm/be_local.c:718 lib/libalpm/be_sync.c:636
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"%s duomenų bazės nesuderinamumas: versija neatitinka nurodytos pakete %s\n"
+msgstr "%s duomenų bazės nesuderinamumas: versija neatitinka nurodytos pakete %s\n"
 
 #: lib/libalpm/be_local.c:759
 #, c-format
@@ -245,8 +236,7 @@ msgstr "nepavyko perskaityt paketo aprašymo failo %s iš duomenų bazės „%s
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"%s duomenų bazės nesuderinamumas: netinkamas paketo „%s“ failo vardas\n"
+msgstr "%s duomenų bazės nesuderinamumas: netinkamas paketo „%s“ failo vardas\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
@@ -326,9 +316,7 @@ msgstr "nepavyko nustatyt failų sistemos prijungimo taškų\n"
 #: lib/libalpm/diskspace.c:385
 #, c-format
 msgid "could not determine cachedir mount point %s\n"
-msgstr ""
-"nepavyko nustatyt „cachedir“ prijungimo taško %s\n"
-"\n"
+msgstr "nepavyko nustatyt „cachedir“ prijungimo taško %s\n\n"
 
 #: lib/libalpm/diskspace.c:438
 #, c-format
@@ -363,8 +351,7 @@ msgstr "nepavyko gauti failo „%s“ iš %s : %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"gauti failo „%s“ iš %s nepavyko: viršytas tikėtasis parsiuntimo dydis\n"
+msgstr "gauti failo „%s“ iš %s nepavyko: viršytas tikėtasis parsiuntimo dydis\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
diff --git a/lib/libalpm/po/nb.po b/lib/libalpm/po/nb.po
index b9de84ce..2971f81c 100644
--- a/lib/libalpm/po/nb.po
+++ b/lib/libalpm/po/nb.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Alexander F Rødseth <rodseth@gmail.com>, 2011,2013
 # Alexander F Rødseth <rodseth@gmail.com>, 2011,2013
@@ -14,12 +14,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-09 22:14+0000\n"
 "Last-Translator: Jon Gjengset <jon@thesquareplanet.com>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/nb/)\n"
-"Language: nb\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/toofishes/archlinux-pacman/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -55,8 +54,7 @@ msgstr "kunne ikke omdøpe %s til %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"filen finnes ikke i fillisten for pakken %s. hopper over utpakking av %s\n"
+msgstr "filen finnes ikke i fillisten for pakken %s. hopper over utpakking av %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -68,18 +66,14 @@ msgstr "kunne ikke hente ut %s%s: stien er for lang"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"mapperettigheter er forskjellige i\n"
-"filsystem %s: %o  pakke: %o\n"
+msgstr "mapperettigheter er forskjellige i\nfilsystem %s: %o  pakke: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"mapperettigheter er forskjellige for %s\n"
-"i filsystem: %u:%u pakke: %u:%u\n"
+msgstr "mapperettigheter er forskjellige for %s\ni filsystem: %u:%u pakke: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -839,6 +833,4 @@ msgstr "mellomlageret %s eksisterer ikke, oppretter...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"kunne ikke finne eller opprette mellomlager for pakker, bruker %s "
-"istedenfor\n"
+msgstr "kunne ikke finne eller opprette mellomlager for pakker, bruker %s istedenfor\n"
diff --git a/lib/libalpm/po/nl.po b/lib/libalpm/po/nl.po
index b8e10538..05df90fc 100644
--- a/lib/libalpm/po/nl.po
+++ b/lib/libalpm/po/nl.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Peter van den Hurk, 2014
 # Peter van den Hurk, 2014-2015
@@ -18,12 +18,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-20 16:24+0000\n"
 "Last-Translator: Peter van den Hurk\n"
-"Language-Team: Dutch (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/nl/)\n"
-"Language: nl\n"
+"Language-Team: Dutch (http://www.transifex.com/toofishes/archlinux-pacman/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -59,9 +58,7 @@ msgstr "kan %s niet hernoemen als %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"bestand niet gevonden in de bestandslijst voor pakket %s. Uitpakken %s wordt "
-"overgeslaan\n"
+msgstr "bestand niet gevonden in de bestandslijst voor pakket %s. Uitpakken %s wordt overgeslaan\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -73,18 +70,14 @@ msgstr "kan %s%s niet uitpakken: pad te lang"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"rechten voor map %s verschillen\n"
-"bestandssysteem: %o pakket: %o\n"
+msgstr "rechten voor map %s verschillen\nbestandssysteem: %o pakket: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"eigenaar van map %s verschilt\n"
-"bestandssysteem: %u:%u pakket: %u:%u\n"
+msgstr "eigenaar van map %s verschilt\nbestandssysteem: %u:%u pakket: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -178,9 +171,7 @@ msgstr "%s database is inconsistent: naam onjuist voor pakket %s\n"
 #: lib/libalpm/be_local.c:718 lib/libalpm/be_sync.c:636
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"%s database is inconsistent: versie onjuist voor pakket %s\n"
-"\n"
+msgstr "%s database is inconsistent: versie onjuist voor pakket %s\n\n"
 
 #: lib/libalpm/be_local.c:759
 #, c-format
@@ -361,9 +352,7 @@ msgstr "kan het bestand '%s' niet ophalen van %s : %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"kon het bestand '%s' niet ophalen van %s : verwachte download grootte "
-"overschreden\n"
+msgstr "kon het bestand '%s' niet ophalen van %s : verwachte download grootte overschreden\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -738,8 +727,7 @@ msgstr "onoplosbaar conflict tussen paketten gevonden\n"
 #: lib/libalpm/sync.c:556
 #, c-format
 msgid "removing '%s' from target list because it conflicts with '%s'\n"
-msgstr ""
-"'%s' wordt verwijderd van de doellijst omdat het conflicteert met '%s'\n"
+msgstr "'%s' wordt verwijderd van de doellijst omdat het conflicteert met '%s'\n"
 
 #: lib/libalpm/sync.c:1014
 #, c-format
diff --git a/lib/libalpm/po/pl.po b/lib/libalpm/po/pl.po
index b18d7f73..6442e5bc 100644
--- a/lib/libalpm/po/pl.po
+++ b/lib/libalpm/po/pl.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Bartek Piotrowski <barthalion@gmail.com>, 2011
 # Bartłomiej Piotrowski <spam@bpiotrowski.pl>, 2014
@@ -19,14 +19,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-19 08:55+0000\n"
 "Last-Translator: megamann\n"
-"Language-Team: Polish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/pl/)\n"
-"Language: pl\n"
+"Language-Team: Polish (http://www.transifex.com/toofishes/archlinux-pacman/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: lib/libalpm/add.c:86
 #, c-format
@@ -61,9 +59,7 @@ msgstr "nie udało się zmienić nazwy %s na %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"plik nie został znaleziony na liście plików pakietu %s, pomijam rozpakowanie "
-"%s\n"
+msgstr "plik nie został znaleziony na liście plików pakietu %s, pomijam rozpakowanie %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -75,18 +71,14 @@ msgstr "nie można wyodrębnić %s%s: ścieżka zbyt długa"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"Różne uprawnienia dla katalogu dla %s\n"
-"system plików: %o pakiet: %o\n"
+msgstr "Różne uprawnienia dla katalogu dla %s\nsystem plików: %o pakiet: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"różne uprawnienia dla katalogu dla %s\n"
-"system plików: %u:%u pakiet: %u:%u\n"
+msgstr "różne uprawnienia dla katalogu dla %s\nsystem plików: %u:%u pakiet: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -246,8 +238,7 @@ msgstr "nie można odczytać pliku opisowego pakietu '%s' z bazy '%s'\n"
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"Baza danych %s jest niespójna: nazwa pliku pakietu %s jest niedozwolona\n"
+msgstr "Baza danych %s jest niespójna: nazwa pliku pakietu %s jest niedozwolona\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
@@ -362,9 +353,7 @@ msgstr "nie udało się pobrać pliku '%s' z %s : %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"nie powiodło się pobieranie pliku '%s' z %s : oczekiwany rozmiar pobierania "
-"został przekroczony\n"
+msgstr "nie powiodło się pobieranie pliku '%s' z %s : oczekiwany rozmiar pobierania został przekroczony\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -644,8 +633,7 @@ msgstr "błąd gpgme"
 #: lib/libalpm/error.c:161
 #, c-format
 msgid "error invoking external downloader"
-msgstr ""
-"wystąpił błąd podczas odwoływania się do zewnętrznego programu pobierającego"
+msgstr "wystąpił błąd podczas odwoływania się do zewnętrznego programu pobierającego"
 
 #: lib/libalpm/error.c:164
 #, c-format
@@ -850,6 +838,4 @@ msgstr "brak pamięci podręcznej dla %s, tworzenie...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"nie można odnaleźć lub stworzyć pamięci podręcznej pakietu, używam %s w "
-"zamian\n"
+msgstr "nie można odnaleźć lub stworzyć pamięci podręcznej pakietu, używam %s w zamian\n"
diff --git a/lib/libalpm/po/pt.po b/lib/libalpm/po/pt.po
index ad4dc3d8..c9688857 100644
--- a/lib/libalpm/po/pt.po
+++ b/lib/libalpm/po/pt.po
@@ -1,25 +1,25 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # ArchGalileu <geral@gasparsantos.eu>, 2011,2014
+# Bruno Guerreiro <american.jesus.pt@gmail.com>, 2016
 # ArchGalileu <geral@gasparsantos.eu>, 2011
-# R00KIE <registosites@hotmail.com>, 2013
+# R00KIE <registosites@hotmail.com>, 2013,2016
 # R00KIE <registosites@hotmail.com>, 2013,2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
-"PO-Revision-Date: 2016-01-17 14:03+0000\n"
-"Last-Translator: R00KIE <registosites@hotmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/pt/)\n"
-"Language: pt\n"
+"PO-Revision-Date: 2016-02-01 20:41+0000\n"
+"Last-Translator: Bruno Guerreiro <american.jesus.pt@gmail.com>\n"
+"Language-Team: Portuguese (http://www.transifex.com/toofishes/archlinux-pacman/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -55,9 +55,7 @@ msgstr "não foi possível renomear %s para %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"O Ficheiro não foi encontrado na lista dos mesmos para o pacote %s. Ignorada "
-"a extração de %s\n"
+msgstr "o ficheiro não foi encontrado na lista dos mesmos para o pacote %s. ignorada a extração de %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -69,19 +67,14 @@ msgstr "incapaz de extrair %s%s: caminho demasiado longo"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"permissões do diretório diferem em %s\n"
-"sistema de ficheiros: %o  pacote: %o\n"
+msgstr "permissões do diretório diferem em %s\nsistema de ficheiros: %o  pacote: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"A propriedade do diretório é diferente no\n"
-"sistema de ficheiros %s: %u:%u pacote: %u:%u\n"
-"\n"
+msgstr "a propriedade do diretório é diferente no\nsistema de ficheiros %s: %u:%u  pacote: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -175,8 +168,7 @@ msgstr "%s base de dados está inconsistente: nome no pacote %s não coincide\n"
 #: lib/libalpm/be_local.c:718 lib/libalpm/be_sync.c:636
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"%s base de dados está inconsistente: versão do pacote %s não coincide\n"
+msgstr "%s base de dados está inconsistente: versão do pacote %s não coincide\n"
 
 #: lib/libalpm/be_local.c:759
 #, c-format
@@ -192,7 +184,7 @@ msgstr "erro ao ler o pacote %s: %s\n"
 #: lib/libalpm/be_package.c:490 lib/libalpm/be_package.c:514
 #, c-format
 msgid "error while reading mtree of package %s: %s\n"
-msgstr "Erro ao ler a árvore do pacote %s: %s\n"
+msgstr "erro ao ler a árvore do pacote %s: %s\n"
 
 #: lib/libalpm/be_package.c:600
 #, c-format
@@ -212,7 +204,7 @@ msgstr "em falta a versão do pacote em %s\n"
 #: lib/libalpm/be_package.c:613
 #, c-format
 msgid "invalid package version in %s\n"
-msgstr "Versão inválida do pacote em %s\n"
+msgstr "versão inválida do pacote em %s\n"
 
 #: lib/libalpm/be_package.c:654
 #, c-format
@@ -237,27 +229,22 @@ msgstr "a remover ficheiro inválido: %s\n"
 #: lib/libalpm/be_sync.c:502
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"não é possível analisar descrição do pacote '%s' da base de dados '%s'\n"
+msgstr "não é possível analisar descrição do pacote '%s' da base de dados '%s'\n"
 
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"a base de dados %s está inconsistente: nome do ficheiro de pacote %s é "
-"ilegal\n"
+msgstr "a base de dados %s está inconsistente: nome do ficheiro de pacote %s é ilegal\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
-msgstr ""
-"a base de dados %s está inconsistente: o nome de ficheiro do pacote %s é "
-"demasiado longo\n"
+msgstr "a base de dados %s está inconsistente: o nome de ficheiro do pacote %s é demasiado longo\n"
 
 #: lib/libalpm/be_sync.c:611
 #, c-format
 msgid "unknown database file: %s\n"
-msgstr "Ficheiro desconhecido da base de dados: %s\n"
+msgstr "ficheiro desconhecido da base de dados: %s\n"
 
 #: lib/libalpm/db.c:370
 #, c-format
@@ -292,8 +279,7 @@ msgstr "não é possível resolver \"%s\", uma dependência de \"%s\"\n"
 #: lib/libalpm/diskspace.c:78
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
-"não foi possível obter informações do sistema de ficheiros para %s: %s\n"
+msgstr "não foi possível obter informações do sistema de ficheiros para %s: %s\n"
 
 #: lib/libalpm/diskspace.c:108
 #, c-format
@@ -313,19 +299,17 @@ msgstr "não foi possível obter a informação do ficheiro para %s\n"
 #: lib/libalpm/diskspace.c:256 lib/libalpm/diskspace.c:315
 #, c-format
 msgid "could not determine mount point for file %s\n"
-msgstr "Não foi possível determinar o ponto de montagem para o ficheiro %s\n"
+msgstr "não foi possível determinar o ponto de montagem para o ficheiro %s\n"
 
 #: lib/libalpm/diskspace.c:354
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %ju blocks free\n"
-msgstr ""
-"Partição %s demasiado cheia: %jd blocos necessários, %ju blocos livres\n"
+msgstr "Partição %s demasiado cheia: %jd blocos necessários, %ju blocos livres\n"
 
 #: lib/libalpm/diskspace.c:379 lib/libalpm/diskspace.c:433
 #, c-format
 msgid "could not determine filesystem mount points\n"
-msgstr ""
-"não foi possível determinar os pontos de montagem do sistema de ficheiros\n"
+msgstr "não foi possível determinar os pontos de montagem do sistema de ficheiros\n"
 
 #: lib/libalpm/diskspace.c:385
 #, c-format
@@ -350,7 +334,7 @@ msgstr "disco"
 #: lib/libalpm/dload.c:373
 #, c-format
 msgid "failed to create temporary file for download\n"
-msgstr "Erro ao criar ficheiro temporário para download\n"
+msgstr "erro ao criar ficheiro temporário para download\n"
 
 #: lib/libalpm/dload.c:418
 #, c-format
@@ -365,9 +349,7 @@ msgstr "falha ao obter ficheiro '%s' de %s : %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"Falhou a obtenção do ficheiro '%s' de %s : o tamanho expectado da "
-"transferência foi excedido\n"
+msgstr "falhou a obtenção do ficheiro '%s' de %s : o tamanho expectado da transferência foi excedido\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -642,7 +624,7 @@ msgstr "erro na biblioteca de descargas"
 #: lib/libalpm/error.c:159
 #, c-format
 msgid "gpgme error"
-msgstr "erro GPGME"
+msgstr "erro gpgme"
 
 #: lib/libalpm/error.c:161
 #, c-format
@@ -657,7 +639,7 @@ msgstr "erro inesperado"
 #: lib/libalpm/handle.c:155
 #, c-format
 msgid "lock file missing %s\n"
-msgstr "Bloquear o ficheiro em falta %s\n"
+msgstr "bloquear o ficheiro em falta %s\n"
 
 #: lib/libalpm/handle.c:161
 #, c-format
@@ -667,8 +649,7 @@ msgstr "não foi possível remover o ficheiro bloqueado %s\n"
 #: lib/libalpm/package.c:568
 #, c-format
 msgid "could not fully load metadata for package %s-%s\n"
-msgstr ""
-"não é possível apresentar na totalidade metadados para o pacote %s-%s\n"
+msgstr "não é possível apresentar na totalidade metadados para o pacote %s-%s\n"
 
 #: lib/libalpm/remove.c:118
 #, c-format
@@ -678,7 +659,7 @@ msgstr "não foi possível encontrar %s na base de dados - a ignorar\n"
 #: lib/libalpm/remove.c:153
 #, c-format
 msgid "removing %s from target list\n"
-msgstr "a remover \"%s\" da lista de pacotes a serem actualizados\n"
+msgstr "a remover %s da lista de pacotes a serem actualizados\n"
 
 #: lib/libalpm/remove.c:343
 #, c-format
@@ -693,7 +674,7 @@ msgstr "não foi possível aceder ao diretório: %s: %s\n"
 #: lib/libalpm/remove.c:540
 #, c-format
 msgid "cannot remove %s (%s)\n"
-msgstr "Não é possível remover%s (%s)\n"
+msgstr "não é possível remover%s (%s)\n"
 
 #: lib/libalpm/remove.c:713
 #, c-format
@@ -808,7 +789,7 @@ msgstr "incapaz de ler do pipe (%s)\n"
 #: lib/libalpm/util.c:584 lib/libalpm/util.c:590
 #, c-format
 msgid "could not create pipe (%s)\n"
-msgstr "Não foi possível criar pipe (%s)\n"
+msgstr "não foi possível criar pipe (%s)\n"
 
 #: lib/libalpm/util.c:598
 #, c-format
@@ -853,6 +834,4 @@ msgstr "cache %s não existe, a criar...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"não é possível encontrar ou criar cache do pacote, em uso %s como "
-"alternativa\n"
+msgstr "não é possível encontrar ou criar cache do pacote, em uso %s como alternativa\n"
diff --git a/lib/libalpm/po/pt_BR.po b/lib/libalpm/po/pt_BR.po
index 36326ab1..24c9d2cb 100644
--- a/lib/libalpm/po/pt_BR.po
+++ b/lib/libalpm/po/pt_BR.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # ambaratti <ambaratti.listas@gmail.com>, 2011
 # Dan McGee <dpmcgee@gmail.com>, 2011
@@ -17,12 +17,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-09 15:44+0000\n"
 "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/pt_BR/)\n"
-"Language: pt_BR\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/toofishes/archlinux-pacman/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -58,9 +57,7 @@ msgstr "não foi possível renomear %s para %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"arquivo não encontrado na lista de aquivos para o pacote %s; ignorando "
-"extração de %s\n"
+msgstr "arquivo não encontrado na lista de aquivos para o pacote %s; ignorando extração de %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -72,18 +69,14 @@ msgstr "não foi possível extrair %s%s: caminho longo demais"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"permissões de diretório diferem em %s\n"
-"sistema de arquivos: %o  pacote: %o\n"
+msgstr "permissões de diretório diferem em %s\nsistema de arquivos: %o  pacote: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"propriedade sobre o diretório difere em %s\n"
-"sistema: %u:%u pacote: %u:%u\n"
+msgstr "propriedade sobre o diretório difere em %s\nsistema: %u:%u pacote: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -172,14 +165,12 @@ msgstr "não foi possível abrir o arquivo %s: %s\n"
 #: lib/libalpm/be_local.c:712 lib/libalpm/be_sync.c:630
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-"base de dados %s está inconsistente: nome não coincidente no pacote %s\n"
+msgstr "base de dados %s está inconsistente: nome não coincidente no pacote %s\n"
 
 #: lib/libalpm/be_local.c:718 lib/libalpm/be_sync.c:636
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"base de dados %s está inconsistente: versão não coincidente no pacote %s\n"
+msgstr "base de dados %s está inconsistente: versão não coincidente no pacote %s\n"
 
 #: lib/libalpm/be_local.c:759
 #, c-format
@@ -240,22 +231,17 @@ msgstr "removendo arquivo inválido: %s\n"
 #: lib/libalpm/be_sync.c:502
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"não foi possível analisar arquivo de descrição de pacote \"%s\" da base de "
-"dados \"%s\"\n"
+msgstr "não foi possível analisar arquivo de descrição de pacote \"%s\" da base de dados \"%s\"\n"
 
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"base de dados %s está inconsistente: nome de arquivo do pacote %s é ilegal\n"
+msgstr "base de dados %s está inconsistente: nome de arquivo do pacote %s é ilegal\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
-msgstr ""
-"base de dados %s está inconsistente: nome de arquivo do pacote %s é muito "
-"grande\n"
+msgstr "base de dados %s está inconsistente: nome de arquivo do pacote %s é muito grande\n"
 
 #: lib/libalpm/be_sync.c:611
 #, c-format
@@ -295,8 +281,7 @@ msgstr "não é possível resolver \"%s\", uma dependência de \"%s\"\n"
 #: lib/libalpm/diskspace.c:78
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
-"não foi possível obter informações do sistema de arquivos para %s: %s\n"
+msgstr "não foi possível obter informações do sistema de arquivos para %s: %s\n"
 
 #: lib/libalpm/diskspace.c:108
 #, c-format
@@ -326,8 +311,7 @@ msgstr "Partição %s cheia demais: %jd blocos necessários, %ju blocos livres\n
 #: lib/libalpm/diskspace.c:379 lib/libalpm/diskspace.c:433
 #, c-format
 msgid "could not determine filesystem mount points\n"
-msgstr ""
-"não foi possível determinar os pontos de montagem do sistema de arquivos\n"
+msgstr "não foi possível determinar os pontos de montagem do sistema de arquivos\n"
 
 #: lib/libalpm/diskspace.c:385
 #, c-format
@@ -367,8 +351,7 @@ msgstr "falha ao obter o arquivo \"%s\" de %s : %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"falha ao obter arquivo \"%s\" de %s: esperava tamanho de download excedido\n"
+msgstr "falha ao obter arquivo \"%s\" de %s: esperava tamanho de download excedido\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -853,5 +836,4 @@ msgstr "cache %s não existe, criando...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"falha em encontrar ou criar cache do pacote, usando %s em substituição.\n"
+msgstr "falha em encontrar ou criar cache do pacote, usando %s em substituição.\n"
diff --git a/lib/libalpm/po/ro.po b/lib/libalpm/po/ro.po
index e1c523c0..f74a9db3 100644
--- a/lib/libalpm/po/ro.po
+++ b/lib/libalpm/po/ro.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Arthur Țițeică <arthur.titeica@gmail.com>, 2013
 # Arthur Titeica <arthur@psw.ro>, 2013
@@ -22,14 +22,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-09 17:58+0000\n"
 "Last-Translator: mihaicris <Mihai.cristescu@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ro/)\n"
-"Language: ro\n"
+"Language-Team: Romanian (http://www.transifex.com/toofishes/archlinux-pacman/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1));\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
 #: lib/libalpm/add.c:86
 #, c-format
@@ -64,9 +62,7 @@ msgstr "nu s-a putut redenumi %s în %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"fișierul nu a fost găsit în lista de fișiere pentru pachetul %s. Se omite "
-"extragerea lui %s\n"
+msgstr "fișierul nu a fost găsit în lista de fișiere pentru pachetul %s. Se omite extragerea lui %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -78,18 +74,14 @@ msgstr "nu se poate extrage %s%s: cale prea lungă"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"permisiunile directorului diferă la %s\n"
-"sistem fișiere: %o  pachet: %o\n"
+msgstr "permisiunile directorului diferă la %s\nsistem fișiere: %o  pachet: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"proprietarul directorului diferă pentru %s\n"
-"sistem fișiere: %u:%u pachet: %u:%u\n"
+msgstr "proprietarul directorului diferă pentru %s\nsistem fișiere: %u:%u pachet: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -178,14 +170,12 @@ msgstr "nu s-a putut deschide fișierul %s: %s\n"
 #: lib/libalpm/be_local.c:712 lib/libalpm/be_sync.c:630
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-"baza de date %s este inconsecventă: nepotrivire de nume la pachetul %s\n"
+msgstr "baza de date %s este inconsecventă: nepotrivire de nume la pachetul %s\n"
 
 #: lib/libalpm/be_local.c:718 lib/libalpm/be_sync.c:636
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"baza de date %s este inconsecventă: nepotrivire de versiune la pachetul %s\n"
+msgstr "baza de date %s este inconsecventă: nepotrivire de versiune la pachetul %s\n"
 
 #: lib/libalpm/be_local.c:759
 #, c-format
@@ -246,22 +236,17 @@ msgstr "se elimină fișierul nevalid: %s\n"
 #: lib/libalpm/be_sync.c:502
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"nu s-a putut analiza fișierul '%s' de descriere a pachetului din db '%s'\n"
+msgstr "nu s-a putut analiza fișierul '%s' de descriere a pachetului din db '%s'\n"
 
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"baza de date %s este inconsistentă: numele de fișier al pachetului %s este "
-"nepermis\n"
+msgstr "baza de date %s este inconsistentă: numele de fișier al pachetului %s este nepermis\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
-msgstr ""
-"baza de date %s este inconsistentă: numele de fișier al pachetului %s este "
-"prea lung\n"
+msgstr "baza de date %s este inconsistentă: numele de fișier al pachetului %s este prea lung\n"
 
 #: lib/libalpm/be_sync.c:611
 #, c-format
@@ -301,8 +286,7 @@ msgstr "nu se poate rezolva \"%s\", o dependență a \"%s\"\n"
 #: lib/libalpm/diskspace.c:78
 #, c-format
 msgid "could not get filesystem information for %s: %s\n"
-msgstr ""
-"nu s-au putut obține informații despre sistemul de fișiere pentru %s: %s\n"
+msgstr "nu s-au putut obține informații despre sistemul de fișiere pentru %s: %s\n"
 
 #: lib/libalpm/diskspace.c:108
 #, c-format
@@ -332,8 +316,7 @@ msgstr "Partiția %s prea plină: %jd blocuri necesare, %ju blocuri libere\n"
 #: lib/libalpm/diskspace.c:379 lib/libalpm/diskspace.c:433
 #, c-format
 msgid "could not determine filesystem mount points\n"
-msgstr ""
-"nu s-au putut determina locurile de montare ale sistemului de fișiere\n"
+msgstr "nu s-au putut determina locurile de montare ale sistemului de fișiere\n"
 
 #: lib/libalpm/diskspace.c:385
 #, c-format
@@ -373,9 +356,7 @@ msgstr "eșec la obținerea fișierului '%s' din %s : %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"eșec la obținerea fișierului '%s' din %s : dimensiunea de descărcare "
-"așteptată a fost depășită\n"
+msgstr "eșec la obținerea fișierului '%s' din %s : dimensiunea de descărcare așteptată a fost depășită\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -860,6 +841,4 @@ msgstr "nu există cache %s, se crează...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"nu s-a putut găsi sau crea cache-ul pentru pachet; se folosește %s în "
-"schimb.\n"
+msgstr "nu s-a putut găsi sau crea cache-ul pentru pachet; se folosește %s în schimb.\n"
diff --git a/lib/libalpm/po/ru.po b/lib/libalpm/po/ru.po
index 2d941bfe..e821f5d7 100644
--- a/lib/libalpm/po/ru.po
+++ b/lib/libalpm/po/ru.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011
 # Ivan Yurasov <vdk@gmx.us>, 2011
@@ -18,15 +18,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-11 10:01+0000\n"
 "Last-Translator: partizan <serg.partizan@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ru/)\n"
-"Language: ru\n"
+"Language-Team: Russian (http://www.transifex.com/toofishes/archlinux-pacman/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
-"%100>=11 && n%100<=14)? 2 : 3);\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: lib/libalpm/add.c:86
 #, c-format
@@ -73,18 +70,14 @@ msgstr "не удалось извлечь %s%s: путь слишком дли
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"права доступа различаются у каталога %s\n"
-"файловая система: %o  пакет: %o\n"
+msgstr "права доступа различаются у каталога %s\nфайловая система: %o  пакет: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"различаются владельцы директории '%s'\n"
-"файловая система: %u:%u  пакет: %u:%u\n"
+msgstr "различаются владельцы директории '%s'\nфайловая система: %u:%u  пакет: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -173,14 +166,12 @@ msgstr "не удалось открыть файл %s: %s\n"
 #: lib/libalpm/be_local.c:712 lib/libalpm/be_sync.c:630
 #, c-format
 msgid "%s database is inconsistent: name mismatch on package %s\n"
-msgstr ""
-"противоречивая информация в базе данных %s: не совпадает имя пакета %s\n"
+msgstr "противоречивая информация в базе данных %s: не совпадает имя пакета %s\n"
 
 #: lib/libalpm/be_local.c:718 lib/libalpm/be_sync.c:636
 #, c-format
 msgid "%s database is inconsistent: version mismatch on package %s\n"
-msgstr ""
-"противоречивая информация в базе данных %s: не совпадает версия пакета %s\n"
+msgstr "противоречивая информация в базе данных %s: не совпадает версия пакета %s\n"
 
 #: lib/libalpm/be_local.c:759
 #, c-format
@@ -246,16 +237,12 @@ msgstr "не удалось разобрать файл описания '%s' и
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"противоречивая информация в базе данных %s: неправильное имя файла для "
-"пакета %s\n"
+msgstr "противоречивая информация в базе данных %s: неправильное имя файла для пакета %s\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is too long\n"
-msgstr ""
-"противоречивая информация в базе данных %s: имя файла пакета %s слишком "
-"длинное\n"
+msgstr "противоречивая информация в базе данных %s: имя файла пакета %s слишком длинное\n"
 
 #: lib/libalpm/be_sync.c:611
 #, c-format
diff --git a/lib/libalpm/po/sk.po b/lib/libalpm/po/sk.po
index 7649c741..b99d452d 100644
--- a/lib/libalpm/po/sk.po
+++ b/lib/libalpm/po/sk.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # archetyp <archetyp@linuxmail.org>, 2013
 # archetyp <archetyp@linuxmail.org>, 2013-2015
@@ -17,12 +17,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-22 14:03+0000\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
-"Language-Team: Slovak (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/sk/)\n"
-"Language: sk\n"
+"Language-Team: Slovak (http://www.transifex.com/toofishes/archlinux-pacman/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: lib/libalpm/add.c:86
@@ -58,9 +57,7 @@ msgstr "nie je možné premenovať %s na %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"súbor nebol nájdený v zozname súborov balíčka %s. preskakujem rozbaľovanie "
-"%s\n"
+msgstr "súbor nebol nájdený v zozname súborov balíčka %s. preskakujem rozbaľovanie %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -72,18 +69,14 @@ msgstr "nepodarilo sa extrahovať %s%s: cesta je príliš dlhá"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"prístupové práva adresára %s sa nezhodujú\n"
-"súborový systém: %o  balíček: %o\n"
+msgstr "prístupové práva adresára %s sa nezhodujú\nsúborový systém: %o  balíček: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"vlastníctvo adresára %s sa nezhoduje\n"
-"súborový systém: %u:%u  balíček: %u:%u\n"
+msgstr "vlastníctvo adresára %s sa nezhoduje\nsúborový systém: %u:%u  balíček: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -313,8 +306,7 @@ msgstr "nepodarilo sa určiť bod pripojenia pre súbor %s\n"
 #: lib/libalpm/diskspace.c:354
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %ju blocks free\n"
-msgstr ""
-"Partícia %s je preplnená: %jd blokov je potrebných, %ju blokov je voľných\n"
+msgstr "Partícia %s je preplnená: %jd blokov je potrebných, %ju blokov je voľných\n"
 
 #: lib/libalpm/diskspace.c:379 lib/libalpm/diskspace.c:433
 #, c-format
@@ -324,9 +316,7 @@ msgstr "nepodarilo sa uričť body pripojenia pre súborový systém\n"
 #: lib/libalpm/diskspace.c:385
 #, c-format
 msgid "could not determine cachedir mount point %s\n"
-msgstr ""
-"nepodarilo sa určiť pripojenie adresára cachedir %s\n"
-"\n"
+msgstr "nepodarilo sa určiť pripojenie adresára cachedir %s\n\n"
 
 #: lib/libalpm/diskspace.c:438
 #, c-format
@@ -361,9 +351,7 @@ msgstr "chyba pri získavaní súboru '%s' z %s: %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"chyba pri sťahovaní súboru '%s' z %s : očakávaná veľkosť sťahovaného súboru "
-"bola prekročená\n"
+msgstr "chyba pri sťahovaní súboru '%s' z %s : očakávaná veľkosť sťahovaného súboru bola prekročená\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -848,6 +836,4 @@ msgstr "neexistuje cache %s, vytváram...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"nie je možné nájsť alebo vytvoriť cache pre balíček,  miesto toho sa používa "
-"%s\n"
+msgstr "nie je možné nájsť alebo vytvoriť cache pre balíček,  miesto toho sa používa %s\n"
diff --git a/lib/libalpm/po/sl.po b/lib/libalpm/po/sl.po
index 5ab87ae4..4f43a257 100644
--- a/lib/libalpm/po/sl.po
+++ b/lib/libalpm/po/sl.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Abomination1 <drozic1989@gmail.com>, 2014
 # ansich <mojmejlzaforume@gmail.com>, 2014
@@ -18,14 +18,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-09 06:03+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Slovenian (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/sl/)\n"
-"Language: sl\n"
+"Language-Team: Slovenian (http://www.transifex.com/toofishes/archlinux-pacman/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
 #: lib/libalpm/add.c:86
 #, c-format
@@ -60,9 +58,7 @@ msgstr "%s ni mogoče preimenovati v %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"datoteke ni bilo mogoče najti v seznamu datotek za paket %s. preskoči "
-"razširjanje %s\n"
+msgstr "datoteke ni bilo mogoče najti v seznamu datotek za paket %s. preskoči razširjanje %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -74,25 +70,19 @@ msgstr ""
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"dovoljenje mape na %s se razlikuje\n"
-"datotečni sistem: %o paket: %o\n"
+msgstr "dovoljenje mape na %s se razlikuje\ndatotečni sistem: %o paket: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"lastnik mape na %s se razlikuje\n"
-"datotečni sistem: %u:%u paket: %u:%u\n"
+msgstr "lastnik mape na %s se razlikuje\ndatotečni sistem: %u:%u paket: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
 msgid "extract: not overwriting dir with file %s\n"
-msgstr ""
-"razširi: ne prepiši mape z datoteko %s\n"
-"\n"
+msgstr "razširi: ne prepiši mape z datoteko %s\n\n"
 
 #: lib/libalpm/add.c:300
 #, c-format
@@ -242,15 +232,12 @@ msgstr "odstranjevanje neveljavne datoteke: %s\n"
 #: lib/libalpm/be_sync.c:502
 #, c-format
 msgid "could not parse package description file '%s' from db '%s'\n"
-msgstr ""
-"ni bilo mogoče razčleniti datoteke opisa paketa '%s' iz podatkovne baze "
-"'%s'\n"
+msgstr "ni bilo mogoče razčleniti datoteke opisa paketa '%s' iz podatkovne baze '%s'\n"
 
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"%s podatkovna baza je v neskladju: ime datoteke paketa %s je neveljavno\n"
+msgstr "%s podatkovna baza je v neskladju: ime datoteke paketa %s je neveljavno\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
@@ -365,9 +352,7 @@ msgstr "napaka pri pridobivanju datoteke '%s' iz %s : %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"napaka pri pridobivanju datoteke '%s' iz %s : pričakovana velikost prenosa "
-"presežena\n"
+msgstr "napaka pri pridobivanju datoteke '%s' iz %s : pričakovana velikost prenosa presežena\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -852,6 +837,4 @@ msgstr "%s predpomnilnik ne obstaja, se ustvarja ...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"predpomnilnika paketa ni bilo mogoče najti ali ustvariti, zato se uporabi "
-"%s\n"
+msgstr "predpomnilnika paketa ni bilo mogoče najti ali ustvariti, zato se uporabi %s\n"
diff --git a/lib/libalpm/po/sr.po b/lib/libalpm/po/sr.po
index 09c22e72..6071b309 100644
--- a/lib/libalpm/po/sr.po
+++ b/lib/libalpm/po/sr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Mladen Pejaković <pejakm@autistici.org>, 2013
 # Mladen Pejaković <pejakm@autistici.org>, 2013
@@ -16,14 +16,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-15 14:16+0000\n"
 "Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/sr/)\n"
-"Language: sr\n"
+"Language-Team: Serbian (http://www.transifex.com/toofishes/archlinux-pacman/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: lib/libalpm/add.c:86
 #, c-format
@@ -70,18 +68,14 @@ msgstr "не могу да распакујем %s%s: путања је пред
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"дозволе фасцикле се разликују за %s\n"
-"систем фајлова: %o пакет: %o\n"
+msgstr "дозволе фасцикле се разликују за %s\nсистем фајлова: %o пакет: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"власништво фасциклре се разликује за %s\n"
-"систем фајлова: %u:%u  пакет: %u:%u\n"
+msgstr "власништво фасциклре се разликује за %s\nсистем фајлова: %u:%u  пакет: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -356,9 +350,7 @@ msgstr "неуспешно преузимање фајла „%s“ са „%s
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"неуспело добављање фајла %s са %s: премашена је предвиђена величина "
-"преузимања\n"
+msgstr "неуспело добављање фајла %s са %s: премашена је предвиђена величина преузимања\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
diff --git a/lib/libalpm/po/sr@latin.po b/lib/libalpm/po/sr@latin.po
index a6eb0e72..0cfef9c3 100644
--- a/lib/libalpm/po/sr@latin.po
+++ b/lib/libalpm/po/sr@latin.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Mladen Pejaković <pejakm@autistici.org>, 2013
 # Mladen Pejaković <pejakm@autistici.org>, 2013
@@ -16,14 +16,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-15 14:17+0000\n"
 "Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/sr@latin/)\n"
-"Language: sr@latin\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/toofishes/archlinux-pacman/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: lib/libalpm/add.c:86
 #, c-format
@@ -58,8 +56,7 @@ msgstr "ne mogu da preimenujem %s u %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"fajl nije nađen u spisku fajlova paketa %s, preskačem raspakivanje %s\n"
+msgstr "fajl nije nađen u spisku fajlova paketa %s, preskačem raspakivanje %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -71,18 +68,14 @@ msgstr "ne mogu da raspakujem %s%s: putanja je predugačka"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"dozvole fascikle se razlikuju za %s\n"
-"sistem fajlova: %o paket: %o\n"
+msgstr "dozvole fascikle se razlikuju za %s\nsistem fajlova: %o paket: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"vlasništvo fasciklre se razlikuje za %s\n"
-"sistem fajlova: %u:%u  paket: %u:%u\n"
+msgstr "vlasništvo fasciklre se razlikuje za %s\nsistem fajlova: %u:%u  paket: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -357,9 +350,7 @@ msgstr "neuspešno preuzimanje fajla „%s“ sa „%s“: %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"neuspelo dobavljanje fajla %s sa %s: premašena je predviđena veličina "
-"preuzimanja\n"
+msgstr "neuspelo dobavljanje fajla %s sa %s: premašena je predviđena veličina preuzimanja\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
diff --git a/lib/libalpm/po/sv.po b/lib/libalpm/po/sv.po
index cfb706a1..34230312 100644
--- a/lib/libalpm/po/sv.po
+++ b/lib/libalpm/po/sv.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # , 2011
 # Daniel Sandman <revoltism@gmail.com>, 2013,2015
@@ -13,12 +13,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-09 06:03+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/sv/)\n"
-"Language: sv\n"
+"Language-Team: Swedish (http://www.transifex.com/toofishes/archlinux-pacman/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -66,18 +65,14 @@ msgstr ""
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"katalogrättigheter skiljer sig på %s\n"
-"filsystem: %o  paket: %o\n"
+msgstr "katalogrättigheter skiljer sig på %s\nfilsystem: %o  paket: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"katalogens ägare skiljer sig på %s\n"
-"filsystem: %u:%u paket: %u:%u\n"
+msgstr "katalogens ägare skiljer sig på %s\nfilsystem: %u:%u paket: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -237,9 +232,7 @@ msgstr "Kunde ej finna paketbeskrivningsfilen '%s' från databasen '%s'\n"
 #: lib/libalpm/be_sync.c:535 lib/libalpm/be_sync.c:540
 #, c-format
 msgid "%s database is inconsistent: filename of package %s is illegal\n"
-msgstr ""
-"%s databasen är inkonsekvent: namn på paketet %s är ogiltig⏎\n"
-"\n"
+msgstr "%s databasen är inkonsekvent: namn på paketet %s är ogiltig⏎\n\n"
 
 #: lib/libalpm/be_sync.c:545
 #, c-format
@@ -289,9 +282,7 @@ msgstr "Kunde ej hämta filsysteminformation för %s: %s\n"
 #: lib/libalpm/diskspace.c:108
 #, c-format
 msgid "could not open file: %s: %s\n"
-msgstr ""
-"kunde inte öppna fil: %s: %s⏎\n"
-"\n"
+msgstr "kunde inte öppna fil: %s: %s⏎\n\n"
 
 #: lib/libalpm/diskspace.c:146 lib/libalpm/diskspace.c:159
 #, c-format
@@ -321,9 +312,7 @@ msgstr "Kunde ej bestämma filsystemmonteringspunkter\n"
 #: lib/libalpm/diskspace.c:385
 #, c-format
 msgid "could not determine cachedir mount point %s\n"
-msgstr ""
-"kunde ej fastställa monteringspunkt för cachekatalog %s⏎\n"
-"\n"
+msgstr "kunde ej fastställa monteringspunkt för cachekatalog %s⏎\n\n"
 
 #: lib/libalpm/diskspace.c:438
 #, c-format
@@ -358,10 +347,7 @@ msgstr "misslyckades hämta filen '%s' från %s : %s\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"misslyckades hämta filen '%s' från %s : förväntad nedladdningsstorlek "
-"överskreds\n"
-"\n"
+msgstr "misslyckades hämta filen '%s' från %s : förväntad nedladdningsstorlek överskreds\n\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -681,9 +667,7 @@ msgstr "kan inte ta bort '%s': %s\n"
 #: lib/libalpm/remove.c:383
 #, c-format
 msgid "could not open directory: %s: %s\n"
-msgstr ""
-"kunde inte öppna katalog %s: %s⏎\n"
-"\n"
+msgstr "kunde inte öppna katalog %s: %s⏎\n\n"
 
 #: lib/libalpm/remove.c:540
 #, c-format
@@ -788,9 +772,7 @@ msgstr "kunde inte ta bort tmpdir %s\n"
 #: lib/libalpm/util.c:256
 #, c-format
 msgid "could not stat file %s: %s\n"
-msgstr ""
-"kunde inte få information på fil %s: %s⏎\n"
-"\n"
+msgstr "kunde inte få information på fil %s: %s⏎\n\n"
 
 #: lib/libalpm/util.c:483
 #, c-format
diff --git a/lib/libalpm/po/tr.po b/lib/libalpm/po/tr.po
index d040b437..1e71259f 100644
--- a/lib/libalpm/po/tr.po
+++ b/lib/libalpm/po/tr.po
@@ -1,24 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Atilla Öntaş <tarakbumba@gmail.com>, 2011,2014
 # Dan McGee <dpmcgee@gmail.com>, 2011
+# Demiray Muhterem <mdemiray@msn.com>, 2016
 # Samed Beyribey <ras0ir@eventualis.org>, 2011,2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
-"PO-Revision-Date: 2015-12-09 06:03+0000\n"
-"Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Turkish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/tr/)\n"
-"Language: tr\n"
+"PO-Revision-Date: 2016-02-02 18:34+0000\n"
+"Last-Translator: Demiray Muhterem <mdemiray@msn.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/toofishes/archlinux-pacman/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: lib/libalpm/add.c:86
@@ -54,32 +54,26 @@ msgstr "%s dosyasının ismi %s olarak değiştirilemiyor (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"%s paketinin dosya listesinde dosya bulunamadı. %s paketinin açılması "
-"atlanıyor\n"
+msgstr "%s paketinin dosya listesinde dosya bulunamadı. %s paketinin açılması atlanıyor\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
 msgid "unable to extract %s%s: path too long"
-msgstr ""
+msgstr "%s%s dışarı aktarılamadı: yol çok uzun"
 
 #: lib/libalpm/add.c:241
 #, c-format
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"%s paketi üzerinde dizin izinleri farklı\n"
-"dosya sistemi: %o paket: %o\n"
+msgstr "%s paketi üzerinde dizin izinleri farklı\ndosya sistemi: %o paket: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"%s üzerinde dizin sahipliği farklı\n"
-"dosya sistemi: %u:%u paket: %u:%u\n"
+msgstr "%s üzerinde dizin sahipliği farklı\ndosya sistemi: %u:%u paket: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -89,7 +83,7 @@ msgstr "aç: %s dosyası dizinin üzerine yazılmıyor\n"
 #: lib/libalpm/add.c:300
 #, c-format
 msgid "unable to extract %s.pacnew: path too long"
-msgstr ""
+msgstr "%s.pacnew aktarılamadı: yol çok uzun"
 
 #: lib/libalpm/add.c:501 lib/libalpm/util.c:331 lib/libalpm/util.c:567
 #, c-format
@@ -299,7 +293,7 @@ msgstr "dosya sistemi bilgisi alınamadı\n"
 #: lib/libalpm/diskspace.c:242
 #, c-format
 msgid "could not get file information for %s\n"
-msgstr ""
+msgstr "%s için dosya bilgileri alınamadı\n"
 
 #: lib/libalpm/diskspace.c:256 lib/libalpm/diskspace.c:315
 #, c-format
@@ -309,7 +303,7 @@ msgstr "%s dosyası için bağlama noktası belirlenemedi\n"
 #: lib/libalpm/diskspace.c:354
 #, c-format
 msgid "Partition %s too full: %jd blocks needed, %ju blocks free\n"
-msgstr ""
+msgstr "%s diski çok dolu: %jd blok gerekiyor, %ju blok boşta\n\n"
 
 #: lib/libalpm/diskspace.c:379 lib/libalpm/diskspace.c:433
 #, c-format
@@ -354,9 +348,7 @@ msgstr "%3$s hatası nedeniyle '%1$s' dosyası %2$s adresinden alınamadı\n"
 #: lib/libalpm/dload.c:500
 #, c-format
 msgid "failed retrieving file '%s' from %s : expected download size exceeded\n"
-msgstr ""
-"'%s' dosyası %s üzerinden alınırken hata oluştu: beklenen indirme boyutuna "
-"ulaşıldı\n"
+msgstr "'%s' dosyası %s üzerinden alınırken hata oluştu: beklenen indirme boyutuna ulaşıldı\n"
 
 #: lib/libalpm/dload.c:548
 #, c-format
@@ -516,7 +508,7 @@ msgstr "veritabanı kilitli değil iken işlem girişimi"
 #: lib/libalpm/error.c:104
 #, c-format
 msgid "failed to run transaction hooks"
-msgstr ""
+msgstr "bağlantılı işlemler çalıştırılamadı"
 
 #: lib/libalpm/error.c:107
 #, c-format
@@ -711,8 +703,7 @@ msgstr "%s: %s sürümünden %s sürümüne çevriliyor.\n"
 #: lib/libalpm/sync.c:119
 #, c-format
 msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr ""
-"%s: yerel depodaki paket (%s) %s deposundaki paketten (%s) daha güncel\n"
+msgstr "%s: yerel depodaki paket (%s) %s deposundaki paketten (%s) daha güncel\n"
 
 #: lib/libalpm/sync.c:160
 #, c-format
@@ -787,12 +778,12 @@ msgstr "%s dosyası konumlandırılamadı: %s\n"
 #: lib/libalpm/util.c:483
 #, c-format
 msgid "unable to write to pipe (%s)\n"
-msgstr ""
+msgstr "(%s) üzerine yazılamadı\n"
 
 #: lib/libalpm/util.c:542
 #, c-format
 msgid "unable to read from pipe (%s)\n"
-msgstr ""
+msgstr "(%s) okunamadı\n"
 
 #: lib/libalpm/util.c:584 lib/libalpm/util.c:590
 #, c-format
@@ -842,5 +833,4 @@ msgstr "%s önbelleği yok, oluşturuluyor...\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"paket önbelleği oluşturulamıyor veya bulunamıyor, yerine %s kullanılıyor\n"
+msgstr "paket önbelleği oluşturulamıyor veya bulunamıyor, yerine %s kullanılıyor\n"
diff --git a/lib/libalpm/po/uk.po b/lib/libalpm/po/uk.po
index 9dc52ff6..a9ef0d56 100644
--- a/lib/libalpm/po/uk.po
+++ b/lib/libalpm/po/uk.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Max Lyashuk <m_lyashuk@ukr.net>, 2015
 # Yarema aka Knedlyk <yupadmin@gmail.com>, 2011-2013,2015
@@ -13,14 +13,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-16 12:27+0000\n"
 "Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/uk/)\n"
-"Language: uk\n"
+"Language-Team: Ukrainian (http://www.transifex.com/toofishes/archlinux-pacman/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: lib/libalpm/add.c:86
 #, c-format
@@ -55,9 +53,7 @@ msgstr "неможливо перейменувати %s на %s (%s)\n"
 #: lib/libalpm/add.c:191
 #, c-format
 msgid "file not found in file list for package %s. skipping extraction of %s\n"
-msgstr ""
-"файл не знайдено в переліку файлів для пакунку %s, пропускаємо витягування з "
-"%s\n"
+msgstr "файл не знайдено в переліку файлів для пакунку %s, пропускаємо витягування з %s\n"
 
 #: lib/libalpm/add.c:200
 #, c-format
@@ -69,19 +65,14 @@ msgstr "не вдається розпакувати %s%s: шлях занадт
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"права каталогу відрізняються у\n"
-"файловій системі %s: %o  пакунок: %o\n"
+msgstr "права каталогу відрізняються у\nфайловій системі %s: %o  пакунок: %o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"власність каталогу відрізняється на %s\n"
-"\n"
-"файлова система: %u:%u пакунок: %u:%u\n"
+msgstr "власність каталогу відрізняється на %s\n\nфайлова система: %u:%u пакунок: %u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -132,9 +123,7 @@ msgstr "неможливо додати запис  «%s» у кеш\n"
 #: lib/libalpm/be_local.c:255
 #, c-format
 msgid "error while reading file %s: %s\n"
-msgstr ""
-"помилка при читанні пакунка %s: %s\n"
-"\n"
+msgstr "помилка при читанні пакунка %s: %s\n\n"
 
 #: lib/libalpm/be_local.c:350
 #, c-format
@@ -843,5 +832,4 @@ msgstr "кеш %s не існує, створюється…\n"
 #: lib/libalpm/util.c:849
 #, c-format
 msgid "couldn't find or create package cache, using %s instead\n"
-msgstr ""
-"неможливо знайти або створити кеш пакунків, використовуючи %s натомість\n"
+msgstr "неможливо знайти або створити кеш пакунків, використовуючи %s натомість\n"
diff --git a/lib/libalpm/po/zh_CN.po b/lib/libalpm/po/zh_CN.po
index cd88cc2b..ca06b5c2 100644
--- a/lib/libalpm/po/zh_CN.po
+++ b/lib/libalpm/po/zh_CN.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011
 # leonfeng <chaofeng111@gmail.com>, 2011
@@ -19,12 +19,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-25 16:12+0000\n"
 "Last-Translator: mytbk <mytbk920423@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/zh_CN/)\n"
-"Language: zh_CN\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/toofishes/archlinux-pacman/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: lib/libalpm/add.c:86
@@ -72,18 +71,14 @@ msgstr "无法解压缩 %s%s:路径过长"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"目录权限不一致 %1$s\n"
-"文件系统:%2$o  软件包:%3$o\n"
+msgstr "目录权限不一致 %1$s\n文件系统:%2$o  软件包:%3$o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"目录权限不一致 %s\n"
-"文件系统:%u:%u 软件包:%u:%u\n"
+msgstr "目录权限不一致 %s\n文件系统:%u:%u 软件包:%u:%u\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
@@ -323,9 +318,7 @@ msgstr "无法测定文件系统挂载点\n"
 #: lib/libalpm/diskspace.c:385
 #, c-format
 msgid "could not determine cachedir mount point %s\n"
-msgstr ""
-"无法确定缓存目录挂载点 %s\n"
-"\n"
+msgstr "无法确定缓存目录挂载点 %s\n\n"
 
 #: lib/libalpm/diskspace.c:438
 #, c-format
@@ -335,9 +328,7 @@ msgstr "无法测定根分区挂载点 %s\n"
 #: lib/libalpm/diskspace.c:486
 #, c-format
 msgid "Partition %s is mounted read only\n"
-msgstr ""
-"分区 %s 为只读\n"
-"\n"
+msgstr "分区 %s 为只读\n\n"
 
 #: lib/libalpm/dload.c:149
 #, c-format
diff --git a/lib/libalpm/po/zh_TW.po b/lib/libalpm/po/zh_TW.po
index 77e635d3..04b66764 100644
--- a/lib/libalpm/po/zh_TW.po
+++ b/lib/libalpm/po/zh_TW.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2012
 # dlin <dlin.tw@gmail.com>, 2014
@@ -16,12 +16,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2015-12-09 08:24+0000\n"
 "Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/zh_TW/)\n"
-"Language: zh_TW\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/toofishes/archlinux-pacman/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: lib/libalpm/add.c:86
@@ -69,19 +68,14 @@ msgstr "無法解壓縮 %s%s:路徑太長了"
 msgid ""
 "directory permissions differ on %s\n"
 "filesystem: %o  package: %o\n"
-msgstr ""
-"目錄權限不一致 %s\n"
-"檔案系統:%o  套件:%o\n"
+msgstr "目錄權限不一致 %s\n檔案系統:%o  套件:%o\n"
 
 #: lib/libalpm/add.c:256
 #, c-format
 msgid ""
 "directory ownership differs on %s\n"
 "filesystem: %u:%u  package: %u:%u\n"
-msgstr ""
-"目錄擁有者不一致 %s\n"
-"檔案系統:%u:%u 套件: %u:%u\n"
-"\n"
+msgstr "目錄擁有者不一致 %s\n檔案系統:%u:%u 套件: %u:%u\n\n"
 
 #: lib/libalpm/add.c:272
 #, c-format
diff --git a/scripts/po/ar.po b/scripts/po/ar.po
index 3325092c..8ed6ee88 100644
--- a/scripts/po/ar.po
+++ b/scripts/po/ar.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # kraim <biskraim@gmail.com>, 2013
 # kraim <biskraim@gmail.com>, 2013
@@ -16,14 +16,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 03:32+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ar/)\n"
-"Language: ar\n"
+"Language-Team: Arabic (http://www.transifex.com/toofishes/archlinux-pacman/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: scripts/makepkg.sh.in:135
 msgid "Cleaning up..."
@@ -104,7 +102,8 @@ msgid "Generating checksums for source files..."
 msgstr "يتم الآن توليد البصمات للملفات المصدر ..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
 msgstr "لم يتم العثور على التطبيق %s و الضروري لتوليد بصمات الملفات المصدر ."
 
 #: scripts/makepkg.sh.in:422
@@ -413,7 +412,8 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "تم بناء حزمة بالفعل. (استخدم %s لاستبدالها)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "تم بناء حزمة بالفعل. (استخدم %s لاستبدالها)"
 
 #: scripts/makepkg.sh.in:1696
@@ -486,7 +486,8 @@ msgid ""
 msgstr "  -r, --rmdeps     أزِل الاعتماديات المُثبّتة بعد البناء النّاجح"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1716
@@ -522,7 +523,8 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1724
@@ -601,10 +603,11 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
@@ -840,9 +843,9 @@ msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
@@ -953,8 +956,8 @@ msgstr ""
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:79
@@ -964,14 +967,14 @@ msgstr ""
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:86
@@ -1150,8 +1153,8 @@ msgstr ""
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
@@ -1207,7 +1210,8 @@ msgid "Rotating database into place..."
 msgstr ""
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr ""
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1308,8 +1312,8 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:62
@@ -1318,13 +1322,14 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr "-n, --new اضف الحزم فقط التي ليست في قاعدة البيانات\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:66
@@ -1333,9 +1338,9 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:75
@@ -1374,9 +1379,9 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:146
@@ -1668,18 +1673,21 @@ msgstr "فشل اثناء السحب %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "مرجع غير معروف : %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr ""
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr ""
 
@@ -1711,12 +1719,14 @@ msgstr "استخراج %s مع %s"
 msgid "Failed to extract %s"
 msgstr "فشل في استخراج %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr ""
@@ -1725,12 +1735,14 @@ msgstr ""
 msgid "%s is not a clone of %s"
 msgstr "%s هذه ليست نسخة من %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr ""
diff --git a/scripts/po/ast.po b/scripts/po/ast.po
index 4789a2dd..26db3d9b 100644
--- a/scripts/po/ast.po
+++ b/scripts/po/ast.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2016-01-17 13:21+1000\n"
+"POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-21 23:34+0000\n"
 "Last-Translator: enolp <enolp@softastur.org>\n"
 "Language-Team: Asturian (http://www.transifex.com/toofishes/archlinux-pacman/language/ast/)\n"
@@ -697,23 +697,23 @@ msgstr ""
 msgid "Could not resolve all dependencies."
 msgstr "Nun puen resolvese toles dependencies."
 
-#: scripts/makepkg.sh.in:2196
+#: scripts/makepkg.sh.in:2197
 msgid "Using existing %s tree"
 msgstr "Usando l'árbol esistente %s"
 
-#: scripts/makepkg.sh.in:2203 scripts/makepkg.sh.in:2225
+#: scripts/makepkg.sh.in:2204 scripts/makepkg.sh.in:2227
 msgid "Removing existing %s directory..."
 msgstr "Desaniciando'l direutoriu esistente %s..."
 
-#: scripts/makepkg.sh.in:2220
+#: scripts/makepkg.sh.in:2222
 msgid "Sources are ready."
 msgstr "Les fontes tán preparaes."
 
-#: scripts/makepkg.sh.in:2246
+#: scripts/makepkg.sh.in:2248
 msgid "Package directory is ready."
 msgstr ""
 
-#: scripts/makepkg.sh.in:2250
+#: scripts/makepkg.sh.in:2252
 msgid "Finished making: %s"
 msgstr ""
 
diff --git a/scripts/po/az_AZ.po b/scripts/po/az_AZ.po
index dbee79e9..6e1290ef 100644
--- a/scripts/po/az_AZ.po
+++ b/scripts/po/az_AZ.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Zaur_Baku, 2015
 # Zaur_Baku, 2015
@@ -12,12 +12,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 03:32+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Azerbaijani (Azerbaijan) (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/az_AZ/)\n"
-"Language: az_AZ\n"
+"Language-Team: Azerbaijani (Azerbaijan) (http://www.transifex.com/toofishes/archlinux-pacman/language/az_AZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: az_AZ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -99,7 +98,8 @@ msgid "Generating checksums for source files..."
 msgstr ""
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
 msgstr ""
 
 #: scripts/makepkg.sh.in:422
@@ -408,7 +408,8 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1696
@@ -481,7 +482,8 @@ msgid ""
 msgstr ""
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1716
@@ -517,7 +519,8 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1724
@@ -596,10 +599,11 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
@@ -835,9 +839,9 @@ msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
@@ -948,8 +952,8 @@ msgstr ""
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:79
@@ -959,14 +963,14 @@ msgstr ""
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:86
@@ -1145,8 +1149,8 @@ msgstr ""
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
@@ -1202,7 +1206,8 @@ msgid "Rotating database into place..."
 msgstr ""
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr ""
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1303,8 +1308,8 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:62
@@ -1313,13 +1318,14 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:66
@@ -1328,9 +1334,9 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:75
@@ -1369,9 +1375,9 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:146
@@ -1663,18 +1669,21 @@ msgstr ""
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr ""
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr ""
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr ""
 
@@ -1706,12 +1715,14 @@ msgstr ""
 msgid "Failed to extract %s"
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr ""
@@ -1720,12 +1731,14 @@ msgstr ""
 msgid "%s is not a clone of %s"
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr ""
diff --git a/scripts/po/bg.po b/scripts/po/bg.po
index 1a29e964..212a3879 100644
--- a/scripts/po/bg.po
+++ b/scripts/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2016-01-17 13:21+1000\n"
+"POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 03:32+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/toofishes/archlinux-pacman/language/bg/)\n"
@@ -695,23 +695,23 @@ msgstr "Проверяване buildtime зависимостите..."
 msgid "Could not resolve all dependencies."
 msgstr "Немогат да се решат всички зависимости."
 
-#: scripts/makepkg.sh.in:2196
+#: scripts/makepkg.sh.in:2197
 msgid "Using existing %s tree"
 msgstr "Използване на съществуващо %s дърво"
 
-#: scripts/makepkg.sh.in:2203 scripts/makepkg.sh.in:2225
+#: scripts/makepkg.sh.in:2204 scripts/makepkg.sh.in:2227
 msgid "Removing existing %s directory..."
 msgstr "Премахване на съществуваща %s директория..."
 
-#: scripts/makepkg.sh.in:2220
+#: scripts/makepkg.sh.in:2222
 msgid "Sources are ready."
 msgstr "Източниците са готови."
 
-#: scripts/makepkg.sh.in:2246
+#: scripts/makepkg.sh.in:2248
 msgid "Package directory is ready."
 msgstr "Директорията на пакета е готова."
 
-#: scripts/makepkg.sh.in:2250
+#: scripts/makepkg.sh.in:2252
 msgid "Finished making: %s"
 msgstr "Завърши създаването: %s"
 
diff --git a/scripts/po/br.po b/scripts/po/br.po
index 4139a3a5..888476e8 100644
--- a/scripts/po/br.po
+++ b/scripts/po/br.po
@@ -1,22 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Gwenn M <tornoz@laposte.net>, 2015
+# Gwenn M <tornoz@laposte.net>, 2015-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
-"PO-Revision-Date: 2016-01-17 03:32+0000\n"
-"Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Breton (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/br/)\n"
-"Language: br\n"
+"PO-Revision-Date: 2016-02-18 12:13+0000\n"
+"Last-Translator: Gwenn M <tornoz@laposte.net>\n"
+"Language-Team: Breton (http://www.transifex.com/toofishes/archlinux-pacman/language/br/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -98,10 +97,9 @@ msgid "Generating checksums for source files..."
 msgstr "O genel ar sammadoù-gwiriañ evit ar restroù tarzh..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"N'haller ket kavout an daouredel %s dleet evit genel restroù tarzh ar sammad-"
-"gwiriañ."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "N'haller ket kavout an daouredel %s dleet evit genel restroù tarzh ar sammad-gwiriañ."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -134,8 +132,7 @@ msgstr "Ur restr pe muioc'h n'o deus ket tremenet ar wiriadur reizhidigezh."
 
 #: scripts/makepkg.sh.in:489
 msgid "Integrity checks (%s) differ in size from the source array."
-msgstr ""
-"Gwiriadurioù anterinder (%s) o deus ur ment disheñvel evit an daolenn tarzh."
+msgstr "Gwiriadurioù anterinder (%s) o deus ur ment disheñvel evit an daolenn tarzh."
 
 #: scripts/makepkg.sh.in:531
 msgid "Integrity checks are missing for: %s"
@@ -337,8 +334,7 @@ msgstr "Komenad pellgargañ dianav : %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"N'haller ket kavout an daouredel %s dleet evit gwiriañ ezhommoù VCS an tarzh."
+msgstr "N'haller ket kavout an daouredel %s dleet evit gwiriañ ezhommoù VCS an tarzh."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
@@ -346,14 +342,11 @@ msgstr "N'haller ket kavout ar pakad %s dleet evit merañ tarzh %s."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
-msgstr ""
-"N'haller ket kavout an daouredel %s dleet evit an oberatadennoù amzalc'h."
+msgstr "N'haller ket kavout an daouredel %s dleet evit an oberatadennoù amzalc'h."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"N'haller ket kavout an daouredel %s. Implijet e vo %s evit kaout an aotreoù "
-"root."
+msgstr "N'haller ket kavout an daouredel %s. Implijet e vo %s evit kaout an aotreoù root."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -370,9 +363,7 @@ msgstr "N'haller ket kavout an daouredel %s dleet evit gwiriañ an tarzhioù."
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"N'haller ket kavout an daouredel %s dleet evit talvoudekaat sammad-gwiriañ "
-"ar restr tarzh."
+msgstr "N'haller ket kavout an daouredel %s dleet evit talvoudekaat sammad-gwiriañ ar restr tarzh."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
@@ -380,30 +371,23 @@ msgstr "N'haller ket kavout an daouredel %s dleet evit koazhañ daouredeloù."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
-msgstr ""
-"N'haller ket kavout an daouredel dleet %s evit gwellekaat ar skeudennoù PNG. "
+msgstr "N'haller ket kavout an daouredel dleet %s evit gwellekaat ar skeudennoù PNG. "
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"N'haller ket kavout an daouredel %s dleet evit ar c'hempunerezhioù "
-"dasparzhet."
+msgstr "N'haller ket kavout an daouredel %s dleet evit ar c'hempunerezhioù dasparzhet."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"N'haller ket kavout an daouredel %s dleet evit implij krubuilh ar c'hempuner."
+msgstr "N'haller ket kavout an daouredel %s dleet evit implij krubuilh ar c'hempuner."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"N'haller ket kavout an daouredel %s dleet evit tennadenn ar restroù objed."
+msgstr "N'haller ket kavout an daouredel %s dleet evit tennadenn ar restroù objed."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"N'haller ket kavout an daouredel %s dleet evit koazhañ ar pajennoù man ha "
-"titouroù."
+msgstr "N'haller ket kavout an daouredel %s dleet evit koazhañ ar pajennoù man ha titouroù."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -423,10 +407,9 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "Savet eo bet ar strollad pakad endeo (implijit %s evit flastrañ)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Savet eo bet ul lodenn eus ar strollad pakadoù endeo. (implijit %s evit "
-"flastrañ)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "Savet eo bet ul lodenn eus ar strollad pakadoù endeo. (implijit %s evit flastrañ)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -458,9 +441,7 @@ msgstr "  -d, --nodeps leuskel an holl gwiriadurioù amzalc'hoù a-gostez"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  Chom hep eztennañ ar restroù tarzh (implijout ar "
-"c'havlec'h %s)"
+msgstr "  -e, --noextract  Chom hep eztennañ ar restroù tarzh (implijout ar c'havlec'h %s)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -497,12 +478,11 @@ msgstr "-p <restr> Ober gant ur skript kempunañ a-eil (e plas '%s')"
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps Dilemel an amzalc'hoù staliet goude bezañ bet kempunet gant "
-"berzh"
+msgstr "  -r, --rmdeps Dilemel an amzalc'hoù staliet goude bezañ bet kempunet gant berzh"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage Adpakañ endalc'had ar pakad hep adkempunañ"
 
 #: scripts/makepkg.sh.in:1716
@@ -538,10 +518,9 @@ msgstr "--holver Chom hep hizivaat an tarzhioù VCS"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"--key <alc'hwez> Erspizañ un alc'hwez evit ober gant ar sinañ %s e plas an "
-"hini dre ziouer"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "--key <alc'hwez> Erspizañ un alc'hwez evit ober gant ar sinañ %s e plas an hini dre ziouer"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -562,8 +541,7 @@ msgstr "--nosign Chom hep krouiñ ur sinadur evit ar pakad"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"--packagelist Diskouez ar roll pakadoù a vefe produet nemetken, hep PKGEXT"
+msgstr "--packagelist Diskouez ar roll pakadoù a vefe produet nemetken, hep PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -590,9 +568,7 @@ msgstr "--skippgpcheck Chom hep gwiriañ ar restroù tarzh gant sinadurioù PGP"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"--verifysource Pellgargañ ar restroù tarzh (m'eo dleet) hag ober "
-"gwiriadurioù anterinder"
+msgstr "--verifysource Pellgargañ ar restroù tarzh (m'eo dleet) hag ober gwiriadurioù anterinder"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -614,9 +590,7 @@ msgstr "--noconfirm Chom hep goulenn kadarnañ an diskoulmoù amzalc'hoù"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"--noprogressbar Chom hep diskouez ur varenn araokaat e-pad pellgargadur ar "
-"restroù"
+msgstr "--noprogressbar Chom hep diskouez ur varenn araokaat e-pad pellgargadur ar restroù"
 
 #: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
@@ -624,11 +598,12 @@ msgstr "Ma n'eo ket erspizet %s e vo klasket gant %s war-lec'h '%s'"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nUr meziant frank eo; sellit ouzh an tarzh evit an diferadennoù.\\nN'eus GWARANT EBET, d'an astenn aotreet gant al lezenn.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -662,9 +637,7 @@ msgstr "N'ho peus ket ar gwir da gadaviñ kerzhlevrioù e %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"N'eo ket aotreet erounit %s evel root rak e c'hell sevel freuzioù peurbadus"
-"\\nha grevus-tre d'ho reizhad."
+msgstr "N'eo ket aotreet erounit %s evel root rak e c'hell sevel freuzioù peurbadus\\nha grevus-tre d'ho reizhad."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -758,8 +731,7 @@ msgstr "linenn patrom direizh : n'haller ket kavout anv ar patrom\n"
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr ""
-"arouezennoù direizh a zo implijet en anv '%s'. aotreet : [:alnum:]+_.@-\n"
+msgstr "arouezennoù direizh a zo implijet en anv '%s'. aotreet : [:alnum:]+_.@-\n"
 
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
@@ -796,8 +768,7 @@ msgstr "  --input, -p <restr> Kempunañ ar skript da lenn (dre siouer : %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
-msgstr ""
-"--output, -o <restr> restr evit an ec'hankad (dre ziouer : restr enankad)\n"
+msgstr "--output, -o <restr> restr evit an ec'hankad (dre ziouer : restr enankad)\n"
 
 #: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
@@ -831,7 +802,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
+msgstr "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\nUr meziant frank eo; sellit ouzh an tarzh evit an diferadennoù.\nN'eus GWARANT EBET, d'an astenn aotreet gant al lezenn.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -867,10 +838,10 @@ msgstr "--nocolor Diweredekaat ar c'hemennadennoù ec'hankad livet"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>.\nUr meziant frank eo; sellit ouzh an tarzh evit an diferadennoù.\nN'eus GWARANT EBET, d'an astenn aotreet gant al lezenn.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -887,9 +858,7 @@ msgstr "An aotreoù a-zere eo ret deoc'h kaout evit hizivaat ar stlennvon."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Kavet eo bet ar restr morailh pacman. N'haller ket lañsañ ket m'emañ lañset "
-"Pacman."
+msgstr "Kavet eo bet ar restr morailh pacman. N'haller ket lañsañ ket m'emañ lañset Pacman."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -905,9 +874,7 @@ msgstr "Dinoet eo bet ur stlennvon gant ur mentrezh rak-4.2 - hizivadenn..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"an ere arouezus %s a za davet ur poent e diavaez gwrizienn pacman, ret eo "
-"ratreañ gant an dorn "
+msgstr "an ere arouezus %s a za davet ur poent e diavaez gwrizienn pacman, ret eo ratreañ gant an dorn "
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -931,14 +898,12 @@ msgstr "-d, --delete Dilemel an naoudi alc'hwezioù erspizet"
 
 #: scripts/pacman-key.sh.in:65
 msgid "  -e, --export              Export the specified or all keyids"
-msgstr ""
-"-e, --export Ezporzhiañ an naoudi alc'hwezioù erspizet pe an holl anezho"
+msgstr "-e, --export Ezporzhiañ an naoudi alc'hwezioù erspizet pe an holl anezho"
 
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"-f, --finger Roll ar roudoù bizied evit an holl naoudi alc'hwezioù erspizet"
+msgstr "-f, --finger Roll ar roudoù bizied evit an holl naoudi alc'hwezioù erspizet"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -960,9 +925,7 @@ msgstr "-v, --verify Gwiriañ ar restr(où) erspizet er sinadur(ioù)"
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"--edit-key Kinnig ul lañser evit merañ an trevelloù merañ an alc'hwezioù war "
-"an naoudi alc'hwezioù"
+msgstr "--edit-key Kinnig ul lañser evit merañ an trevelloù merañ an alc'hwezioù war an naoudi alc'hwezioù"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
@@ -972,9 +935,7 @@ msgstr "--import Enporzhiañ pubring.pgp adalek ar c'havlec'h(ioù)"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"--import-trustdb Enporzhiañ talvoudoù ar fiziadurioù implijer adalek trustdb."
-"gpg er c'havlec'h(ioù)"
+msgstr "--import-trustdb Enporzhiañ talvoudoù ar fiziadurioù implijer adalek trustdb.gpg er c'havlec'h(ioù)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
@@ -990,32 +951,26 @@ msgstr "--lsign-key Sinañ an naoudi alc'hwez erspized en un doare lec'hel"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"--populate Adkargañ an alc'hwezioù dre ziouer adalek an troñselloù roet\\n e "
-"'%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "--populate Adkargañ an alc'hwezioù dre ziouer adalek an troñselloù roet\\n e '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"--refresh-keys Hizivaat an alc'hwezioù erspizet pe an holl anezho adalek un "
-"dafariad alc'hwezioù"
+msgstr "--refresh-keys Hizivaat an alc'hwezioù erspizet pe an holl anezho adalek un dafariad alc'hwezioù"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
 msgstr "--config <restr> Ober gant ur restr keflunian a-eil (e plas\\n '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"--gpgdir <kavlec'h> Arventennañ ur c'havlec'h a-eil evit GNuPG (e plas\\n "
-"'%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "--gpgdir <kavlec'h> Arventennañ ur c'havlec'h a-eil evit GNuPG (e plas\\n '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
@@ -1139,8 +1094,7 @@ msgstr "N'eo ket bet kerc'het mat an alc'hwez a-bell eus an dafariad."
 
 #: scripts/pacman-key.sh.in:477
 msgid "A specified local key could not be updated from a keyserver."
-msgstr ""
-"N'haller ket hizivaat un alc'hwez erspizet adalek un dafariad alc'hwezioù."
+msgstr "N'haller ket hizivaat un alc'hwez erspizet adalek un dafariad alc'hwezioù."
 
 #: scripts/pacman-key.sh.in:487
 msgid "The signature identified by %s could not be verified."
@@ -1190,25 +1144,17 @@ msgstr "Implij : %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize a zo un tun vihan evit gwellaat digonusted\\n pacman p'emañ "
-"o lenn/skrivañ d'e stlennvon diazezet war restroù.\\n\\n"
+msgstr "pacman-optimize a zo un tun vihan evit gwellaat digonusted\\n pacman p'emañ o lenn/skrivañ d'e stlennvon diazezet war restroù.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Dre ma vez implijet meur a restr bihan gant pacman evot heuliañ ar pakadoù,"
-"\\n gallout a ra ar restroù-mañ bezañ strewet gant an amzer.\\nKlasket e vez "
-"gant ar skript-mañ adlec'hiañ ar restroù-mañ en ul\\nlec'h hepken war ho "
-"pladenn galet. An disoc'h a zo\\ur bladenn galet gouest da lenn anezho en un "
-"doare primoc'h,\\ndre ma n'eus ket ar bladenn galet da fiñval kement tro-dro "
-"d'ar bladenn.\\n"
+msgstr "Dre ma vez implijet meur a restr bihan gant pacman evot heuliañ ar pakadoù,\\n gallout a ra ar restroù-mañ bezañ strewet gant an amzer.\\nKlasket e vez gant ar skript-mañ adlec'hiañ ar restroù-mañ en ul\\nlec'h hepken war ho pladenn galet. An disoc'h a zo\\ur bladenn galet gouest da lenn anezho en un doare primoc'h,\\ndre ma n'eus ket ar bladenn galet da fiñval kement tro-dro d'ar bladenn.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1259,9 +1205,9 @@ msgid "Rotating database into place..."
 msgstr "O sturiañ ar stlennvon davet al lec'h mat..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"Eillec'hiañ ar stlennvon nevez c'hwitet. Gwiriekait %s, %s ha kavlec'hioù %s."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "Eillec'hiañ ar stlennvon nevez c'hwitet. Gwiriekait %s, %s ha kavlec'hioù %s."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1275,9 +1221,7 @@ msgstr "Implij : pkgdelta [dibarzhioù] <pakad1> <pakad2\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"Krouet e vo gant pkgdelta ur restr delta etre daou pakad.\\nAr restr delta-"
-"mañ a c'hello bezañ ouzhpennet d'ur stlennvon en ur implij repo-add.\\n"
+msgstr "Krouet e vo gant pkgdelta ur restr delta etre daou pakad.\\nAr restr delta-mañ a c'hello bezañ ouzhpennet d'ur stlennvon en ur implij repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1298,25 +1242,20 @@ msgstr "--nocolor tennañ al livioù eus an ec'hankad\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"--min-pkg-size ment pakad izelañ a-raok ma vefe savet ar restroù delta\\n\\n"
+msgstr "--min-pkg-size ment pakad izelañ a-raok ma vefe savet ar restroù delta\\n\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"--max-delta-size dregantad a pakadoù nevez a-raok ma vefe dilezet an delta\\n"
+msgstr "--max-delta-size dregantad a pakadoù nevez a-raok ma vefe dilezet an delta\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nUr meziant "
-"frank eo, sellit ouzh an tarzh evit titouroù a-fet eilañ.\\nN'eus GWARANT "
-"EBET, d'an astenn aotreet gant al lezenn.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nUr meziant frank eo, sellit ouzh an tarzh evit titouroù a-fet eilañ.\\nN'eus GWARANT EBET, d'an astenn aotreet gant al lezenn.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1324,9 +1263,7 @@ msgstr "Restr pakad direizh '%s'."
 
 #: scripts/pkgdelta.sh.in:120
 msgid "Skipping delta creation for small package: %s - size %s"
-msgstr ""
-"O leuskel krouidigezh ar restr delta a-gostez evit ar pakad bihan : %s - "
-"ment %s"
+msgstr "O leuskel krouidigezh ar restr delta a-gostez evit ar pakad bihan : %s - ment %s"
 
 #: scripts/pkgdelta.sh.in:125
 msgid "The package names don't match : '%s' and '%s'"
@@ -1370,45 +1307,36 @@ msgstr "Implij : repo-add [dibarzhioù] <treug-ar-sv> <package|delta>...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"Hizivaet e vo stlenncon ur pakad gant repo-add en ul lenn ur restr pakad."
-"\\nMeur a pakad a c'hell bezan ouzhpennet en ur erspizañ anezhe el linenn "
-"urzhiañ.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "Hizivaet e vo stlenncon ur pakad gant repo-add en ul lenn ur restr pakad.\\nMeur a pakad a c'hell bezan ouzhpennet en ur erspizañ anezhe el linenn urzhiañ.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"-d, --delta sevel hag ouzhpennañ ar restr delta evit un hizivadenn pakad\\n"
+msgstr "-d, --delta sevel hag ouzhpennañ ar restr delta evit un hizivadenn pakad\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr "-n, --new ouzhpennañ pakadoù ha n'int ket er stlennvon nemetken\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"-R, --remove dilemel ar restroù pakad kozh eus ar bladenn pa vez hizivaet ar "
-"stlennvon\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "-R, --remove dilemel ar restroù pakad kozh eus ar bladenn pa vez hizivaet ar stlennvon\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Implij : repo-remove [dibarzhioù] <treug-ar-sv> <packagename|delta>... \\n"
+msgstr "Implij : repo-remove [dibarzhioù] <treug-ar-sv> <packagename|delta>... \\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"Hizivaet e vo ur stlennvon pakadoù gant repo-remove en ur dilemel anv ar "
-"pakad\\nerspizet el linenn-urzhiañ adalek ar stlennvon mirlec'h roet. Meur a "
-"\\npakad a c'heller dilemel en ur erspizañ anezhe el linenn-urzhiañ.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "Hizivaet e vo ur stlennvon pakadoù gant repo-remove en ur dilemel anv ar pakad\\nerspizet el linenn-urzhiañ adalek ar stlennvon mirlec'h roet. Meur a \\npakad a c'heller dilemel en ur erspizañ anezhe el linenn-urzhiañ.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1424,8 +1352,7 @@ msgstr "-s, --sign sinañ ar stlennvon gant GnuPG goude un hizivadenn\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"-k, --key <alc'hwez> implij ar alc'hwez erspizet evit sinañ ar stlennvon\\n"
+msgstr "-k, --key <alc'hwez> implij ar alc'hwez erspizet evit sinañ ar stlennvon\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
@@ -1434,15 +1361,12 @@ msgstr "-v, --verify gwiriañ sinadur ar stlennvon a-raok an hizivadenn\\n"
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\n\\nLenn %s(8) evit titouroù ha deskrivadurioù hiroc'h an dibarzhioù "
-"hegerz.\\n"
+msgstr "\\n\\nLenn %s(8) evit titouroù ha deskrivadurioù hiroc'h an dibarzhioù hegerz.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Skouer :  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Skouer :  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1450,10 +1374,10 @@ msgstr "Skouer:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\nUr meziant frank eo; sellit ouzh an tarzh evit an diferadennoù.\nN'eus GWARANT EBET, d'an astenn aotreet gant al lezenn.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1744,18 +1668,21 @@ msgstr "C'hwitet war sachadenn %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Dave dianavezet : %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "O krouiñ un eilenn labour eus ar mirlec'h %s %s..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "C'hwitet war hizivadenn an eilenn labour eus ar mirlec'h %s %s"
 
@@ -1787,12 +1714,14 @@ msgstr "Oc'h eztennañ %s gant %s"
 msgid "Failed to extract %s"
 msgstr "C'hwitet war eztennañ %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "O klonañ ar mirlec'h %s %s..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "C'hwitet war pellgargañ ar mirlec'h %s %s"
@@ -1801,12 +1730,14 @@ msgstr "C'hwitet war pellgargañ ar mirlec'h %s %s"
 msgid "%s is not a clone of %s"
 msgstr "%s n'eo ket ur c'hlon eus %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Oc'h hizivaat ar mirlec'h %s %s..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "C'hwitet war hizivadur ar mirlec'h %s %s"
@@ -1849,8 +1780,7 @@ msgstr "O tilemel restroù levraoueg difiñv..."
 
 #: scripts/libmakepkg/tidy/strip.sh.in:85
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr ""
-"O tennañ an arouezioù diezhomm eus an daouredel hag eus al levraouegoù..."
+msgstr "O tennañ an arouezioù diezhomm eus an daouredel hag eus al levraouegoù..."
 
 #: scripts/libmakepkg/tidy/upx.sh.in:35
 msgid "Compressing binaries with %s..."
diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index 44234c93..0263efea 100644
--- a/scripts/po/ca.po
+++ b/scripts/po/ca.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Davidmp <medipas@gmail.com>, 2015
 # Hector Mtz-Seara <hseara@gmail.com>, 2011-2013
@@ -15,14 +15,13 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
-"PO-Revision-Date: 2016-01-18 16:13+0000\n"
+"PO-Revision-Date: 2016-01-30 00:12+0000\n"
 "Last-Translator: Davidmp <medipas@gmail.com>\n"
-"Language-Team: Catalan (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ca/)\n"
-"Language: ca\n"
+"Language-Team: Catalan (http://www.transifex.com/toofishes/archlinux-pacman/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -101,14 +100,12 @@ msgstr "Ha fallat eliminar les dependències instal·lades."
 
 #: scripts/makepkg.sh.in:405
 msgid "Generating checksums for source files..."
-msgstr ""
-"S'estan generant les sumes de verificació per als fitxers de codi font..."
+msgstr "S'estan generant les sumes de verificació per als fitxers de codi font..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"No es pot trobar el fitxer binari %s necessari per generar sumes de "
-"verificació de fitxers de codi font."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "No es pot trobar el fitxer binari %s necessari per generar sumes de verificació de fitxers de codi font."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -141,9 +138,7 @@ msgstr "Un o més fitxers no han passat la comprovació de la validació!"
 
 #: scripts/makepkg.sh.in:489
 msgid "Integrity checks (%s) differ in size from the source array."
-msgstr ""
-"Les comprovacions de la integritat (%s) difereixen en mida de la cadena de "
-"les fonts."
+msgstr "Les comprovacions de la integritat (%s) difereixen en mida de la cadena de les fonts."
 
 #: scripts/makepkg.sh.in:531
 msgid "Integrity checks are missing for: %s"
@@ -216,8 +211,7 @@ msgstr "S'ometen tots els controls d'integritat de fitxers de condi font."
 
 #: scripts/makepkg.sh.in:717
 msgid "Skipping verification of source file checksums."
-msgstr ""
-"S'omet la verificació de les sumes de comprovació de fitxers de codi font."
+msgstr "S'omet la verificació de les sumes de comprovació de fitxers de codi font."
 
 #: scripts/makepkg.sh.in:720
 msgid "Skipping verification of source file PGP signatures."
@@ -346,25 +340,19 @@ msgstr "Protocol de descàrrega desconegut: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"No es pot trobar el binari %s necessari per comprovar els requeriments de "
-"les fonts VCS."
+msgstr "No es pot trobar el binari %s necessari per comprovar els requeriments de les fonts VCS."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
-msgstr ""
-"No es pot trobar el binari %s necessari per manejar els fitxers font de %s."
+msgstr "No es pot trobar el binari %s necessari per manejar els fitxers font de %s."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
-msgstr ""
-"No es pot trobar el binari %s necessari per a les operacions de dependència."
+msgstr "No es pot trobar el binari %s necessari per a les operacions de dependència."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"No es pot trobar el binari %s. Es farà servir %s per adquirir privilegis de "
-"root."
+msgstr "No es pot trobar el binari %s. Es farà servir %s per adquirir privilegis de root."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -381,14 +369,11 @@ msgstr "No es pot trobar el binari %s necessari per comprovar els arxius font."
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"No es pot trobar el binari %s necessari per a la validació de les sumes de "
-"comprovació dels fitxers font."
+msgstr "No es pot trobar el binari %s necessari per a la validació de les sumes de comprovació dels fitxers font."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"No es pot trobar el binari %s necessari per a la compressió dels binaris."
+msgstr "No es pot trobar el binari %s necessari per a la compressió dels binaris."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
@@ -396,26 +381,19 @@ msgstr "No es pot trobar el binari %s necessari per optimitzar imatges PNG."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"No es pot trobar el binari %s necessari per a la compilació distribuïda."
+msgstr "No es pot trobar el binari %s necessari per a la compilació distribuïda."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"No es pot trobar el binari %s necessari per a l'ús de la memòria cau del "
-"compilador."
+msgstr "No es pot trobar el binari %s necessari per a l'ús de la memòria cau del compilador."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"No es pot trobar el binari %s necessari per a la retirada de símbols en "
-"fitxers objecte."
+msgstr "No es pot trobar el binari %s necessari per a la retirada de símbols en fitxers objecte."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"No es pot trobar el binari %s necessari per a la compressió de pàgines man i "
-"info."
+msgstr "No es pot trobar el binari %s necessari per a la compressió de pàgines man i info."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -428,20 +406,16 @@ msgstr "Ja s'ha construït un paquet. (Utilitzeu %s per sobreescriure'l)"
 #: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr ""
-"Ja s'ha construït el grup de paquets, s'estan instal·lant els paquets "
-"existents..."
+msgstr "Ja s'ha construït el grup de paquets, s'estan instal·lant els paquets existents..."
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Ja s'ha construït el grup de paquets. (Utilitzeu %s per sobreescriure'l)"
+msgstr "Ja s'ha construït el grup de paquets. (Utilitzeu %s per sobreescriure'l)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Ja s'ha construït part del grup de paquets. (Utilitzeu %s per "
-"sobreescriure'l)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "Ja s'ha construït part del grup de paquets. (Utilitzeu %s per sobreescriure'l)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -461,13 +435,11 @@ msgstr "  -A, --ignorearch Ignora el camp %s incomplet a %s"
 
 #: scripts/makepkg.sh.in:1702
 msgid "  -c, --clean      Clean up work files after build"
-msgstr ""
-"  -c, --clean      Neteja els fitxers de treball després de la construcció"
+msgstr "  -c, --clean      Neteja els fitxers de treball després de la construcció"
 
 #: scripts/makepkg.sh.in:1703
 msgid "  -C, --cleanbuild Remove %s dir before building the package"
-msgstr ""
-"  -C, --cleanbuild Elimina el directori %s abans de compilar el paquet."
+msgstr "  -C, --cleanbuild Elimina el directori %s abans de compilar el paquet."
 
 #: scripts/makepkg.sh.in:1704
 msgid "  -d, --nodeps     Skip all dependency checks"
@@ -475,8 +447,7 @@ msgstr "  -d, --nodeps     Omet totes les comprovacions de dependències"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  No extreure els arxius font (empra la carpeta existent %s)"
+msgstr "  -e, --noextract  No extreure els arxius font (empra la carpeta existent %s)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -484,8 +455,7 @@ msgstr "  -f, --force      Sobreescriu el paquet existent"
 
 #: scripts/makepkg.sh.in:1707
 msgid "  -g, --geninteg   Generate integrity checks for source files"
-msgstr ""
-"  -g, --geninteg   Genera comprovacions d'integritat per als fitxers font"
+msgstr "  -g, --geninteg   Genera comprovacions d'integritat per als fitxers font"
 
 #: scripts/makepkg.sh.in:1708
 msgid "  -h, --help       Show this help message and exit"
@@ -493,14 +463,11 @@ msgstr "  -h, --help       Mostra aquest missatge d'ajuda i surt"
 
 #: scripts/makepkg.sh.in:1709
 msgid "  -i, --install    Install package after successful build"
-msgstr ""
-"  -i, --install    Instal·la el paquet després d'una construcció "
-"satisfactòria"
+msgstr "  -i, --install    Instal·la el paquet després d'una construcció satisfactòria"
 
 #: scripts/makepkg.sh.in:1710
 msgid "  -L, --log        Log package build process"
-msgstr ""
-"  -L, --log        Crea un registre del procés de construcció del paquet"
+msgstr "  -L, --log        Crea un registre del procés de construcció del paquet"
 
 #: scripts/makepkg.sh.in:1711
 msgid "  -m, --nocolor    Disable colorized output messages"
@@ -512,21 +479,17 @@ msgstr "  -o, --nobuild    Només baixa i extreu els fitxers"
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <file>        Usa un script de construcció alternatiu (enlloc de \"%s\")"
+msgstr "  -p <file>        Usa un script de construcció alternatiu (enlloc de \"%s\")"
 
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Elimina les dependències instal·lades després d'una "
-"construcció satisfactòria"
+msgstr "  -r, --rmdeps     Elimina les dependències instal·lades després d'una construcció satisfactòria"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr ""
-"  -R, --repackage  Reempaqueta el contingut del paquet sense tornar-lo a "
-"construir"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
+msgstr "  -R, --repackage  Reempaqueta el contingut del paquet sense tornar-lo a construir"
 
 #: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
@@ -535,9 +498,7 @@ msgstr "  -s, --syncdeps   Instal·la les dependències que falten amb %s"
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source         Genera una tarball de només codi font sense el codi "
-"font baixat"
+msgstr "  -S, --source         Genera una tarball de només codi font sense el codi font baixat"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -547,9 +508,7 @@ msgstr "  -V, --version    Mostra la informació de la versió i surt"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      Genera una tarball de només codi font incloent-hi el codi "
-"font baixat"
+msgstr "  --allsource      Genera una tarball de només codi font incloent-hi el codi font baixat"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -557,8 +516,7 @@ msgstr "  --check          Executa la funció %s a %s "
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <file>  Usa un fitxer de configuració alternatiu (enlloc de «%s»)"
+msgstr "  --config <file>  Usa un fitxer de configuració alternatiu (enlloc de «%s»)"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -566,10 +524,9 @@ msgstr "  --holdver        No actualitzis fonts VCS"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <key>      Especifica una clau per a la signatura de %s en lloc de "
-"la predeterminada"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <key>      Especifica una clau per a la signatura de %s en lloc de la predeterminada"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -590,9 +547,7 @@ msgstr "  --nosign         No creïs una signatura per al paquet"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"  --packagelist    Només llista els paquests que serien produïts, sense "
-"PKGEXT"
+msgstr "  --packagelist    Només llista els paquests que serien produïts, sense PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -604,14 +559,12 @@ msgstr "  --sign           Signa el paquet resultant amb %s"
 
 #: scripts/makepkg.sh.in:1731
 msgid "  --skipchecksums  Do not verify checksums of the source files"
-msgstr ""
-"  --skipchecksums  No verifiquis les sumes de comprovació dels fitxers font"
+msgstr "  --skipchecksums  No verifiquis les sumes de comprovació dels fitxers font"
 
 #: scripts/makepkg.sh.in:1732
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
-msgstr ""
-"  --skipinteg      No facis cap comprovació de verificació als fitxers font"
+msgstr "  --skipinteg      No facis cap comprovació de verificació als fitxers font"
 
 #: scripts/makepkg.sh.in:1733
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
@@ -621,9 +574,7 @@ msgstr "  --skippgpcheck   No verfiquis els fitxers font amb signatures PGP"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource   Descarregar codi font (si cal) i realitzar comprovacions "
-"d'integritat"
+msgstr "  --verifysource   Descarregar codi font (si cal) i realitzar comprovacions d'integritat"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -631,15 +582,12 @@ msgstr "Aquestes opcions es poden passar a %s:"
 
 #: scripts/makepkg.sh.in:1738
 msgid "  --asdeps         Install packages as non-explicitly installed"
-msgstr ""
-"  --asdeps         Instal·la els paquets com a no explícitament instal·lats"
+msgstr "  --asdeps         Instal·la els paquets com a no explícitament instal·lats"
 
 #: scripts/makepkg.sh.in:1739
 msgid ""
 "  --needed         Do not reinstall the targets that are already up to date"
-msgstr ""
-"  --needed         No tornis a instal·lar els paquets que ja estan "
-"actualitzats"
+msgstr "  --needed         No tornis a instal·lar els paquets que ja estan actualitzats"
 
 #: scripts/makepkg.sh.in:1740
 msgid ""
@@ -656,15 +604,12 @@ msgstr "Si %s no s'ha especificat, %s buscarà \"%s\""
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nAixò és "
-"programari lliure. Consulteu el codi font per a les condicions de còpia."
-"\\nNO hi ha cap GARANTIA, en la mesura permesa per la llei.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nAixò és programari lliure. Consulteu el codi font per a les condicions de còpia.\\nNO hi ha cap GARANTIA, en la mesura permesa per la llei.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -698,9 +643,7 @@ msgstr "No teniu permís d'escriptura per emmagatzemar els registres a %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Executar %s com a root no està permès ja que pot causar danys\\npermanents o "
-"catastròfics al sistema."
+msgstr "Executar %s com a root no està permès ja que pot causar danys\\npermanents o catastròfics al sistema."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -736,8 +679,7 @@ msgstr "S'està fent el paquet: %s"
 
 #: scripts/makepkg.sh.in:2133
 msgid "A source package has already been built. (use %s to overwrite)"
-msgstr ""
-"Un paquet font ja ha estat construït. (Utilitzeu %s per sobreescriure'l)"
+msgstr "Un paquet font ja ha estat construït. (Utilitzeu %s per sobreescriure'l)"
 
 #: scripts/makepkg.sh.in:2152
 msgid "Source package created: %s"
@@ -790,15 +732,12 @@ msgstr "parella clau/valor no vàlida\n"
 
 #: scripts/makepkg-template.pl.in:82
 msgid "invalid template line: can't find template name\n"
-msgstr ""
-"la línia plantilla no és vàlida: no s'ha pogut trobar el nom de la "
-"plantilla\n"
+msgstr "la línia plantilla no és vàlida: no s'ha pogut trobar el nom de la plantilla\n"
 
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr ""
-"s'han utilitzat caràcters no vàlids al nom \"%s\". Permès: [:alnum:]+_.@-\n"
+msgstr "s'han utilitzat caràcters no vàlids al nom \"%s\". Permès: [:alnum:]+_.@-\n"
 
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
@@ -831,27 +770,21 @@ msgstr "Opcions:\n"
 #: scripts/makepkg-template.pl.in:178
 #, perl-format
 msgid "  --input, -p <file>    Build script to read (default: %s)\n"
-msgstr ""
-"  --input, -p <fitxer>    Script de construcció per llegir (per defecte: "
-"%s)\n"
+msgstr "  --input, -p <fitxer>    Script de construcció per llegir (per defecte: %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
-msgstr ""
-"  --output, -o <fitxer>   fitxer de sortida (per defecte: fitxer d'entrada)\n"
+msgstr "  --output, -o <fitxer>   fitxer de sortida (per defecte: fitxer d'entrada)\n"
 
 #: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
-msgstr ""
-"  --newest, -n          actualitza les plantilles a la versió més nova\n"
+msgstr "  --newest, -n          actualitza les plantilles a la versió més nova\n"
 
 #: scripts/makepkg-template.pl.in:181
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"(per defecte: utilitza la versió especificada en les etiquetes de les "
-"plantilles)\n"
+msgstr "(per defecte: utilitza la versió especificada en les etiquetes de les plantilles)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
@@ -864,26 +797,18 @@ msgstr "                        (per defecte: %s)\n"
 
 #: scripts/makepkg-template.pl.in:184
 msgid "  --help, -h            This help message\n"
-msgstr ""
-"  --help, -h            Aquest missatge d'ajuda\n"
-"\n"
+msgstr "  --help, -h            Aquest missatge d'ajuda\n\n"
 
 #: scripts/makepkg-template.pl.in:185
 msgid "  --version             Version information\n"
-msgstr ""
-"  --version             Informació de la versió\n"
-"\n"
+msgstr "  --version             Informació de la versió\n\n"
 
 #: scripts/makepkg-template.pl.in:194
 msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
-"Això és programari lliure. Consulteu el codi font per a les condicions de "
-"còpia.\n"
-"NO hi ha cap GARANTIA, en la mesura permesa per la llei.\n"
+msgstr "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\nAixò és programari lliure. Consulteu el codi font per a les condicions de còpia.\nNO hi ha cap GARANTIA, en la mesura permesa per la llei.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -895,8 +820,7 @@ msgstr "opcions:"
 
 #: scripts/pacman-db-upgrade.sh.in:43
 msgid "  -b, --dbpath <path>  set an alternate database location"
-msgstr ""
-"  -b, --dbpath <ruta>  estableix una ubicació alternativa de la base de dades"
+msgstr "  -b, --dbpath <ruta>  estableix una ubicació alternativa de la base de dades"
 
 #: scripts/pacman-db-upgrade.sh.in:44
 msgid "  -h, --help           show this help message and exit"
@@ -920,13 +844,10 @@ msgstr "  --nocolor            inhabilita els missatges de sortida acolorits"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nAixò és programari lliure. Consulteu el codi font per a les condicions de "
-"còpia.\\nNO hi ha cap GARANTIA, en la mesura permesa per la llei.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nAixò és programari lliure. Consulteu el codi font per a les condicions de còpia.\\nNO hi ha cap GARANTIA, en la mesura permesa per la llei.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -943,9 +864,7 @@ msgstr "Heu de tenir els permisos correctes per actualitzar la base de dades."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"S'ha trobat el fitxer de bloqueig del Pacman. No es pot executar mentre el "
-"Pacman s'està executant."
+msgstr "S'ha trobat el fitxer de bloqueig del Pacman. No es pot executar mentre el Pacman s'està executant."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -961,9 +880,7 @@ msgstr "Format de base de dades Pre-4.2 detectat - s'actualitza..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"L'enllaç simbòlic \"%s\" apunta fora de l'arrel del Pacman, és necessària "
-"una reparació manual."
+msgstr "L'enllaç simbòlic \"%s\" apunta fora de l'arrel del Pacman, és necessària una reparació manual."
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -979,26 +896,20 @@ msgstr "Operacions:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add                 Afegeix les claus especificades (buit per stdin)"
+msgstr "  -a, --add                 Afegeix les claus especificades (buit per stdin)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
-msgstr ""
-"  -d, --delete              Esborra els identificadors de clau especificats"
+msgstr "  -d, --delete              Esborra els identificadors de clau especificats"
 
 #: scripts/pacman-key.sh.in:65
 msgid "  -e, --export              Export the specified or all keyids"
-msgstr ""
-"  -e, --export              Exporta tots els identificadors de clau o els "
-"especificats"
+msgstr "  -e, --export              Exporta tots els identificadors de clau o els especificats"
 
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              Llista les empremtes per a tots els "
-"identificadors de clau o els especificats"
+msgstr "  -f, --finger              Llista les empremtes per a tots els identificadors de clau o els especificats"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -1006,28 +917,21 @@ msgstr "  -l, --list-keys           Llista les claus especificades o totes"
 
 #: scripts/pacman-key.sh.in:68
 msgid "  -r, --recv-keys           Fetch the specified keyids"
-msgstr ""
-"  -r, --recv-keys           Recupera els identificadors de clau especificats"
+msgstr "  -r, --recv-keys           Recupera els identificadors de clau especificats"
 
 #: scripts/pacman-key.sh.in:69
 msgid "  -u, --updatedb            Update the trustdb of pacman"
-msgstr ""
-"  -u, --updatedb            Actualitza la base de dades de confiança del "
-"Pacman"
+msgstr "  -u, --updatedb            Actualitza la base de dades de confiança del Pacman"
 
 #: scripts/pacman-key.sh.in:70
 msgid ""
 "  -v, --verify              Verify the file(s) specified by the signature(s)"
-msgstr ""
-"  -v, --verify              Verifica els fitxer(s) especificats per la "
-"signatura(es)"
+msgstr "  -v, --verify              Verifica els fitxer(s) especificats per la signatura(es)"
 
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key                Mostra un menú per a la tasca de gestió de claus "
-"sobre els identificadors de clau"
+msgstr "  --edit-key                Mostra un menú per a la tasca de gestió de claus sobre els identificadors de clau"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
@@ -1037,62 +941,46 @@ msgstr "  --import                  Importa pubring.gpg del(s) dirirectori(s)"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          Importa valors de confiança de trustdb.gpg al(s) "
-"directori(s)"
+msgstr "  --import-trustdb          Importa valors de confiança de trustdb.gpg al(s) directori(s)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                    Assegura que el clauer ha estat correctament "
-"iniciat"
+msgstr "  --init                    Assegura que el clauer ha estat correctament iniciat"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
-msgstr ""
-"  --list-sigs               Llista claus i les corresponents signatures"
+msgstr "  --list-sigs               Llista claus i les corresponents signatures"
 
 #: scripts/pacman-key.sh.in:76
 msgid "  --lsign-key               Locally sign the specified keyid"
-msgstr ""
-"  --lsign-key               Signa localment l'identificador de clau "
-"especificat"
+msgstr "  --lsign-key               Signa localment l'identificador de clau especificat"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                Recarrega les claus per defecte dels clauers\\n "
-"a \"%s\""
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                Recarrega les claus per defecte dels clauers\\n a \"%s\""
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            Actualitza totes les claus o les especificades "
-"d'un servidor de claus"
+msgstr "  --refresh-keys            Actualitza totes les claus o les especificades d'un servidor de claus"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <file>           Empra un fitxer de configuració alternatiu (en "
-"comtes de\\n \"%s\")"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <file>           Empra un fitxer de configuració alternatiu (en comtes de\\n \"%s\")"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            Estableix un directori alternatiu per a GnuPG "
-"(en comptes\\n de \"%s\")"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            Estableix un directori alternatiu per a GnuPG (en comptes\\n de \"%s\")"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <server-url>  Especifica un servidor de claus si és necessari"
+msgstr "  --keyserver <server-url>  Especifica un servidor de claus si és necessari"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1212,9 +1100,7 @@ msgstr "Clau remota no obtinguda correctament del servidor de claus."
 
 #: scripts/pacman-key.sh.in:477
 msgid "A specified local key could not be updated from a keyserver."
-msgstr ""
-"No s'ha pogut actualitzar una clau local espcificada des d'un servidor de "
-"claus."
+msgstr "No s'ha pogut actualitzar una clau local espcificada des d'un servidor de claus."
 
 #: scripts/pacman-key.sh.in:487
 msgid "The signature identified by %s could not be verified."
@@ -1264,26 +1150,17 @@ msgstr "Ús: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize és un petit arranjament que hauria de millorar el rendiment"
-"\\ndel Pacman en llegir/escriure a la seva base de dades basada en un "
-"sistema de fitxers.\\n\\n"
+msgstr "pacman-optimize és un petit arranjament que hauria de millorar el rendiment\\ndel Pacman en llegir/escriure a la seva base de dades basada en un sistema de fitxers.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Com que el Pacman usa molts fitxers petits per mantenir el seguiment dels "
-"paquets,\\nhi ha la tendència que aquests fitxers es fragmentin.\\nAquest "
-"script intenta reassignar aquests fitxers petits en una\\nubicació contínua "
-"al vostre disc dur. De resultes d'això el disc\\ndur hauria de poder llegir-"
-"los més ràpidament, ja que el capçal del disc\\nno s'ha de moure gaire per "
-"tot el disc.\\n"
+msgstr "Com que el Pacman usa molts fitxers petits per mantenir el seguiment dels paquets,\\nhi ha la tendència que aquests fitxers es fragmentin.\\nAquest script intenta reassignar aquests fitxers petits en una\\nubicació contínua al vostre disc dur. De resultes d'això el disc\\ndur hauria de poder llegir-los més ràpidament, ja que el capçal del disc\\nno s'ha de moure gaire per tot el disc.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1327,19 +1204,16 @@ msgstr "S'està comprovant la integritat..."
 
 #: scripts/pacman-optimize.sh.in:162
 msgid "Integrity check FAILED, reverting to old database."
-msgstr ""
-"Ha FALLAT la comprovació de la integritat, s'està revertint a l'antiga base "
-"de dades."
+msgstr "Ha FALLAT la comprovació de la integritat, s'està revertint a l'antiga base de dades."
 
 #: scripts/pacman-optimize.sh.in:166
 msgid "Rotating database into place..."
 msgstr "S'està rotant la base de dades a lloc..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"Ha fallat la substitució de la nova base de dades. Comproveu %s, %s i el "
-"directori %s."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "Ha fallat la substitució de la nova base de dades. Comproveu %s, %s i el directori %s."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1353,9 +1227,7 @@ msgstr "Ús: pkgdelta [opcions] <paquet1> <paquet2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"El pkgdelta crearà un fitxer delta entre dos paquets.\\nAquest fitxer delta "
-"pot ser afegit una la base de dades mitjançant repo-add.\\n"
+msgstr "El pkgdelta crearà un fitxer delta entre dos paquets.\\nAquest fitxer delta pot ser afegit una la base de dades mitjançant repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1376,26 +1248,20 @@ msgstr "  --nocolor         elimina el color del text de sortida\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-" --min-pkg-size    Mida mínima del paquet abans de la generació de deltes\\n"
+msgstr " --min-pkg-size    Mida mínima del paquet abans de la generació de deltes\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  percentatge del nou paquet per sobre del qual es "
-"descartarà el delta\\n"
+msgstr "  --max-delta-size  percentatge del nou paquet per sobre del qual es descartarà el delta\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nAixò és "
-"programari lliure; consulteu el codi font per a les condicions de còpia."
-"\\nNO hi ha cap GARANTIA, en la mesura permesa per la llei.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nAixò és programari lliure; consulteu el codi font per a les condicions de còpia.\\nNO hi ha cap GARANTIA, en la mesura permesa per la llei.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1447,50 +1313,36 @@ msgstr "Utilització: repo-add [opcions] <path-to-db> <package|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add actualitzarà la base de dades de paquets mitjançant la lectura d'un "
-"fitxer de  paquet.\\nEs poden especificar múltiples paquets per afegir a la "
-"línia d'ordres.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add actualitzarà la base de dades de paquets mitjançant la lectura d'un fitxer de  paquet.\\nEs poden especificar múltiples paquets per afegir a la línia d'ordres.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta       genera i afegeix delta per a l'actualització del paquet"
-"\\n"
+msgstr "  -d, --delta       genera i afegeix delta per a l'actualització del paquet\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"  -n, --new         Afegeix tan sols els paquets que ja no són a la base de "
-"dades\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "  -n, --new         Afegeix tan sols els paquets que ja no són a la base de dades\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"  -R, --remove      elimina el fitxer antic del paquet del disc després "
-"d'actualitzar la base de dades\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "  -R, --remove      elimina el fitxer antic del paquet del disc després d'actualitzar la base de dades\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Utilització: repo-remove [opcions] <ruta-a-baseDeDades> <nomPaquet|delta> ..."
-"\\n"
+msgstr "Utilització: repo-remove [opcions] <ruta-a-baseDeDades> <nomPaquet|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove actualitzarà una base de dades de paquets eliminant el nom del "
-"paquet,\\nespecificat a la línia d'ordres, de la base de dades del "
-"repositori donat.\\nEs poden especificar múltiples paquets a eliminar a la "
-"línia d'ordres.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove actualitzarà una base de dades de paquets eliminant el nom del paquet,\\nespecificat a la línia d'ordres, de la base de dades del repositori donat.\\nEs poden especificar múltiples paquets a eliminar a la línia d'ordres.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1502,34 +1354,25 @@ msgstr "  --nocolor         no usis color al text de sortida\\n"
 
 #: scripts/repo-add.sh.in:80
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
-msgstr ""
-"  -s, --sign        signa la base de dades amb GnuPG després de "
-"l'actualització\\n"
+msgstr "  -s, --sign        signa la base de dades amb GnuPG després de l'actualització\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <key>   usa la clau especificada per signar la base de dades\\n"
+msgstr "  -k, --key <key>   usa la clau especificada per signar la base de dades\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
-"  -v, --verify      verifica la signatura de la base de dades abans de "
-"l'actualització\\n"
+msgstr "  -v, --verify      verifica la signatura de la base de dades abans de l'actualització\\n"
 
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nVegis %s(8) per més detalls i descripcions sobre les opcions disponibles."
-"\\n"
+msgstr "\\nVegis %s(8) per més detalls i descripcions sobre les opcions disponibles.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Exemple:  repo-add /ruta/a/repositori.db.tar.gz pacman-3.0.0-1-i686.pkg.tar."
-"gz\\n"
+msgstr "Exemple:  repo-add /ruta/a/repositori.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1537,13 +1380,10 @@ msgstr "Exemple:  repo-remove /ruta/a/repositori.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nAixò és programari lliure. Consulteu el codi font per a les condicions de "
-"còpia.\\nNO hi ha cap GARANTIA, en la mesura permesa per la llei.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nAixò és programari lliure. Consulteu el codi font per a les condicions de còpia.\\nNO hi ha cap GARANTIA, en la mesura permesa per la llei.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1575,8 +1415,7 @@ msgstr "S'ha creat el fitxer de signatura \"%s\""
 
 #: scripts/repo-add.sh.in:272
 msgid "Failed to sign package database file '%s'"
-msgstr ""
-"Ha fallat la signatura del fitxer de la base de dades de paquets \"%s\""
+msgstr "Ha fallat la signatura del fitxer de la base de dades de paquets \"%s\""
 
 #: scripts/repo-add.sh.in:281
 msgid "Verifying database signature..."
@@ -1640,8 +1479,7 @@ msgstr "Retingut pel procés %s"
 
 #: scripts/repo-add.sh.in:536
 msgid "Repository file '%s' is not a proper pacman database."
-msgstr ""
-"El fitxer de repositori \"%s\" no és una base de dades de Pacman adequada."
+msgstr "El fitxer de repositori \"%s\" no és una base de dades de Pacman adequada."
 
 #: scripts/repo-add.sh.in:541
 msgid "Extracting database to a temporary location..."
@@ -1697,8 +1535,7 @@ msgstr "S'ha especificat un nom d'ordre \"%s\" no vàlid."
 
 #: scripts/repo-add.sh.in:734
 msgid "Cannot create temp directory for database building."
-msgstr ""
-"No s'ha pogut crear el directori temporal per construir la base de dades."
+msgstr "No s'ha pogut crear el directori temporal per construir la base de dades."
 
 #: scripts/repo-add.sh.in:812
 msgid "Creating updated database file '%s'"
@@ -1837,18 +1674,21 @@ msgstr "Error durant l'obtenció de %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Referència desconeguda: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Creant una còpia de treball del repositori %s %s ..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Error en actualitzar la còpia de treball del repositori %s %s"
 
@@ -1880,12 +1720,14 @@ msgstr "S'està extraient  %s amb %s"
 msgid "Failed to extract %s"
 msgstr "Ha fallat extreure %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Clonant el repositori %s %s..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Error durant la baixada del repositori %s %s"
@@ -1894,12 +1736,14 @@ msgstr "Error durant la baixada del repositori %s %s"
 msgid "%s is not a clone of %s"
 msgstr "%s no és un clon de %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Actualitzant el repositori %s %s..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Error actualitzant el repositori %s %s"
@@ -1942,9 +1786,7 @@ msgstr "S'estan eliminant els fitxers de les biblioteques estàtiques..."
 
 #: scripts/libmakepkg/tidy/strip.sh.in:85
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr ""
-"S'estan retirant els símbols innecessaris de depuració dels binaris i les "
-"biblioteques..."
+msgstr "S'estan retirant els símbols innecessaris de depuració dels binaris i les biblioteques..."
 
 #: scripts/libmakepkg/tidy/upx.sh.in:35
 msgid "Compressing binaries with %s..."
diff --git a/scripts/po/cs.po b/scripts/po/cs.po
index fde9a58f..661bc34d 100644
--- a/scripts/po/cs.po
+++ b/scripts/po/cs.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011
 # Jaroslav Lichtblau <dragonlord@seznam.cz>, 2014-2016
@@ -18,12 +18,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-24 21:55+0000\n"
 "Last-Translator: Jaroslav Lichtblau <dragonlord@seznam.cz>\n"
-"Language-Team: Czech (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/cs/)\n"
-"Language: cs\n"
+"Language-Team: Czech (http://www.transifex.com/toofishes/archlinux-pacman/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: scripts/makepkg.sh.in:135
@@ -105,7 +104,8 @@ msgid "Generating checksums for source files..."
 msgstr "Počítají se kontrolní součty zdrojových souborů..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
 msgstr "Nelze nalézt soubor %s potřebný pro vytvoření kontrolních součtů."
 
 #: scripts/makepkg.sh.in:422
@@ -414,7 +414,8 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "Skupina balíčků je již sestavena. (použijte %s pro přepsání)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "Část skupiny balíčků je již sestavena. (použijte %s pro přepsání)"
 
 #: scripts/makepkg.sh.in:1696
@@ -447,9 +448,7 @@ msgstr "  -d, --nodeps     Přeskočit všechny kontroly závislostí"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  Nerozbalovat zdrojové soubory (použít existující %s "
-"složku)"
+msgstr "  -e, --noextract  Nerozbalovat zdrojové soubory (použít existující %s složku)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -486,11 +485,11 @@ msgstr "  -p <file>        Použít alternativní build skript (namísto '%s')"
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Po úspěšném sestavení odstranit nainstalované závislosti"
+msgstr "  -r, --rmdeps     Po úspěšném sestavení odstranit nainstalované závislosti"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  Znovu zabalit obsah balícku bez sestavení"
 
 #: scripts/makepkg.sh.in:1716
@@ -510,8 +509,7 @@ msgstr "  -V, --version      Verze programu"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      Vytvořit zdrojový archiv, včetně stahovaných souborů"
+msgstr "  --allsource      Vytvořit zdrojový archiv, včetně stahovaných souborů"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -519,8 +517,7 @@ msgstr "  --check          Spustí funkci %s v %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <file>  Použít alternativní konfigurační soubor (namísto '%s')"
+msgstr "  --config <file>  Použít alternativní konfigurační soubor (namísto '%s')"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -528,7 +525,8 @@ msgstr "--holdver Neaktualizuje VCS zdroje"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
 msgstr "  --key <klíč>     Určí klíč pro podepisování %s namísto výchozího"
 
 #: scripts/makepkg.sh.in:1724
@@ -577,9 +575,7 @@ msgstr "  --skippgpcheck   Neověřovat PGP podpisy u zdrojových souborů"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"--verifysource Stáhne zdrojové soubory (pokud je to potřeba) a provede "
-"kontrolu integrity"
+msgstr "--verifysource Stáhne zdrojové soubory (pokud je to potřeba) a provede kontrolu integrity"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -592,8 +588,7 @@ msgstr "      --asdeps         nainstalovat balíčky jako závislosti"
 #: scripts/makepkg.sh.in:1739
 msgid ""
 "  --needed         Do not reinstall the targets that are already up to date"
-msgstr ""
-"      --needed         nepřeinstalovávát balíčky, které jsou stále aktuální"
+msgstr "      --needed         nepřeinstalovávát balíčky, které jsou stále aktuální"
 
 #: scripts/makepkg.sh.in:1740
 msgid ""
@@ -610,15 +605,12 @@ msgstr "Když není zadáno %s, %s bude hledat '%s'"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nToto je "
-"svobodný software; nahlédněte do zdrojového kódu pro podmínky kopírování."
-"\\nNejsou poskytovány žádné záruky, v rozsahu povoleném zákonem.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nToto je svobodný software; nahlédněte do zdrojového kódu pro podmínky kopírování.\\nNejsou poskytovány žádné záruky, v rozsahu povoleném zákonem.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -652,9 +644,7 @@ msgstr "Nemáte práva zápisu k uložení logů do %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Spuštění %s jako root není povoleno, protože může způsobit trvalou,"
-"\\nkatastrofickou škodu na vašem systému."
+msgstr "Spuštění %s jako root není povoleno, protože může způsobit trvalou,\\nkatastrofickou škodu na vašem systému."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -785,8 +775,7 @@ msgstr "  --input, -p <file>    Sestavit skript pro čtení (výchozí: %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
-msgstr ""
-"  --output, -o <file>   soubor pro výstup na (výchozí: vstupní soubor)\n"
+msgstr "  --output, -o <file>   soubor pro výstup na (výchozí: vstupní soubor)\n"
 
 #: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
@@ -796,9 +785,7 @@ msgstr "  --newest, -n          aktualizovat šablony na nejnovější verzi\n"
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                        (výchozí: použít verzi uvedenou ve značkovači "
-"šablon)\n"
+msgstr "                        (výchozí: použít verzi uvedenou ve značkovači šablon)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
@@ -822,11 +809,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
-"Toto je svobodný software; nahlédněte do zdrojového kódu pro podmínky "
-"kopírování.\n"
-"Nejsou poskytovány žádné záruky, v rozsahu povoleném zákonem.\n"
+msgstr "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\nToto je svobodný software; nahlédněte do zdrojového kódu pro podmínky kopírování.\nNejsou poskytovány žádné záruky, v rozsahu povoleném zákonem.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -846,8 +829,7 @@ msgstr "  -h, --help           vypsat tuto nápovědu a ukončit program"
 
 #: scripts/pacman-db-upgrade.sh.in:45
 msgid "  -r, --root <path>    set an alternate installation root"
-msgstr ""
-"  -r, --root <path>    nastavit alternativní kořenový adresář instalace"
+msgstr "  -r, --root <path>    nastavit alternativní kořenový adresář instalace"
 
 #: scripts/pacman-db-upgrade.sh.in:46
 msgid "  -V, --version        show version information and exit"
@@ -863,14 +845,10 @@ msgstr "  --nocolor            vypnout barevné zvýraznění výstupu"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nToto je svobodný software; nahlédněte do zdrojového kódu pro podmínky "
-"kopírování.\\nNejsou poskytovány žádné záruky, v rozsahu povoleném zákonem."
-"\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nToto je svobodný software; nahlédněte do zdrojového kódu pro podmínky kopírování.\\nNejsou poskytovány žádné záruky, v rozsahu povoleném zákonem.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -903,8 +881,7 @@ msgstr "Zjištěn formát databáze před verzí 4.2 - aktualizuje se..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"symlink '%s' míří mimo kořen programu pacman, vyžadována manuální náprava"
+msgstr "symlink '%s' míří mimo kořen programu pacman, vyžadována manuální náprava"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -945,8 +922,7 @@ msgstr "  -r, --recv-keys   Stáhne uvedené klíče"
 
 #: scripts/pacman-key.sh.in:69
 msgid "  -u, --updatedb            Update the trustdb of pacman"
-msgstr ""
-"  -u, --updatedb      Aktualizuje databázi důvěry (trustdb) v pacmanovi"
+msgstr "  -u, --updatedb      Aktualizuje databázi důvěry (trustdb) v pacmanovi"
 
 #: scripts/pacman-key.sh.in:70
 msgid ""
@@ -966,9 +942,7 @@ msgstr "  --import    Načte pupring.gpg z adresáře(ů)"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb   Načte \"důvěryhodnost vlastníků\" z trustdb.gpg ze "
-"zadaných složek "
+msgstr "  --import-trustdb   Načte \"důvěryhodnost vlastníků\" z trustdb.gpg ze zadaných složek "
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
@@ -984,40 +958,30 @@ msgstr "  --lsign-key   Lokálně podepíše uvedené keyid"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate    Znovu načte výchozí klíče z (zadaných) klíčenek\\n  v '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate    Znovu načte výchozí klíče z (zadaných) klíčenek\\n  v '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys   Aktualizuje uvedené (nebo všechny) klíče ze serveru s "
-"klíči"
+msgstr "  --refresh-keys   Aktualizuje uvedené (nebo všechny) klíče ze serveru s klíči"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <soubor>    Použije zadaný konfigurační soubor (namísto"
-"\\n                                                         '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <soubor>    Použije zadaný konfigurační soubor (namísto\\n                                                         '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <složka>     nastaví vlastní adresář pro GnuPG (namísto "
-"\\n                                                                                        "
-"'%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <složka>     nastaví vlastní adresář pro GnuPG (namísto \\n                                                                                        '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <server-url>          Určí, který server s klíči se má v "
-"případě potřeby použít"
+msgstr "  --keyserver <server-url>          Určí, který server s klíči se má v případě potřeby použít"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1187,24 +1151,17 @@ msgstr "Použití: %s [--nocolor] [kořen_databáze_pacmana]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize je malý hack, který pomáhá zlepšit výkon pacmana\\npři čtení "
-"a zápisu do databáze na bázi souborového systému.\\n\\n"
+msgstr "pacman-optimize je malý hack, který pomáhá zlepšit výkon pacmana\\npři čtení a zápisu do databáze na bázi souborového systému.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Protože pacman používá mnoho malých souborů pro udržování informací\\no "
-"balíčcích, má tendenci v průběhu času tyto soubory fragmentovat.\\nTento "
-"skript se pokouší přemístit tyto malé soubory do jedné souvislé\\noblasti na "
-"disku. Ve výsledku by měl disk být schopen číst tyto soubory\\nrychleji, "
-"protože hlavičky disku se nemusí tak často přesouvat.\\n"
+msgstr "Protože pacman používá mnoho malých souborů pro udržování informací\\no balíčcích, má tendenci v průběhu času tyto soubory fragmentovat.\\nTento skript se pokouší přemístit tyto malé soubory do jedné souvislé\\noblasti na disku. Ve výsledku by měl disk být schopen číst tyto soubory\\nrychleji, protože hlavičky disku se nemusí tak často přesouvat.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1255,7 +1212,8 @@ msgid "Rotating database into place..."
 msgstr "Vyměňují se databáze..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr "Nahrazení nové databáze sehlalo. Zkontrolujte složky %s, %s a %s. "
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1270,9 +1228,7 @@ msgstr "Použití: pkgdelta [-q] <balíček1><balíček2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta vytvoří delta rozdíl mezi dvěma balíčky.\\nTento delta rozdíl pak "
-"může být přidán do databáze pomocí repo-add.\\n"
+msgstr "pkgdelta vytvoří delta rozdíl mezi dvěma balíčky.\\nTento delta rozdíl pak může být přidán do databáze pomocí repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1299,18 +1255,14 @@ msgstr "--min-pkg-size velikost nejmenšího balíčku, pro generovaní deltas\\
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"--max-delta-size procenta. Pokud jsou změny větší, nepoužije se delta. \\n"
+msgstr "--max-delta-size procenta. Pokud jsou změny větší, nepoužije se delta. \\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nToto je "
-"svobodný software; vizte zdrojový kód pro podmínky kopírování.\\nNejsou "
-"poskytovány žádné záruky, v rozsahu povoleném zákonem.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nToto je svobodný software; vizte zdrojový kód pro podmínky kopírování.\\nNejsou poskytovány žádné záruky, v rozsahu povoleném zákonem.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1362,11 +1314,9 @@ msgstr "Použití: repo-add [volby] <cesta-k-databázi> <balíček|delta> ...\\n
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add aktualizuje databázi balíčků pomocí čtení souboru balíčku.\\nNa "
-"příkazové řádce může být uvedeno více balíčků pro přidání.\\n\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add aktualizuje databázi balíčků pomocí čtení souboru balíčku.\\nNa příkazové řádce může být uvedeno více balíčků pro přidání.\\n\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1374,16 +1324,15 @@ msgstr "  -d, --delta    vytvoří a přidá rozdíly (delta) pro update balíč
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr "-n, --new přidat pouze balíčky, které ještě nejsou v DB\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"  -R, --remove      odstranit starý soubor balíčku z disku po aktualizaci "
-"databáze\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "  -R, --remove      odstranit starý soubor balíčku z disku po aktualizaci databáze\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
@@ -1391,13 +1340,10 @@ msgstr "Použití: repo-remove [volby] <cesta-k-db> <jmenobalicku|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove aktualizuje databázi balíčků odstraňováním balíčků podle jména"
-"\\nuvedeného na příkazové řádce z dané databáze. Na příkazové řádce může být"
-"\\nuvedeno více balíčků pro odebrání.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove aktualizuje databázi balíčků odstraňováním balíčků podle jména\\nuvedeného na příkazové řádce z dané databáze. Na příkazové řádce může být\\nuvedeno více balíčků pro odebrání.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1427,8 +1373,7 @@ msgstr "\\nViz %s(8) pro více informací a popis dostupných voleb. \\n"
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Příklad:  repo-add /cesta/k/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Příklad:  repo-add /cesta/k/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1436,14 +1381,10 @@ msgstr "Příklad:  repo-remove /cesta/k/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\n\\nToto je svobodný software; nahlédněte do zdrojového kódu pro podmínky "
-"kopírování.\\nNejsou poskytovány žádné záruky, v rozsahu povoleném zákonem."
-"\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\n\\nToto je svobodný software; nahlédněte do zdrojového kódu pro podmínky kopírování.\\nNejsou poskytovány žádné záruky, v rozsahu povoleném zákonem.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1734,18 +1675,21 @@ msgstr "Selhalo stažení %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Nerozpoznaný odkaz: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Vytváření pracovní kopie repozitáře %s %s ..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Chyba při aktualizaci pracovní kopie repozitáře %s %s "
 
@@ -1777,12 +1721,14 @@ msgstr "Rozbaluje se %s pomocí %s"
 msgid "Failed to extract %s"
 msgstr "Selhalo rozbalení %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Klonování repozitáře %s %s ..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Chyba při stahování repozitáře %s %s "
@@ -1791,20 +1737,21 @@ msgstr "Chyba při stahování repozitáře %s %s "
 msgid "%s is not a clone of %s"
 msgstr "%s není klonem %s "
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Aktualizuji repozitář %s %s ..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Chyba při aktualizaci repozitáře %s %s "
 
 #: scripts/libmakepkg/source/local.sh.in:39
 msgid "%s was not found in the build directory and is not a URL."
-msgstr ""
-"Soubor %s nebyl nalezen v adresáři, kde se provádí sestavení, a není ani URL."
+msgstr "Soubor %s nebyl nalezen v adresáři, kde se provádí sestavení, a není ani URL."
 
 #: scripts/libmakepkg/tidy.sh.in:41
 msgid "Tidying install..."
@@ -1840,8 +1787,7 @@ msgstr "Odstraňování souborů statických knihoven..."
 
 #: scripts/libmakepkg/tidy/strip.sh.in:85
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr ""
-"Odstraňují se nepotřebné ladící informace z binárních souborů a knihoven..."
+msgstr "Odstraňují se nepotřebné ladící informace z binárních souborů a knihoven..."
 
 #: scripts/libmakepkg/tidy/upx.sh.in:35
 msgid "Compressing binaries with %s..."
diff --git a/scripts/po/da.po b/scripts/po/da.po
index 056eb855..2d2b597a 100644
--- a/scripts/po/da.po
+++ b/scripts/po/da.po
@@ -1,10 +1,10 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Chris Darnell <chris@cedeel.com>, 2013
-# Chris Darnell <chris@cedeel.com>, 2013-2014
+# Chris Darnell <chris@cedeel.com>, 2013-2014,2016
 # Freso <transifex.net@freso.dk>, 2012-2013
 # Freso <transifex.net@freso.dk>, 2012-2013
 # jakobw <jakob.wadsager@gmail.com>, 2012
@@ -19,14 +19,13 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
-"PO-Revision-Date: 2016-01-17 03:32+0000\n"
-"Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Danish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/da/)\n"
-"Language: da\n"
+"PO-Revision-Date: 2016-02-22 22:21+0000\n"
+"Last-Translator: Chris Darnell <chris@cedeel.com>\n"
+"Language-Team: Danish (http://www.transifex.com/toofishes/archlinux-pacman/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -108,10 +107,9 @@ msgid "Generating checksums for source files..."
 msgstr "Opretter kontrolsummer for kildefiler..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Kan ikke finde den binære fil %s, der er krævet for at generere kildefil-"
-"kontrolsummer."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Kan ikke finde den binære fil %s, der er krævet for at generere kildefil-kontrolsummer."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -136,7 +134,7 @@ msgstr "FEJLEDE"
 
 #: scripts/makepkg.sh.in:478
 msgid "Validating %s files with %s..."
-msgstr ""
+msgstr "Validerer %s filer med %s ..."
 
 #: scripts/makepkg.sh.in:485
 msgid "One or more files did not pass the validity check!"
@@ -148,7 +146,7 @@ msgstr "Integritetstjekene (%s) har en anden størrelse end kildetabellen."
 
 #: scripts/makepkg.sh.in:531
 msgid "Integrity checks are missing for: %s"
-msgstr ""
+msgstr "Integritetstjek mangler for: %s"
 
 #: scripts/makepkg.sh.in:598
 msgid "Verifying source file signatures with %s..."
@@ -346,8 +344,7 @@ msgstr "Ukendt overførselsprotokol: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Kan ikke finde den binære fil %s der er krævet for at tjekke VCS-kildekrav"
+msgstr "Kan ikke finde den binære fil %s der er krævet for at tjekke VCS-kildekrav"
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
@@ -355,14 +352,11 @@ msgstr "Kan ikke finde pakken %s som er påkrævet til at håndtere %s-kilder."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
-msgstr ""
-"Kan ikke finde den binære fil %s, der er krævet for afhængige operationer."
+msgstr "Kan ikke finde den binære fil %s, der er krævet for afhængige operationer."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Kan ikke finde den binære fil %s. Vil bruge %s til at indhente root-"
-"privilegier."
+msgstr "Kan ikke finde den binære fil %s. Vil bruge %s til at indhente root-privilegier."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -374,44 +368,36 @@ msgstr "Kan ikke finde den binære fil %s, der er krævet for at signere pakker.
 
 #: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
-"Kan ikke finde den binære fil %s, der er krævet for at verificere kildefiler."
+msgstr "Kan ikke finde den binære fil %s, der er krævet for at verificere kildefiler."
 
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
+msgstr "Kan ikke finde den binære fil %s, der er krævet for at validere kildefil-kontrolsummer."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"Kan ikke finde den binære fil %s, der er krævet for at komprimere binære "
-"filer."
+msgstr "Kan ikke finde den binære fil %s, der er krævet for at komprimere binære filer."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
-msgstr ""
+msgstr "Kan ikke finde den binære fil %s, der er krævet for at optimere PNG-billeder."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"Kan ikke finde den binære fil %s, der er krævet for distribueret kompilering."
+msgstr "Kan ikke finde den binære fil %s, der er krævet for distribueret kompilering."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Kan ikke finde den binære fil %s, der er krævet for brug af compiler cache."
+msgstr "Kan ikke finde den binære fil %s, der er krævet for brug af compiler cache."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"Kan ikke finde den binære fil %s, der er krævet for objektfil-stripping."
+msgstr "Kan ikke finde den binære fil %s, der er krævet for objektfil-stripping."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Kan ikke finde den binære fil %s, der er krævet for at komprimere man- og "
-"info-sider."
+msgstr "Kan ikke finde den binære fil %s, der er krævet for at komprimere man- og info-sider."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -424,17 +410,16 @@ msgstr "En pakke er allerede blevet bygget. (brug %s for at overskrive)"
 #: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr ""
-"Pakkegruppen er allerede blevet bygget, installerer eksisterende pakker..."
+msgstr "Pakkegruppen er allerede blevet bygget, installerer eksisterende pakker..."
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "Pakkegruppen er allerede blevet bygget. (brug %s for at overskrive)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"En del af pakkegruppen er allerede blevet bygget. (brug %s for at overskrive)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "En del af pakkegruppen er allerede blevet bygget. (brug %s for at overskrive)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -503,12 +488,11 @@ msgstr "  -p <fil>         Brug et alternativt bygningsscript (fremfor '%s')"
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Fjern installerede afhængigheder efter en succesfuld "
-"bygning"
+msgstr "  -r, --rmdeps     Fjern installerede afhængigheder efter en succesfuld bygning"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  Ompak indholdet af pakken uden at bygge igen"
 
 #: scripts/makepkg.sh.in:1716
@@ -528,9 +512,7 @@ msgstr " -v, --version Vis programversion og afslut"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      Opret en tarball kun med kildefiler inklusiv hentede "
-"kilder"
+msgstr "  --allsource      Opret en tarball kun med kildefiler inklusiv hentede kilder"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -538,8 +520,7 @@ msgstr "--check Kør funktionen %s i %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <fil>  Brug en alternativ konfigurationsfil (i stedet for '%s')"
+msgstr "  --config <fil>  Brug en alternativ konfigurationsfil (i stedet for '%s')"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -547,9 +528,9 @@ msgstr "  --holdver        Opdater ikke VCS-kilder"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"--key <nøgle> Angiv en nøgle til %s-signering i stedet for standardnøglen"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "--key <nøgle> Angiv en nøgle til %s-signering i stedet for standardnøglen"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -570,11 +551,11 @@ msgstr "--nosign         Opret ikke en signatur for pakken"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
+msgstr "--packagelist List kun pakker som ville blive produceret, uden PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
-msgstr ""
+msgstr "--printsrcinfo Udskriv den dannede SRCINFO og afslut"
 
 #: scripts/makepkg.sh.in:1730
 msgid "  --sign           Sign the resulting package with %s"
@@ -597,8 +578,7 @@ msgstr " --skippgpcheck   Verificer ikke kildefiler med PGP-signaturer"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"--verifysource Hent kildekode (hvis nødvendig) og udfør integritetskontrol"
+msgstr "--verifysource Hent kildekode (hvis nødvendig) og udfør integritetskontrol"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -616,9 +596,7 @@ msgstr "--needed Geninstaller ikke mål som allerede er ajourførte"
 #: scripts/makepkg.sh.in:1740
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr ""
-"  --noconfirm      Spørg ikke efter bekræftelse, når der skal løses "
-"afhængigheder"
+msgstr "  --noconfirm      Spørg ikke efter bekræftelse, når der skal løses afhængigheder"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
@@ -630,11 +608,12 @@ msgstr "Hvis %s ikke er angivet, vil %s kigge efter '%s'"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman-udviklingsholdet <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nDette er fri software; se kildeteksten for kopieringsbetingelser.\\nDer er INGEN GARANTI i det omfang det er tilladt ved lov.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -668,9 +647,7 @@ msgstr "Du har ikke skriverettigheder til at gemme logfiler i %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Det er ikke tilladt at køre %s som root, da det kan forårsage permanent,"
-"\\nkatastrofisk skade i dit system."
+msgstr "Det er ikke tilladt at køre %s som root, da det kan forårsage permanent,\\nkatastrofisk skade i dit system."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -769,17 +746,17 @@ msgstr "ugyldige karakterer anvendt i navn '%s'. tilladt: [:alnum:]+_.@-\n"
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
 msgid "Couldn't detect version for template '%s'\n"
-msgstr ""
+msgstr "Kunne ikke genkende version af skabelon '%s'\n"
 
 #: scripts/makepkg-template.pl.in:125
 #, perl-format
 msgid "Failed to find template file matching '%s'\n"
-msgstr ""
+msgstr "Kunne ikke finde skabelonfil som matcher '%s'\n"
 
 #: scripts/makepkg-template.pl.in:136
 #, perl-format
 msgid "failed to open '%s': %s\n"
-msgstr ""
+msgstr "kunne ikke åbne '%s': %s\n"
 
 #: scripts/makepkg-template.pl.in:153
 #, perl-format
@@ -811,9 +788,7 @@ msgstr "  --newest, -n          opdater skabeloner til nyeste version\n"
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                        (forvalg: brug versionen angivet i "
-"skabelonmarkørene)\n"
+msgstr "                        (forvalg: brug versionen angivet i skabelonmarkørene)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
@@ -837,7 +812,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
+msgstr "Copyright (c) 2013-2016 Pacman-udviklingsholdet <pacman-dev@archlinux.org>.\nDette er fri software; se kildeteksten for kopieringsbetingelser.\nDer er INGEN GARANTI i det omfang der er tilladt ved lov.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -873,10 +848,10 @@ msgstr "  --nocolor            deaktiver farvede output-tekst"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Pacman-udviklingsholdet <pacman-dev@archlinux.org>.\\nDette er fri software; se kildeteksten for kopieringsbetingelser.\\nDer er INGEN GARANTI i det omfang der er tilladt ved lov.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -970,13 +945,11 @@ msgstr "--import Importer pubring.gpg fra mapper"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"--import-trustdb Importerer ownertrust-værdier fra trustdb.gpg i mapper"
+msgstr "--import-trustdb Importerer ownertrust-værdier fra trustdb.gpg i mapper"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                   Sikr at nøgleringen er korrekt initialiseret"
+msgstr "  --init                   Sikr at nøgleringen er korrekt initialiseret"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
@@ -988,10 +961,9 @@ msgstr "--lsign-key Underskriv lokalt de specificerede nøgle-id'er"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"--populate Genindlæs standardnøglerne fra (angivne) nøgleringene\\n i »%s«"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "--populate Genindlæs standardnøglerne fra (angivne) nøgleringene\\n i »%s«"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
@@ -1000,19 +972,15 @@ msgstr "  --refresh-keys Opdater angivne eller alle nøgler fra en nøgleserver"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <file>           Brug en alternativ konfigurationsfil (i stedet "
-"for\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <file>           Brug en alternativ konfigurationsfil (i stedet for\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <mappe>              angiv en alternativ mappe for GnuPG (i stedet"
-"\\n                            for '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <mappe>              angiv en alternativ mappe for GnuPG (i stedet\\n                            for '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
@@ -1152,8 +1120,7 @@ msgstr "Tillidsdatabase kunne ikke opdateres."
 
 #: scripts/pacman-key.sh.in:559
 msgid "Cannot find the %s binary required for all %s operations."
-msgstr ""
-"Kan ikke finde den binære fil %s, der er krævet for alle %s operationer."
+msgstr "Kan ikke finde den binære fil %s, der er krævet for alle %s operationer."
 
 #: scripts/pacman-key.sh.in:564
 msgid "%s needs to be run as root for this operation."
@@ -1187,30 +1154,21 @@ msgstr "Brug: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize er et lille hack, som skal forbedre ydelsen\\naf pacman når "
-"den læser/skriver til sin filsystembaserede database.\\n\\n"
+msgstr "pacman-optimize er et lille hack, som skal forbedre ydelsen\\naf pacman når den læser/skriver til sin filsystembaserede database.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Da pacman bruger mange små filer til at holde styr på pakker,\\ner der en "
-"tendens til at disse filer bliver fragmenteret over tid.\\nDette skript "
-"forsøger at flytte disse små filer til en\\nkontinuerlig placering på din "
-"harddisk. Resultatet er at harddisken\\n skulle kunne læse dem hurtigere, da "
-"harddiskhovedet ikke skal\\nbevæge sig så meget omkring på disken.\\n"
+msgstr "Da pacman bruger mange små filer til at holde styr på pakker,\\ner der en tendens til at disse filer bliver fragmenteret over tid.\\nDette skript forsøger at flytte disse små filer til en\\nkontinuerlig placering på din harddisk. Resultatet er at harddisken\\n skulle kunne læse dem hurtigere, da harddiskhovedet ikke skal\\nbevæge sig så meget omkring på disken.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
-msgstr ""
-"Kan ikke finde den binære fil %s, der er krævet for at verificere "
-"integriteten."
+msgstr "Kan ikke finde den binære fil %s, der er krævet for at verificere integriteten."
 
 #: scripts/pacman-optimize.sh.in:109
 msgid "You must have correct permissions to optimize the database."
@@ -1257,7 +1215,8 @@ msgid "Rotating database into place..."
 msgstr "Roterer database på plads..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr "Ny databaseerstatning mislykkedes. Kontroller stierne %s, %s og %s."
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1272,9 +1231,7 @@ msgstr "Brug: pkgdelta [tilvalg] <pakke1> <pakke2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta vil lave en delta-fil mellem to pakker.\\nDenne delta-fil kan "
-"efterfølgende tilføjes til en database ved brug af repo-add.\\n"
+msgstr "pkgdelta vil lave en delta-fil mellem to pakker.\\nDenne delta-fil kan efterfølgende tilføjes til en database ved brug af repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1295,26 +1252,20 @@ msgstr "--nocolor fjern farve fra udskrift\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size    minimum pakkestørrelse før deltaer bliver dannet\\n"
+msgstr "  --min-pkg-size    minimum pakkestørrelse før deltaer bliver dannet\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size procent af den nye pakke over hvilken deltaet vil blive "
-"kasseret\\n"
+msgstr "  --max-delta-size procent af den nye pakke over hvilken deltaet vil blive kasseret\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nDette er fri "
-"software; se kildeteksten for kopieringsbetingelser.\\nDer er INGEN GARANTI "
-"i det omfang det er tilladt ved lov.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nDette er fri software; se kildeteksten for kopieringsbetingelser.\\nDer er INGEN GARANTI i det omfang det er tilladt ved lov.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1366,11 +1317,9 @@ msgstr "Brug: repo-add [valgmuligheder] <sti-til-db> <pakke|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add opdaterer en pakkedatabase ved at læse en pakkefil. \\nFlere pakker "
-"kan tilføjes ved at angive disse på kommandolinien.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add opdaterer en pakkedatabase ved at læse en pakkefil. \\nFlere pakker kan tilføjes ved at angive disse på kommandolinien.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1378,29 +1327,26 @@ msgstr "  -d, --delta       generer og tilføj delta for pakkeopdatering\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr "-n, --new tilføj kun pakker som ikke allerede er i databasen\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "-R, --remove fjern gammel pakkefil fra disken ved opdatering af databasen\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Brug: repo-remove [valgmuligheder] <sti-til-db> <pakkenavn|delta> ...\\n"
+msgstr "Brug: repo-remove [valgmuligheder] <sti-til-db> <pakkenavn|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove opdaterer en pakkedatabase ved at fjerne pakkenavnet \\nangivet "
-"på kommandolinien fra den givne repo-database. Flere\\npakker kan fjernes "
-"ved at angive disse på kommandolinien.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove opdaterer en pakkedatabase ved at fjerne pakkenavnet \\nangivet på kommandolinien fra den givne repo-database. Flere\\npakker kan fjernes ved at angive disse på kommandolinien.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1416,8 +1362,7 @@ msgstr "  -s, --sign        signer database med GnuPG efter opdatering\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k --key <nøgle>   brug den angivne nøgle til at signere databasen\\n"
+msgstr "  -k --key <nøgle>   brug den angivne nøgle til at signere databasen\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
@@ -1426,15 +1371,12 @@ msgstr "  -v, --verify      verificer databases signatur før opdatering\\n"
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nSe %s(8) for flere detaljer og beskrivelser af de tilgængelige "
-"valgmuligheder.\\n"
+msgstr "\\nSe %s(8) for flere detaljer og beskrivelser af de tilgængelige valgmuligheder.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Eksempel: repo-add /sti/til/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Eksempel: repo-add /sti/til/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1442,10 +1384,10 @@ msgstr "Eksempel:  repo-remove /sti/til/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman-udviklingsholdet <pacman-dev@archlinux.org>\\n\\nDette er fri software; se kildeteksten for kopieringsbetingelser.\\nDer er INGEN GARANTI i det omfang der er tilladt ved lov.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1461,7 +1403,7 @@ msgstr "Fjerner eksisterende punkt '%s'..."
 
 #: scripts/repo-add.sh.in:195
 msgid "Removing empty deltas file..."
-msgstr ""
+msgstr "Fjerner tom deltas-fil ..."
 
 #: scripts/repo-add.sh.in:216
 msgid "Cannot find the gpg binary! Is GnuPG installed?"
@@ -1469,7 +1411,7 @@ msgstr "Kan ikke finde binær fil gpg! Er GnuPG installeret?"
 
 #: scripts/repo-add.sh.in:261
 msgid "Signing database '%s'..."
-msgstr ""
+msgstr "Signerer database '%s' ..."
 
 #: scripts/repo-add.sh.in:270
 msgid "Created signature file '%s'"
@@ -1477,7 +1419,7 @@ msgstr "Oprettede signaturfil '%s'"
 
 #: scripts/repo-add.sh.in:272
 msgid "Failed to sign package database file '%s'"
-msgstr ""
+msgstr "Kunne ikke signere pakke-databasefilen '%s'"
 
 #: scripts/repo-add.sh.in:281
 msgid "Verifying database signature..."
@@ -1497,7 +1439,7 @@ msgstr "Databasesignatur var IKKE gyldig!"
 
 #: scripts/repo-add.sh.in:305
 msgid "'%s' does not have a valid database archive extension."
-msgstr ""
+msgstr "'%s' har ikke en gyldig database-arkivfilendelse."
 
 #: scripts/repo-add.sh.in:351
 msgid "An entry for '%s' already existed"
@@ -1505,7 +1447,7 @@ msgstr "Et punkt for '%s' findes allerede"
 
 #: scripts/repo-add.sh.in:368
 msgid "Cannot use armored signatures for packages: %s"
-msgstr ""
+msgstr "Kan ikke bruge armerede signaturer til pakker: %s"
 
 #: scripts/repo-add.sh.in:373
 msgid "Invalid package signature file '%s'."
@@ -1529,7 +1471,7 @@ msgstr "Gammel pakkefil ikke fundet: %s"
 
 #: scripts/repo-add.sh.in:461
 msgid "Removing old package file '%s'"
-msgstr ""
+msgstr "Fjerner gammel pakkefil: '%s'"
 
 #: scripts/repo-add.sh.in:522
 msgid "Failed to acquire lockfile: %s."
@@ -1609,7 +1551,7 @@ msgstr "Ingen pakker ændret, intet at udføre."
 
 #: scripts/libmakepkg/lint_package.sh.in:41
 msgid "Checking for packaging issue..."
-msgstr ""
+msgstr "Undersøger for pakkeproblemer ..."
 
 #: scripts/libmakepkg/lint_package/build_references.sh.in:33
 #: scripts/libmakepkg/lint_package/build_references.sh.in:36
@@ -1698,17 +1640,17 @@ msgstr "%s-fil (%s) findes ikke eller er ikke en regulær fil."
 #: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:47
 #: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:82
 msgid "%s should be an array"
-msgstr ""
+msgstr "%s burde være et matrix"
 
 #: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:61
 #: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:92
 msgid "%s_%s should be an array"
-msgstr ""
+msgstr "$s_%s burde være et matrix"
 
 #: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:72
 #: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:100
 msgid "%s should not be an array"
-msgstr ""
+msgstr "%s burde ikke være et matrix"
 
 #: scripts/libmakepkg/source.sh.in:40
 msgid "Retrieving sources..."
@@ -1720,7 +1662,7 @@ msgstr "Udpakker kilder..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:47
 msgid "Branching %s..."
-msgstr ""
+msgstr "Forgrener %s ..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:49
 msgid "Failure while branching %s"
@@ -1728,7 +1670,7 @@ msgstr "Fejl under forgrening %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:54
 msgid "Pulling %s..."
-msgstr ""
+msgstr "Henter %s ..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:58
 msgid "Failure while pulling %s"
@@ -1736,18 +1678,21 @@ msgstr "Fejl under hentning %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Referencen blev ikke genkendt: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Opretter arbejdskopi af %s %s arkiv ..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Fejl under opdatering af arbejdskopi for %s %s repo"
 
@@ -1779,12 +1724,14 @@ msgstr "Udpakker %s med %s"
 msgid "Failed to extract %s"
 msgstr "Kunne ikke udpakke %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Kloner %s %s arkiv ..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Fejl under hentning af %s %s arkiv"
@@ -1793,12 +1740,14 @@ msgstr "Fejl under hentning af %s %s arkiv"
 msgid "%s is not a clone of %s"
 msgstr "%s er ikke en klon af %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Opdaterer %s %s arkiv ..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Fejl under opdatering %s %s arkiv"
@@ -1825,11 +1774,11 @@ msgstr "Fjerner %s filer..."
 
 #: scripts/libmakepkg/tidy/optipng.sh.in:35
 msgid "Optimizing PNG images..."
-msgstr ""
+msgstr "Optimerer PNG-billeder ..."
 
 #: scripts/libmakepkg/tidy/optipng.sh.in:40
 msgid "Could not optimize PNG image : %s"
-msgstr ""
+msgstr "Kunne ikke optimere PNG-billede: %s"
 
 #: scripts/libmakepkg/tidy/purge.sh.in:35
 msgid "Purging unwanted files..."
diff --git a/scripts/po/de.po b/scripts/po/de.po
index d67f4c55..6015c559 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Alexander Griesbaum <agrsbm@gmail.com>, 2014
 # Frank Theile, 2014,2016
@@ -34,12 +34,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 20:04+0000\n"
 "Last-Translator: Matthias Gorissen <matthias@archlinux.de>\n"
-"Language-Team: German (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/de/)\n"
-"Language: de\n"
+"Language-Team: German (http://www.transifex.com/toofishes/archlinux-pacman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -121,10 +120,9 @@ msgid "Generating checksums for source files..."
 msgstr "Erstelle Prüfsummen für Quell-Dateien..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Kann %s Binärdatei nicht finden, die zur Erstellung der Prüfsummen der Quell-"
-"Dateien benötigt wird."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Kann %s Binärdatei nicht finden, die zur Erstellung der Prüfsummen der Quell-Dateien benötigt wird."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -157,9 +155,7 @@ msgstr "Eine oder mehrere Dateien überstanden nicht die Gültigkeits-Prüfung!"
 
 #: scripts/makepkg.sh.in:489
 msgid "Integrity checks (%s) differ in size from the source array."
-msgstr ""
-"Integritäts-Prüfungen (%s) unterscheiden sich in der Größe vom Array der "
-"Quelle."
+msgstr "Integritäts-Prüfungen (%s) unterscheiden sich in der Größe vom Array der Quelle."
 
 #: scripts/makepkg.sh.in:531
 msgid "Integrity checks are missing for: %s"
@@ -361,8 +357,7 @@ msgstr "Unbekanntes Download-Protokoll: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"%s Proramm nicht gefunden, um die Anforderungen der VCS Quelle zu überprüfen"
+msgstr "%s Proramm nicht gefunden, um die Anforderungen der VCS Quelle zu überprüfen"
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
@@ -370,15 +365,11 @@ msgstr "Kann Paket %s nicht finden um die %s Quellen zu bearbeiten."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
-msgstr ""
-"Kann die %s Binär-Datei nicht finden, die für Abhängigkeits-Operationen "
-"benötigt wird."
+msgstr "Kann die %s Binär-Datei nicht finden, die für Abhängigkeits-Operationen benötigt wird."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Kann die %s Binär-Datei nicht finden. Werde %s verwenden, um Root-Rechte zu "
-"erlangen."
+msgstr "Kann die %s Binär-Datei nicht finden. Werde %s verwenden, um Root-Rechte zu erlangen."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -386,54 +377,40 @@ msgstr "Kann das Programm %s nicht finden."
 
 #: scripts/makepkg.sh.in:1531
 msgid "Cannot find the %s binary required for signing packages."
-msgstr ""
-"Kann Programm %s nicht finden, das zum Signieren von Paketen benötigt wird."
+msgstr "Kann Programm %s nicht finden, das zum Signieren von Paketen benötigt wird."
 
 #: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
-"Kann Programm %s nicht finden, das zum Überprüfen von Quelldateien benötigt "
-"wird."
+msgstr "Kann Programm %s nicht finden, das zum Überprüfen von Quelldateien benötigt wird."
 
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"Konnte das zum Überprüfen der Quell-Datei-Prüfsummen nötige Programm %s "
-"nicht finden."
+msgstr "Konnte das zum Überprüfen der Quell-Datei-Prüfsummen nötige Programm %s nicht finden."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"Kann Programm %s nicht finden, das zum Komprimieren der Binärdateien "
-"benötigt wird."
+msgstr "Kann Programm %s nicht finden, das zum Komprimieren der Binärdateien benötigt wird."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
-msgstr ""
-"Konnte das zum Optimieren von PNG-Bilder nötige Programm %s nicht finden."
+msgstr "Konnte das zum Optimieren von PNG-Bilder nötige Programm %s nicht finden."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"Kann Programm %s nicht finden, das zur verteilten Kompilierung benötigt wird."
+msgstr "Kann Programm %s nicht finden, das zur verteilten Kompilierung benötigt wird."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Kann Programm %s nicht finden, das für den Kompilationscache benötigt wird."
+msgstr "Kann Programm %s nicht finden, das für den Kompilationscache benötigt wird."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"Kann Programm %s nicht finden, das zum Bereinigen der Objektdateien benötigt "
-"wird."
+msgstr "Kann Programm %s nicht finden, das zum Bereinigen der Objektdateien benötigt wird."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Kann Programm %s nicht finden, das zur Komprimierung der Manpages und der "
-"Info-Seiten benötigt wird."
+msgstr "Kann Programm %s nicht finden, das zur Komprimierung der Manpages und der Info-Seiten benötigt wird."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -446,19 +423,16 @@ msgstr "Es wurde bereits ein Paket gebaut. (benutze %s zum Überschreiben)"
 #: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr ""
-"Die Paket-Gruppe wurde bereits gebaut, installiere existierende Pakete..."
+msgstr "Die Paket-Gruppe wurde bereits gebaut, installiere existierende Pakete..."
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Die Paketgruppe wurde bereits gebaut. (Benutzen Sie %s zum Überschreiben)"
+msgstr "Die Paketgruppe wurde bereits gebaut. (Benutzen Sie %s zum Überschreiben)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Ein Teil der Paketgruppe wurde bereits gebaut. (Benutzen Sie %s zum "
-"Überschreiben)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "Ein Teil der Paketgruppe wurde bereits gebaut. (Benutzen Sie %s zum Überschreiben)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -490,9 +464,7 @@ msgstr "  -d, --nodeps     Überspringe alle Abhängigkeitsprüfungen"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  Entpacke keine Quelldateien (benutze bestehendes %s "
-"Verzeichnis)"
+msgstr "  -e, --noextract  Entpacke keine Quelldateien (benutze bestehendes %s Verzeichnis)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -524,20 +496,17 @@ msgstr "  -o, --nobuild    Dateien nur herunterladen und auspacken"
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <Datei>       Ein alternatives Build-Skript (statt '%s') verwenden"
+msgstr "  -p <Datei>       Ein alternatives Build-Skript (statt '%s') verwenden"
 
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Entferne installierte Abhängigkeiten nach erfolgreichem "
-"Build"
+msgstr "  -r, --rmdeps     Entferne installierte Abhängigkeiten nach erfolgreichem Build"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr ""
-"  -R, --repackage  Packe den Inhalt des Paketes neu, ohne etwas zu bauen"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
+msgstr "  -R, --repackage  Packe den Inhalt des Paketes neu, ohne etwas zu bauen"
 
 #: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
@@ -546,9 +515,7 @@ msgstr "  -s, --syncdeps   Installiere fehlende Abhängigkeiten mit %s"
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source     Erstelle einen Quell-Tarball ohne die heruntergeladenen "
-"Quellen"
+msgstr "  -S, --source     Erstelle einen Quell-Tarball ohne die heruntergeladenen Quellen"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -558,9 +525,7 @@ msgstr "  -V, --version    Zeige die Versions-Informationen an und beende"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      Erstelle einen Tarball nur mit den Quellen einschließlich "
-"der heruntergeladenen Quellen"
+msgstr "  --allsource      Erstelle einen Tarball nur mit den Quellen einschließlich der heruntergeladenen Quellen"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -568,9 +533,7 @@ msgstr "  --check          Führe die Funktion %s in %s aus"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <Datei> Eine alternative Konfigurations-Datei (statt '%s') "
-"verwenden"
+msgstr "  --config <Datei> Eine alternative Konfigurations-Datei (statt '%s') verwenden"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -578,10 +541,9 @@ msgstr "  --holdver        Aktualisiere keine VCS-Quellen"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <key>      Lege einen Schlüssel für das Signieren von %s fest, "
-"anstatt den Standardschlüssel zu verwenden"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <key>      Lege einen Schlüssel für das Signieren von %s fest, anstatt den Standardschlüssel zu verwenden"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -602,9 +564,7 @@ msgstr "  --nosign         Erzeuge keine Signatur für das Paket"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"--packagelist Zeigt nur die Pakete an, die erstellt werden würden, ohne "
-"PKGEXT"
+msgstr "--packagelist Zeigt nur die Pakete an, die erstellt werden würden, ohne PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -625,17 +585,13 @@ msgstr "  --skipinteg      Führe keinerlei Überprüfungen der Quell-Dateien au
 
 #: scripts/makepkg.sh.in:1733
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
-msgstr ""
-"  --skippgpcheck   Überprüfe nicht die Quell-Dateien an Hand der PGP-"
-"Signaturen"
+msgstr "  --skippgpcheck   Überprüfe nicht die Quell-Dateien an Hand der PGP-Signaturen"
 
 #: scripts/makepkg.sh.in:1734
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource   Lade die Quell-Dateien herunter (falls diese benötigt "
-"werden) und führe Integritäts-Prüfungen durch"
+msgstr "  --verifysource   Lade die Quell-Dateien herunter (falls diese benötigt werden) und führe Integritäts-Prüfungen durch"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -643,28 +599,21 @@ msgstr "Diese Optionen können an %s übergeben werden:"
 
 #: scripts/makepkg.sh.in:1738
 msgid "  --asdeps         Install packages as non-explicitly installed"
-msgstr ""
-"  --asdeps         Installiere Pakete als nicht-ausdrücklich installiert"
+msgstr "  --asdeps         Installiere Pakete als nicht-ausdrücklich installiert"
 
 #: scripts/makepkg.sh.in:1739
 msgid ""
 "  --needed         Do not reinstall the targets that are already up to date"
-msgstr ""
-"  --needed         Wird jene Ziele nicht neu installieren, die bereits "
-"aktuell sind"
+msgstr "  --needed         Wird jene Ziele nicht neu installieren, die bereits aktuell sind"
 
 #: scripts/makepkg.sh.in:1740
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr ""
-"  --noconfirm      Niemals nach einer Bestätigung fragen, wenn "
-"Abhängigkeiten aufgelöst werden"
+msgstr "  --noconfirm      Niemals nach einer Bestätigung fragen, wenn Abhängigkeiten aufgelöst werden"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"  --noprogressbar  Keine Fortschrittsanzeige anzeigen, wenn Dateien "
-"heruntergeladen werden"
+msgstr "  --noprogressbar  Keine Fortschrittsanzeige anzeigen, wenn Dateien heruntergeladen werden"
 
 #: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
@@ -672,15 +621,12 @@ msgstr "Falls %s nicht angegeben, wird %s nach '%s' suchen"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Entwicklergruppe <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nDies ist "
-"freie Software; siehe den Quellcode für Urheberrechtsbestimmungen.\\nEs "
-"besteht KEINE GARANTIE, soweit es die gültige Rechtsgebung zulässt.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Entwicklergruppe <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nDies ist freie Software; siehe den Quellcode für Urheberrechtsbestimmungen.\\nEs besteht KEINE GARANTIE, soweit es die gültige Rechtsgebung zulässt.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -704,8 +650,7 @@ msgstr "Sie haben keine Schreib-Berechtigung, um Downloads in %s zu speichern."
 
 #: scripts/makepkg.sh.in:1946
 msgid "You do not have write permission to store source tarballs in %s."
-msgstr ""
-"Sie haben keine Schreibrechte, um den Quell-Tarball in %s zu speichern."
+msgstr "Sie haben keine Schreibrechte, um den Quell-Tarball in %s zu speichern."
 
 #: scripts/makepkg.sh.in:1959
 msgid "You do not have write permission to store logs in %s."
@@ -715,15 +660,11 @@ msgstr "Sie haben keine Schreib-Berechtigung, Log-Dateien in %s zu speichern."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"%s als root auszuführen ist nicht erlaubt, da es Ihrem System bleibenden, "
-"katastrophalen Schaden zufügen kann."
+msgstr "%s als root auszuführen ist nicht erlaubt, da es Ihrem System bleibenden, katastrophalen Schaden zufügen kann."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
-msgstr ""
-"Verwenden Sie nicht die Option %s. Diese Option ist nur für die Verwendung "
-"durch %s."
+msgstr "Verwenden Sie nicht die Option %s. Diese Option ist nur für die Verwendung durch %s."
 
 #: scripts/makepkg.sh.in:1989
 msgid "%s does not exist."
@@ -755,8 +696,7 @@ msgstr "Erstelle Paket: %s"
 
 #: scripts/makepkg.sh.in:2133
 msgid "A source package has already been built. (use %s to overwrite)"
-msgstr ""
-"Es wurde bereits ein Quell-Paket gebaut. (Benutzen Sie -f zum Überschreiben)"
+msgstr "Es wurde bereits ein Quell-Paket gebaut. (Benutzen Sie -f zum Überschreiben)"
 
 #: scripts/makepkg.sh.in:2152
 msgid "Source package created: %s"
@@ -861,14 +801,11 @@ msgstr "  --newest, -n          Vorlagen auf neueste Version aktualisieren\n"
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                        (Standard: verwende die in der Vorlagenmarkierung "
-"spezifizierte Version)\n"
+msgstr "                        (Standard: verwende die in der Vorlagenmarkierung spezifizierte Version)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
-msgstr ""
-"  --template-dir <Verz>  Verzeichnis, das nach Vorlagen durchsucht wird\n"
+msgstr "  --template-dir <Verz>  Verzeichnis, das nach Vorlagen durchsucht wird\n"
 
 #: scripts/makepkg-template.pl.in:183
 #, perl-format
@@ -888,10 +825,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
-"Dies ist freie Software; siehe den Quellcode für Urheberrechtsbestimmungen.\n"
-"Es besteht KEINE GARANTIE, soweit es die gültige Rechtsgebung zulässt.\n"
+msgstr "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\nDies ist freie Software; siehe den Quellcode für Urheberrechtsbestimmungen.\nEs besteht KEINE GARANTIE, soweit es die gültige Rechtsgebung zulässt.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -911,9 +845,7 @@ msgstr "  -h, --help           Zeige diese Hilfe und beende"
 
 #: scripts/pacman-db-upgrade.sh.in:45
 msgid "  -r, --root <path>    set an alternate installation root"
-msgstr ""
-"  -r, --root <Pfad>    Alternatives Wurzelverzeichnis zur Installation "
-"definieren"
+msgstr "  -r, --root <Pfad>    Alternatives Wurzelverzeichnis zur Installation definieren"
 
 #: scripts/pacman-db-upgrade.sh.in:46
 msgid "  -V, --version        show version information and exit"
@@ -929,14 +861,10 @@ msgstr "  --nocolor            Deaktiviere farbige Ausgabe aller Mitteilungen"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nDies ist freie Software; siehe den Quellcode für "
-"Urheberrechtsbestimmungen.\\nEs besteht KEINE GARANTIE, soweit es die "
-"gültige Rechtsgebung zulässt.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nDies ist freie Software; siehe den Quellcode für Urheberrechtsbestimmungen.\\nEs besteht KEINE GARANTIE, soweit es die gültige Rechtsgebung zulässt.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -949,9 +877,7 @@ msgstr "%s ist kein Pacman-Datenbank Verzeichnis."
 
 #: scripts/pacman-db-upgrade.sh.in:140
 msgid "You must have correct permissions to upgrade the database."
-msgstr ""
-"Sie müssen über die korrekten Berechtigungen verfügen, um die Datenbank zu "
-"aktualisieren."
+msgstr "Sie müssen über die korrekten Berechtigungen verfügen, um die Datenbank zu aktualisieren."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
@@ -971,9 +897,7 @@ msgstr "Pre-4.2-Datenbankformat erkannt - aktualisiere..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"Symbolischer Link '%s' außerhalb des pacman Wurzelverzeichnis. Manuelles "
-"Reparieren erforderlich"
+msgstr "Symbolischer Link '%s' außerhalb des pacman Wurzelverzeichnis. Manuelles Reparieren erforderlich"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -989,9 +913,7 @@ msgstr "Operationen:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add                 Fügt die angegebenen Schlüssel hinzu (leer für "
-"stdin)"
+msgstr "  -a, --add                 Fügt die angegebenen Schlüssel hinzu (leer für stdin)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
@@ -999,21 +921,16 @@ msgstr "  -d, --delete              Entfernt die angegebenen Schlüssel-Ids"
 
 #: scripts/pacman-key.sh.in:65
 msgid "  -e, --export              Export the specified or all keyids"
-msgstr ""
-"  -e, --export              Exportiert die angegebenen oder alle Schlüssel-"
-"Ids"
+msgstr "  -e, --export              Exportiert die angegebenen oder alle Schlüssel-Ids"
 
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              Zeigt die Fingerabdrücke aller oder aller "
-"angegebenen Schlüssel-Ids"
+msgstr "  -f, --finger              Zeigt die Fingerabdrücke aller oder aller angegebenen Schlüssel-Ids"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
-msgstr ""
-"  -l, --list-keys           Zeigt die angegebenen oder alle Schlüssel an"
+msgstr "  -l, --list-keys           Zeigt die angegebenen oder alle Schlüssel an"
 
 #: scripts/pacman-key.sh.in:68
 msgid "  -r, --recv-keys           Fetch the specified keyids"
@@ -1021,48 +938,35 @@ msgstr "  -r, --recv-keys           Ermittelt die angegebenen Schlüssel-Ids"
 
 #: scripts/pacman-key.sh.in:69
 msgid "  -u, --updatedb            Update the trustdb of pacman"
-msgstr ""
-"  -u, --updatedb            Aktualisiert die Trust-Datenbank von Pacman"
+msgstr "  -u, --updatedb            Aktualisiert die Trust-Datenbank von Pacman"
 
 #: scripts/pacman-key.sh.in:70
 msgid ""
 "  -v, --verify              Verify the file(s) specified by the signature(s)"
-msgstr ""
-"  -v, --verify              Verifiziert die Datei(en), die von der/den "
-"Signatur(en) spezifiziert wurden"
+msgstr "  -v, --verify              Verifiziert die Datei(en), die von der/den Signatur(en) spezifiziert wurden"
 
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key                Präsentiert ein Menü für Schlüsselverwaltungs-"
-"Aufgaben an den Schlüssel-Ids"
+msgstr "  --edit-key                Präsentiert ein Menü für Schlüsselverwaltungs-Aufgaben an den Schlüssel-Ids"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
-msgstr ""
-"  --import                  Importiert pubring.gpg aus dem/den "
-"Verzeichnis(sen)"
+msgstr "  --import                  Importiert pubring.gpg aus dem/den Verzeichnis(sen)"
 
 #: scripts/pacman-key.sh.in:73
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          Importiert die Vertrauenswerte aus trustdb.gpg "
-"in das/die Verzeichnis(se)"
+msgstr "  --import-trustdb          Importiert die Vertrauenswerte aus trustdb.gpg in das/die Verzeichnis(se)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                    Stellt sicher, dass der Schlüsselbund richtig "
-"initialisiert ist"
+msgstr "  --init                    Stellt sicher, dass der Schlüsselbund richtig initialisiert ist"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
-msgstr ""
-"  --list-sigs               Erstellt eine Liste der Schlüssel und ihrer "
-"Signaturen"
+msgstr "  --list-sigs               Erstellt eine Liste der Schlüssel und ihrer Signaturen"
 
 #: scripts/pacman-key.sh.in:76
 msgid "  --lsign-key               Locally sign the specified keyid"
@@ -1070,40 +974,30 @@ msgstr "  --lsign-key               Signiert die angegebene Schlüssel-Id lokal"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                Lädt die Standard-Schlüssel erneut aus den "
-"(vorher bestimmten) Schlüsselbunden\\n                            in '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                Lädt die Standard-Schlüssel erneut aus den (vorher bestimmten) Schlüsselbunden\\n                            in '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            Aktualisiert die angegebenen oder alle Schlüssel "
-"von einem Schlüssel-Server"
+msgstr "  --refresh-keys            Aktualisiert die angegebenen oder alle Schlüssel von einem Schlüssel-Server"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <file>           Benutze eine alternative Konfigurationsdatei (an "
-"Stelle von\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <file>           Benutze eine alternative Konfigurationsdatei (an Stelle von\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            Setze ein alternatives Verzeichnis für GnuPG (an "
-"Stelle\\n                            von '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            Setze ein alternatives Verzeichnis für GnuPG (an Stelle\\n                            von '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <server-url>  Spezifiziere den zu nutzenden Schlüssel-Server, "
-"falls dies nötig ist"
+msgstr "  --keyserver <server-url>  Spezifiziere den zu nutzenden Schlüssel-Server, falls dies nötig ist"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1123,18 +1017,15 @@ msgstr "Schlüsselname ist zweideutig:"
 
 #: scripts/pacman-key.sh.in:181
 msgid "The key identified by %s could not be found locally."
-msgstr ""
-"Der von %s identifizierte Schlüssel konnte lokal nicht gefunden werden."
+msgstr "Der von %s identifizierte Schlüssel konnte lokal nicht gefunden werden."
 
 #: scripts/pacman-key.sh.in:224
 msgid "You do not have sufficient permissions to read the %s keyring."
-msgstr ""
-"Sie haben nicht genügend Berechtigungen, um den Schlüsselbund %s zu lesen."
+msgstr "Sie haben nicht genügend Berechtigungen, um den Schlüsselbund %s zu lesen."
 
 #: scripts/pacman-key.sh.in:225 scripts/pacman-key.sh.in:232
 msgid "Use '%s' to correct the keyring permissions."
-msgstr ""
-"Benutzen Sie '%s', um die Berechtigungen des Schlüsselbundes zu korrigieren."
+msgstr "Benutzen Sie '%s', um die Berechtigungen des Schlüsselbundes zu korrigieren."
 
 #: scripts/pacman-key.sh.in:231
 msgid "You do not have sufficient permissions to run this command."
@@ -1142,8 +1033,7 @@ msgstr "Sie haben nicht genügend Berechtigungen, um diesen Befehl auszuführen.
 
 #: scripts/pacman-key.sh.in:239
 msgid "There is no secret key available to sign with."
-msgstr ""
-"Es ist kein geheimer Schlüssel vorhanden, mit dem signiert werden kann."
+msgstr "Es ist kein geheimer Schlüssel vorhanden, mit dem signiert werden kann."
 
 #: scripts/pacman-key.sh.in:240
 msgid "Use '%s' to generate a default secret key."
@@ -1179,15 +1069,11 @@ msgstr "Mache Schlüssel %s unbrauchbar..."
 
 #: scripts/pacman-key.sh.in:334
 msgid "A specified keyfile could not be added to the keyring."
-msgstr ""
-"Eine angegebene Schlüsseldatei konnte nicht zum Schlüsselbund hinzugefügt "
-"werden."
+msgstr "Eine angegebene Schlüsseldatei konnte nicht zum Schlüsselbund hinzugefügt werden."
 
 #: scripts/pacman-key.sh.in:342
 msgid "A specified key could not be removed from the keyring."
-msgstr ""
-"Eine angegebene Schlüsseldatei konnte nicht vom Schlüsselbund entfernt "
-"werden."
+msgstr "Eine angegebene Schlüsseldatei konnte nicht vom Schlüsselbund entfernt werden."
 
 #: scripts/pacman-key.sh.in:352
 msgid "The key identified by %s could not be edited."
@@ -1195,14 +1081,11 @@ msgstr "Der von %s identifizierte Schlüssel konnte nicht bearbeitet werden."
 
 #: scripts/pacman-key.sh.in:364
 msgid "A specified key could not be exported from the keyring."
-msgstr ""
-"Eine angegebene Schlüsseldatei konnte nicht vom Schlüsselbund exportiert "
-"werden."
+msgstr "Eine angegebene Schlüsseldatei konnte nicht vom Schlüsselbund exportiert werden."
 
 #: scripts/pacman-key.sh.in:372
 msgid "The fingerprint of a specified key could not be determined."
-msgstr ""
-"Der Fingerabdruck eines bestimmten Schlüssels konnte nicht ermittelt werden."
+msgstr "Der Fingerabdruck eines bestimmten Schlüssels konnte nicht ermittelt werden."
 
 #: scripts/pacman-key.sh.in:385 scripts/pacman-key.sh.in:404
 msgid "%s could not be imported."
@@ -1230,15 +1113,11 @@ msgstr "%s konnte nicht lokal signiert werden."
 
 #: scripts/pacman-key.sh.in:469
 msgid "Remote key not fetched correctly from keyserver."
-msgstr ""
-"Entfernter Schlüssel konnte nicht korrekt vom Schlüssel-Server abgerufen "
-"werden."
+msgstr "Entfernter Schlüssel konnte nicht korrekt vom Schlüssel-Server abgerufen werden."
 
 #: scripts/pacman-key.sh.in:477
 msgid "A specified local key could not be updated from a keyserver."
-msgstr ""
-"Ein spezifizierter lokaler Schlüssel konnte nicht vom Schlüssel-Server "
-"aktualisiert werden."
+msgstr "Ein spezifizierter lokaler Schlüssel konnte nicht vom Schlüssel-Server aktualisiert werden."
 
 #: scripts/pacman-key.sh.in:487
 msgid "The signature identified by %s could not be verified."
@@ -1254,8 +1133,7 @@ msgstr "Vertrauensdatenbank konnte nicht aktualisiert werden."
 
 #: scripts/pacman-key.sh.in:559
 msgid "Cannot find the %s binary required for all %s operations."
-msgstr ""
-"Kann das Programm %s nicht finden, das für alle %s Operationen benötigt wird."
+msgstr "Kann das Programm %s nicht finden, das für alle %s Operationen benötigt wird."
 
 #: scripts/pacman-key.sh.in:564
 msgid "%s needs to be run as root for this operation."
@@ -1289,37 +1167,25 @@ msgstr "Verwendung: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize ist ein kleines Skript, das die Performanz von Pacman"
-"\\nverbessert, wenn die Dateisystem-basierte Datenbank gelesen/beschrieben "
-"wird.\\n\\n"
+msgstr "pacman-optimize ist ein kleines Skript, das die Performanz von Pacman\\nverbessert, wenn die Dateisystem-basierte Datenbank gelesen/beschrieben wird.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Da Pacman viele kleine Dateien verwendet, um Pakete zu verfolgen,"
-"\\ntendieren diese Dateien im Laufe der Zeit dazu, zu fragmentieren."
-"\\nDieses Skript versucht, diese kleinen Dateien an einem Ort auf Ihrer"
-"\\nFestplatte zu versammeln. Als Ergebnis kann die Festplatte sie"
-"\\nschneller auslesen, da der Kopf der Festplatte nicht so viel umher-"
-"\\nwandern muss.\\n"
+msgstr "Da Pacman viele kleine Dateien verwendet, um Pakete zu verfolgen,\\ntendieren diese Dateien im Laufe der Zeit dazu, zu fragmentieren.\\nDieses Skript versucht, diese kleinen Dateien an einem Ort auf Ihrer\\nFestplatte zu versammeln. Als Ergebnis kann die Festplatte sie\\nschneller auslesen, da der Kopf der Festplatte nicht so viel umher-\\nwandern muss.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
-msgstr ""
-"Kann die %s Binär-Datei nicht finden, die für die Integritäts-Überprüfung "
-"benötigt wird."
+msgstr "Kann die %s Binär-Datei nicht finden, die für die Integritäts-Überprüfung benötigt wird."
 
 #: scripts/pacman-optimize.sh.in:109
 msgid "You must have correct permissions to optimize the database."
-msgstr ""
-"Sie müssen über die nötigen Rechte verfügen, um die Datenbank zu optimieren."
+msgstr "Sie müssen über die nötigen Rechte verfügen, um die Datenbank zu optimieren."
 
 #: scripts/pacman-optimize.sh.in:125
 msgid "Cannot create temporary directory for database building."
@@ -1362,10 +1228,9 @@ msgid "Rotating database into place..."
 msgstr "Verschiebe neue Datenbank an ihren Ort..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"Ersetzung durch neue Datenbank schlug fehl. Überprüfen Sie %s, %s und %s-"
-"Verzeichnisse."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "Ersetzung durch neue Datenbank schlug fehl. Überprüfen Sie %s, %s und %s-Verzeichnisse."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1379,10 +1244,7 @@ msgstr "Benutzung: pkgdelta [optionen] <Packet1> <Packet2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta wird aus dem Vergleich zweier Pakete eine Datei mit deren Differenz "
-"erstellen.\\nDiese Differenz kann dann mittels repo-add zur Datenbank "
-"hinzugefügt werden.\\n"
+msgstr "pkgdelta wird aus dem Vergleich zweier Pakete eine Datei mit deren Differenz erstellen.\\nDiese Differenz kann dann mittels repo-add zur Datenbank hinzugefügt werden.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1403,27 +1265,20 @@ msgstr "  --nocolor         Deaktiviere die farbige Ausgabe\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size    Minimale Paketgröße, bevor Delta-Dateien erstellt werden"
-"\\n"
+msgstr "  --min-pkg-size    Minimale Paketgröße, bevor Delta-Dateien erstellt werden\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  Prozentsatz des neuen Paketes, oberhalb dessen das Delta "
-"verworfen wird\\n"
+msgstr "  --max-delta-size  Prozentsatz des neuen Paketes, oberhalb dessen das Delta verworfen wird\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nDies ist Freie "
-"Software, vgl. den Quellcode zu den Kopierbestimmungen.\\nEs gibt KEINE "
-"GARANTIE, soweit das Gesetz dies erlaubt.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nDies ist Freie Software, vgl. den Quellcode zu den Kopierbestimmungen.\\nEs gibt KEINE GARANTIE, soweit das Gesetz dies erlaubt.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1471,53 +1326,40 @@ msgstr "Kann die xdelta3-Binär-Datei nicht finden! Ist xdelta3 installiert?"
 
 #: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr ""
-"Verwendung: repo-add [Optionen] <Pfad-zur-Datenbank> <Paket|Delta> ...\\n"
+msgstr "Verwendung: repo-add [Optionen] <Pfad-zur-Datenbank> <Paket|Delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add wird eine Paket-Datenbank aktualiesieren, indem es eine Paket-Datei "
-"ausliest.\\nWenn mehrere Pakete hinzugefügt werden sollen, kann dies auf der "
-"Kommando-Zeile spezifiziert werden.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add wird eine Paket-Datenbank aktualiesieren, indem es eine Paket-Datei ausliest.\\nWenn mehrere Pakete hinzugefügt werden sollen, kann dies auf der Kommando-Zeile spezifiziert werden.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta       Erzeuge und füge Delta-Datei für Paket-Update hinzu\\n"
+msgstr "  -d, --delta       Erzeuge und füge Delta-Datei für Paket-Update hinzu\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"  -n, --new         Füge nur Pakete hinzu, die nicht bereits in der "
-"Datenbank enthalten sind\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "  -n, --new         Füge nur Pakete hinzu, die nicht bereits in der Datenbank enthalten sind\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"-R, --remove Entferne alte Paketdatei nach dem Aktualisieren der Datenbank "
-"von der Festplatte\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "-R, --remove Entferne alte Paketdatei nach dem Aktualisieren der Datenbank von der Festplatte\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Verwendung: repo-remove [Options] <Pfad-zur-db> <Paketname|delta> ...\\n"
+msgstr "Verwendung: repo-remove [Options] <Pfad-zur-db> <Paketname|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove wird eine Paket-Daten aktualisieren, indem der auf der Kommando-"
-"Zeile\\nspezifierte Paketname von der Datenbank des angegebenen Repos "
-"entfernt wird.\\nMehrere zu entfernende Pakete können auf der Kommandozeile "
-"angegeben werden.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove wird eine Paket-Daten aktualisieren, indem der auf der Kommando-Zeile\\nspezifierte Paketname von der Datenbank des angegebenen Repos entfernt wird.\\nMehrere zu entfernende Pakete können auf der Kommandozeile angegeben werden.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1533,27 +1375,21 @@ msgstr "  -s, --sign        Signiere Datenbank mit GnuPG nach dem Update\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <key>   Benutze den angegebenen Schlüssel zum Signieren der "
-"Datenbank\\n"
+msgstr "  -k, --key <key>   Benutze den angegebenen Schlüssel zum Signieren der Datenbank\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
-"  -v, --verify      Überprüfe die Signatur der Datenbank vor dem Update\\n"
+msgstr "  -v, --verify      Überprüfe die Signatur der Datenbank vor dem Update\\n"
 
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nSiehe %s(8) für mehr Details und Beschreibungen der verfügbaren Optionen."
-"\\n"
+msgstr "\\nSiehe %s(8) für mehr Details und Beschreibungen der verfügbaren Optionen.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Beispiel:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Beispiel:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1561,14 +1397,10 @@ msgstr "Beispiel: repo-remove /Pfad/zum/Repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nDies ist freie Software; siehe den Quellcode für "
-"Urheberrechtsbestimmungen.\\nEs besteht KEINE GARANTIE, soweit es die "
-"gültige Rechtsgebung zulässt.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n\\nDies ist freie Software; siehe den Quellcode für Urheberrechtsbestimmungen.\\nEs besteht KEINE GARANTIE, soweit es die gültige Rechtsgebung zulässt.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1859,18 +1691,21 @@ msgstr "Konnte %s nicht herunterladen"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Unerkannte Referenz: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Erstelle Arbeitskopie des %s %s Repos..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Fehler beim Aktualisieren der Kopie des %s %s Repositoriums"
 
@@ -1902,12 +1737,14 @@ msgstr "Entpacke %s mit %s"
 msgid "Failed to extract %s"
 msgstr "Konnte %s nicht entpacken"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Klone das %s %s Repo..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Fehler beim Download des %s %s Repos"
@@ -1916,12 +1753,14 @@ msgstr "Fehler beim Download des %s %s Repos"
 msgid "%s is not a clone of %s"
 msgstr "%s ist kein Klon von %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Aktualisiere das %s %s Repo..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Fehler während der Aktualisierung des %s %s Repos"
diff --git a/scripts/po/el.po b/scripts/po/el.po
index 251fd462..849b5d69 100644
--- a/scripts/po/el.po
+++ b/scripts/po/el.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Achilleas Pipinellis, 2013
 # Achilleas Pipinellis, 2013
@@ -17,14 +17,13 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
-"PO-Revision-Date: 2016-01-17 10:44+0000\n"
+"PO-Revision-Date: 2016-02-02 10:52+0000\n"
 "Last-Translator: Christos Nouskas <nous@archlinux.us>\n"
-"Language-Team: Greek (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/el/)\n"
-"Language: el\n"
+"Language-Team: Greek (http://www.transifex.com/toofishes/archlinux-pacman/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -106,9 +105,9 @@ msgid "Generating checksums for source files..."
 msgstr "Δημιουργία αθροισμάτων ελέγχου πηγαίων αρχείων..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Δεν βρέθηκε εκτελέσιμο %s για δημιουργία αθροισμάτων ελέγχου πηγαίων αρχείων."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Δεν βρέθηκε εκτελέσιμο %s για δημιουργία αθροισμάτων ελέγχου πηγαίων αρχείων."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -234,8 +233,7 @@ msgstr "Εκκίνηση %s()..."
 
 #: scripts/makepkg.sh.in:938
 msgid "Library listed in %s is not required by any files: %s"
-msgstr ""
-"Η βιβλιοθήκη που παρατίθεται στο %s δεν απαιτείται από κάποιο αρχείο: %s"
+msgstr "Η βιβλιοθήκη που παρατίθεται στο %s δεν απαιτείται από κάποιο αρχείο: %s"
 
 #: scripts/makepkg.sh.in:967
 msgid "Library listed in %s is not versioned: %s"
@@ -243,8 +241,7 @@ msgstr "Η βιβλιοθήκη που παρατίθεται στο %s δεν 
 
 #: scripts/makepkg.sh.in:980
 msgid "Library listed in %s is not a shared object: %s"
-msgstr ""
-"Η βιβλιοθήκη που παρατίθεται στο %s δεν είναι κοινόχρηστο αντικείμενο: %s"
+msgstr "Η βιβλιοθήκη που παρατίθεται στο %s δεν είναι κοινόχρηστο αντικείμενο: %s"
 
 #: scripts/makepkg.sh.in:995
 msgid "Cannot find library listed in %s: %s"
@@ -345,13 +342,11 @@ msgstr "Άγνωστο πρωτόκολλο λήψης: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Αδυναμία εύρεσης εκτελέσιμου %s που απαιτείται για έλεγχο πηγαίου κώδικα VCS."
+msgstr "Αδυναμία εύρεσης εκτελέσιμου %s που απαιτείται για έλεγχο πηγαίου κώδικα VCS."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
-msgstr ""
-"Αδυναμία εύρεσης πακέτου %s που απαιτείται για χειρισμό πηγαίου κώδικα %s."
+msgstr "Αδυναμία εύρεσης πακέτου %s που απαιτείται για χειρισμό πηγαίου κώδικα %s."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
@@ -371,15 +366,12 @@ msgstr "Δεν βρέθηκε το εκτελέσιμο %s που απαιτεί
 
 #: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
-"Δεν βρέθηκε το εκτελέσιμο %s που απαιτείται για επαλήθευση πηγαίων αρχείων."
+msgstr "Δεν βρέθηκε το εκτελέσιμο %s που απαιτείται για επαλήθευση πηγαίων αρχείων."
 
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"Δεν βρέθηκε το εκτελέσιμο %s που απαιτείται για την επικύρωση αθροισμάτων "
-"ελέγχου πηγαίων αρχείων."
+msgstr "Δεν βρέθηκε το εκτελέσιμο %s που απαιτείται για την επικύρωση αθροισμάτων ελέγχου πηγαίων αρχείων."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
@@ -387,19 +379,15 @@ msgstr "Δεν βρέθηκε το εκτελέσιμο %s που απαιτεί
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
-msgstr ""
-"Δεν βρέθηκε το εκτελέσιμο %s που απαιτείται για τη βελτιστοποίηση εικόνων "
-"PNG."
+msgstr "Δεν βρέθηκε το εκτελέσιμο %s που απαιτείται για τη βελτιστοποίηση εικόνων PNG."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"Δεν βρέθηκε το εκτελέσιμο %s που απαιτείται για κατανεμημένη μεταγλώττιση."
+msgstr "Δεν βρέθηκε το εκτελέσιμο %s που απαιτείται για κατανεμημένη μεταγλώττιση."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Δεν βρέθηκε το εκτελέσιμο %s που απαιτείται για χρήση κρύπτης μεταγλωττιστή."
+msgstr "Δεν βρέθηκε το εκτελέσιμο %s που απαιτείται για χρήση κρύπτης μεταγλωττιστή."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
@@ -407,9 +395,7 @@ msgstr "Δεν βρέθηκε το εκτελέσιμο %s που απαιτεί
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Δεν βρέθηκε το εκτελέσιμο %s που απαιτείται για συμπίεση σελίδων man και "
-"info."
+msgstr "Δεν βρέθηκε το εκτελέσιμο %s που απαιτείται για συμπίεση σελίδων man και info."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -422,17 +408,16 @@ msgstr "Έχει ήδη δημιουργηθεί πακέτο (%s για αντ
 #: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr ""
-"Έχει ήδη δημιουργηθεί η ομάδα πακέτων, εγκατάσταση υπαρχόντων πακέτων..."
+msgstr "Έχει ήδη δημιουργηθεί η ομάδα πακέτων, εγκατάσταση υπαρχόντων πακέτων..."
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "Έχει ήδη δημιουργηθεί η ομάδα πακέτων (%s για αντικατάσταση)."
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Έχει ήδη δημιουργηθεί μέρος από την ομάδα πακέτων (%s για αντικατάσταση)."
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "Έχει ήδη δημιουργηθεί μέρος από την ομάδα πακέτων (%s για αντικατάσταση)."
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -464,8 +449,7 @@ msgstr "  -d, --nodeps     Παράλειψη όλων των ελέγχων ε
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  Μη εξαγωγή πηγαίων αρχείων (χρήση υπάρχοντος καταλόγου %s)"
+msgstr "  -e, --noextract  Μη εξαγωγή πηγαίων αρχείων (χρήση υπάρχοντος καταλόγου %s)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -497,18 +481,16 @@ msgstr "  -o, --nobuild    Λήψη αρχείων και εξαγωγή μόν
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <file>        Χρήση εναλλακτικού σεναρίου μεταγλώττισης (αντί του '%s')"
+msgstr "  -p <file>        Χρήση εναλλακτικού σεναρίου μεταγλώττισης (αντί του '%s')"
 
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Κατάργηση εγκατεστημένων εξαρτήσεων μετά κατόπιν "
-"επιτυχούς δημιουργίας"
+msgstr "  -r, --rmdeps     Κατάργηση εγκατεστημένων εξαρτήσεων μετά κατόπιν επιτυχούς δημιουργίας"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  Ανασύνθεση πακέτου χωρίς αναδημιουργία"
 
 #: scripts/makepkg.sh.in:1716
@@ -518,8 +500,7 @@ msgstr "  -s, --syncdeps   Εγκατάσταση απουσών εξαρτήσ
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source     Δημιουργία πηγαίου αρχείου tar χωρίς ληφθείσες πηγές"
+msgstr "  -S, --source     Δημιουργία πηγαίου αρχείου tar χωρίς ληφθείσες πηγές"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -529,9 +510,7 @@ msgstr "  -V, --version    Εμφάνιση αριθμού έκδοσης και
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      Δημιουργία πηγαίου αρχείου tar συμπεριλαμβάνοντας "
-"ληφθείσες πηγές"
+msgstr "  --allsource      Δημιουργία πηγαίου αρχείου tar συμπεριλαμβάνοντας ληφθείσες πηγές"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -539,8 +518,7 @@ msgstr "  --check          Εκτέλεση συνάρτησης %s στο %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <file>  Χρήση εναλλακτικού αρχείου ρυθμίσεων (αντί του '%s')"
+msgstr "  --config <file>  Χρήση εναλλακτικού αρχείου ρυθμίσεων (αντί του '%s')"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -548,9 +526,9 @@ msgstr "  --holdver        Μη ενημέρωση πηγών CVS"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <key>      Ορισμός κλειδιού για υπογραφή %s αντί του προεπιλεγμένου"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <key>      Ορισμός κλειδιού για υπογραφή %s αντί του προεπιλεγμένου"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -571,11 +549,11 @@ msgstr "  --nosign         Χωρίς δημουργία υπογραφής γι
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr "--packagelist Προβολή μόνο των παραγόμενων πακέτων, χωρίς PKGEXT"
+msgstr "  --packagelist    Μόνο προβολή των παραγόμενων πακέτων, χωρίς PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
-msgstr " --printsrcinfo Προβολή παραχθέντος SRCINFO και έξοδος"
+msgstr "  --printsrcinfo   Προβολή παραχθέντος SRCINFO και έξοδος"
 
 #: scripts/makepkg.sh.in:1730
 msgid "  --sign           Sign the resulting package with %s"
@@ -583,8 +561,7 @@ msgstr "  --sign           Υπογραφή δημιουργηθέντος πα
 
 #: scripts/makepkg.sh.in:1731
 msgid "  --skipchecksums  Do not verify checksums of the source files"
-msgstr ""
-"  --skipchecksums  Χωρίς επαλήθευση αθροισμάτων ελέγχου πηγαίων αρχείων"
+msgstr "  --skipchecksums  Χωρίς επαλήθευση αθροισμάτων ελέγχου πηγαίων αρχείων"
 
 #: scripts/makepkg.sh.in:1732
 msgid ""
@@ -599,9 +576,7 @@ msgstr "  --skippgpcheck   Χωρίς επαλήθευση υπογραφών PG
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource   Λήψη πηγαίων αρχείων (εάν απαιτείται) και έλεγχοι "
-"ακεραιότητας"
+msgstr "  --verifysource   Λήψη πηγαίων αρχείων (εάν απαιτείται) και έλεγχοι ακεραιότητας"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -631,16 +606,12 @@ msgstr "Εάν το %s δεν καθοριστεί, το %s θα αναζητή
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Πνευματική ιδιοκτησία (c) 2006-2016 Ομάδα Ανάπτυξης Pacman <pacman-"
-"dev@archlinux.org>.\\nCopyright  (c) 2002-2006 Judd Vinet <jvinet@zeroflux."
-"org>.\\n\\nΤο παρόν αποτελεί ελεύθερο λογισμικό, οι όροι αναπαραγωγής "
-"βρίσκονται στον πηγαίο κώδικα. Δεν παρέχεται ΚΑΜΜΙΑ ΕΓΓΥΗΣΗ, στον επιτρεπτό "
-"από τον νόμο βαθμό.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Πνευματική ιδιοκτησία (c) 2006-2016 Ομάδα Ανάπτυξης Pacman <pacman-dev@archlinux.org>.\\nCopyright  (c) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nΤο παρόν αποτελεί ελεύθερο λογισμικό, οι όροι αναπαραγωγής βρίσκονται στον πηγαίο κώδικα. Δεν παρέχεται ΚΑΜΜΙΑ ΕΓΓΥΗΣΗ, στον επιτρεπτό από τον νόμο βαθμό.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -674,9 +645,7 @@ msgstr "Δεν έχεις δικαίωμα εγγραφής στο %s για α
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Εκτέλεση του %s ως root δεν επιτρέπεται καθώς μπορεί να προξενήσει μόνιμη, "
-"καταστροφική ζημία στο σύστημα."
+msgstr "Εκτέλεση του %s ως root δεν επιτρέπεται καθώς μπορεί να προξενήσει μόνιμη, καταστροφική ζημία στο σύστημα."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -841,12 +810,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Πνευματική ιδιοκτησία (c) 2013-2016 Ομάδα Ανάπτυξης Pacman <pacman-"
-"dev@archlinux.org>.\n"
-"Το παρόν αποτελεί ελεύθερο λογισμικό, οι όροι αναπαραγωγής βρίσκονται στον "
-"πηγαίο κώδικα.\n"
-"Δεν παρέχεται ΚΑΜΜΙΑ ΕΓΓΥΗΣΗ, στον επιτρεπτό από τον νόμο βαθμό.\n"
+msgstr "Πνευματική ιδιοκτησία (c) 2013-2016 Ομάδα Ανάπτυξης Pacman <pacman-dev@archlinux.org>.\nΤο παρόν αποτελεί ελεύθερο λογισμικό, οι όροι αναπαραγωγής βρίσκονται στον πηγαίο κώδικα.\nΔεν παρέχεται ΚΑΜΜΙΑ ΕΓΓΥΗΣΗ, στον επιτρεπτό από τον νόμο βαθμό.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -882,14 +846,10 @@ msgstr "  --nocolor            Απενεργοποίηση χρώματος μ
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Πνευματική ιδιοκτησία (c) 2010-2016 Ομάδα Ανάπτυξης Pacman <pacman-"
-"dev@archlinux.org>.\\nΤο παρόν αποτελεί ελεύθερο λογισμικό, οι όροι "
-"αναπαραγωγής βρίσκονται στον πηγαίο κώδικα.\\nΔεν παρέχεται ΚΑΜΜΙΑ ΕΓΓΥΗΣΗ, "
-"στον επιτρεπτό από τον νόμο βαθμό.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Πνευματική ιδιοκτησία (c) 2010-2016 Ομάδα Ανάπτυξης Pacman <pacman-dev@archlinux.org>.\\nΤο παρόν αποτελεί ελεύθερο λογισμικό, οι όροι αναπαραγωγής βρίσκονται στον πηγαίο κώδικα.\\nΔεν παρέχεται ΚΑΜΜΙΑ ΕΓΓΥΗΣΗ, στον επιτρεπτό από τον νόμο βαθμό.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -906,9 +866,7 @@ msgstr "Απαιτούνται σωστές άδειες για την αναβ
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Υπάρχει αρχείο κλειδώματος του pacman. Αδυναμία εκτέλεσης ενώ ο pacman "
-"λειτουργεί."
+msgstr "Υπάρχει αρχείο κλειδώματος του pacman. Αδυναμία εκτέλεσης ενώ ο pacman λειτουργεί."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -924,9 +882,7 @@ msgstr "Εντοπισμός μορφής βάσης δεδομένων προ-4
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"ο συμβολικός δεσμός '%s' δείχνει εκτός ριζικού καταλόγου pacman, απαιτείται "
-"χειροκίνητη επιδιόρθωση"
+msgstr "ο συμβολικός δεσμός '%s' δείχνει εκτός ριζικού καταλόγου pacman, απαιτείται χειροκίνητη επιδιόρθωση"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -942,8 +898,7 @@ msgstr "Λειτουργίες:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add                 Προσθήκη καθορισμένων κλειδιών (κενό για stdin)"
+msgstr "  -a, --add                 Προσθήκη καθορισμένων κλειδιών (κενό για stdin)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
@@ -956,9 +911,7 @@ msgstr "  -e, --export              Εξαγωγή καθορισμένων ή 
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              Παράθεση αποτυπωμάτων καθορισμένων ή όλων των "
-"κλειδιών"
+msgstr "  -f, --finger              Παράθεση αποτυπωμάτων καθορισμένων ή όλων των κλειδιών"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -975,14 +928,12 @@ msgstr "  -u, --updatedb            Ενημέρωση της trustdb του pac
 #: scripts/pacman-key.sh.in:70
 msgid ""
 "  -v, --verify              Verify the file(s) specified by the signature(s)"
-msgstr ""
-"  -v, --verify              Επαλήθευση αρχείου(-ων) βάσει υπογραφής(-ών)"
+msgstr "  -v, --verify              Επαλήθευση αρχείου(-ων) βάσει υπογραφής(-ών)"
 
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key                Προβολή μενού εργασιών διαχείρισης κλειδιών"
+msgstr "  --edit-key                Προβολή μενού εργασιών διαχείρισης κλειδιών"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
@@ -992,9 +943,7 @@ msgstr "  --import                  Εισαγωγή pubring.gpg από κατά
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          Εισαγωγή τιμών ιδιο-εμπιστοσύνης trustdb.gpg από "
-"κατάλογο(-ους)"
+msgstr "  --import-trustdb          Εισαγωγή τιμών ιδιο-εμπιστοσύνης trustdb.gpg από κατάλογο(-ους)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
@@ -1010,39 +959,30 @@ msgstr "  --lsign-key               Τοπική υπογραφή καθορισ
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                Ανανέωση προεπιλεγμένων κλειδιών από "
-"(δοθέντες)\\n                            κλειδούχους στο '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                Ανανέωση προεπιλεγμένων κλειδιών από (δοθέντες)\\n                            κλειδούχους στο '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            Ανανέωση καθορισμένων ή όλων των κλειδιών από "
-"διακομιστή"
+msgstr "  --refresh-keys            Ανανέωση καθορισμένων ή όλων των κλειδιών από διακομιστή"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <file>           Χρήση εναλλακτικού αρχείου ρυθμίσεων (αντί του "
-"'%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <file>           Χρήση εναλλακτικού αρχείου ρυθμίσεων (αντί του '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            Ορισμός εναλλακτικού καταλόγου GnuPG (αντί του "
-"'%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            Ορισμός εναλλακτικού καταλόγου GnuPG (αντί του '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <server-url>  Ορισμός διακομιστή κλειδιών, εάν απαιτείται"
+msgstr "  --keyserver <server-url>  Ορισμός διακομιστή κλειδιών, εάν απαιτείται"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1178,8 +1118,7 @@ msgstr "Αδυναμία ενημέρωσης βάσης εμπιστοσύνη
 
 #: scripts/pacman-key.sh.in:559
 msgid "Cannot find the %s binary required for all %s operations."
-msgstr ""
-"Δεν βρέθηκε το εκτελέσιμο %s που απαιτείται για όλες τις λειτουργίες του %s."
+msgstr "Δεν βρέθηκε το εκτελέσιμο %s που απαιτείται για όλες τις λειτουργίες του %s."
 
 #: scripts/pacman-key.sh.in:564
 msgid "%s needs to be run as root for this operation."
@@ -1213,30 +1152,21 @@ msgstr "Χρήση: %s [--nocolor] [ριζικός_κατάλογος_βάσης
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"Το pacman-optimize είναι ένα εργαλείο που βελτιώνει την απόδοση του\\pacman "
-"στην ανάγνωση/εγγραφή της βάσης πακέτων στον δίσκο.\\n\\n"
+msgstr "Το pacman-optimize είναι ένα εργαλείο που βελτιώνει την απόδοση του\\pacman στην ανάγνωση/εγγραφή της βάσης πακέτων στον δίσκο.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Επειδή ο pacman χρησιμοποιεί πολλά μικρά αρχεία για τον έλεγχο των πακέτων,"
-"\\nαυτά τείνουν να κατακερματίζονται με την πάροδο του χρόνου.\\nΑυτό το "
-"εργαλείο επιχειρεί να μεταφέρει τα αρχεία αυτά σε μία συνεχόμενη\\nθέση στον "
-"δίσκο. Ως αποτέλεσμα, ο σκληρός δίσκος θα μπορεί να τα διαβάζει\\nταχύτερα, "
-"εφ' όσον οι κεφαλές του δεν θα χρειάζεται να μετακινούνται πέρα-δώθε"
-"\\nσυνεχώς.\\n"
+msgstr "Επειδή ο pacman χρησιμοποιεί πολλά μικρά αρχεία για τον έλεγχο των πακέτων,\\nαυτά τείνουν να κατακερματίζονται με την πάροδο του χρόνου.\\nΑυτό το εργαλείο επιχειρεί να μεταφέρει τα αρχεία αυτά σε μία συνεχόμενη\\nθέση στον δίσκο. Ως αποτέλεσμα, ο σκληρός δίσκος θα μπορεί να τα διαβάζει\\nταχύτερα, εφ' όσον οι κεφαλές του δεν θα χρειάζεται να μετακινούνται πέρα-δώθε\\nσυνεχώς.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
-msgstr ""
-"Αδυναμία εύρεσης εκτελέσιμου %s που απαιτείτα για επαλήθευση ακεραιότητας."
+msgstr "Αδυναμία εύρεσης εκτελέσιμου %s που απαιτείτα για επαλήθευση ακεραιότητας."
 
 #: scripts/pacman-optimize.sh.in:109
 msgid "You must have correct permissions to optimize the database."
@@ -1283,9 +1213,9 @@ msgid "Rotating database into place..."
 msgstr "Μεταστροφή βάσης..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"Αποτυχία υποκατάστασης νέας βάσης. Έλεγξε τους καταλόγους %s, %s και %s."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "Αποτυχία υποκατάστασης νέας βάσης. Έλεγξε τους καταλόγους %s, %s και %s."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1299,9 +1229,7 @@ msgstr "Χρήση: pkgdelta [επιλογές] <πακέτο1> <πακέτο2>\
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"το pkgdelta δημιουργεί αρχείο δέλτα μεταξύ δύο πακέτων.\\nΑυτό το αρχείο "
-"δέλτα μπορεί κατόπιν να προστεθεί σε μια βάση με το repo-add.\\n"
+msgstr "το pkgdelta δημιουργεί αρχείο δέλτα μεταξύ δύο πακέτων.\\nΑυτό το αρχείο δέλτα μπορεί κατόπιν να προστεθεί σε μια βάση με το repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1328,20 +1256,14 @@ msgstr "  --min-pkg-size    ελάχιστο μέγεθος πακέτου γι
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  ποσοστό νέου πακέτου άνω του οποίου απορρίπτεται το delta"
-"\\n"
+msgstr "  --max-delta-size  ποσοστό νέου πακέτου άνω του οποίου απορρίπτεται το delta\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Πνευματική ιδιοκτησία (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nΤο "
-"παρόν αποτελεί ελεύθερο λογισμικό, οι όροι αναπαραγωγής βρίσκονται στον "
-"πηγαίο κώδικα.\\nΔεν παρέχεται ΚΑΜΜΙΑ ΕΓΓΥΗΣΗ, στον επιτρεπτό από τον νόμο "
-"βαθμό.\\n"
+msgstr "Πνευματική ιδιοκτησία (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nΤο παρόν αποτελεί ελεύθερο λογισμικό, οι όροι αναπαραγωγής βρίσκονται στον πηγαίο κώδικα.\\nΔεν παρέχεται ΚΑΜΜΙΑ ΕΓΓΥΗΣΗ, στον επιτρεπτό από τον νόμο βαθμό.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1393,30 +1315,25 @@ msgstr "Χρήση: repo-add [options] <διαδρομή--βάσης> <πακέ
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"Το repo-add ενημερώνει μια βάση διαβάζοντας ένα αρχείο πακέτου.\\nΜπορούν να "
-"καθορισθούν στην γραμμή εντολών πολλαπλά πακέτα προς προσθήκη.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "Το repo-add ενημερώνει μια βάση διαβάζοντας ένα αρχείο πακέτου.\\nΜπορούν να καθορισθούν στην γραμμή εντολών πολλαπλά πακέτα προς προσθήκη.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta       παραγωγή και προσθήκη δέλτα για αναβάθμιση πακέτου\\n"
+msgstr "  -d, --delta       παραγωγή και προσθήκη δέλτα για αναβάθμιση πακέτου\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"  -n, --new         προσθήκη μόνο πακέτων που δεν υπάρχουν ήδη στην βάση\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "  -n, --new         προσθήκη μόνο πακέτων που δεν υπάρχουν ήδη στην βάση\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"-R, --remove διαγραφή παλαιού αρχείου πακέτου από τον δίσκο μετά την "
-"ενημέρωση της βάσης\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "-R, --remove διαγραφή παλαιού αρχείου πακέτου από τον δίσκο μετά την ενημέρωση της βάσης\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
@@ -1424,13 +1341,10 @@ msgstr "Χρήση: repo-remove [επιλογές] <διαδρομή-βάσης>
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"Το repo-remove ενημερώνει μια βάση διαγράφοντας το πακέτο που ορίσθηκε"
-"\\nστην γραμμή εντολών από μια δοθείσα βάση αποθήκης. Μπορούν να"
-"\\nκαθορισθούν στην γραμμή εντολών πολλαπλά πακέτα προς διαγραφή.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "Το repo-remove ενημερώνει μια βάση διαγράφοντας το πακέτο που ορίσθηκε\\nστην γραμμή εντολών από μια δοθείσα βάση αποθήκης. Μπορούν να\\nκαθορισθούν στην γραμμή εντολών πολλαπλά πακέτα προς διαγραφή.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1446,8 +1360,7 @@ msgstr "  -s, --sign        υπογραφή βάσης με GnuPG μετά τη
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <key>   χρήση του συγκεκριμένου κλειδιού για υπογραφή βάσης\\n"
+msgstr "  -k, --key <key>   χρήση του συγκεκριμένου κλειδιού για υπογραφή βάσης\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
@@ -1456,15 +1369,12 @@ msgstr "  -v, --verify      επαλήθευση υπογραφής βάσης 
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nΔες %s(8) για λεπτομέρειες και περιγραφή των διαθέσιμων επιλογών.\\n"
+msgstr "\\nΔες %s(8) για λεπτομέρειες και περιγραφή των διαθέσιμων επιλογών.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Παράδειγμα:  repo-add /διαδρομή/προς/repo.db.tar.gz pacman-3.0.0-1-i686.pkg."
-"tar.gz\\n"
+msgstr "Παράδειγμα:  repo-add /διαδρομή/προς/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1472,14 +1382,10 @@ msgstr "Παράδειγμα:  repo-remove /διαδρομή/προς/repo.db.ta
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Πνευματική ιδιοκτησία (c) 2006-2016 Ομάδα Ανάπτυξης Pacman <pacman-"
-"dev@archlinux.org>.\\n\\nΤο παρόν αποτελεί ελεύθερο λογισμικό, οι όροι "
-"αναπαραγωγής βρίσκονται στον πηγαίο κώδικα.\\nΔεν παρέχεται ΚΑΜΜΙΑ ΕΓΓΥΗΣΗ, "
-"στον επιτρεπτό από τον νόμο βαθμό.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Πνευματική ιδιοκτησία (c) 2006-2016 Ομάδα Ανάπτυξης Pacman <pacman-dev@archlinux.org>.\\n\\nΤο παρόν αποτελεί ελεύθερο λογισμικό, οι όροι αναπαραγωγής βρίσκονται στον πηγαίο κώδικα.\\nΔεν παρέχεται ΚΑΜΜΙΑ ΕΓΓΥΗΣΗ, στον επιτρεπτό από τον νόμο βαθμό.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1770,18 +1676,21 @@ msgstr "Αποτυχία λήψης %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Μη αναγνωρίσιμη αναφορά: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Δημιουργία αντιγράφου εργασίας του αποθετηρίου %s %s ..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Αποτυχία ενημέρωσης αντιγράφου εργασίας αποθετηρίου %s με %s"
 
@@ -1813,12 +1722,14 @@ msgstr "Εξαγωγή %s με %s"
 msgid "Failed to extract %s"
 msgstr "Αποτυχία εξαγωγής %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Κλωνοποίηση του αποθετηρίου %s %s"
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Αποτυχία λήψης του αποθετηρίου %s %s"
@@ -1827,12 +1738,14 @@ msgstr "Αποτυχία λήψης του αποθετηρίου %s %s"
 msgid "%s is not a clone of %s"
 msgstr "το %s δεν είναι κλώνος του %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Ενημέρωση του αποθετηρίου %s %s"
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Αποτυχία ενημέρωσης του αποθετηρίου %s %s"
diff --git a/scripts/po/en_GB.po b/scripts/po/en_GB.po
index cdad228f..bc17990c 100644
--- a/scripts/po/en_GB.po
+++ b/scripts/po/en_GB.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Allan McRae <allan@archlinux.org>, 2013
 # Allan McRae <allan@archlinux.org>, 2013-2016
@@ -13,12 +13,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 08:39+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/en_GB/)\n"
-"Language: en_GB\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/toofishes/archlinux-pacman/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -100,9 +99,9 @@ msgid "Generating checksums for source files..."
 msgstr "Generating checksums for source files..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
+msgid ""
 "Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Cannot find the %s binary required for generating sourcefile checksums."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -366,8 +365,7 @@ msgstr "Cannot find the %s binary required for verifying source files."
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"Cannot find the %s binary required for validating source file checksums."
+msgstr "Cannot find the %s binary required for validating source file checksums."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
@@ -404,17 +402,16 @@ msgstr "A package has already been built. (use %s to overwrite)"
 #: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr ""
-"The package group has already been built, installing existing packages..."
+msgstr "The package group has already been built, installing existing packages..."
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "The package group has already been built. (use %s to overwrite)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
+msgid ""
 "Part of the package group has already been built. (use %s to overwrite)"
+msgstr "Part of the package group has already been built. (use %s to overwrite)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -483,13 +480,12 @@ msgstr "  -p <file>        Use an alternate build script (instead of '%s')"
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Remove installed dependencies after a successful build"
+msgstr "  -r, --rmdeps     Remove installed dependencies after a successful build"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr ""
+msgid ""
 "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgstr "  -R, --repackage  Repackage contents of the package without rebuilding"
 
 #: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
@@ -498,8 +494,7 @@ msgstr "  -s, --syncdeps   Install missing dependencies with %s"
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source     Generate a source-only tarball without downloaded sources"
+msgstr "  -S, --source     Generate a source-only tarball without downloaded sources"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -509,9 +504,7 @@ msgstr "-V, --version Show version information and exit"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      Generate a source-only tarball including downloaded "
-"sources"
+msgstr "  --allsource      Generate a source-only tarball including downloaded sources"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -527,9 +520,9 @@ msgstr "  --holdver        Do not update VCS sources"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <key>      Specify a key to use for %s signing instead of the default"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -550,8 +543,7 @@ msgstr "  --nosign         Do not create a signature for the package"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"  --packagelist    Only list packages that would be produced, without PKGEXT"
+msgstr "  --packagelist    Only list packages that would be produced, without PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -568,8 +560,7 @@ msgstr "  --skipchecksums  Do not verify checksums of the source files"
 #: scripts/makepkg.sh.in:1732
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
-msgstr ""
-"  --skipinteg      Do not perform any verification checks on source files"
+msgstr "  --skipinteg      Do not perform any verification checks on source files"
 
 #: scripts/makepkg.sh.in:1733
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
@@ -579,9 +570,7 @@ msgstr "  --skippgpcheck   Do not verify source files with PGP signatures"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-" --verifysource Download source files (if needed) and perform integrity "
-"checks"
+msgstr " --verifysource Download source files (if needed) and perform integrity checks"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -594,14 +583,12 @@ msgstr "  --asdeps         Install packages as non-explicitly installed"
 #: scripts/makepkg.sh.in:1739
 msgid ""
 "  --needed         Do not reinstall the targets that are already up to date"
-msgstr ""
-"  --needed         Do not reinstall the targets that are already up to date"
+msgstr "  --needed         Do not reinstall the targets that are already up to date"
 
 #: scripts/makepkg.sh.in:1740
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr ""
-"  --noconfirm      Do not ask for confirmation when resolving dependencies"
+msgstr "  --noconfirm      Do not ask for confirmation when resolving dependencies"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
@@ -613,15 +600,12 @@ msgstr "If %s is not specified, %s will look for '%s'"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for copying conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -655,9 +639,7 @@ msgstr "You do not have write permission to store logs in %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
-"damage to your system."
+msgstr "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic damage to your system."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -798,9 +780,7 @@ msgstr "  --newest, -n          update templates to newest version\n"
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                        (default: use version specified in the template "
-"markers)\n"
+msgstr "                        (default: use version specified in the template markers)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
@@ -824,10 +804,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
-"This is free software; see the source for copying conditions.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\nThis is free software; see the source for copying conditions.\nThere is NO WARRANTY, to the extent permitted by law.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -863,13 +840,10 @@ msgstr "  --nocolor            disable colourised output messages"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nThis is free software; see the source for copying conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -953,8 +927,7 @@ msgstr "  -v, --verify        Verify the file(s) specified by the signature(s)"
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key                Present a menu for key management task on keyids"
+msgstr "  --edit-key                Present a menu for key management task on keyids"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
@@ -964,9 +937,7 @@ msgstr "  --import                  Imports pubring.gpg from dir(s)"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
-"dir(s)"
+msgstr "  --import-trustdb          Imports ownertrust values from trustdb.gpg in dir(s)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
@@ -982,33 +953,26 @@ msgstr "  --lsign-key               Locally sign the specified keyid"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n in '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                Reload the default keys from the (given) keyrings\\n in '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            Update specified or all keys from a keyserver"
+msgstr "  --refresh-keys            Update specified or all keys from a keyserver"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <file>           Use an alternate config file (instead of\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n                            of '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
@@ -1182,25 +1146,17 @@ msgstr "Usage: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize is a little hack that should improve the performance\\nof "
-"pacman when reading/writing to its filesystem-based database.\\n\\n"
+msgstr "pacman-optimize is a little hack that should improve the performance\\nof pacman when reading/writing to its filesystem-based database.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
-"attempts to relocate these small files into one\\ncontinuous location on "
-"your hard drive. The result is that the hard\\ndrive should be able to read "
-"them faster, since the hard drive head\\ndoes not have to move around the "
-"disk as much.\\n"
-msgstr ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
+msgstr "Because pacman uses many small files to keep track of packages,\\nthere is a tendency for these files to become fragmented over time.\\nThis script attempts to relocate these small files into one\\ncontinuous location on your hard drive. The result is that the hard\\ndrive should be able to read them faster, since the hard drive head\\ndoes not have to move around the disk as much.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1251,9 +1207,9 @@ msgid "Rotating database into place..."
 msgstr "Rotating database into place..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
+msgid ""
 "New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "New database substitution failed. Check for %s, %s, and %s directories."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1267,9 +1223,7 @@ msgstr "Usage: pkgdelta [options] <package1> <package2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta will create a delta file between two packages.\\nThis delta file "
-"can then be added to a database using repo-add.\\n"
+msgstr "pkgdelta will create a delta file between two packages.\\nThis delta file can then be added to a database using repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1290,26 +1244,20 @@ msgstr "  --nocolor         remove colour from output\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size    minimum package size before deltas are generated\\n"
+msgstr "  --min-pkg-size    minimum package size before deltas are generated\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  percent of new package above which the delta will be "
-"discarded\\n"
+msgstr "  --max-delta-size  percent of new package above which the delta will be discarded\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
-"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
-"the extent permitted by law.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free software; see the source for copying conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1361,11 +1309,9 @@ msgstr "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add will update a package database by reading a package file.\\nMultiple packages to add can be specified on the command line.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1373,17 +1319,15 @@ msgstr "  -d, --delta       generate and add delta for package update\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "  -n, --new         only add packages that are not already in the database\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "  -R, --remove      remove old package file from disk after updating database\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
@@ -1391,13 +1335,10 @@ msgstr "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove will update a package database by removing the package name\\nspecified on the command line from the given repo database. Multiple\\npackages to remove can be specified on the command line.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1422,14 +1363,12 @@ msgstr "  -v, --verify      verify database's signature before update\\n"
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nSee %s(8) for more details and descriptions of the available options.\\n"
+msgstr "\\nSee %s(8) for more details and descriptions of the available options.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1437,13 +1376,10 @@ msgstr "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n\\nThis is free software; see the source for copying conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1734,18 +1670,21 @@ msgstr "Failure while pulling %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Unrecognised reference: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Creating working copy of %s %s repo..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Failure while updating working copy of %s %s repo"
 
@@ -1777,12 +1716,14 @@ msgstr "Extracting %s with %s"
 msgid "Failed to extract %s"
 msgstr "Failed to extract %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Cloning %s %s repo..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Failure while downloading %s %s repo"
@@ -1791,12 +1732,14 @@ msgstr "Failure while downloading %s %s repo"
 msgid "%s is not a clone of %s"
 msgstr "%s is not a clone of %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Updating %s %s repo..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Failure while updating %s %s repo"
diff --git a/scripts/po/eo.po b/scripts/po/eo.po
index 352094c1..809cd5e0 100644
--- a/scripts/po/eo.po
+++ b/scripts/po/eo.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # pizzaiolo, 2015
 # pizzaiolo, 2015
@@ -13,12 +13,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-27 11:49+0000\n"
 "Last-Translator: pizzaiolo\n"
-"Language-Team: Esperanto (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/eo/)\n"
-"Language: eo\n"
+"Language-Team: Esperanto (http://www.transifex.com/toofishes/archlinux-pacman/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -100,9 +99,9 @@ msgid "Generating checksums for source files..."
 msgstr "Generante kontrolsumojn por fontdosierojn..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Ne eblas trovi la duumon %s bezonata por krei kontrolsumojn de fontdosierojn."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Ne eblas trovi la duumon %s bezonata por krei kontrolsumojn de fontdosierojn."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -135,8 +134,7 @@ msgstr "Unu aŭ pli dosieroj ne sukcesis dum la valida kontrolo!"
 
 #: scripts/makepkg.sh.in:489
 msgid "Integrity checks (%s) differ in size from the source array."
-msgstr ""
-"Kontroloj de integreco (%s) malsamas pri grandeco rilate al la fonta tabelo."
+msgstr "Kontroloj de integreco (%s) malsamas pri grandeco rilate al la fonta tabelo."
 
 #: scripts/makepkg.sh.in:531
 msgid "Integrity checks are missing for: %s"
@@ -338,8 +336,7 @@ msgstr "Nekonata elŝuta protokolo: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Ne eblas trovi la duumon %s, bezonata por kontroli fontajn postulojn de VCS."
+msgstr "Ne eblas trovi la duumon %s, bezonata por kontroli fontajn postulojn de VCS."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
@@ -351,8 +348,7 @@ msgstr "Ne eblas trovi la duumon %s, bezonata por dependecaj funkcioj."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Ne eblas trovi la duumon %s. Oni uzos %s por akiri ĉefuzantajn rajtojn."
+msgstr "Ne eblas trovi la duumon %s. Oni uzos %s por akiri ĉefuzantajn rajtojn."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -369,9 +365,7 @@ msgstr "Ne eblas trovi la duumon %s bezonata por konfirmi fontdosierojn."
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"Ne eblas trovi la duumon %s bezonata por validigi kontrolsumojn de "
-"fontdosierojn."
+msgstr "Ne eblas trovi la duumon %s bezonata por validigi kontrolsumojn de fontdosierojn."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
@@ -387,9 +381,7 @@ msgstr "Ne eblas trovi la duumon %s, bezonata por disa programtradukado."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Ne eblas trovi la duumon %s, bezonata por uzado de programtradukila "
-"kaŝmemoro."
+msgstr "Ne eblas trovi la duumon %s, bezonata por uzado de programtradukila kaŝmemoro."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
@@ -397,9 +389,7 @@ msgstr "Ne eblas trovi la duumon %s bezonata por senfeligi objektan dosieron."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Ne eblas trovi la duumon %s, bezonata por kompaktigi manlibran kaj informan "
-"paĝojn."
+msgstr "Ne eblas trovi la duumon %s, bezonata por kompaktigi manlibran kaj informan paĝojn."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -419,9 +409,9 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "La pakaĵa grupo jam estis konstruita. (uzu %s por superskribi)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Parto de la pakaĵa grupo jam estis konstruita. (uzu %s por superskribi)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "Parto de la pakaĵa grupo jam estis konstruita. (uzu %s por superskribi)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -453,8 +443,7 @@ msgstr "  -d, --nodeps     Preterpasi ĉiujn kontrolojn de dependencoj"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  Ne eltiri fontdosierojn (uzi estantan dosierujon %s)"
+msgstr "  -e, --noextract  Ne eltiri fontdosierojn (uzi estantan dosierujon %s)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -491,11 +480,11 @@ msgstr "  -p <file>        Uzi alian konstruan skripton (anstataŭ '%s')"
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Forigi instalitajn dependencojn post sukcesa konstruado"
+msgstr "  -r, --rmdeps     Forigi instalitajn dependencojn post sukcesa konstruado"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  Repaki la enhavojn de la pakaĵo sen rekonstrui"
 
 #: scripts/makepkg.sh.in:1716
@@ -531,10 +520,9 @@ msgstr "  --holdver        Ne ĝisdatigi VCS-fontojn"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <key>      Specifi ŝlosilon por uzi dum subskribado de %s anstataŭ "
-"la defaŭlto"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <key>      Specifi ŝlosilon por uzi dum subskribado de %s anstataŭ la defaŭlto"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -555,8 +543,7 @@ msgstr "  --nosign         Ne krei subskribon por la pakaĵo"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"  --packagelist    Nur listigi pakaĵojn, ke estus produktitaj sen PKGEXT"
+msgstr "  --packagelist    Nur listigi pakaĵojn, ke estus produktitaj sen PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -583,9 +570,7 @@ msgstr "  --skippgpcheck   Ne konfirmi fontdosierojn kun PGP-subskriboj"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource   Elŝuti fontdosierojn (se postulataj) kaj kontrolu "
-"integrecon"
+msgstr "  --verifysource   Elŝuti fontdosierojn (se postulataj) kaj kontrolu integrecon"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -607,8 +592,7 @@ msgstr "      --noconfirm      ne petu konfirmon kiam solvante dependencojn"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"      --noprogressbar  Ne montri progresbreton kiam elŝutante dosierojn"
+msgstr "      --noprogressbar  Ne montri progresbreton kiam elŝutante dosierojn"
 
 #: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
@@ -616,15 +600,12 @@ msgstr "Se %s ne estos difinita, %s serĉos '%s'"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Kopirajto (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nKopirajto (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nĈi tiu "
-"estas libera programo; vidu la fonton por kopiaj kondiĉoj.\\nNE estas "
-"GARANTIOJ, kiom tiom la leĝo eblas.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Kopirajto (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nKopirajto (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nĈi tiu estas libera programo; vidu la fonton por kopiaj kondiĉoj.\\nNE estas GARANTIOJ, kiom tiom la leĝo eblas.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -658,9 +639,7 @@ msgstr "Vi ne havas skriban permeson por konservi protokolojn en %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Funkciigi %s kiel ĉefuzanto ne estas permesata ĉar gi povas krei daŭran,"
-"\\nkatastrofan difekton en via sistemo."
+msgstr "Funkciigi %s kiel ĉefuzanto ne estas permesata ĉar gi povas krei daŭran,\\nkatastrofan difekton en via sistemo."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -787,13 +766,11 @@ msgstr "Opcioj:\n"
 #: scripts/makepkg-template.pl.in:178
 #, perl-format
 msgid "  --input, -p <file>    Build script to read (default: %s)\n"
-msgstr ""
-"  --input, -p <file>    Elekti la konstruadskripton por legi (defaŭlta: %s)\n"
+msgstr "  --input, -p <file>    Elekti la konstruadskripton por legi (defaŭlta: %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
-msgstr ""
-"  --output, -o <file>   eligi dosieron al (defaŭlte: la eniga dosiero)\n"
+msgstr "  --output, -o <file>   eligi dosieron al (defaŭlte: la eniga dosiero)\n"
 
 #: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
@@ -827,10 +804,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Kopirajto (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
-"Ĉi tiu estas libera programo; vidu la fonton por kopiaj kondiĉoj.\n"
-"NE estas GARANTIOJ, kiom tiom la leĝo eblas.\n"
+msgstr "Kopirajto (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\nĈi tiu estas libera programo; vidu la fonton por kopiaj kondiĉoj.\nNE estas GARANTIOJ, kiom tiom la leĝo eblas.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -866,13 +840,10 @@ msgstr "  --nocolor            malebligi kolorajn eligajn mesaĝojn"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Kopirajto (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nĈi tiu estas libera programo; vidu la fonton por kopiaj kondiĉoj.\\nNE "
-"estas GARANTIOJ, kiom tiom la leĝo eblas.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Kopirajto (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nĈi tiu estas libera programo; vidu la fonton por kopiaj kondiĉoj.\\nNE estas GARANTIOJ, kiom tiom la leĝo eblas.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -889,9 +860,7 @@ msgstr "Vi bezonas havi la ĝustajn permesojn por ĝisdatigi la datumbazo."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Ŝlosdosiero de pacman estis trovita. Ne eblas daŭrigi kvankam pacman "
-"funkcias."
+msgstr "Ŝlosdosiero de pacman estis trovita. Ne eblas daŭrigi kvankam pacman funkcias."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -907,9 +876,7 @@ msgstr "Datumbazo-formato pra-4.2 detektita - ĝisdatigante..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"la simbola ligilo '%s' indikas eksteren al pacman kun ĉefuzantaj rajtoj, "
-"mana riparo estas bezonata"
+msgstr "la simbola ligilo '%s' indikas eksteren al pacman kun ĉefuzantaj rajtoj, mana riparo estas bezonata"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -925,9 +892,7 @@ msgstr "Agoj:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add                 Aldoni la precizigitajn ŝlosilojn (malplena por "
-"stdin)"
+msgstr "  -a, --add                 Aldoni la precizigitajn ŝlosilojn (malplena por stdin)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
@@ -935,15 +900,12 @@ msgstr "  -d, --delete              Forviŝi precizigitajn keyid-dosierojn"
 
 #: scripts/pacman-key.sh.in:65
 msgid "  -e, --export              Export the specified or all keyids"
-msgstr ""
-"  -e, --export              Eksporti precizigitajn aŭ ĉiujn keyid-dosierojn"
+msgstr "  -e, --export              Eksporti precizigitajn aŭ ĉiujn keyid-dosierojn"
 
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              Listigi fingrospuron por precizigitaj aŭ ĉiuj "
-"keyid-dosieroj"
+msgstr "  -f, --finger              Listigi fingrospuron por precizigitaj aŭ ĉiuj keyid-dosieroj"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -960,16 +922,12 @@ msgstr "  -u, --updatedb            Ĝisdatigi la trustdb de pacman"
 #: scripts/pacman-key.sh.in:70
 msgid ""
 "  -v, --verify              Verify the file(s) specified by the signature(s)"
-msgstr ""
-"  -v, --verify              Konfirmi la precizigita(j)n dosiero(j)n per "
-"subskribo"
+msgstr "  -v, --verify              Konfirmi la precizigita(j)n dosiero(j)n per subskribo"
 
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key                Montri menuon por tasko de ŝlosila administrado "
-"pri keyid"
+msgstr "  --edit-key                Montri menuon por tasko de ŝlosila administrado pri keyid"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
@@ -979,14 +937,11 @@ msgstr "  --import                  Importi pubring.gpg de dosierujo(j)"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          Importi posedantajn fidajn valorojn de trustdb."
-"gpg en dosierujo(j)"
+msgstr "  --import-trustdb          Importi posedantajn fidajn valorojn de trustdb.gpg en dosierujo(j)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                    Certigi ke la ŝlosilingo estu ĝuste ekigita"
+msgstr "  --init                    Certigi ke la ŝlosilingo estu ĝuste ekigita"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
@@ -998,39 +953,30 @@ msgstr "  --lsign-key               Loke subskribi la difinitan keyid"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                Reŝarĝi la defaŭltajn ŝlosilojn de ĉi tiuj "
-"ŝlosilingoj\\n                            en '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                Reŝarĝi la defaŭltajn ŝlosilojn de ĉi tiuj ŝlosilingoj\\n                            en '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            Ĝisdatigi specifajn aŭ ĉiujn ŝlosilojn de "
-"ŝlosilservilo"
+msgstr "  --refresh-keys            Ĝisdatigi specifajn aŭ ĉiujn ŝlosilojn de ŝlosilservilo"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <file>           Uzi alian agordan dosieron (anstataŭ"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <file>           Uzi alian agordan dosieron (anstataŭ\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            Elekti alian dosierujon por GnuPG (anstataŭ"
-"\\n                            '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            Elekti alian dosierujon por GnuPG (anstataŭ\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <server-url>  Specifi ŝlosilservilon por uzi se postulata"
+msgstr "  --keyserver <server-url>  Specifi ŝlosilservilon por uzi se postulata"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1200,24 +1146,17 @@ msgstr "Usage: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize estas eta kodumo ke devas kreskigi la rendimenton\\nde "
-"pacman dum legado/skribado en ĝia dosiersistema datumbazo.\\n\\n"
+msgstr "pacman-optimize estas eta kodumo ke devas kreskigi la rendimenton\\nde pacman dum legado/skribado en ĝia dosiersistema datumbazo.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Ĉar pacman uzas multajn dosieretojn por observi pakaĵojn,\\nestas inklinemo "
-"ke tiuj dosieroj post kaj post estos dispecigitaj.\\nĈi tiu skripto klopodas "
-"translokiĝi tiujn etajn dosierojn al unu\\ndaŭra loko en via fiksita disko. "
-"La rezulto estas ke la fiksita\\ndisko legos ilin pli rapide, ĉar la kapo de "
-"la fiksita disko\\nne movas tiom multe ĉirkaŭ la disko.\\n"
+msgstr "Ĉar pacman uzas multajn dosieretojn por observi pakaĵojn,\\nestas inklinemo ke tiuj dosieroj post kaj post estos dispecigitaj.\\nĈi tiu skripto klopodas translokiĝi tiujn etajn dosierojn al unu\\ndaŭra loko en via fiksita disko. La rezulto estas ke la fiksita\\ndisko legos ilin pli rapide, ĉar la kapo de la fiksita disko\\nne movas tiom multe ĉirkaŭ la disko.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1268,9 +1207,9 @@ msgid "Rotating database into place..."
 msgstr "Turnante la datumbazon al sia loko..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"Nova datumbaza anstataŭo malsukcesis. Kontrolu la dosierujojn %s, %s kaj %s."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "Nova datumbaza anstataŭo malsukcesis. Kontrolu la dosierujojn %s, %s kaj %s."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1284,9 +1223,7 @@ msgstr "Uzado: pkgdelta [opcioj] <pakaĵo1> <pakaĵo2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta kreos diferencodosieron inter du pakaĵojn.\\nTiu ĉi "
-"diferencodosiero povas esti aldonita al datumbazo uzante repo-add.\\n"
+msgstr "pkgdelta kreos diferencodosieron inter du pakaĵojn.\\nTiu ĉi diferencodosiero povas esti aldonita al datumbazo uzante repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1307,27 +1244,20 @@ msgstr "  --nocolor         forigi koloron el la eligo\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size    minimuma pakaĵa grando antaŭ diferencodosieroj estos "
-"generitaj\\n"
+msgstr "  --min-pkg-size    minimuma pakaĵa grando antaŭ diferencodosieroj estos generitaj\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  elcentaĵo el la nova pakaĵo kiu ne estos konservita de "
-"la diferencodosiero\\n"
+msgstr "  --max-delta-size  elcentaĵo el la nova pakaĵo kiu ne estos konservita de la diferencodosiero\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Kopirajto (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\nĈi tiu estas "
-"libera programo; vidu la fonton por kopiaj kondiĉoj.\\nNE estas GARANTIOJ, "
-"kiom tiom la leĝo eblas.\\n"
+msgstr "Kopirajto (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\nĈi tiu estas libera programo; vidu la fonton por kopiaj kondiĉoj.\\nNE estas GARANTIOJ, kiom tiom la leĝo eblas.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1335,8 +1265,7 @@ msgstr "Nevalida pakaĵa dosiero '%s'."
 
 #: scripts/pkgdelta.sh.in:120
 msgid "Skipping delta creation for small package: %s - size %s"
-msgstr ""
-"Preterpasante kreadon de diferencodosiero por eta pakaĵo: %s - grando %s"
+msgstr "Preterpasante kreadon de diferencodosiero por eta pakaĵo: %s - grando %s"
 
 #: scripts/pkgdelta.sh.in:125
 msgid "The package names don't match : '%s' and '%s'"
@@ -1380,31 +1309,25 @@ msgstr "Uzado: repo-add [opcioj] <path-to-db> <package|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add ĝisdatigos pakaĵan datumbazon legante pakaĵdosieron.\\nMultoblaj "
-"pakaĵoj povas esti aldonitaj komandlinie.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add ĝisdatigos pakaĵan datumbazon legante pakaĵdosieron.\\nMultoblaj pakaĵoj povas esti aldonitaj komandlinie.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta       generi kaj aldoni diferencodosieron por pakaĵa ĝisdatigo"
-"\\n"
+msgstr "  -d, --delta       generi kaj aldoni diferencodosieron por pakaĵa ĝisdatigo\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"  -n, --new         nur aldoni pakaĵojn ke ne jam estas en la datumbazo\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "  -n, --new         nur aldoni pakaĵojn ke ne jam estas en la datumbazo\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"  -R, --remove      forviŝi malnovan pakaĵan dosieron el la disko post "
-"ĝisdatigado de datumbazo\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "  -R, --remove      forviŝi malnovan pakaĵan dosieron el la disko post ĝisdatigado de datumbazo\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
@@ -1412,13 +1335,10 @@ msgstr "Uzado: repo-remove [opcioj] <path-to-db> <packagename|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove ĝisdatigos pakaĵan datumbazon forviŝante la pakaĵan nomon"
-"\\ndifinita en la komandlinio de la cela deponeja datumbazo. Multoblaj"
-"\\npakaĵojn por forviŝi povas esti difinita en la komandlinio.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove ĝisdatigos pakaĵan datumbazon forviŝante la pakaĵan nomon\\ndifinita en la komandlinio de la cela deponeja datumbazo. Multoblaj\\npakaĵojn por forviŝi povas esti difinita en la komandlinio.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1430,31 +1350,25 @@ msgstr "  --nocolor         malŝalti koloron en eligo\\n"
 
 #: scripts/repo-add.sh.in:80
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
-msgstr ""
-"  -s, --sign        subskribi la datumbazon kun GnuPG post la ĝisdatigo\\n"
+msgstr "  -s, --sign        subskribi la datumbazon kun GnuPG post la ĝisdatigo\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <key>   uzi la difinitan ŝlosilon por subskribi la datumbazon\\n"
+msgstr "  -k, --key <key>   uzi la difinitan ŝlosilon por subskribi la datumbazon\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
-"  -v, --verify      konfirmi la subskribon de la datumbazo antaŭ la ĝisdatigo"
-"\\n"
+msgstr "  -v, --verify      konfirmi la subskribon de la datumbazo antaŭ la ĝisdatigo\\n"
 
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\n\\nVidu %s(8) por pliaj detaloj kaj priskriboj sur la fareblaj opcioj.\\n"
+msgstr "\\n\\nVidu %s(8) por pliaj detaloj kaj priskriboj sur la fareblaj opcioj.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Ekzemple:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Ekzemple:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1462,13 +1376,10 @@ msgstr "Ekzemple:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Kopirajto (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\n\\nĈi tiu estas libera programo; vidu la fonton por kopiaj kondiĉoj.\\nNE "
-"estas GARANTIOJ, kiom tiom la leĝo eblas.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Kopirajto (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\n\\nĈi tiu estas libera programo; vidu la fonton por kopiaj kondiĉoj.\\nNE estas GARANTIOJ, kiom tiom la leĝo eblas.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1759,18 +1670,21 @@ msgstr "Malsukcesis dum tirado de %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Neagnoskita referenco: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Kreante funkciantan kopion de deponejo %s %s..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Malsukcesis dum ĝisdatigo de funkcianta kopio de deponejo %s %s"
 
@@ -1802,12 +1716,14 @@ msgstr "Eltirante %s kun %s"
 msgid "Failed to extract %s"
 msgstr "Malsukcesis eltiri %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Klonante deponejon %s %s..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Malsukceso dum elŝuto de deponejo de %s %s"
@@ -1816,12 +1732,14 @@ msgstr "Malsukceso dum elŝuto de deponejo de %s %s"
 msgid "%s is not a clone of %s"
 msgstr "%s ne estas klono de %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Ĝisdatigante deponejon %s %s..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Malsukceso dum ĝisdatigo de deponejo %s %s"
diff --git a/scripts/po/es.po b/scripts/po/es.po
index 97e67656..cdecc4aa 100644
--- a/scripts/po/es.po
+++ b/scripts/po/es.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Jenn <jcmm986@gmail.com>, 2012
 # Jenn <jcmm986@gmail.com>, 2012
@@ -23,12 +23,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-18 16:40+0000\n"
 "Last-Translator: Pedro Román <roizheim@gmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/es/)\n"
-"Language: es\n"
+"Language-Team: Spanish (http://www.transifex.com/toofishes/archlinux-pacman/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -110,10 +109,9 @@ msgid "Generating checksums for source files..."
 msgstr "Generando las sumas de control para los archivos fuentes…"
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para generar las sumas de "
-"control de las fuentes."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "No se pudo encontrar el binario %s requerido para generar las sumas de control de las fuentes."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -146,9 +144,7 @@ msgstr "¡Uno o más archivos no superaron el control de validación!"
 
 #: scripts/makepkg.sh.in:489
 msgid "Integrity checks (%s) differ in size from the source array."
-msgstr ""
-"Los controles de integridad (%s) difieren en tamaño de los especificados en "
-"la fuente."
+msgstr "Los controles de integridad (%s) difieren en tamaño de los especificados en la fuente."
 
 #: scripts/makepkg.sh.in:531
 msgid "Integrity checks are missing for: %s"
@@ -330,8 +326,7 @@ msgstr "Hubo fallos al crear el paquete fuente."
 
 #: scripts/makepkg.sh.in:1389
 msgid "Failed to create symlink to source package file."
-msgstr ""
-"Hubo fallos al crear el enlace simbólico al archivo del paquete fuente."
+msgstr "Hubo fallos al crear el enlace simbólico al archivo del paquete fuente."
 
 #: scripts/makepkg.sh.in:1401
 msgid "Installing package %s with %s..."
@@ -351,8 +346,7 @@ msgstr "Protocolo de descarga desconocido: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"No se pudo encontrar el binario requerido %s para verificar las fuentes CVS."
+msgstr "No se pudo encontrar el binario requerido %s para verificar las fuentes CVS."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
@@ -360,15 +354,11 @@ msgstr "No se pudo encontrar el paquete %s para manejar las fuentes %s."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para las operaciones de "
-"dependencia"
+msgstr "No se pudo encontrar el binario %s requerido para las operaciones de dependencia"
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"No se pudo encontrar el binario %s. Se usará %s para obtener privilegios de "
-"superusuario."
+msgstr "No se pudo encontrar el binario %s. Se usará %s para obtener privilegios de superusuario."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -380,48 +370,36 @@ msgstr "No se pudo encontrar el binario %s requerido para firmar paquetes."
 
 #: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para verificar las fuentes."
+msgstr "No se pudo encontrar el binario %s requerido para verificar las fuentes."
 
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"No se pudo encontrar el binario %s necesario para verificar las sumas de "
-"control de las fuentes."
+msgstr "No se pudo encontrar el binario %s necesario para verificar las sumas de control de las fuentes."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para comprimir los binarios."
+msgstr "No se pudo encontrar el binario %s requerido para comprimir los binarios."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
-msgstr ""
-"No se pudo encontrar el binario %s necesario para optimizar imágenes PNG."
+msgstr "No se pudo encontrar el binario %s necesario para optimizar imágenes PNG."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para la compilación distribuida."
+msgstr "No se pudo encontrar el binario %s requerido para la compilación distribuida."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para el uso de la caché del "
-"compilador."
+msgstr "No se pudo encontrar el binario %s requerido para el uso de la caché del compilador."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para desmontar el archivo en "
-"cuestión."
+msgstr "No se pudo encontrar el binario %s requerido para desmontar el archivo en cuestión."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para comprimir las páginas man "
-"e info."
+msgstr "No se pudo encontrar el binario %s requerido para comprimir las páginas man e info."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -441,9 +419,9 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "El grupo de paquetes ya se ha compilado. (use %s para sobrescribirlo)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Parte del grupo de paquetes ya se ha compilado. (use %s para sobrescribirlo)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "Parte del grupo de paquetes ya se ha compilado. (use %s para sobrescribirlo)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -507,22 +485,17 @@ msgstr "  -o, --nobuild    Únicamente descarga y extrae los archivos"
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <archivo>     Usa un intérprete de compilación alternativo (en lugar de "
-"«%s»)"
+msgstr "  -p <archivo>     Usa un intérprete de compilación alternativo (en lugar de «%s»)"
 
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps Quita las dependencias instaladas tras una compilación "
-"exitosa."
+msgstr "  -r, --rmdeps Quita las dependencias instaladas tras una compilación exitosa."
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr ""
-"  -R, --repackage  Vuelve a empaquetar el contenido del paquete sin "
-"recompilar"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
+msgstr "  -R, --repackage  Vuelve a empaquetar el contenido del paquete sin recompilar"
 
 #: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
@@ -531,9 +504,7 @@ msgstr "  -s, --syncdeps   Instala las dependencias que faltan para %s"
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source     Genera un archivo comprimido «tar» sólo de fuentes,\n"
-"                   excluyendo las fuentes descargadas"
+msgstr "  -S, --source     Genera un archivo comprimido «tar» sólo de fuentes,\n                   excluyendo las fuentes descargadas"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -543,9 +514,7 @@ msgstr "  -V, --version    Muestra información de la versión y sale"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      Genera un archivo comprimido «tar» de fuentes,\n"
-"                   incluyendo las fuentes descargadas"
+msgstr "  --allsource      Genera un archivo comprimido «tar» de fuentes,\n                   incluyendo las fuentes descargadas"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -553,9 +522,7 @@ msgstr "  --check          Ejecuta la función %s en el %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <ruta>  Usa un archivo de configuración alternativo (en vez de "
-"«%s»)"
+msgstr "  --config <ruta>  Usa un archivo de configuración alternativo (en vez de «%s»)"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -563,10 +530,9 @@ msgstr "  --holdver        No actualiza las fuentes VCS"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <clave>    Especifica la clave a usar para firmar %s en lugar de la "
-"clave por omisión"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <clave>    Especifica la clave a usar para firmar %s en lugar de la clave por omisión"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -591,8 +557,7 @@ msgstr "  --packagelist    Lista únicamente paquetes reproducibles, sin PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
-msgstr ""
-"  --printsrcinfo   Muestra en pantalla el archivo SRCINFO generado y sale"
+msgstr "  --printsrcinfo   Muestra en pantalla el archivo SRCINFO generado y sale"
 
 #: scripts/makepkg.sh.in:1730
 msgid "  --sign           Sign the resulting package with %s"
@@ -605,8 +570,7 @@ msgstr "  --skipchecksums  No verifica las sumas de control de las fuentes"
 #: scripts/makepkg.sh.in:1732
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
-msgstr ""
-"  --skipinteg      No ejecuta ningún control de integridad sobre las fuentes"
+msgstr "  --skipinteg      No ejecuta ningún control de integridad sobre las fuentes"
 
 #: scripts/makepkg.sh.in:1733
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
@@ -616,9 +580,7 @@ msgstr "  --skippgpcheck   No verifica las fuentes con las firmas PGP"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource   Descarga el código fuente (si es necesario) y comprueba "
-"su integridad"
+msgstr "  --verifysource   Descarga el código fuente (si es necesario) y comprueba su integridad"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -631,19 +593,16 @@ msgstr "  --asdeps         Instala paquetes como dependencias (no explícitas)"
 #: scripts/makepkg.sh.in:1739
 msgid ""
 "  --needed         Do not reinstall the targets that are already up to date"
-msgstr ""
-"  --needed         No reinstala los objetivos que ya están actualizados"
+msgstr "  --needed         No reinstala los objetivos que ya están actualizados"
 
 #: scripts/makepkg.sh.in:1740
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr ""
-"  --noconfirm      No solicita confirmación alguna al resolver dependencias"
+msgstr "  --noconfirm      No solicita confirmación alguna al resolver dependencias"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"  --noprogressbar  No muestra la barra de progreso al descargar los archivos"
+msgstr "  --noprogressbar  No muestra la barra de progreso al descargar los archivos"
 
 #: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
@@ -651,16 +610,12 @@ msgstr "Si no se especifica %s, %s intentará utilizar «%s»"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Derechos de autor (c) 2006-2016 Equipo de desarrollo de pacman <pacman-"
-"dev@archlinux.org>\\nDerechos de autor (c) 2002-2006 Judit Vinet "
-"<jvinet@zeroflux.org>\\n\\nEsto es software libre; véase el código fuente "
-"para condiciones de copia.\\nNo se ofrece NINGUNA GARANTÍA sobre el "
-"programa, hasta lo permitido por las leyes aplicables.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Derechos de autor (c) 2006-2016 Equipo de desarrollo de pacman <pacman-dev@archlinux.org>\\nDerechos de autor (c) 2002-2006 Judit Vinet <jvinet@zeroflux.org>\\n\\nEsto es software libre; véase el código fuente para condiciones de copia.\\nNo se ofrece NINGUNA GARANTÍA sobre el programa, hasta lo permitido por las leyes aplicables.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -694,9 +649,7 @@ msgstr "No tiene permisos de escritura para guardar registros (logs) en %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Ejecutar %s como superusuario no está permitido ya que puede causar daños"
-"\\npermanentes y catastróficos a su sistema."
+msgstr "Ejecutar %s como superusuario no está permitido ya que puede causar daños\\npermanentes y catastróficos a su sistema."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -785,16 +738,12 @@ msgstr "emparejamiento clave/valor no válido\n"
 
 #: scripts/makepkg-template.pl.in:82
 msgid "invalid template line: can't find template name\n"
-msgstr ""
-"la línea «template» no es válida: no se pudo encontrar el nombre de la "
-"plantilla\n"
+msgstr "la línea «template» no es válida: no se pudo encontrar el nombre de la plantilla\n"
 
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr ""
-"se han utilizado caracteres no válidos en el nombre «%s». Permitido: [:"
-"alnum:]+_.@-\n"
+msgstr "se han utilizado caracteres no válidos en el nombre «%s». Permitido: [:alnum:]+_.@-\n"
 
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
@@ -827,32 +776,25 @@ msgstr "Opciones:\n"
 #: scripts/makepkg-template.pl.in:178
 #, perl-format
 msgid "  --input, -p <file>    Build script to read (default: %s)\n"
-msgstr ""
-"  --input, -p <archivo>    Intérprete de compilación (por omisión: %s)\n"
+msgstr "  --input, -p <archivo>    Intérprete de compilación (por omisión: %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
-msgstr ""
-"  --output, -o <archivo>   archivo de salida (por omisión: archivo de "
-"entrada)\n"
+msgstr "  --output, -o <archivo>   archivo de salida (por omisión: archivo de entrada)\n"
 
 #: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
-msgstr ""
-"  --newest, -n          actualiza las plantillas a la versión más reciente\n"
+msgstr "  --newest, -n          actualiza las plantillas a la versión más reciente\n"
 
 #: scripts/makepkg-template.pl.in:181
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                        (por omisión: utiliza la versión especificada en las "
-"etiquetas de las plantillas)\n"
+msgstr "                        (por omisión: utiliza la versión especificada en las etiquetas de las plantillas)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
-msgstr ""
-"  --template-dir <directorio>  directorio en el que buscar las plantillas\n"
+msgstr "  --template-dir <directorio>  directorio en el que buscar las plantillas\n"
 
 #: scripts/makepkg-template.pl.in:183
 #, perl-format
@@ -872,12 +814,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Derechos de autor (c) 2013-2016 Equipo de desarrollo de pacman <pacman-"
-"dev@archlinux.org>.\n"
-"Esto es software libre; véase el código fuente para condiciones de copia.\n"
-"No se ofrece NINGUNA GARANTÍA sobre el programa, hasta lo permitido por las "
-"leyes aplicables.\n"
+msgstr "Derechos de autor (c) 2013-2016 Equipo de desarrollo de pacman <pacman-dev@archlinux.org>.\nEsto es software libre; véase el código fuente para condiciones de copia.\nNo se ofrece NINGUNA GARANTÍA sobre el programa, hasta lo permitido por las leyes aplicables.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -889,9 +826,7 @@ msgstr "opciones:"
 
 #: scripts/pacman-db-upgrade.sh.in:43
 msgid "  -b, --dbpath <path>  set an alternate database location"
-msgstr ""
-"  -b, --dbpath <ruta>  establece una ubicación de la base de datos "
-"alternativa"
+msgstr "  -b, --dbpath <ruta>  establece una ubicación de la base de datos alternativa"
 
 #: scripts/pacman-db-upgrade.sh.in:44
 msgid "  -h, --help           show this help message and exit"
@@ -907,8 +842,7 @@ msgstr "  -V, --version       muestra información de la versión y sale"
 
 #: scripts/pacman-db-upgrade.sh.in:47
 msgid "  --config <path>      set an alternate configuration file"
-msgstr ""
-"  --config <ruta>      establece un archivo de configuración alternativo"
+msgstr "  --config <ruta>      establece un archivo de configuración alternativo"
 
 #: scripts/pacman-db-upgrade.sh.in:48
 msgid "  --nocolor            disable colorized output messages"
@@ -916,14 +850,10 @@ msgstr "  --nocolor            desactiva los mensajes de salida coloreados"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Derechos de autor (c) 2010-2016 Equipo de desarrollo de pacman <pacman-"
-"dev@archlinux.org>.\\nEsto es software libre; véase el código fuente para "
-"condiciones de copia.\\nNo se ofrece NINGUNA GARANTÍA sobre el programa, "
-"hasta lo permitido por las leyes aplicables.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Derechos de autor (c) 2010-2016 Equipo de desarrollo de pacman <pacman-dev@archlinux.org>.\\nEsto es software libre; véase el código fuente para condiciones de copia.\\nNo se ofrece NINGUNA GARANTÍA sobre el programa, hasta lo permitido por las leyes aplicables.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -940,9 +870,7 @@ msgstr "Debe tener los permisos adecuados para actualizar la base de datos."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Se encontró el archivo de bloqueo de pacman. No se puede ejecutar mientras "
-"pacman esté funcionando."
+msgstr "Se encontró el archivo de bloqueo de pacman. No se puede ejecutar mientras pacman esté funcionando."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -958,9 +886,7 @@ msgstr "Formato de base de datos previo a 4.2 encontrado, actualizando…"
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"el enlace simbólico «%s» apunta fuera de la raíz de pacman, es necesario una "
-"reparación manual"
+msgstr "el enlace simbólico «%s» apunta fuera de la raíz de pacman, es necesario una reparación manual"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -976,9 +902,7 @@ msgstr "Operaciones:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add                  Añade las claves especificadas (vacío para la "
-"entrada estándar)"
+msgstr "  -a, --add                  Añade las claves especificadas (vacío para la entrada estándar)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
@@ -986,66 +910,48 @@ msgstr "  -d, --delete Quita los identificadores de claves especificados"
 
 #: scripts/pacman-key.sh.in:65
 msgid "  -e, --export              Export the specified or all keyids"
-msgstr ""
-"  -e, --export               Exporta todos los identificadores de claves o "
-"los especificados"
+msgstr "  -e, --export               Exporta todos los identificadores de claves o los especificados"
 
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger               Lista las huellas de todos los identificadores "
-"de claves o los especificados"
+msgstr "  -f, --finger               Lista las huellas de todos los identificadores de claves o los especificados"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
-msgstr ""
-"  -l, --list-keys            Lista todas las claves o las especificadas"
+msgstr "  -l, --list-keys            Lista todas las claves o las especificadas"
 
 #: scripts/pacman-key.sh.in:68
 msgid "  -r, --recv-keys           Fetch the specified keyids"
-msgstr ""
-"  -r, --recv-keys            Recupera los identificadores de las claves "
-"especificadas"
+msgstr "  -r, --recv-keys            Recupera los identificadores de las claves especificadas"
 
 #: scripts/pacman-key.sh.in:69
 msgid "  -u, --updatedb            Update the trustdb of pacman"
-msgstr ""
-"  -u, --updatedb             Actualiza la base de datos de confianza de "
-"pacman"
+msgstr "  -u, --updatedb             Actualiza la base de datos de confianza de pacman"
 
 #: scripts/pacman-key.sh.in:70
 msgid ""
 "  -v, --verify              Verify the file(s) specified by the signature(s)"
-msgstr ""
-"  -v, --verify               Verifica el archivo(s) especificado por la "
-"firma(s)"
+msgstr "  -v, --verify               Verifica el archivo(s) especificado por la firma(s)"
 
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key                 Muestra un menú para la administración de las "
-"claves en base a los identificadores de claves"
+msgstr "  --edit-key                 Muestra un menú para la administración de las claves en base a los identificadores de claves"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
-msgstr ""
-"  --import                   Importa pubring.gpg desde el directorio(s)"
+msgstr "  --import                   Importa pubring.gpg desde el directorio(s)"
 
 #: scripts/pacman-key.sh.in:73
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb           Importa los valores de los propietarios de "
-"confianza desde trustdb.gpg al directorio(s)"
+msgstr "  --import-trustdb           Importa los valores de los propietarios de confianza desde trustdb.gpg al directorio(s)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                     Asegurar que el depósito de claves esté "
-"correctamente inicializado"
+msgstr "  --init                     Asegurar que el depósito de claves esté correctamente inicializado"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
@@ -1053,46 +959,34 @@ msgstr "  --list-sigs                Lista las claves y sus firmas"
 
 #: scripts/pacman-key.sh.in:76
 msgid "  --lsign-key               Locally sign the specified keyid"
-msgstr ""
-"  --lsign-key                Firma localmente el identificador de clave "
-"especificado"
+msgstr "  --lsign-key                Firma localmente el identificador de clave especificado"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                 Recarga las claves por omisión de los depósitos "
-"(seleccionados)\\n en «%s»"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                 Recarga las claves por omisión de los depósitos (seleccionados)\\n en «%s»"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys             Actualiza todas las claves (o las "
-"especificadas) desde un servidor de claves"
+msgstr "  --refresh-keys             Actualiza todas las claves (o las especificadas) desde un servidor de claves"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <archivo>         Usa un archivo de configuración alternativo\n"
-"                             (en lugar de «%s»)"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <archivo>         Usa un archivo de configuración alternativo\n                             (en lugar de «%s»)"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <directorio>      Configura un directorio alternativo para GnuPG\n"
-"                             (en lugar de «%s»)"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <directorio>      Configura un directorio alternativo para GnuPG\n                             (en lugar de «%s»)"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <dirección>    Especifica un servidor de claves para utilizar "
-"cuando sea necesario"
+msgstr "  --keyserver <dirección>    Especifica un servidor de claves para utilizar cuando sea necesario"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1208,14 +1102,11 @@ msgstr "%s no pudo ser firmada localmente."
 
 #: scripts/pacman-key.sh.in:469
 msgid "Remote key not fetched correctly from keyserver."
-msgstr ""
-"La clave remota no se pudo obtener correctamente desde el servidor de claves."
+msgstr "La clave remota no se pudo obtener correctamente desde el servidor de claves."
 
 #: scripts/pacman-key.sh.in:477
 msgid "A specified local key could not be updated from a keyserver."
-msgstr ""
-"La clave local especificada no se pudo actualizar desde un servidor de "
-"claves."
+msgstr "La clave local especificada no se pudo actualizar desde un servidor de claves."
 
 #: scripts/pacman-key.sh.in:487
 msgid "The signature identified by %s could not be verified."
@@ -1231,9 +1122,7 @@ msgstr "No se pudo actualizar la base de datos de claves de confianza."
 
 #: scripts/pacman-key.sh.in:559
 msgid "Cannot find the %s binary required for all %s operations."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para todas las operaciones de "
-"%s."
+msgstr "No se pudo encontrar el binario %s requerido para todas las operaciones de %s."
 
 #: scripts/pacman-key.sh.in:564
 msgid "%s needs to be run as root for this operation."
@@ -1267,30 +1156,21 @@ msgstr "Uso: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize es un pequeño programa que debería aumentar el rendimiento"
-"\\nde pacman cuando lea/escriba en su base de datos.\\n\\n"
+msgstr "pacman-optimize es un pequeño programa que debería aumentar el rendimiento\\nde pacman cuando lea/escriba en su base de datos.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Debido a que pacman usa muchos archivos pequeños para seguir el rastro de "
-"los paquetes,\\nhay una tendencia a que estos archivos se fragmenten con el "
-"paso del tiempo.\\nEste intérprete procurará reubicar estos pequeños "
-"archivos en un espacio\\ncontinuo del disco duro. El resultado será que el "
-"disco duro debería ser capaz de leerlos más rápidos, ya que los cabezales"
-"\\nno tendrán que moverse tanto.\\n"
+msgstr "Debido a que pacman usa muchos archivos pequeños para seguir el rastro de los paquetes,\\nhay una tendencia a que estos archivos se fragmenten con el paso del tiempo.\\nEste intérprete procurará reubicar estos pequeños archivos en un espacio\\ncontinuo del disco duro. El resultado será que el disco duro debería ser capaz de leerlos más rápidos, ya que los cabezales\\nno tendrán que moverse tanto.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para verificar la integridad."
+msgstr "No se pudo encontrar el binario %s requerido para verificar la integridad."
 
 #: scripts/pacman-optimize.sh.in:109
 msgid "You must have correct permissions to optimize the database."
@@ -1298,8 +1178,7 @@ msgstr "Debe tener los permisos adecuados para optimizar la base de datos."
 
 #: scripts/pacman-optimize.sh.in:125
 msgid "Cannot create temporary directory for database building."
-msgstr ""
-"No se pudo crear el directorio temporal para compilar la base de datos."
+msgstr "No se pudo crear el directorio temporal para compilar la base de datos."
 
 #: scripts/pacman-optimize.sh.in:128
 msgid "MD5sum'ing the old database..."
@@ -1331,18 +1210,16 @@ msgstr "Comprobando la integridad…"
 
 #: scripts/pacman-optimize.sh.in:162
 msgid "Integrity check FAILED, reverting to old database."
-msgstr ""
-"HA FALLADO el control de integridad, restaurando la base de datos antigua."
+msgstr "HA FALLADO el control de integridad, restaurando la base de datos antigua."
 
 #: scripts/pacman-optimize.sh.in:166
 msgid "Rotating database into place..."
 msgstr "Rotando la base de datos de lugar…"
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"La sustitución de la nueva base de datos ha fallado. Compruebe los "
-"directorios %s, %s y %s. "
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "La sustitución de la nueva base de datos ha fallado. Compruebe los directorios %s, %s y %s. "
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1356,10 +1233,7 @@ msgstr "Uso: pkgdelta [opciones] <paquete1> <paquete2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta creará un archivo de diferencial entre los dos paquetes.\\nEste "
-"archivo de diferencial podrá ser añadido después a una base de datos usando "
-"repo-add.\\n"
+msgstr "pkgdelta creará un archivo de diferencial entre los dos paquetes.\\nEste archivo de diferencial podrá ser añadido después a una base de datos usando repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1372,8 +1246,7 @@ msgstr "Opciones:\\n"
 
 #: scripts/pkgdelta.sh.in:60 scripts/repo-add.sh.in:79
 msgid "  -q, --quiet       minimize output\\n"
-msgstr ""
-"  -q, --quiet       reduce al mínimo la cantidad de información de salida\\n"
+msgstr "  -q, --quiet       reduce al mínimo la cantidad de información de salida\\n"
 
 #: scripts/pkgdelta.sh.in:61
 msgid "  --nocolor         remove color from output\\n"
@@ -1381,28 +1254,20 @@ msgstr "--nocolor quita el color de los mensajes de salida\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size    tamaño mínimo del paquete a partir del cual se crearán "
-"los diferenciales (deltas)\\n"
+msgstr "  --min-pkg-size    tamaño mínimo del paquete a partir del cual se crearán los diferenciales (deltas)\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  porcentaje del paquete nuevo a partir del cual se "
-"descartará la creación del diferencial (delta)\\n"
+msgstr "  --max-delta-size  porcentaje del paquete nuevo a partir del cual se descartará la creación del diferencial (delta)\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Derechos de autor (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nEsto "
-"es software libre; véase el código fuente para condiciones de copia.\\nNo se "
-"ofrece NINGUNA GARANTÍA sobre el programa, hasta lo permitido por las leyes "
-"aplicables.\\n"
+msgstr "Derechos de autor (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nEsto es software libre; véase el código fuente para condiciones de copia.\\nNo se ofrece NINGUNA GARANTÍA sobre el programa, hasta lo permitido por las leyes aplicables.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1410,8 +1275,7 @@ msgstr "El archivo del paquete «%s» no es válido."
 
 #: scripts/pkgdelta.sh.in:120
 msgid "Skipping delta creation for small package: %s - size %s"
-msgstr ""
-"Omitiendo la creación del diferencial para un paquete pequeño: %s - tamaño %s"
+msgstr "Omitiendo la creación del diferencial para un paquete pequeño: %s - tamaño %s"
 
 #: scripts/pkgdelta.sh.in:125
 msgid "The package names don't match : '%s' and '%s'"
@@ -1451,52 +1315,40 @@ msgstr "¡No se pudo encontrar el binario xdelta3! ¿xdelta3 está instalado?"
 
 #: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr ""
-"Uso: repo-add [opciones] <ruta-a-la-base-de-datos> <paquete|delta> …\\n"
+msgstr "Uso: repo-add [opciones] <ruta-a-la-base-de-datos> <paquete|delta> …\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add actualizará la base de datos de paquetes leyendo desde un paquete."
-"\\nPueden añadirse varios paquetes especificándolo en la línea de órdenes.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add actualizará la base de datos de paquetes leyendo desde un paquete.\\nPueden añadirse varios paquetes especificándolo en la línea de órdenes.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta       genera y añade un diferencial para la actualización del "
-"paquete\\n"
+msgstr "  -d, --delta       genera y añade un diferencial para la actualización del paquete\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr "  -n, --new         sólo añade paquetes nuevos a la base de datos\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"-R, --remove quita el paquete obsoleto del disco tras actualizar la base de "
-"datos\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "-R, --remove quita el paquete obsoleto del disco tras actualizar la base de datos\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Uso: repo-remove [opciones] <ruta-de-la-base-de-datos> <nombredelpaquete|"
-"delta> …\\n"
+msgstr "Uso: repo-remove [opciones] <ruta-de-la-base-de-datos> <nombredelpaquete|delta> …\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove actualiza una base de datos de paquetes al quitar el nombre del "
-"paquete\\nespecificado en la linea de órdenes de la base de datos del "
-"repositorio en cuestión. Es posible\\nquitar varios paquetes especificándolo "
-"en la línea de órdenes.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove actualiza una base de datos de paquetes al quitar el nombre del paquete\\nespecificado en la linea de órdenes de la base de datos del repositorio en cuestión. Es posible\\nquitar varios paquetes especificándolo en la línea de órdenes.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1508,33 +1360,25 @@ msgstr "      --nocolor     desactiva los colores de los mensajes de salida\\n"
 
 #: scripts/repo-add.sh.in:80
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
-msgstr ""
-"  -s, --sign        firma la base de datos con GnuPG tras la actualización\\n"
+msgstr "  -s, --sign        firma la base de datos con GnuPG tras la actualización\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <clave> usa la clave especificada para firmar la base de datos\\n"
+msgstr "  -k, --key <clave> usa la clave especificada para firmar la base de datos\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
-"  -v, --verify      verifica la firma de la base de datos antes de actualizar"
-"\\n"
+msgstr "  -v, --verify      verifica la firma de la base de datos antes de actualizar\\n"
 
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nVéase %s(8) para obtener mas detalles y descripciones de las opciones "
-"disponibles.\\n"
+msgstr "\\nVéase %s(8) para obtener mas detalles y descripciones de las opciones disponibles.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Ejemplo:  repo-add /ruta/hasta/repo.db.tar.gz pacman-3.5.0-1-i686.pkg.tar.gz"
-"\\n"
+msgstr "Ejemplo:  repo-add /ruta/hasta/repo.db.tar.gz pacman-3.5.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1542,14 +1386,10 @@ msgstr "Ejemplo:  repo-remove /ruta/hasta/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Derechos de autor (c) 2006-2016 Equipo de desarrollo de pacman <pacman-"
-"dev@archlinux.org>\\n\\nEsto es software libre; véase el código fuente para "
-"condiciones de copia.\\nNo se ofrece NINGUNA GARANTÍA sobre el programa, "
-"hasta lo permitido por las leyes aplicables.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Derechos de autor (c) 2006-2016 Equipo de desarrollo de pacman <pacman-dev@archlinux.org>\\n\\nEsto es software libre; véase el código fuente para condiciones de copia.\\nNo se ofrece NINGUNA GARANTÍA sobre el programa, hasta lo permitido por las leyes aplicables.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1645,8 +1485,7 @@ msgstr "Detenido por el proceso %s"
 
 #: scripts/repo-add.sh.in:536
 msgid "Repository file '%s' is not a proper pacman database."
-msgstr ""
-"El archivo del repositorio «%s» no es una base de datos de pacman válida."
+msgstr "El archivo del repositorio «%s» no es una base de datos de pacman válida."
 
 #: scripts/repo-add.sh.in:541
 msgid "Extracting database to a temporary location..."
@@ -1702,8 +1541,7 @@ msgstr "El nombre de la orden «%s» especificado no es válido"
 
 #: scripts/repo-add.sh.in:734
 msgid "Cannot create temp directory for database building."
-msgstr ""
-"No se puede crear el directorio temporal para compilar la base de datos."
+msgstr "No se puede crear el directorio temporal para compilar la base de datos."
 
 #: scripts/repo-add.sh.in:812
 msgid "Creating updated database file '%s'"
@@ -1842,31 +1680,30 @@ msgstr "Hubo fallos durante el sondeo de %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Referencia desconocida: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Creando copia de trabajo de %s del repositorio %s…"
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
-msgstr ""
-"Hubo fallos durante la actualización de la copia de trabajo de %s del "
-"repositorio %s"
+msgstr "Hubo fallos durante la actualización de la copia de trabajo de %s del repositorio %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:100
 #: scripts/libmakepkg/source/git.sh.in:95
 #: scripts/libmakepkg/source/git.sh.in:120
 #: scripts/libmakepkg/source/hg.sh.in:98
 msgid "Failure while creating working copy of %s %s repo"
-msgstr ""
-"Hubo fallos durante la creación de la copia de trabajo de %s del repositorio "
-"%s"
+msgstr "Hubo fallos durante la creación de la copia de trabajo de %s del repositorio %s"
 
 #: scripts/libmakepkg/source/file.sh.in:36
 #: scripts/libmakepkg/source/local.sh.in:36
@@ -1889,12 +1726,14 @@ msgstr "Extrayendo %s con %s"
 msgid "Failed to extract %s"
 msgstr "Hubo fallos al extraer %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Clonando %s del repositorio %s…"
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Hubo fallos durante la descarga de %s del repositorio %s"
@@ -1903,21 +1742,21 @@ msgstr "Hubo fallos durante la descarga de %s del repositorio %s"
 msgid "%s is not a clone of %s"
 msgstr "%s no es un clon de %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Actualizando %s del repositorio %s…"
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Hubo fallos durante la actualización de %s del repositorio %s"
 
 #: scripts/libmakepkg/source/local.sh.in:39
 msgid "%s was not found in the build directory and is not a URL."
-msgstr ""
-"%s no fue encontrado en el directorio de compilación, y no es una dirección "
-"URL."
+msgstr "%s no fue encontrado en el directorio de compilación, y no es una dirección URL."
 
 #: scripts/libmakepkg/tidy.sh.in:41
 msgid "Tidying install..."
@@ -1953,8 +1792,7 @@ msgstr "Quitando los archivos de bibliotecas estáticas…"
 
 #: scripts/libmakepkg/tidy/strip.sh.in:85
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr ""
-"Despojando los símbolos innecesarios de los binarios y de las bibliotecas…"
+msgstr "Despojando los símbolos innecesarios de los binarios y de las bibliotecas…"
 
 #: scripts/libmakepkg/tidy/upx.sh.in:35
 msgid "Compressing binaries with %s..."
diff --git a/scripts/po/es_419.po b/scripts/po/es_419.po
index a4020062..e679a445 100644
--- a/scripts/po/es_419.po
+++ b/scripts/po/es_419.po
@@ -1,8 +1,9 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# gabrieltandil <gabriel.tandil@gmail.com>, 2016
 # Jenn <jcmm986@gmail.com>, 2012
 # juantascon <juantascon@gmail.com>, 2011
 # Julio Nadal <ice.modding@gmail.com>, 2016
@@ -14,14 +15,13 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
-"PO-Revision-Date: 2016-01-24 04:12+0000\n"
-"Last-Translator: Julio Nadal <ice.modding@gmail.com>\n"
-"Language-Team: Spanish (Latin America) (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/es_419/)\n"
-"Language: es_419\n"
+"PO-Revision-Date: 2016-02-04 13:28+0000\n"
+"Last-Translator: gabrieltandil <gabriel.tandil@gmail.com>\n"
+"Language-Team: Spanish (Latin America) (http://www.transifex.com/toofishes/archlinux-pacman/language/es_419/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es_419\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -103,10 +103,9 @@ msgid "Generating checksums for source files..."
 msgstr "Generando las sumas de control para los archivos fuentes…"
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para generar las sumas de "
-"control de las fuentes."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "No se pudo encontrar el binario %s requerido para generar las sumas de control de las fuentes."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -131,7 +130,7 @@ msgstr "FALLÓ"
 
 #: scripts/makepkg.sh.in:478
 msgid "Validating %s files with %s..."
-msgstr ""
+msgstr "Validando %s archivos con %s…"
 
 #: scripts/makepkg.sh.in:485
 msgid "One or more files did not pass the validity check!"
@@ -139,13 +138,11 @@ msgstr "¡Uno o más archivos no superaron el control de validación!"
 
 #: scripts/makepkg.sh.in:489
 msgid "Integrity checks (%s) differ in size from the source array."
-msgstr ""
-"Los controles de integridad (%s) difieren en tamaño de los especificados en "
-"la fuente."
+msgstr "Los controles de integridad (%s) difieren en tamaño de los especificados en la fuente."
 
 #: scripts/makepkg.sh.in:531
 msgid "Integrity checks are missing for: %s"
-msgstr ""
+msgstr "Faltan las comprobaciones de integridad para: %s"
 
 #: scripts/makepkg.sh.in:598
 msgid "Verifying source file signatures with %s..."
@@ -202,9 +199,7 @@ msgstr "¡Una o más firmas PGP no pudieron ser verificadas!"
 
 #: scripts/makepkg.sh.in:708
 msgid "Warnings have occurred while verifying the signatures."
-msgstr ""
-"Se han producido avisos de problemas durante las verificaciones de las "
-"firmas."
+msgstr "Se han producido avisos de problemas durante las verificaciones de las firmas."
 
 #: scripts/makepkg.sh.in:709
 msgid "Please make sure you really trust them."
@@ -325,8 +320,7 @@ msgstr "Hubo fallos al crear el paquete fuente."
 
 #: scripts/makepkg.sh.in:1389
 msgid "Failed to create symlink to source package file."
-msgstr ""
-"Hubo fallos al crear el enlace simbólico al archivo del paquete fuente."
+msgstr "Hubo fallos al crear el enlace simbólico al archivo del paquete fuente."
 
 #: scripts/makepkg.sh.in:1401
 msgid "Installing package %s with %s..."
@@ -346,8 +340,7 @@ msgstr "Protocolo de descarga desconocido: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"No se pudo encontrar el binario requerido %s para verificar las fuentes CVS."
+msgstr "No se pudo encontrar el binario requerido %s para verificar las fuentes CVS."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
@@ -355,15 +348,11 @@ msgstr "No se pudo encontrar el paquete %s para manejar las fuentes %s."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para las operaciones de "
-"dependencia"
+msgstr "No se pudo encontrar el binario %s requerido para las operaciones de dependencia"
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"No se pudo encontrar el binario %s. Se usará %s para obtener privilegios de "
-"administrador."
+msgstr "No se pudo encontrar el binario %s. Se usará %s para obtener privilegios de administrador."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -375,45 +364,36 @@ msgstr "No se pudo encontrar el binario %s requerido para firmar paquetes."
 
 #: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para verificar las fuentes."
+msgstr "No se pudo encontrar el binario %s requerido para verificar las fuentes."
 
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
+msgstr "No se pudo encontrar el binario %s requerido para verificar las sumas de control de las fuentes."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para comprimir los binarios."
+msgstr "No se pudo encontrar el binario %s requerido para comprimir los binarios."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
-msgstr ""
+msgstr "No se pudo encontrar el binario %s requerido para optimizar las imágenes PNG.."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para la compilación distribuida."
+msgstr "No se pudo encontrar el binario %s requerido para la compilación distribuida."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para el uso de la caché del "
-"compilador."
+msgstr "No se pudo encontrar el binario %s requerido para el uso de la caché del compilador."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para desmontar el archivo en "
-"cuestión."
+msgstr "No se pudo encontrar el binario %s requerido para desmontar el archivo en cuestión."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para comprimir las páginas man "
-"e info."
+msgstr "No se pudo encontrar el binario %s requerido para comprimir las páginas man e info."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -433,9 +413,9 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "El grupo de paquetes ya se ha compilado. (use %s para sobrescribirlo)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Parte del grupo de paquetes ya se ha compilado. (use %s para sobrescribirlo)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "Parte del grupo de paquetes ya se ha compilado. (use %s para sobrescribirlo)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -459,8 +439,7 @@ msgstr "  -c, --clean      Limpia los archivos tras la compilación"
 
 #: scripts/makepkg.sh.in:1703
 msgid "  -C, --cleanbuild Remove %s dir before building the package"
-msgstr ""
-"  -C, --cleanbuild Elimina el directorio %s antes de compilar el paquete"
+msgstr "  -C, --cleanbuild Elimina el directorio %s antes de compilar el paquete"
 
 #: scripts/makepkg.sh.in:1704
 msgid "  -d, --nodeps     Skip all dependency checks"
@@ -500,22 +479,17 @@ msgstr "  -o, --nobuild Únicamente descarga y extrae los archivos"
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <archivo>     Usa un intérprete de compilación alternativo (en lugar de "
-"«%s»)"
+msgstr "  -p <archivo>     Usa un intérprete de compilación alternativo (en lugar de «%s»)"
 
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Elimina las dependencias instaladas tras una compilación "
-"exitosa."
+msgstr "  -r, --rmdeps     Elimina las dependencias instaladas tras una compilación exitosa."
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr ""
-"  -R, --repackage  Vuelve a empaquetar el contenido del paquete sin "
-"recompilar"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
+msgstr "  -R, --repackage  Vuelve a empaquetar el contenido del paquete sin recompilar"
 
 #: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
@@ -524,9 +498,7 @@ msgstr "  -s, --syncdeps   Instala las dependencias que faltan para %s"
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source Genera un archivo comprimido de fuentes únicamente, "
-"excluyendo las fuentes descargadas"
+msgstr "  -S, --source Genera un archivo comprimido de fuentes únicamente, excluyendo las fuentes descargadas"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -536,9 +508,7 @@ msgstr "  -V, --version Muestra información de la versión y sale"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource Genera un archivo comprimido de fuentes únicamente, incluyendo "
-"las fuentes descargadas"
+msgstr "  --allsource Genera un archivo comprimido de fuentes únicamente, incluyendo las fuentes descargadas"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -546,9 +516,7 @@ msgstr "  --check          Ejecuta la función %s en el %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <archivo>  Usa un archivo de configuración alternativo (en vez de "
-"«%s»)"
+msgstr "  --config <archivo>  Usa un archivo de configuración alternativo (en vez de «%s»)"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -556,10 +524,9 @@ msgstr "  --holdver          No actualiza las fuentes VCS"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <clave>   Especifica la clave a usar para firmar %s en lugar de la "
-"clave por defecto"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <clave>   Especifica la clave a usar para firmar %s en lugar de la clave por defecto"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -580,7 +547,7 @@ msgstr "  --nosign         No crea una firma para el paquete"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
+msgstr "--packagelist Solo lista los paquetes que se producirían, sin pkgacct"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -597,8 +564,7 @@ msgstr "  --skipchecksums  No verifica las sumas de control de las fuentes"
 #: scripts/makepkg.sh.in:1732
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
-msgstr ""
-"  --skipinteg      No ejecuta ningún control de integridad sobre las fuentes"
+msgstr "  --skipinteg      No ejecuta ningún control de integridad sobre las fuentes"
 
 #: scripts/makepkg.sh.in:1733
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
@@ -608,9 +574,7 @@ msgstr "  --skippgpcheck   No verifica las fuentes con las firmas PGP"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource    Descarga el código fuente (si es necesario) y realiza "
-"las comprobaciones de integridad"
+msgstr "  --verifysource    Descarga el código fuente (si es necesario) y realiza las comprobaciones de integridad"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -628,14 +592,11 @@ msgstr "--needed          No reinstala los objetivos que ya están actualizados"
 #: scripts/makepkg.sh.in:1740
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr ""
-"      --noconfirm      No solicita confirmación alguna cuando se encuentra "
-"resolviendo dependencias"
+msgstr "      --noconfirm      No solicita confirmación alguna cuando se encuentra resolviendo dependencias"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"  --noprogressbar  No muestra la barra de progreso al descargar los archivos"
+msgstr "  --noprogressbar  No muestra la barra de progreso al descargar los archivos"
 
 #: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
@@ -643,10 +604,11 @@ msgstr "Si %s no es especificado, %s buscará «%s»"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
@@ -681,9 +643,7 @@ msgstr "No tiene permisos de escritura para guardar registros (logs) en %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Ejecutar %s como administrador no está permitido ya que puede causar daños"
-"\\npermanentes y catastróficos a su sistema."
+msgstr "Ejecutar %s como administrador no está permitido ya que puede causar daños\\npermanentes y catastróficos a su sistema."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -772,26 +732,22 @@ msgstr "el par clave/valor no es válido\n"
 
 #: scripts/makepkg-template.pl.in:82
 msgid "invalid template line: can't find template name\n"
-msgstr ""
-"la línea plantilla no es válida: no se pudo encontrar el nombre de la "
-"plantilla\n"
+msgstr "la línea plantilla no es válida: no se pudo encontrar el nombre de la plantilla\n"
 
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr ""
-"se han utilizado caracteres no válidos en el nombre «%s». Permitido: [:"
-"alnum:]+_.@-\n"
+msgstr "se han utilizado caracteres no válidos en el nombre «%s». Permitido: [:alnum:]+_.@-\n"
 
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
 msgid "Couldn't detect version for template '%s'\n"
-msgstr ""
+msgstr "No se pudo detectar la versión de la plantilla «%s»\n"
 
 #: scripts/makepkg-template.pl.in:125
 #, perl-format
 msgid "Failed to find template file matching '%s'\n"
-msgstr ""
+msgstr "Fallo al encontrar el archivo de plantilla que coincida con \"%s\"\n"
 
 #: scripts/makepkg-template.pl.in:136
 #, perl-format
@@ -818,27 +774,21 @@ msgstr "  --input, -p <archivo>    Script de compilación (por defecto: %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
-msgstr ""
-"  --output, -o <archivo>   archivo de salida (por defecto: archivo de "
-"entrada)\n"
+msgstr "  --output, -o <archivo>   archivo de salida (por defecto: archivo de entrada)\n"
 
 #: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
-msgstr ""
-"  --newest, -n          actualiza las plantillas a la versión más reciente\n"
+msgstr "  --newest, -n          actualiza las plantillas a la versión más reciente\n"
 
 #: scripts/makepkg-template.pl.in:181
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                        (por omisión: utiliza la versión especificada en las "
-"etiquetas de las plantillas)\n"
+msgstr "                        (por omisión: utiliza la versión especificada en las etiquetas de las plantillas)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
-msgstr ""
-"  --template-dir <directorio>  directorio en el que buscar las plantillas\n"
+msgstr "  --template-dir <directorio>  directorio en el que buscar las plantillas\n"
 
 #: scripts/makepkg-template.pl.in:183
 #, perl-format
@@ -870,9 +820,7 @@ msgstr "opciones:"
 
 #: scripts/pacman-db-upgrade.sh.in:43
 msgid "  -b, --dbpath <path>  set an alternate database location"
-msgstr ""
-"  -b, --dbpath <ruta>  establece una ubicación de la base de datos "
-"alternativa"
+msgstr "  -b, --dbpath <ruta>  establece una ubicación de la base de datos alternativa"
 
 #: scripts/pacman-db-upgrade.sh.in:44
 msgid "  -h, --help           show this help message and exit"
@@ -888,8 +836,7 @@ msgstr "  -V, --version       muestra información de la versión y sale"
 
 #: scripts/pacman-db-upgrade.sh.in:47
 msgid "  --config <path>      set an alternate configuration file"
-msgstr ""
-"  --config <ruta>      establece un archivo de configuración alternativo"
+msgstr "  --config <ruta>      establece un archivo de configuración alternativo"
 
 #: scripts/pacman-db-upgrade.sh.in:48
 msgid "  --nocolor            disable colorized output messages"
@@ -897,9 +844,9 @@ msgstr "  --nocolor            desactiva los mensajes de salida coloreados"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
@@ -917,9 +864,7 @@ msgstr "Debe tener los permisos adecuados para actualizar la base de datos."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Se encontró el archivo de bloqueo de pacman. No se puede ejecutar mientras "
-"pacman esté funcionando."
+msgstr "Se encontró el archivo de bloqueo de pacman. No se puede ejecutar mientras pacman esté funcionando."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -935,9 +880,7 @@ msgstr "Formato de base de datos previo a 4.2 encontrado, actualizando…"
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"el enlace simbólico «%s» apunta fuera de la raíz de pacman, es necesario una "
-"reparación manual"
+msgstr "el enlace simbólico «%s» apunta fuera de la raíz de pacman, es necesario una reparación manual"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -953,71 +896,52 @@ msgstr "Operaciones:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add                  Añade las claves especificadas (vacío para la "
-"entrada)"
+msgstr "  -a, --add                  Añade las claves especificadas (vacío para la entrada)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
-msgstr ""
-"  -d, --delete                Elimina los identificadores de claves (keyids) "
-"especificados"
+msgstr "  -d, --delete                Elimina los identificadores de claves (keyids) especificados"
 
 #: scripts/pacman-key.sh.in:65
 msgid "  -e, --export              Export the specified or all keyids"
-msgstr ""
-"  -e, --export                Exporta todos los identificadores de claves o "
-"los especificados"
+msgstr "  -e, --export                Exporta todos los identificadores de claves o los especificados"
 
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger                Lista las huellas de todos los identificadores "
-"de claves o los especificados"
+msgstr "  -f, --finger                Lista las huellas de todos los identificadores de claves o los especificados"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
-msgstr ""
-"  -l, --list-keys            Lista todas las claves o las especificadas"
+msgstr "  -l, --list-keys            Lista todas las claves o las especificadas"
 
 #: scripts/pacman-key.sh.in:68
 msgid "  -r, --recv-keys           Fetch the specified keyids"
-msgstr ""
-"  -r, --recv-keys            Obtiene los identificadores de claves "
-"especificados"
+msgstr "  -r, --recv-keys            Obtiene los identificadores de claves especificados"
 
 #: scripts/pacman-key.sh.in:69
 msgid "  -u, --updatedb            Update the trustdb of pacman"
-msgstr ""
-"  -u, --updatedb            Actualiza la base de datos de confianza de pacman"
+msgstr "  -u, --updatedb            Actualiza la base de datos de confianza de pacman"
 
 #: scripts/pacman-key.sh.in:70
 msgid ""
 "  -v, --verify              Verify the file(s) specified by the signature(s)"
-msgstr ""
-"  -v, --verify               Verifica el archivo(s) especificado por la "
-"firma(s)"
+msgstr "  -v, --verify               Verifica el archivo(s) especificado por la firma(s)"
 
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key                 Muestra un menú para la administración de las "
-"claves en base a los identificadores de claves"
+msgstr "  --edit-key                 Muestra un menú para la administración de las claves en base a los identificadores de claves"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
-msgstr ""
-"  --import                    Importa pubring.gpg desde el directorio(s)"
+msgstr "  --import                    Importa pubring.gpg desde el directorio(s)"
 
 #: scripts/pacman-key.sh.in:73
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb            Importa los valores de los propietarios de "
-"confianza desde trustdb.gpg en el directorio(s)"
+msgstr "  --import-trustdb            Importa los valores de los propietarios de confianza desde trustdb.gpg en el directorio(s)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
@@ -1033,40 +957,30 @@ msgstr "  --lsign-key Firma localmente el identificador de clave especificado"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate Recarga las claves por defecto de los llaveros (dados)\\n en "
-"«%s»"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate Recarga las claves por defecto de los llaveros (dados)\\n en «%s»"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            Actualiza todas las claves o las especificadas "
-"desde un servidor de claves"
+msgstr "  --refresh-keys            Actualiza todas las claves o las especificadas desde un servidor de claves"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <archivo>        Usa un archivo de configuración alternativo"
-"\\n                            (en lugar de «%s»)"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <archivo>        Usa un archivo de configuración alternativo\\n                            (en lugar de «%s»)"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <directorio>            Configura un directorio alternativo para "
-"GnuPG\\n                            (en lugar de «%s»)"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <directorio>            Configura un directorio alternativo para GnuPG\\n                            (en lugar de «%s»)"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <dirección URL del servidor> Especifica un servidor de claves "
-"para utilizar cuando sea necesario"
+msgstr "  --keyserver <dirección URL del servidor> Especifica un servidor de claves para utilizar cuando sea necesario"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1182,14 +1096,11 @@ msgstr "%s no pudo ser firmada localmente."
 
 #: scripts/pacman-key.sh.in:469
 msgid "Remote key not fetched correctly from keyserver."
-msgstr ""
-"La clave remota no se pudo obtener correctamente desde el servidor de claves."
+msgstr "La clave remota no se pudo obtener correctamente desde el servidor de claves."
 
 #: scripts/pacman-key.sh.in:477
 msgid "A specified local key could not be updated from a keyserver."
-msgstr ""
-"La clave local especificada no se pudo actualizar desde un servidor de "
-"claves."
+msgstr "La clave local especificada no se pudo actualizar desde un servidor de claves."
 
 #: scripts/pacman-key.sh.in:487
 msgid "The signature identified by %s could not be verified."
@@ -1205,9 +1116,7 @@ msgstr "No se pudo actualizar la base de datos de claves de confianza."
 
 #: scripts/pacman-key.sh.in:559
 msgid "Cannot find the %s binary required for all %s operations."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para todas las operaciones de "
-"%s."
+msgstr "No se pudo encontrar el binario %s requerido para todas las operaciones de %s."
 
 #: scripts/pacman-key.sh.in:564
 msgid "%s needs to be run as root for this operation."
@@ -1241,30 +1150,21 @@ msgstr "Uso: %s [--nocolor] [raíz_de_bd_de_pacman]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize es un pequeño programa que debería aumentar el rendimiento"
-"\\nde pacman cuando lea/escriba en su base de datos.\\n\\n"
+msgstr "pacman-optimize es un pequeño programa que debería aumentar el rendimiento\\nde pacman cuando lea/escriba en su base de datos.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Debido a que pacman usa muchos archivos pequeños para seguir el rastro de "
-"los paquetes,\\nhay una tendencia a que estos archivos se fragmenten con el "
-"paso del tiempo.\\nEste intérprete procurará reubicar estos pequeños "
-"archivos en un espacio\\ncontinuo del disco duro. El resultado será que el "
-"disco duro debería ser capaz de leerlos más rápidos, ya que los cabezales"
-"\\nno tendrán que moverse tanto.\\n"
+msgstr "Debido a que pacman usa muchos archivos pequeños para seguir el rastro de los paquetes,\\nhay una tendencia a que estos archivos se fragmenten con el paso del tiempo.\\nEste intérprete procurará reubicar estos pequeños archivos en un espacio\\ncontinuo del disco duro. El resultado será que el disco duro debería ser capaz de leerlos más rápidos, ya que los cabezales\\nno tendrán que moverse tanto.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
-msgstr ""
-"No se pudo encontrar el binario %s requerido para verificar la integridad."
+msgstr "No se pudo encontrar el binario %s requerido para verificar la integridad."
 
 #: scripts/pacman-optimize.sh.in:109
 msgid "You must have correct permissions to optimize the database."
@@ -1272,8 +1172,7 @@ msgstr "Debe tener los permisos adecuados para optimizar la base de datos."
 
 #: scripts/pacman-optimize.sh.in:125
 msgid "Cannot create temporary directory for database building."
-msgstr ""
-"No se pudo crear el directorio temporal para compilar la base de datos."
+msgstr "No se pudo crear el directorio temporal para compilar la base de datos."
 
 #: scripts/pacman-optimize.sh.in:128
 msgid "MD5sum'ing the old database..."
@@ -1305,18 +1204,16 @@ msgstr "Comprobando la integridad…"
 
 #: scripts/pacman-optimize.sh.in:162
 msgid "Integrity check FAILED, reverting to old database."
-msgstr ""
-"HA FALLADO el control de integridad, volviéndose a la base de datos antigua."
+msgstr "HA FALLADO el control de integridad, volviéndose a la base de datos antigua."
 
 #: scripts/pacman-optimize.sh.in:166
 msgid "Rotating database into place..."
 msgstr "Rotando la base de datos en su ubicación…"
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"La sustitución de la nueva base de datos ha fallado. Compruebe los "
-"directorios %s, %s y %s. "
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "La sustitución de la nueva base de datos ha fallado. Compruebe los directorios %s, %s y %s. "
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1330,10 +1227,7 @@ msgstr "Uso: pkgdelta [opciones] <paquete1> <paquete2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta creará un archivo de diferencial entre los dos paquetes.\\nEste "
-"archivo de diferencial podrá ser añadido después a una base de datos usando "
-"repo-add.\\n"
+msgstr "pkgdelta creará un archivo de diferencial entre los dos paquetes.\\nEste archivo de diferencial podrá ser añadido después a una base de datos usando repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1354,28 +1248,20 @@ msgstr "  --nocolor quita el color de la salida\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size tamaño mínimo del paquete a partir del cual se crearán los "
-"diferenciales (deltas)\\n"
+msgstr "  --min-pkg-size tamaño mínimo del paquete a partir del cual se crearán los diferenciales (deltas)\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size porcentaje del paquete nuevo a partir del cual se "
-"descartará la creación del diferencial (delta)\\n"
+msgstr "  --max-delta-size porcentaje del paquete nuevo a partir del cual se descartará la creación del diferencial (delta)\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Derechos de autor (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nEsto "
-"es software libre; véase el código fuente para condiciones de copia.\\nNo se "
-"ofrece NINGUNA GARANTÍA sobre el programa, hasta lo permitido por las leyes "
-"aplicables.\\n"
+msgstr "Derechos de autor (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nEsto es software libre; véase el código fuente para condiciones de copia.\\nNo se ofrece NINGUNA GARANTÍA sobre el programa, hasta lo permitido por las leyes aplicables.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1383,8 +1269,7 @@ msgstr "El archivo del paquete «%s» no es válido."
 
 #: scripts/pkgdelta.sh.in:120
 msgid "Skipping delta creation for small package: %s - size %s"
-msgstr ""
-"Omitiendo la creación del diferencial para un paquete pequeño: %s - tamaño %s"
+msgstr "Omitiendo la creación del diferencial para un paquete pequeño: %s - tamaño %s"
 
 #: scripts/pkgdelta.sh.in:125
 msgid "The package names don't match : '%s' and '%s'"
@@ -1424,51 +1309,40 @@ msgstr "¡No se pudo encontrar el binario xdelta3! ¿xdelta3 está instalado?"
 
 #: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr ""
-"Uso: repo-add [opciones] <ruta-a-la-base-de-datos> <paquete|delta> …\\n"
+msgstr "Uso: repo-add [opciones] <ruta-a-la-base-de-datos> <paquete|delta> …\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add actualizará la base de datos de paquetes leyendo desde un paquete."
-"\\nPueden ser agregados varios paquetes especificándolo en la línea de "
-"órdenes.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add actualizará la base de datos de paquetes leyendo desde un paquete.\\nPueden ser agregados varios paquetes especificándolo en la línea de órdenes.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta       genera y añade un diferencial para la actualización del"
-"\\n                    paquete\\n"
+msgstr "  -d, --delta       genera y añade un diferencial para la actualización del\\n                    paquete\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr "-n, --new solamente agrega paquetes nuevos a la base de datos\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Uso: repo-remove [opciones] <ruta-de-la-base-de-datos> <nombredelpaquete|"
-"delta> …\\n"
+msgstr "Uso: repo-remove [opciones] <ruta-de-la-base-de-datos> <nombredelpaquete|delta> …\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove actualiza una base de datos de paquetes al eliminar el nombre "
-"del paquete\\nespecificado en la linea de órdenes de la base de datos del "
-"repositorio en cuestión. Es posible\\nquitar varios paquetes especificándolo "
-"en la línea de órdenes.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove actualiza una base de datos de paquetes al eliminar el nombre del paquete\\nespecificado en la linea de órdenes de la base de datos del repositorio en cuestión. Es posible\\nquitar varios paquetes especificándolo en la línea de órdenes.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1480,33 +1354,25 @@ msgstr "--nocolor desactiva los colores de la salida\\n"
 
 #: scripts/repo-add.sh.in:80
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
-msgstr ""
-"  -s, --sign        firma la base de datos con GnuPG tras la actualización\\n"
+msgstr "  -s, --sign        firma la base de datos con GnuPG tras la actualización\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <clave> usa la clave especificada para firmar la base de datos\\n"
+msgstr "  -k, --key <clave> usa la clave especificada para firmar la base de datos\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
-"  -v, --verify      verifica la firma de la base de datos antes de actualizar"
-"\\n"
+msgstr "  -v, --verify      verifica la firma de la base de datos antes de actualizar\\n"
 
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nVéase %s(8) para obtener mas detalles y descripciones de las opciones "
-"disponibles.\\n"
+msgstr "\\nVéase %s(8) para obtener mas detalles y descripciones de las opciones disponibles.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Ejemplo:  repo-add /ruta/hasta/repo.db.tar.gz pacman-3.5.0-1-i686.pkg.tar.gz"
-"\\n"
+msgstr "Ejemplo:  repo-add /ruta/hasta/repo.db.tar.gz pacman-3.5.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1514,9 +1380,9 @@ msgstr "Ejemplo:  repo-remove /ruta/hasta/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:146
@@ -1613,8 +1479,7 @@ msgstr "Detenido por el proceso %s"
 
 #: scripts/repo-add.sh.in:536
 msgid "Repository file '%s' is not a proper pacman database."
-msgstr ""
-"El archivo del repositorio «%s» no es una base de datos de pacman válida."
+msgstr "El archivo del repositorio «%s» no es una base de datos de pacman válida."
 
 #: scripts/repo-add.sh.in:541
 msgid "Extracting database to a temporary location..."
@@ -1670,8 +1535,7 @@ msgstr "El nombre de la orden «%s» especificado no es válido"
 
 #: scripts/repo-add.sh.in:734
 msgid "Cannot create temp directory for database building."
-msgstr ""
-"No se puede crear el directorio temporal para compilar la base de datos."
+msgstr "No se puede crear el directorio temporal para compilar la base de datos."
 
 #: scripts/repo-add.sh.in:812
 msgid "Creating updated database file '%s'"
@@ -1810,31 +1674,30 @@ msgstr "Hubo fallos durante el sondeo de %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Referencia desconocida: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Creando copia de trabajo de %s del repositorio %s…"
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
-msgstr ""
-"Hubo fallos durante la creación de la copia de trabajo de %s del repositorio "
-"%s"
+msgstr "Hubo fallos durante la creación de la copia de trabajo de %s del repositorio %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:100
 #: scripts/libmakepkg/source/git.sh.in:95
 #: scripts/libmakepkg/source/git.sh.in:120
 #: scripts/libmakepkg/source/hg.sh.in:98
 msgid "Failure while creating working copy of %s %s repo"
-msgstr ""
-"Hubo fallos durante la creación de la copia de trabajo de %s del repositorio "
-"%s"
+msgstr "Hubo fallos durante la creación de la copia de trabajo de %s del repositorio %s"
 
 #: scripts/libmakepkg/source/file.sh.in:36
 #: scripts/libmakepkg/source/local.sh.in:36
@@ -1857,12 +1720,14 @@ msgstr "Extrayendo %s con %s"
 msgid "Failed to extract %s"
 msgstr "Hubo fallos al extraer %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Clonando %s del repositorio %s…"
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Hubo fallos durante la descarga de %s del repositorio %s"
@@ -1871,21 +1736,21 @@ msgstr "Hubo fallos durante la descarga de %s del repositorio %s"
 msgid "%s is not a clone of %s"
 msgstr "%s no es un clon de %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Actualizando %s del repositorio %s…"
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Hubo fallos durante la actualización de %s del repositorio %s"
 
 #: scripts/libmakepkg/source/local.sh.in:39
 msgid "%s was not found in the build directory and is not a URL."
-msgstr ""
-"%s no fue encontrado en el directorio de compilación, y no es una dirección "
-"URL."
+msgstr "%s no fue encontrado en el directorio de compilación, y no es una dirección URL."
 
 #: scripts/libmakepkg/tidy.sh.in:41
 msgid "Tidying install..."
diff --git a/scripts/po/eu.po b/scripts/po/eu.po
index 409dad57..efcd5fed 100644
--- a/scripts/po/eu.po
+++ b/scripts/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2016-01-17 13:21+1000\n"
+"POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-24 18:49+0000\n"
 "Last-Translator: Osoitz <oelkoro@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/toofishes/archlinux-pacman/language/eu/)\n"
@@ -696,23 +696,23 @@ msgstr "Eraikuntza-orduko menpekotasunak egiaztatzen..."
 msgid "Could not resolve all dependencies."
 msgstr "Ezin izan dira menpekotasun guztiak ebatzi."
 
-#: scripts/makepkg.sh.in:2196
+#: scripts/makepkg.sh.in:2197
 msgid "Using existing %s tree"
 msgstr "Badagoen %s zuhaitza erabiltzen"
 
-#: scripts/makepkg.sh.in:2203 scripts/makepkg.sh.in:2225
+#: scripts/makepkg.sh.in:2204 scripts/makepkg.sh.in:2227
 msgid "Removing existing %s directory..."
 msgstr "Ezabatzen badagoen %s direktorioa..."
 
-#: scripts/makepkg.sh.in:2220
+#: scripts/makepkg.sh.in:2222
 msgid "Sources are ready."
 msgstr "Iturburuak prest daude."
 
-#: scripts/makepkg.sh.in:2246
+#: scripts/makepkg.sh.in:2248
 msgid "Package directory is ready."
 msgstr "Pakete direktorioa prest dago."
 
-#: scripts/makepkg.sh.in:2250
+#: scripts/makepkg.sh.in:2252
 msgid "Finished making: %s"
 msgstr "Egiten bukatua: %s"
 
diff --git a/scripts/po/fi.po b/scripts/po/fi.po
index bfbd1a6c..77c8e094 100644
--- a/scripts/po/fi.po
+++ b/scripts/po/fi.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # No User, 2012
 # J. S. Tuomisto <jstuomisto@gmail.com>, 2014
@@ -19,12 +19,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 03:32+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Finnish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/fi/)\n"
-"Language: fi\n"
+"Language-Team: Finnish (http://www.transifex.com/toofishes/archlinux-pacman/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -106,9 +105,9 @@ msgid "Generating checksums for source files..."
 msgstr "Luodaan tarkistussummia lähdetiedostoille..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Lähdetiedostojen tarkistussummien luontiin tarvittavaa ohjelmaa %s ei löydy."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Lähdetiedostojen tarkistussummien luontiin tarvittavaa ohjelmaa %s ei löydy."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -355,9 +354,7 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Ohjelmaa %s ei löydy. Käytetään ohjelmaa %s ylläpitäjän oikeuksien "
-"saamiseksi."
+msgstr "Ohjelmaa %s ei löydy. Käytetään ohjelmaa %s ylläpitäjän oikeuksien saamiseksi."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -374,9 +371,7 @@ msgstr "Lähdetiedostojen tarkastamiseen tarvittavaa ohjelmaa %s ei löydy."
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"Lähdetiedostojen tarkistussummien tarkistamiseen tarvittavaa ohjelmaa %s ei "
-"löydy."
+msgstr "Lähdetiedostojen tarkistussummien tarkistamiseen tarvittavaa ohjelmaa %s ei löydy."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
@@ -408,26 +403,21 @@ msgstr "Paketti on jo käännetty. Asennetaan valmista pakettia..."
 
 #: scripts/makepkg.sh.in:1619
 msgid "A package has already been built. (use %s to overwrite)"
-msgstr ""
-"Paketti on jo käännetty. (käytä valitsinta %s kääntääksesi paketin uudelleen)"
+msgstr "Paketti on jo käännetty. (käytä valitsinta %s kääntääksesi paketin uudelleen)"
 
 #: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr ""
-"Pakettiryhmä on jo käännetty. Asennetaan valmiiksi käännettyjä paketteja..."
+msgstr "Pakettiryhmä on jo käännetty. Asennetaan valmiiksi käännettyjä paketteja..."
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Pakettiryhmä on jo käännetty. (käytä valitsinta %s kääntääksesi paketit "
-"uudelleen)"
+msgstr "Pakettiryhmä on jo käännetty. (käytä valitsinta %s kääntääksesi paketit uudelleen)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Osa pakettiryhmästä on jo käännetty. (käytä valitsinta %s kääntääksesi "
-"paketit uudelleen)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "Osa pakettiryhmästä on jo käännetty. (käytä valitsinta %s kääntääksesi paketit uudelleen)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -459,9 +449,7 @@ msgstr "  -d, --nodeps     Ohita riippuvuustarkastukset"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  Älä pura lähdetiedostoja (käytt'' olemassa olevaa %s "
-"kansiota)"
+msgstr "  -e, --noextract  Älä pura lähdetiedostoja (käytt'' olemassa olevaa %s kansiota)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -489,13 +477,11 @@ msgstr "  -m, --nocolor    Älä käytä värejä viesteissä"
 
 #: scripts/makepkg.sh.in:1712
 msgid "  -o, --nobuild    Download and extract files only"
-msgstr ""
-"  -o, --nobuild    Älä käännä pakettia, mutta lataa ja pura lähdetiedostot"
+msgstr "  -o, --nobuild    Älä käännä pakettia, mutta lataa ja pura lähdetiedostot"
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <tiedosto>    Käytä vaihtoehtoista käännösskriptiä ('%s':in sjaan)"
+msgstr "  -p <tiedosto>    Käytä vaihtoehtoista käännösskriptiä ('%s':in sjaan)"
 
 #: scripts/makepkg.sh.in:1714
 msgid ""
@@ -503,7 +489,8 @@ msgid ""
 msgstr "  -r, --rmdeps     Poista asennetut riippuvuudet kääntämisen jälkeen"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  Uudelleenpakkaa paketin sisältö ilman kääntämistä"
 
 #: scripts/makepkg.sh.in:1716
@@ -523,9 +510,7 @@ msgstr ""
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      Luo lähdepaketti ja sisällytä myös ladatut lähdetiedostot "
-"siihen"
+msgstr "  --allsource      Luo lähdepaketti ja sisällytä myös ladatut lähdetiedostot siihen"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -533,8 +518,7 @@ msgstr "  --check          Suorita funktio %s kohteessa %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config<tiedosto> Käytä vaihtoehtoista asetustiedostoa ('%s':in sijaan)"
+msgstr "  --config<tiedosto> Käytä vaihtoehtoista asetustiedostoa ('%s':in sijaan)"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -542,9 +526,9 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <avain>    Määrritä paketin allekirjoittamiseen käytettävä %s avain"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <avain>    Määrritä paketin allekirjoittamiseen käytettävä %s avain"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -622,10 +606,11 @@ msgstr "Jos tiedostoa ei anneta %s-valitsimella, %s etsii tiedostoa \"%s\""
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
@@ -696,9 +681,7 @@ msgstr "Käännetään pakettia: %s"
 
 #: scripts/makepkg.sh.in:2133
 msgid "A source package has already been built. (use %s to overwrite)"
-msgstr ""
-"Lähdepaketti on jo luotu. (käytä valitsinta %s luodaksesi lähdepaketin "
-"uudelleen)"
+msgstr "Lähdepaketti on jo luotu. (käytä valitsinta %s luodaksesi lähdepaketin uudelleen)"
 
 #: scripts/makepkg.sh.in:2152
 msgid "Source package created: %s"
@@ -863,9 +846,9 @@ msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
@@ -883,14 +866,11 @@ msgstr "Sinulla tulee olla oikeat oikeudet tietokannan päivittämiseen."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Pacmanin lukitustiedosto löytyi. Et voi ajaa kahta pacmania samanaikaisesti."
+msgstr "Pacmanin lukitustiedosto löytyi. Et voi ajaa kahta pacmania samanaikaisesti."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
-msgstr ""
-"Vanhanaikainen pakettitietokantaformaatti havaittu. Päivitetään sitä uuteen "
-"3.5 formaattiin..."
+msgstr "Vanhanaikainen pakettitietokantaformaatti havaittu. Päivitetään sitä uuteen 3.5 formaattiin..."
 
 #: scripts/pacman-db-upgrade.sh.in:169
 msgid "Done."
@@ -918,9 +898,7 @@ msgstr "Operaatiot:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add                 Lisää luetellut avaimet (tyhjäksi jätettynä "
-"luetaan stdinistä)"
+msgstr "  -a, --add                 Lisää luetellut avaimet (tyhjäksi jätettynä luetaan stdinistä)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
@@ -981,8 +959,8 @@ msgstr ""
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:79
@@ -992,19 +970,15 @@ msgstr ""
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <tiedosto>           Käytä omavalintaista asetustiedostoa "
-"(tiedoston\\n                                '%s' sijaan)"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <tiedosto>           Käytä omavalintaista asetustiedostoa (tiedoston\\n                                '%s' sijaan)"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <kansio>             Käytä omavalintaista GnuPG kansiota (kansion"
-"\\n                                '%s' sijaan)"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <kansio>             Käytä omavalintaista GnuPG kansiota (kansion\\n                                '%s' sijaan)"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
@@ -1178,25 +1152,17 @@ msgstr "Käyttö: %s [--nocolor] [pacman_tietokannan_juuri]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize on pikkuinen skripti, jonka tarkoituksena\\non kohentaa "
-"pacmanin suorituskykyä,\\nluettaessa ja kirjoitettaessa sen tietokantaan.\\n"
-"\\n"
+msgstr "pacman-optimize on pikkuinen skripti, jonka tarkoituksena\\non kohentaa pacmanin suorituskykyä,\\nluettaessa ja kirjoitettaessa sen tietokantaan.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Koska pacman pitää kirjaa paketeista monien pienten tiedostojen\\navulla, "
-"niin saattavat nämä tiedostot kertyä ympäri kiintolevyä\\najan kuluessa. "
-"Tämän skriptin tarkoituksena on tuoda nämä tiedostot\\nyhteen ja samaan "
-"paikkaan kiintolevyllä.\\nNäin ollen pacmanilta menee vähemmän aikaa löytää "
-"ne.\\n\\n"
+msgstr "Koska pacman pitää kirjaa paketeista monien pienten tiedostojen\\navulla, niin saattavat nämä tiedostot kertyä ympäri kiintolevyä\\najan kuluessa. Tämän skriptin tarkoituksena on tuoda nämä tiedostot\\nyhteen ja samaan paikkaan kiintolevyllä.\\nNäin ollen pacmanilta menee vähemmän aikaa löytää ne.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1247,7 +1213,8 @@ msgid "Rotating database into place..."
 msgstr "Pyöritellään tietokantaa paikalleen..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr ""
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1296,10 +1263,7 @@ msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Tekijänoikeudet (c) 2009 Xavier Chantry <shiningxc@gmail.com>\\n\\nTämä on "
-"vapaa ohjelmisto; katso kopiointiehdot lähdekoodista.\\nMitään takuita ei "
-"anneta, lain rajoissa.\\n"
+msgstr "Tekijänoikeudet (c) 2009 Xavier Chantry <shiningxc@gmail.com>\\n\\nTämä on vapaa ohjelmisto; katso kopiointiehdot lähdekoodista.\\nMitään takuita ei anneta, lain rajoissa.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1347,16 +1311,13 @@ msgstr "Xdelta3-ohjelmaa ei löydy! Onko xdelta3 asennettuna?"
 
 #: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr ""
-"Käyttö: repo-add [valinnat] <tietokannan-sijainti> <paketti|delta> ...\\n"
+msgstr "Käyttö: repo-add [valinnat] <tietokannan-sijainti> <paketti|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add päivittää pakettitietokannan lukemalla pakettitiedoston."
-"\\nKomentorivillä voi antaa useita päivitettäviä paketteja.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add päivittää pakettitietokannan lukemalla pakettitiedoston.\\nKomentorivillä voi antaa useita päivitettäviä paketteja.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1364,13 +1325,14 @@ msgstr "  -d, --delta       luo ja lisää delta paketti\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:66
@@ -1379,13 +1341,10 @@ msgstr "Käyttö: repo-remove [valinnat] <path-to-db> <packagename|delta> ...\\n
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove päivittää pakettitietokannan poistamalla komentorivillä"
-"\\nannetun nimisen paketin annetusta varastotietokannasta.\\nKomentorivillä "
-"voi antaa useita poistettavia paketteja.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove päivittää pakettitietokannan poistamalla komentorivillä\\nannetun nimisen paketin annetusta varastotietokannasta.\\nKomentorivillä voi antaa useita poistettavia paketteja.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1401,14 +1360,11 @@ msgstr "  -s, --sign        allekirjoita tietokanta GnuGP:llä\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <avain> käytä annettua avainta tietokannan allekirjoittamiseen\\n"
+msgstr "  -k, --key <avain> käytä annettua avainta tietokannan allekirjoittamiseen\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
-"  -v, --verify      tarkasta tietokannan allekirjoitus, ennen päivittämistä"
-"\\n"
+msgstr "  -v, --verify      tarkasta tietokannan allekirjoitus, ennen päivittämistä\\n"
 
 #: scripts/repo-add.sh.in:83
 msgid ""
@@ -1418,9 +1374,7 @@ msgstr "\\nMan-sivulta %s(8) löydät lisätietoja käytettävistä valinnoista.
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Esimerkki:  repo-add /polku/varastoon/repo.db.tar.gz pacman-3.0.0-1-i686.pkg."
-"tar.gz\\n"
+msgstr "Esimerkki:  repo-add /polku/varastoon/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1428,9 +1382,9 @@ msgstr "Esimerkki:  repo-remove /polku/varastoon/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:146
@@ -1527,8 +1481,7 @@ msgstr "Prosessin %s hallinnassa"
 
 #: scripts/repo-add.sh.in:536
 msgid "Repository file '%s' is not a proper pacman database."
-msgstr ""
-"Pakettivarastotiedosto '%s' ei ole kelvollinen pacmanin pakettitietokanta."
+msgstr "Pakettivarastotiedosto '%s' ei ole kelvollinen pacmanin pakettitietokanta."
 
 #: scripts/repo-add.sh.in:541
 msgid "Extracting database to a temporary location..."
@@ -1723,18 +1676,21 @@ msgstr "Virhe vedettäessä sijainnista %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Tunnistamaton viite: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Luodaan työkopio varastosta %s %s ..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Virhe päivitettäessä työkopiota %s %s-varastosta"
 
@@ -1766,12 +1722,14 @@ msgstr "Puretaan %s komennolla %s"
 msgid "Failed to extract %s"
 msgstr "tiedoston %s purkaminen epäonnistui"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Kloonataan varasto %s %s ..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Varaston %s %s lataaminen epäonnistui"
@@ -1780,12 +1738,14 @@ msgstr "Varaston %s %s lataaminen epäonnistui"
 msgid "%s is not a clone of %s"
 msgstr "%s ei ole varaston %s klooni"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Päivitetään varasto %s %s ..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Varaston %s %s päivitys epäonnistui"
diff --git a/scripts/po/fr.po b/scripts/po/fr.po
index 2870c0b6..ca7f22e4 100644
--- a/scripts/po/fr.po
+++ b/scripts/po/fr.po
@@ -1,8 +1,9 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
+# Allan McRae <allan@archlinux.org>, 2016
 # Antoine Lubineau <antoine@lubignon.info>, 2012-2013
 # Antoine Lubineau <antoine@lubignon.info>, 2012
 # Antoine Lubineau <antoine@lubignon.info>, 2012-2013,2015
@@ -21,14 +22,13 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
-"PO-Revision-Date: 2016-01-17 09:45+0000\n"
-"Last-Translator: Charles Monzat <superboa@hotmail.fr>\n"
-"Language-Team: French (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/fr/)\n"
-"Language: fr\n"
+"PO-Revision-Date: 2016-02-07 09:09+0000\n"
+"Last-Translator: Allan McRae <allan@archlinux.org>\n"
+"Language-Team: French (http://www.transifex.com/toofishes/archlinux-pacman/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -110,10 +110,9 @@ msgid "Generating checksums for source files..."
 msgstr "Génération des sommes de contrôle des sources..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Le fichier binaire %s, nécessaire à la génération des sommes de contrôle des "
-"fichiers sources, n’a pas pu être trouvé."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Le fichier binaire %s, nécessaire à la génération des sommes de contrôle des fichiers sources, n’a pas pu être trouvé."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -138,7 +137,7 @@ msgstr "ÉCHEC"
 
 #: scripts/makepkg.sh.in:478
 msgid "Validating %s files with %s..."
-msgstr "Validation des fichiers % avec %s..."
+msgstr "Validation des fichiers %s avec %s..."
 
 #: scripts/makepkg.sh.in:485
 msgid "One or more files did not pass the validity check!"
@@ -207,9 +206,7 @@ msgstr "Une ou plusieurs signatures PGP n’ont pas pu être vérifiées."
 
 #: scripts/makepkg.sh.in:708
 msgid "Warnings have occurred while verifying the signatures."
-msgstr ""
-"Des messages destinés à attirer votre attention sont apparus lors de la "
-"vérification des signatures."
+msgstr "Des messages destinés à attirer votre attention sont apparus lors de la vérification des signatures."
 
 #: scripts/makepkg.sh.in:709
 msgid "Please make sure you really trust them."
@@ -350,9 +347,7 @@ msgstr "Protocole de téléchargement inconnu : %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Impossible de trouver le binaire %s nécessaire à la vérification des sources "
-"utilisant un gestionnaire de version."
+msgstr "Impossible de trouver le binaire %s nécessaire à la vérification des sources utilisant un gestionnaire de version."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
@@ -360,15 +355,11 @@ msgstr "Impossible de trouver le paquet %s nécessaire pour les sources %s."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
-msgstr ""
-"Le fichier binaire %s requis pour les opérations de dépendance est "
-"introuvable."
+msgstr "Le fichier binaire %s requis pour les opérations de dépendance est introuvable."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Le fichier binaire %s est introuvable. Utilisation de %s pour obtenir les "
-"privilèges du superutilisateur."
+msgstr "Le fichier binaire %s est introuvable. Utilisation de %s pour obtenir les privilèges du superutilisateur."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -376,56 +367,40 @@ msgstr "Impossible de trouver le fichier binaire %s."
 
 #: scripts/makepkg.sh.in:1531
 msgid "Cannot find the %s binary required for signing packages."
-msgstr ""
-"Le fichier binaire %s servant à la signature des paquets est introuvable."
+msgstr "Le fichier binaire %s servant à la signature des paquets est introuvable."
 
 #: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
-"Le fichier binaire %s servant à la vérification des fichiers sources est "
-"introuvable."
+msgstr "Le fichier binaire %s servant à la vérification des fichiers sources est introuvable."
 
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"Impossible de trouver le fichier binaire %s nécessaire afin de valider les "
-"sommes de contrôle du ou des fichiers sources."
+msgstr "Impossible de trouver le fichier binaire %s nécessaire afin de valider les sommes de contrôle du ou des fichiers sources."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"Le fichier binaire %s servant à la compression des paquets est introuvable."
+msgstr "Le fichier binaire %s servant à la compression des paquets est introuvable."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
-msgstr ""
-"Impossible de trouver le fichier binaire %s nécessaire afin d'optimiser les "
-"images PNG."
+msgstr "Impossible de trouver le fichier binaire %s nécessaire afin d'optimiser les images PNG."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"%s n’a pas pu être trouvé. Celui-ci est requis pour effectuer la compilation "
-"distribuée."
+msgstr "%s n’a pas pu être trouvé. Celui-ci est requis pour effectuer la compilation distribuée."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"%s n’a pas pu être trouvé. Celui-ci est requis pour l’utilisation du cache "
-"du compilateur."
+msgstr "%s n’a pas pu être trouvé. Celui-ci est requis pour l’utilisation du cache du compilateur."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"%s n’a pas été trouvé. Celui-ci est requis pour le nettoyage des fichiers "
-"objets."
+msgstr "%s n’a pas été trouvé. Celui-ci est requis pour le nettoyage des fichiers objets."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"%s n’a pas pu être trouvé. Celui-ci est requis pour compresser les pages man "
-"et les pages info."
+msgstr "%s n’a pas pu être trouvé. Celui-ci est requis pour compresser les pages man et les pages info."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -438,19 +413,16 @@ msgstr "Un paquet a déjà été compilé (utilisez %s pour l’écraser)."
 #: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr ""
-"Un groupe de paquets a déjà été compilé, installation des paquets "
-"existants..."
+msgstr "Un groupe de paquets a déjà été compilé, installation des paquets existants..."
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "Un groupe de paquets a déjà été compilé (utilisez %s pour l’écraser)."
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Une partie du groupe de paquets a déjà été compilé (utilisez %s pour "
-"l’écraser)."
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "Une partie du groupe de paquets a déjà été compilé (utilisez %s pour l’écraser)."
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -474,8 +446,7 @@ msgstr "  -c, --clean      Nettoyer les fichiers après compilation"
 
 #: scripts/makepkg.sh.in:1703
 msgid "  -C, --cleanbuild Remove %s dir before building the package"
-msgstr ""
-"-C, --cleanbuild Supprime le répertoire %s avant de construire le paquet"
+msgstr "-C, --cleanbuild Supprime le répertoire %s avant de construire le paquet"
 
 #: scripts/makepkg.sh.in:1704
 msgid "  -d, --nodeps     Skip all dependency checks"
@@ -483,9 +454,7 @@ msgstr "  -d, --nodeps     Ne pas vérifier les dépendances"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  Ne pas extraire les fichiers sources (utilisation dossier "
-"%s existant)"
+msgstr "  -e, --noextract  Ne pas extraire les fichiers sources (utilisation dossier %s existant)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -493,8 +462,7 @@ msgstr "  -f, --force      Écraser le paquet existant"
 
 #: scripts/makepkg.sh.in:1707
 msgid "  -g, --geninteg   Generate integrity checks for source files"
-msgstr ""
-"  -g, --geninteg   Générer les sommes de contrôle d’intégrité des sources"
+msgstr "  -g, --geninteg   Générer les sommes de contrôle d’intégrité des sources"
 
 #: scripts/makepkg.sh.in:1708
 msgid "  -h, --help       Show this help message and exit"
@@ -514,9 +482,7 @@ msgstr "  -m, --nocolor    Ne pas colorer les messages de sortie"
 
 #: scripts/makepkg.sh.in:1712
 msgid "  -o, --nobuild    Download and extract files only"
-msgstr ""
-"  -o, --nobuild    Effectuer seulement le téléchargement et l’extraction des "
-"fichiers"
+msgstr "  -o, --nobuild    Effectuer seulement le téléchargement et l’extraction des fichiers"
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
@@ -525,12 +491,11 @@ msgstr "  -p <file>        Utiliser un script alternatif (au lieu de « %s »)"
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Supprimer les dépendances installées après une "
-"compilation réussie"
+msgstr "  -r, --rmdeps     Supprimer les dépendances installées après une compilation réussie"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  Recréer le paquet sans re-compiler"
 
 #: scripts/makepkg.sh.in:1716
@@ -540,21 +505,17 @@ msgstr "  -s, --syncdeps   Installer les dépendances manquantes avec %s"
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source     Génèrer une archive (tarball) source sans les sources "
-"téléchargées"
+msgstr "  -S, --source     Génèrer une archive (tarball) source sans les sources téléchargées"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
-msgstr ""
-"  -V, --version             Afficher la version du programme et quitter"
+msgstr "  -V, --version             Afficher la version du programme et quitter"
 
 #: scripts/makepkg.sh.in:1719
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      Créer une archive source incluant les sources téléchargées"
+msgstr "  --allsource      Créer une archive source incluant les sources téléchargées"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -562,9 +523,7 @@ msgstr "  --check          Exécute la fonction %s dans %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <file>  Utilise un fichier de configuration alternatif (au lieu "
-"de « %s »)"
+msgstr "  --config <file>  Utilise un fichier de configuration alternatif (au lieu de « %s »)"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -572,10 +531,9 @@ msgstr "  --holdver        Ne pas mettre à jour "
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <key>      Spécifier une clé à utiliser avec %s pour signer les "
-"paquets à la place de celle par défaut."
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <key>      Spécifier une clé à utiliser avec %s pour signer les paquets à la place de celle par défaut."
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -596,9 +554,7 @@ msgstr "  --nosign         Ne pas créer de signature pour le paquet"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"--packagelist Liste seulement les paquets qui pouvant être produits, sans "
-"PKGEXT"
+msgstr "--packagelist Liste seulement les paquets qui pouvant être produits, sans PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -610,9 +566,7 @@ msgstr "  --sign           Signer le paquet résultant avec %s"
 
 #: scripts/makepkg.sh.in:1731
 msgid "  --skipchecksums  Do not verify checksums of the source files"
-msgstr ""
-"  --skipchecksums  Ne pas générer les sommes de contrôle pour les fichiers "
-"sources"
+msgstr "  --skipchecksums  Ne pas générer les sommes de contrôle pour les fichiers sources"
 
 #: scripts/makepkg.sh.in:1732
 msgid ""
@@ -621,17 +575,13 @@ msgstr "  --skipinteg      Ne rien vérifier pour les fichiers sources"
 
 #: scripts/makepkg.sh.in:1733
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
-msgstr ""
-"  --skippgpcheck   Ne pas vérifier les fichiers sources avec des signatures "
-"PGP"
+msgstr "  --skippgpcheck   Ne pas vérifier les fichiers sources avec des signatures PGP"
 
 #: scripts/makepkg.sh.in:1734
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource   Télécharger les fichiers source (si nécessaire) et "
-"vérifier leur intégrité"
+msgstr "  --verifysource   Télécharger les fichiers source (si nécessaire) et vérifier leur intégrité"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -653,9 +603,7 @@ msgstr "  --noconfirm      Ne demander aucune confirmation"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"  --noprogressbar  Ne pas afficher la barre de progression pendant le "
-"téléchargement"
+msgstr "  --noprogressbar  Ne pas afficher la barre de progression pendant le téléchargement"
 
 #: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
@@ -663,16 +611,12 @@ msgstr "Si %s n’est pas spécifié, %s cherchera « %s »"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Droits d'auteur (c) 2006-2016 Équipe de développement de Pacman <pacman-"
-"dev@archlinux.org>.\\nDroits d'auteur (C) 2002-2006 Judd Vinet "
-"<jvinet@zeroflux.org>.\\n\\nCeci est un logiciel libre ; voir les sources "
-"pour les conditions sur la copie.\\nIl n'y a AUCUNE GARANTIE, dans les "
-"limites permises par la loi.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Droits d'auteur (c) 2006-2016 Équipe de développement de Pacman <pacman-dev@archlinux.org>.\\nDroits d'auteur (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nCeci est un logiciel libre ; voir les sources pour les conditions sur la copie.\\nIl n'y a AUCUNE GARANTIE, dans les limites permises par la loi.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -684,27 +628,19 @@ msgstr "%s est introuvable."
 
 #: scripts/makepkg.sh.in:1909 scripts/makepkg.sh.in:1916
 msgid "You do not have write permission to create packages in %s."
-msgstr ""
-"Vous n’avez pas les permissions nécessaires (accès en écriture) pour créer "
-"les paquets dans %s."
+msgstr "Vous n’avez pas les permissions nécessaires (accès en écriture) pour créer les paquets dans %s."
 
 #: scripts/makepkg.sh.in:1929
 msgid "You do not have write permission to store packages in %s."
-msgstr ""
-"Vous n’avez pas les permissions nécessaires (accès en écriture) pour "
-"enregistrer les paquets dans %s."
+msgstr "Vous n’avez pas les permissions nécessaires (accès en écriture) pour enregistrer les paquets dans %s."
 
 #: scripts/makepkg.sh.in:1937
 msgid "You do not have write permission to store downloads in %s."
-msgstr ""
-"Vous n’avez pas les permissions nécessaires (accès en écriture) pour "
-"enregistrer les téléchargements dans %s."
+msgstr "Vous n’avez pas les permissions nécessaires (accès en écriture) pour enregistrer les téléchargements dans %s."
 
 #: scripts/makepkg.sh.in:1946
 msgid "You do not have write permission to store source tarballs in %s."
-msgstr ""
-"Vous n’avez pas l’autorisation en écriture pour stocker les archives sources "
-"dans %s."
+msgstr "Vous n’avez pas l’autorisation en écriture pour stocker les archives sources dans %s."
 
 #: scripts/makepkg.sh.in:1959
 msgid "You do not have write permission to store logs in %s."
@@ -714,9 +650,7 @@ msgstr "Vous n’avez pas les permissions d’écrire les logs dans %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Lancer %s en tant que root n'est pas autorisé car cela pourrait\\ncauser des "
-"dommages catastrophiques et permanents à votre système."
+msgstr "Lancer %s en tant que root n'est pas autorisé car cela pourrait\\ncauser des dommages catastrophiques et permanents à votre système."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -810,9 +744,7 @@ msgstr "ligne de modèle invalide : impossible de trouver le nom du modèle\n"
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr ""
-"caractères non valides utilisés dans le nom '%s'. Autorisés : [:alnum:]+_."
-"@-\n"
+msgstr "caractères non valides utilisés dans le nom '%s'. Autorisés : [:alnum:]+_.@-\n"
 
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
@@ -849,8 +781,7 @@ msgstr "--input, -p <file> Script de construction (par défaut %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
-msgstr ""
-"--output, -o <file> Fichier de sortie (par défaut : fichier d'entrée)\n"
+msgstr "--output, -o <file> Fichier de sortie (par défaut : fichier d'entrée)\n"
 
 #: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
@@ -884,18 +815,11 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Droits d'auteur (c) 2013-2016 Équipe de développement de Pacman <pacman-"
-"dev@archlinux.org>.\n"
-"Ceci est un logiciel libre ; voir les sources pour les conditions sur la "
-"copie.\n"
-"Il n'y a AUCUNE GARANTIE, dans les limites permises par la loi.\n"
+msgstr "Droits d'auteur (c) 2013-2016 Équipe de développement de Pacman <pacman-dev@archlinux.org>.\nCeci est un logiciel libre ; voir les sources pour les conditions sur la copie.\nIl n'y a AUCUNE GARANTIE, dans les limites permises par la loi.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
-msgstr ""
-"Veuillez mettre à jour la base de données locale de pacman à un format plus "
-"récent"
+msgstr "Veuillez mettre à jour la base de données locale de pacman à un format plus récent"
 
 #: scripts/pacman-db-upgrade.sh.in:42
 msgid "options:"
@@ -903,8 +827,7 @@ msgstr "options :"
 
 #: scripts/pacman-db-upgrade.sh.in:43
 msgid "  -b, --dbpath <path>  set an alternate database location"
-msgstr ""
-"-b, --dbpath <path> définit un emplacement de base de données alternatif"
+msgstr "-b, --dbpath <path> définit un emplacement de base de données alternatif"
 
 #: scripts/pacman-db-upgrade.sh.in:44
 msgid "  -h, --help           show this help message and exit"
@@ -928,14 +851,10 @@ msgstr "--nocolor Ne pas colorer les messages de sortie"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Droits d'auteur (c) 2010-2016 Équipe de développement de Pacman <pacman-"
-"dev@archlinux.org>.\\nCeci est un logiciel libre ; voir les sources pour les "
-"conditions sur la copie.\\nIl n'y a AUCUNE GARANTIE, dans les limites "
-"permises par la loi.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Droits d'auteur (c) 2010-2016 Équipe de développement de Pacman <pacman-dev@archlinux.org>.\\nCeci est un logiciel libre ; voir les sources pour les conditions sur la copie.\\nIl n'y a AUCUNE GARANTIE, dans les limites permises par la loi.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -948,21 +867,15 @@ msgstr "%s n’est pas un répertoire de dépôt pacman."
 
 #: scripts/pacman-db-upgrade.sh.in:140
 msgid "You must have correct permissions to upgrade the database."
-msgstr ""
-"Vous devez avoir les permissions suffisantes pour mettre à jour la base de "
-"données."
+msgstr "Vous devez avoir les permissions suffisantes pour mettre à jour la base de données."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Le fichier de verrou de pacman est présent. Ne peut pas être exécuté pendant "
-"que pacman tourne."
+msgstr "Le fichier de verrou de pacman est présent. Ne peut pas être exécuté pendant que pacman tourne."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
-msgstr ""
-"Le format de la base de données est antérieur à celui de la version 3.5 ; "
-"mise à jour..."
+msgstr "Le format de la base de données est antérieur à celui de la version 3.5 ; mise à jour..."
 
 #: scripts/pacman-db-upgrade.sh.in:169
 msgid "Done."
@@ -970,15 +883,11 @@ msgstr "Effectué(e)."
 
 #: scripts/pacman-db-upgrade.sh.in:173
 msgid "Pre-4.2 database format detected - upgrading..."
-msgstr ""
-"Le format de la base de données est antérieur à celui de la version 4.2 ; "
-"mise à jour..."
+msgstr "Le format de la base de données est antérieur à celui de la version 4.2 ; mise à jour..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"le lien symbolique '%s' pointe en dehors de la racine de pacman, une "
-"réparation manuelle est requise"
+msgstr "le lien symbolique '%s' pointe en dehors de la racine de pacman, une réparation manuelle est requise"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -994,57 +903,42 @@ msgstr "Opérations :"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add                 Ajouter les clés spécifiées (aucune pour "
-"l’entrée standard)"
+msgstr "  -a, --add                 Ajouter les clés spécifiées (aucune pour l’entrée standard)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
-msgstr ""
-"  -d, --delete              Supprimer les identifiants de clés spécifiés"
+msgstr "  -d, --delete              Supprimer les identifiants de clés spécifiés"
 
 #: scripts/pacman-key.sh.in:65
 msgid "  -e, --export              Export the specified or all keyids"
-msgstr ""
-"  -e, --export              Exporter tous les identifiants de clés ou "
-"seulement ceux spécifiés"
+msgstr "  -e, --export              Exporter tous les identifiants de clés ou seulement ceux spécifiés"
 
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              Lister toutes les empreintes de clés ou "
-"seulement celles des identifiants spécifiés"
+msgstr "  -f, --finger              Lister toutes les empreintes de clés ou seulement celles des identifiants spécifiés"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
-msgstr ""
-"  -l, --list-keys           Lister toutes les clés ou seulement celles "
-"spécifiées"
+msgstr "  -l, --list-keys           Lister toutes les clés ou seulement celles spécifiées"
 
 #: scripts/pacman-key.sh.in:68
 msgid "  -r, --recv-keys           Fetch the specified keyids"
-msgstr ""
-"  -r, --recv-keys           Récupérer les identifiants de clés spécifiés"
+msgstr "  -r, --recv-keys           Récupérer les identifiants de clés spécifiés"
 
 #: scripts/pacman-key.sh.in:69
 msgid "  -u, --updatedb            Update the trustdb of pacman"
-msgstr ""
-"  -u, --updatedb            Mettre à jour la base de données de confiance de "
-"pacman"
+msgstr "  -u, --updatedb            Mettre à jour la base de données de confiance de pacman"
 
 #: scripts/pacman-key.sh.in:70
 msgid ""
 "  -v, --verify              Verify the file(s) specified by the signature(s)"
-msgstr ""
-"  -v, --verify              Vérifier les fichiers spécifiés par les "
-"signatures"
+msgstr "  -v, --verify              Vérifier les fichiers spécifiés par les signatures"
 
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key                Ouvrir le menu de gestion des clés spécifiées"
+msgstr "  --edit-key                Ouvrir le menu de gestion des clés spécifiées"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
@@ -1054,14 +948,11 @@ msgstr "  --import                  Importer pubring.gpg depuis les dossiers"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          Importer les valeurs de confiance de trustdb.gpg "
-"depuis les dossiers"
+msgstr "  --import-trustdb          Importer les valeurs de confiance de trustdb.gpg depuis les dossiers"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                    S’assurer que le porte-clefs est bien initialisé"
+msgstr "  --init                    S’assurer que le porte-clefs est bien initialisé"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
@@ -1073,40 +964,30 @@ msgstr "  --lsign-key               Signer localement les clés spécifiées"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                Recharcher les clés par défaut depuis les "
-"trousseaux dans %s"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                Recharcher les clés par défaut depuis les trousseaux dans %s"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            Mettre à jour les clés spécifiées ou toutes, "
-"depuis un serveur de clés"
+msgstr "  --refresh-keys            Mettre à jour les clés spécifiées ou toutes, depuis un serveur de clés"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <file>           Utilisation d’un fichier de configuration "
-"alternatif (à la place de\\n                            « %s »)"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <file>           Utilisation d’un fichier de configuration alternatif (à la place de\\n                            « %s »)"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            Indiquer un répertoire alternatif pour GnuPG (à "
-"la place de\\n                            « %s »)"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            Indiquer un répertoire alternatif pour GnuPG (à la place de\\n                            « %s »)"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <server-url>  Indiquer un serveur de clés à utiliser si "
-"nécessaire"
+msgstr "  --keyserver <server-url>  Indiquer un serveur de clés à utiliser si nécessaire"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1178,14 +1059,11 @@ msgstr "Désactivation de la clef %s..."
 
 #: scripts/pacman-key.sh.in:334
 msgid "A specified keyfile could not be added to the keyring."
-msgstr ""
-"L’un des fichiers de clefs spécifié n’a pas pu être ajouté au porte-clefs "
-"GPG."
+msgstr "L’un des fichiers de clefs spécifié n’a pas pu être ajouté au porte-clefs GPG."
 
 #: scripts/pacman-key.sh.in:342
 msgid "A specified key could not be removed from the keyring."
-msgstr ""
-"L’une des clefs spécifiée n’a pas pu être supprimée du porte-clefs GPG."
+msgstr "L’une des clefs spécifiée n’a pas pu être supprimée du porte-clefs GPG."
 
 #: scripts/pacman-key.sh.in:352
 msgid "The key identified by %s could not be edited."
@@ -1225,14 +1103,11 @@ msgstr "%s n’a pas pu être signée localement."
 
 #: scripts/pacman-key.sh.in:469
 msgid "Remote key not fetched correctly from keyserver."
-msgstr ""
-"La clef distante n’a pas correctement pu être atteinte depuis le serveur de "
-"clefs."
+msgstr "La clef distante n’a pas correctement pu être atteinte depuis le serveur de clefs."
 
 #: scripts/pacman-key.sh.in:477
 msgid "A specified local key could not be updated from a keyserver."
-msgstr ""
-"Une clef locale spécifiée n’a pas pu être mise à jour depuis le serveur."
+msgstr "Une clef locale spécifiée n’a pas pu être mise à jour depuis le serveur."
 
 #: scripts/pacman-key.sh.in:487
 msgid "The signature identified by %s could not be verified."
@@ -1248,15 +1123,11 @@ msgstr "La base de données de confiance n’a pas pu être mise à jour."
 
 #: scripts/pacman-key.sh.in:559
 msgid "Cannot find the %s binary required for all %s operations."
-msgstr ""
-"Le fichier binaire %s, requis pour toutes les opérations %s, n’a pas pu être "
-"trouvé."
+msgstr "Le fichier binaire %s, requis pour toutes les opérations %s, n’a pas pu être trouvé."
 
 #: scripts/pacman-key.sh.in:564
 msgid "%s needs to be run as root for this operation."
-msgstr ""
-"%s doit être executé avec les droits de l’utilisateur root pour effectuer "
-"cette opération."
+msgstr "%s doit être executé avec les droits de l’utilisateur root pour effectuer cette opération."
 
 #: scripts/pacman-key.sh.in:570
 msgid "%s configuration file '%s' not found."
@@ -1286,25 +1157,17 @@ msgstr "Utilisation : %s [--nocolor] [pacman_bd_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize est une petite astuce qui devrait améliorer les performances"
-"\\nde pacman lors de la lecture/écriture de sa base de données.\\n\\n"
+msgstr "pacman-optimize est une petite astuce qui devrait améliorer les performances\\nde pacman lors de la lecture/écriture de sa base de données.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Pacman utilise beaucoup de petits fichiers pour garder des traces des "
-"paquets,\\nces fichiers ont ainsi tendance à se fragmenter avec le temps. "
-"\\nCe script tente de replacer tous ces fichiers ensemble sur votre disque "
-"dur.\\nLe résultat est que le disque devrait être capable de les lire plus "
-"rapidement\\n,puisque la tête de lecture n’aura plus besoin de bouger autant."
-"\\n"
+msgstr "Pacman utilise beaucoup de petits fichiers pour garder des traces des paquets,\\nces fichiers ont ainsi tendance à se fragmenter avec le temps. \\nCe script tente de replacer tous ces fichiers ensemble sur votre disque dur.\\nLe résultat est que le disque devrait être capable de les lire plus rapidement\\n,puisque la tête de lecture n’aura plus besoin de bouger autant.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1312,15 +1175,11 @@ msgstr "Impossible de trouver le binaire %s requis pour vérifier l’intégrit
 
 #: scripts/pacman-optimize.sh.in:109
 msgid "You must have correct permissions to optimize the database."
-msgstr ""
-"Vous devez avoir les permissions suffisantes pour optimiser la base de "
-"données."
+msgstr "Vous devez avoir les permissions suffisantes pour optimiser la base de données."
 
 #: scripts/pacman-optimize.sh.in:125
 msgid "Cannot create temporary directory for database building."
-msgstr ""
-"Impossible de créer un répertoire temporaire pour construire la base de "
-"données."
+msgstr "Impossible de créer un répertoire temporaire pour construire la base de données."
 
 #: scripts/pacman-optimize.sh.in:128
 msgid "MD5sum'ing the old database..."
@@ -1352,19 +1211,16 @@ msgstr "Analyse de l’intégrité... "
 
 #: scripts/pacman-optimize.sh.in:162
 msgid "Integrity check FAILED, reverting to old database."
-msgstr ""
-"La vérification de l’intégrité a échoué, restauration de l’ancienne base de "
-"données."
+msgstr "La vérification de l’intégrité a échoué, restauration de l’ancienne base de données."
 
 #: scripts/pacman-optimize.sh.in:166
 msgid "Rotating database into place..."
 msgstr "Mise en place de la base de données..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"Le remplacement de la nouvelle base de données a échoué. Vérifiez les "
-"dossier %s, %s et %s."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "Le remplacement de la nouvelle base de données a échoué. Vérifiez les dossier %s, %s et %s."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1378,9 +1234,7 @@ msgstr "Utilisation : pkgdelta [options] <paquet1> <paquet2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta va créer un fichier de delta entre les deux paquets.\\nCe fichier "
-"delta pourra être ajouté à une base de données avec repo-add.\\n"
+msgstr "pkgdelta va créer un fichier de delta entre les deux paquets.\\nCe fichier delta pourra être ajouté à une base de données avec repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1401,27 +1255,20 @@ msgstr "  --nocolor         désactive la couleur\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size    taille minimale de paquet avant que les deltas soient "
-"générés\\n"
+msgstr "  --min-pkg-size    taille minimale de paquet avant que les deltas soient générés\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  pourcentage du nouveau paquet au-dessus duquel le delta "
-"sera ignoré\\n"
+msgstr "  --max-delta-size  pourcentage du nouveau paquet au-dessus duquel le delta sera ignoré\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nCeci est un "
-"logiciel libre ; voir les sources pour les conditions sur la copie.\\nIl n'y "
-"a AUCUNE GARANTIE, dans les limites permises par la loi.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nCeci est un logiciel libre ; voir les sources pour les conditions sur la copie.\\nIl n'y a AUCUNE GARANTIE, dans les limites permises par la loi.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1429,8 +1276,7 @@ msgstr "Le paquet « %s » est invalide."
 
 #: scripts/pkgdelta.sh.in:120
 msgid "Skipping delta creation for small package: %s - size %s"
-msgstr ""
-"Omission de la création de delta pour un petit paquet : %s - taille : %s"
+msgstr "Omission de la création de delta pour un petit paquet : %s - taille : %s"
 
 #: scripts/pkgdelta.sh.in:125
 msgid "The package names don't match : '%s' and '%s'"
@@ -1438,8 +1284,7 @@ msgstr "Les noms des paquets ne sont pas cohérents : « %s » et « %s »"
 
 #: scripts/pkgdelta.sh.in:130
 msgid "The package architectures don't match : '%s' and '%s'"
-msgstr ""
-"Les architectures des paquets ne sont pas cohérentes : « %s » et « %s »"
+msgstr "Les architectures des paquets ne sont pas cohérentes : « %s » et « %s »"
 
 #: scripts/pkgdelta.sh.in:135
 msgid "Both packages have the same version : '%s'"
@@ -1455,8 +1300,7 @@ msgstr "Impossible de créer le delta."
 
 #: scripts/pkgdelta.sh.in:152
 msgid "Delta package larger than maximum size. Removing."
-msgstr ""
-"Le paquet delta est plus gros que la taille maximum autorisée. Suppression."
+msgstr "Le paquet delta est plus gros que la taille maximum autorisée. Suppression."
 
 #: scripts/pkgdelta.sh.in:157
 msgid "Generated delta : '%s'"
@@ -1468,59 +1312,44 @@ msgstr "Fichier « %s » introuvable"
 
 #: scripts/pkgdelta.sh.in:220 scripts/repo-add.sh.in:250
 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
-msgstr ""
-"Le programme xdelta3 est introuvable ! Vérifiez qu’il est bien installé."
+msgstr "Le programme xdelta3 est introuvable ! Vérifiez qu’il est bien installé."
 
 #: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr ""
-"Utilisation : repo-add [options] <chemin de la base de données> <paquet|"
-"delta> ...\\n"
+msgstr "Utilisation : repo-add [options] <chemin de la base de données> <paquet|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"« repo-add » va mettre à jour un dépot à partir d’un paquet.\\nIl est "
-"possible de spécifier plusieurs paquets à ajouter.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "« repo-add » va mettre à jour un dépot à partir d’un paquet.\\nIl est possible de spécifier plusieurs paquets à ajouter.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta       génère et ajoute un delta pour la mise à jour des paquets"
-"\\n"
+msgstr "  -d, --delta       génère et ajoute un delta pour la mise à jour des paquets\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"  -n, --new         ajoute seulement les paquets qui ne sont pas déjà dans "
-"la base de données"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "  -n, --new         ajoute seulement les paquets qui ne sont pas déjà dans la base de données"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"-R, --remove supprime les paquets obsolètes du disque après la mise à jour "
-"de la base de données\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "-R, --remove supprime les paquets obsolètes du disque après la mise à jour de la base de données\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Utilisation : repo-remove [options] <chemin de la base de données> <nom du "
-"paquet|delta> ...\\n"
+msgstr "Utilisation : repo-remove [options] <chemin de la base de données> <nom du paquet|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"« repo-remove » va mettre à jour un dépôt en supprimant le paquet\\nspécifié "
-"en ligne de commande pour un dépôt donné. Plusieurs\\npaquets à supprimer "
-"peuvent être spécifiés.\\n\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "« repo-remove » va mettre à jour un dépôt en supprimant le paquet\\nspécifié en ligne de commande pour un dépôt donné. Plusieurs\\npaquets à supprimer peuvent être spécifiés.\\n\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1532,21 +1361,15 @@ msgstr "  --nocolor         désactive la couleur\\n"
 
 #: scripts/repo-add.sh.in:80
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
-msgstr ""
-"  -s, --sign        signer la base de données avec GnuPG après la mise à jour"
-"\\n"
+msgstr "  -s, --sign        signer la base de données avec GnuPG après la mise à jour\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <clef>  utilise la clef spécifiée pour signer la base de données"
-"\\n"
+msgstr "  -k, --key <clef>  utilise la clef spécifiée pour signer la base de données\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
-"  -v, --verify      vérifie la signature de la base de données avant la mise "
-"à jour\\n"
+msgstr "  -v, --verify      vérifie la signature de la base de données avant la mise à jour\\n"
 
 #: scripts/repo-add.sh.in:83
 msgid ""
@@ -1556,8 +1379,7 @@ msgstr "\\nVoir %s(8) pour plus de détails sur les options disponibles.\\n"
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Exemple :  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Exemple :  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1565,14 +1387,10 @@ msgstr "Exemple :  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016  Équipe de développement de Pacman <pacman-"
-"dev@archlinux.org>.\\n\\nCeci est un logiciel libre ; voir les sources pour "
-"les conditions sur la copie.\\nIl n'y a AUCUNE GARANTIE, dans les limites "
-"permises par la loi.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016  Équipe de développement de Pacman <pacman-dev@archlinux.org>.\\n\\nCeci est un logiciel libre ; voir les sources pour les conditions sur la copie.\\nIl n'y a AUCUNE GARANTIE, dans les limites permises par la loi.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1724,9 +1542,7 @@ msgstr "La commande « %s » spécifiée est invalide."
 
 #: scripts/repo-add.sh.in:734
 msgid "Cannot create temp directory for database building."
-msgstr ""
-"Ne peut pas créer le répertoire temporaire pour construire la base de "
-"données."
+msgstr "Ne peut pas créer le répertoire temporaire pour construire la base de données."
 
 #: scripts/repo-add.sh.in:812
 msgid "Creating updated database file '%s'"
@@ -1814,14 +1630,11 @@ msgstr "%s ne peut pas contenir de deux-points, de tirets ou d’espaces."
 
 #: scripts/libmakepkg/lint_pkgbuild/provides.sh.in:56
 msgid "%s array cannot contain comparison (< or >) operators."
-msgstr ""
-"Le champ %s ne ne peut pas contenir d’opérateurs de comparaison (« < » ou « "
-"> »)"
+msgstr "Le champ %s ne ne peut pas contenir d’opérateurs de comparaison (« < » ou « > »)"
 
 #: scripts/libmakepkg/lint_pkgbuild/source.sh.in:36
 msgid "Sparse arrays are not allowed for source"
-msgstr ""
-"Les tableaux avec valeurs omises sont interdits pour le champ \"source\""
+msgstr "Les tableaux avec valeurs omises sont interdits pour le champ \"source\""
 
 #: scripts/libmakepkg/lint_pkgbuild/util.sh.in:34
 msgid "%s file (%s) does not exist or is not a regular file."
@@ -1868,18 +1681,21 @@ msgstr "Échec lors de la mise à jour de la branche %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Référence inconnu : %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Création d’une copie de travail du dépot %s %s..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Échec lors de la mise à jour d’une copie de travail du dépot %s %s"
 
@@ -1911,12 +1727,14 @@ msgstr "Extraction de %s avec %s"
 msgid "Failed to extract %s"
 msgstr "L’extraction de %s a échoué"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Clonage du dépôt %s %s..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Échec lors du téléchargement du dépôt %s %s"
@@ -1925,20 +1743,21 @@ msgstr "Échec lors du téléchargement du dépôt %s %s"
 msgid "%s is not a clone of %s"
 msgstr "%s n’est pas un clone de %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Mise à jour du dépot %s %s"
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Échec lors de la mise à jour du dépôt %s %s"
 
 #: scripts/libmakepkg/source/local.sh.in:39
 msgid "%s was not found in the build directory and is not a URL."
-msgstr ""
-"%s n’a pas été trouvé dans le répertoire de travail et n’est pas une URL."
+msgstr "%s n’a pas été trouvé dans le répertoire de travail et n’est pas une URL."
 
 #: scripts/libmakepkg/tidy.sh.in:41
 msgid "Tidying install..."
@@ -1974,9 +1793,7 @@ msgstr "Suppression des fichiers de bibliothèques statiques..."
 
 #: scripts/libmakepkg/tidy/strip.sh.in:85
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr ""
-"Nettoyage des symboles inutiles dans les fichiers binaires et les "
-"bibliothèques..."
+msgstr "Nettoyage des symboles inutiles dans les fichiers binaires et les bibliothèques..."
 
 #: scripts/libmakepkg/tidy/upx.sh.in:35
 msgid "Compressing binaries with %s..."
diff --git a/scripts/po/gl.po b/scripts/po/gl.po
index 8fb1f477..ae0d468e 100644
--- a/scripts/po/gl.po
+++ b/scripts/po/gl.po
@@ -1,25 +1,25 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Adrián Chaves Fernández <adriyetichaves@gmail.com>, 2013
-# Adrián Chaves Fernández <adriyetichaves@gmail.com>, 2013-2015
+# Adrián Chaves Fernández <adriyetichaves@gmail.com>, 2013-2016
 # Adrián Chaves Fernández <adriyetichaves@gmail.com>, 2015
 # Daniel, 2016
+# Daniel, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
-"PO-Revision-Date: 2016-01-22 20:16+0000\n"
-"Last-Translator: Daniel\n"
-"Language-Team: Galician (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/gl/)\n"
-"Language: gl\n"
+"PO-Revision-Date: 2016-02-07 15:46+0000\n"
+"Last-Translator: Adrián Chaves Fernández <adriyetichaves@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.com/toofishes/archlinux-pacman/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -44,9 +44,7 @@ msgstr "Versión actualizada: %s"
 
 #: scripts/makepkg.sh.in:194
 msgid "%s is not writeable -- pkgver will not be updated"
-msgstr ""
-"Non pode escribirse en «%s», polo que non se actualizará a versión do "
-"paquete («pkgver»)."
+msgstr "Non pode escribirse en «%s», polo que non se actualizará a versión do paquete («pkgver»)."
 
 #: scripts/makepkg.sh.in:202
 msgid "Unable to find source file %s."
@@ -103,10 +101,9 @@ msgid "Generating checksums for source files..."
 msgstr "Xerando as sumas de comprobación dos ficheiros fonte…"
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Non é posíbel atopar o programa «%s», necesario para xerar as sumas de "
-"comprobación dos ficheiros fonte."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Non é posíbel atopar o programa «%s», necesario para xerar as sumas de comprobación dos ficheiros fonte."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -131,7 +128,7 @@ msgstr "Incorrecto"
 
 #: scripts/makepkg.sh.in:478
 msgid "Validating %s files with %s..."
-msgstr ""
+msgstr "Validando os ficheiros de %s con %s…"
 
 #: scripts/makepkg.sh.in:485
 msgid "One or more files did not pass the validity check!"
@@ -139,13 +136,11 @@ msgstr "Un ou máis ficheiros non pasaron a proba de verificación."
 
 #: scripts/makepkg.sh.in:489
 msgid "Integrity checks (%s) differ in size from the source array."
-msgstr ""
-"O número de sumas de comprobación (%s) e distinto do número de ficheiros "
-"fonte."
+msgstr "O número de sumas de comprobación (%s) e distinto do número de ficheiros fonte."
 
 #: scripts/makepkg.sh.in:531
 msgid "Integrity checks are missing for: %s"
-msgstr ""
+msgstr "Faltan as probas de validación para: %s"
 
 #: scripts/makepkg.sh.in:598
 msgid "Verifying source file signatures with %s..."
@@ -323,9 +318,7 @@ msgstr "Non foi posíbel crear o ficheiro do paquete de fontes."
 
 #: scripts/makepkg.sh.in:1389
 msgid "Failed to create symlink to source package file."
-msgstr ""
-"Non foi posíbel crear unha ligazón simbólica ao ficheiro do paquete de "
-"fontes."
+msgstr "Non foi posíbel crear unha ligazón simbólica ao ficheiro do paquete de fontes."
 
 #: scripts/makepkg.sh.in:1401
 msgid "Installing package %s with %s..."
@@ -345,27 +338,19 @@ msgstr "Protocolo de descarga descoñecido: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Non foi posíbel atopar o executábel «%s» necesario para comprobar os\n"
-"requisitos das fontes no seu sistema de control de versións."
+msgstr "Non foi posíbel atopar o executábel «%s» necesario para comprobar os\nrequisitos das fontes no seu sistema de control de versións."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
-msgstr ""
-"Non foi posíbel atopar o paquete «%s», necesario para manexar as fontes de "
-"«%s»."
+msgstr "Non foi posíbel atopar o paquete «%s», necesario para manexar as fontes de «%s»."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
-msgstr ""
-"Non foi posíbel atopar o executábel «%s», necesario para as operacións de "
-"dependencias."
+msgstr "Non foi posíbel atopar o executábel «%s», necesario para as operacións de dependencias."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Non foi posíbel atopar o executábel «%s». Usarase «%s» para adquirir "
-"privilexios de administrador."
+msgstr "Non foi posíbel atopar o executábel «%s». Usarase «%s» para adquirir privilexios de administrador."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -373,52 +358,40 @@ msgstr "Non foi posíbel atopar o executábel «%s»."
 
 #: scripts/makepkg.sh.in:1531
 msgid "Cannot find the %s binary required for signing packages."
-msgstr ""
-"Non foi posíbel atopar o executábel «%s», necesario para asinar paquetes."
+msgstr "Non foi posíbel atopar o executábel «%s», necesario para asinar paquetes."
 
 #: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
-"Non foi posíbel atopar o executábel «%s», necesario para verificar ficheiros "
-"de fontes."
+msgstr "Non foi posíbel atopar o executábel «%s», necesario para verificar ficheiros de fontes."
 
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
+msgstr "Non é posíbel atopar o binario %s necesario para validar as sumas de verificación dos ficheiros das fontes."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"Non foi posíbel atopar o executábel «%s», necesario para comprimir binarios."
+msgstr "Non foi posíbel atopar o executábel «%s», necesario para comprimir binarios."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
-msgstr ""
+msgstr "Non é posíbel atopar o binario %s necesario para optimizar as imaxes PNG."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"Non foi posíbel atopar o executábel «%s», necesario para compilar de maneira "
-"distribuída."
+msgstr "Non foi posíbel atopar o executábel «%s», necesario para compilar de maneira distribuída."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Non foi posíbel atopar o executábel «%s», necesario para usar a caché do "
-"compilador."
+msgstr "Non foi posíbel atopar o executábel «%s», necesario para usar a caché do compilador."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"Non foi posíbel atopar o executábel «%s», necesario para eliminar datos "
-"innecesarios dos ficheiros de obxectos."
+msgstr "Non foi posíbel atopar o executábel «%s», necesario para eliminar datos innecesarios dos ficheiros de obxectos."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Non foi posíbel atopar o executábel «%s», necesario para comprimir as "
-"páxinas de manuais (man) e información (info)."
+msgstr "Non foi posíbel atopar o executábel «%s», necesario para comprimir as páxinas de manuais (man) e información (info)."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -431,15 +404,15 @@ msgstr "Xa se construíu un paquete (use «%s» para forzar)."
 #: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr ""
-"Xa se construíu o grupo de paquetes, instalando os paquetes existentes…"
+msgstr "Xa se construíu o grupo de paquetes, instalando os paquetes existentes…"
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "Xa se construíu o grupo de paquetes (use «%s» para forzar)."
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "Xa se construíu parte do grupo de paquetes (use «%s» para forzar)."
 
 #: scripts/makepkg.sh.in:1696
@@ -460,13 +433,11 @@ msgstr "  -A, --ignorearch    Ignorar os campos «%s» incompletos en «%s»."
 
 #: scripts/makepkg.sh.in:1702
 msgid "  -c, --clean      Clean up work files after build"
-msgstr ""
-"  -c, --clean         Limpar os ficheiros de traballo despois da construción."
+msgstr "  -c, --clean         Limpar os ficheiros de traballo despois da construción."
 
 #: scripts/makepkg.sh.in:1703
 msgid "  -C, --cleanbuild Remove %s dir before building the package"
-msgstr ""
-"  -C, --cleanbuild    Eliminar o cartafol «%s» antes de construír o paquete."
+msgstr "  -C, --cleanbuild    Eliminar o cartafol «%s» antes de construír o paquete."
 
 #: scripts/makepkg.sh.in:1704
 msgid "  -d, --nodeps     Skip all dependency checks"
@@ -474,20 +445,15 @@ msgstr "  -d, --nodeps        Saltarse as comprobacións de dependencias."
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract     Non extraer os ficheiros das fontes (usar o cartafol"
-"\\n                      «%s» existente)."
+msgstr "  -e, --noextract     Non extraer os ficheiros das fontes (usar o cartafol\\n                      «%s» existente)."
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
-msgstr ""
-"  -f, --force         Substituír calquera paquete previamente construído."
+msgstr "  -f, --force         Substituír calquera paquete previamente construído."
 
 #: scripts/makepkg.sh.in:1707
 msgid "  -g, --geninteg   Generate integrity checks for source files"
-msgstr ""
-"  -g, --geninteg      Xerar comprobacións de integridade para os ficheiros "
-"fonte."
+msgstr "  -g, --geninteg      Xerar comprobacións de integridade para os ficheiros fonte."
 
 #: scripts/makepkg.sh.in:1708
 msgid "  -h, --help       Show this help message and exit"
@@ -495,8 +461,7 @@ msgstr "  -h, --help          Mostrar esta mensaxe de axuda e saír."
 
 #: scripts/makepkg.sh.in:1709
 msgid "  -i, --install    Install package after successful build"
-msgstr ""
-"  -i, --install       Instalar o paquete despois de construílo correctamente."
+msgstr "  -i, --install       Instalar o paquete despois de construílo correctamente."
 
 #: scripts/makepkg.sh.in:1710
 msgid "  -L, --log        Log package build process"
@@ -512,21 +477,17 @@ msgstr "  -o, --nobuild       Unicamente descargar e extraer os ficheiros."
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <ficheiro>       Usar un script de construción alternativo (en vez de"
-"\\n                      «%s»)."
+msgstr "  -p <ficheiro>       Usar un script de construción alternativo (en vez de\\n                      «%s»)."
 
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps        Eliminar as dependencias instaladas tras construír o"
-"\\n                      paquete correctamente."
+msgstr "  -r, --rmdeps        Eliminar as dependencias instaladas tras construír o\\n                      paquete correctamente."
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr ""
-"  -R, --repackage     Volver empaquetar o contido do paquete sen reconstruír."
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
+msgstr "  -R, --repackage     Volver empaquetar o contido do paquete sen reconstruír."
 
 #: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
@@ -535,9 +496,7 @@ msgstr "  -s, --syncdeps      Instalar as dependencias que faltan con «%s»."
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source        Xerar un arquivo coas fontes do paquete (sen os "
-"ficheiros\\n                      de fontes descargados)."
+msgstr "  -S, --source        Xerar un arquivo coas fontes do paquete (sen os ficheiros\\n                      de fontes descargados)."
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -547,9 +506,7 @@ msgstr "  -V, --version       Mostrar información sobre a versión e saír."
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource         Xerar un arquivo coas fontes do paquete incluíndo os"
-"\\n                      ficheiros de fontes descargados."
+msgstr "  --allsource         Xerar un arquivo coas fontes do paquete incluíndo os\\n                      ficheiros de fontes descargados."
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -557,22 +514,17 @@ msgstr "  --check             Executar a función «%s» do «%s»."
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <ficheiro> Usar un ficheiro de configuración alternativo (en vez "
-"de\\n                      «%s»)."
+msgstr "  --config <ficheiro> Usar un ficheiro de configuración alternativo (en vez de\\n                      «%s»)."
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
-msgstr ""
-"  --holdver           Non actualizar as fontes obtidas dun sistema de "
-"control de\\n                      versións."
+msgstr "  --holdver           Non actualizar as fontes obtidas dun sistema de control de\\n                      versións."
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <chave>       Indicar unha chave de asinado «%s» que usar en vez"
-"\\n                      da predeterminada."
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <chave>       Indicar unha chave de asinado «%s» que usar en vez\\n                      da predeterminada."
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -593,11 +545,11 @@ msgstr "  --nosign            Non crear unha sinatura para o paquete."
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
+msgstr "  --packagelist    Listar só os paquetes que se producirían, sen PKGEXT."
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
-msgstr ""
+msgstr "  --printsrcinfo   Imprimir o SRCINFO xerado e saír."
 
 #: scripts/makepkg.sh.in:1730
 msgid "  --sign           Sign the resulting package with %s"
@@ -605,29 +557,22 @@ msgstr "  --sign              Asinar o paquete resultante con «%s»."
 
 #: scripts/makepkg.sh.in:1731
 msgid "  --skipchecksums  Do not verify checksums of the source files"
-msgstr ""
-"  --skipchecksums     Non comprobar as sumas de comprobación dos ficheiros de"
-"\\n                      fontes."
+msgstr "  --skipchecksums     Non comprobar as sumas de comprobación dos ficheiros de\\n                      fontes."
 
 #: scripts/makepkg.sh.in:1732
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
-msgstr ""
-"  --skipinteg         Non realizar ningunha verificación dos ficheiros de "
-"fontes."
+msgstr "  --skipinteg         Non realizar ningunha verificación dos ficheiros de fontes."
 
 #: scripts/makepkg.sh.in:1733
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
-msgstr ""
-"  --skippgpcheck      Non verificar os ficheiros de fontes con sinaturas PGP."
+msgstr "  --skippgpcheck      Non verificar os ficheiros de fontes con sinaturas PGP."
 
 #: scripts/makepkg.sh.in:1734
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource      Descargar os ficheiros de fontes (se non se descargaron"
-"\\n                      previamente) e comprobar a súa integridade."
+msgstr "  --verifysource      Descargar os ficheiros de fontes (se non se descargaron\\n                      previamente) e comprobar a súa integridade."
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -635,28 +580,21 @@ msgstr "As seguintes opcións pódenselle pasar a «%s»:"
 
 #: scripts/makepkg.sh.in:1738
 msgid "  --asdeps         Install packages as non-explicitly installed"
-msgstr ""
-"  --asdeps            Marcar os paquetes instalados como paquetes «instalados"
-"\\n                      indirectamente»."
+msgstr "  --asdeps            Marcar os paquetes instalados como paquetes «instalados\\n                      indirectamente»."
 
 #: scripts/makepkg.sh.in:1739
 msgid ""
 "  --needed         Do not reinstall the targets that are already up to date"
-msgstr ""
-"  --needed            Non instalar de novo os paquetes que xa estean ao día."
+msgstr "  --needed            Non instalar de novo os paquetes que xa estean ao día."
 
 #: scripts/makepkg.sh.in:1740
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr ""
-"  --noconfirm         Non pedir confirmación á hora de solucionar as"
-"\\n                      dependencias."
+msgstr "  --noconfirm         Non pedir confirmación á hora de solucionar as\\n                      dependencias."
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"  --noprogressbar     Non mostrar unha barra de progreso ao descargar "
-"ficheiros."
+msgstr "  --noprogressbar     Non mostrar unha barra de progreso ao descargar ficheiros."
 
 #: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
@@ -664,11 +602,12 @@ msgstr "Se non se usa o parámetro «%s», «%s» buscará un ficheiro co nome 
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "© 2006-2016 Equipo de desenvolvemento de Pacman <pacman-dev@archlinux.org>.\\n© 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nIsto é software libre; consulte as condicións de copia nas fontes.\\nNON HAI GARANTÍA, dentro das limitacións legais.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -692,8 +631,7 @@ msgstr "Non ten permisos de escritura para almacenar descargas en «%s»."
 
 #: scripts/makepkg.sh.in:1946
 msgid "You do not have write permission to store source tarballs in %s."
-msgstr ""
-"Non ten permisos de escritura para almacenar arquivos de fontes en «%s»."
+msgstr "Non ten permisos de escritura para almacenar arquivos de fontes en «%s»."
 
 #: scripts/makepkg.sh.in:1959
 msgid "You do not have write permission to store logs in %s."
@@ -703,9 +641,7 @@ msgstr "Non ten permisos de escritura para almacenar rexistros en «%s»."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Non se permite executar «%s» como administrador porque pode\\ncausar dano "
-"permanente e catastrófico ao sistema."
+msgstr "Non se permite executar «%s» como administrador porque pode\\ncausar dano permanente e catastrófico ao sistema."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -799,24 +735,22 @@ msgstr "A liña modelo é incorrecta: non é posíbel atopar o nome do modelo.\n
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr ""
-"Usáronse caracteres non permitidos no nome «%s». Permítense os seguintes: «[:"
-"alnum:]+_.@-».\n"
+msgstr "Usáronse caracteres non permitidos no nome «%s». Permítense os seguintes: «[:alnum:]+_.@-».\n"
 
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
 msgid "Couldn't detect version for template '%s'\n"
-msgstr ""
+msgstr "Non foi posíbel detectar a versión do modelo «%s».\n"
 
 #: scripts/makepkg-template.pl.in:125
 #, perl-format
 msgid "Failed to find template file matching '%s'\n"
-msgstr ""
+msgstr "Non foi posíbel atopar un ficheiro de modelo que se corresponda con «%s».\n"
 
 #: scripts/makepkg-template.pl.in:136
 #, perl-format
 msgid "failed to open '%s': %s\n"
-msgstr ""
+msgstr "non foi posíbel abrir «%s»: %s\n"
 
 #: scripts/makepkg-template.pl.in:153
 #, perl-format
@@ -834,17 +768,11 @@ msgstr "Opcións:\n"
 #: scripts/makepkg-template.pl.in:178
 #, perl-format
 msgid "  --input, -p <file>    Build script to read (default: %s)\n"
-msgstr ""
-"  --input, -p <ficheiro>\n"
-"                        Script de construción para ler (valor "
-"predeterminado: %s).\n"
+msgstr "  --input, -p <ficheiro>\n                        Script de construción para ler (valor predeterminado: %s).\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
-msgstr ""
-"  --output, -o <ficheiro>                           Ficheiro no que gardar a "
-"saída. Úsase o ficheiro de\n"
-"                        entrada de maneira predeterminada.\n"
+msgstr "  --output, -o <ficheiro>                           Ficheiro no que gardar a saída. Úsase o ficheiro de\n                        entrada de maneira predeterminada.\n"
 
 #: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
@@ -854,15 +782,11 @@ msgstr "  --newest, -n          Actualizar os modelos á última versión.\n"
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                        (de maneira predeterminada úsase a versión dos\n"
-"                        marcadores do modelo).\n"
+msgstr "                        (de maneira predeterminada úsase a versión dos\n                        marcadores do modelo).\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
-msgstr ""
-"  --template-dir <cartafol>\n"
-"                        Cartafol no que buscar modelos.\n"
+msgstr "  --template-dir <cartafol>\n                        Cartafol no que buscar modelos.\n"
 
 #: scripts/makepkg-template.pl.in:183
 #, perl-format
@@ -882,12 +806,11 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
+msgstr "© 2013-2016 Equipo de desenvolvemento de Pacman <pacman-dev@archlinux.org>.\nIsto é software libre; consulte as condicións de copia nas fontes.\nNON HAI GARANTÍA, dentro das limitacións legais.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
-msgstr ""
-"Anovar a base de datos local de Pacman para que use un formato máis novo."
+msgstr "Anovar a base de datos local de Pacman para que use un formato máis novo."
 
 #: scripts/pacman-db-upgrade.sh.in:42
 msgid "options:"
@@ -903,8 +826,7 @@ msgstr "  -h, --help           Mostra esta mensaxe de axuda."
 
 #: scripts/pacman-db-upgrade.sh.in:45
 msgid "  -r, --root <path>    set an alternate installation root"
-msgstr ""
-"  -r, --root <ruta>    Define unha ruta raíz de instalación alternativa."
+msgstr "  -r, --root <ruta>    Define unha ruta raíz de instalación alternativa."
 
 #: scripts/pacman-db-upgrade.sh.in:46
 msgid "  -V, --version        show version information and exit"
@@ -912,8 +834,7 @@ msgstr "  -V, --version        Mostra información da versión."
 
 #: scripts/pacman-db-upgrade.sh.in:47
 msgid "  --config <path>      set an alternate configuration file"
-msgstr ""
-"  --config <ruta>      Definir un ficheiro de configuración alternativo."
+msgstr "  --config <ruta>      Definir un ficheiro de configuración alternativo."
 
 #: scripts/pacman-db-upgrade.sh.in:48
 msgid "  --nocolor            disable colorized output messages"
@@ -921,10 +842,10 @@ msgstr "  --nocolor            Desactiva o uso de cores nas mensaxes de saída."
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "© 2010-2016 Equipo de desenvolvemento de Pacman <pacman-dev@archlinux.org>.\\nIsto é software libre; consulte as condicións de copia nas fontes.\\nNON HAI GARANTÍA, dentro das limitacións legais.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -941,15 +862,11 @@ msgstr "Debe contar cos permisos necesarios para anovar a base de datos."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Atopouse o ficheiro de bloqueo de Pacman. Non pode executar este script ao "
-"mesmo tempo que executa Pacman."
+msgstr "Atopouse o ficheiro de bloqueo de Pacman. Non pode executar este script ao mesmo tempo que executa Pacman."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
-msgstr ""
-"Detectouse que o formato da base de datos é anterior á versión 3.5. "
-"Anovándoo…"
+msgstr "Detectouse que o formato da base de datos é anterior á versión 3.5. Anovándoo…"
 
 #: scripts/pacman-db-upgrade.sh.in:169
 msgid "Done."
@@ -957,14 +874,11 @@ msgstr "Listo."
 
 #: scripts/pacman-db-upgrade.sh.in:173
 msgid "Pre-4.2 database format detected - upgrading..."
-msgstr ""
-"Detectouse un formato de base de datos anterior á versión 4.2, anovándoo…"
+msgstr "Detectouse un formato de base de datos anterior á versión 4.2, anovándoo…"
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"A ligazón simbólica «%s» apunta fóra da raíz de Pacman, debe solucionar o "
-"problema manualmente."
+msgstr "A ligazón simbólica «%s» apunta fóra da raíz de Pacman, debe solucionar o problema manualmente."
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -980,28 +894,20 @@ msgstr "Operacións:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add                 Engadir as chaves especificadas. Se non "
-"especifica\\n                            ningunha, leranse da entrada "
-"estándar (stdin)."
+msgstr "  -a, --add                 Engadir as chaves especificadas. Se non especifica\\n                            ningunha, leranse da entrada estándar (stdin)."
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
-msgstr ""
-"  -d, --delete              Eliminar os identificadores de chave indicados."
+msgstr "  -d, --delete              Eliminar os identificadores de chave indicados."
 
 #: scripts/pacman-key.sh.in:65
 msgid "  -e, --export              Export the specified or all keyids"
-msgstr ""
-"  -e, --export              Exportar os identificadores de chave indicados ou"
-"\\n                            todos eles."
+msgstr "  -e, --export              Exportar os identificadores de chave indicados ou\\n                            todos eles."
 
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              Listar as pegadas dixitais dos identificadores de"
-"\\n                            chave indicados ou de todos eles."
+msgstr "  -f, --finger              Listar as pegadas dixitais dos identificadores de\\n                            chave indicados ou de todos eles."
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -1009,27 +915,21 @@ msgstr "  -l, --list-keys           Listar as chaves indicadas ou todas elas."
 
 #: scripts/pacman-key.sh.in:68
 msgid "  -r, --recv-keys           Fetch the specified keyids"
-msgstr ""
-"  -r, --recv-keys           Obter os identificadores de chave indicados."
+msgstr "  -r, --recv-keys           Obter os identificadores de chave indicados."
 
 #: scripts/pacman-key.sh.in:69
 msgid "  -u, --updatedb            Update the trustdb of pacman"
-msgstr ""
-"  -u, --updatedb            Actualizar a táboa de confianza (trustdb) de "
-"Pacman."
+msgstr "  -u, --updatedb            Actualizar a táboa de confianza (trustdb) de Pacman."
 
 #: scripts/pacman-key.sh.in:70
 msgid ""
 "  -v, --verify              Verify the file(s) specified by the signature(s)"
-msgstr ""
-"  -v, --verify              Verificar os ficheiros indicados polas sinaturas."
+msgstr "  -v, --verify              Verificar os ficheiros indicados polas sinaturas."
 
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key                Mostrar un menú para tarefas de xestión de "
-"chaves en\\n                            identificadores de chaves."
+msgstr "  --edit-key                Mostrar un menú para tarefas de xestión de chaves en\\n                            identificadores de chaves."
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
@@ -1039,15 +939,11 @@ msgstr "  --import                  Importa «pubring.gpg» dos cartafoles."
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          Importa os valores de confianza en propietarios"
-"\\n                            (ownertrust) de «trustdb.gpg» nos cartafoles."
+msgstr "  --import-trustdb          Importa os valores de confianza en propietarios\\n                            (ownertrust) de «trustdb.gpg» nos cartafoles."
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                    Asegúrase de que o chaveiro se cree "
-"correctamente."
+msgstr "  --init                    Asegúrase de que o chaveiro se cree correctamente."
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
@@ -1055,46 +951,34 @@ msgstr "  --list-sigs               Lista chaves e mailas súas sinaturas."
 
 #: scripts/pacman-key.sh.in:76
 msgid "  --lsign-key               Locally sign the specified keyid"
-msgstr ""
-"  --lsign-key               Asina o identificador de chave indicado "
-"localmente."
+msgstr "  --lsign-key               Asina o identificador de chave indicado localmente."
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                Recargar as chaves predeterminadas dos chaveiros"
-"\\n                            indicados en «%s»."
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                Recargar as chaves predeterminadas dos chaveiros\\n                            indicados en «%s»."
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            Actualizar as chaves indicadas ou todas desde un"
-"\\n                            servidor."
+msgstr "  --refresh-keys            Actualizar as chaves indicadas ou todas desde un\\n                            servidor."
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <ficheiro>       Usar un ficheiro de configuración alternativo "
-"(en vez de\\n                            «%s»)"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <ficheiro>       Usar un ficheiro de configuración alternativo (en vez de\\n                            «%s»)"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <cartafol>       Definir un cartafol alternativo para GnuPG (en "
-"vez\\n                            de «%s»)."
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <cartafol>       Definir un cartafol alternativo para GnuPG (en vez\\n                            de «%s»)."
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <URL>         Indique o servidor de chaves a usar se fose"
-"\\n                            necesario."
+msgstr "  --keyserver <URL>         Indique o servidor de chaves a usar se fose\\n                            necesario."
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1166,9 +1050,7 @@ msgstr "Desactivando a chave «%s»…"
 
 #: scripts/pacman-key.sh.in:334
 msgid "A specified keyfile could not be added to the keyring."
-msgstr ""
-"Un dos ficheiros de anel de chaves indicado non puido engadirse ao anel de "
-"chaves."
+msgstr "Un dos ficheiros de anel de chaves indicado non puido engadirse ao anel de chaves."
 
 #: scripts/pacman-key.sh.in:342
 msgid "A specified key could not be removed from the keyring."
@@ -1184,8 +1066,7 @@ msgstr "Non foi posíbel exportar desde o anel unha das chaves indicadas."
 
 #: scripts/pacman-key.sh.in:372
 msgid "The fingerprint of a specified key could not be determined."
-msgstr ""
-"Non foi posíbel determinar a pegada dixital dunha das chaves indicadas."
+msgstr "Non foi posíbel determinar a pegada dixital dunha das chaves indicadas."
 
 #: scripts/pacman-key.sh.in:385 scripts/pacman-key.sh.in:404
 msgid "%s could not be imported."
@@ -1217,9 +1098,7 @@ msgstr "Non foi posíbel obter a chave remota correctamente do servidor."
 
 #: scripts/pacman-key.sh.in:477
 msgid "A specified local key could not be updated from a keyserver."
-msgstr ""
-"Non foi posíbel actualizar unha das chaves locais indicadas usando o "
-"servidor."
+msgstr "Non foi posíbel actualizar unha das chaves locais indicadas usando o servidor."
 
 #: scripts/pacman-key.sh.in:487
 msgid "The signature identified by %s could not be verified."
@@ -1235,15 +1114,11 @@ msgstr "Non foi posíbel actualizar a base de datos de confianza."
 
 #: scripts/pacman-key.sh.in:559
 msgid "Cannot find the %s binary required for all %s operations."
-msgstr ""
-"Non foi posíbel atopar o executábel «%s», necesario para todas as operacións "
-"de «%s»."
+msgstr "Non foi posíbel atopar o executábel «%s», necesario para todas as operacións de «%s»."
 
 #: scripts/pacman-key.sh.in:564
 msgid "%s needs to be run as root for this operation."
-msgstr ""
-"Para realizar esta operación, ten que executar «%s» como administrador "
-"(root)."
+msgstr "Para realizar esta operación, ten que executar «%s» como administrador (root)."
 
 #: scripts/pacman-key.sh.in:570
 msgid "%s configuration file '%s' not found."
@@ -1251,8 +1126,7 @@ msgstr "%s non se atopou o ficheiro de configuración «%s»."
 
 #: scripts/pacman-key.sh.in:591
 msgid "no operation specified (use -h for help)"
-msgstr ""
-"non indicou ningunha operación. Use o parámetro «-h» para máis información."
+msgstr "non indicou ningunha operación. Use o parámetro «-h» para máis información."
 
 #: scripts/pacman-key.sh.in:596
 msgid "Multiple operations specified."
@@ -1274,31 +1148,21 @@ msgstr "Sintaxe: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"«pacman-optimize» é un programa con algúns trucos que debería mellorar o"
-"\\nrendemento de pacman á hora de ler e escribir na súa base de datos "
-"baseada nun sistema de\\nficheiros.\\n\\n"
+msgstr "«pacman-optimize» é un programa con algúns trucos que debería mellorar o\\nrendemento de pacman á hora de ler e escribir na súa base de datos baseada nun sistema de\\nficheiros.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Dado que Pacman utiliza varios ficheiros pequenos para levar conta dos "
-"paquetes,\\nco tempo estes ficheiros adoitan fragmentarse. Este script "
-"intenta recolocar eses\\nficheiros situándoos nun lugar continuo do "
-"almacenamento, de xeito que o\\ndisco duro poda acceder aos seus datos no "
-"menor tempo posíbel.\\n"
+msgstr "Dado que Pacman utiliza varios ficheiros pequenos para levar conta dos paquetes,\\nco tempo estes ficheiros adoitan fragmentarse. Este script intenta recolocar eses\\nficheiros situándoos nun lugar continuo do almacenamento, de xeito que o\\ndisco duro poda acceder aos seus datos no menor tempo posíbel.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
-msgstr ""
-"Non foi posíbel atopar o executábel «%s», necesario para as verificacións de "
-"integridade."
+msgstr "Non foi posíbel atopar o executábel «%s», necesario para as verificacións de integridade."
 
 #: scripts/pacman-optimize.sh.in:109
 msgid "You must have correct permissions to optimize the database."
@@ -1306,8 +1170,7 @@ msgstr "Debe contar cos permisos necesarios para optimizar a base de datos."
 
 #: scripts/pacman-optimize.sh.in:125
 msgid "Cannot create temporary directory for database building."
-msgstr ""
-"Non foi posíbel crear un cartafol temporal para construír a base de datos."
+msgstr "Non foi posíbel crear un cartafol temporal para construír a base de datos."
 
 #: scripts/pacman-optimize.sh.in:128
 msgid "MD5sum'ing the old database..."
@@ -1323,9 +1186,7 @@ msgstr "Non foi posíbel arquivar %s."
 
 #: scripts/pacman-optimize.sh.in:141
 msgid "Making and MD5sum'ing the new database..."
-msgstr ""
-"Construíndo a nova base de datos e creando unha suma de comprobación da "
-"mesma…"
+msgstr "Construíndo a nova base de datos e creando unha suma de comprobación da mesma…"
 
 #: scripts/pacman-optimize.sh.in:146
 msgid "Untar'ing %s failed."
@@ -1348,10 +1209,9 @@ msgid "Rotating database into place..."
 msgstr "Colocando a base de datos na ruta correcta…"
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"Non foi posíbel substituír a vella base de datos pola nova. Comprobe «%s», "
-"«%s», e os cartafoles de «%s»."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "Non foi posíbel substituír a vella base de datos pola nova. Comprobe «%s», «%s», e os cartafoles de «%s»."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1365,9 +1225,7 @@ msgstr "Sintaxe: pkgdelta [opcións] <paquete1> <paquete2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta creará un ficheiro de diferenzas entre os paquetes.\\nPode usar "
-"«repo-add» para engadir o ficheiro de diferenzas a unha base de datos.\\n"
+msgstr "pkgdelta creará un ficheiro de diferenzas entre os paquetes.\\nPode usar «repo-add» para engadir o ficheiro de diferenzas a unha base de datos.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1388,27 +1246,20 @@ msgstr "  --nocolor         Non usar cores nos datos da saída estándar.\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size    Tamaño mínimo que debe ter un paquete para que se xeren"
-"\\n                    ficheiros de diferenzas.\\n"
+msgstr "  --min-pkg-size    Tamaño mínimo que debe ter un paquete para que se xeren\\n                    ficheiros de diferenzas.\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  Porcentaxe sobre o novo paquete a partir da cal se"
-"\\n                   descartará o ficheiro de diferenzas.\\n"
+msgstr "  --max-delta-size  Porcentaxe sobre o novo paquete a partir da cal se\\n                   descartará o ficheiro de diferenzas.\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"© 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nIsto é software libre. Nas "
-"fontes atopará os termos da licenza.\\nNon se ofrecen garantías que non "
-"esixa a lei.\\n"
+msgstr "© 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nIsto é software libre. Nas fontes atopará os termos da licenza.\\nNon se ofrecen garantías que non esixa a lei.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1416,9 +1267,7 @@ msgstr "O ficheiro «%s» do paquete non é válido."
 
 #: scripts/pkgdelta.sh.in:120
 msgid "Skipping delta creation for small package: %s - size %s"
-msgstr ""
-"Non se creará un ficheiro de diferenzas para o paquete «%s» por ser "
-"demasiado pequeno (%s)."
+msgstr "Non se creará un ficheiro de diferenzas para o paquete «%s» por ser demasiado pequeno (%s)."
 
 #: scripts/pkgdelta.sh.in:125
 msgid "The package names don't match : '%s' and '%s'"
@@ -1442,9 +1291,7 @@ msgstr "Non foi posíbel crear o ficheiro de diferenzas."
 
 #: scripts/pkgdelta.sh.in:152
 msgid "Delta package larger than maximum size. Removing."
-msgstr ""
-"O ficheiro de diferenzas eliminouse por ter un tamaño superior ao máximo "
-"permitido."
+msgstr "O ficheiro de diferenzas eliminouse por ter un tamaño superior ao máximo permitido."
 
 #: scripts/pkgdelta.sh.in:157
 msgid "Generated delta : '%s'"
@@ -1460,50 +1307,40 @@ msgstr "Non foi posíbel atopar o executábel «xdelta3». Instale «xdelta3»."
 
 #: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr ""
-"Sintaxe: repo-add [opcións] <ruta da base de datos> <paquete|diferenza> …\\n"
+msgstr "Sintaxe: repo-add [opcións] <ruta da base de datos> <paquete|diferenza> …\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add actualizará unha base de datos de paquetes a partir dun ficheiro de "
-"paquete.\\nPode indicar varios paquetes para engadir."
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add actualizará unha base de datos de paquetes a partir dun ficheiro de paquete.\\nPode indicar varios paquetes para engadir."
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta       Xerar e engadir un ficheiro de diferenzas para a"
-"\\n                    actualización do paquete.\\n"
+msgstr "  -d, --delta       Xerar e engadir un ficheiro de diferenzas para a\\n                    actualización do paquete.\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"  -n, --new         Só engadir paquetes que non estean xa na base de datos."
-"\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "  -n, --new         Só engadir paquetes que non estean xa na base de datos.\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "  -R, --remove      Eliminar do disco o ficheiro antigo do paquete\\n                    tras actualizar a base de datos.\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Sintaxe: repo-remove [opcións] <ruta da base de datos> <paquete|diferenza> …"
-"\\n"
+msgstr "Sintaxe: repo-remove [opcións] <ruta da base de datos> <paquete|diferenza> …\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove eliminará da base de datos de paquetes indicada o paquete co nome"
-"\\nindicado. Pode indicar varios paquetes para eliminar.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove eliminará da base de datos de paquetes indicada o paquete co nome\\nindicado. Pode indicar varios paquetes para eliminar.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1511,24 +1348,19 @@ msgstr "Continúe, aquí non hai nada que ver.\\n"
 
 #: scripts/repo-add.sh.in:78
 msgid "  --nocolor         turn off color in output\\n"
-msgstr ""
-"  --nocolor         Desactivar o uso de cores nas mensaxes de saída.\\n"
+msgstr "  --nocolor         Desactivar o uso de cores nas mensaxes de saída.\\n"
 
 #: scripts/repo-add.sh.in:80
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
-msgstr ""
-"  -s, --sign        Asinar a base de datos con GnuPG tras a actualización.\\n"
+msgstr "  -s, --sign        Asinar a base de datos con GnuPG tras a actualización.\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <chave> Usar a chave indicada para asinar a base de datos.\\n"
+msgstr "  -k, --key <chave> Usar a chave indicada para asinar a base de datos.\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
-"  -v, --verify      Verificar a sinatura da base de datos antes de "
-"actualizala.\\n"
+msgstr "  -v, --verify      Verificar a sinatura da base de datos antes de actualizala.\\n"
 
 #: scripts/repo-add.sh.in:83
 msgid ""
@@ -1538,8 +1370,7 @@ msgstr "\\nVéxase %s(8) para máis información sobre as opcións dispoñíbeis
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Exemplo:  repo-add /ruta/a/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Exemplo:  repo-add /ruta/a/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1547,13 +1378,10 @@ msgstr "Exemplo:  repo-remove /ruta/a/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"© 2006-2016 Equipo de desenvolvemento de Pacman <pacman-dev@archlinux.org>\\n"
-"\\nIsto é software libre. Nas fontes atopará os termos da licenza.\\nNon se "
-"ofrecen garantías que non esixa a lei.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "© 2006-2016 Equipo de desenvolvemento de Pacman <pacman-dev@archlinux.org>\\n\\nIsto é software libre. Nas fontes atopará os termos da licenza.\\nNon se ofrecen garantías que non esixa a lei.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1569,7 +1397,7 @@ msgstr "Eliminando a entrada «%s»…"
 
 #: scripts/repo-add.sh.in:195
 msgid "Removing empty deltas file..."
-msgstr ""
+msgstr "Eliminando o ficheiro de diferenzas baleiro…"
 
 #: scripts/repo-add.sh.in:216
 msgid "Cannot find the gpg binary! Is GnuPG installed?"
@@ -1577,7 +1405,7 @@ msgstr "Non foi posíbel atopar o executábel «gpg». Instalou GnuPG?"
 
 #: scripts/repo-add.sh.in:261
 msgid "Signing database '%s'..."
-msgstr ""
+msgstr "Asinando a base de datos «%s»…"
 
 #: scripts/repo-add.sh.in:270
 msgid "Created signature file '%s'"
@@ -1585,7 +1413,7 @@ msgstr "Creouse o ficheiro de sinatura «%s»."
 
 #: scripts/repo-add.sh.in:272
 msgid "Failed to sign package database file '%s'"
-msgstr ""
+msgstr "Non foi posíbel asinar o ficheiro de base de datos de paquetes «%s»."
 
 #: scripts/repo-add.sh.in:281
 msgid "Verifying database signature..."
@@ -1605,7 +1433,7 @@ msgstr "A sinatura da base de datos non é correcta!"
 
 #: scripts/repo-add.sh.in:305
 msgid "'%s' does not have a valid database archive extension."
-msgstr ""
+msgstr "«%s» non ten unha extensión de arquivo de base de datos válida."
 
 #: scripts/repo-add.sh.in:351
 msgid "An entry for '%s' already existed"
@@ -1613,7 +1441,7 @@ msgstr "Xa existía unha entrada para «%s»."
 
 #: scripts/repo-add.sh.in:368
 msgid "Cannot use armored signatures for packages: %s"
-msgstr ""
+msgstr "Non poden usarse sinaturas protexidas para paquetes: %s"
 
 #: scripts/repo-add.sh.in:373
 msgid "Invalid package signature file '%s'."
@@ -1637,7 +1465,7 @@ msgstr "Non se atopou o ficheiro do paquete vello: %s"
 
 #: scripts/repo-add.sh.in:461
 msgid "Removing old package file '%s'"
-msgstr ""
+msgstr "Eliminando o ficheiro anterior do paquete, «%s»."
 
 #: scripts/repo-add.sh.in:522
 msgid "Failed to acquire lockfile: %s."
@@ -1649,8 +1477,7 @@ msgstr "O proceso «%s» está a usala."
 
 #: scripts/repo-add.sh.in:536
 msgid "Repository file '%s' is not a proper pacman database."
-msgstr ""
-"O ficheiro de repositorio «%s» non é unha base de datos de Pacman válida."
+msgstr "O ficheiro de repositorio «%s» non é unha base de datos de Pacman válida."
 
 #: scripts/repo-add.sh.in:541
 msgid "Extracting database to a temporary location..."
@@ -1706,8 +1533,7 @@ msgstr "A orde indicada, «%s», non é válida."
 
 #: scripts/repo-add.sh.in:734
 msgid "Cannot create temp directory for database building."
-msgstr ""
-"Non foi posíbel crear un cartafol temporal para construír a base de datos."
+msgstr "Non foi posíbel crear un cartafol temporal para construír a base de datos."
 
 #: scripts/repo-add.sh.in:812
 msgid "Creating updated database file '%s'"
@@ -1719,7 +1545,7 @@ msgstr "Non se modificou ningún paquete, non hai que facer nada."
 
 #: scripts/libmakepkg/lint_package.sh.in:41
 msgid "Checking for packaging issue..."
-msgstr ""
+msgstr "Comprobando se hai problemas de empaquetamento…"
 
 #: scripts/libmakepkg/lint_package/build_references.sh.in:33
 #: scripts/libmakepkg/lint_package/build_references.sh.in:36
@@ -1791,8 +1617,7 @@ msgstr "%s ten que ser un valor decimal, non %s."
 
 #: scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in:39
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
-msgstr ""
-"«%s» non pode conter dous puntos («:»), guións («-») ou espazos en branco."
+msgstr "«%s» non pode conter dous puntos («:»), guións («-») ou espazos en branco."
 
 #: scripts/libmakepkg/lint_pkgbuild/provides.sh.in:56
 msgid "%s array cannot contain comparison (< or >) operators."
@@ -1809,17 +1634,17 @@ msgstr "O ficheiro %s (%s) non existe ou non é un ficheiro normal."
 #: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:47
 #: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:82
 msgid "%s should be an array"
-msgstr ""
+msgstr "%s debería ser unha matriz."
 
 #: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:61
 #: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:92
 msgid "%s_%s should be an array"
-msgstr ""
+msgstr "%s_%s debería ser unha matriz."
 
 #: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:72
 #: scripts/libmakepkg/lint_pkgbuild/variable.sh.in:100
 msgid "%s should not be an array"
-msgstr ""
+msgstr "%s non debería ser unha matriz."
 
 #: scripts/libmakepkg/source.sh.in:40
 msgid "Retrieving sources..."
@@ -1831,7 +1656,7 @@ msgstr "Extraendo as fontes…"
 
 #: scripts/libmakepkg/source/bzr.sh.in:47
 msgid "Branching %s..."
-msgstr ""
+msgstr "Creando unha rama a partir de %s…"
 
 #: scripts/libmakepkg/source/bzr.sh.in:49
 msgid "Failure while branching %s"
@@ -1839,7 +1664,7 @@ msgstr "Non foi posíbel crear unha rama para «%s»…"
 
 #: scripts/libmakepkg/source/bzr.sh.in:54
 msgid "Pulling %s..."
-msgstr ""
+msgstr "Descargando %s…"
 
 #: scripts/libmakepkg/source/bzr.sh.in:58
 msgid "Failure while pulling %s"
@@ -1847,30 +1672,30 @@ msgstr "Produciuse un erro ao obter «%s»."
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Referencia descoñecida: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Creando unha copia de traballo do repositorio %s %s…"
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
-msgstr ""
-"Produciuse un erro durante a actualización da copia local do repositorio «%s "
-"%s»."
+msgstr "Produciuse un erro durante a actualización da copia local do repositorio «%s %s»."
 
 #: scripts/libmakepkg/source/bzr.sh.in:100
 #: scripts/libmakepkg/source/git.sh.in:95
 #: scripts/libmakepkg/source/git.sh.in:120
 #: scripts/libmakepkg/source/hg.sh.in:98
 msgid "Failure while creating working copy of %s %s repo"
-msgstr ""
-"Produciuse un erro ao crear unha copia de traballo do repositorio %s %s."
+msgstr "Produciuse un erro ao crear unha copia de traballo do repositorio %s %s."
 
 #: scripts/libmakepkg/source/file.sh.in:36
 #: scripts/libmakepkg/source/local.sh.in:36
@@ -1893,12 +1718,14 @@ msgstr "Extraendo «%s» con «%s»."
 msgid "Failed to extract %s"
 msgstr "Non foi posíbel extraer «%s»."
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Clonando o repositorio %s %s…"
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Produciuse un erro ao descargar o repositorio %s %s."
@@ -1907,12 +1734,14 @@ msgstr "Produciuse un erro ao descargar o repositorio %s %s."
 msgid "%s is not a clone of %s"
 msgstr "%s non é un clon de %s."
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Actualizando o repositorio %s %s…"
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Produciuse un erro ao actualizar o repositorio %s %s."
@@ -1939,11 +1768,11 @@ msgstr "Eliminando «%s» ficheiros…"
 
 #: scripts/libmakepkg/tidy/optipng.sh.in:35
 msgid "Optimizing PNG images..."
-msgstr ""
+msgstr "Optimizando as imaxes PNG…"
 
 #: scripts/libmakepkg/tidy/optipng.sh.in:40
 msgid "Could not optimize PNG image : %s"
-msgstr ""
+msgstr "Non foi posíbel optimizar a imaxe PNG: %s"
 
 #: scripts/libmakepkg/tidy/purge.sh.in:35
 msgid "Purging unwanted files..."
diff --git a/scripts/po/hr.po b/scripts/po/hr.po
index 602ab4ba..9d382388 100644
--- a/scripts/po/hr.po
+++ b/scripts/po/hr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Ivica  Kolić <ikoli@yahoo.com>, 2012-2015
 msgid ""
@@ -11,14 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 03:32+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Croatian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/hr/)\n"
-"Language: hr\n"
+"Language-Team: Croatian (http://www.transifex.com/toofishes/archlinux-pacman/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: scripts/makepkg.sh.in:135
 msgid "Cleaning up..."
@@ -99,7 +97,8 @@ msgid "Generating checksums for source files..."
 msgstr ""
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
 msgstr ""
 
 #: scripts/makepkg.sh.in:422
@@ -408,7 +407,8 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1696
@@ -481,7 +481,8 @@ msgid ""
 msgstr ""
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1716
@@ -517,7 +518,8 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1724
@@ -588,8 +590,7 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"  --noprogressbar Ne prikazuj traku napretka prilikom preuzimanja datoteka"
+msgstr "  --noprogressbar Ne prikazuj traku napretka prilikom preuzimanja datoteka"
 
 #: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
@@ -597,10 +598,11 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
@@ -836,9 +838,9 @@ msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
@@ -949,8 +951,8 @@ msgstr ""
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:79
@@ -960,14 +962,14 @@ msgstr ""
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:86
@@ -1146,8 +1148,8 @@ msgstr ""
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
@@ -1203,7 +1205,8 @@ msgid "Rotating database into place..."
 msgstr ""
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr ""
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1304,8 +1307,8 @@ msgstr "Upotreba: repo-add [options] <path-to-db> <package|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:62
@@ -1314,13 +1317,14 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:66
@@ -1329,9 +1333,9 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:75
@@ -1370,9 +1374,9 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:146
@@ -1664,18 +1668,21 @@ msgstr ""
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr ""
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Stvaram radnu kopiju %s %s repozitorija..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Neuspjeh tijekom ažuriranja radne kopije %s %s repozitorija"
 
@@ -1707,12 +1714,14 @@ msgstr "Raspakiram %s pomoću %s"
 msgid "Failed to extract %s"
 msgstr "Neuspjelo raspakiranje %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Kloniram %s %s repozitorij..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Neuspjeh tijekom preuzimanja %s %s repozitorija"
@@ -1721,12 +1730,14 @@ msgstr "Neuspjeh tijekom preuzimanja %s %s repozitorija"
 msgid "%s is not a clone of %s"
 msgstr "%s nije klon od %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Ažuriram  %s %s repozitorij..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Neuspjeh tijekom ažuriranja %s %s repozitorija"
diff --git a/scripts/po/hu.po b/scripts/po/hu.po
index 0ac2567d..278815f8 100644
--- a/scripts/po/hu.po
+++ b/scripts/po/hu.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # György Balló <ballogy@freestart.hu>, 2013
 # Gábor Nagy <ngaba@bibl.u-szeged.hu>, 2012
@@ -15,12 +15,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 03:32+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Hungarian (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/hu/)\n"
-"Language: hu\n"
+"Language-Team: Hungarian (http://www.transifex.com/toofishes/archlinux-pacman/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -102,10 +101,9 @@ msgid "Generating checksums for source files..."
 msgstr "Forrásfájlok ellenőrzőösszegeinek generálása..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Nem található az %s bináris, ami a forrásfájlok ellenőrzőösszegeinek "
-"generálásához szükséges."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Nem található az %s bináris, ami a forrásfájlok ellenőrzőösszegeinek generálásához szükséges."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -320,8 +318,7 @@ msgstr "Nem sikerült létrehozni a forráscsomagfájlt."
 
 #: scripts/makepkg.sh.in:1389
 msgid "Failed to create symlink to source package file."
-msgstr ""
-"Nem sikerült létrehozni a forráscsomagfájlra mutató szimbolikus linket."
+msgstr "Nem sikerült létrehozni a forráscsomagfájlra mutató szimbolikus linket."
 
 #: scripts/makepkg.sh.in:1401
 msgid "Installing package %s with %s..."
@@ -341,14 +338,11 @@ msgstr "Ismeretlen letöltési protokoll: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Nem található a %s bináris, ami a VCS forrás követelményeinek ellenőrzéséhez "
-"szükséges."
+msgstr "Nem található a %s bináris, ami a VCS forrás követelményeinek ellenőrzéséhez szükséges."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
-msgstr ""
-"Nem található a(z) %s csomag, ami a(z) %s források kezeléséhez szükséges."
+msgstr "Nem található a(z) %s csomag, ami a(z) %s források kezeléséhez szükséges."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
@@ -356,9 +350,7 @@ msgstr "Nem található a %s bináris, ami a függőségi műveletekhez szüksé
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Nem található a %s bináris. A rendszergazdai jogosultságok megszerzéséhez a "
-"%s lesz használva."
+msgstr "Nem található a %s bináris. A rendszergazdai jogosultságok megszerzéséhez a %s lesz használva."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -370,8 +362,7 @@ msgstr "Nem található a %s bináris, ami a csomagok aláírásához szüksége
 
 #: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
-"Nem található a %s bináris, ami a forrásfájlok ellenőrzéséhez szükséges."
+msgstr "Nem található a %s bináris, ami a forrásfájlok ellenőrzéséhez szükséges."
 
 #: scripts/makepkg.sh.in:1547
 msgid ""
@@ -392,20 +383,15 @@ msgstr "Nem található a %s bináris, ami az elosztott fordításhoz szüksége
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Nem található a %s bináris, ami a fordító-gyorsítótár használatához "
-"szükséges."
+msgstr "Nem található a %s bináris, ami a fordító-gyorsítótár használatához szükséges."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"Nem található a %s bináris, ami az objektumfájlok megtisztításához szükséges."
+msgstr "Nem található a %s bináris, ami az objektumfájlok megtisztításához szükséges."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Nem található a %s bináris, ami a man és info oldalak tömörítéséhez "
-"szükséges."
+msgstr "Nem található a %s bináris, ami a man és info oldalak tömörítéséhez szükséges."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -422,14 +408,12 @@ msgstr "A csomagcsoport már le lett fordítva, létező csomagok telepítése..
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
-msgstr ""
-"A csomagcsoport már le lett fordítva. (a felülíráshoz használja az %s opciót)"
+msgstr "A csomagcsoport már le lett fordítva. (a felülíráshoz használja az %s opciót)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"A csomagcsoport egy része már le lett fordítva. (a felülíráshoz használja az "
-"%s opciót)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "A csomagcsoport egy része már le lett fordítva. (a felülíráshoz használja az %s opciót)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -461,9 +445,7 @@ msgstr "  -d, --nodeps     Minden függőségellenőrzés kihagyása"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  Ne bontsa ki a forrásfájlokat (használja a meglévő %s "
-"könyvtárat)"
+msgstr "  -e, --noextract  Ne bontsa ki a forrásfájlokat (használja a meglévő %s könyvtárat)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -500,13 +482,12 @@ msgstr "  -p <fájl>        Alternatív fordítószkript használata ('%s' helye
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Telepített függőségek eltávolítása sikeres fordítás után"
+msgstr "  -r, --rmdeps     Telepített függőségek eltávolítása sikeres fordítás után"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr ""
-"  -R, --repackage  A csomag tartalmának újracsomagolása újrafordítás nélkül"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
+msgstr "  -R, --repackage  A csomag tartalmának újracsomagolása újrafordítás nélkül"
 
 #: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
@@ -515,8 +496,7 @@ msgstr "  -s, --syncdeps   Hiányzó függőségek telepítése %snal"
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source     Csak forrás tarball generálása letöltött források nélkül"
+msgstr "  -S, --source     Csak forrás tarball generálása letöltött források nélkül"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -526,9 +506,7 @@ msgstr "  -V, --version    Verzióinformációk kiírása és kilépés"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      Csak forrás tarball generálása a letöltött forrásokkal "
-"együtt"
+msgstr "  --allsource      Csak forrás tarball generálása a letöltött forrásokkal együtt"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -536,9 +514,7 @@ msgstr "  --check          A %s funkció futtatása a %s-ben"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <fájl>  Használjon egy alternatív konfiguráció fájlt ('%s' "
-"helyett)"
+msgstr "  --config <fájl>  Használjon egy alternatív konfiguráció fájlt ('%s' helyett)"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -546,9 +522,9 @@ msgstr "  --holdver        Ne frissítse a VCS forrásokat"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <kulcs>    Kulcs megadása %s aláíráshoz az alapértelmezett helyett"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <kulcs>    Kulcs megadása %s aláíráshoz az alapértelmezett helyett"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -586,9 +562,7 @@ msgstr "  --skipchecksums  Ne ellenőrizze a forrásfájlok ellenőrzőösszegé
 #: scripts/makepkg.sh.in:1732
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
-msgstr ""
-"  --skipinteg      Ne hajtson végre semmilyen eredetiségellenőrzést a "
-"forrásfájlokon"
+msgstr "  --skipinteg      Ne hajtson végre semmilyen eredetiségellenőrzést a forrásfájlokon"
 
 #: scripts/makepkg.sh.in:1733
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
@@ -598,9 +572,7 @@ msgstr "  --skippgpcheck   Ne ellenőrizze a forrásfájlokat PGP aláírásokka
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource   Forrásfájlok letöltése (ha szükséges), és integritás-"
-"ellenőrzés végrehajtása"
+msgstr "  --verifysource   Forrásfájlok letöltése (ha szükséges), és integritás-ellenőrzés végrehajtása"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -630,10 +602,11 @@ msgstr "Ha %s nincs megadva, %s a '%s'-et fogja keresni"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
@@ -646,37 +619,29 @@ msgstr "%s nem található."
 
 #: scripts/makepkg.sh.in:1909 scripts/makepkg.sh.in:1916
 msgid "You do not have write permission to create packages in %s."
-msgstr ""
-"Nincs írási jogosultsága ahhoz, hogy csomagokat készítsen a %s könyvtárban."
+msgstr "Nincs írási jogosultsága ahhoz, hogy csomagokat készítsen a %s könyvtárban."
 
 #: scripts/makepkg.sh.in:1929
 msgid "You do not have write permission to store packages in %s."
-msgstr ""
-"Nincs írási jogosultsága ahhoz, hogy csomagokat tároljon a %s könyvtárban."
+msgstr "Nincs írási jogosultsága ahhoz, hogy csomagokat tároljon a %s könyvtárban."
 
 #: scripts/makepkg.sh.in:1937
 msgid "You do not have write permission to store downloads in %s."
-msgstr ""
-"Nincs írási jogosultsága ahhoz, hogy letöltéseket tároljon a %s könyvtárban."
+msgstr "Nincs írási jogosultsága ahhoz, hogy letöltéseket tároljon a %s könyvtárban."
 
 #: scripts/makepkg.sh.in:1946
 msgid "You do not have write permission to store source tarballs in %s."
-msgstr ""
-"Nincs írási jogosultsága ahhoz, hogy forrás tarballokat tároljon a %s "
-"könyvtárban."
+msgstr "Nincs írási jogosultsága ahhoz, hogy forrás tarballokat tároljon a %s könyvtárban."
 
 #: scripts/makepkg.sh.in:1959
 msgid "You do not have write permission to store logs in %s."
-msgstr ""
-"Nincs írási jogosultsága ahhoz, hogy naplófájlokat tároljon a %s könyvtárban."
+msgstr "Nincs írási jogosultsága ahhoz, hogy naplófájlokat tároljon a %s könyvtárban."
 
 #: scripts/makepkg.sh.in:1972
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"A %s futtatása rendszergazdaként nem engedélyezett, mivel a\\nrendszer "
-"végzetes, katasztrofális károsodását okozhatja."
+msgstr "A %s futtatása rendszergazdaként nem engedélyezett, mivel a\\nrendszer végzetes, katasztrofális károsodását okozhatja."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -712,8 +677,7 @@ msgstr "Csomag készítése: %s"
 
 #: scripts/makepkg.sh.in:2133
 msgid "A source package has already been built. (use %s to overwrite)"
-msgstr ""
-"A forráscsomag már le lett fordítva. (a felülíráshoz használja az %s opciót)"
+msgstr "A forráscsomag már le lett fordítva. (a felülíráshoz használja az %s opciót)"
 
 #: scripts/makepkg.sh.in:2152
 msgid "Source package created: %s"
@@ -771,9 +735,7 @@ msgstr "érvénytelen sablonsor: nem található sablonnév\n"
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr ""
-"a(z) '%s' név érvénytelen karaktereket tartalmaz. Engedélyezett: [:alnum:]+_."
-"@-\n"
+msgstr "a(z) '%s' név érvénytelen karaktereket tartalmaz. Engedélyezett: [:alnum:]+_.@-\n"
 
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
@@ -806,14 +768,11 @@ msgstr "Opciók:\n"
 #: scripts/makepkg-template.pl.in:178
 #, perl-format
 msgid "  --input, -p <file>    Build script to read (default: %s)\n"
-msgstr ""
-"  --input, -p <fájl>    Beolvasandó fordítószkript (alapértelmezett: %s)\n"
+msgstr "  --input, -p <fájl>    Beolvasandó fordítószkript (alapértelmezett: %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
-msgstr ""
-"  --output, -o <fájl>   fájl, amibe a kimenet kerül (alapértelmezett: "
-"bemeneti fájl)\n"
+msgstr "  --output, -o <fájl>   fájl, amibe a kimenet kerül (alapértelmezett: bemeneti fájl)\n"
 
 #: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
@@ -823,9 +782,7 @@ msgstr "  --newest, -n          sablonok frissítése a legújabb verzióra\n"
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                        (alapértelmezett: a sablonjelölőkben megadott verzió "
-"használata)\n"
+msgstr "                        (alapértelmezett: a sablonjelölőkben megadott verzió használata)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
@@ -885,9 +842,9 @@ msgstr "  --nocolor            színezett kimeneti üzenetek kikapcsolása"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
@@ -905,9 +862,7 @@ msgstr "Megfelelő jogosultságok kellenek az adatbázis frissítéséhez."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Pacman zárolófájlt találtam. Ez az eszköz nem futtatható, miközben a pacman "
-"fut."
+msgstr "Pacman zárolófájlt találtam. Ez az eszköz nem futtatható, miközben a pacman fut."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -923,9 +878,7 @@ msgstr "4.2-es verzió előtti adatbázis-formátumot találtam - frissítés...
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"a '%s' szimbolikus link a pacman gyökérkönyvtáron kívülre mutat, kézi "
-"javítás szükséges"
+msgstr "a '%s' szimbolikus link a pacman gyökérkönyvtáron kívülre mutat, kézi javítás szükséges"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -941,8 +894,7 @@ msgstr "Műveletek:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add                 A megadott kulcsok hozzáadása (üres stdin-hez)"
+msgstr "  -a, --add                 A megadott kulcsok hozzáadása (üres stdin-hez)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
@@ -950,21 +902,16 @@ msgstr "  -d, --delete              A megadott kulcsazonosítók eltávolítása
 
 #: scripts/pacman-key.sh.in:65
 msgid "  -e, --export              Export the specified or all keyids"
-msgstr ""
-"  -e, --export              A megadott vagy az összes kulcsazonosító "
-"exportálása"
+msgstr "  -e, --export              A megadott vagy az összes kulcsazonosító exportálása"
 
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              Ujjlenyomatok felsorolása a megadott vagy az "
-"összes kulcsazonosítóhoz"
+msgstr "  -f, --finger              Ujjlenyomatok felsorolása a megadott vagy az összes kulcsazonosítóhoz"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
-msgstr ""
-"  -l, --list-keys           A megadott vagy az összes kulcs felsorolása"
+msgstr "  -l, --list-keys           A megadott vagy az összes kulcs felsorolása"
 
 #: scripts/pacman-key.sh.in:68
 msgid "  -r, --recv-keys           Fetch the specified keyids"
@@ -977,16 +924,12 @@ msgstr "  -u, --updatedb            Pacman trustdb-jének frissítése"
 #: scripts/pacman-key.sh.in:70
 msgid ""
 "  -v, --verify              Verify the file(s) specified by the signature(s)"
-msgstr ""
-"  -v, --verify              A fájl(ok) ellenőrzése a megadott aláírás(ok) "
-"alapján"
+msgstr "  -v, --verify              A fájl(ok) ellenőrzése a megadott aláírás(ok) alapján"
 
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key                Menü megjelenítése kulcskezelési feladatokhoz a "
-"kulcsazonosítókon"
+msgstr "  --edit-key                Menü megjelenítése kulcskezelési feladatokhoz a kulcsazonosítókon"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
@@ -996,15 +939,11 @@ msgstr "  --import                  pubring.gpg importálása a könyvtár(ak)b
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          ownertrust értékek importálása a könyvtár(ak)ban "
-"lévő trustdb.gpg fájlból"
+msgstr "  --import-trustdb          ownertrust értékek importálása a könyvtár(ak)ban lévő trustdb.gpg fájlból"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                    Ellenőrizze, hogy a kulcstartó megfelelően "
-"inicializált-e"
+msgstr "  --init                    Ellenőrizze, hogy a kulcstartó megfelelően inicializált-e"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
@@ -1012,44 +951,34 @@ msgstr "  --list-sigs               Kulcsok és aláírásaik felsorolása"
 
 #: scripts/pacman-key.sh.in:76
 msgid "  --lsign-key               Locally sign the specified keyid"
-msgstr ""
-"  --lsign-key               Helyileg írja alá a megadott kulcsazonosítókat"
+msgstr "  --lsign-key               Helyileg írja alá a megadott kulcsazonosítókat"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                Az alapértelmezett kulcsok újratöltése a "
-"(megadott) kulcstartókból\\n                            a '%s' könyvtárból"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                Az alapértelmezett kulcsok újratöltése a (megadott) kulcstartókból\\n                            a '%s' könyvtárból"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            A megadott vagy az összes kulcs frissítése egy "
-"kulcsszerverről"
+msgstr "  --refresh-keys            A megadott vagy az összes kulcs frissítése egy kulcsszerverről"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <fájl>           Alternatív konfigurációs fájl használata"
-"\\n                            ('%s' helyett)"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <fájl>           Alternatív konfigurációs fájl használata\\n                            ('%s' helyett)"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <könyvtár>       Alternatív könyvtár beállítása a GnuPG-hez"
-"\\n                            ('%s' helyett)"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <könyvtár>       Alternatív könyvtár beállítása a GnuPG-hez\\n                            ('%s' helyett)"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <szerver-url> Használandó kulcsszerver megadása, ha szükséges"
+msgstr "  --keyserver <szerver-url> Használandó kulcsszerver megadása, ha szükséges"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1089,8 +1018,7 @@ msgstr "Nem érhető el titkos kulcs az aláíráshoz."
 
 #: scripts/pacman-key.sh.in:240
 msgid "Use '%s' to generate a default secret key."
-msgstr ""
-"Egy alapértelmezett titkos kulcs generálásához használja a '%s' parancsot."
+msgstr "Egy alapértelmezett titkos kulcs generálásához használja a '%s' parancsot."
 
 #: scripts/pacman-key.sh.in:259
 msgid "No keyring files exist in %s."
@@ -1220,35 +1148,25 @@ msgstr "Használat: %s [--nocolor] [pacman_adatbázis_gyökérkönyvtár]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"A pacman-optimize egy kis hack, aminek javítani kellene a pacman"
-"\\nteljesítményét amikor olvassa/írja a fájlrendszer alapú adatbázisát.\\n\\n"
+msgstr "A pacman-optimize egy kis hack, aminek javítani kellene a pacman\\nteljesítményét amikor olvassa/írja a fájlrendszer alapú adatbázisát.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Mivel a pacman sok kis fájlt használ ahhoz, hogy figyelemmel kövesse\\na "
-"csomagokat, van egy tendencia arra, hogy ezek töredezetté válnak\\naz idő "
-"során. Ez a szkript megkísérli ezeket a kis fájlokat egy\\nfolyamatos helyre "
-"rakni a merevlemezen. Ez azt eredményezi, hogy\\na merevlemez gyorsabban "
-"tudja majd olvasni azokat, mivel a\\nmerevlemezfejnek nem kell olyan sokat "
-"mozognia.\\n"
+msgstr "Mivel a pacman sok kis fájlt használ ahhoz, hogy figyelemmel kövesse\\na csomagokat, van egy tendencia arra, hogy ezek töredezetté válnak\\naz idő során. Ez a szkript megkísérli ezeket a kis fájlokat egy\\nfolyamatos helyre rakni a merevlemezen. Ez azt eredményezi, hogy\\na merevlemez gyorsabban tudja majd olvasni azokat, mivel a\\nmerevlemezfejnek nem kell olyan sokat mozognia.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
-msgstr ""
-"Nem található az %s bináris, ami az integritás-ellenőrzéshez szükséges."
+msgstr "Nem található az %s bináris, ami az integritás-ellenőrzéshez szükséges."
 
 #: scripts/pacman-optimize.sh.in:109
 msgid "You must have correct permissions to optimize the database."
-msgstr ""
-"Az adatbázis optimalizálásához megfelelő jogosultságokkal kell rendelkeznie."
+msgstr "Az adatbázis optimalizálásához megfelelő jogosultságokkal kell rendelkeznie."
 
 #: scripts/pacman-optimize.sh.in:125
 msgid "Cannot create temporary directory for database building."
@@ -1291,10 +1209,9 @@ msgid "Rotating database into place..."
 msgstr "Adatbázis helyre forgatása..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"Az új adatbázis helyettesítése nem sikerült. Ellenőrizze a %s, %s és %s "
-"könyvtárakat."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "Az új adatbázis helyettesítése nem sikerült. Ellenőrizze a %s, %s és %s könyvtárakat."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1308,9 +1225,7 @@ msgstr "Használat: pkgdelta [opció] <csomag1> <csomag2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"a pkgdelta egy deltafájlt hoz létre két csomag között.\\nEz a deltafájl "
-"később hozzáadható egy adatbázishoz a repo-add használatával.\\n"
+msgstr "a pkgdelta egy deltafájlt hoz létre két csomag között.\\nEz a deltafájl később hozzáadható egy adatbázishoz a repo-add használatával.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1331,26 +1246,20 @@ msgstr "  --nocolor         színek eltávolítása a kimenetről\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size    minimális csomagméret, ami felett delta lesz generálva\\n"
+msgstr "  --min-pkg-size    minimális csomagméret, ami felett delta lesz generálva\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  csomagméret százaléka, ami felett a delták el lesznek "
-"dobva\\n"
+msgstr "  --max-delta-size  csomagméret százaléka, ami felett a delták el lesznek dobva\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nEz egy szabad "
-"szoftver; a forráskódban leírtak szerint terjeszthető.\\nNINCS GARANCIA, a "
-"jog által engedélyezett mértékig.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nEz egy szabad szoftver; a forráskódban leírtak szerint terjeszthető.\\nNINCS GARANCIA, a jog által engedélyezett mértékig.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1398,49 +1307,40 @@ msgstr "Nem található az xdelta3 bináris! Telepítve van az xdelta3?"
 
 #: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr ""
-"Használat: repo-add [opciók] <adatbázis-elérési-út> <csomag|delta> ...\\n"
+msgstr "Használat: repo-add [opciók] <adatbázis-elérési-út> <csomag|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"A repo-add csomagadatbázist frissít a megadott csomagfájl(ok) tartalma "
-"alapján.\\nTöbb csomag is megadható a parancssorban.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "A repo-add csomagadatbázist frissít a megadott csomagfájl(ok) tartalma alapján.\\nTöbb csomag is megadható a parancssorban.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta       delta generálása és hozzáadása a csomagfrissítéshez\\n"
+msgstr "  -d, --delta       delta generálása és hozzáadása a csomagfrissítéshez\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"  -n, --new         csak olyan csomagok hozzáadása, amik még nincsenek az "
-"adatbázisban\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "  -n, --new         csak olyan csomagok hozzáadása, amik még nincsenek az adatbázisban\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Használat: repo-remove [opciók] <adatbázis-elérési-út> <csomagnév|delta> ..."
-"\\n"
+msgstr "Használat: repo-remove [opciók] <adatbázis-elérési-út> <csomagnév|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"A repo-remove csomagadatbázist frissít a parancssorban megadott "
-"csomag(ok)\\neltávolításával. Több csomagnév is megadható a parancssorban.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "A repo-remove csomagadatbázist frissít a parancssorban megadott csomag(ok)\\neltávolításával. Több csomagnév is megadható a parancssorban.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1456,26 +1356,21 @@ msgstr "  -s, --sign        adatbázis aláírása GnuPG-vel a frissítés után
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <kulcs> a megadott kulcs használata az adatbázis aláírásához\\n"
+msgstr "  -k, --key <kulcs> a megadott kulcs használata az adatbázis aláírásához\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
-"  -v, --verify      adatbázis aláírásának ellenőrzése frissítés előtt\\n"
+msgstr "  -v, --verify      adatbázis aláírásának ellenőrzése frissítés előtt\\n"
 
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nAz elérhető opciókról további részleteket és leírásokat talál %s(8)-ban."
-"\\n"
+msgstr "\\nAz elérhető opciókról további részleteket és leírásokat talál %s(8)-ban.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Példa:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Példa:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1483,9 +1378,9 @@ msgstr "Példa:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:146
@@ -1638,8 +1533,7 @@ msgstr "Érvénytelen '%s' parancsnév lett meghatározva."
 
 #: scripts/repo-add.sh.in:734
 msgid "Cannot create temp directory for database building."
-msgstr ""
-"Nem sikerült létrehozni az ideiglenes könyvtárat az adatbázis építéséhez."
+msgstr "Nem sikerült létrehozni az ideiglenes könyvtárat az adatbázis építéséhez."
 
 #: scripts/repo-add.sh.in:812
 msgid "Creating updated database file '%s'"
@@ -1778,18 +1672,21 @@ msgstr "Hiba történt %s lekérése közben"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Ismeretlen hivatkozás: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "%s %s tároló munkamásolatának elkészítése..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Hiba történt %s %s tároló munkamásolatának frissítése közben"
 
@@ -1821,12 +1718,14 @@ msgstr "%s kibontása a(z) %s programmal"
 msgid "Failed to extract %s"
 msgstr "%s kibontása nem sikerült"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "%s %s tároló klónozása..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Hiba történt %s %s tároló letöltése közben"
@@ -1835,12 +1734,14 @@ msgstr "Hiba történt %s %s tároló letöltése közben"
 msgid "%s is not a clone of %s"
 msgstr "%s nem %s klónja"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "%s %s tároló frissítése..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Hiba történt %s %s tároló frissítése közben"
diff --git a/scripts/po/id.po b/scripts/po/id.po
index 67ba7ad3..d98f52a0 100644
--- a/scripts/po/id.po
+++ b/scripts/po/id.po
@@ -1,13 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Ibnu Daru Aji, 2013
 # Gregori, 2013
 # Ibnu Daru Aji, 2013-2015
 # Hasan Al Banna, 2013
-# Ibnu Daru Aji, 2013
+# Ibnu Daru Aji, 2013,2016
 # Ibnu Daru Aji, 2016
 # Mohamad Hasan Al Banna <se7entime@openmailbox.org>, 2013
 # Mohamad Hasan Al Banna <se7entime@openmailbox.org>, 2013,2016
@@ -18,12 +18,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 06:00+0000\n"
 "Last-Translator: Ibnu Daru Aji\n"
-"Language-Team: Indonesian (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/id/)\n"
-"Language: id\n"
+"Language-Team: Indonesian (http://www.transifex.com/toofishes/archlinux-pacman/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: scripts/makepkg.sh.in:135
@@ -105,10 +104,9 @@ msgid "Generating checksums for source files..."
 msgstr "Menghasilkan checksum untuk berkas sumber..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Tidak dapat mencari binary %s yang dibutuhkan untuk menghasilkan checksum "
-"berkas sumber."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Tidak dapat mencari binary %s yang dibutuhkan untuk menghasilkan checksum berkas sumber."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -343,14 +341,11 @@ msgstr "Protokol download tidak dikenal: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Tidak dapat menemukan binary %s yang dibutuhkan untuk memeriksa kebutuhan "
-"sumber VCS"
+msgstr "Tidak dapat menemukan binary %s yang dibutuhkan untuk memeriksa kebutuhan sumber VCS"
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
-msgstr ""
-"Tidak dapat menemukan paket %s yang dibutuhkan untuk menangani sumber %s."
+msgstr "Tidak dapat menemukan paket %s yang dibutuhkan untuk menangani sumber %s."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
@@ -358,9 +353,7 @@ msgstr "Tidak dapat mencari binary %s yang dibutuhkan untuk operasi dependensi"
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Tidak dapat mencari binary %s. Akan menggunakan %s untuk mendapatkan hak "
-"khusus root."
+msgstr "Tidak dapat mencari binary %s. Akan menggunakan %s untuk mendapatkan hak khusus root."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -372,49 +365,36 @@ msgstr "Tidak dapat mencari binari %s yang dibutuhkan untuk menandai paket."
 
 #: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
-"Tidak dapat mencari berkas binary %s yang dibutuhkan untuk memverifikasi "
-"berkas sumber"
+msgstr "Tidak dapat mencari berkas binary %s yang dibutuhkan untuk memverifikasi berkas sumber"
 
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"Tidak dapat menemukan binari %s yang dibutuhkan untuk validasi chekcsum "
-"berkas sumber."
+msgstr "Tidak dapat menemukan binari %s yang dibutuhkan untuk validasi chekcsum berkas sumber."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"Tidak dapat mencari binary %s yang dibutuhkan untuk mengkompres binari."
+msgstr "Tidak dapat mencari binary %s yang dibutuhkan untuk mengkompres binari."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
-msgstr ""
-"Tidak dapat mencari binari %s yang dibutuhkan untuk optimasi citra PNG."
+msgstr "Tidak dapat mencari binari %s yang dibutuhkan untuk optimasi citra PNG."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"Tidak dapat mencari binary %s yang dibutuhkan untuk kompilasi terdistribusi."
+msgstr "Tidak dapat mencari binary %s yang dibutuhkan untuk kompilasi terdistribusi."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Tidak dapat mencari binary %s yang dibutuhkan untuk penggunaan kompilasi "
-"cache."
+msgstr "Tidak dapat mencari binary %s yang dibutuhkan untuk penggunaan kompilasi cache."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"Tidak dapat mencari binary %s yang dibutuhkan untuk merampingkan berkas "
-"objek."
+msgstr "Tidak dapat mencari binary %s yang dibutuhkan untuk merampingkan berkas objek."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Tidak dapat mencari binary %s yang dibutuhkan untuk mengkompresi man dan "
-"halaman info."
+msgstr "Tidak dapat mencari binary %s yang dibutuhkan untuk mengkompresi man dan halaman info."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -434,7 +414,8 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "Grup paket sudah dibuat. (gunakan %s untuk menimpa)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "Bagian dari grup paket sudah dibuat. (gunakan %s untuk menimpa)"
 
 #: scripts/makepkg.sh.in:1696
@@ -467,9 +448,7 @@ msgstr "-d, --nodeps Lewati semua pemeriksaan dependensi"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"-e, --noextract Jangan ekstrak berkas sumber (menggunakan direktori %s yang "
-"ada)"
+msgstr "-e, --noextract Jangan ekstrak berkas sumber (menggunakan direktori %s yang ada)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -509,7 +488,8 @@ msgid ""
 msgstr "-r, -rmdeps Hapus dependensi terinstall setelah berhasil membuat paket"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "-R, --repackage Paketkan ulang konten tanpa membuat ulang"
 
 #: scripts/makepkg.sh.in:1716
@@ -529,9 +509,7 @@ msgstr "-V, --version Perlihatkan informasi versi dan keluar"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"--allsource Hasilkan tarball yang hanya berisi sumber saja termasuk sumber "
-"yang terunduh"
+msgstr "--allsource Hasilkan tarball yang hanya berisi sumber saja termasuk sumber yang terunduh"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -547,10 +525,9 @@ msgstr "--holdver Jangan mutakhirkan sumber VCS"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"--key <kunci> Spesifikasikan kunci yang digunakan untuk memberi tanda %s "
-"dibanding bawaan"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "--key <kunci> Spesifikasikan kunci yang digunakan untuk memberi tanda %s dibanding bawaan"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -592,16 +569,13 @@ msgstr "--skipinteg Jangan lakukan verifikasi apapun pada sumber berkas"
 
 #: scripts/makepkg.sh.in:1733
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
-msgstr ""
-"--skippgpcheck Jangan memverifikasi berkas sumber menggunakan tandatangan PGP"
+msgstr "--skippgpcheck Jangan memverifikasi berkas sumber menggunakan tandatangan PGP"
 
 #: scripts/makepkg.sh.in:1734
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"--verifysource Unduh berkas sumber (jika dibutuhkan) dan melakukan "
-"pemeriksaan integritas"
+msgstr "--verifysource Unduh berkas sumber (jika dibutuhkan) dan melakukan pemeriksaan integritas"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -619,9 +593,7 @@ msgstr "--needed Jangan menginstall ulang target yang sudah mutakhir"
 #: scripts/makepkg.sh.in:1740
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr ""
-"--noconfirm Jangan tanyakan persetujuan ketika menyelesaikan pemenuhan "
-"dependensi"
+msgstr "--noconfirm Jangan tanyakan persetujuan ketika menyelesaikan pemenuhan dependensi"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
@@ -633,15 +605,12 @@ msgstr "Jika %s tidak dispesifikkan, %s akan mencari '%s'"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Hak Cipta (c) 2006-2016 Tim Pengembang Pacman <pacman-dev@archlinux.org>."
-"\\nHakCipta (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nProgram ini "
-"adalah software bebas; lihat kode sumber untuk persyaratan penyalinan."
-"\\nProgram ini TANPA GARANSI, sesuai yang ditentukan oleh hukum.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Hak Cipta (c) 2006-2016 Tim Pengembang Pacman <pacman-dev@archlinux.org>.\\nHakCipta (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nProgram ini adalah software bebas; lihat kode sumber untuk persyaratan penyalinan.\\nProgram ini TANPA GARANSI, sesuai yang ditentukan oleh hukum.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -675,9 +644,7 @@ msgstr "Anda tidak punya hak untuk menulis log pada %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Menjalankan %s sebagai root dapat menyebabkan kerusakan permanen dan azab "
-"Tuhan pada sistem anda."
+msgstr "Menjalankan %s sebagai root dapat menyebabkan kerusakan permanen dan azab Tuhan pada sistem anda."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -771,9 +738,7 @@ msgstr "baris pola tidak valid: tidak dapat mencari nama pola\n"
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr ""
-"karakter tak valid digunakan pada nama '%s'. yang diperbolehkan: [:alnum:]+_."
-"@\n"
+msgstr "karakter tak valid digunakan pada nama '%s'. yang diperbolehkan: [:alnum:]+_.@\n"
 
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
@@ -844,11 +809,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Hak cipta (c) 2013-2016 Tim Pengembangan Pacman <pacman-dev@archlinux.org>\n"
-"Software ini merupakan perangkat lunak bebas; lihat sumber untuk persyaratan "
-"penyalinan.\n"
-"TAK ADA GARANSI, sampai pada batas yang ditentukan oleh hukum.\n"
+msgstr "Hak cipta (c) 2013-2016 Tim Pengembangan Pacman <pacman-dev@archlinux.org>\nSoftware ini merupakan perangkat lunak bebas; lihat sumber untuk persyaratan penyalinan.\nTAK ADA GARANSI, sampai pada batas yang ditentukan oleh hukum.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -884,13 +845,10 @@ msgstr "--nocolor lumpuhkan pesan keluaran berwarna"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Hak Cipta (c) 2010-2016 Tim Pengembang Pacman <pacman-dev@archlinux.org>."
-"\\nIni merupakan perangkat lunak bebas; lihat sumber untuk syarat menyalin."
-"\\n TIDAK ADA JAMINAN, yang diizinkan oleh hukum.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Hak Cipta (c) 2010-2016 Tim Pengembang Pacman <pacman-dev@archlinux.org>.\\nIni merupakan perangkat lunak bebas; lihat sumber untuk syarat menyalin.\\n TIDAK ADA JAMINAN, yang diizinkan oleh hukum.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -907,9 +865,7 @@ msgstr "Anda harus mempunyai izin yang tepat untuk meningkatkan database."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Berkas pengunci pacman ditemukan. Tidak dapat mengeksekusi ketika pacman "
-"berjalan."
+msgstr "Berkas pengunci pacman ditemukan. Tidak dapat mengeksekusi ketika pacman berjalan."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -954,8 +910,7 @@ msgstr "-e, --export Ekspor kunci yang ditentukan atau semua kunci"
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"-f, --finger Daftar sidik jari untuk keyid yang ditentukan atau semuanya"
+msgstr "-f, --finger Daftar sidik jari untuk keyid yang ditentukan atau semuanya"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -972,8 +927,7 @@ msgstr "-u, --updatedb Mutakhirkan trustdb pacman"
 #: scripts/pacman-key.sh.in:70
 msgid ""
 "  -v, --verify              Verify the file(s) specified by the signature(s)"
-msgstr ""
-"-v, --verify Verifikasi berkas(-berkas) yang ditentukan oleh signature(s)"
+msgstr "-v, --verify Verifikasi berkas(-berkas) yang ditentukan oleh signature(s)"
 
 #: scripts/pacman-key.sh.in:71
 msgid ""
@@ -988,8 +942,7 @@ msgstr "--import Mengimpor pubring.gpg dari direktori(s)"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"--import-trustdb Impor nilai ownertrust dari trustdb.gpg pada direktori(s)"
+msgstr "--import-trustdb Impor nilai ownertrust dari trustdb.gpg pada direktori(s)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
@@ -1005,35 +958,30 @@ msgstr "-lsign-key Menandai keyid yang ditentukan"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"--populate Memuat ulang key default dari keyring (yang diberikan) pada '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "--populate Memuat ulang key default dari keyring (yang diberikan) pada '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"--refresh-keys Memutakhirkan kunci yang ditentukan atau semuanya dari "
-"keyserver"
+msgstr "--refresh-keys Memutakhirkan kunci yang ditentukan atau semuanya dari keyserver"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"--config <berkas> Gunakan berkas konfigurasi alternatif (selain \\n'%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "--config <berkas> Gunakan berkas konfigurasi alternatif (selain \\n'%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
 msgstr "--gpgdir <dir> Mengatur direktori alternatif GnuPG (daripada\\n '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"--keyserver <server-url> menentukan keyserver yang digunakan bila dibutuhkan"
+msgstr "--keyserver <server-url> menentukan keyserver yang digunakan bila dibutuhkan"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1203,31 +1151,21 @@ msgstr "Kegunaan: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize adalah usaha kecil yang seharusnya meningkatkan kinerja"
-"\\ndari pacman ketika membaca/menulis ke databasenay yang berdasarkan sistem "
-"berkas.\\n\\n"
+msgstr "pacman-optimize adalah usaha kecil yang seharusnya meningkatkan kinerja\\ndari pacman ketika membaca/menulis ke databasenay yang berdasarkan sistem berkas.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Karena pacman menggunakan banyak berkas kecil untuk melacak paket,\\nada "
-"kecenderungan berkas tersebut menjadi terfragmen seiring berjalannya waktu."
-"\\nSkrip ini berusaha mengembalikan berkas berkas kecil ini ke satu\\nlokasi "
-"pada hard drive anda. Hasilnya hard\\ndrive bisa membacanya lebih cepat, "
-"karena head hard\\ndrive tidak perlu berkeliling hard drive terlalu banya.\\n"
+msgstr "Karena pacman menggunakan banyak berkas kecil untuk melacak paket,\\nada kecenderungan berkas tersebut menjadi terfragmen seiring berjalannya waktu.\\nSkrip ini berusaha mengembalikan berkas berkas kecil ini ke satu\\nlokasi pada hard drive anda. Hasilnya hard\\ndrive bisa membacanya lebih cepat, karena head hard\\ndrive tidak perlu berkeliling hard drive terlalu banya.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
-msgstr ""
-"Tidak dapat mencari berkas binary %s yang dibutuhkan untuk memverifikasi "
-"integritas."
+msgstr "Tidak dapat mencari berkas binary %s yang dibutuhkan untuk memverifikasi integritas."
 
 #: scripts/pacman-optimize.sh.in:109
 msgid "You must have correct permissions to optimize the database."
@@ -1274,7 +1212,8 @@ msgid "Rotating database into place..."
 msgstr "Memutar database ditempat..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr "Subtitusi database baru gagal. Periksa direktori %s, %s dan %s."
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1289,9 +1228,7 @@ msgstr "Penggunaaan: pkgdelta [opsi] <paket1> <paket2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta akan membuat berkas delta diantara kedua paket.\\nBerkas delta ini "
-"dapat ditambahkan ke database menggunakan repo-add.\\n"
+msgstr "pkgdelta akan membuat berkas delta diantara kedua paket.\\nBerkas delta ini dapat ditambahkan ke database menggunakan repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1318,19 +1255,14 @@ msgstr "--min-pkg-size ukuran paket minimum sebelum delta dibuat\\n"
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"--max-delta-size persentasi paket baru yang berukuran diatas delta akan "
-"dihapus\\n"
+msgstr "--max-delta-size persentasi paket baru yang berukuran diatas delta akan dihapus\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Hak Cipta (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\n Ini merupakan "
-"perangkat lunak bebas; lihat sumber untuk kondisi penyalinan.\\nTIDAK ADA "
-"GARANSI, untuk memperpanjang izin oleh hukum.\\n"
+msgstr "Hak Cipta (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\n Ini merupakan perangkat lunak bebas; lihat sumber untuk kondisi penyalinan.\\nTIDAK ADA GARANSI, untuk memperpanjang izin oleh hukum.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1382,11 +1314,9 @@ msgstr "Penggunaan: repo-add [opsi] <path-ke-db> <paket|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add akan memutakhirkan database paket dengan membaca berkas paket."
-"\\nBeberapa paket dapat ditambahkan dalam commandline.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add akan memutakhirkan database paket dengan membaca berkas paket.\\nBeberapa paket dapat ditambahkan dalam commandline.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1394,16 +1324,15 @@ msgstr "-d, --delta membuat dan menambahkan delta untuk pemutakhiran paket\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr "-n, --new hanya menambah paket yang tidak ada pada database\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"-R, --remove menghapus paket lama dari diska setelah pemutakhiran basis data"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "-R, --remove menghapus paket lama dari diska setelah pemutakhiran basis data\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
@@ -1411,13 +1340,10 @@ msgstr "Penggunaan: repo-remove [opsi] <path-ke-db> <namapaket|delta>..\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove akan memutakhirkan database paket dengan menghapus nama paket"
-"\\nyang ditentukan pada command line yang ada pada database repo. Beberapa"
-"\\npaket dapat dihapus pada command line.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove akan memutakhirkan database paket dengan menghapus nama paket\\nyang ditentukan pada command line yang ada pada database repo. Beberapa\\npaket dapat dihapus pada command line.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1433,8 +1359,7 @@ msgstr "-s, --sign tandai database dengan GnuPG setelah pemutakhiran\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"-k, --key <kunci> gunakan kunci yang ditentukan untuk menandai database\\n"
+msgstr "-k, --key <kunci> gunakan kunci yang ditentukan untuk menandai database\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
@@ -1448,8 +1373,7 @@ msgstr "\\nLihat %s(8) untuk detail dan deskripsi dari opsi yang tersedia.\\n"
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Contoh: repo-add /path/ke/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Contoh: repo-add /path/ke/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1457,13 +1381,10 @@ msgstr "Contoh: repo-remove /path/ke/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Hak Cipta (c) 2006-2016 Tim Pengembang Pacman <pacman-dev@archlinux.org>\\n"
-"\\nIni merupakan perangkat lunak bebas; lihat sumber untuk syarat menyalin."
-"\\n TIDAK ADA JAMINAN, yang diizinkan oleh hukum.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Hak Cipta (c) 2006-2016 Tim Pengembang Pacman <pacman-dev@archlinux.org>\\n\\nIni merupakan perangkat lunak bebas; lihat sumber untuk syarat menyalin.\\n TIDAK ADA JAMINAN, yang diizinkan oleh hukum.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1754,18 +1675,21 @@ msgstr "Gagal ketika pulling %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Acuan tidak dikenal: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Membuat salinan kerja dari %s %s repo..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Gagal ketika memutakhirkan salinan kerja dari repo %s %s"
 
@@ -1797,12 +1721,14 @@ msgstr "Mengekstrak %s dengan %s"
 msgid "Failed to extract %s"
 msgstr "Gagal mengekstrak %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Cloning repo %s %s"
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Gagal ketika mendownload repo %s %s"
@@ -1811,12 +1737,14 @@ msgstr "Gagal ketika mendownload repo %s %s"
 msgid "%s is not a clone of %s"
 msgstr "%s bukan klon dari %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Memutakhirkan %s %s repo..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Gagal ketika memutakhirkan %s %s repo"
diff --git a/scripts/po/is.po b/scripts/po/is.po
index 54c12c3c..fc1d8afe 100644
--- a/scripts/po/is.po
+++ b/scripts/po/is.po
@@ -1,9 +1,10 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Kristján Magnússon, 2016
+# Kristján Magnússon, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
@@ -11,12 +12,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-27 21:07+0000\n"
 "Last-Translator: Kristján Magnússon\n"
-"Language-Team: Icelandic (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/is/)\n"
-"Language: is\n"
+"Language-Team: Icelandic (http://www.transifex.com/toofishes/archlinux-pacman/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -98,7 +98,8 @@ msgid "Generating checksums for source files..."
 msgstr ""
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
 msgstr ""
 
 #: scripts/makepkg.sh.in:422
@@ -407,7 +408,8 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1696
@@ -480,7 +482,8 @@ msgid ""
 msgstr ""
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1716
@@ -516,7 +519,8 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1724
@@ -595,10 +599,11 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
@@ -834,9 +839,9 @@ msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
@@ -947,8 +952,8 @@ msgstr ""
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:79
@@ -958,14 +963,14 @@ msgstr ""
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:86
@@ -1144,8 +1149,8 @@ msgstr ""
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
@@ -1201,7 +1206,8 @@ msgid "Rotating database into place..."
 msgstr ""
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr ""
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1302,8 +1308,8 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:62
@@ -1312,13 +1318,14 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:66
@@ -1327,9 +1334,9 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:75
@@ -1368,9 +1375,9 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:146
@@ -1662,18 +1669,21 @@ msgstr ""
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr ""
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr ""
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr ""
 
@@ -1705,12 +1715,14 @@ msgstr ""
 msgid "Failed to extract %s"
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr ""
@@ -1719,12 +1731,14 @@ msgstr ""
 msgid "%s is not a clone of %s"
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr ""
diff --git a/scripts/po/it.po b/scripts/po/it.po
index 8e043631..750c268c 100644
--- a/scripts/po/it.po
+++ b/scripts/po/it.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrea Scarpino <andrea@archlinux.org>, 2011-2012
 # Andrea Scarpino <inactive+bash@transifex.com>, 2014
@@ -16,12 +16,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 20:47+0000\n"
 "Last-Translator: Saverio <saverio.brancaccio@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/it/)\n"
-"Language: it\n"
+"Language-Team: Italian (http://www.transifex.com/toofishes/archlinux-pacman/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -103,10 +102,9 @@ msgid "Generating checksums for source files..."
 msgstr "Generazione dei controlli dell'integrità dei sorgenti in corso..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Impossibile trovare %s richiesto per generare i controlli dell'integrità dei "
-"sorgenti."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Impossibile trovare %s richiesto per generare i controlli dell'integrità dei sorgenti."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -139,9 +137,7 @@ msgstr "Uno o più file non hanno superato il controllo di validità!"
 
 #: scripts/makepkg.sh.in:489
 msgid "Integrity checks (%s) differ in size from the source array."
-msgstr ""
-"I controlli dell'integrità (%s) differiscono in dimensione dall'array dei "
-"sorgenti."
+msgstr "I controlli dell'integrità (%s) differiscono in dimensione dall'array dei sorgenti."
 
 #: scripts/makepkg.sh.in:531
 msgid "Integrity checks are missing for: %s"
@@ -343,26 +339,19 @@ msgstr "Protocollo di download sconosciuto: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Impossibile trovare il binario %s richiesto per il controllo del sorgente "
-"VCS."
+msgstr "Impossibile trovare il binario %s richiesto per il controllo del sorgente VCS."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
-msgstr ""
-"Impossibile trovare il pacchetto %s necessario per gestire i sorgenti di %s."
+msgstr "Impossibile trovare il pacchetto %s necessario per gestire i sorgenti di %s."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
-msgstr ""
-"Impossibile trovare il binario %s richiesto per le operazioni della "
-"dipendenza."
+msgstr "Impossibile trovare il binario %s richiesto per le operazioni della dipendenza."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Impossibile trovare il binario %s. Sarà usato %s per ottenere i privilegi di "
-"root."
+msgstr "Impossibile trovare il binario %s. Sarà usato %s per ottenere i privilegi di root."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -379,9 +368,7 @@ msgstr "Impossibile trovare %s richiesto per verificare i sorgenti."
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"Impossibile trovare il binario %s richiesto per validare i checksum dei "
-"sorgenti."
+msgstr "Impossibile trovare il binario %s richiesto per validare i checksum dei sorgenti."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
@@ -389,8 +376,7 @@ msgstr "Impossibile trovare %s richiesto per comprimere gli eseguibili."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
-msgstr ""
-"Impossibile trovare il binario %s richiesto per ottimizzare le immagini PNG."
+msgstr "Impossibile trovare il binario %s richiesto per ottimizzare le immagini PNG."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
@@ -406,14 +392,11 @@ msgstr "Impossibile trovare %s richiesto per lo stripping dei file."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Impossibile trovare %s richiesto per comprimere le pagine info e i manuali."
+msgstr "Impossibile trovare %s richiesto per comprimere le pagine info e i manuali."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
-msgstr ""
-"Già è stato creato un pacchetto, installazione del pacchetto esistente in "
-"corso..."
+msgstr "Già è stato creato un pacchetto, installazione del pacchetto esistente in corso..."
 
 #: scripts/makepkg.sh.in:1619
 msgid "A package has already been built. (use %s to overwrite)"
@@ -422,20 +405,16 @@ msgstr "Un pacchetto è già stato compilato. (usa %s per sovrascrivere)"
 #: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr ""
-"Il gruppo del pacchetto è stato già creato, installazione dei pacchetti "
-"esistenti in corso..."
+msgstr "Il gruppo del pacchetto è stato già creato, installazione dei pacchetti esistenti in corso..."
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Il gruppo del pacchetto è già stato compilato. (usa %s per sovrascrivere)"
+msgstr "Il gruppo del pacchetto è già stato compilato. (usa %s per sovrascrivere)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Parte del gruppo del pacchetto è già stato compilato. (usa %s per "
-"sovrascrivere)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "Parte del gruppo del pacchetto è già stato compilato. (usa %s per sovrascrivere)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -499,20 +478,17 @@ msgstr "  -o, --nobuild    Scarica ed estrae solo i file"
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <file>        Usa uno script di compilazione alternativo (invece di "
-"'%s')"
+msgstr "  -p <file>        Usa uno script di compilazione alternativo (invece di '%s')"
 
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Rimuove le dipendenze installate dopo la compilazione"
+msgstr "  -r, --rmdeps     Rimuove le dipendenze installate dopo la compilazione"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr ""
-"  -R, --repackage  Ricrea il contenuto del pacchetto senza ricompilarlo"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
+msgstr "  -R, --repackage  Ricrea il contenuto del pacchetto senza ricompilarlo"
 
 #: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
@@ -531,8 +507,7 @@ msgstr "-V, --version Mostra l'informazione della versione ed esce"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      Genera solo un archivio che include i sorgenti scaricati"
+msgstr "  --allsource      Genera solo un archivio che include i sorgenti scaricati"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -540,8 +515,7 @@ msgstr "  --check          Avvia la funzione %s nel %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <file>  Usa un file di configurazione alternativo (invece di '%s')"
+msgstr "  --config <file>  Usa un file di configurazione alternativo (invece di '%s')"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -549,10 +523,9 @@ msgstr "--holdver Non aggiorna i sorgenti VCS"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <key>      Specifica una chiave da usare per firmare %s invece di "
-"quella di default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <key>      Specifica una chiave da usare per firmare %s invece di quella di default"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -573,9 +546,7 @@ msgstr "  --nosign         Non crea una firma per il pacchetto"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"--packagelist Elenca solo i pacchetti che potrebbero essere prodotti senza "
-"PKGEXT"
+msgstr "--packagelist Elenca solo i pacchetti che potrebbero essere prodotti senza PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -592,8 +563,7 @@ msgstr "  --skipchecksums  Non verifica l'integrità dei sorgenti"
 #: scripts/makepkg.sh.in:1732
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
-msgstr ""
-"  --skipinteg      Non effettua nessuna verifica sul controllo dei sorgenti"
+msgstr "  --skipinteg      Non effettua nessuna verifica sul controllo dei sorgenti"
 
 #: scripts/makepkg.sh.in:1733
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
@@ -603,9 +573,7 @@ msgstr "  --skippgpcheck   Non verifica i sorgenti con le firme PGP"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"--verifysource Scarica i file dei sorgenti (se necessario) ed esegue i "
-"controlli dell'integrità"
+msgstr "--verifysource Scarica i file dei sorgenti (se necessario) ed esegue i controlli dell'integrità"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -623,15 +591,11 @@ msgstr "--needed Non reinstalla i pacchetti già aggiornati"
 #: scripts/makepkg.sh.in:1740
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr ""
-"  --noconfirm      Non chiede conferma durante la risoluzione delle "
-"dipendenze"
+msgstr "  --noconfirm      Non chiede conferma durante la risoluzione delle dipendenze"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"  --noprogressbar  Non mostra la barra di avanzamento durante il download "
-"dei file"
+msgstr "  --noprogressbar  Non mostra la barra di avanzamento durante il download dei file"
 
 #: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
@@ -639,15 +603,12 @@ msgstr "Se %s non è stato specificato, %s cercherà '%s'"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Team di Sviluppo per Pacman <pacman-dev@archlinux."
-"org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n"
-"\\nQuesto è un software libero; vedere il codice sorgente per le condizioni "
-"di copia.\\nNon c'è GARANZIA, nei termini di legge.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Team di Sviluppo per Pacman <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nQuesto è un software libero; vedere il codice sorgente per le condizioni di copia.\\nNon c'è GARANZIA, nei termini di legge.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -663,8 +624,7 @@ msgstr "Non si dispone dei permessi in scrittura per creare i pacchetti in %s."
 
 #: scripts/makepkg.sh.in:1929
 msgid "You do not have write permission to store packages in %s."
-msgstr ""
-"Non si dispone dei permessi in scrittura per salvare i pacchetti in %s."
+msgstr "Non si dispone dei permessi in scrittura per salvare i pacchetti in %s."
 
 #: scripts/makepkg.sh.in:1937
 msgid "You do not have write permission to store downloads in %s."
@@ -682,9 +642,7 @@ msgstr "Non si dispone dei permessi in scrittura per salvare i log in %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"L'uso di %s da root non è consentito, poiché può causare danni permanenti,"
-"\\ncatastrofici al tuo sistema."
+msgstr "L'uso di %s da root non è consentito, poiché può causare danni permanenti,\\ncatastrofici al tuo sistema."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -773,15 +731,12 @@ msgstr "La coppia chiave/valore non è valida\n"
 
 #: scripts/makepkg-template.pl.in:82
 msgid "invalid template line: can't find template name\n"
-msgstr ""
-"la linea del template non è valida: impossibile trovare il nome del "
-"template\n"
+msgstr "la linea del template non è valida: impossibile trovare il nome del template\n"
 
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr ""
-"Caratteri non validi utilizzati nel nome '%s'. Permessi: [:alnum:]+_.@-\n"
+msgstr "Caratteri non validi utilizzati nel nome '%s'. Permessi: [:alnum:]+_.@-\n"
 
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
@@ -814,8 +769,7 @@ msgstr "Opzioni:\n"
 #: scripts/makepkg-template.pl.in:178
 #, perl-format
 msgid "  --input, -p <file>    Build script to read (default: %s)\n"
-msgstr ""
-"  --input, -p <file>    Script di compilazione da leggere (default: %s)\n"
+msgstr "  --input, -p <file>    Script di compilazione da leggere (default: %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
@@ -833,8 +787,7 @@ msgstr "(default: usa una versione specifica nei marcatori del template)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
-msgstr ""
-"--template-dir <dir> specifica la directory per la ricerca dei template\n"
+msgstr "--template-dir <dir> specifica la directory per la ricerca dei template\n"
 
 #: scripts/makepkg-template.pl.in:183
 #, perl-format
@@ -854,12 +807,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (c) 2013-2016 Team di Sviluppo per Pacman <pacman-dev@archlinux."
-"org>.\n"
-"Questo è un software libero; vedere il codice sorgente per le condizioni di "
-"copia.\n"
-"Non c'è GARANZIA, nei termini di legge.\n"
+msgstr "Copyright (c) 2013-2016 Team di Sviluppo per Pacman <pacman-dev@archlinux.org>.\nQuesto è un software libero; vedere il codice sorgente per le condizioni di copia.\nNon c'è GARANZIA, nei termini di legge.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -895,13 +843,10 @@ msgstr "--nocolor disabilita la visualizzazione dei messaggi colorati"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2016 Team di Sviluppo per Pacman <pacman-dev@archlinux."
-"org>.\\nQuesto è un software libero; vedere il codice sorgente per le "
-"condizioni di copia.\\nNon c'è GARANZIA, nei termini di legge.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Team di Sviluppo per Pacman <pacman-dev@archlinux.org>.\\nQuesto è un software libero; vedere il codice sorgente per le condizioni di copia.\\nNon c'è GARANZIA, nei termini di legge.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -918,15 +863,11 @@ msgstr "Per aggiornare il database devi avere i corretti permessi."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Il file lock di pacman è stato trovato. Impossibile avviare di nuovo pacman "
-"mentre è ancora in funzione."
+msgstr "Il file lock di pacman è stato trovato. Impossibile avviare di nuovo pacman mentre è ancora in funzione."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
-msgstr ""
-"È stato individuato il formato del database pre-3.5, aggiornamento in "
-"corso..."
+msgstr "È stato individuato il formato del database pre-3.5, aggiornamento in corso..."
 
 #: scripts/pacman-db-upgrade.sh.in:169
 msgid "Done."
@@ -934,15 +875,11 @@ msgstr "Fatto."
 
 #: scripts/pacman-db-upgrade.sh.in:173
 msgid "Pre-4.2 database format detected - upgrading..."
-msgstr ""
-"È stato individuato il formato del database pre-4.2 - aggiornamrnto in "
-"corso..."
+msgstr "È stato individuato il formato del database pre-4.2 - aggiornamrnto in corso..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"il link simbolico '%s' punta al di fuori della root di pacman, è richiesto "
-"un intervento manuale"
+msgstr "il link simbolico '%s' punta al di fuori della root di pacman, è richiesto un intervento manuale"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -1003,15 +940,11 @@ msgstr "--import Importa pubring.gpg dalla(e) directory"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"--import-trustdb Importa i valori dell'ownertrust da trustdb.gpg nella(e) "
-"directory"
+msgstr "--import-trustdb Importa i valori dell'ownertrust da trustdb.gpg nella(e) directory"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                    Assicura che il keyring sia inizializzato "
-"correttamente"
+msgstr "  --init                    Assicura che il keyring sia inizializzato correttamente"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
@@ -1023,39 +956,30 @@ msgstr "--lsign-key Firma localmente il keyid specificato"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"--populate Ricarica le chiavi di default dai portachiavi\\n (specificati) in "
-"'%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "--populate Ricarica le chiavi di default dai portachiavi\\n (specificati) in '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"--refresh-keys Aggiorna la chiave specificata o tutte le chiavi da un "
-"keyserver"
+msgstr "--refresh-keys Aggiorna la chiave specificata o tutte le chiavi da un keyserver"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <file>           Usa un file di configurazione alternativo "
-"(invece di\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <file>           Usa un file di configurazione alternativo (invece di\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            Imposta una directory alternativa per GnuPG "
-"(invece\\n                            di '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            Imposta una directory alternativa per GnuPG (invece\\n                            di '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"--keyserver <server-url> Se necessario, specifica un keyserver da utilizzare"
+msgstr "--keyserver <server-url> Se necessario, specifica un keyserver da utilizzare"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1175,8 +1099,7 @@ msgstr "La chiave remota non è stata correttamente scaricata dal keyserver."
 
 #: scripts/pacman-key.sh.in:477
 msgid "A specified local key could not be updated from a keyserver."
-msgstr ""
-"Una chiave locale specificata non può essere aggiornata da un keyserver."
+msgstr "Una chiave locale specificata non può essere aggiornata da un keyserver."
 
 #: scripts/pacman-key.sh.in:487
 msgid "The signature identified by %s could not be verified."
@@ -1226,30 +1149,21 @@ msgstr "Uso: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize è un piccolo hack che dovrebbe migliorare le prestazioni"
-"\\ndi pacman durante la lettura/scrittura del suo database.\\n\\n"
+msgstr "pacman-optimize è un piccolo hack che dovrebbe migliorare le prestazioni\\ndi pacman durante la lettura/scrittura del suo database.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Poiché pacman utilizza molti file piccoli per tenere traccia dei pacchetti,"
-"\\ncol tempo questi file tendono a frammentarsi.\\nQuesto script prova a "
-"sistemare questi file piccoli all'interno di una\\nlocazione continua sul "
-"tuo disco rigido. Il risultato è che il disco rigido\\ndovrebbe essere in "
-"grado di leggerli più velocemente, in quanto la testina non\\ndeve spostarsi "
-"continuamente sul disco.\\n"
+msgstr "Poiché pacman utilizza molti file piccoli per tenere traccia dei pacchetti,\\ncol tempo questi file tendono a frammentarsi.\\nQuesto script prova a sistemare questi file piccoli all'interno di una\\nlocazione continua sul tuo disco rigido. Il risultato è che il disco rigido\\ndovrebbe essere in grado di leggerli più velocemente, in quanto la testina non\\ndeve spostarsi continuamente sul disco.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
-msgstr ""
-"Impossibile trovare il binario %s richiesto per verificare l'integrità."
+msgstr "Impossibile trovare il binario %s richiesto per verificare l'integrità."
 
 #: scripts/pacman-optimize.sh.in:109
 msgid "You must have correct permissions to optimize the database."
@@ -1289,19 +1203,16 @@ msgstr "Verifica dell'integrità in corso..."
 
 #: scripts/pacman-optimize.sh.in:162
 msgid "Integrity check FAILED, reverting to old database."
-msgstr ""
-"Impossibile effettuare il controllo dell'integrità, ritorno al vecchio "
-"database."
+msgstr "Impossibile effettuare il controllo dell'integrità, ritorno al vecchio database."
 
 #: scripts/pacman-optimize.sh.in:166
 msgid "Rotating database into place..."
 msgstr "Ottimizzazione del database in corso..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"La sostituzione del nuovo database non è riuscita. Verificare la presenza "
-"delle directory %s, %s e %s."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "La sostituzione del nuovo database non è riuscita. Verificare la presenza delle directory %s, %s e %s."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1315,9 +1226,7 @@ msgstr "Uso: pkgdelta [opzioni] <pacchetto1> <pacchetto2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta creerà un file delta fra i due pacchetti.\\nQuesto file delta può "
-"essere aggiunto al database usando repo-add.\\n"
+msgstr "pkgdelta creerà un file delta fra i due pacchetti.\\nQuesto file delta può essere aggiunto al database usando repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1338,27 +1247,20 @@ msgstr "--nocolor rimuove il colore dall'output\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"--min-pkg-size dimensione minima del pacchetto prima della generazione dei "
-"delta\\n"
+msgstr "--min-pkg-size dimensione minima del pacchetto prima della generazione dei delta\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"--max-delta-size percentuale del nuovo pacchetto dal quale il delta sarà "
-"eliminato\\n"
+msgstr "--max-delta-size percentuale del nuovo pacchetto dal quale il delta sarà eliminato\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
-"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
-"the extent permitted by law.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free software; see the source for copying conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1366,8 +1268,7 @@ msgstr "Il file '%s' del pacchetto non è valido."
 
 #: scripts/pkgdelta.sh.in:120
 msgid "Skipping delta creation for small package: %s - size %s"
-msgstr ""
-"Ignoro la creazione del delta per i pacchetti piccoli: %s - dimensione %s"
+msgstr "Ignoro la creazione del delta per i pacchetti piccoli: %s - dimensione %s"
 
 #: scripts/pkgdelta.sh.in:125
 msgid "The package names don't match : '%s' and '%s'"
@@ -1411,32 +1312,25 @@ msgstr "Uso: repo-add [opzioni] <path-del-db> <pacchetto|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add aggiornerà un database di un pacchetto, leggendo i file del "
-"pacchetto.\\nPacchetti multipli da aggiungere, possono essere specificati "
-"dalla linea di comando.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add aggiornerà un database di un pacchetto, leggendo i file del pacchetto.\\nPacchetti multipli da aggiungere, possono essere specificati dalla linea di comando.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta       genera ed aggiunge il delta per l'aggiornamento del "
-"pacchetto\\n"
+msgstr "  -d, --delta       genera ed aggiunge il delta per l'aggiornamento del pacchetto\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"-n, --new only aggiunge i pacchetti che non sono già presenti nel database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "-n, --new only aggiunge i pacchetti che non sono già presenti nel database\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"-R, --remove rimuove il vecchio pacchetto dal disco dopo l'aggiornamento del "
+"  -R, --remove      remove old package file from disk after updating "
 "database\\n"
+msgstr "-R, --remove rimuove il vecchio pacchetto dal disco dopo l'aggiornamento del database\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
@@ -1444,14 +1338,10 @@ msgstr "Uso: repo-remove [opzioni] <path-del-db> <nomepacchetto|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove aggiornerà il database di un pacchetto, rimuovendo il nome del "
-"pacchetto dal database del repository,\\nspecificato dalla linea di comando. "
-"I pacchetti\\nmultipli da rimuovere, possono essere specificati dalla linea "
-"di comando.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove aggiornerà il database di un pacchetto, rimuovendo il nome del pacchetto dal database del repository,\\nspecificato dalla linea di comando. I pacchetti\\nmultipli da rimuovere, possono essere specificati dalla linea di comando.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1463,32 +1353,25 @@ msgstr "--nocolor non visualizza i colori nell'output\\n"
 
 #: scripts/repo-add.sh.in:80
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
-msgstr ""
-"  -s, --sign        firma il database con GnuPG dopo l'aggiornamento\\n"
+msgstr "  -s, --sign        firma il database con GnuPG dopo l'aggiornamento\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <key>   usa la chiave specificata per firmare il database\\n"
+msgstr "  -k, --key <key>   usa la chiave specificata per firmare il database\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
-"  -v, --verify      verifica la firma del database prima dell'aggiornamento"
-"\\n"
+msgstr "  -v, --verify      verifica la firma del database prima dell'aggiornamento\\n"
 
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nVedi %s(8) per maggiori dettagli e descrizioni delle opzioni disponibili."
-"\\n"
+msgstr "\\nVedi %s(8) per maggiori dettagli e descrizioni delle opzioni disponibili.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Esempio:  repo-add /path/al/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Esempio:  repo-add /path/al/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1496,13 +1379,10 @@ msgstr "Esempio:  repo-remove /path/al/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Team di Sviluppo per Pacman <pacman-dev@archlinux."
-"org>.\\n\\nQuesto è un software libero; vedere il codice sorgente per le "
-"condizioni di copia.\\nNon c'è GARANZIA, nei termini di legge.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016 Team di Sviluppo per Pacman <pacman-dev@archlinux.org>.\\n\\nQuesto è un software libero; vedere il codice sorgente per le condizioni di copia.\\nNon c'è GARANZIA, nei termini di legge.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1542,9 +1422,7 @@ msgstr "Verifica della firma del database in corso..."
 
 #: scripts/repo-add.sh.in:284
 msgid "No existing signature found, skipping verification."
-msgstr ""
-"Non è stata trovata una firma esistente, il processo di verifica sarà "
-"ignorato."
+msgstr "Non è stata trovata una firma esistente, il processo di verifica sarà ignorato."
 
 #: scripts/repo-add.sh.in:289
 msgid "Database signature file verified."
@@ -1795,18 +1673,21 @@ msgstr "Si è verificato un errore durante il download di %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Riferimento non riconosciuto: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Creazione di una copia di lavoro del repository %s %s in corso..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Impossibile creare una copia di lavoro del repository %s %s"
 
@@ -1838,12 +1719,14 @@ msgstr "Estrazione di %s usando %s in corso..."
 msgid "Failed to extract %s"
 msgstr "Impossibile estrarre %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Clonazione del repository %s %s in corso..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Impossibile scaricare dal repository %s %s"
@@ -1852,12 +1735,14 @@ msgstr "Impossibile scaricare dal repository %s %s"
 msgid "%s is not a clone of %s"
 msgstr "%s non è un clone di %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Aggiornamento del repository %s %s in corso..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Impossibile aggiornare il repository %s %s"
@@ -1900,8 +1785,7 @@ msgstr "Rimozione dei file dalle librerie statiche..."
 
 #: scripts/libmakepkg/tidy/strip.sh.in:85
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr ""
-"Rimozione dei simboli non necessari dai binari e dalle librerie in corso..."
+msgstr "Rimozione dei simboli non necessari dai binari e dalle librerie in corso..."
 
 #: scripts/libmakepkg/tidy/upx.sh.in:35
 msgid "Compressing binaries with %s..."
diff --git a/scripts/po/ja.po b/scripts/po/ja.po
index e5dda1eb..a4170acb 100644
--- a/scripts/po/ja.po
+++ b/scripts/po/ja.po
@@ -1,23 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# kusakata <shohei@kusakata.com>, 2015
-# kusakata <shohei@kusakata.com>, 2015-2016
+# kusakata, 2015
+# kusakata, 2015-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 07:11+0000\n"
-"Last-Translator: kusakata <shohei@kusakata.com>\n"
-"Language-Team: Japanese (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ja/)\n"
-"Language: ja\n"
+"Last-Translator: kusakata\n"
+"Language-Team: Japanese (http://www.transifex.com/toofishes/archlinux-pacman/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: scripts/makepkg.sh.in:135
@@ -99,10 +98,9 @@ msgid "Generating checksums for source files..."
 msgstr "ソースファイルのチェックサムを生成..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"ソースファイルのチェックサムを生成するのに必要な %s バイナリが見つかりませ"
-"ん。"
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "ソースファイルのチェックサムを生成するのに必要な %s バイナリが見つかりません。"
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -228,8 +226,7 @@ msgstr "%s() を開始..."
 
 #: scripts/makepkg.sh.in:938
 msgid "Library listed in %s is not required by any files: %s"
-msgstr ""
-"%s にリストされているライブラリはどのファイルにも必要とされていません: %s"
+msgstr "%s にリストされているライブラリはどのファイルにも必要とされていません: %s"
 
 #: scripts/makepkg.sh.in:967
 msgid "Library listed in %s is not versioned: %s"
@@ -338,8 +335,7 @@ msgstr "不明なダウンロードプロトコル: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"VCS ソースの必要条件をチェックするのに必要な %s バイナリが見つかりません。"
+msgstr "VCS ソースの必要条件をチェックするのに必要な %s バイナリが見つかりません。"
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
@@ -368,9 +364,7 @@ msgstr "ソースファイルを検証するのに必要な %s バイナリが
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"ソースファイルのチェックサムを検証するのに必要な %s バイナリが見つかりませ"
-"ん。"
+msgstr "ソースファイルのチェックサムを検証するのに必要な %s バイナリが見つかりません。"
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
@@ -390,9 +384,7 @@ msgstr "コンパイラキャッシュを使うのに必要な %s バイナリ
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"オブジェクトファイルをストリップするために必要な %s バイナリが見つかりませ"
-"ん。"
+msgstr "オブジェクトファイルをストリップするために必要な %s バイナリが見つかりません。"
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
@@ -400,8 +392,7 @@ msgstr "man と info ページを圧縮するのに必要な %s バイナリが
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
-msgstr ""
-"パッケージはすでにビルドされています。既存のパッケージをインストール..."
+msgstr "パッケージはすでにビルドされています。既存のパッケージをインストール..."
 
 #: scripts/makepkg.sh.in:1619
 msgid "A package has already been built. (use %s to overwrite)"
@@ -410,18 +401,16 @@ msgstr "パッケージはすでにビルドされています。(%s で上書
 #: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr ""
-"パッケージグループはすでにビルドされています。既存のパッケージをインストー"
-"ル..."
+msgstr "パッケージグループはすでにビルドされています。既存のパッケージをインストール..."
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "パッケージグループはすでにビルドされています。(%s で上書きします)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"パッケージグループの一部がすでにビルドされています。(%s で上書きします)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "パッケージグループの一部がすでにビルドされています。(%s で上書きします)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -490,11 +479,11 @@ msgstr "  -p <file>        指定したビルドスクリプトを使う (デフ
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     ビルドが成功した後にインストールされた依存パッケージを削除"
+msgstr "  -r, --rmdeps     ビルドが成功した後にインストールされた依存パッケージを削除"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  リビルドをせずにパッケージの中身を再パッケージ"
 
 #: scripts/makepkg.sh.in:1716
@@ -504,9 +493,7 @@ msgstr "  -s, --syncdeps   欠けている依存パッケージを %s でイン
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source     ダウンロードされたソースが含まれないソースだけの tarball "
-"を生成"
+msgstr "  -S, --source     ダウンロードされたソースが含まれないソースだけの tarball を生成"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -516,9 +503,7 @@ msgstr "  -V, --version    バージョン情報を表示して終了する"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      ダウンロードされたソースが含まれるソースだけの tarball を"
-"生成"
+msgstr "  --allsource      ダウンロードされたソースが含まれるソースだけの tarball を生成"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -534,10 +519,9 @@ msgstr "  --holdver        VCS ソースを更新しない"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <key>      デフォルトのキーのかわりに指定したキーを使って %s 署名を行"
-"う"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <key>      デフォルトのキーのかわりに指定したキーを使って %s 署名を行う"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -558,8 +542,7 @@ msgstr "  --nosign         パッケージに署名を作成しない"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"  --packagelist    Only list packages that would be produced, without PKGEXT"
+msgstr "  --packagelist    Only list packages that would be produced, without PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -586,9 +569,7 @@ msgstr "  --skippgpcheck   ソースファイルの PGP 鍵を検証しない"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource   (必要な) ソースファイルをダウンロードして整合性チェックを"
-"行う"
+msgstr "  --verifysource   (必要な) ソースファイルをダウンロードして整合性チェックを行う"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -596,9 +577,7 @@ msgstr "以下のオプションを %s に渡すことができます:"
 
 #: scripts/makepkg.sh.in:1738
 msgid "  --asdeps         Install packages as non-explicitly installed"
-msgstr ""
-"  --asdeps         依存関係としてインストールされたとしてパッケージをインス"
-"トール"
+msgstr "  --asdeps         依存関係としてインストールされたとしてパッケージをインストール"
 
 #: scripts/makepkg.sh.in:1739
 msgid ""
@@ -612,8 +591,7 @@ msgstr "  --noconfirm      依存関係を解決するときに確認をしな
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"  --noprogressbar  ファイルのダウンロード中にプログレスバーを表示しない"
+msgstr "  --noprogressbar  ファイルのダウンロード中にプログレスバーを表示しない"
 
 #: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
@@ -621,15 +599,12 @@ msgstr "%s が指定されていない場合、%s は '%s' を探します"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for copying conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -663,14 +638,11 @@ msgstr "%s にログを保存するための書き込み許可がありません
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"%s を root で実行することはできません。\\nシステムに致命的なダメージを与える"
-"可能性があります。"
+msgstr "%s を root で実行することはできません。\\nシステムに致命的なダメージを与える可能性があります。"
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
-msgstr ""
-"%s オプションを使わないでください。このオプションは %s で使うためのものです。"
+msgstr "%s オプションを使わないでください。このオプションは %s で使うためのものです。"
 
 #: scripts/makepkg.sh.in:1989
 msgid "%s does not exist."
@@ -760,8 +732,7 @@ msgstr "無効な template 行: テンプレートの名前が見つかりませ
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr ""
-"名前 '%s' に不正な文字が使用されています。使用可能文字: [:alnum:]+_.@-\n"
+msgstr "名前 '%s' に不正な文字が使用されています。使用可能文字: [:alnum:]+_.@-\n"
 
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
@@ -808,9 +779,7 @@ msgstr "  --newest, -n          テンプレートを最新のバージョンに
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                        (デフォルト: テンプレートメーカーで指定されたバージョ"
-"ンを使用)\n"
+msgstr "                        (デフォルト: テンプレートメーカーで指定されたバージョンを使用)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
@@ -834,10 +803,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
-"This is free software; see the source for copying conditions.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\nThis is free software; see the source for copying conditions.\nThere is NO WARRANTY, to the extent permitted by law.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -873,13 +839,10 @@ msgstr "  --nocolor            メッセージの出力をカラーにしない"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nThis is free software; see the source for copying conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -896,8 +859,7 @@ msgstr "データベースを更新するには適切な権限が必要です。
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Pacman ロックファイルが存在します。pacman が動作している間は実行できません。"
+msgstr "Pacman ロックファイルが存在します。pacman が動作している間は実行できません。"
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -909,15 +871,11 @@ msgstr "完了。"
 
 #: scripts/pacman-db-upgrade.sh.in:173
 msgid "Pre-4.2 database format detected - upgrading..."
-msgstr ""
-"4.2 以前のデータベースフォーマットが検出されました - アップグレードしていま"
-"す..."
+msgstr "4.2 以前のデータベースフォーマットが検出されました - アップグレードしています..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"シンボリックリンク '%s' の先が pacman のルートの外になっています。手動で修正"
-"する必要があります"
+msgstr "シンボリックリンク '%s' の先が pacman のルートの外になっています。手動で修正する必要があります"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -941,15 +899,12 @@ msgstr "  -d, --delete              指定された keyid を削除"
 
 #: scripts/pacman-key.sh.in:65
 msgid "  -e, --export              Export the specified or all keyids"
-msgstr ""
-"  -e, --export              指定された、もしくは全ての keyid をエクスポート"
+msgstr "  -e, --export              指定された、もしくは全ての keyid をエクスポート"
 
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              指定された、もしくは全ての keyid のフィンガープリ"
-"ントを一覧"
+msgstr "  -f, --finger              指定された、もしくは全ての keyid のフィンガープリントを一覧"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -981,9 +936,7 @@ msgstr "  --import                  ディレクトリから pubring.gpg をイ
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          ディレクトリ内の trustdb.gpg から所有者信頼値をイ"
-"ンポート"
+msgstr "  --import-trustdb          ディレクトリ内の trustdb.gpg から所有者信頼値をインポート"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
@@ -999,34 +952,26 @@ msgstr "  --lsign-key               指定された keyid に署名"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                (指定された) キーリングからデフォルトキーをリロー"
-"ド\\n                            キーリングのディレクトリ: '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                (指定された) キーリングからデフォルトキーをリロード\\n                            キーリングのディレクトリ: '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            指定された、もしくは全てのキーをキーサーバから更"
-"新"
+msgstr "  --refresh-keys            指定された、もしくは全てのキーをキーサーバから更新"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <file>           指定された設定ファイルを使う (デフォルトは"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <file>           指定された設定ファイルを使う (デフォルトは\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            GnuPG のディレクトリを指定する (デフォルトは"
-"\\n                            '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            GnuPG のディレクトリを指定する (デフォルトは\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
@@ -1200,24 +1145,17 @@ msgstr "使用方法: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize はファイルシステムベースのデータベースに\\npacman が読み書き"
-"するときのパフォーマンスを改善するためのツールです。\\n\\n"
+msgstr "pacman-optimize はファイルシステムベースのデータベースに\\npacman が読み書きするときのパフォーマンスを改善するためのツールです。\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"pacman はパッケージを管理するために多くの小さなファイルを使うので、\\n長く利"
-"用しているとファイルの断片化が発生してしまいます。\\nこのスクリプトはこうした"
-"小さなファイルをハードドライブの連続した場所に\\n再配置することを試みます。"
-"HDDのヘッドが動く距離を減らすことになり\\n結果としてハードドライブの読み込み"
-"が速くなるはずです。\\n"
+msgstr "pacman はパッケージを管理するために多くの小さなファイルを使うので、\\n長く利用しているとファイルの断片化が発生してしまいます。\\nこのスクリプトはこうした小さなファイルをハードドライブの連続した場所に\\n再配置することを試みます。HDDのヘッドが動く距離を減らすことになり\\n結果としてハードドライブの読み込みが速くなるはずです。\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1268,10 +1206,9 @@ msgid "Rotating database into place..."
 msgstr "データベースを配置..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"新しいデータベースの置換に失敗しました。%s, %s, %s ディレクトリを確認してくだ"
-"さい。"
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "新しいデータベースの置換に失敗しました。%s, %s, %s ディレクトリを確認してください。"
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1285,9 +1222,7 @@ msgstr "使用方法: pkgdelta [オプション] <パッケージ1> <パッケ
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta は2つのパッケージから差分ファイルを作成します。\\n差分ファイルは "
-"repo-add を使うことでデータベースに追加できます。\\n"
+msgstr "pkgdelta は2つのパッケージから差分ファイルを作成します。\\n差分ファイルは repo-add を使うことでデータベースに追加できます。\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1321,10 +1256,7 @@ msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
-"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
-"the extent permitted by law.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free software; see the source for copying conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1368,9 +1300,7 @@ msgstr "ファイル '%s' は存在しません"
 
 #: scripts/pkgdelta.sh.in:220 scripts/repo-add.sh.in:250
 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
-msgstr ""
-"xdelta3 バイナリを見つけられませんでした!xdelta3 がインストールされています"
-"か?"
+msgstr "xdelta3 バイナリを見つけられませんでした!xdelta3 がインストールされていますか?"
 
 #: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
@@ -1378,11 +1308,9 @@ msgstr "使用方法: repo-add [オプション] <path-to-db> <パッケージ|
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add はパッケージファイルを読み込んでパッケージデータベースを更新しま"
-"す。\\n追加するパッケージはコマンドラインから複数指定することができます。\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add はパッケージファイルを読み込んでパッケージデータベースを更新します。\\n追加するパッケージはコマンドラインから複数指定することができます。\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1390,31 +1318,26 @@ msgstr "  -d, --delta       パッケージの更新の差分を生成・追加\
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr "  -n, --new         データベースにないパッケージのみを追加\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"  -R, --remove      データベースの更新後に古いパッケージファイルをディスクか"
-"ら削除\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "  -R, --remove      データベースの更新後に古いパッケージファイルをディスクから削除\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"使用方法: repo-remove [オプション] <path-to-db> <パッケージ名|差分> ...\\n"
+msgstr "使用方法: repo-remove [オプション] <path-to-db> <パッケージ名|差分> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove はコマンドラインから指定されたパッケージ名をデータベースから\\n削"
-"除してパッケージデータベースを更新します。一度に複数の\\nパッケージをコマンド"
-"ラインから指定して削除できます。\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove はコマンドラインから指定されたパッケージ名をデータベースから\\n削除してパッケージデータベースを更新します。一度に複数の\\nパッケージをコマンドラインから指定して削除できます。\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1444,8 +1367,7 @@ msgstr "\\n詳細とオプションの説明は %s(8) を見てください。\\
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"例:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "例:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1453,13 +1375,10 @@ msgstr "例:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n\\nThis is free software; see the source for copying conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1750,18 +1669,21 @@ msgstr "Failure while pulling %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "認識できない参照: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "%s %s リポジトリの作業コピーを作成..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "%s %s リポジトリの作業コピーの更新中にエラー"
 
@@ -1793,12 +1715,14 @@ msgstr "%s を %s で展開"
 msgid "Failed to extract %s"
 msgstr "%s の展開に失敗しました"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "%s %s リポジトリを複製..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "%s %s リポジトリのダウンロードに失敗"
@@ -1807,12 +1731,14 @@ msgstr "%s %s リポジトリのダウンロードに失敗"
 msgid "%s is not a clone of %s"
 msgstr "%s は %s の複製ではありません"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "%s %s リポジトリを更新..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "%s %s リポジトリの更新に失敗"
diff --git a/scripts/po/ka.po b/scripts/po/ka.po
index 394b012e..967a54e3 100644
--- a/scripts/po/ka.po
+++ b/scripts/po/ka.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # arabuli <arabulibeqa@yahoo.com>, 2015
 # arabuli <arabulibeqa@yahoo.com>, 2015
@@ -12,12 +12,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 03:32+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Georgian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ka/)\n"
-"Language: ka\n"
+"Language-Team: Georgian (http://www.transifex.com/toofishes/archlinux-pacman/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: scripts/makepkg.sh.in:135
@@ -99,7 +98,8 @@ msgid "Generating checksums for source files..."
 msgstr ""
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
 msgstr ""
 
 #: scripts/makepkg.sh.in:422
@@ -408,7 +408,8 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1696
@@ -481,7 +482,8 @@ msgid ""
 msgstr ""
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1716
@@ -517,7 +519,8 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1724
@@ -596,10 +599,11 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
@@ -835,9 +839,9 @@ msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
@@ -948,8 +952,8 @@ msgstr ""
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:79
@@ -959,14 +963,14 @@ msgstr ""
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:86
@@ -1145,8 +1149,8 @@ msgstr ""
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
@@ -1202,7 +1206,8 @@ msgid "Rotating database into place..."
 msgstr ""
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr ""
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1303,8 +1308,8 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:62
@@ -1313,13 +1318,14 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:66
@@ -1328,9 +1334,9 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:75
@@ -1369,9 +1375,9 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:146
@@ -1663,18 +1669,21 @@ msgstr ""
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr ""
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr ""
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr ""
 
@@ -1706,12 +1715,14 @@ msgstr ""
 msgid "Failed to extract %s"
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr ""
@@ -1720,12 +1731,14 @@ msgstr ""
 msgid "%s is not a clone of %s"
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr ""
diff --git a/scripts/po/kk.po b/scripts/po/kk.po
index 3e3263b7..8af0db8e 100644
--- a/scripts/po/kk.po
+++ b/scripts/po/kk.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 msgid ""
 msgstr ""
@@ -10,12 +10,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 03:32+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Kazakh (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/kk/)\n"
-"Language: kk\n"
+"Language-Team: Kazakh (http://www.transifex.com/toofishes/archlinux-pacman/language/kk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: kk\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: scripts/makepkg.sh.in:135
@@ -97,7 +96,8 @@ msgid "Generating checksums for source files..."
 msgstr "Бастапқы кодтар файлдарының тексеру сомалары есептелуде..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
 msgstr ""
 
 #: scripts/makepkg.sh.in:422
@@ -131,8 +131,7 @@ msgstr "Бір немесе бірнеше файлдар бүтіндікті 
 
 #: scripts/makepkg.sh.in:489
 msgid "Integrity checks (%s) differ in size from the source array."
-msgstr ""
-"Бүтіндігін тексерудің (%s) бастапқы массивіндегі мәндерден өлшемдері басқа."
+msgstr "Бүтіндігін тексерудің (%s) бастапқы массивіндегі мәндерден өлшемдері басқа."
 
 #: scripts/makepkg.sh.in:531
 msgid "Integrity checks are missing for: %s"
@@ -407,7 +406,8 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1696
@@ -448,9 +448,7 @@ msgstr "  -f, --force      Бар болып тұрған дестені алм
 
 #: scripts/makepkg.sh.in:1707
 msgid "  -g, --geninteg   Generate integrity checks for source files"
-msgstr ""
-"  -g, --geninteg   Бастапқы файлдардың бүтіндігін тексеру үшін ақпаратты "
-"дайындау"
+msgstr "  -g, --geninteg   Бастапқы файлдардың бүтіндігін тексеру үшін ақпаратты дайындау"
 
 #: scripts/makepkg.sh.in:1708
 msgid "  -h, --help       Show this help message and exit"
@@ -479,13 +477,12 @@ msgstr "  -p <file>        Жинау үшін басқа скриптті қо
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Сәтті жинаудан кейін орнатылған тәуелділіктерді өшіру"
+msgstr "  -r, --rmdeps     Сәтті жинаудан кейін орнатылған тәуелділіктерді өшіру"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr ""
-"  -R, --repackage  Компиляциясыз-ақ десте құрамасын қайта дестеге жинау"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
+msgstr "  -R, --repackage  Компиляциясыз-ақ десте құрамасын қайта дестеге жинау"
 
 #: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
@@ -504,9 +501,7 @@ msgstr ""
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      Бастапқы кодтары бар, жүктеліп алынған файлдармен қоса, "
-"архивті жасау"
+msgstr "  --allsource      Бастапқы кодтары бар, жүктеліп алынған файлдармен қоса, архивті жасау"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -522,7 +517,8 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1724
@@ -593,8 +589,7 @@ msgstr "  --noconfirm      Тәуелділіктерді шешу кезінд
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"  --noprogressbar  Файлдарды жүктеп алу кезінде үрдіс жолағын көрсетпеу"
+msgstr "  --noprogressbar  Файлдарды жүктеп алу кезінде үрдіс жолағын көрсетпеу"
 
 #: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
@@ -602,10 +597,11 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
@@ -841,9 +837,9 @@ msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
@@ -861,9 +857,7 @@ msgstr "Дерекқорды жаңарту үшін сізде керек рұ
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Pacman'ның оқшаулау файлы табылды. Pacman қосулы тұрғанда оны қайта қосуға "
-"болмайды."
+msgstr "Pacman'ның оқшаулау файлы табылды. Pacman қосулы тұрғанда оны қайта қосуға болмайды."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -956,8 +950,8 @@ msgstr ""
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:79
@@ -967,14 +961,14 @@ msgstr ""
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:86
@@ -1149,25 +1143,17 @@ msgstr ""
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize - бұл кішкентай қу әрекет, ол pacman'ның жылдамдығын"
-"\\nфайлдық жүйеге негізделген дерекқорға жазу/оқу кезінде арттыра алады.\\n"
-"\\n"
+msgstr "pacman-optimize - бұл кішкентай қу әрекет, ол pacman'ның жылдамдығын\\nфайлдық жүйеге негізделген дерекқорға жазу/оқу кезінде арттыра алады.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Дестелерді бақылау үшін pacman көп кішкентай файлдарды қолданған соң,"
-"\\nуақыт өте ол файлдар диск бойына тарап, фрагментацияға әкеп соғады.\\nБұл "
-"скрипт ол файлдарды дискіде үзіліссіз орналастыруға тырысады.\\nНәтижесінде "
-"қатты диск ол файлдарды тезірек оқуы керек,\\nөйткені дискіге енді аздау "
-"әрекеттер жасау керек болады.\\n"
+msgstr "Дестелерді бақылау үшін pacman көп кішкентай файлдарды қолданған соң,\\nуақыт өте ол файлдар диск бойына тарап, фрагментацияға әкеп соғады.\\nБұл скрипт ол файлдарды дискіде үзіліссіз орналастыруға тырысады.\\nНәтижесінде қатты диск ол файлдарды тезірек оқуы керек,\\nөйткені дискіге енді аздау әрекеттер жасау керек болады.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1218,7 +1204,8 @@ msgid "Rotating database into place..."
 msgstr "Жаңа дерекқор орнына апарылуда..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr ""
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1267,10 +1254,7 @@ msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nБұл еркін "
-"бағдарламалық қамтама; көшірме жасау шарттарын кодтан қараңыз.\\nЗаңмен "
-"рұқсат етілген шегінде ешбір КЕПІЛДЕМЕ берілмейді.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nБұл еркін бағдарламалық қамтама; көшірме жасау шарттарын кодтан қараңыз.\\nЗаңмен рұқсат етілген шегінде ешбір КЕПІЛДЕМЕ берілмейді.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1322,8 +1306,8 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:62
@@ -1332,13 +1316,14 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:66
@@ -1347,9 +1332,9 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:75
@@ -1388,9 +1373,9 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:146
@@ -1682,18 +1667,21 @@ msgstr ""
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr ""
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr ""
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr ""
 
@@ -1725,12 +1713,14 @@ msgstr "%s тарқатылуда %s көмегімен"
 msgid "Failed to extract %s"
 msgstr "%s тарқату мүмкін емес"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr ""
@@ -1739,12 +1729,14 @@ msgstr ""
 msgid "%s is not a clone of %s"
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr ""
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr ""
@@ -1787,8 +1779,7 @@ msgstr ""
 
 #: scripts/libmakepkg/tidy/strip.sh.in:85
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr ""
-"Орындалатын файлдар мен жинақтардан керек емес таңбаларды алып тастау..."
+msgstr "Орындалатын файлдар мен жинақтардан керек емес таңбаларды алып тастау..."
 
 #: scripts/libmakepkg/tidy/upx.sh.in:35
 msgid "Compressing binaries with %s..."
diff --git a/scripts/po/ko.po b/scripts/po/ko.po
index 33df7418..dce36c97 100644
--- a/scripts/po/ko.po
+++ b/scripts/po/ko.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Seong-ho Cho <darkcircle.0426@gmail.com>, 2013
 # Seong-ho Cho <darkcircle.0426@gmail.com>, 2013,2015
@@ -19,12 +19,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-18 12:04+0000\n"
 "Last-Translator: Taegil Bae <esrevinu@gmail.com>\n"
-"Language-Team: Korean (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ko/)\n"
-"Language: ko\n"
+"Language-Team: Korean (http://www.transifex.com/toofishes/archlinux-pacman/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: scripts/makepkg.sh.in:135
@@ -106,7 +105,8 @@ msgid "Generating checksums for source files..."
 msgstr "원본 파일에 대한 checksum을 만드는 중..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
 msgstr "원본 파일 checksum을 만드는데 필요한 %s 바이너리를 찾을 수 없습니다."
 
 #: scripts/makepkg.sh.in:422
@@ -395,8 +395,7 @@ msgstr "목적 파일을 스트리핑 하는 데 필요한 %s 바이너리를 
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"맨페이지와 info 페이지를 압축하는 데 필요한 %s 바이너리를 찾을 수 없습니다."
+msgstr "맨페이지와 info 페이지를 압축하는 데 필요한 %s 바이너리를 찾을 수 없습니다."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -416,9 +415,9 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "꾸러미 그룹을 이미 빌드했습니다(덮어 쓰려면 %s 옵션을 사용하십시오)."
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"꾸러미 그룹 일부를 이미 빌드했습니다(덮어 쓰려면 %s 옵션을 사용하십시오)."
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "꾸러미 그룹 일부를 이미 빌드했습니다(덮어 쓰려면 %s 옵션을 사용하십시오)."
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -450,9 +449,7 @@ msgstr "  -d, --nodeps     모든 의존성 검사를 건너뜁니다"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  원본 파일을 추출하지 않습니다(이미 있는 %s 디렉터리를 사용"
-"합니다)"
+msgstr "  -e, --noextract  원본 파일을 추출하지 않습니다(이미 있는 %s 디렉터리를 사용합니다)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -489,13 +486,12 @@ msgstr "  -p <파일>        ('%s' 대신) 대체 빌드 스크립트를 사용
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     빌드가 성공적으로 끝나면 설치한 의존 요소를 제거합니다"
+msgstr "  -r, --rmdeps     빌드가 성공적으로 끝나면 설치한 의존 요소를 제거합니다"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr ""
-"  -R, --repackage  꾸러미의 내용을 다시 빌드하지 않고 꾸러미를 다시 만듭니다"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
+msgstr "  -R, --repackage  꾸러미의 내용을 다시 빌드하지 않고 꾸러미를 다시 만듭니다"
 
 #: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
@@ -530,7 +526,8 @@ msgstr "  --holdver        VCS 원본을 업데이트하지 않습니다"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
 msgstr "  --key <키>      서명을 위해 %s에 대한 키를 기본값 대신 지정합니다"
 
 #: scripts/makepkg.sh.in:1724
@@ -579,9 +576,7 @@ msgstr "  --skippgpcheck   PGP 서명으로 원본 파일을 검증하지 않습
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource   (필요한 경우) 원본 파일을 다운로드하고 무결성 검사를 수행"
-"합니다"
+msgstr "  --verifysource   (필요한 경우) 원본 파일을 다운로드하고 무결성 검사를 수행합니다"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -603,8 +598,7 @@ msgstr "  --noconfirm      의존성을 해결할 때 확인하지 않습니다"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"  --noprogressbar  파일을 다운로드할 때 진행 표시줄을 표시하지 않습니다"
+msgstr "  --noprogressbar  파일을 다운로드할 때 진행 표시줄을 표시하지 않습니다"
 
 #: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
@@ -612,15 +606,12 @@ msgstr "%s를 지정하지 않으면, %s는 %s를 찾습니다"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\n이것은 자유"
-"소프트웨어입니다. 복제조건에 대해서는 소스코드를 참조하십시오.\\n법이 허용하"
-"는 한에서 어떤 보증도 하지 않습니다.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\n이것은 자유소프트웨어입니다. 복제조건에 대해서는 소스코드를 참조하십시오.\\n법이 허용하는 한에서 어떤 보증도 하지 않습니다.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -654,9 +645,7 @@ msgstr "%s에 기록을 저장하려는데 쓰기 권한이 없습니다."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"%s를 root로서 실행하는 것은 허용되지 않습니다. 당신의 시스템에 영구적이고 큰 "
-"손상을\\n줄 수 있기 때문입니다."
+msgstr "%s를 root로서 실행하는 것은 허용되지 않습니다. 당신의 시스템에 영구적이고 큰 손상을\\n줄 수 있기 때문입니다."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -750,8 +739,7 @@ msgstr "유효하지 않은 템플릿 줄: 템플릿 이름을 찾을 수 없습
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr ""
-"이름 '%s'에 유효하지 않은 글자가 사용되었습니다. 허용글자: [:alnum:]+_.@-\n"
+msgstr "이름 '%s'에 유효하지 않은 글자가 사용되었습니다. 허용글자: [:alnum:]+_.@-\n"
 
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
@@ -798,8 +786,7 @@ msgstr "  --newest, -n          최신 버전으로 템플릿을 갱신합니다
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                        (기본값: 템플릿 표시자 안에 명기된 버전 사용)\n"
+msgstr "                        (기본값: 템플릿 표시자 안에 명기된 버전 사용)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
@@ -823,10 +810,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
-"이것은 자유소프트웨어입니다. 복제조건에 대해서는 소스코드를 참조하십시오.\n"
-"법이 허용하는 한에서 어떤 보증도 하지 않습니다.\n"
+msgstr "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n이것은 자유소프트웨어입니다. 복제조건에 대해서는 소스코드를 참조하십시오.\n법이 허용하는 한에서 어떤 보증도 하지 않습니다.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -862,13 +846,10 @@ msgstr "  --nocolor            출력 메시지의 색 구분 기능을 끕니
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\n이것은 자유소프트웨어입니다. 복제조건에 대해서는 소스코드를 참조하십시오."
-"\\n법이 허용하는 한에서 어떤 보증도 하지 않습니다.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\n이것은 자유소프트웨어입니다. 복제조건에 대해서는 소스코드를 참조하십시오.\\n법이 허용하는 한에서 어떤 보증도 하지 않습니다.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -885,8 +866,7 @@ msgstr "데이터베이스를 업그레이드하려면 권한을 올바르게 
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"pacman 잠금 파일이 있습니다. pacman이 실행중인 동안에는 실행할 수 없습니다."
+msgstr "pacman 잠금 파일이 있습니다. pacman이 실행중인 동안에는 실행할 수 없습니다."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -902,8 +882,7 @@ msgstr "4.2 이전 데이터베이스 형식을 감지했습니다 - 업그레
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"심볼릭 연결 '%s'가 pacman 최상위 디렉터리 바깥을 가리킵니다. 수동 조치 필요"
+msgstr "심볼릭 연결 '%s'가 pacman 최상위 디렉터리 바깥을 가리킵니다. 수동 조치 필요"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -932,8 +911,7 @@ msgstr "  -e, --export              지정한 또는 모든 키 ID를 내보냅
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              지정한 또는 모든 키 ID에 대한 지문키를 출력합니다"
+msgstr "  -f, --finger              지정한 또는 모든 키 ID에 대한 지문키를 출력합니다"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -955,8 +933,7 @@ msgstr "  -v, --verify              지정한 파일을 서명으로 검증합
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key                키 ID에 대한 키 관리 작업 메뉴를 나타냅니다"
+msgstr "  --edit-key                키 ID에 대한 키 관리 작업 메뉴를 나타냅니다"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
@@ -966,14 +943,11 @@ msgstr "  --import                  디렉터리에서 pubring.gpg를 가져옵
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          디렉터리의 trustdb.gpg에서 소유자 신뢰 값을 가져"
-"옵니다"
+msgstr "  --import-trustdb          디렉터리의 trustdb.gpg에서 소유자 신뢰 값을 가져옵니다"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                    키 모음이 제대로 초기화 되었는지 확인합니다"
+msgstr "  --init                    키 모음이 제대로 초기화 되었는지 확인합니다"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
@@ -985,31 +959,26 @@ msgstr "  --lsign-key               지정한 키 ID로 로컬 서명합니다"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                '%s'의(주어진) 키 모음에서 기본값을 다시 불러옵니"
-"다"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                '%s'의(주어진) 키 모음에서 기본값을 다시 불러옵니다"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            키 서버에서 지정한 또는 모든 키를 업데이트합니다"
+msgstr "  --refresh-keys            키 서버에서 지정한 또는 모든 키를 업데이트합니다"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
 msgstr "  --config <파일>           ('%s' 대신) 지정한 설정 파일을 사용합니다"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <디렉터리>            ('%s' 대신) GnuPG에서 사용할 대체 디렉터리를"
-"\\n                            설정합니다."
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <디렉터리>            ('%s' 대신) GnuPG에서 사용할 대체 디렉터리를\\n                            설정합니다."
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
@@ -1183,24 +1152,17 @@ msgstr "사용법: %s <--nocolor> <pacman DB 루트>"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"파일 시스템 기반 데이터베이스에 읽고 쓸 때, 성능을 개선하려고\\npacman-"
-"optimize를 약간 수정했습니다.\\n\\n"
+msgstr "파일 시스템 기반 데이터베이스에 읽고 쓸 때, 성능을 개선하려고\\npacman-optimize를 약간 수정했습니다.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"왜냐면 pacman은 꾸러미 상태를 유지하려고 작은 크기의 많은 파일을\\n 사용하"
-"며, 이 파일들은 시간이 지나면서 쪼개지는 경향이 있기\\n 때문입니다. 이 스크립"
-"트는 여러분의 하드 드라이브에서\\n연속적으로 위치하도록 재배치 작업을 시도합"
-"니다. 결과적으로\\n하드 드라이브는 헤드를 디스크의 이곳저곳으로 움직이지\\n않"
-"으므로, 이 파일을 좀 더 빨리 읽을 수 있습니다.\\n"
+msgstr "왜냐면 pacman은 꾸러미 상태를 유지하려고 작은 크기의 많은 파일을\\n 사용하며, 이 파일들은 시간이 지나면서 쪼개지는 경향이 있기\\n 때문입니다. 이 스크립트는 여러분의 하드 드라이브에서\\n연속적으로 위치하도록 재배치 작업을 시도합니다. 결과적으로\\n하드 드라이브는 헤드를 디스크의 이곳저곳으로 움직이지\\n않으므로, 이 파일을 좀 더 빨리 읽을 수 있습니다.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1251,9 +1213,9 @@ msgid "Rotating database into place..."
 msgstr "데이터베이스를 제 위치로 돌려놓는중..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"새 데이터베이스 대체에 실패했습니다. %s, %s, %s 디렉터리를 확인하십시오."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "새 데이터베이스 대체에 실패했습니다. %s, %s, %s 디렉터리를 확인하십시오."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1267,9 +1229,7 @@ msgstr "사용법: pkgdelta <옵션> <꾸러미1> <꾸러미2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta는 두 꾸러미 사이의 델타 파일을 만들 것입니다.\\n그러면 이 델타 파일"
-"은 repo-add를 사용해서 데이터베이스에 넣을 수 있습니다.\\n"
+msgstr "pkgdelta는 두 꾸러미 사이의 델타 파일을 만들 것입니다.\\n그러면 이 델타 파일은 repo-add를 사용해서 데이터베이스에 넣을 수 있습니다.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1296,19 +1256,14 @@ msgstr "  --min-pkg-size    델타를 만들기 전에 꾸러미 크기를 최
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  무시할 델타값보다 더 큰 델타값을 가진 새 꾸러미의 백분율"
-"입니다\\n"
+msgstr "  --max-delta-size  무시할 델타값보다 더 큰 델타값을 가진 새 꾸러미의 백분율입니다\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\n이것은 자유소프"
-"트웨어입니다. 복제조건에 대해서는 소스코드를 참조하십시오.\\n법이 허용하는 한"
-"에서 어떤 보증도 하지 않습니다.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\n이것은 자유소프트웨어입니다. 복제조건에 대해서는 소스코드를 참조하십시오.\\n법이 허용하는 한에서 어떤 보증도 하지 않습니다.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1360,29 +1315,25 @@ msgstr "사용법: repo-add <옵션> <DB 경로> <꾸러미|델타> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add에서 꾸러미 파일을 읽어 꾸러미 데이터베이스를 업데이트합니다.\\n여러 "
-"꾸러미를 추가하려면 명령줄에서 지정할 수 있습니다.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add에서 꾸러미 파일을 읽어 꾸러미 데이터베이스를 업데이트합니다.\\n여러 꾸러미를 추가하려면 명령줄에서 지정할 수 있습니다.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta       꾸러미 업데이트에 사용할 델타를 생성하고 추가합니다\\n"
+msgstr "  -d, --delta       꾸러미 업데이트에 사용할 델타를 생성하고 추가합니다\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr "  -n, --new         데이터베이스에 없는 꾸러미만 추가합니다\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"  -R, --remove      데이터베이스 갱신 후 디스크로부터 오래된 꾸러미 파일 삭제"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "  -R, --remove      데이터베이스 갱신 후 디스크로부터 오래된 꾸러미 파일 삭제\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
@@ -1390,13 +1341,10 @@ msgstr "사용법: repo-remove <옵션> <DB 경로> <꾸러미 이름|델타> ..
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove는 명령줄 상에서 repo 데이터베이스에 주어진 꾸러미 이름을 지우고"
-"\\n꾸러미 데이터베이스를 업데이트합니다. 여러 꾸러미를 추가하려면 명령줄에서"
-"\\n지정할 수 있습니다.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove는 명령줄 상에서 repo 데이터베이스에 주어진 꾸러미 이름을 지우고\\n꾸러미 데이터베이스를 업데이트합니다. 여러 꾸러미를 추가하려면 명령줄에서\\n지정할 수 있습니다.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1408,8 +1356,7 @@ msgstr "  --nocolor         출력할 때 색 구분 기능을 끕니다\\n"
 
 #: scripts/repo-add.sh.in:80
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
-msgstr ""
-"  -s, --sign        업데이트가 끝나면 GnuPG로 데이터베이스에 서명합니다\\n"
+msgstr "  -s, --sign        업데이트가 끝나면 GnuPG로 데이터베이스에 서명합니다\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
@@ -1422,15 +1369,12 @@ msgstr "  -v, --verify      업데이트 전 데이터베이스 서명을 검증
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\n사용할 수 있는 옵션에 대한 더 자세한 설명을 보려면 %s(8)을 참조하십시오."
-"\\n"
+msgstr "\\n사용할 수 있는 옵션에 대한 더 자세한 설명을 보려면 %s(8)을 참조하십시오.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"예시:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "예시:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1438,13 +1382,10 @@ msgstr "예시:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\n이것은 자유소프트웨어입니다.\\n법이 허용하는 한에서 어떤 보증도 하지 않습"
-"니다.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n\\n이것은 자유소프트웨어입니다.\\n법이 허용하는 한에서 어떤 보증도 하지 않습니다.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1735,18 +1676,21 @@ msgstr "%s를 끌어 오다가 실패했습니다"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "알 수 없는 참조입니다: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "%s %s 저장소의 작업 사본 만드는 중..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "%s %s 레포의 작업용 사본을 만드는 중 실패했습니다."
 
@@ -1778,12 +1722,14 @@ msgstr "%s를 %s로 추출 중"
 msgid "Failed to extract %s"
 msgstr "%s 추출에 실패했습니다"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "%s %s 저장소 클로닝중..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "%s %s 저장소를 다운로드하는 중 실패했습니다"
@@ -1792,12 +1738,14 @@ msgstr "%s %s 저장소를 다운로드하는 중 실패했습니다"
 msgid "%s is not a clone of %s"
 msgstr "%s는 %s의 클론이 아닙니다"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "%s %s 저장소 업데이트 중..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "%s %s 저장소 업데이트 중 실패했습니다"
diff --git a/scripts/po/lt.po b/scripts/po/lt.po
index bc947f4b..e22cd4bc 100644
--- a/scripts/po/lt.po
+++ b/scripts/po/lt.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Algimantas Margevičius <gymka@archlinux.lt>, 2013
 # Algimantas Margevičius <gymka@mail.ru>, 2011
@@ -19,14 +19,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-21 23:26+0000\n"
 "Last-Translator: Moo\n"
-"Language-Team: Lithuanian (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/lt/)\n"
-"Language: lt\n"
+"Language-Team: Lithuanian (http://www.transifex.com/toofishes/archlinux-pacman/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: scripts/makepkg.sh.in:135
 msgid "Cleaning up..."
@@ -107,10 +105,9 @@ msgid "Generating checksums for source files..."
 msgstr "Kuriamos pradinio kodo failų kontrolinės sumos ..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Negaliu rasti %s sukompiliuotos programos reikalingos suskaičiuoti pradinio "
-"kodo kontrolinę sumą."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Negaliu rasti %s sukompiliuotos programos reikalingos suskaičiuoti pradinio kodo kontrolinę sumą."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -345,9 +342,7 @@ msgstr "Nežinomas parsiuntimo protokolas: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Nepavyksta rasti %s sukompiliuotos programos, reikalingos patikrinti VCS "
-"šaltinių reikalavimus."
+msgstr "Nepavyksta rasti %s sukompiliuotos programos, reikalingos patikrinti VCS šaltinių reikalavimus."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
@@ -355,15 +350,11 @@ msgstr "Nepavyksta rasti %s paketo, reikalingo apdoroti %s šaltinius."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
-msgstr ""
-"Neįmanoma rasti %s sukompiliuotos programos reikalingos atlikti "
-"priklausomybės operacijas."
+msgstr "Neįmanoma rasti %s sukompiliuotos programos reikalingos atlikti priklausomybės operacijas."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Neįmanoma rasti %s sukompiliuotos programos. „Root“ teisėms gauti bus "
-"naudojama %s."
+msgstr "Neįmanoma rasti %s sukompiliuotos programos. „Root“ teisėms gauti bus naudojama %s."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -371,33 +362,24 @@ msgstr "Nepavyksta rasti %s sukompiliuotos programos."
 
 #: scripts/makepkg.sh.in:1531
 msgid "Cannot find the %s binary required for signing packages."
-msgstr ""
-"Negaliu rasti %s sukompiliuotos programos reikalingos paketų pasirašymui."
+msgstr "Negaliu rasti %s sukompiliuotos programos reikalingos paketų pasirašymui."
 
 #: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
-"Negaliu rasti %s sukompiliuotos programos reikalingos patikrinti pradinių "
-"kodų failus."
+msgstr "Negaliu rasti %s sukompiliuotos programos reikalingos patikrinti pradinių kodų failus."
 
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"Nepavyksta rasti %s sukompiliuotos programos, reikalingos šaltinio failo "
-"kontrolinės sumos patikrinimui."
+msgstr "Nepavyksta rasti %s sukompiliuotos programos, reikalingos šaltinio failo kontrolinės sumos patikrinimui."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"Negaliu rasti %s sukompiliuotos programos reikalingos archyvuoti "
-"kompiliuotas programas."
+msgstr "Negaliu rasti %s sukompiliuotos programos reikalingos archyvuoti kompiliuotas programas."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
-msgstr ""
-"Nepavyksta rasti %s sukompiliuotos programos, reikalingos PNG paveikslų "
-"optimizavimui."
+msgstr "Nepavyksta rasti %s sukompiliuotos programos, reikalingos PNG paveikslų optimizavimui."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
@@ -405,9 +387,7 @@ msgstr "Negaliu rasti %s sukompiliuotos programos reikalingos kompiliavimui."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Negaliu rasti %s sukompiliuotos programos reikalingos kompiliatoriaus "
-"podėlio naudojimui."
+msgstr "Negaliu rasti %s sukompiliuotos programos reikalingos kompiliatoriaus podėlio naudojimui."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
@@ -415,8 +395,7 @@ msgstr "Negaliu rasti %s sukompiliuotos programos objektų failų pašalinimui."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Negaliu rasti %s sukompiliuotos programos man ir info puslapių archyvavimui."
+msgstr "Negaliu rasti %s sukompiliuotos programos man ir info puslapių archyvavimui."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -436,7 +415,8 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "Paketų grupė jau sukurta. (naudok %s perrašyt)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "Dalis paketo jau sukurta. (naudok %s perrašyt)"
 
 #: scripts/makepkg.sh.in:1696
@@ -469,9 +449,7 @@ msgstr "  -d, --nodeps     Praleisti visas priklausomybių patikras"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  Neišarchyvuoti pradinio kodo failų (naudoti esantį %s "
-"aplanką)"
+msgstr "  -e, --noextract  Neišarchyvuoti pradinio kodo failų (naudoti esantį %s aplanką)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -479,8 +457,7 @@ msgstr "  -f, --force      Perrašyti egzistuojantį paketą"
 
 #: scripts/makepkg.sh.in:1707
 msgid "  -g, --geninteg   Generate integrity checks for source files"
-msgstr ""
-"  -g, --geninteg   Generuoti vientisumo patikras pradinių kodų failams "
+msgstr "  -g, --geninteg   Generuoti vientisumo patikras pradinių kodų failams "
 
 #: scripts/makepkg.sh.in:1708
 msgid "  -h, --help       Show this help message and exit"
@@ -504,17 +481,16 @@ msgstr "  -o, --nobuild    Failus tik parsiųsti ir išarchyvuoti"
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <failas>        Naudoti alternatyvų kūrimo scenarijų (vietoj „%s“)"
+msgstr "  -p <failas>        Naudoti alternatyvų kūrimo scenarijų (vietoj „%s“)"
 
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Po sėkmingo sukūrimo pašalinti įdiegtas priklausomybes"
+msgstr "  -r, --rmdeps     Po sėkmingo sukūrimo pašalinti įdiegtas priklausomybes"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  Perpakuoti paketo turinį neperkuriant"
 
 #: scripts/makepkg.sh.in:1716
@@ -524,9 +500,7 @@ msgstr "  -s, --syncdeps   Įdiegti trūkstamas priklausomybes su %s"
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source     Sukuria tik tai pradinio kodo archyvą be parsiųstų "
-"išeities kodų"
+msgstr "  -S, --source     Sukuria tik tai pradinio kodo archyvą be parsiųstų išeities kodų"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -536,9 +510,7 @@ msgstr "  -V, --version Parodyti programos versiją ir išeiti"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      Sukurti tik pradinio kodo „tarball“ pridedant parsiųstus "
-"pradinius kodus "
+msgstr "  --allsource      Sukurti tik pradinio kodo „tarball“ pridedant parsiųstus pradinius kodus "
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -546,8 +518,7 @@ msgstr "  --check          Paleisti funkciją %s %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <failas>  Naudoti alternatyvų konfigūracijos failą (vietoj „%s“)"
+msgstr "  --config <failas>  Naudoti alternatyvų konfigūracijos failą (vietoj „%s“)"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -555,10 +526,9 @@ msgstr "  --holdver        Neatnaujinti VCS pradinių kodų"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <raktas>      Nurodyti raktą %s kuris bus naudojamas vietoj "
-"numatytojo"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <raktas>      Nurodyti raktą %s kuris bus naudojamas vietoj numatytojo"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -579,8 +549,7 @@ msgstr "  --nosign         Nekurti paketo parašo"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"  --packagelist    Išvardinti tik paketus, kurie būtų sukurti, be PKGEXT"
+msgstr "  --packagelist    Išvardinti tik paketus, kurie būtų sukurti, be PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -607,9 +576,7 @@ msgstr "  --skippgpcheck   Netikrinti pradinio kodo failų PGP parašų"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource   Parsiųsti pradinio kodo failus (jei reikia) ir atlikti "
-"vientisumo patikras"
+msgstr "  --verifysource   Parsiųsti pradinio kodo failus (jei reikia) ir atlikti vientisumo patikras"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -639,16 +606,12 @@ msgstr "Jei %s nenurodytas, %s ieškos „%s“"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Autorių teisės (c) 2006-2016 Pacman kūrimo komanda <pacman-dev@archlinux."
-"org>.\\nAutorių teisės (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n"
-"\\nTai yra laisva programinė įranga; norėdami sužinoti apie kopijavimo "
-"sąlygas, žiūrėkite pirminį kodą.\\nNėra JOKIOS GARANTIJOS, tiek, kiek tai "
-"leidžiama pagal įstatymus.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Autorių teisės (c) 2006-2016 Pacman kūrimo komanda <pacman-dev@archlinux.org>.\\nAutorių teisės (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nTai yra laisva programinė įranga; norėdami sužinoti apie kopijavimo sąlygas, žiūrėkite pirminį kodą.\\nNėra JOKIOS GARANTIJOS, tiek, kiek tai leidžiama pagal įstatymus.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -682,9 +645,7 @@ msgstr "Neturite rašymo teisės saugoti žurnalus %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"%s vykdymas \"root\" teisėmis nėra leidžiamas, kadangi jis gali sukelti "
-"ilgalaikę,\\npražūtingą žalą jūsų sistemai."
+msgstr "%s vykdymas \"root\" teisėmis nėra leidžiamas, kadangi jis gali sukelti ilgalaikę,\\npražūtingą žalą jūsų sistemai."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -778,15 +739,12 @@ msgstr "neteisinga šablono eilutė: nepavyksta rasti šablono pavadinimo\n"
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr ""
-"pavadinime panaudoti neteisingi simboliai \"%s\". leidžiami: [:alnum:]+_.@-\n"
+msgstr "pavadinime panaudoti neteisingi simboliai \"%s\". leidžiami: [:alnum:]+_.@-\n"
 
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
 msgid "Couldn't detect version for template '%s'\n"
-msgstr ""
-"Nepavyko aptikti versijos \"%s\" šablonui\n"
-"\n"
+msgstr "Nepavyko aptikti versijos \"%s\" šablonui\n\n"
 
 #: scripts/makepkg-template.pl.in:125
 #, perl-format
@@ -814,15 +772,11 @@ msgstr "Pasirinktys:\n"
 #: scripts/makepkg-template.pl.in:178
 #, perl-format
 msgid "  --input, -p <file>    Build script to read (default: %s)\n"
-msgstr ""
-"  --input, -p <failas>    Kūrimo scenarijus, kurį skaityti (numatytasis: "
-"%s)\n"
+msgstr "  --input, -p <failas>    Kūrimo scenarijus, kurį skaityti (numatytasis: %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
-msgstr ""
-"  --output, -o <failas>   failas, į kurį išvesti informaciją (numatytasis: "
-"įvesties failas)\n"
+msgstr "  --output, -o <failas>   failas, į kurį išvesti informaciją (numatytasis: įvesties failas)\n"
 
 #: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
@@ -832,9 +786,7 @@ msgstr "  --newest, -n          atnaujinti šablonus į naujausią versiją\n"
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                        (pagal numatymą: naudoti versiją, nurodytą šablono "
-"žymėse)\n"
+msgstr "                        (pagal numatymą: naudoti versiją, nurodytą šablono žymėse)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
@@ -858,12 +810,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Autorių teisės (c) 2013-2016 Pacman kūrimo komanda <pacman-dev@archlinux."
-"org>.\n"
-"Tai yra laisva programinė įranga; norėdami sužinoti apie kopijavimo sąlygas, "
-"žiūrėkite pirminį kodą.\n"
-"Nėra JOKIOS GARANTIJOS, tiek, kiek tai leidžiama pagal įstatymus.\n"
+msgstr "Autorių teisės (c) 2013-2016 Pacman kūrimo komanda <pacman-dev@archlinux.org>.\nTai yra laisva programinė įranga; norėdami sužinoti apie kopijavimo sąlygas, žiūrėkite pirminį kodą.\nNėra JOKIOS GARANTIJOS, tiek, kiek tai leidžiama pagal įstatymus.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -883,8 +830,7 @@ msgstr "  -h, --help           parodyti šį pagalbos pranešimą ir išeiti"
 
 #: scripts/pacman-db-upgrade.sh.in:45
 msgid "  -r, --root <path>    set an alternate installation root"
-msgstr ""
-"  -r, --root <kelias>    nustatyti alternatyvų įdiegimo šakninį katalogą"
+msgstr "  -r, --root <kelias>    nustatyti alternatyvų įdiegimo šakninį katalogą"
 
 #: scripts/pacman-db-upgrade.sh.in:46
 msgid "  -V, --version        show version information and exit"
@@ -900,14 +846,10 @@ msgstr "  --nocolor            išjungti spalvotus išvesties pranešimus"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Autorių teisės (c) 2010-2016 Pacman kūrimo komanda <pacman-dev@archlinux."
-"org>.\\nTai yra laisva programinė įranga; norėdami sužinoti apie kopijavimo "
-"sąlygas, žiūrėkite pirminį kodą.\\nNėra JOKIOS GARANTIJOS, tiek, kiek tai "
-"leidžiama pagal įstatymus.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Autorių teisės (c) 2010-2016 Pacman kūrimo komanda <pacman-dev@archlinux.org>.\\nTai yra laisva programinė įranga; norėdami sužinoti apie kopijavimo sąlygas, žiūrėkite pirminį kodą.\\nNėra JOKIOS GARANTIJOS, tiek, kiek tai leidžiama pagal įstatymus.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -940,9 +882,7 @@ msgstr "Aptiktas pre-4.2 duomenų bazės formatas - atnaujinama..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"simbolinė nuoroda \"%s\" nurodo už pacman root ribų, reikalingas taisymas "
-"rankiniu būdu"
+msgstr "simbolinė nuoroda \"%s\" nurodo už pacman root ribų, reikalingas taisymas rankiniu būdu"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -971,9 +911,7 @@ msgstr "  -e, --export              Eksportuoti nurodytus arba visus keyids"
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              Parodyti fingerprint sąrašą nurodytiems arba "
-"visiems keyid"
+msgstr "  -f, --finger              Parodyti fingerprint sąrašą nurodytiems arba visiems keyid"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -990,8 +928,7 @@ msgstr "  -u, --updatedb            Atnaujinti patikimas pacman duomenų bazes"
 #: scripts/pacman-key.sh.in:70
 msgid ""
 "  -v, --verify              Verify the file(s) specified by the signature(s)"
-msgstr ""
-"  -v, --verify              Patikrinti failą (-us) pagal nurodytus parašus"
+msgstr "  -v, --verify              Patikrinti failą (-us) pagal nurodytus parašus"
 
 #: scripts/pacman-key.sh.in:71
 msgid ""
@@ -1006,14 +943,11 @@ msgstr "  --import                  Importuoja pubring.gpg iš aplanko(ų)"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          Importuoja savininko pasitikėjimo reikšmes iš "
-"trustdb.gpg aplanke(-uose)"
+msgstr "  --import-trustdb          Importuoja savininko pasitikėjimo reikšmes iš trustdb.gpg aplanke(-uose)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                    Užtikrinti jog raktų saugykla tinkamai inicijuota"
+msgstr "  --init                    Užtikrinti jog raktų saugykla tinkamai inicijuota"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
@@ -1025,34 +959,26 @@ msgstr "  --lsign-key               Pasirašyti lokaliai nurodytą keyid"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                Perkrauti numatytus raktus iš (duotosios) "
-"raktinės\\n                             „%s“"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                Perkrauti numatytus raktus iš (duotosios) raktinės\\n                             „%s“"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            Atnaujinti nurodytus arba visus raktus iš raktų "
-"serverio"
+msgstr "  --refresh-keys            Atnaujinti nurodytus arba visus raktus iš raktų serverio"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <failas>           Naudoti alternatyvų konfigūracijos failą "
-"(vietoj\\n                    „%s“)"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <failas>           Naudoti alternatyvų konfigūracijos failą (vietoj\\n                    „%s“)"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            Nurodyti alternatyvų GnuPG aplanką (vietoj"
-"\\n                             „%s“)"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            Nurodyti alternatyvų GnuPG aplanką (vietoj\\n                             „%s“)"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
@@ -1226,24 +1152,17 @@ msgstr "Naudojimas: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize yra mažas pataisymas kuris turėtų pagreitinti\\nkai pacman "
-"skaito/rašo savo failų sistemos duomenų bazę\\n\\n"
+msgstr "pacman-optimize yra mažas pataisymas kuris turėtų pagreitinti\\nkai pacman skaito/rašo savo failų sistemos duomenų bazę\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Pacman paketų sekimui naudoja daug mažų failų,\\nyra tikimybė jog tie failai "
-"laikui bėgant bus fragmentuoti.\\nŠis scenarijus pabandys perkelti tuos "
-"failus į vieną\\nfailą kuris bus vientisas. Ko pasekoje kietasis diskas "
-"turėtų sugebėt greičiau juos perskaityt, nes kietojo disko galvutei"
-"\\nnereiks tiek daug keliaut.\\n"
+msgstr "Pacman paketų sekimui naudoja daug mažų failų,\\nyra tikimybė jog tie failai laikui bėgant bus fragmentuoti.\\nŠis scenarijus pabandys perkelti tuos failus į vieną\\nfailą kuris bus vientisas. Ko pasekoje kietasis diskas turėtų sugebėt greičiau juos perskaityt, nes kietojo disko galvutei\\nnereiks tiek daug keliaut.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1294,9 +1213,9 @@ msgid "Rotating database into place..."
 msgstr "Duomenų bazė grąžinama į vietą..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"Naujos duomenų bazės pakeitimas nepavyko. Patikrinkite %s, %s ir %s aplankus."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "Naujos duomenų bazės pakeitimas nepavyko. Patikrinkite %s, %s ir %s aplankus."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1310,9 +1229,7 @@ msgstr "Naudojimas: pkgdelta [parinktys] <paketas1> <paketas2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta sukurs delta tarp dviejų paketų.\\nTada šį delta failą bus galima "
-"pridėti į duomenų bazę naudojant repo-add.\\n"
+msgstr "pkgdelta sukurs delta tarp dviejų paketų.\\nTada šį delta failą bus galima pridėti į duomenų bazę naudojant repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1339,19 +1256,14 @@ msgstr "  --min-pkg-size    minimalus paketo dydis kuriam generuojama delta\\n"
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  paketo dydžio procentas kurį viršijus delta duomenys bus "
-"pašalinti\\n"
+msgstr "  --max-delta-size  paketo dydžio procentas kurį viršijus delta duomenys bus pašalinti\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Autorinės teisės (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nTai "
-"nemokama programa; peržiūrėk pradinį kodą platinimo sąlygom.\\nNėra JOKIOS "
-"GARANTIJOS, tiek kiek tai leidžiama pagal įstatymus.\\n"
+msgstr "Autorinės teisės (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nTai nemokama programa; peržiūrėk pradinį kodą platinimo sąlygom.\\nNėra JOKIOS GARANTIJOS, tiek kiek tai leidžiama pagal įstatymus.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1399,16 +1311,13 @@ msgstr "Negaliu rasti xdelta3 programos! Ar xdelta3 įdiegta?"
 
 #: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr ""
-"Naudojimas: repo-add [pasirinktys] <kelias-iki-db> <paketas|delta> ...\\n"
+msgstr "Naudojimas: repo-add [pasirinktys] <kelias-iki-db> <paketas|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add atnaujins paketų duomenų bazę perskaitęs paketo failą."
-"\\nKomandinėje eilutėje gali būti nurodyti keli paketai pridėjimui.\\n\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add atnaujins paketų duomenų bazę perskaitęs paketo failą.\\nKomandinėje eilutėje gali būti nurodyti keli paketai pridėjimui.\\n\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1416,33 +1325,26 @@ msgstr "  -d, --delta       sukurti ir pridėti delta paketo atnaujinimui\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"  -n, --new         pridėti tik tuos paketus kurių nėra duomenų bazėje\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "  -n, --new         pridėti tik tuos paketus kurių nėra duomenų bazėje\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"  -R, --remove      atnaujinus duomenų bazę, šalinti seną paketo failą iš "
-"disko\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "  -R, --remove      atnaujinus duomenų bazę, šalinti seną paketo failą iš disko\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Naudojimas: repo-remove [parintys] <kelias-iki_db> <paketo_vardas|delta>..."
-"\\n"
+msgstr "Naudojimas: repo-remove [parintys] <kelias-iki_db> <paketo_vardas|delta>...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove atnaujins paketų duomenų bazę pašalindamas\\npaketą nurodytą "
-"komandinėj eilutėj iš nurodytos repo duomenų bazės. Gali\\nbūti nurodyti "
-"keli paketai pašalinimui\\n\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove atnaujins paketų duomenų bazę pašalindamas\\npaketą nurodytą komandinėj eilutėj iš nurodytos repo duomenų bazės. Gali\\nbūti nurodyti keli paketai pašalinimui\\n\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1458,27 +1360,21 @@ msgstr "  -s, --sign        po atnaujinimo pasirašyti duomenų bazę su GnuPG\\
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <raktas>   naudoti nurodytą raktą duomenų bazės pasirašymui\\n"
+msgstr "  -k, --key <raktas>   naudoti nurodytą raktą duomenų bazės pasirašymui\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
-"  -v, --verify      patikrinti duomenų bazės parašą prieš atnaujinimą\\n"
+msgstr "  -v, --verify      patikrinti duomenų bazės parašą prieš atnaujinimą\\n"
 
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nPeržiūrėkite %s(8) detalesniai informacijai bei galimų pasirinkčių "
-"aprašymus.\\n"
+msgstr "\\nPeržiūrėkite %s(8) detalesniai informacijai bei galimų pasirinkčių aprašymus.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Pavyzdys:  repo-add /kelias/iki/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
-"\\n"
+msgstr "Pavyzdys:  repo-add /kelias/iki/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1486,14 +1382,10 @@ msgstr "Pavyzdys:  repo-remove /kelias/iki/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Autorių teisės (c) 2006-2016 Pacman kūrimo komanda <pacman-dev@archlinux.org>"
-"\\n\\nTai yra laisva programinė įranga; norėdami sužinoti apie kopijavimo "
-"sąlygas, žiūrėkite pirminį kodą.\\nNėra JOKIOS GARANTIJOS, tiek, kiek tai "
-"leidžiama pagal įstatymus.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Autorių teisės (c) 2006-2016 Pacman kūrimo komanda <pacman-dev@archlinux.org>\\n\\nTai yra laisva programinė įranga; norėdami sužinoti apie kopijavimo sąlygas, žiūrėkite pirminį kodą.\\nNėra JOKIOS GARANTIJOS, tiek, kiek tai leidžiama pagal įstatymus.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1784,18 +1676,21 @@ msgstr "Klaida gaunant %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Neatpažinta nuoroda: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Kuriama %s %s saugyklos darbinė kopija..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Nesėkmė, atnaujinant darbinę %s %s saugyklos kopiją"
 
@@ -1827,12 +1722,14 @@ msgstr "Išarchyvuojama %s su %s"
 msgid "Failed to extract %s"
 msgstr "%s išarchyvuoti nepavyko"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Klonuojama %s %s saugykla..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Klaida parsiunčiant %s %s saugyklą"
@@ -1841,12 +1738,14 @@ msgstr "Klaida parsiunčiant %s %s saugyklą"
 msgid "%s is not a clone of %s"
 msgstr "%s nėra %s klonas"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Atnaujinama %s %s saugykla..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Atnaujinti  %s %s saugyklos nepavyko"
@@ -1889,8 +1788,7 @@ msgstr "Šalinami nekintami bibliotekos failai..."
 
 #: scripts/libmakepkg/tidy/strip.sh.in:85
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr ""
-"Šalinami nereikalingi simboliai iš sukompiliuotos programos bei bibliotekų..."
+msgstr "Šalinami nereikalingi simboliai iš sukompiliuotos programos bei bibliotekų..."
 
 #: scripts/libmakepkg/tidy/upx.sh.in:35
 msgid "Compressing binaries with %s..."
diff --git a/scripts/po/nb.po b/scripts/po/nb.po
index 82aa5d0a..b0b5d9ff 100644
--- a/scripts/po/nb.po
+++ b/scripts/po/nb.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Alexander F Rødseth <rodseth@gmail.com>, 2015
 # Alexander F Rødseth <rodseth@gmail.com>, 2011-2013
@@ -14,12 +14,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 16:57+0000\n"
 "Last-Translator: Harald H. <haarektrans@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/nb/)\n"
-"Language: nb\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/toofishes/archlinux-pacman/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -101,10 +100,9 @@ msgid "Generating checksums for source files..."
 msgstr "Genererer sjekksummer for kildefiler..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Kunne ikke finne %s programmet som kreves for å generere sjekksummer for "
-"kildefiler."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Kunne ikke finne %s programmet som kreves for å generere sjekksummer for kildefiler."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -339,9 +337,7 @@ msgstr "Ukjent dataprotokoll: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Kunne ikke finne binærfilen %s som er nødvendig for å sjekke "
-"versjonskontrollerte kildeavhengigheter."
+msgstr "Kunne ikke finne binærfilen %s som er nødvendig for å sjekke versjonskontrollerte kildeavhengigheter."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
@@ -353,9 +349,7 @@ msgstr "Kunne ikke finne programmet %s som trengs for å håndtere avhengigheter
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Kunne ikke finne programmet %s. Bruker %s for å få "
-"administrasjonsrettigheter."
+msgstr "Kunne ikke finne programmet %s. Bruker %s for å få administrasjonsrettigheter."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -367,8 +361,7 @@ msgstr "Kunne ikke finne %s programmet, som trengs for å signere pakker."
 
 #: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
-"Kunne ikke finne %s programmet, som trengs for å verifisere kildefiler."
+msgstr "Kunne ikke finne %s programmet, som trengs for å verifisere kildefiler."
 
 #: scripts/makepkg.sh.in:1547
 msgid ""
@@ -377,8 +370,7 @@ msgstr "Fant ikke programmet %s som kreves for a verifisere kildefiler."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"Kunne ikke finne %s programmet, som trengs for å komprimere binærfiler."
+msgstr "Kunne ikke finne %s programmet, som trengs for å komprimere binærfiler."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
@@ -386,13 +378,11 @@ msgstr "Fant ikke programmet %s som kreves for å optimalisere PNG bildefiler."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"Kunne ikke finne %s programmet, som trengs for distribuert kompilering."
+msgstr "Kunne ikke finne %s programmet, som trengs for distribuert kompilering."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Kunne ikke finne %s programmet, som trengs for mellomlagring ved kompilering."
+msgstr "Kunne ikke finne %s programmet, som trengs for mellomlagring ved kompilering."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
@@ -400,9 +390,7 @@ msgstr "Kunne ikke finne %s programmet, som trengs for å strippe objektfiler."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Kunne ikke finne %s programmet, som trengs for å komprimere bruksanvisninger "
-"(man og info)."
+msgstr "Kunne ikke finne %s programmet, som trengs for å komprimere bruksanvisninger (man og info)."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -415,17 +403,16 @@ msgstr "En pakke har alt blitt bygget. (bruk %s for å erstatte)"
 #: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr ""
-"Pakkegruppen har allerede blitt bygget, installerer eksisterende pakker..."
+msgstr "Pakkegruppen har allerede blitt bygget, installerer eksisterende pakker..."
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "Pakkegruppen har alt blitt bygget. (bruk %s for å erstatte)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Deler av pakkegruppen har allerede blitt bygget. (bruk %s for å erstatte)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "Deler av pakkegruppen har allerede blitt bygget. (bruk %s for å erstatte)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -494,14 +481,12 @@ msgstr "  -p <fil>         Bruk alternative byggeinstrukser (istedenfor '%s')"
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Fjern installerte avhengigheter etter vellykket bygging"
+msgstr "  -r, --rmdeps     Fjern installerte avhengigheter etter vellykket bygging"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr ""
-"  -R, --repackage  Pakk inn pakken på nytt, men uten å bygge denprosessen "
-"fra begynnelsen"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
+msgstr "  -R, --repackage  Pakk inn pakken på nytt, men uten å bygge denprosessen fra begynnelsen"
 
 #: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
@@ -510,9 +495,7 @@ msgstr "  -s, --syncdeps   Installer manglende avhengigheter med %s"
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source     Opprett en .tar fil med kildekode, men uten nedlastede "
-"kilder"
+msgstr "  -S, --source     Opprett en .tar fil med kildekode, men uten nedlastede kilder"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -522,8 +505,7 @@ msgstr "  -V, --version    Vis versjonsinformasjon og avslutt"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      Opprett en .tar fil med kildekode og nedlastede kilder"
+msgstr "  --allsource      Opprett en .tar fil med kildekode og nedlastede kilder"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -539,7 +521,8 @@ msgstr "  --holdver        Ikke oppdater VCS kilder"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
 msgstr "  --key <key>      Oppgi en alternativ signeringsnøkkel for %s"
 
 #: scripts/makepkg.sh.in:1724
@@ -588,9 +571,7 @@ msgstr "  --skippgpcheck   Ikke verifiser kildefiler med PGP signaturer"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource   Last ned kildefiler (om nødvendig) og utfør "
-"integritetstester"
+msgstr "  --verifysource   Last ned kildefiler (om nødvendig) og utfør integritetstester"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -603,14 +584,12 @@ msgstr "  --asdeps         Installér pakker som avhengigheter"
 #: scripts/makepkg.sh.in:1739
 msgid ""
 "  --needed         Do not reinstall the targets that are already up to date"
-msgstr ""
-"  --needed         Ikke reinstallér pakker som allerede er i nyeste versjon"
+msgstr "  --needed         Ikke reinstallér pakker som allerede er i nyeste versjon"
 
 #: scripts/makepkg.sh.in:1740
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr ""
-"  --noconfirm      Ikke spør om bekreftelse ved oppnøsting av avhengigheter"
+msgstr "  --noconfirm      Ikke spør om bekreftelse ved oppnøsting av avhengigheter"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
@@ -622,15 +601,12 @@ msgstr "Dersom %s ikke er spesifisert vil %s se etter '%s'."
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Opphavsrett (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nOpphavsrett (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nDette er "
-"fri programvare; se kildekoden for kopibetingelser.\\nDet gis INGEN GARANTI "
-"så langt det er tillatt innenfor loven.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Opphavsrett (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nOpphavsrett (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nDette er fri programvare; se kildekoden for kopibetingelser.\\nDet gis INGEN GARANTI så langt det er tillatt innenfor loven.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -664,9 +640,7 @@ msgstr "Du har ikke skriverettigheter til å lage loggfiler i %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Det er ikke tillatt å kjøre %s som brukeren root ettersom dette\\nkan "
-"forårsake uopprettelig skade til maskinen."
+msgstr "Det er ikke tillatt å kjøre %s som brukeren root ettersom dette\\nkan forårsake uopprettelig skade til maskinen."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -831,11 +805,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Opphavsrett (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux."
-"org>.\n"
-"Dette er fri programvare; se kildekoden for kopibetingelser.\n"
-"Det gis INGEN GARANTI, så langt dette er tillatt innenfor loven.\n"
+msgstr "Opphavsrett (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\nDette er fri programvare; se kildekoden for kopibetingelser.\nDet gis INGEN GARANTI, så langt dette er tillatt innenfor loven.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -871,13 +841,10 @@ msgstr "--nocolor ikke bruk farge i utskrevne meldinger"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Opphavsrett (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nDette er fri programvare; se kildekoden for kopibetingelser.\\nDet gis "
-"INGEN GARANTI, så langt det er tillatt innenfor loven.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Opphavsrett (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nDette er fri programvare; se kildekoden for kopibetingelser.\\nDet gis INGEN GARANTI, så langt det er tillatt innenfor loven.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -910,8 +877,7 @@ msgstr "Database fra før versjon 4.2 funnet - oppgraderer..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"lenkefil '%s' peker utenfor roten brukt av pacman; manuell fiks nødvendig"
+msgstr "lenkefil '%s' peker utenfor roten brukt av pacman; manuell fiks nødvendig"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -940,9 +906,7 @@ msgstr "  -e, --export              Eksporér de gitte (eller alle) nøkkel IDer
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              List fingeravtrykk for gitte (eller alle) nøkkel "
-"IDer"
+msgstr "  -f, --finger              List fingeravtrykk for gitte (eller alle) nøkkel IDer"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -954,8 +918,7 @@ msgstr "  -r, --recv-keys           Hent de gitte nøkkel IDene"
 
 #: scripts/pacman-key.sh.in:69
 msgid "  -u, --updatedb            Update the trustdb of pacman"
-msgstr ""
-"  -u, --updatedb                 Oppdater pacmans liste over betrodde kilder"
+msgstr "  -u, --updatedb                 Oppdater pacmans liste over betrodde kilder"
 
 #: scripts/pacman-key.sh.in:70
 msgid ""
@@ -965,8 +928,7 @@ msgstr "  -v, --verify              Sjekk fil(ene) gitt i signaturen(e)"
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key                Vis en meny for nøkkelhåndtering av nøkkel IDer"
+msgstr "  --edit-key                Vis en meny for nøkkelhåndtering av nøkkel IDer"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
@@ -976,15 +938,11 @@ msgstr "  --import                  Importér pubring.gpg fra mappe(r)"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          Importér eiertro verdier fra trustdb.gpg i "
-"mappe(r)"
+msgstr "  --import-trustdb          Importér eiertro verdier fra trustdb.gpg i mappe(r)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                         Forsikre at nøkkelknippet er riktig "
-"igangsatt"
+msgstr "  --init                         Forsikre at nøkkelknippet er riktig igangsatt"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
@@ -996,40 +954,30 @@ msgstr "  --lsign-key               Signér den gitte nøkkel IDen lokalt"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                Last inn standardnøkler på nytt fra (de "
-"angitte)\\n                            nøkkelringene i '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                Last inn standardnøkler på nytt fra (de angitte)\\n                            nøkkelringene i '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            Oppdatér de angitte, eller alle, nøklene fra en "
-"nøkkelserver"
+msgstr "  --refresh-keys            Oppdatér de angitte, eller alle, nøklene fra en nøkkelserver"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <fil>                 Bruk en alternativ konfigurasjonsfil "
-"(istedenfor\\n                                 '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <fil>                 Bruk en alternativ konfigurasjonsfil (istedenfor\\n                                 '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <mappe>               Angi en alternativ mappe for GnuPG "
-"(istedenfor\\n                                 '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <mappe>               Angi en alternativ mappe for GnuPG (istedenfor\\n                                 '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <server-url>  Oppgi hvilken nøkkelserver som skal brukes om "
-"nødvendig"
+msgstr "  --keyserver <server-url>  Oppgi hvilken nøkkelserver som skal brukes om nødvendig"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1165,8 +1113,7 @@ msgstr "Tillitsdatabase kunne ikke oppdateres."
 
 #: scripts/pacman-key.sh.in:559
 msgid "Cannot find the %s binary required for all %s operations."
-msgstr ""
-"Kunne ikke finne %s programmet som er nødvendig for alle %s operasjoner."
+msgstr "Kunne ikke finne %s programmet som er nødvendig for alle %s operasjoner."
 
 #: scripts/pacman-key.sh.in:564
 msgid "%s needs to be run as root for this operation."
@@ -1200,24 +1147,17 @@ msgstr "Bruk: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize er et lite hack som bør forbedre ytelsen\\ntil pacman når "
-"den leser eller skriver til den filsystem-baserte databasen.\\n\\n"
+msgstr "pacman-optimize er et lite hack som bør forbedre ytelsen\\ntil pacman når den leser eller skriver til den filsystem-baserte databasen.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Fordi pacman bruker mange små filer til å holde styr på pakkene,\\ner det en "
-"tendens til at disse filene blir liggende spredt på disken.\\nDette skriptet "
-"forsøker å omorganisere disse slik at de ligger\\n etter hverandre på "
-"harddisken. Resultatet er at de kan\\nleses inn raskere fordi harddisken "
-"ikke trenger å bruke tid på å finne ut hvor de egentlig ligger."
+msgstr "Fordi pacman bruker mange små filer til å holde styr på pakkene,\\ner det en tendens til at disse filene blir liggende spredt på disken.\\nDette skriptet forsøker å omorganisere disse slik at de ligger\\n etter hverandre på harddisken. Resultatet er at de kan\\nleses inn raskere fordi harddisken ikke trenger å bruke tid på å finne ut hvor de egentlig ligger."
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1268,7 +1208,8 @@ msgid "Rotating database into place..."
 msgstr "Roterer database på plass..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr "Ny databaseerstatning feilet. Se etter %s, %s og %s mapper."
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1283,9 +1224,7 @@ msgstr "Bruk: pkgdelta [valg] <pakke1> <pakke2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta oppretter en forskjellsfil mellom to pakker.\\nDenne filen kan så "
-"bli lagt til i en database ved å benytte repo-add.\\n"
+msgstr "pkgdelta oppretter en forskjellsfil mellom to pakker.\\nDenne filen kan så bli lagt til i en database ved å benytte repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1306,27 +1245,20 @@ msgstr "  --nocolor         fjern farger fra utskrift\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size    minste pakkestørrelse før endringer blir kalkulert\\n"
+msgstr "  --min-pkg-size    minste pakkestørrelse før endringer blir kalkulert\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  forkast endringer når endringen er større en den angitte"
-"\\n\n"
-"                    prosentandelen av den opprinnelige pakken\\n"
+msgstr "  --max-delta-size  forkast endringer når endringen er større en den angitte\\n\n                    prosentandelen av den opprinnelige pakken\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Opphavsrett (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nDette er fri "
-"programvare; se kildekoden for kopibetingelser.\\nDet gis INGEN GARANTI så "
-"langt det er tillatt innenfor loven.\\n"
+msgstr "Opphavsrett (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nDette er fri programvare; se kildekoden for kopibetingelser.\\nDet gis INGEN GARANTI så langt det er tillatt innenfor loven.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1378,30 +1310,25 @@ msgstr "Bruk: repo-add [valg] <sti-til-db> <pakke|endring> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add kan oppdatere en pakkedatabase ved å lese en pakkefil.\\nFlere "
-"pakker kan legges til ved å angi dem på kommandolinjen.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add kan oppdatere en pakkedatabase ved å lese en pakkefil.\\nFlere pakker kan legges til ved å angi dem på kommandolinjen.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta        generer og legg til endring for pakkeoppdatering\\n"
+msgstr "  -d, --delta        generer og legg til endring for pakkeoppdatering\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"  -n, --new         legg kun til pakker som ikke allerede finnes i databasen"
-"\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "  -n, --new         legg kun til pakker som ikke allerede finnes i databasen\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"-R, --remove fjern den gamle pakkefilen når databasen har blitt oppdatert\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "-R, --remove fjern den gamle pakkefilen når databasen har blitt oppdatert\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
@@ -1409,13 +1336,10 @@ msgstr "Bruk: repo-remove [valg] <sti-til-db>.<pakkenavn|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove kan oppdatere en pakkedatabase ved å fjerne pakkenavnet \\nsom "
-"angis på kommandolinjen, fra den gitte pakkedatabasen. Flere\\npakker kan "
-"fjernes ved å angi dem på kommandolinjen.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove kan oppdatere en pakkedatabase ved å fjerne pakkenavnet \\nsom angis på kommandolinjen, fra den gitte pakkedatabasen. Flere\\npakker kan fjernes ved å angi dem på kommandolinjen.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1431,8 +1355,7 @@ msgstr "  -s, --sign         signer database med GnuPG etter oppdatering\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <nøkkel> bruk den angitte nøkkelen for å signere databasen\\n"
+msgstr "  -k, --key <nøkkel> bruk den angitte nøkkelen for å signere databasen\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
@@ -1441,14 +1364,12 @@ msgstr "  -v, --verify       verifiser databasens signatur før oppdatering\\n"
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nSe %s(8) for en mer detaljert beskrivelse av de tilgjengelige valgene.\\n"
+msgstr "\\nSe %s(8) for en mer detaljert beskrivelse av de tilgjengelige valgene.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Eksempel: repo-add /sti/til/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Eksempel: repo-add /sti/til/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1456,13 +1377,10 @@ msgstr "Eksempel: repo-remove /sti/til/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Opphavsrett (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\n\\nDette er fri programvare; se kildekoden for kopibetingelser.\\nDet gis "
-"INGEN GARANTI så langt det er tillatt innenfor loven.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Opphavsrett (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\n\\nDette er fri programvare; se kildekoden for kopibetingelser.\\nDet gis INGEN GARANTI så langt det er tillatt innenfor loven.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1753,18 +1671,21 @@ msgstr "Kunne ikke hente %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Ukjent referanse: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Oppretter arbeidskopi av %s %s arkiv..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Kunne ikke oppdatere lokalkopien av %s %s arkivet"
 
@@ -1796,12 +1717,14 @@ msgstr "Pakker ut %s med %s"
 msgid "Failed to extract %s"
 msgstr "Klarte ikke å pakke ut %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Kopierer %s %s arkiv..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Kunne ikke laste ned %s %s arkiv"
@@ -1810,12 +1733,14 @@ msgstr "Kunne ikke laste ned %s %s arkiv"
 msgid "%s is not a clone of %s"
 msgstr "%s er ikke en kopi av %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Oppdaterer %s %s arkiv..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Kunne ikke oppdatere %s %s arkiv"
diff --git a/scripts/po/nl.po b/scripts/po/nl.po
index 0e3e699f..d4bf057d 100644
--- a/scripts/po/nl.po
+++ b/scripts/po/nl.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Ger Schinkel, 2015
 # Ger Schinkel, 2015
@@ -21,14 +21,13 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
-"PO-Revision-Date: 2016-01-17 13:56+0000\n"
-"Last-Translator: Peter van den Hurk\n"
-"Language-Team: Dutch (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/nl/)\n"
-"Language: nl\n"
+"PO-Revision-Date: 2016-01-30 00:12+0000\n"
+"Last-Translator: Allan McRae <allan@archlinux.org>\n"
+"Language-Team: Dutch (http://www.transifex.com/toofishes/archlinux-pacman/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -110,10 +109,9 @@ msgid "Generating checksums for source files..."
 msgstr "Checksums genereren voor bronbestanden..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Uitvoerbaar bestand %s nodig voor het genereren van controlesommen van "
-"bronbestanden kan niet worden gevonden."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Uitvoerbaar bestand %s nodig voor het genereren van controlesommen van bronbestanden kan niet worden gevonden."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -348,9 +346,7 @@ msgstr "Onbekend download protocol: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Kan uitvoerbaar bestand %s niet vinden om VCS bron benodigdheden te "
-"controleren."
+msgstr "Kan uitvoerbaar bestand %s niet vinden om VCS bron benodigdheden te controleren."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
@@ -358,14 +354,11 @@ msgstr "Kan pakket %s, nodig om %s bronbestanden af te handelen, niet vinden."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
-msgstr ""
-"Kan uitvoerbaar bestand %s niet vinden om afhankelijkheden af te handelen."
+msgstr "Kan uitvoerbaar bestand %s niet vinden om afhankelijkheden af te handelen."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Kan uitvoerbaar bestand %s niet vinden. %s zal worden gebruikt om root "
-"rechten te verkrijgen."
+msgstr "Kan uitvoerbaar bestand %s niet vinden. %s zal worden gebruikt om root rechten te verkrijgen."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -382,47 +375,35 @@ msgstr "Kan uitvoerbaar bestand %s niet vinden om bronbestanden te verifiëren."
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"Kan uitvoerbaar bestand %s niet vinden om controlesommen van bronbestanden "
-"te verifiëren."
+msgstr "Kan uitvoerbaar bestand %s niet vinden om controlesommen van bronbestanden te verifiëren."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"Kan uitvoerbaar bestand %s niet vinden om uitvoerbare bestanden te "
-"comprimeren."
+msgstr "Kan uitvoerbaar bestand %s niet vinden om uitvoerbare bestanden te comprimeren."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
-msgstr ""
-"Kan uitvoerbaar bestand %s niet vinden om PNG bestanden te optimaliseren."
+msgstr "Kan uitvoerbaar bestand %s niet vinden om PNG bestanden te optimaliseren."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"Kan uitvoerbaar bestand %s niet vinden voor gedistribueerde compilatie."
+msgstr "Kan uitvoerbaar bestand %s niet vinden voor gedistribueerde compilatie."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Kan uitvoerbaar bestand %s niet vinden voor het cachen van de compileerder."
+msgstr "Kan uitvoerbaar bestand %s niet vinden voor het cachen van de compileerder."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"Kan uitvoerbaar bestand %s niet vinden voor het strippen van object "
-"bestanden."
+msgstr "Kan uitvoerbaar bestand %s niet vinden voor het strippen van object bestanden."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Kan uitvoerbaar bestand %s niet vinden om man en info pagina's te "
-"comprimeren."
+msgstr "Kan uitvoerbaar bestand %s niet vinden om man en info pagina's te comprimeren."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
-msgstr ""
-"Er werd al een pakket gebouwd, zal het het bestaande pakket installeren..."
+msgstr "Er werd al een pakket gebouwd, zal het het bestaande pakket installeren..."
 
 #: scripts/makepkg.sh.in:1619
 msgid "A package has already been built. (use %s to overwrite)"
@@ -438,9 +419,9 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "De pakketgroep werd al gebouwd. (gebruik %s om te overschrijven)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Een deel van de pakketgroep werd al gemaakt. (gebruik %s om te overschrijven)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "Een deel van de pakketgroep werd al gemaakt. (gebruik %s om te overschrijven)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -472,8 +453,7 @@ msgstr "-d, --nodeps Alle afhankelijkscontroles overslaan"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"-e, --noextract Bronbestanden niet extraheren (gebruik bestaande map %s)"
+msgstr "-e, --noextract Bronbestanden niet extraheren (gebruik bestaande map %s)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -510,15 +490,12 @@ msgstr "-p <bestand> gebruik een ander creatiescript (in plaats van '%s')"
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"-r, --rmdeps Verwijder geïnstalleerde afhankelijkheden na een succesvolle "
-"creatie"
+msgstr "-r, --rmdeps Verwijder geïnstalleerde afhankelijkheden na een succesvolle creatie"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr ""
-"-R, --repackage Herverpak de inhoud van het pakket zonder het opnieuw te "
-"creëren"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
+msgstr "-R, --repackage Herverpak de inhoud van het pakket zonder het opnieuw te creëren"
 
 #: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
@@ -527,8 +504,7 @@ msgstr "-s, --syncdeps Installeer ontbrekende afhankelijkheden met %s"
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"-S, --source Genereer een brontarball zonder de gedownloade bronbestanden"
+msgstr "-S, --source Genereer een brontarball zonder de gedownloade bronbestanden"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -546,8 +522,7 @@ msgstr "--check Voer de %s functie uit in het %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"--config <file> Gebruik een ander configuratiebestand (in plaats van '%s')"
+msgstr "--config <file> Gebruik een ander configuratiebestand (in plaats van '%s')"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -555,10 +530,9 @@ msgstr "--holdver Vernieuw de VCS bronbestanden niet"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"--key <key> Specifieer een sleutel voor het %s versleutelen in plaats van de "
-"standaardsleutel"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "--key <key> Specifieer een sleutel voor het %s versleutelen in plaats van de standaardsleutel"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -579,8 +553,7 @@ msgstr "--nosign Maak geen signatuur aan voor het pakket"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"--packagelist Toon enkel pakketten die zouden worden gemaakt, zonder PKGEXT"
+msgstr "--packagelist Toon enkel pakketten die zouden worden gemaakt, zonder PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -607,9 +580,7 @@ msgstr "--skippgpcheck Verifieer de PGP signaturen van de bronbestanden niet"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"--verifysource Download bronbestanden (indien nodig) en voer "
-"integriteitscontrole uit"
+msgstr "--verifysource Download bronbestanden (indien nodig) en voer integriteitscontrole uit"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -627,8 +598,7 @@ msgstr "--needed Herinstalleer de doelen die al up to date zijn niet"
 #: scripts/makepkg.sh.in:1740
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr ""
-"--noconfirm Vraag geen bevestiging wanneer afhankelijkheden worden opgelost"
+msgstr "--noconfirm Vraag geen bevestiging wanneer afhankelijkheden worden opgelost"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
@@ -640,16 +610,12 @@ msgstr "Als %s niet werd gespecificeerd, zal %s zoeken naar '%s'"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nDit is "
-"vrije software; zie de bronbestanden voor de voorwaarden tot reproductie."
-"\\nEr wordt GEEN ENKELE GARANTIE gegeven, voor zover toegelaten door de wet."
-"\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nDit is vrije software; zie de bronbestanden voor de voorwaarden tot reproductie.\\nEr wordt GEEN ENKELE GARANTIE gegeven, voor zover toegelaten door de wet.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -683,9 +649,7 @@ msgstr "U heeft geen schrijfrechten om logbestanden op te slaan in %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Het draaien van %s als root is niet toegestaan omdat het permanente,"
-"\\ncatastrofale schade kan toebrengen aan uw systeem."
+msgstr "Het draaien van %s als root is niet toegestaan omdat het permanente,\\ncatastrofale schade kan toebrengen aan uw systeem."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -850,11 +814,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
-"Dit is vrije software; zie de bronbestanden voor de voorwaarden tot "
-"reproductie.\n"
-"Er wordt GEEN ENKELE GARANTIE gegeven, voor zover toegelaten door de wet.\n"
+msgstr "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\nDit is vrije software; zie de bronbestanden voor de voorwaarden tot reproductie.\nEr wordt GEEN ENKELE GARANTIE gegeven, voor zover toegelaten door de wet.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -890,14 +850,10 @@ msgstr "--nocolor zet gekleurde uitvoer uit"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nDit is vrije software; zie de bronbestanden voor de voorwaarden tot "
-"reproductie.\\nEr wordt GEEN ENKELE GARANTIE gegeven, voor zover toegelaten "
-"door de wet.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nDit is vrije software; zie de bronbestanden voor de voorwaarden tot reproductie.\\nEr wordt GEEN ENKELE GARANTIE gegeven, voor zover toegelaten door de wet.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -914,8 +870,7 @@ msgstr "Om de database to upgraden heb je de juiste rechten nodig."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Pacman lockbestand gevonden. Kan niet uitvoeren wanneer pacman actief is."
+msgstr "Pacman lockbestand gevonden. Kan niet uitvoeren wanneer pacman actief is."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -931,8 +886,7 @@ msgstr "Pre-4.2 database formaat gedetecteerd - upgraden...."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"symlink '%s' verwijzing ligt buiten de pacman root, handmatig herstel nodig"
+msgstr "symlink '%s' verwijzing ligt buiten de pacman root, handmatig herstel nodig"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -978,8 +932,7 @@ msgstr "-u, --updatedb Werk de trustdb van pacman bij"
 #: scripts/pacman-key.sh.in:70
 msgid ""
 "  -v, --verify              Verify the file(s) specified by the signature(s)"
-msgstr ""
-"-v, --verify Verifieer de bestand(en) gespecificeerd door de signatu(u)r(en)"
+msgstr "-v, --verify Verifieer de bestand(en) gespecificeerd door de signatu(u)r(en)"
 
 #: scripts/pacman-key.sh.in:71
 msgid ""
@@ -1010,40 +963,30 @@ msgstr "--lsign-key Onderteken de gespecificeerde sleutelid lokaal"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"--populate Herlaad de standaard sleutels van de (gegeven) sleutelbossen\\n "
-"in '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "--populate Herlaad de standaard sleutels van de (gegeven) sleutelbossen\\n in '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"--refresh-keys Werk de gespecificeerde of alle sleutels bij van een "
-"sleutelserver"
+msgstr "--refresh-keys Werk de gespecificeerde of alle sleutels bij van een sleutelserver"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"--config <bestand> Gebruik een alternatief configuratiebestand (in plaats van"
-"\\n '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "--config <bestand> Gebruik een alternatief configuratiebestand (in plaats van\\n '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"--gpgdir <map> Stel een alternatieve map in voor GnuPG (in plaats van\\n "
-"'%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "--gpgdir <map> Stel een alternatieve map in voor GnuPG (in plaats van\\n '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"--keyserver <server-url> Specificeer een sleutelserver om te gebruiken "
-"indien nodig"
+msgstr "--keyserver <server-url> Specificeer een sleutelserver om te gebruiken indien nodig"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1115,14 +1058,11 @@ msgstr "Deactiveren sleutel %s..."
 
 #: scripts/pacman-key.sh.in:334
 msgid "A specified keyfile could not be added to the keyring."
-msgstr ""
-"Een gespecificeerd sleutelbestand kon niet aan de sleutelbos toegevoegd "
-"worden."
+msgstr "Een gespecificeerd sleutelbestand kon niet aan de sleutelbos toegevoegd worden."
 
 #: scripts/pacman-key.sh.in:342
 msgid "A specified key could not be removed from the keyring."
-msgstr ""
-"Een gespecificeerde sleutel kon niet verwijderd worden uit de sleutelbos."
+msgstr "Een gespecificeerde sleutel kon niet verwijderd worden uit de sleutelbos."
 
 #: scripts/pacman-key.sh.in:352
 msgid "The key identified by %s could not be edited."
@@ -1166,8 +1106,7 @@ msgstr "Sleutel op afstand niet correct van sleutelserver gehaald."
 
 #: scripts/pacman-key.sh.in:477
 msgid "A specified local key could not be updated from a keyserver."
-msgstr ""
-"Een bepaalde lokale sleutel kon niet worden bijgewerkt van een sleutelserver."
+msgstr "Een bepaalde lokale sleutel kon niet worden bijgewerkt van een sleutelserver."
 
 #: scripts/pacman-key.sh.in:487
 msgid "The signature identified by %s could not be verified."
@@ -1183,9 +1122,7 @@ msgstr "Trust database kon niet worden bijgewerkt..."
 
 #: scripts/pacman-key.sh.in:559
 msgid "Cannot find the %s binary required for all %s operations."
-msgstr ""
-"Kan het uitvoerbare bestand %s, vereist voor alle %s bewerkingen, niet "
-"vinden."
+msgstr "Kan het uitvoerbare bestand %s, vereist voor alle %s bewerkingen, niet vinden."
 
 #: scripts/pacman-key.sh.in:564
 msgid "%s needs to be run as root for this operation."
@@ -1219,25 +1156,17 @@ msgstr "Gebruik: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize is een hack welke pacman's snelheid zou moeten verbeteren "
-"van het lezen en schrijven naar de bestandssysteem gebaseerde database.\\n\\n"
+msgstr "pacman-optimize is een hack welke pacman's snelheid zou moeten verbeteren van het lezen en schrijven naar de bestandssysteem gebaseerde database.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Aangezien pacman veel kleine bestanden gebruikt om pakketten te traceren,"
-"\\nbestaat het gevaar voor fragmentatie van deze bestanden na verloop van "
-"tijd.\\nDit script probeert deze kleine bestanden op een\\naaneengesloten "
-"ruimte op jouw harde schijf te plaatsen. Het resultaat is dat de harde"
-"\\nschijf ze sneller zou moeten kunnen uitlezen, omdat de leeskoppen van de "
-"harde schijf\\nzich niet zo vaak moeten verplaatsen.\\n"
+msgstr "Aangezien pacman veel kleine bestanden gebruikt om pakketten te traceren,\\nbestaat het gevaar voor fragmentatie van deze bestanden na verloop van tijd.\\nDit script probeert deze kleine bestanden op een\\naaneengesloten ruimte op jouw harde schijf te plaatsen. Het resultaat is dat de harde\\nschijf ze sneller zou moeten kunnen uitlezen, omdat de leeskoppen van de harde schijf\\nzich niet zo vaak moeten verplaatsen.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1288,7 +1217,8 @@ msgid "Rotating database into place..."
 msgstr "Database wordt naar de juiste plaats geroteerd..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr "Vervangen nieuwe database mislukt. Controleer %s, %s, en %s mappen."
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1303,9 +1233,7 @@ msgstr "Gebruik: pkgdelta [opties] <package1> <package2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta maakt een delta bestand tussen twee pakketten.\\nDit delta bestand "
-"kan vervolgens worden toegevoegd aan een database met repo-add.\\n"
+msgstr "pkgdelta maakt een delta bestand tussen twee pakketten.\\nDit delta bestand kan vervolgens worden toegevoegd aan een database met repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1326,27 +1254,20 @@ msgstr "--nocolor kleurloze output\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"--min-pkg-size minimum pakketgrootte vanaf dewelke deltas worden gegenereerd"
-"\\n"
+msgstr "--min-pkg-size minimum pakketgrootte vanaf dewelke deltas worden gegenereerd\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"--max-delta-size percent van nieuw pakket waarboven de delta wordt genegeerd"
-"\\n"
+msgstr "--max-delta-size percent van nieuw pakket waarboven de delta wordt genegeerd\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nDit is vrije "
-"software; zie bronbestanden voor de voorwaarden tot reproductie.\\nEr wordt "
-"GEEN ENKELE GARANTIE gegeven, voor zover toegelaten bij wet.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nDit is vrije software; zie bronbestanden voor de voorwaarden tot reproductie.\\nEr wordt GEEN ENKELE GARANTIE gegeven, voor zover toegelaten bij wet.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1398,12 +1319,9 @@ msgstr "Gebruik: repo-add [options] <path-to-db> <package|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add zal een pakketten database bijwerken door het uitlezen van een "
-"pakketbestand.\\nMeerdere pakketten kunnen worden gespecificeerd in de "
-"opdrachtregel.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add zal een pakketten database bijwerken door het uitlezen van een pakketbestand.\\nMeerdere pakketten kunnen worden gespecificeerd in de opdrachtregel.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1411,17 +1329,15 @@ msgstr "-d, --delta aanmaken en toevoegen delta voor bijwerken van pakket\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"-n, --new alleen pakketten toevoegen die nog niet in de database voorkomen\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "-n, --new alleen pakketten toevoegen die nog niet in de database voorkomen\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"-R, --remove verwijder oud pakket van harde schijf nadat de database is "
-"bijgewerkt\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "-R, --remove verwijder oud pakket van harde schijf nadat de database is bijgewerkt\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
@@ -1429,13 +1345,10 @@ msgstr "Gebruik: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove zal een pakketdatabase bijwerkendoor de pakketnaam\\zoals "
-"gespecificeerd op de cli van die repo database. Meerdere\\npakketten om te "
-"verwijderen kunnen worden gespecificeerd op de cli.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove zal een pakketdatabase bijwerkendoor de pakketnaam\\zoals gespecificeerd op de cli van die repo database. Meerdere\\npakketten om te verwijderen kunnen worden gespecificeerd op de cli.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1451,8 +1364,7 @@ msgstr "-s, --sign onderteken database met GnuPG na update\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"-k, --key <sleutel> gebruik deze sleutel om de database te ondertekenen\\n"
+msgstr "-k, --key <sleutel> gebruik deze sleutel om de database te ondertekenen\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
@@ -1461,16 +1373,12 @@ msgstr "-v, --verify verifieer de signatuur van de database voor de update\\n"
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nZie %s(8) voor meer details en beschrijvingen van de beschikbare opties."
-"\\n"
+msgstr "\\nZie %s(8) voor meer details en beschrijvingen van de beschikbare opties.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Bijvoorbeeld: repo-add /pad/naar/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar."
-"gz\\n"
+msgstr "Bijvoorbeeld: repo-add /pad/naar/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1478,14 +1386,10 @@ msgstr "Bijvoorbeeld: repo-remove /pad/naar/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\n\\nDit is vrije software; zie de bronbestanden voor de voorwaarden tot "
-"reproductie.\\nEr wordt GEEN ENKELE GARANTIE gegeven, voor zover toegelaten "
-"door de wet.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\n\\nDit is vrije software; zie de bronbestanden voor de voorwaarden tot reproductie.\\nEr wordt GEEN ENKELE GARANTIE gegeven, voor zover toegelaten door de wet.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1776,18 +1680,21 @@ msgstr "Fout tijdens ophalen van %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Referentie niet herkend: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Een werkkopie van pakketlijst %s %s aan het aanmaken..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Fout tijdens het bijwerken van de werkkopie van %s %s repo"
 
@@ -1819,12 +1726,14 @@ msgstr "%s uitpakken met %s"
 msgid "Failed to extract %s"
 msgstr "Uitpakken van %s mislukt"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "%s %s repo klonen..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Fout tijdens downloaden %s %s repo"
@@ -1833,12 +1742,14 @@ msgstr "Fout tijdens downloaden %s %s repo"
 msgid "%s is not a clone of %s"
 msgstr "%s is geen kloon van %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "%s %s repo bijwerken..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Fout tijdens bijwerken %s %s repo"
@@ -1881,8 +1792,7 @@ msgstr "Bezig met het verwijderen van statische bibliotheekbestanden..."
 
 #: scripts/libmakepkg/tidy/strip.sh.in:85
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr ""
-"Strippen van onnodige symbolen van uitvoerbare bestanden en bibliotheken..."
+msgstr "Strippen van onnodige symbolen van uitvoerbare bestanden en bibliotheken..."
 
 #: scripts/libmakepkg/tidy/upx.sh.in:35
 msgid "Compressing binaries with %s..."
diff --git a/scripts/po/pl.po b/scripts/po/pl.po
index 984f9e13..778028b3 100644
--- a/scripts/po/pl.po
+++ b/scripts/po/pl.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Adam Zotow <inactive+adam.zotow@transifex.com>, 2012
 # Adam Zotow <inactive+adam.zotow@transifex.com>, 2012
@@ -26,16 +26,14 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
-"PO-Revision-Date: 2016-01-17 03:32+0000\n"
-"Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Polish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/pl/)\n"
-"Language: pl\n"
+"PO-Revision-Date: 2016-01-30 08:28+0000\n"
+"Last-Translator: megamann\n"
+"Language-Team: Polish (http://www.transifex.com/toofishes/archlinux-pacman/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: scripts/makepkg.sh.in:135
 msgid "Cleaning up..."
@@ -116,10 +114,9 @@ msgid "Generating checksums for source files..."
 msgstr "Generowanie sum kontrolnych dla plików źródłowych..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Nie można odnaleźć %s, potrzebnego do wygenerowania sum kontrolnych plików "
-"źródłowych."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Nie można odnaleźć %s, potrzebnego do wygenerowania sum kontrolnych plików źródłowych."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -354,9 +351,7 @@ msgstr "Nieznany protokół pobierania: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Nie można odnaleźć pliku binarnego %s potrzebnego do sprawdzenia wymagań "
-"źródłowych VCS"
+msgstr "Nie można odnaleźć pliku binarnego %s potrzebnego do sprawdzenia wymagań źródłowych VCS"
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
@@ -364,14 +359,11 @@ msgstr "Nie można znaleźć pakietu %s potrzebnego do obsługi źródeł %s."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
-msgstr ""
-"Nie można odnaleźć pliku binarnego %s, potrzebnego do działań zależnych."
+msgstr "Nie można odnaleźć pliku binarnego %s, potrzebnego do działań zależnych."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Nie można odnaleźć pliku binarnego %s. Zostanie użyte %s do nabycia "
-"uprawnień administratora."
+msgstr "Nie można odnaleźć pliku binarnego %s. Zostanie użyte %s do nabycia uprawnień administratora."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -388,9 +380,7 @@ msgstr "Nie można odnaleźć %s, potrzebnego do weryfikowania plików źródło
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"Nie można odnaleźć %s, potrzebnego do sprawdzania sum kontrolnych plików "
-"źródłowych."
+msgstr "Nie można odnaleźć %s, potrzebnego do sprawdzania sum kontrolnych plików źródłowych."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
@@ -406,20 +396,15 @@ msgstr "Nie można odnaleźć %s, potrzebnego do rozproszonej kompilacji."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Nie można odnaleźć %s, potrzebnego do korzystania z pamięci podręcznej "
-"kompilatora."
+msgstr "Nie można odnaleźć %s, potrzebnego do korzystania z pamięci podręcznej kompilatora."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"Nie można odnaleźć %s, potrzebnego do usuwania niepotrzebnych informacji z "
-"plików binarnych."
+msgstr "Nie można odnaleźć %s, potrzebnego do usuwania niepotrzebnych informacji z plików binarnych."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Nie można odnaleźć %s, potrzebnego do kompresji dokumentacji (man i info)."
+msgstr "Nie można odnaleźć %s, potrzebnego do kompresji dokumentacji (man i info)."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -432,15 +417,15 @@ msgstr "Pakiet został już zbudowany. (użyj %s, aby wymusić)"
 #: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr ""
-"Grupa pakietów została już zbudowana, instalowanie istniejących pakietów..."
+msgstr "Grupa pakietów została już zbudowana, instalowanie istniejących pakietów..."
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "Grupa pakietów została już zbudowana. (użyj %s, aby wymusić)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "Część z pakietów w grupie została już zbudowana."
 
 #: scripts/makepkg.sh.in:1696
@@ -473,8 +458,7 @@ msgstr "  -d, --nodeps     Pomija sprawdzanie zależności"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  Nie rozpakowuj źródeł (użyj istniejącego katalogu %s)"
+msgstr "  -e, --noextract  Nie rozpakowuj źródeł (użyj istniejącego katalogu %s)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -514,7 +498,8 @@ msgid ""
 msgstr "  -r, --rmdeps     Usuń zainstalowane zależności po udanym budowaniu"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  Przepakuj zawartość pakietu bez ponownego budowania"
 
 #: scripts/makepkg.sh.in:1716
@@ -534,8 +519,7 @@ msgstr "  -V, --version    Pokazuje informacje o wersji i zakańcza"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      Generuje archiwum źródłowe zawierające pobrane źródła"
+msgstr "  --allsource      Generuje archiwum źródłowe zawierające pobrane źródła"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -543,8 +527,7 @@ msgstr "  --check          Uruchom funkcję %s w %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <plik> Użyj alternatywnego pliku konfiguracyjnego (zamiast '%s')"
+msgstr "  --config <plik> Użyj alternatywnego pliku konfiguracyjnego (zamiast '%s')"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -552,7 +535,8 @@ msgstr "--holdver Nie aktualizuj źródeł VCS"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
 msgstr "--key <key> Wybierz klucz %s do podpisywania zamiast domyślnego"
 
 #: scripts/makepkg.sh.in:1724
@@ -574,8 +558,7 @@ msgstr "  --nosign         Nie twórz podpisu dla tego pakietu"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"--packagelist tylko lista pakietów, które byłyby produkowane bez PKGEXT"
+msgstr "--packagelist tylko lista pakietów, które byłyby produkowane bez PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -602,9 +585,7 @@ msgstr "  --skippgpcheck   Nie weryfikuj podpisów PGP plików źródłowych"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource     Pobieranie plików źródłowych (jeśli potrzeba) i "
-"przeprowadzenie sprawdzania ich integralności"
+msgstr "  --verifysource     Pobieranie plików źródłowych (jeśli potrzeba) i przeprowadzenie sprawdzania ich integralności"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -622,8 +603,7 @@ msgstr "--needed Nie reinstaluj celów, które już sa aktualne."
 #: scripts/makepkg.sh.in:1740
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr ""
-"  --noconfirm      Nie pytaj o potwierdzenie przy rozwiązywaniu zależności"
+msgstr "  --noconfirm      Nie pytaj o potwierdzenie przy rozwiązywaniu zależności"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
@@ -635,11 +615,12 @@ msgstr "Jeśli %s nie jest podane, %s będzie szukać '%s'"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Prawa autorskie (c) 2006-2016 Zespół Programistów Pacman <pacman-dev@archlinux.org>.\\nPrawa autorskie (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nNiniejszy program jest wolnym oprogramowaniem; sprawdź w źródłach warunki rozpowszechniania.\\nW zakresie dozwolonym przez prawo, program NIE JEST OBJĘTY GWARANCJĄ.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -673,9 +654,7 @@ msgstr "Nie masz prawa zapisu do przechowywania dzienników w %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Uruchamianie %s jako root nie jest dozwolone, ponieważ może to spowodować "
-"trwałe,\\n katastrofalne szkody w systemie."
+msgstr "Uruchamianie %s jako root nie jest dozwolone, ponieważ może to spowodować trwałe,\\n katastrofalne szkody w systemie."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -840,7 +819,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
+msgstr "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\nNiniejszy program jest wolnym oprogramowaniem; sprawdź w źródłach warunki rozpowszechniania.\nW zakresie dozwolonym przez prawo, program NIE JEST OBJĘTY GWARANCJĄ.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -876,10 +855,10 @@ msgstr "--nocolor wyłącza kolorowe komunikaty"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Prawa autorskie (c) 2010-2016 Zespół Programistów Pacman <pacman-dev@archlinux.org>\\nNiniejszy program jest wolnym oprogramowaniem; sprawdź w źródłach warunki rozpowszechniania.\\nW zakresie dozwolonym przez prawo, program NIE JEST OBJĘTY GWARANCJĄ.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -896,8 +875,7 @@ msgstr "Musisz posiadać odpowiednie uprawnienia, by zaktualizować bazę danych
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Znaleziono plik blokady pacmana. Nie można kontynuować gdy pacman działa."
+msgstr "Znaleziono plik blokady pacmana. Nie można kontynuować gdy pacman działa."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -913,9 +891,7 @@ msgstr "Wykryto format bazy danych sprzed wersji 4.2 - aktualizowanie..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"punkt dowiązania symbolicznego '%s' poza ścieżką docelową pacmana, wymagana "
-"jest instrukcja naprawy"
+msgstr "punkt dowiązania symbolicznego '%s' poza ścieżką docelową pacmana, wymagana jest instrukcja naprawy"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -931,8 +907,7 @@ msgstr "Operacje:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"-a, --add Dodaje określone klawisze (puste dla domyślnych danych wejściowych)"
+msgstr "-a, --add Dodaje określone klawisze (puste dla domyślnych danych wejściowych)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
@@ -940,16 +915,12 @@ msgstr "-d, --delete usuń wybrane id kluczów"
 
 #: scripts/pacman-key.sh.in:65
 msgid "  -e, --export              Export the specified or all keyids"
-msgstr ""
-"-e, --export Eksportowanie określonych lub wszystkich kluczy "
-"identyfikacyjnych"
+msgstr "-e, --export Eksportowanie określonych lub wszystkich kluczy identyfikacyjnych"
 
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"-f, --finger Wyświetl odcisk dla określonego lub wszystkich identyfikatorów "
-"klucza"
+msgstr "-f, --finger Wyświetl odcisk dla określonego lub wszystkich identyfikatorów klucza"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -971,9 +942,7 @@ msgstr "-v, --verify Sprawdzanie pliku(ów) określonych przez podpis(y)"
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"--edit-key obecne menu dla klucza zadań zarządzania w kluczach "
-"identyfikacyjnych"
+msgstr "--edit-key obecne menu dla klucza zadań zarządzania w kluczach identyfikacyjnych"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
@@ -983,9 +952,7 @@ msgstr "--import Imptorowanie pubring.gpg z katalogu(ów)"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"--import-trustdb Importowanie wartości poziomu zaufania z trustdb.gpg w "
-"katalogu(ach)"
+msgstr "--import-trustdb Importowanie wartości poziomu zaufania z trustdb.gpg w katalogu(ach)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
@@ -1001,10 +968,9 @@ msgstr "--lsign-key Lokalne oznaczenie określonego klucza identyfikacyjnego"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"--populate Odświeżanie domyślnych kluczy z (podanego) zbioru kluczy\\n w '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "--populate Odświeżanie domyślnych kluczy z (podanego) zbioru kluczy\\n w '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
@@ -1013,19 +979,15 @@ msgstr " --refresh-keys Zaktualizuj wybrane lub wszystkie klucze z serwera"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <plik>           Użycie alternatywnego pliku konfiguracji (zamiast"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <plik>           Użycie alternatywnego pliku konfiguracji (zamiast\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <katalog>            Użycie alternatywnego katalogu dla GnuPG "
-"(zamiast\\n                            '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <katalog>            Użycie alternatywnego katalogu dla GnuPG (zamiast\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
@@ -1149,8 +1111,7 @@ msgstr "Zdolny klucz nie został poprawnie uzyskany z serwera kluczy."
 
 #: scripts/pacman-key.sh.in:477
 msgid "A specified local key could not be updated from a keyserver."
-msgstr ""
-"Określony klucz lokalny nie może zostać zaktualizowany z serwera kluczy."
+msgstr "Określony klucz lokalny nie może zostać zaktualizowany z serwera kluczy."
 
 #: scripts/pacman-key.sh.in:487
 msgid "The signature identified by %s could not be verified."
@@ -1166,8 +1127,7 @@ msgstr "Zaufana baza danych nie mogła zostać zaktualizowana."
 
 #: scripts/pacman-key.sh.in:559
 msgid "Cannot find the %s binary required for all %s operations."
-msgstr ""
-"Nie można odnaleźć pliku binarnego %s potrzebnego do wszystkich %s działań."
+msgstr "Nie można odnaleźć pliku binarnego %s potrzebnego do wszystkich %s działań."
 
 #: scripts/pacman-key.sh.in:564
 msgid "%s needs to be run as root for this operation."
@@ -1201,31 +1161,21 @@ msgstr "Użycie: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize jest małym narzędziem, które powinno polepszyć wydajność"
-"\\npacmana podczas odczytu/zapisu do bazy danych opartej na systemie plików."
-"\\n\\n"
+msgstr "pacman-optimize jest małym narzędziem, które powinno polepszyć wydajność\\npacmana podczas odczytu/zapisu do bazy danych opartej na systemie plików.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Ponieważ pacman używa wielu małych plików aby śledzić pakiety pliki te mają"
-"\\ntendencję do fragmentacji w miarę upływu czasu. Ten skrypt próbuje "
-"przenieść\\nje w jedno ciągłe miejsce na dysku. W rezultacie dysk twardy "
-"powinien czytać\\nje szybciej, ponieważ jego głowica nie musi się często "
-"przemieszczać\\n"
+msgstr "Ponieważ pacman używa wielu małych plików aby śledzić pakiety pliki te mają\\ntendencję do fragmentacji w miarę upływu czasu. Ten skrypt próbuje przenieść\\nje w jedno ciągłe miejsce na dysku. W rezultacie dysk twardy powinien czytać\\nje szybciej, ponieważ jego głowica nie musi się często przemieszczać\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
-msgstr ""
-"Nie można odnaleźć pliku binarnego %s wymaganego do weryfikowania "
-"integralności."
+msgstr "Nie można odnaleźć pliku binarnego %s wymaganego do weryfikowania integralności."
 
 #: scripts/pacman-optimize.sh.in:109
 msgid "You must have correct permissions to optimize the database."
@@ -1272,10 +1222,9 @@ msgid "Rotating database into place..."
 msgstr "Przenoszę bazę danych w jej miejsce..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"New database substitution failed. Check for %s, %s, and %s directories.\n"
-"Zastąpienie bazy danych nie powiodło się. Sprawdź katalogi %s, %s i %s."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "New database substitution failed. Check for %s, %s, and %s directories.\nZastąpienie bazy danych nie powiodło się. Sprawdź katalogi %s, %s i %s."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1289,9 +1238,7 @@ msgstr "Użycie: pkgdelta [opcje] <pakiet1> <pakiet2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta tworzy plik przyrostowy między dwoma pakietami.\\nPlik przyrostowy "
-"można dodać do bazy danych używając repo-add.\\n"
+msgstr "pkgdelta tworzy plik przyrostowy między dwoma pakietami.\\nPlik przyrostowy można dodać do bazy danych używając repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1312,27 +1259,20 @@ msgstr "--nocolor usuwa kolor z wyniku\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"--min-pkg-size minimalny rozmiar pakietu przed przyrostem jest generowany\\n"
+msgstr "--min-pkg-size minimalny rozmiar pakietu przed przyrostem jest generowany\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"--max-delta-size procent nowego pakietu, powyżej którego przyrost zostanie "
-"odrzucony\\n"
+msgstr "--max-delta-size procent nowego pakietu, powyżej którego przyrost zostanie odrzucony\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Prawa autorskie (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n"
-"\\nNiniejszy program jest wolnym oprogramowaniem; sprawdź w źródłach warunki "
-"rozpowszechniania.\\nW zakresie dozwolonym przez prawo, program NIE JEST "
-"OBJĘTY GWARANCJĄ.\\n"
+msgstr "Prawa autorskie (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nNiniejszy program jest wolnym oprogramowaniem; sprawdź w źródłach warunki rozpowszechniania.\\nW zakresie dozwolonym przez prawo, program NIE JEST OBJĘTY GWARANCJĄ.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1380,51 +1320,40 @@ msgstr "Nie znaleziono programu xdelta3! Czy jest on zainstalowany?"
 
 #: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr ""
-"Sposób użycia: repo-add [opcje] <ścieżka-do-bazy-danych> <pakiet|delta> ..."
-"\\n"
+msgstr "Sposób użycia: repo-add [opcje] <ścieżka-do-bazy-danych> <pakiet|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add zaktualizuje bazę danych pakietów poprzez odczytanie pliku pakietu."
-"\\nWiele pakietów do dodania może zostać określone w wierszu poleceń.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add zaktualizuje bazę danych pakietów poprzez odczytanie pliku pakietu.\\nWiele pakietów do dodania może zostać określone w wierszu poleceń.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta       wygeneruj i dodaj deltę dla aktualizacji pakietu\\n"
+msgstr "  -d, --delta       wygeneruj i dodaj deltę dla aktualizacji pakietu\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr "-n, --new dodaje tylko te pakiety, które nie są jeszcze w bazie\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"-R, --remove usuwanie starego pliku pakietu z dysku podczas aktualizacji "
-"wpisu bazy danych\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "-R, --remove usuwanie starego pliku pakietu z dysku podczas aktualizacji wpisu bazy danych\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Sposób użycia: repo-remove [opcje] <ścieżka-do-bazy-danych> <nazwa-pakietu|"
-"delta> ...\\n"
+msgstr "Sposób użycia: repo-remove [opcje] <ścieżka-do-bazy-danych> <nazwa-pakietu|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove zaktualizuje bazę danych pakietów poprzez usunięcie nazwy pakietu"
-"\\nokreslonego w wierszu poleceń z danej bazy danych repozytorium.Wiele"
-"\\npakietów do usunięcia może zostać określone w wierszu poleceń.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove zaktualizuje bazę danych pakietów poprzez usunięcie nazwy pakietu\\nokreslonego w wierszu poleceń z danej bazy danych repozytorium.Wiele\\npakietów do usunięcia może zostać określone w wierszu poleceń.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1436,32 +1365,25 @@ msgstr "--nocolor wyłącza kolorowanie wyniku\\n"
 
 #: scripts/repo-add.sh.in:80
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
-msgstr ""
-"  -s, --sign        podpisz bazę danych przy użyciu GnuPG po aktualizacji\\n"
+msgstr "  -s, --sign        podpisz bazę danych przy użyciu GnuPG po aktualizacji\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <key>   użyj określonego klucza do podpisania bazy danych\\n"
+msgstr "  -k, --key <key>   użyj określonego klucza do podpisania bazy danych\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
-"  -v, --verify      zweryfikuj podpis bazy danych przed aktualizacją\\n"
+msgstr "  -v, --verify      zweryfikuj podpis bazy danych przed aktualizacją\\n"
 
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nZobacz %s(8) celem większej ilości szczegółów i opisów dostępnych opcji."
-"\\n"
+msgstr "\\nZobacz %s(8) celem większej ilości szczegółów i opisów dostępnych opcji.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Przykład:  repo-add /ścieżka/do/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
-"\\n"
+msgstr "Przykład:  repo-add /ścieżka/do/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1469,10 +1391,10 @@ msgstr "Przykład:  repo-remove /ścieżka/do/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Prawa autorskie (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n\\nNiniejszy program jest wolnym oprogramowaniem; sprawdź w źródłach warunki rozpowszechniania.\\nW zakresie dozwolonym przez prawo, program NIE JEST OBJĘTY GWARANCJĄ.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1763,18 +1685,21 @@ msgstr "Wystąpił błąd podczas wyciągania %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Nierozpoznane odwołanie: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Tworzenie kopii roboczej repozytorium %s %s..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Wystąpił błąd podczas aktualizowania kopii roboczej repozytorium %s %s"
 
@@ -1806,12 +1731,14 @@ msgstr "Rozpakowywanie %s za pomocą %s"
 msgid "Failed to extract %s"
 msgstr "Nie udało się rozpakować %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Klonowanie %s repozytorium %s..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Wystąpił błąd podczas pobierania repozytorium %s %s"
@@ -1820,12 +1747,14 @@ msgstr "Wystąpił błąd podczas pobierania repozytorium %s %s"
 msgid "%s is not a clone of %s"
 msgstr "%s nie jest klonem %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Aktualizowanie %s repozytorium %s..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Wystąpił błąd podczas aktualizowania repozytorium %s %s"
diff --git a/scripts/po/pt.po b/scripts/po/pt.po
index 9cbd8815..c790e188 100644
--- a/scripts/po/pt.po
+++ b/scripts/po/pt.po
@@ -1,12 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # ArchGalileu <geral@gasparsantos.eu>, 2011,2014
+# Bruno Guerreiro <american.jesus.pt@gmail.com>, 2016
 # DarkVenger <thedarkvenger@gmail.com>, 2014
 # ArchGalileu <geral@gasparsantos.eu>, 2011
-# R00KIE <registosites@hotmail.com>, 2013
+# R00KIE <registosites@hotmail.com>, 2013,2016
 # R00KIE <registosites@hotmail.com>, 2013,2016
 # R00KIE <registosites@hotmail.com>, 2011-2012
 # DarkVenger <thedarkvenger@gmail.com>, 2014-2015
@@ -16,14 +17,13 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
-"PO-Revision-Date: 2016-01-17 15:03+0000\n"
-"Last-Translator: R00KIE <registosites@hotmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/pt/)\n"
-"Language: pt\n"
+"PO-Revision-Date: 2016-02-01 20:39+0000\n"
+"Last-Translator: Bruno Guerreiro <american.jesus.pt@gmail.com>\n"
+"Language-Team: Portuguese (http://www.transifex.com/toofishes/archlinux-pacman/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -105,10 +105,9 @@ msgid "Generating checksums for source files..."
 msgstr "A gerar checksums para os ficheiros fonte..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Não é possível encontrar o binário %s necessário para gerar checksums para o "
-"ficheiro-fonte."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Não é possível encontrar o binário %s necessário para gerar checksums para o ficheiro-fonte."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -210,8 +209,7 @@ msgstr "Por favor, certifique-se de que realmente confia neles."
 
 #: scripts/makepkg.sh.in:715
 msgid "Skipping all source file integrity checks."
-msgstr ""
-"Ignorando todas as verificações de integridade dos ficheiros de origem."
+msgstr "Ignorando todas as verificações de integridade dos ficheiros de origem."
 
 #: scripts/makepkg.sh.in:717
 msgid "Skipping verification of source file checksums."
@@ -247,7 +245,7 @@ msgstr "Livraria listada em %s não é um objecto partilhado: %s"
 
 #: scripts/makepkg.sh.in:995
 msgid "Cannot find library listed in %s: %s"
-msgstr "Não é possível encontrar biblioteca apresentada em %s:%s"
+msgstr "Não é possível encontrar biblioteca apresentada em %s: %s"
 
 #: scripts/makepkg.sh.in:1109 scripts/makepkg.sh.in:1153
 #: scripts/makepkg.sh.in:1318
@@ -292,7 +290,7 @@ msgstr "Falhou ao criar link simbólico para o ficheiro do pacote."
 
 #: scripts/makepkg.sh.in:1292
 msgid "Signing package..."
-msgstr "A assinar pacote ..."
+msgstr "A assinar pacote..."
 
 #: scripts/makepkg.sh.in:1303
 msgid "Created signature file %s."
@@ -344,26 +342,19 @@ msgstr "Protocolo de download desconhecido: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Incapaz de encontrar o executável %s necessário para verificar os requisitos "
-"de Sistema de Controlo de Versões do código fonte."
+msgstr "Incapaz de encontrar o executável %s necessário para verificar os requisitos de Sistema de Controlo de Versões do código fonte."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
-msgstr ""
-"Incapaz de encontrar o pacote %s necessário para lidar com o código-fonte %s."
+msgstr "Incapaz de encontrar o pacote %s necessário para lidar com o código-fonte %s."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
-msgstr ""
-"Incapaz de encontrar o binário %s necessário para as operações com "
-"dependências."
+msgstr "Incapaz de encontrar o binário %s necessário para as operações com dependências."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Incapaz de encontrar o binário %s. Vai ser usado %s para adquirir "
-"privilégios de root."
+msgstr "Incapaz de encontrar o binário %s. Vai ser usado %s para adquirir privilégios de root."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -375,16 +366,12 @@ msgstr "Incapaz de encontrar o comando %s necessário para assinar pacotes."
 
 #: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
-"Incapaz de encontrar o comando %s necessário para a verificação dos "
-"ficheiros-fonte."
+msgstr "Incapaz de encontrar o comando %s necessário para a verificação dos ficheiros-fonte."
 
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"Incapaz de encontrar o comando %s necessário para validar os códigos de "
-"verificação dos ficheiros-fonte."
+msgstr "Incapaz de encontrar o comando %s necessário para validar os códigos de verificação dos ficheiros-fonte."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
@@ -392,30 +379,23 @@ msgstr "Incapaz de encontrar o comando %s necessário para compactar binários."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
-msgstr ""
-"Incapaz de encontrar o comando %s necessário para optimizar as imagens PNG."
+msgstr "Incapaz de encontrar o comando %s necessário para optimizar as imagens PNG."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"Incapaz de encontrar o comando %s necessário para a compilação distribuída. "
+msgstr "Incapaz de encontrar o comando %s necessário para a compilação distribuída."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Incapaz de encontrar o comando %s necessário para o compilador usar cache."
+msgstr "Incapaz de encontrar o comando %s necessário para o compilador usar cache."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"Incapaz de encontrar o comando %s necessário para a remoção dos ficheiros "
-"objeto. "
+msgstr "Incapaz de encontrar o comando %s necessário para a remoção dos ficheiros objeto."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Incapaz de encontrar o comando %s necessário para compactar páginas do "
-"manual e de informação."
+msgstr "Incapaz de encontrar o comando %s necessário para compactar páginas do manual e de informação."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -428,15 +408,15 @@ msgstr "Um pacote já foi compilado. (use %s para sobrepor)"
 #: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr ""
-"Um grupo de pacotes já foi empacotado, a instalar pacotes existentes..."
+msgstr "Um grupo de pacotes já foi empacotado, a instalar pacotes existentes..."
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "O grupo de pacotes já foi compilado. (use %s para sobrepor)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "Parte do grupo de pacotes já foi compilado. (use %s para sobrepor)"
 
 #: scripts/makepkg.sh.in:1696
@@ -457,9 +437,7 @@ msgstr "  -A, --ignorearch Ignorar campos %s incompletos em %s"
 
 #: scripts/makepkg.sh.in:1702
 msgid "  -c, --clean      Clean up work files after build"
-msgstr ""
-"  -c, --clean             Apagar ficheiroa utilizados na compilação após a "
-"mesma"
+msgstr "  -c, --clean      Apagar ficheiroa utilizados na compilação após a mesma"
 
 #: scripts/makepkg.sh.in:1703
 msgid "  -C, --cleanbuild Remove %s dir before building the package"
@@ -467,22 +445,19 @@ msgstr "  -C, --cleanbuild Remove o diretório %s antes de construir o pacote"
 
 #: scripts/makepkg.sh.in:1704
 msgid "  -d, --nodeps     Skip all dependency checks"
-msgstr "  -d, --nodeps          Ignorar a verificação de dependências"
+msgstr "  -d, --nodeps     Ignorar a verificação de dependências"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  Não extrair os ficheiros de código-fonte (usar o "
-"diretório %s existente)"
+msgstr "  -e, --noextract  Não extrair os ficheiros de código-fonte (usar o diretório %s existente)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
-msgstr "  -f, --force              Sobrescrever pacote existente"
+msgstr "  -f, --force      Sobrescrever pacote existente"
 
 #: scripts/makepkg.sh.in:1707
 msgid "  -g, --geninteg   Generate integrity checks for source files"
-msgstr ""
-"  -g, --geninteg        Gerar teste(s) de integridade para ficheiro(s) fonte"
+msgstr "  -g, --geninteg   Gerar teste(s) de integridade para ficheiro(s) fonte"
 
 #: scripts/makepkg.sh.in:1708
 msgid "  -h, --help       Show this help message and exit"
@@ -490,39 +465,33 @@ msgstr "  -h, --help       Mostra esta mensagem de ajuda e termina"
 
 #: scripts/makepkg.sh.in:1709
 msgid "  -i, --install    Install package after successful build"
-msgstr ""
-"  -i, --install              Instalar pacote após compilação bem-sucedida"
+msgstr "  -i, --install    Instalar pacote após compilação bem-sucedida"
 
 #: scripts/makepkg.sh.in:1710
 msgid "  -L, --log        Log package build process"
-msgstr "  -L, --log                  Gerar log do processo de compilação"
+msgstr "  -L, --log        Gerar log do processo de compilação"
 
 #: scripts/makepkg.sh.in:1711
 msgid "  -m, --nocolor    Disable colorized output messages"
-msgstr "  -m, --nocolor          Inabilitar mensagens de saída coloridas"
+msgstr "  -m, --nocolor    Inabilitar mensagens de saída coloridas"
 
 #: scripts/makepkg.sh.in:1712
 msgid "  -o, --nobuild    Download and extract files only"
-msgstr ""
-"  -o, --nobuild            Fazer apenas desrcarga e extrair os ficheiros"
+msgstr "  -o, --nobuild    Fazer apenas descarga e extrair os ficheiros"
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <arquivo>          Usar um script alternativo de compilação (ao invés "
-"de '%s')"
+msgstr "  -p <arquivo>        Usar um script alternativo de compilação (ao invés de '%s')"
 
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps             Remover as dependências instaladas após "
-"compilação bem-sucedido"
+msgstr "  -r, --rmdeps     Remover as dependências instaladas após compilação bem-sucedido"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr ""
-"  -R, --repackage        Re-empacotar o conteúdo do pacote sem recompilar"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
+msgstr "  -R, --repackage  Re-empacotar o conteúdo do pacote sem recompilar"
 
 #: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
@@ -535,15 +504,13 @@ msgstr "  -S, --source     Criar um tarball fonte sem as fontes descarregadas"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
-msgstr "-V, --version Mostra a versão do programa e sai"
+msgstr "  -V, --version    Mostra a versão do programa e sai"
 
 #: scripts/makepkg.sh.in:1719
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"      --allsource            Gerar um tarball somente com os fontes, "
-"incluindo os que foram descarregados"
+msgstr "  --allsource      Gerar um tarball somente com os fontes, incluindo os que foram descarregados"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -551,24 +518,21 @@ msgstr "  --check          Executar a função %s no %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <arquivo>   Usar um ficheiro de configuração alternativo (ao "
-"invés de \"%s\")"
+msgstr "  --config <arquivo>  Usar um ficheiro de configuração alternativo (ao invés de '%s')"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
-msgstr "--holdver Não actualizar as fontes VCS"
+msgstr "  --holdver        Não atualizar as fontes VCS"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <key>      Especificar uma chave para assinar %s ao invés da por "
-"omissão"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <key>      Especificar uma chave para assinar %s ao invés da por omissão"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
-msgstr "--noarchive Não criar arquivo do pacote"
+msgstr "  --noarchive      Não criar arquivo do pacote"
 
 #: scripts/makepkg.sh.in:1725
 msgid "  --nocheck        Do not run the %s function in the %s"
@@ -585,11 +549,11 @@ msgstr "  --nosign         Não criar uma assinatura para o pacote"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr "--packagelist Listar apenas pacotes que iriam ser produzidos, sem "
+msgstr "  --packagelist    Listar apenas pacotes que iriam ser produzidos, sem PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
-msgstr "--printsrcinfo Mostrar o SRCINFO gerado e sair"
+msgstr "  --printsrcinfo   Mostrar o SRCINFO gerado e sair"
 
 #: scripts/makepkg.sh.in:1730
 msgid "  --sign           Sign the resulting package with %s"
@@ -597,28 +561,22 @@ msgstr "  --sign           Assinar o pacote criado com %s"
 
 #: scripts/makepkg.sh.in:1731
 msgid "  --skipchecksums  Do not verify checksums of the source files"
-msgstr ""
-"  --skipchecksums  Não validar os códigos de validação dos ficheiros-fonte"
+msgstr "  --skipchecksums  Não validar os códigos de validação dos ficheiros-fonte"
 
 #: scripts/makepkg.sh.in:1732
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
-msgstr ""
-"  --skipinteg      Não executar nenhuma validação/verificação sobre os "
-"ficheiros-fonte"
+msgstr "  --skipinteg      Não executar nenhuma validação/verificação sobre os ficheiros-fonte"
 
 #: scripts/makepkg.sh.in:1733
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
-msgstr ""
-"  --skippgpcheck   Não verificar as assinaturas PGP dos ficheiros-fonte"
+msgstr "  --skippgpcheck   Não verificar as assinaturas PGP dos ficheiros-fonte"
 
 #: scripts/makepkg.sh.in:1734
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"--verifysource Efectua o download dos ficheiros de source (se necessário) e "
-"executa as verificações de integridade"
+msgstr "  --verifysource   Efetua o download dos ficheiros de source (se necessário) e executa as verificações de integridade"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -626,24 +584,21 @@ msgstr "Estas opções podem ser passadas ao %s:"
 
 #: scripts/makepkg.sh.in:1738
 msgid "  --asdeps         Install packages as non-explicitly installed"
-msgstr "--asdeps Instalar pacotes como não sendo explicitamente instalados"
+msgstr "  --asdeps         Instalar pacotes como não sendo explicitamente instalados"
 
 #: scripts/makepkg.sh.in:1739
 msgid ""
 "  --needed         Do not reinstall the targets that are already up to date"
-msgstr "--needed Não reinstalar pacotes que se encontram actualizados"
+msgstr "  --needed         Não reinstalar pacotes que se encontram atualizados"
 
 #: scripts/makepkg.sh.in:1740
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr ""
-"  --noconfirm               Não pedir confirmação ao resolver dependências"
+msgstr "  --noconfirm      Não pedir confirmação ao resolver dependências"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"  --noprogressbar        Não mostrar a barra de progresso enquanto "
-"descarrega os ficheiros"
+msgstr "  --noprogressbar  Não mostrar a barra de progresso enquanto descarrega os ficheiros"
 
 #: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
@@ -651,15 +606,12 @@ msgstr "Se %s não se encontra especificado, %s irá procurar por '%s'"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Equipa de Desenvolvimento do Pacman <pacman-"
-"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux."
-"org>.\\n\\nEste é um software livre; veja o código fonte para condições de "
-"cópia.\\nNÃO HÁ GARANTIA, na extensão permitida pela lei.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Equipa de Desenvolvimento do Pacman <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nEste é um software livre; veja o código fonte para condições de cópia.\\nNÃO HÁ GARANTIA, na extensão permitida pela lei.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -693,9 +645,7 @@ msgstr "Não tem permissão de escrita para armazenar os ficheiros de log em %s.
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Executar %s como root não é permitido dado que pode causar danos permanentes"
-"\\n e catastróficos ao seu sistema."
+msgstr "Executar %s como root não é permitido dado que pode causar danos permanentes\\n e catastróficos ao seu sistema."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -780,7 +730,7 @@ msgstr "incapaz de criar '%s': %s"
 
 #: scripts/makepkg-template.pl.in:73
 msgid "invalid key/value pair\n"
-msgstr "Par chave/valor inválido\n"
+msgstr "par chave/valor inválido\n"
 
 #: scripts/makepkg-template.pl.in:82
 msgid "invalid template line: can't find template name\n"
@@ -789,7 +739,7 @@ msgstr "linha inválida no modelo: incapaz de encontrar o nome do modelo\n"
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr "Caracteres inválidos no nome '%s'. permitidos: [:alnum:]+_.@-\n"
+msgstr "caracteres inválidos no nome '%s'. permitidos: [:alnum:]+_.@-\n"
 
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
@@ -804,7 +754,7 @@ msgstr "Incapaz de encontrar o ficheiro do modelo correspondente a '%s'\n"
 #: scripts/makepkg-template.pl.in:136
 #, perl-format
 msgid "failed to open '%s': %s\n"
-msgstr "Falha ao abrir '%s': %s\n"
+msgstr "falha ao abrir '%s': %s\n"
 
 #: scripts/makepkg-template.pl.in:153
 #, perl-format
@@ -822,61 +772,45 @@ msgstr "Opções:\n"
 #: scripts/makepkg-template.pl.in:178
 #, perl-format
 msgid "  --input, -p <file>    Build script to read (default: %s)\n"
-msgstr ""
-"  --input, -p <file>    Script a ler, com instruções de construção (por "
-"omissão: %s)\n"
+msgstr "  --input, -p <file>    Script a ler, com instruções de construção (por omissão: %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
-msgstr ""
-"  --output, -o <file>   ficheiro onde colocar os resultados (por omissão: "
-"ficheiro de entrada)\n"
+msgstr "  --output, -o <file>   ficheiro onde colocar os resultados (por omissão: ficheiro de entrada)\n"
 
 #: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
-msgstr ""
-"  --newest, -n          atualizar modelos para a versão mais recente\n"
-"\n"
+msgstr "  --newest, -n          atualizar modelos para a versão mais recente\n"
 
 #: scripts/makepkg-template.pl.in:181
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr "(por omissão: usar a versão especificada nos marcadores do modelo)\n"
+msgstr "                        (por omissão: usar a versão especificada nos marcadores do modelo)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
-msgstr ""
-"  --template-dir <dir>  diretório onde procurar por modelos\n"
-"\n"
+msgstr "  --template-dir <dir>  diretório onde procurar por modelos\n"
 
 #: scripts/makepkg-template.pl.in:183
 #, perl-format
 msgid "                        (default: %s)\n"
-msgstr "(por omissão: %s)\n"
+msgstr "                        (por omissão: %s)\n"
 
 #: scripts/makepkg-template.pl.in:184
 msgid "  --help, -h            This help message\n"
-msgstr ""
-"  --help, -h            Esta mensagem de ajuda\n"
-"\n"
+msgstr "  --help, -h            Esta mensagem de ajuda\n"
 
 #: scripts/makepkg-template.pl.in:185
 msgid "  --version             Version information\n"
-msgstr ""
-"  --version             Informação relativa à versão\n"
-"\n"
+msgstr "  --version             Informação relativa à versão\n"
 
 #: scripts/makepkg-template.pl.in:194
 msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (c) 2013-2016 Equipa de Desenvolvimento do Pacman <pacman-"
-"dev@archlinux.org>.\n"
-"Este é um software livre; veja o código fonte para condições de cópia.\n"
-"NÃO HÁ GARANTIA, na extensão permitida pela lei.\n"
+msgstr "Copyright (c) 2013-2016 Equipa de Desenvolvimento do Pacman <pacman-dev@archlinux.org>.\nEste é um software livre; veja o código fonte para condições de cópia.\nNÃO HÁ GARANTIA, na extensão permitida pela lei.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -888,8 +822,7 @@ msgstr "opções:"
 
 #: scripts/pacman-db-upgrade.sh.in:43
 msgid "  -b, --dbpath <path>  set an alternate database location"
-msgstr ""
-"  -b, --dbpath <path>  define um local alternativo para a base de dados"
+msgstr "  -b, --dbpath <path>  define um local alternativo para a base de dados"
 
 #: scripts/pacman-db-upgrade.sh.in:44
 msgid "  -h, --help           show this help message and exit"
@@ -913,13 +846,10 @@ msgstr "  --nocolor            desativa cores nas mensagem de resultados"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2016 Equipa de Desenvolvimento do Pacman <pacman-"
-"dev@archlinux.org>.\\nEste é um software livre; veja o código fonte para "
-"condições de cópia.\\nNÃO HÁ GARANTIA, na extensão permitida pela lei.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Equipa de Desenvolvimento do Pacman <pacman-dev@archlinux.org>.\\nEste é um software livre; veja o código fonte para condições de cópia.\\nNÃO HÁ GARANTIA, na extensão permitida pela lei.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -932,14 +862,11 @@ msgstr "%s não é um caminho para a base de dados do pacman."
 
 #: scripts/pacman-db-upgrade.sh.in:140
 msgid "You must have correct permissions to upgrade the database."
-msgstr ""
-"Precisa de ter as permissões correctas para actualizar a base de dados."
+msgstr "Precisa de ter as permissões correctas para actualizar a base de dados."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Ficheiro lock do pacman foi encontrado. Não é possível executar enquanto "
-"pacman está em execução."
+msgstr "Ficheiro lock do pacman foi encontrado. Não é possível executar enquanto pacman está em execução."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -955,9 +882,7 @@ msgstr "Base de dados pre-4.2 detetada - a atualizar..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"atalho simbólico '%s' aponta para fora do diretório base do pacman, "
-"reparação manual necessária"
+msgstr "atalho simbólico '%s' aponta para fora do diretório base do pacman, reparação manual necessária"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -973,30 +898,28 @@ msgstr "Operações:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr "-a, --add Adicionar as chaves especificadas (vazio para stdin)"
+msgstr "  -a, --add                 Adicionar as chaves especificadas (vazio para stdin)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
-msgstr "-d, --delete Remove as keyids especificadas"
+msgstr "  -d, --delete              Remove as keyids especificadas"
 
 #: scripts/pacman-key.sh.in:65
 msgid "  -e, --export              Export the specified or all keyids"
-msgstr "-e, --export Exportar a keyid especificada ou todas as keyids"
+msgstr "  -e, --export              Exportar a keyid especificada ou todas as keyids"
 
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"-f, --finger Listar a impressão digital para a keyid especificada ou todas "
-"as keyids"
+msgstr "  -f, --finger              Listar a impressão digital para a keyid especificada ou todas as keyids"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
-msgstr "-l, --list-keys Listar a chave especificada ou todas as chaves"
+msgstr "  -l, --list-keys           Listar a chave especificada ou todas as chaves"
 
 #: scripts/pacman-key.sh.in:68
 msgid "  -r, --recv-keys           Fetch the specified keyids"
-msgstr "-r, --recv-keys Obter as keyids especificadas"
+msgstr "  -r, --recv-keys           Obter as keyids especificadas"
 
 #: scripts/pacman-key.sh.in:69
 msgid "  -u, --updatedb            Update the trustdb of pacman"
@@ -1005,75 +928,61 @@ msgstr "  -u, --updatedb            Atualiza a trustdb do pacman"
 #: scripts/pacman-key.sh.in:70
 msgid ""
 "  -v, --verify              Verify the file(s) specified by the signature(s)"
-msgstr ""
-"-v, --verify Verificar o(s) ficheiro(s) especificado(s) pela(s) assinatura(s)"
+msgstr "  -v, --verify              Verificar o(s) ficheiro(s) especificado(s) pela(s) assinatura(s)"
 
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr "--edit-key Apresenta um menu para gestão de chaves em keyids"
+msgstr "  --edit-key                Apresenta um menu para gestão de chaves em keyids"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
-msgstr "--import Importa pubring.gpg a partir da(s) directoria(s)"
+msgstr "  --import                  Importa pubring.gpg a partir da(s) directoria(s)"
 
 #: scripts/pacman-key.sh.in:73
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"--import-trustdb Importa valores de confiança de proprietário de trustdb.gpg "
-"no(s) diretório(s)"
+msgstr "  --import-trustdb          Importa valores de confiança de proprietário de trustdb.gpg no(s) diretório(s)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                    Garante que o gestor de chaves está corretamente "
-"inicializado"
+msgstr "  --init                    Garante que o gestor de chaves está corretamente inicializado"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
-msgstr "--list-sigs Lista chaves e as suas assinaturas"
+msgstr "  --list-sigs               Lista chaves e as suas assinaturas"
 
 #: scripts/pacman-key.sh.in:76
 msgid "  --lsign-key               Locally sign the specified keyid"
-msgstr "--lsign-key Assinar localmente a keyid especificada"
+msgstr "  --lsign-key               Assinar localmente a keyid especificada"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"--populate Recarregar as chaves por omissão a partir dos chaveiros\\n em '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                Recarregar as chaves por omissão a partir dos chaveiros\\n                            em '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"--refresh-keys Actualizar a chave especificada ou todas as chaves a partir "
-"do servidor de chaves"
+msgstr "  --refresh-keys            Atualizar a chave especificada ou todas as chaves a partir do servidor de chaves"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <ficheiro>           Usar um ficheiro de configurações "
-"alternativo (ao invés de\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <ficheiro>           Usar um ficheiro de configurações alternativo (ao invés de\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            Definir um diretório alternativo para o GnuPG "
-"(ao invés\\n                            de '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            Definir um diretório alternativo para o GnuPG (ao invés\\n                            de '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"--keyserver <server-url> Especificar o servidor de chaves a utilizar se "
-"necessário"
+msgstr "  --keyserver <server-url>  Especificar o servidor de chaves a utilizar se necessário"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1145,8 +1054,7 @@ msgstr "A desactivar a chave %s..."
 
 #: scripts/pacman-key.sh.in:334
 msgid "A specified keyfile could not be added to the keyring."
-msgstr ""
-"Não foi possível adicionar ao chaveiro o ficheiro de chaves especificado."
+msgstr "Não foi possível adicionar ao chaveiro o ficheiro de chaves especificado."
 
 #: scripts/pacman-key.sh.in:342
 msgid "A specified key could not be removed from the keyring."
@@ -1190,14 +1098,11 @@ msgstr "%s não pode ser assinado localmente."
 
 #: scripts/pacman-key.sh.in:469
 msgid "Remote key not fetched correctly from keyserver."
-msgstr ""
-"A chave remota não foi obtida correctamente a partir do servidor de chaves."
+msgstr "A chave remota não foi obtida correctamente a partir do servidor de chaves."
 
 #: scripts/pacman-key.sh.in:477
 msgid "A specified local key could not be updated from a keyserver."
-msgstr ""
-"A chave local especificada não pôde ser actualizada a partir do servidor de "
-"chaves."
+msgstr "A chave local especificada não pôde ser actualizada a partir do servidor de chaves."
 
 #: scripts/pacman-key.sh.in:487
 msgid "The signature identified by %s could not be verified."
@@ -1213,8 +1118,7 @@ msgstr "A base de dados de confiança não pôde ser actualizada."
 
 #: scripts/pacman-key.sh.in:559
 msgid "Cannot find the %s binary required for all %s operations."
-msgstr ""
-"Incapaz de encontrar o comando %s necessário para todas as operações %s."
+msgstr "Incapaz de encontrar o comando %s necessário para todas as operações %s."
 
 #: scripts/pacman-key.sh.in:564
 msgid "%s needs to be run as root for this operation."
@@ -1230,7 +1134,7 @@ msgstr "nenhuma operação especificada (use -h para ajuda)"
 
 #: scripts/pacman-key.sh.in:596
 msgid "Multiple operations specified."
-msgstr "Múltiplas operações especificadas. "
+msgstr "Múltiplas operações especificadas."
 
 #: scripts/pacman-key.sh.in:597
 msgid "Please run %s with each operation separately."
@@ -1248,32 +1152,21 @@ msgstr "Uso: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize é um hack que deve melhorar a performance \\ndo pacman "
-"quando está a ler/escrever a base de dados baseada no sistema de ficheiros\\n"
-"\\n"
+msgstr "pacman-optimize é um hack que deve melhorar a performance \\ndo pacman quando está a ler/escrever a base de dados baseada no sistema de ficheiros\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Devido ao fato do pacman usar muitos arquivos pequenos para gerir os pacotes,"
-"\\nhá uma tendência que esses arquivos fiquem fragmentados com o passar do "
-"tempo. \\nEste script tenta realocar esses arquivos pequenos num local "
-"contínuo \\ndo disco rígido. O resultado será o disco ler os arquivos "
-"\\nmais rápido, já que a cabeça do disco não precisará de mover-se tanto "
-"pelo disco.\\n"
+msgstr "Devido ao fato do pacman usar muitos arquivos pequenos para gerir os pacotes,\\nhá uma tendência que esses arquivos fiquem fragmentados com o passar do tempo. \\nEste script tenta realocar esses arquivos pequenos num local contínuo \\ndo disco rígido. O resultado será o disco ler os arquivos \\nmais rápido, já que a cabeça do disco não precisará de mover-se tanto pelo disco.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
-msgstr ""
-"Incapaz de encontrar o binário %s necessário para a verificação de "
-"integridade."
+msgstr "Incapaz de encontrar o binário %s necessário para a verificação de integridade."
 
 #: scripts/pacman-optimize.sh.in:109
 msgid "You must have correct permissions to optimize the database."
@@ -1281,8 +1174,7 @@ msgstr "Deve ter as permissões correctas para optimizar a base de dados."
 
 #: scripts/pacman-optimize.sh.in:125
 msgid "Cannot create temporary directory for database building."
-msgstr ""
-"Incapaz de criar um diretório temporário para construir a base de dados."
+msgstr "Incapaz de criar um diretório temporário para construir a base de dados."
 
 #: scripts/pacman-optimize.sh.in:128
 msgid "MD5sum'ing the old database..."
@@ -1321,10 +1213,9 @@ msgid "Rotating database into place..."
 msgstr "A colocar a nova base de dados no lugar..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"Substituição de nova base de dados falhou. Verifique %s, %s e os diretórios "
-"%s."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "Substituição de nova base de dados falhou. Verifique %s, %s e os diretórios %s."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1338,9 +1229,7 @@ msgstr "Uso: pkgdelta [opções] <pacote1> <pacote2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta irá criar um ficheiro de diferenças entre os dois pacotes.\\n Este "
-"ficheiro pode ser adicionado à base de dados usando repo-add.\\n"
+msgstr "pkgdelta irá criar um ficheiro de diferenças entre os dois pacotes.\\n Este ficheiro pode ser adicionado à base de dados usando repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1357,31 +1246,24 @@ msgstr "  -q, --quiet       minimizar escritas na consola\\n"
 
 #: scripts/pkgdelta.sh.in:61
 msgid "  --nocolor         remove color from output\\n"
-msgstr "--nocolor remover cor da saída\\n"
+msgstr "  --nocolor         remover cor da saída\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"--min-pkg-size tamanho mínimo do pacote a partir do qual deltas são gerados"
-"\\n"
+msgstr "  --min-pkg-size    tamanho mínimo do pacote a partir do qual deltas são gerados\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"--max-delta-size percentagem do tamanho do pacote a partir do qual os deltas "
-"são descartados\\n"
+msgstr "  --max-delta-size  percentagem do tamanho do pacote a partir do qual os deltas são descartados\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nEste é um "
-"software livre; veja o código fonte para condições de cópia.\\nNÃO HÁ "
-"GARANTIA, na extensão permitida pela lei.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nEste é um software livre; veja o código fonte para condições de cópia.\\nNÃO HÁ GARANTIA, na extensão permitida pela lei.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1425,58 +1307,44 @@ msgstr "O ficheiro '%s' não existe"
 
 #: scripts/pkgdelta.sh.in:220 scripts/repo-add.sh.in:250
 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
-msgstr ""
-"Não foi possível encontrar o binário xdelta3! O xdelta3 está instalado?"
+msgstr "Não foi possível encontrar o binário xdelta3! O xdelta3 está instalado?"
 
 #: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr ""
-"Uso: repo-add [opções] <diretório-base-de-dados> <pacote|diferença> ...\\n"
+msgstr "Uso: repo-add [opções] <diretório-base-de-dados> <pacote|diferença> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add irá actualizar a base de dados de pacotes ao ler um pacote."
-"\\nMúltiplos pacotes a adicionar podem ser especificados na linha de "
-"comandos.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add irá actualizar a base de dados de pacotes ao ler um pacote.\\nMúltiplos pacotes a adicionar podem ser especificados na linha de comandos.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta       gera e adiciona diferença para a atualização do pacote\\n"
+msgstr "  -d, --delta       gera e adiciona diferença para a atualização do pacote\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"-n, --new adicionar apenas pacotes que ainda não estão na base de dados\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "  -n, --new         adicionar apenas pacotes que ainda não estão na base de dados\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"-R, --remove remove o ficheiro do pacote do disco após atualizar a base de "
-"dados\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "  -R, --remove      remove o ficheiro do pacote do disco após atualizar a base de dados\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Uso: repo-remove [opções] <caminho-para-base-de-dados> <nomedepacote|"
-"diferença> ...\\n"
+msgstr "Uso: repo-remove [opções] <caminho-para-base-de-dados> <nomedepacote|diferença> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove irá actualizar a base de dados de pacotes ao remover o pacote"
-"\\nespecificado na linha de comandos da base de dados do repositório."
-"Múltiplos\\npacotes a remover podem ser especificados na linha de comandos."
-"\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove irá actualizar a base de dados de pacotes ao remover o pacote\\nespecificado na linha de comandos da base de dados do repositório. Múltiplos\\npacotes a remover podem ser especificados na linha de comandos.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1484,37 +1352,29 @@ msgstr "Por favor continue, não existe nada para ver aqui.\\n"
 
 #: scripts/repo-add.sh.in:78
 msgid "  --nocolor         turn off color in output\\n"
-msgstr "--nocolor desligar cor na saída\\n"
+msgstr "  --nocolor         desligar cor na saída\\n"
 
 #: scripts/repo-add.sh.in:80
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
-msgstr ""
-"  -s, --sign        assinar a base de dados com o GnuPG após a atualização\\n"
+msgstr "  -s, --sign        assinar a base de dados com o GnuPG após a atualização\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <chave>   usar a chave especificada para assinar a base de dados"
-"\\n"
+msgstr "  -k, --key <chave>   usar a chave especificada para assinar a base de dados\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
-"  -v, --verify       verificar a assinatura da base de dados antes de "
-"actualizar\\n"
+msgstr "  -v, --verify       verificar a assinatura da base de dados antes de actualizar\\n"
 
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nVeja %s(8) para mais detalhes e descrições das opções disponíveis.\\n"
+msgstr "\\nVeja %s(8) para mais detalhes e descrições das opções disponíveis.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Exemplo:  repo-add /caminho/para/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar."
-"gz\\n"
+msgstr "Exemplo:  repo-add /caminho/para/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1522,13 +1382,10 @@ msgstr "Exemplo:  repo-remove /caminho/para/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Equipa de Desenvolvimento do Pacman <pacman-"
-"dev@archlinux.org>.\\n\\nEste é um software livre; veja o código fonte para "
-"condições de cópia.\\nNÃO HÁ GARANTIA, na extensão permitida pela lei.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016 Equipa de Desenvolvimento do Pacman <pacman-dev@archlinux.org>.\\n\\nEste é um software livre; veja o código fonte para condições de cópia.\\nNÃO HÁ GARANTIA, na extensão permitida pela lei.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1536,7 +1393,7 @@ msgstr "Nenhum registo de base de dados para o pacote '%s'."
 
 #: scripts/repo-add.sh.in:164
 msgid "Adding 'deltas' entry : %s -> %s"
-msgstr "A adicionar registo de 'deltas': %s -> %s"
+msgstr "A adicionar registo de 'deltas' : %s -> %s"
 
 #: scripts/repo-add.sh.in:192 scripts/repo-add.sh.in:479
 msgid "Removing existing entry '%s'..."
@@ -1580,8 +1437,7 @@ msgstr "A base de dados as assinaturas NÃO era válida!"
 
 #: scripts/repo-add.sh.in:305
 msgid "'%s' does not have a valid database archive extension."
-msgstr ""
-"'%s' não possui uma extensão válida de arquivo de base de dados de pacotes."
+msgstr "'%s' não possui uma extensão válida de arquivo de base de dados de pacotes."
 
 #: scripts/repo-add.sh.in:351
 msgid "An entry for '%s' already existed"
@@ -1593,7 +1449,7 @@ msgstr "Incapaz de utilizar assinaturas blindadas para os pacotes: %s"
 
 #: scripts/repo-add.sh.in:373
 msgid "Invalid package signature file '%s'."
-msgstr "Ficheiro de assinatura de pacote '%s', inválido"
+msgstr "Ficheiro de assinatura de pacote '%s', inválido."
 
 #: scripts/repo-add.sh.in:376
 msgid "Adding package signature..."
@@ -1633,7 +1489,7 @@ msgstr "A extrair base de dados para um local temporário..."
 
 #: scripts/repo-add.sh.in:549
 msgid "Repository file '%s' was not found."
-msgstr "Ficheiro de repositório \"%s\" em falta."
+msgstr "Ficheiro de repositório '%s' em falta."
 
 #: scripts/repo-add.sh.in:556
 msgid "Repository file '%s' could not be created."
@@ -1681,8 +1537,7 @@ msgstr "Comando especificado '%s' inválido."
 
 #: scripts/repo-add.sh.in:734
 msgid "Cannot create temp directory for database building."
-msgstr ""
-"Não foi possível criar diretório temporário para criação da base de dados."
+msgstr "Não foi possível criar diretório temporário para criação da base de dados."
 
 #: scripts/repo-add.sh.in:812
 msgid "Creating updated database file '%s'"
@@ -1714,15 +1569,15 @@ msgstr "%s contem carateres inválidos: '%s'"
 #: scripts/libmakepkg/lint_pkgbuild/arch.sh.in:49
 #: scripts/libmakepkg/lint_pkgbuild/arch.sh.in:57
 msgid "%s is not available for the '%s' architecture."
-msgstr "%s não está disponível para a arquitectura '%s'."
+msgstr "%s não está disponível para a arquitetura '%s'."
 
 #: scripts/libmakepkg/lint_pkgbuild/backup.sh.in:45
 msgid "%s entry should not contain leading slash : %s"
-msgstr "As entradas %s  não devem ter uma barra no início: %s"
+msgstr "As entradas %s não devem ter uma barra no início: %s"
 
 #: scripts/libmakepkg/lint_pkgbuild/epoch.sh.in:34
 msgid "%s must be an integer, not %s."
-msgstr "% tem de ser um inteiro, não %s."
+msgstr "%s tem de ser um inteiro, não %s."
 
 #: scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in:58
 msgid "Invalid syntax for %s: '%s'"
@@ -1770,9 +1625,7 @@ msgstr "%s não pode conter dois pontos, hífens ou espaços."
 
 #: scripts/libmakepkg/lint_pkgbuild/provides.sh.in:56
 msgid "%s array cannot contain comparison (< or >) operators."
-msgstr ""
-"A ordem providenciada por %s não pode conter os operadores de comparação (< "
-"ou >)."
+msgstr "A ordem providenciada por %s não pode conter os operadores de comparação (< ou >)."
 
 #: scripts/libmakepkg/lint_pkgbuild/source.sh.in:36
 msgid "Sparse arrays are not allowed for source"
@@ -1799,7 +1652,7 @@ msgstr "%s não deve ser um array"
 
 #: scripts/libmakepkg/source.sh.in:40
 msgid "Retrieving sources..."
-msgstr "A obter as fontes ..."
+msgstr "A obter as fontes..."
 
 #: scripts/libmakepkg/source.sh.in:88
 msgid "Extracting sources..."
@@ -1823,18 +1676,21 @@ msgstr "Falha ao puxar %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Referência desconhecida: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "A criar uma cópia de trabalho %s do repositório %s ..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Falha ao atualizar a cópia em uso de %s %s repositório"
 
@@ -1866,12 +1722,14 @@ msgstr "A extrair %s com %s"
 msgid "Failed to extract %s"
 msgstr "Falhou ao extrair %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "A clonar %s do repositório %s ..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Falha ao clonar %s do repositório %s"
@@ -1880,12 +1738,14 @@ msgstr "Falha ao clonar %s do repositório %s"
 msgid "%s is not a clone of %s"
 msgstr "%s não é um clone de %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
-msgstr "A actualizar %s do repositório %s ..."
+msgstr "A atualizar %s do repositório %s ..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Falha ao actualizar %s do repositório %s"
@@ -1920,7 +1780,7 @@ msgstr "Não foi possivel optimizar a imagem PNG : %s"
 
 #: scripts/libmakepkg/tidy/purge.sh.in:35
 msgid "Purging unwanted files..."
-msgstr "A remover ficheiros indesejados ..."
+msgstr "A remover ficheiros indesejados..."
 
 #: scripts/libmakepkg/tidy/staticlibs.sh.in:35
 msgid "Removing static library files..."
@@ -1928,8 +1788,7 @@ msgstr "A remover ficheiros de bibliotecas estáticas..."
 
 #: scripts/libmakepkg/tidy/strip.sh.in:85
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr ""
-"A remover símbolos de debug desnecessários de binários e bibliotecas..."
+msgstr "A remover símbolos de debug desnecessários de binários e bibliotecas..."
 
 #: scripts/libmakepkg/tidy/upx.sh.in:35
 msgid "Compressing binaries with %s..."
@@ -1937,7 +1796,7 @@ msgstr "A comprimir binários com %s..."
 
 #: scripts/libmakepkg/tidy/upx.sh.in:41
 msgid "Could not compress binary : %s"
-msgstr "Não foi possível comprimir binário:%s"
+msgstr "Não foi possível comprimir binário : %s"
 
 #: scripts/libmakepkg/tidy/zipman.sh.in:35
 msgid "Compressing man and info pages..."
diff --git a/scripts/po/pt_BR.po b/scripts/po/pt_BR.po
index dd69d4c5..eae08d8b 100644
--- a/scripts/po/pt_BR.po
+++ b/scripts/po/pt_BR.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # ambaratti <ambaratti.listas@gmail.com>, 2015
 # ambaratti <ambaratti.listas@gmail.com>, 2015
@@ -15,12 +15,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 16:26+0000\n"
 "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/pt_BR/)\n"
-"Language: pt_BR\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/toofishes/archlinux-pacman/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -102,10 +101,9 @@ msgid "Generating checksums for source files..."
 msgstr "Gerando somas de verificação para os arquivos fonte..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Não foi possível achar o executável %s necessário para gerar somas de "
-"verificação de aquivo fonte."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Não foi possível achar o executável %s necessário para gerar somas de verificação de aquivo fonte."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -138,8 +136,7 @@ msgstr "Um ou mais arquivos não passaram na verificação de validade!"
 
 #: scripts/makepkg.sh.in:489
 msgid "Integrity checks (%s) differ in size from the source array."
-msgstr ""
-"Verificações de integridade (%s) diferem em tamanho do vetor de fontes."
+msgstr "Verificações de integridade (%s) diferem em tamanho do vetor de fontes."
 
 #: scripts/makepkg.sh.in:531
 msgid "Integrity checks are missing for: %s"
@@ -341,26 +338,19 @@ msgstr "Protocolo de download desconhecido: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Não foi possível localizar o executável %s necessário para verificar "
-"exigências da fonte VCS."
+msgstr "Não foi possível localizar o executável %s necessário para verificar exigências da fonte VCS."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
-msgstr ""
-"Não foi possível localizar o pacote %s necessário para lidar com fontes %s."
+msgstr "Não foi possível localizar o pacote %s necessário para lidar com fontes %s."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
-msgstr ""
-"Não foi possível encontrar o executável %s necessário para operações de "
-"dependências."
+msgstr "Não foi possível encontrar o executável %s necessário para operações de dependências."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Não foi possível encontrar o executável %s. Ao invés, %s será usado para "
-"obter privilégios de root."
+msgstr "Não foi possível encontrar o executável %s. Ao invés, %s será usado para obter privilégios de root."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -368,58 +358,40 @@ msgstr "Não foi possível localizar o executável %s."
 
 #: scripts/makepkg.sh.in:1531
 msgid "Cannot find the %s binary required for signing packages."
-msgstr ""
-"Não foi possível encontrar o executável %s necessário para assinatura de "
-"pacotes."
+msgstr "Não foi possível encontrar o executável %s necessário para assinatura de pacotes."
 
 #: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
-"Não foi possível encontrar o executável %s necessário para verificação de "
-"arquivos fontes."
+msgstr "Não foi possível encontrar o executável %s necessário para verificação de arquivos fontes."
 
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"O arquivo binário %s necessário para validar os checksums do arquivo fonte "
-"não pode ser encontrado."
+msgstr "O arquivo binário %s necessário para validar os checksums do arquivo fonte não pode ser encontrado."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"Não foi possível encontrar o executável %s necessário para compressão de "
-"binários."
+msgstr "Não foi possível encontrar o executável %s necessário para compressão de binários."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
-msgstr ""
-"O arquivo binário %s necessário para otimizar as imagens PNG não pode ser "
-"encontrado."
+msgstr "O arquivo binário %s necessário para otimizar as imagens PNG não pode ser encontrado."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"Não foi possível encontrar o executável %s necessário para compilação "
-"distribuída."
+msgstr "Não foi possível encontrar o executável %s necessário para compilação distribuída."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Não foi possível encontrar o executável %s necessário pelo uso de cache de "
-"compilador."
+msgstr "Não foi possível encontrar o executável %s necessário pelo uso de cache de compilador."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"Não foi possível encontrar o executável %s necessário para remoção símbolos "
-"de objetos."
+msgstr "Não foi possível encontrar o executável %s necessário para remoção símbolos de objetos."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Não foi possível encontrar o executável %s necessário para compressão de "
-"páginas man e info."
+msgstr "Não foi possível encontrar o executável %s necessário para compressão de páginas man e info."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -432,15 +404,15 @@ msgstr "Um pacote já foi compilado. (use %s para sobrescrever)"
 #: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr ""
-"Um grupo de pacotes já foi construído, instalando pacotes existentes..."
+msgstr "Um grupo de pacotes já foi construído, instalando pacotes existentes..."
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "O grupo de pacotes já foi compilado. (use %s para sobrescrever)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "Parte do grupo de pacotes já foi compilado. (use %s para sobrescrever)"
 
 #: scripts/makepkg.sh.in:1696
@@ -473,8 +445,7 @@ msgstr "  -d, --nodeps     Ignora todas as verificações de dependência"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  Não extrai os arquivos fontes (usa diretório %s existente)"
+msgstr "  -e, --noextract  Não extrai os arquivos fontes (usa diretório %s existente)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -482,8 +453,7 @@ msgstr "  -f, --force      Sobrescrever pacote existente"
 
 #: scripts/makepkg.sh.in:1707
 msgid "  -g, --geninteg   Generate integrity checks for source files"
-msgstr ""
-"  -g, --geninteg   Gera verificações de integridade para arquivos fonte"
+msgstr "  -g, --geninteg   Gera verificações de integridade para arquivos fonte"
 
 #: scripts/makepkg.sh.in:1708
 msgid "  -h, --help       Show this help message and exit"
@@ -507,19 +477,16 @@ msgstr "  -o, --nobuild    Apenas baixa e extrai os arquivos"
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <arquivo>     Usa um script de empacotamento alternativo (ao invés\n"
-"                   de \"%s\")"
+msgstr "  -p <arquivo>     Usa um script de empacotamento alternativo (ao invés\n                   de \"%s\")"
 
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Remove dependências instaladas após uma compilação\n"
-"                   bem-sucedida"
+msgstr "  -r, --rmdeps     Remove dependências instaladas após uma compilação\n                   bem-sucedida"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  Reempacota o conteúdo do pacote sem recompilar"
 
 #: scripts/makepkg.sh.in:1716
@@ -539,9 +506,7 @@ msgstr "  -V, --version    Mostra informação da versão e sai"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"      --allsource  Gera um tarball somente com os fontes, incluindo os que\n"
-"                   foram baixados"
+msgstr "      --allsource  Gera um tarball somente com os fontes, incluindo os que\n                   foram baixados"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -549,23 +514,17 @@ msgstr "  --check          Executa a função %s no %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <arquivo>\n"
-"                   Usa um arquivo de configuração alternativo (ao invés\n"
-"                   de \"%s\")"
+msgstr "  --config <arquivo>\n                   Usa um arquivo de configuração alternativo (ao invés\n                   de \"%s\")"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
-msgstr ""
-"  --holdver        Não atualiza fontes de sistemas de controle de versão "
-"(VCS)"
+msgstr "  --holdver        Não atualiza fontes de sistemas de controle de versão (VCS)"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <chave>    Especifica uma chave para ser usada na assinatura %s ao\n"
-"                   invés do padrão"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <chave>    Especifica uma chave para ser usada na assinatura %s ao\n                   invés do padrão"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -586,8 +545,7 @@ msgstr "  --nosign         Não cria uma assinatura para o pacote"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"--packagelist Apenas listas os pacotes que seriam produzidos, sem PKGEXT"
+msgstr "--packagelist Apenas listas os pacotes que seriam produzidos, sem PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -599,8 +557,7 @@ msgstr "  --sign           Assina o pacote resultante com %s"
 
 #: scripts/makepkg.sh.in:1731
 msgid "  --skipchecksums  Do not verify checksums of the source files"
-msgstr ""
-"  --skipchecksums  Não verifica some de verificação dos arquivos fontes"
+msgstr "  --skipchecksums  Não verifica some de verificação dos arquivos fontes"
 
 #: scripts/makepkg.sh.in:1732
 msgid ""
@@ -615,9 +572,7 @@ msgstr "  --skippgpcheck   Não verifica arquivos fontes com assinaturas PGP"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource   Baixa arquivos fontes (se necessário) e realiza\n"
-"                   verificações de integridade"
+msgstr "  --verifysource   Baixa arquivos fontes (se necessário) e realiza\n                   verificações de integridade"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -639,8 +594,7 @@ msgstr "  --noconfirm      Não pede confirmação ao resolver dependências"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"  --noprogressbar  Não mostra a barra de progresso enquanto baixa os arquivos"
+msgstr "  --noprogressbar  Não mostra a barra de progresso enquanto baixa os arquivos"
 
 #: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
@@ -648,15 +602,12 @@ msgstr "Se %s não for especificada, %s vai procurar por \"%s\""
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Time de Desenvolvimento do Pacman <pacman-"
-"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux."
-"org>.\\n\\nEste é um software livre; veja o código fonte para condições de "
-"reprodução.\\nSEM GARANTIAS, dentro do permitido por lei.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Time de Desenvolvimento do Pacman <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nEste é um software livre; veja o código fonte para condições de reprodução.\\nSEM GARANTIAS, dentro do permitido por lei.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -680,8 +631,7 @@ msgstr "Você não tem permissão de escrita para armazenar downloads em %s."
 
 #: scripts/makepkg.sh.in:1946
 msgid "You do not have write permission to store source tarballs in %s."
-msgstr ""
-"Você não tem permissão de escrita para armazenar um tarball de fontes em %s."
+msgstr "Você não tem permissão de escrita para armazenar um tarball de fontes em %s."
 
 #: scripts/makepkg.sh.in:1959
 msgid "You do not have write permission to store logs in %s."
@@ -691,9 +641,7 @@ msgstr "Você não tem permissão de escrita para armazenar logs em %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Executar %s como root não é permitido, pois isso pode causar danos "
-"catastróficos e permanentes ao seu sistema."
+msgstr "Executar %s como root não é permitido, pois isso pode causar danos catastróficos e permanentes ao seu sistema."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -787,8 +735,7 @@ msgstr "linha de modelo inválido: não foi possível localizar nome de modelo\n
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr ""
-"caracteres inválidos usados no nome \"%s\", permitidos: [:alnum:]+_.@-\n"
+msgstr "caracteres inválidos usados no nome \"%s\", permitidos: [:alnum:]+_.@-\n"
 
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
@@ -821,14 +768,11 @@ msgstr "Opções:\n"
 #: scripts/makepkg-template.pl.in:178
 #, perl-format
 msgid "  --input, -p <file>    Build script to read (default: %s)\n"
-msgstr ""
-"  --input, -p <arquivo>    Script de compilação a ser lido (padrão: %s)\n"
+msgstr "  --input, -p <arquivo>    Script de compilação a ser lido (padrão: %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
-msgstr ""
-"  --output, -o <arquivo>   arquivo resultante (padrão: arquivo de entrada)\n"
-"\n"
+msgstr "  --output, -o <arquivo>   arquivo resultante (padrão: arquivo de entrada)\n\n"
 
 #: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
@@ -838,9 +782,7 @@ msgstr "  --newest, -n          atualiza modelos para versão mais nova\n"
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                        (padrão: usa versão informada em marcadores de "
-"modelo)\n"
+msgstr "                        (padrão: usa versão informada em marcadores de modelo)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
@@ -849,32 +791,22 @@ msgstr "  --template-dir <dir>  diretório onde modelos serão pesquisados\n"
 #: scripts/makepkg-template.pl.in:183
 #, perl-format
 msgid "                        (default: %s)\n"
-msgstr ""
-"                        (padrão: %s)\n"
-"\n"
+msgstr "                        (padrão: %s)\n\n"
 
 #: scripts/makepkg-template.pl.in:184
 msgid "  --help, -h            This help message\n"
-msgstr ""
-"  --help, -h            Essa mensagem de ajuda\n"
-"\n"
+msgstr "  --help, -h            Essa mensagem de ajuda\n\n"
 
 #: scripts/makepkg-template.pl.in:185
 msgid "  --version             Version information\n"
-msgstr ""
-"  --version             Informação da versão\n"
-"\n"
+msgstr "  --version             Informação da versão\n\n"
 
 #: scripts/makepkg-template.pl.in:194
 msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (c) 2013-2016 Time de Desenvolvimento do Pacman <pacman-"
-"dev@archlinux.org>.\n"
-"Este é um software livre; veja o código fonte para condições de reprodução.\n"
-"SEM GARANTIAS, dentro do permitido por lei.\n"
+msgstr "Copyright (c) 2013-2016 Time de Desenvolvimento do Pacman <pacman-dev@archlinux.org>.\nEste é um software livre; veja o código fonte para condições de reprodução.\nSEM GARANTIAS, dentro do permitido por lei.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -886,9 +818,7 @@ msgstr "opções:"
 
 #: scripts/pacman-db-upgrade.sh.in:43
 msgid "  -b, --dbpath <path>  set an alternate database location"
-msgstr ""
-"  -b, --dbpath <caminho>  \n"
-"                       define uma localização alternativa de base de dados"
+msgstr "  -b, --dbpath <caminho>  \n                       define uma localização alternativa de base de dados"
 
 #: scripts/pacman-db-upgrade.sh.in:44
 msgid "  -h, --help           show this help message and exit"
@@ -912,13 +842,10 @@ msgstr "  --nocolor            desabilita saída de mensagens coloridas"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2016 Time de Desenvolvimento do Pacman <pacman-"
-"dev@archlinux.org>.\\nEste é um software livre; veja o código fonte para "
-"condições de reprodução.\\nSEM GARANTIAS, dentro do permitido por lei.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Time de Desenvolvimento do Pacman <pacman-dev@archlinux.org>.\\nEste é um software livre; veja o código fonte para condições de reprodução.\\nSEM GARANTIAS, dentro do permitido por lei.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -931,14 +858,11 @@ msgstr "%s não é um diretório de base de dados do pacman."
 
 #: scripts/pacman-db-upgrade.sh.in:140
 msgid "You must have correct permissions to upgrade the database."
-msgstr ""
-"Você precisa ter as permissões adequadas para atualizar a base de dados."
+msgstr "Você precisa ter as permissões adequadas para atualizar a base de dados."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Arquivo de trava do pacman foi encontrado. Não é possível executar enquanto "
-"pacman está em execução."
+msgstr "Arquivo de trava do pacman foi encontrado. Não é possível executar enquanto pacman está em execução."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -954,9 +878,7 @@ msgstr "Formato de base de dados pré-4.2 detectado - atualizando..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"link simbólico \"%s\" aponta para fora da raiz do pacman, correção manual "
-"exigida"
+msgstr "link simbólico \"%s\" aponta para fora da raiz do pacman, correção manual exigida"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -972,9 +894,7 @@ msgstr "Operações:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add                 Adiciona as chaves especificadas"
-"\\n                            (vazio, para entrada padrão)"
+msgstr "  -a, --add                 Adiciona as chaves especificadas\\n                            (vazio, para entrada padrão)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
@@ -987,9 +907,7 @@ msgstr "  -e, --export              Exporta a keyid especificada ou todas"
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              Lista a impressão digital da keyid especificada"
-"\\n                            ou todas"
+msgstr "  -f, --finger              Lista a impressão digital da keyid especificada\\n                            ou todas"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -1001,21 +919,17 @@ msgstr "  -r, --recv-keys           Obtém as keyids especificadas"
 
 #: scripts/pacman-key.sh.in:69
 msgid "  -u, --updatedb            Update the trustdb of pacman"
-msgstr ""
-"  -u, --updatedb             Atualiza a base de dados de confiáveis do pacman"
+msgstr "  -u, --updatedb             Atualiza a base de dados de confiáveis do pacman"
 
 #: scripts/pacman-key.sh.in:70
 msgid ""
 "  -v, --verify              Verify the file(s) specified by the signature(s)"
-msgstr ""
-"  -v, --verify              Verifica arquivos especificados pelas assinaturas"
+msgstr "  -v, --verify              Verifica arquivos especificados pelas assinaturas"
 
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key                Apresenta um menu para a tarefa de gerenciamento"
-"\\n                            de chaves de keyids"
+msgstr "  --edit-key                Apresenta um menu para a tarefa de gerenciamento\\n                            de chaves de keyids"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
@@ -1025,15 +939,11 @@ msgstr "  --import                  Importa pubring.gpg dos diretórios"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          Importa valores de confiança do proprietário do"
-"\\n                            trustdb.gpg nos diretórios"
+msgstr "  --import-trustdb          Importa valores de confiança do proprietário do\\n                            trustdb.gpg nos diretórios"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                     Garante que o chaveiro está inicializado\n"
-"                             corretamente"
+msgstr "  --init                     Garante que o chaveiro está inicializado\n                             corretamente"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
@@ -1045,41 +955,30 @@ msgstr "  --lsign-key               Assina localmente a keyid especificada"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                Recarrega as chaves padrões dos chaveiros dados"
-"\\n                            em \"%s\""
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                Recarrega as chaves padrões dos chaveiros dados\\n                            em \"%s\""
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            Atualiza a chave especificada ou todas de um"
-"\\n                            servidor de chaves"
+msgstr "  --refresh-keys            Atualiza a chave especificada ou todas de um\\n                            servidor de chaves"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <arquivo>         Usa um arquivo de configuração alternativo (ao\n"
-"                             invés de \"%s\")"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <arquivo>         Usa um arquivo de configuração alternativo (ao\n                             invés de \"%s\")"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <diretório>       Define um diretório alternativo para GnuPG\n"
-"                             (invés de \"%s\")"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <diretório>       Define um diretório alternativo para GnuPG\n                             (invés de \"%s\")"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <url-de-servidor>\n"
-"                            Especifica um servidor de chaves para usar,"
-"\\n                            se necessário"
+msgstr "  --keyserver <url-de-servidor>\n                            Especifica um servidor de chaves para usar,\\n                            se necessário"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1167,8 +1066,7 @@ msgstr "Um arquivo de chaves especificado não pôde ser exportado do chaveiro."
 
 #: scripts/pacman-key.sh.in:372
 msgid "The fingerprint of a specified key could not be determined."
-msgstr ""
-"A impressão digital de uma chave especificada não pôde ser determinada."
+msgstr "A impressão digital de uma chave especificada não pôde ser determinada."
 
 #: scripts/pacman-key.sh.in:385 scripts/pacman-key.sh.in:404
 msgid "%s could not be imported."
@@ -1200,9 +1098,7 @@ msgstr "A chave remota não foi adquirida corretamente do servidor de chaves."
 
 #: scripts/pacman-key.sh.in:477
 msgid "A specified local key could not be updated from a keyserver."
-msgstr ""
-"Uma chave local especifica não pôde ser atualizada a partir do servidor de "
-"chaves."
+msgstr "Uma chave local especifica não pôde ser atualizada a partir do servidor de chaves."
 
 #: scripts/pacman-key.sh.in:487
 msgid "The signature identified by %s could not be verified."
@@ -1218,8 +1114,7 @@ msgstr "A base de dados de confiança não pôde ser atualizada."
 
 #: scripts/pacman-key.sh.in:559
 msgid "Cannot find the %s binary required for all %s operations."
-msgstr ""
-"Não foi possível encontrar o binário %s necessário para todas %s operações."
+msgstr "Não foi possível encontrar o binário %s necessário para todas %s operações."
 
 #: scripts/pacman-key.sh.in:564
 msgid "%s needs to be run as root for this operation."
@@ -1253,32 +1148,21 @@ msgstr "Uso: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize é um pequeno hack que deve melhorar a performance\\ndo "
-"pacman quando está lendo/escrevendo em sua base de dados baseada\\nno "
-"sistema de arquivos\\n\\n"
+msgstr "pacman-optimize é um pequeno hack que deve melhorar a performance\\ndo pacman quando está lendo/escrevendo em sua base de dados baseada\\nno sistema de arquivos\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Devido ao fato do pacman usar muitos arquivos pequenos para gerenciar os"
-"\\npacotes, há uma tendência desses arquivos se tornarem fragmentados com o "
-"tempo.\\nEste script tenta realocar esses arquivos pequenos em um único "
-"local contínuo\\nno seu disco rígido. O resultado é que o disco deverá ser "
-"capaz de ler os\\narquivos mais rápido, já que a cabeça do disco não "
-"precisará se mover tanto\\npela sua superfície.\\n"
+msgstr "Devido ao fato do pacman usar muitos arquivos pequenos para gerenciar os\\npacotes, há uma tendência desses arquivos se tornarem fragmentados com o tempo.\\nEste script tenta realocar esses arquivos pequenos em um único local contínuo\\nno seu disco rígido. O resultado é que o disco deverá ser capaz de ler os\\narquivos mais rápido, já que a cabeça do disco não precisará se mover tanto\\npela sua superfície.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
-msgstr ""
-"Não foi possível encontrar o executável %s necessário para verificação de "
-"integridade."
+msgstr "Não foi possível encontrar o executável %s necessário para verificação de integridade."
 
 #: scripts/pacman-optimize.sh.in:109
 msgid "You must have correct permissions to optimize the database."
@@ -1286,9 +1170,7 @@ msgstr "Você deve ter as permissões corretas para otimizar a base de dados."
 
 #: scripts/pacman-optimize.sh.in:125
 msgid "Cannot create temporary directory for database building."
-msgstr ""
-"Não foi possível criar um diretório temporário para compilação da base de "
-"dados."
+msgstr "Não foi possível criar um diretório temporário para compilação da base de dados."
 
 #: scripts/pacman-optimize.sh.in:128
 msgid "MD5sum'ing the old database..."
@@ -1320,18 +1202,16 @@ msgstr "Verificando integridade..."
 
 #: scripts/pacman-optimize.sh.in:162
 msgid "Integrity check FAILED, reverting to old database."
-msgstr ""
-"Verificação de integridade FALHOU, revertendo para a base de dados antiga."
+msgstr "Verificação de integridade FALHOU, revertendo para a base de dados antiga."
 
 #: scripts/pacman-optimize.sh.in:166
 msgid "Rotating database into place..."
 msgstr "Posicionando a base de dados em seu lugar..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"Substituição por nova base de dados falhou. Verifique nos diretórios %s, %s "
-"e %s."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "Substituição por nova base de dados falhou. Verifique nos diretórios %s, %s e %s."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1345,9 +1225,7 @@ msgstr "Uso: pkgdelta [opções] <pacote1> <pacote2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta vai criar um arquivo delta entre dois pacotes.\\nEste arquivo delta "
-"pode então ser adicionado a uma base de dados usando repo-add.\\n"
+msgstr "pkgdelta vai criar um arquivo delta entre dois pacotes.\\nEste arquivo delta pode então ser adicionado a uma base de dados usando repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1368,27 +1246,20 @@ msgstr "  --nocolor         remove cores da saída\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size    tamanho mínimo de pacote antes que deltas sejam gerados"
-"\\n"
+msgstr "  --min-pkg-size    tamanho mínimo de pacote antes que deltas sejam gerados\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  porcentagem do novo pacote acima cujo delta será\n"
-"                    descartado\\n"
+msgstr "  --max-delta-size  porcentagem do novo pacote acima cujo delta será\n                    descartado\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nEste é um "
-"software livre; veja o código fonte para condições de cópia.\\nNÃO HÁ "
-"GARANTIA, na extensão permitida pela lei.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nEste é um software livre; veja o código fonte para condições de cópia.\\nNÃO HÁ GARANTIA, na extensão permitida pela lei.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1432,8 +1303,7 @@ msgstr "O arquivo \"%s\" não existe"
 
 #: scripts/pkgdelta.sh.in:220 scripts/repo-add.sh.in:250
 msgid "Cannot find the xdelta3 binary! Is xdelta3 installed?"
-msgstr ""
-"Não foi possível encontrar o executável xdelta3! O xdelta3 está instalado?"
+msgstr "Não foi possível encontrar o executável xdelta3! O xdelta3 está instalado?"
 
 #: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
@@ -1441,33 +1311,25 @@ msgstr "Uso: repo-add [opções] <caminho-para-bd> <pacote|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add atualiza uma base de dados de pacotes lendo um arquivo de\\npacote. "
-"Múltiplos pacotes a serem adicionados podem ser especificados\\nna linha de "
-"comando.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add atualiza uma base de dados de pacotes lendo um arquivo de\\npacote. Múltiplos pacotes a serem adicionados podem ser especificados\\nna linha de comando.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta        gera e adiciona delta para atualização de pacote\\n"
+msgstr "  -d, --delta        gera e adiciona delta para atualização de pacote\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"  -n, --new         apenas adiciona pacotes que ainda não foram adicionados "
-"à\n"
-"                    base de dados\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "  -n, --new         apenas adiciona pacotes que ainda não foram adicionados à\n                    base de dados\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"-R, --remove remove o pacote antigo do disco depois de atualizar a base de "
-"dados\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "-R, --remove remove o pacote antigo do disco depois de atualizar a base de dados\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
@@ -1475,14 +1337,10 @@ msgstr "Uso: repo-remove [opções] <caminho para-bd> <nome-pacote|delta> ...\\n
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove atualiza uma base de dados de pacotes removendo o nome do"
-"\\npacote especificado na linha de comando da base de dados de repositório"
-"\\ninformada. Múltiplos pacotes a serem removidos podem ser especificados"
-"\\nna linha de comando.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove atualiza uma base de dados de pacotes removendo o nome do\\npacote especificado na linha de comando da base de dados de repositório\\ninformada. Múltiplos pacotes a serem removidos podem ser especificados\\nna linha de comando.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1494,32 +1352,25 @@ msgstr "  --nocolor         remove cores da saída\\n"
 
 #: scripts/repo-add.sh.in:80
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
-msgstr ""
-"  -s, --sign         assina base de dados com GnuPG depois de atualizar\\n"
+msgstr "  -s, --sign         assina base de dados com GnuPG depois de atualizar\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <chave>  usa a chave especificada para assinar a base de dados\\n"
+msgstr "  -k, --key <chave>  usa a chave especificada para assinar a base de dados\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
-"  -v, --verify       verifica assinatura da base de dados antes de atualizar"
-"\\n"
+msgstr "  -v, --verify       verifica assinatura da base de dados antes de atualizar\\n"
 
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nVeja %s(8) para mais detalhes e descrição das opções disponíveis.\\n"
+msgstr "\\nVeja %s(8) para mais detalhes e descrição das opções disponíveis.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Exemplo:  repo-add /caminho/para/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar."
-"gz\\n"
+msgstr "Exemplo:  repo-add /caminho/para/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1527,13 +1378,10 @@ msgstr "Exemplo:  repo-remove /caminho/para/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Time de Desenvolvimento do Pacman <pacman-"
-"dev@archlinux.org>.\\n\\nEste é um software livre; veja o código fonte para "
-"condições de reprodução.\\nSEM GARANTIAS, dentro do permitido por lei.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016 Time de Desenvolvimento do Pacman <pacman-dev@archlinux.org>.\\n\\nEste é um software livre; veja o código fonte para condições de reprodução.\\nSEM GARANTIAS, dentro do permitido por lei.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1629,8 +1477,7 @@ msgstr "Contido pelo processo %s"
 
 #: scripts/repo-add.sh.in:536
 msgid "Repository file '%s' is not a proper pacman database."
-msgstr ""
-"Arquivo de repositório \"%s\" não é uma base de dados válida do pacman."
+msgstr "Arquivo de repositório \"%s\" não é uma base de dados válida do pacman."
 
 #: scripts/repo-add.sh.in:541
 msgid "Extracting database to a temporary location..."
@@ -1686,8 +1533,7 @@ msgstr "Nome de comando inválido \"%s\" foi especificado."
 
 #: scripts/repo-add.sh.in:734
 msgid "Cannot create temp directory for database building."
-msgstr ""
-"Não foi possível criar diretório temporário para compilação da base de dados."
+msgstr "Não foi possível criar diretório temporário para compilação da base de dados."
 
 #: scripts/repo-add.sh.in:812
 msgid "Creating updated database file '%s'"
@@ -1826,18 +1672,21 @@ msgstr "Falha ao executar pull de %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Referência não reconhecida: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Criando cópia de trabalho do repositório %s do tipo %s..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Falha ao atualizar cópia de trabalho do repositório %s %s"
 
@@ -1869,12 +1718,14 @@ msgstr "Extraindo %s com %s"
 msgid "Failed to extract %s"
 msgstr "Falha ao extrair %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Clonando repositório %s do tipo %s..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Falha ao baixar o repositório %s do tipo %s"
@@ -1883,12 +1734,14 @@ msgstr "Falha ao baixar o repositório %s do tipo %s"
 msgid "%s is not a clone of %s"
 msgstr "%s não é um clone de %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Atualizando repositório %s do tipo %s..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Falha ao atualizar repositório %s do tipo %s"
diff --git a/scripts/po/ro.po b/scripts/po/ro.po
index eb2e1f96..4e7ef866 100644
--- a/scripts/po/ro.po
+++ b/scripts/po/ro.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Arthur Țițeică <arthur.titeica@gmail.com>, 2013
 # Arthur Titeica <arthur@psw.ro>, 2013
@@ -19,14 +19,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-18 06:02+0000\n"
 "Last-Translator: mihaicris <Mihai.cristescu@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ro/)\n"
-"Language: ro\n"
+"Language-Team: Romanian (http://www.transifex.com/toofishes/archlinux-pacman/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1));\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
 #: scripts/makepkg.sh.in:135
 msgid "Cleaning up..."
@@ -107,10 +105,9 @@ msgid "Generating checksums for source files..."
 msgstr "Se generează sumele de control pentru fișierele sursă..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Nu se poate găsi binarul %s necesar pentru generarea sumelor de control a "
-"fișierelor sursă."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Nu se poate găsi binarul %s necesar pentru generarea sumelor de control a fișierelor sursă."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -143,8 +140,7 @@ msgstr "Unul sau mai multe fișiere nu au trecut de verificarea validității!"
 
 #: scripts/makepkg.sh.in:489
 msgid "Integrity checks (%s) differ in size from the source array."
-msgstr ""
-"Verificările de integritate (%s) diferă ca mărime față de matricea sursă."
+msgstr "Verificările de integritate (%s) diferă ca mărime față de matricea sursă."
 
 #: scripts/makepkg.sh.in:531
 msgid "Integrity checks are missing for: %s"
@@ -346,8 +342,7 @@ msgstr "Protocol de descărcare necunoscut: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Nu se poate găsi binarul %s necesar pentru a verifica cerințele de sursă VCS."
+msgstr "Nu se poate găsi binarul %s necesar pentru a verifica cerințele de sursă VCS."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
@@ -359,8 +354,7 @@ msgstr "Nu se poate găsi binarul %s necesar pentru operații cu dependențe."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Nu se poate găsi binarul %s. Se va folosi %s pentru a obține privilegii root."
+msgstr "Nu se poate găsi binarul %s. Se va folosi %s pentru a obține privilegii root."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -372,15 +366,12 @@ msgstr "Nu se poate găsi binarul %s necesar pentru semnarea pachetelor."
 
 #: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
-"Nu se poate găsi binarul %s necesar pentru verificarea fișierelor sursă."
+msgstr "Nu se poate găsi binarul %s necesar pentru verificarea fișierelor sursă."
 
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"Nu se poate găsi binarul %s necesar pentru validarea sumelor de control ale "
-"fișierelor sursă."
+msgstr "Nu se poate găsi binarul %s necesar pentru validarea sumelor de control ale fișierelor sursă."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
@@ -396,20 +387,15 @@ msgstr "Nu se poate găsi binarul %s necesar pentru compilarea distribuită."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Nu se poate găsi binarul %s necesar pentru folosirea cache-ului "
-"compilatorului."
+msgstr "Nu se poate găsi binarul %s necesar pentru folosirea cache-ului compilatorului."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"Nu se poate găsi binarul %s necesar pentru eliminarea simbolurilor pentru "
-"depanare."
+msgstr "Nu se poate găsi binarul %s necesar pentru eliminarea simbolurilor pentru depanare."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Nu se poate găsi binarul %s necesar pentru comprimarea paginilor man și info."
+msgstr "Nu se poate găsi binarul %s necesar pentru comprimarea paginilor man și info."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -422,19 +408,16 @@ msgstr "Un pachet a fost deja construit. (folosește %s pentru a suprascrie)"
 #: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr ""
-"Grupul de pachete a fost deja construit, se instalează pachetele existente..."
+msgstr "Grupul de pachete a fost deja construit, se instalează pachetele existente..."
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Grupul de pachete a fost deja construit. (folosește %s pentru a suprascrie)"
+msgstr "Grupul de pachete a fost deja construit. (folosește %s pentru a suprascrie)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"O parte din grupul de pachete a fost deja construită. (folosește %s pentru a "
-"suprascrie)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "O parte din grupul de pachete a fost deja construită. (folosește %s pentru a suprascrie)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -458,8 +441,7 @@ msgstr "  -c, --clean       Curăță fișierele de lucru după construire"
 
 #: scripts/makepkg.sh.in:1703
 msgid "  -C, --cleanbuild Remove %s dir before building the package"
-msgstr ""
-"  -C, --cleanbuild  Elimină directorul %s înainte de construcția pachetului"
+msgstr "  -C, --cleanbuild  Elimină directorul %s înainte de construcția pachetului"
 
 #: scripts/makepkg.sh.in:1704
 msgid "  -d, --nodeps     Skip all dependency checks"
@@ -467,9 +449,7 @@ msgstr "  -d, --nodeps      Se omit toate verificările de dependențe"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract   Nu extrage fișierele sursă (folosește directorul %s "
-"existent)"
+msgstr "  -e, --noextract   Nu extrage fișierele sursă (folosește directorul %s existent)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -477,9 +457,7 @@ msgstr "  -f, --force       Suprascrie pachetul existent"
 
 #: scripts/makepkg.sh.in:1707
 msgid "  -g, --geninteg   Generate integrity checks for source files"
-msgstr ""
-"  -g, --geninteg    Generează verificări de integritate pentru fișierele "
-"sursă"
+msgstr "  -g, --geninteg    Generează verificări de integritate pentru fișierele sursă"
 
 #: scripts/makepkg.sh.in:1708
 msgid "  -h, --help       Show this help message and exit"
@@ -487,13 +465,11 @@ msgstr "  -h, --help        Afișează acest mesaj de ajutor și ieși"
 
 #: scripts/makepkg.sh.in:1709
 msgid "  -i, --install    Install package after successful build"
-msgstr ""
-"  -i, --install     Instalează pachetul după ce construirea are loc cu succes"
+msgstr "  -i, --install     Instalează pachetul după ce construirea are loc cu succes"
 
 #: scripts/makepkg.sh.in:1710
 msgid "  -L, --log        Log package build process"
-msgstr ""
-"  -L, --log         Scrie în jurnal procesului de construire a pachetului"
+msgstr "  -L, --log         Scrie în jurnal procesului de construire a pachetului"
 
 #: scripts/makepkg.sh.in:1711
 msgid "  -m, --nocolor    Disable colorized output messages"
@@ -505,21 +481,17 @@ msgstr "  -o, --nobuild     Doar descarcă și extrage fișierele"
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <fișier>       Foloseşte un script de construire alternativ (în locul "
-"'%s')"
+msgstr "  -p <fișier>       Foloseşte un script de construire alternativ (în locul '%s')"
 
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps      Elimină dependențele instalate după ce construirea are "
-"loc cu succes"
+msgstr "  -r, --rmdeps      Elimină dependențele instalate după ce construirea are loc cu succes"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr ""
-"  -R, --repackage   Reîmpachetează conținutul pachetului fără reconstruire"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
+msgstr "  -R, --repackage   Reîmpachetează conținutul pachetului fără reconstruire"
 
 #: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
@@ -528,8 +500,7 @@ msgstr "  -s, --syncdeps    Instalează dependențele lipsă cu %s"
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source      Generează o arhivă doar-sursă fără sursele descărcate"
+msgstr "  -S, --source      Generează o arhivă doar-sursă fără sursele descărcate"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -539,9 +510,7 @@ msgstr "  -V, --version     Arată informații despre versiune și ieși"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource       Generează o arhivă doar-sursă incluzând sursele "
-"descărcate"
+msgstr "  --allsource       Generează o arhivă doar-sursă incluzând sursele descărcate"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -549,8 +518,7 @@ msgstr "  --check           Execută funcția %s în %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <fișier> Folosește un fișier config alternativ (în locul '%s')"
+msgstr "  --config <fișier> Folosește un fișier config alternativ (în locul '%s')"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -558,10 +526,9 @@ msgstr "  --holdver         Nu actualiza sursele VCS"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <cheie>     Specifică o cheie pentru semnarea %s în loc de cea "
-"implicită."
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <cheie>     Specifică o cheie pentru semnarea %s în loc de cea implicită."
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -582,8 +549,7 @@ msgstr "  --nosign          Nu crea o semnătură pentru pachet"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"  --packagelist     Listează doar pachetele care ar fi produse, fără PKGEXT"
+msgstr "  --packagelist     Listează doar pachetele care ar fi produse, fără PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -610,9 +576,7 @@ msgstr "  --skippgpcheck    Nu verifica fișierele sursă cu semnături PGP"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource    Descarcă fișierele sursă (dacă e nevoie) și efectuează "
-"verificările de integritate"
+msgstr "  --verifysource    Descarcă fișierele sursă (dacă e nevoie) și efectuează verificările de integritate"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -620,8 +584,7 @@ msgstr "Aceste opțiuni sunt valabile pentru %s:"
 
 #: scripts/makepkg.sh.in:1738
 msgid "  --asdeps         Install packages as non-explicitly installed"
-msgstr ""
-"  --asdeps          Instalează pachetele ca pachete instalate neexplicit."
+msgstr "  --asdeps          Instalează pachetele ca pachete instalate neexplicit."
 
 #: scripts/makepkg.sh.in:1739
 msgid ""
@@ -643,15 +606,12 @@ msgstr "Dacă %s nu este specificat, %s va căuta '%s'"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Echipa de dezvoltare Pacman <pacman-dev@archlinux."
-"org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nAcest "
-"program este gratuit; se vor vedea sursele pentru condițiile de copiere."
-"\\nNu există NICIO GARANȚIE, în măsura permisă de lege.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Echipa de dezvoltare Pacman <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nAcest program este gratuit; se vor vedea sursele pentru condițiile de copiere.\\nNu există NICIO GARANȚIE, în măsura permisă de lege.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -685,9 +645,7 @@ msgstr "Nu aveți drepturi de scriere pentru a stoca jurnale în %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Executarea %s ca root nu este permisă și poate cauza daune permanente,"
-"\\ncatastrofale pentru sistem."
+msgstr "Executarea %s ca root nu este permisă și poate cauza daune permanente,\\ncatastrofale pentru sistem."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -723,8 +681,7 @@ msgstr "Se face pachetul: %s"
 
 #: scripts/makepkg.sh.in:2133
 msgid "A source package has already been built. (use %s to overwrite)"
-msgstr ""
-"Un pachet sursă a fost deja construit. (folosește %s pentru a suprascrie)"
+msgstr "Un pachet sursă a fost deja construit. (folosește %s pentru a suprascrie)"
 
 #: scripts/makepkg.sh.in:2152
 msgid "Source package created: %s"
@@ -815,27 +772,21 @@ msgstr "Opțiuni:\n"
 #: scripts/makepkg-template.pl.in:178
 #, perl-format
 msgid "  --input, -p <file>    Build script to read (default: %s)\n"
-msgstr ""
-"  --input, -p <fișier>    script de construire de citit (implicit: %s)\n"
+msgstr "  --input, -p <fișier>    script de construire de citit (implicit: %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
-msgstr ""
-"  --output, -o <fișier>   fișier de scriere rezultate (implicit: fișier "
-"intrare)\n"
+msgstr "  --output, -o <fișier>   fișier de scriere rezultate (implicit: fișier intrare)\n"
 
 #: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
-msgstr ""
-"  --newest, -n            actualizează șabloanele la cea mai nouă versiune\n"
+msgstr "  --newest, -n            actualizează șabloanele la cea mai nouă versiune\n"
 
 #: scripts/makepkg-template.pl.in:181
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                          (implicit: se folosește versiunea specificată în "
-"marcajele de șablon)\n"
+msgstr "                          (implicit: se folosește versiunea specificată în marcajele de șablon)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
@@ -859,12 +810,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (c) 2013-2016 Echipa de dezvoltare Pacman <pacman-dev@archlinux."
-"org>.\n"
-"Acest program este gratuit; se vor vedea sursele pentru condițiile de "
-"copiere.\n"
-"Nu există NICIO GARANȚIE, în măsura permisă de lege.\n"
+msgstr "Copyright (c) 2013-2016 Echipa de dezvoltare Pacman <pacman-dev@archlinux.org>.\nAcest program este gratuit; se vor vedea sursele pentru condițiile de copiere.\nNu există NICIO GARANȚIE, în măsura permisă de lege.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -876,8 +822,7 @@ msgstr "opțiuni:"
 
 #: scripts/pacman-db-upgrade.sh.in:43
 msgid "  -b, --dbpath <path>  set an alternate database location"
-msgstr ""
-"  -b, --dbpath <cale>     setează o locație alternativă a bazei de date"
+msgstr "  -b, --dbpath <cale>     setează o locație alternativă a bazei de date"
 
 #: scripts/pacman-db-upgrade.sh.in:44
 msgid "  -h, --help           show this help message and exit"
@@ -897,18 +842,14 @@ msgstr "      --config <cale>     setează un fișier alternativ de configurare"
 
 #: scripts/pacman-db-upgrade.sh.in:48
 msgid "  --nocolor            disable colorized output messages"
-msgstr ""
-"  --nocolor               se dezactivează colorarea mesajelor returnate"
+msgstr "  --nocolor               se dezactivează colorarea mesajelor returnate"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2016 Echipa de dezvoltare Pacman <pacman-dev@archlinux."
-"org>.\\nAcest program este gratuit; se vor vedea sursele pentru condițiile "
-"de copiere.\\nNu există NICIO GARANȚIE, în măsura permisă de lege.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Echipa de dezvoltare Pacman <pacman-dev@archlinux.org>.\\nAcest program este gratuit; se vor vedea sursele pentru condițiile de copiere.\\nNu există NICIO GARANȚIE, în măsura permisă de lege.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -921,15 +862,11 @@ msgstr "Directorul %s nu conține o bază de date pacman."
 
 #: scripts/pacman-db-upgrade.sh.in:140
 msgid "You must have correct permissions to upgrade the database."
-msgstr ""
-"Trebuie să aveți permisiunile corespunzătoare pentru a actualiza baza de "
-"date."
+msgstr "Trebuie să aveți permisiunile corespunzătoare pentru a actualiza baza de date."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"A fost găsit fișierul de blocare al pacman. Nu se poate rula programul cât "
-"timp pacman rulează."
+msgstr "A fost găsit fișierul de blocare al pacman. Nu se poate rula programul cât timp pacman rulează."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -945,9 +882,7 @@ msgstr "S-a detectat formatul bazei de date Pre-4.2 - se actualizează..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"legătura simbolică '%s' trimite în afara root-ului pacman, este necesară "
-"depanarea manuală"
+msgstr "legătura simbolică '%s' trimite în afara root-ului pacman, este necesară depanarea manuală"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -963,8 +898,7 @@ msgstr "Operații:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add                 Adaugă cheile specificate (gol pentru stdin)"
+msgstr "  -a, --add                 Adaugă cheile specificate (gol pentru stdin)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
@@ -972,15 +906,12 @@ msgstr "  -d, --delete              Elimină keyid-urile specificate"
 
 #: scripts/pacman-key.sh.in:65
 msgid "  -e, --export              Export the specified or all keyids"
-msgstr ""
-"  -e, --export              Exportă keyid-urile specificate sau pe toate"
+msgstr "  -e, --export              Exportă keyid-urile specificate sau pe toate"
 
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              Afișează amprentele pentru keyid-urile "
-"specificate sau pentru toate"
+msgstr "  -f, --finger              Afișează amprentele pentru keyid-urile specificate sau pentru toate"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -997,15 +928,12 @@ msgstr "  -u, --updatedb            Actualizează baza trustdb a pacman"
 #: scripts/pacman-key.sh.in:70
 msgid ""
 "  -v, --verify              Verify the file(s) specified by the signature(s)"
-msgstr ""
-"  -v, --verify              Verifică fișierele specificate de semnături"
+msgstr "  -v, --verify              Verifică fișierele specificate de semnături"
 
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key                Afișează un meniu pentru operațiuni de "
-"administrare a cheilor după keyid-uri."
+msgstr "  --edit-key                Afișează un meniu pentru operațiuni de administrare a cheilor după keyid-uri."
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
@@ -1015,15 +943,11 @@ msgstr "  --import                  Importă pubring.gpg din director(oare)"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          Importă valorile nivelurilor de încredere a "
-"deținătorilor\n"
-"                            din trustdb.gpg în director(oare)"
+msgstr "  --import-trustdb          Importă valorile nivelurilor de încredere a deținătorilor\n                            din trustdb.gpg în director(oare)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                    Verifică inițializarea corectă a inelului de chei"
+msgstr "  --init                    Verifică inițializarea corectă a inelului de chei"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
@@ -1035,39 +959,30 @@ msgstr "  --lsign-key               Semnează keyid-urile locale specificate"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                Reîncarcă cheile implicite din fișierele (date) "
-"de chei\\n                            din '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                Reîncarcă cheile implicite din fișierele (date) de chei\\n                            din '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            Actualizează cheile specificate sau toate cheile "
-"de la un server de chei."
+msgstr "  --refresh-keys            Actualizează cheile specificate sau toate cheile de la un server de chei."
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <fișier>         Folosește un fișier de configurare alternativ "
-"(în loc de\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <fișier>         Folosește un fișier de configurare alternativ (în loc de\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            Alege un director alternativ pentru GnuPG (în "
-"loc de\\n                            of '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            Alege un director alternativ pentru GnuPG (în loc de\\n                            of '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <url-server>  Specifică un server de chei, dacă este necesar"
+msgstr "  --keyserver <url-server>  Specifică un server de chei, dacă este necesar"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1187,8 +1102,7 @@ msgstr "Cheia specificată nu s-a preluat corect de la un server de chei."
 
 #: scripts/pacman-key.sh.in:477
 msgid "A specified local key could not be updated from a keyserver."
-msgstr ""
-"O cheie specificată local nu poate fi actualizată de la un server de chei."
+msgstr "O cheie specificată local nu poate fi actualizată de la un server de chei."
 
 #: scripts/pacman-key.sh.in:487
 msgid "The signature identified by %s could not be verified."
@@ -1238,26 +1152,17 @@ msgstr "Utilizare: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize este un mic utilitar care ar trebui să îmbunătățească "
-"performanța\\npacman la citirea/scrierea în baza sa de date din sistemul de "
-"fișiere.\\n\\n"
+msgstr "pacman-optimize este un mic utilitar care ar trebui să îmbunătățească performanța\\npacman la citirea/scrierea în baza sa de date din sistemul de fișiere.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Deoarece pacman foloseşte multe fișiere mici pentru a păstra legătura cu "
-"pachetele,\\nexistă o tendință a acestor fișiere să se fragmenteze în timp."
-"\\nAcest script încearcă realocarea acestor mici fișiere într-o\\nlocație "
-"continuă pe hard disk-ul dvs. Rezultatul este acela că hard disk-ul\\nva fi "
-"capabil să le citească mai repede deoarece capul de citire al hard-ului\\nnu "
-"se va mai muta atât de mult pe disc.\\n"
+msgstr "Deoarece pacman foloseşte multe fișiere mici pentru a păstra legătura cu pachetele,\\nexistă o tendință a acestor fișiere să se fragmenteze în timp.\\nAcest script încearcă realocarea acestor mici fișiere într-o\\nlocație continuă pe hard disk-ul dvs. Rezultatul este acela că hard disk-ul\\nva fi capabil să le citească mai repede deoarece capul de citire al hard-ului\\nnu se va mai muta atât de mult pe disc.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1265,8 +1170,7 @@ msgstr "Nu se poate găsi binarul %s necesar pentru verificarea integrității."
 
 #: scripts/pacman-optimize.sh.in:109
 msgid "You must have correct permissions to optimize the database."
-msgstr ""
-"Trebuie să aveți permisiunile corespunzătoare pentru a optimiza baza de date."
+msgstr "Trebuie să aveți permisiunile corespunzătoare pentru a optimiza baza de date."
 
 #: scripts/pacman-optimize.sh.in:125
 msgid "Cannot create temporary directory for database building."
@@ -1286,8 +1190,7 @@ msgstr "Arhivarea %s a eșuat."
 
 #: scripts/pacman-optimize.sh.in:141
 msgid "Making and MD5sum'ing the new database..."
-msgstr ""
-"Se construiește și se calculează sumele MD5 pentru noua bază de date..."
+msgstr "Se construiește și se calculează sumele MD5 pentru noua bază de date..."
 
 #: scripts/pacman-optimize.sh.in:146
 msgid "Untar'ing %s failed."
@@ -1310,10 +1213,9 @@ msgid "Rotating database into place..."
 msgstr "Se rotește baza de date în loc..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"Înlocuirea cu noua bază de date a eșuat. Verificați directoarele %s, %s, și "
-"%s."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "Înlocuirea cu noua bază de date a eșuat. Verificați directoarele %s, %s, și %s."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1327,9 +1229,7 @@ msgstr "Utilizare: pkgdelta [opțiuni] <pachet1> <pachet2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta va crea un fișier delta între cele două pachete.\\nAcest fișier "
-"poate fi apoi adăugat la o bază de date folosind repo-add.\\n"
+msgstr "pkgdelta va crea un fișier delta între cele două pachete.\\nAcest fișier poate fi apoi adăugat la o bază de date folosind repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1350,27 +1250,20 @@ msgstr "  --nocolor         nu colora mesajele de ieșire\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size    dimensiunea minimă a pachetelor înainte de generarea "
-"delta-urilor\\n"
+msgstr "  --min-pkg-size    dimensiunea minimă a pachetelor înainte de generarea delta-urilor\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  procentajul noului pachet peste care delta va fi anulat"
-"\\n"
+msgstr "  --max-delta-size  procentajul noului pachet peste care delta va fi anulat\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nAcest program "
-"este gratuit; vezi sursa pentru condițiile de copiere.\\nNu există NICIO "
-"GARANȚIE, în măsura permisă de lege.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nAcest program este gratuit; vezi sursa pentru condițiile de copiere.\\nNu există NICIO GARANȚIE, în măsura permisă de lege.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1422,47 +1315,36 @@ msgstr "Utilizare: repo-add [opțiuni] <cale-către-bd> <pachet|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add va actualiza o bază de date de pachete prin citirea unei fișier "
-"pachet.\\nMultiple pachete pot fi specificate în linia de comandă.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add va actualiza o bază de date de pachete prin citirea unei fișier pachet.\\nMultiple pachete pot fi specificate în linia de comandă.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta       generează și adaugă delta pentru actualizare pachet\\n"
+msgstr "  -d, --delta       generează și adaugă delta pentru actualizare pachet\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"  -n, --new         adaugă doar pachetele care nu sunt deja în baza de date"
-"\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "  -n, --new         adaugă doar pachetele care nu sunt deja în baza de date\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"  -R, --remove      elimină fișierul vechi al pachetului de pe disc după "
-"actualizarea bazei de date\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "  -R, --remove      elimină fișierul vechi al pachetului de pe disc după actualizarea bazei de date\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Utilizare: repo-remove [opțiuni] <cale-către-db> <numepachet|delta> ...\\n"
+msgstr "Utilizare: repo-remove [opțiuni] <cale-către-db> <numepachet|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"rep-remove va actualiza o bază de date de pachete prin eliminarea numelui"
-"\\npachetului specificat în linia de comanda din baza de date dată a "
-"depozitului.\\nPachetele multiple de eliminat pot fi specificate în linia de "
-"comandă.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "rep-remove va actualiza o bază de date de pachete prin eliminarea numelui\\npachetului specificat în linia de comanda din baza de date dată a depozitului.\\nPachetele multiple de eliminat pot fi specificate în linia de comandă.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1478,29 +1360,21 @@ msgstr "  -s, --sign        semnează baza de date cu GnuPG după actualizare\\n
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <cheie> folosește cheia specificată pentru a semna baza de date"
-"\\n"
+msgstr "  -k, --key <cheie> folosește cheia specificată pentru a semna baza de date\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
-"  -v, --verify      verifică semnătura bazei de date înainte de actualizare"
-"\\n"
+msgstr "  -v, --verify      verifică semnătura bazei de date înainte de actualizare\\n"
 
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nVezi %s(8) pentru mai multe detalii și descrieri pentru opțiunile "
-"disponibile.\\n"
+msgstr "\\nVezi %s(8) pentru mai multe detalii și descrieri pentru opțiunile disponibile.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Exemplu: repo-add /cale/către/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
-"\\n"
+msgstr "Exemplu: repo-add /cale/către/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1508,13 +1382,10 @@ msgstr "Exemplu: repo-remove /cale/către/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2016 Echipa de dezvoltare Pacman <pacman-dev@archlinux."
-"org>.\\nAcest program este gratuit; se vor vedea sursele pentru condițiile "
-"de copiere.\\nNu există NICIO GARANȚIE, în măsura permisă de lege.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Echipa de dezvoltare Pacman <pacman-dev@archlinux.org>.\\nAcest program este gratuit; se vor vedea sursele pentru condițiile de copiere.\\nNu există NICIO GARANȚIE, în măsura permisă de lege.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1666,8 +1537,7 @@ msgstr "Numele comenzii specificate, '%s', este nevalid."
 
 #: scripts/repo-add.sh.in:734
 msgid "Cannot create temp directory for database building."
-msgstr ""
-"Nu poate fi creat directorul temporar pentru construirea bazei de date."
+msgstr "Nu poate fi creat directorul temporar pentru construirea bazei de date."
 
 #: scripts/repo-add.sh.in:812
 msgid "Creating updated database file '%s'"
@@ -1806,18 +1676,21 @@ msgstr "Eșec la preluarea %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Referință nerecunoscută: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Se creează o copie de lucru a depozitului %s %s ..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Eșec la actualizarea copiei de lucru a depozitului %s %s"
 
@@ -1849,12 +1722,14 @@ msgstr "Se extrage %s cu %s..."
 msgid "Failed to extract %s"
 msgstr "Eșec la extragerea %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Se clonează depozitul %s %s..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Eșec la descărcarea depozitului %s %s"
@@ -1863,12 +1738,14 @@ msgstr "Eșec la descărcarea depozitului %s %s"
 msgid "%s is not a clone of %s"
 msgstr "%s nu este o clonă a %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Se actulizează depozitul %s %s ..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Eșec la actualizarea depozitului %s %s"
@@ -1911,8 +1788,7 @@ msgstr "Se elimină fișierele de biblioteci statice..."
 
 #: scripts/libmakepkg/tidy/strip.sh.in:85
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr ""
-"Se elimină simbolurile de depanare din fișierele binare și biblioteci..."
+msgstr "Se elimină simbolurile de depanare din fișierele binare și biblioteci..."
 
 #: scripts/libmakepkg/tidy/upx.sh.in:35
 msgid "Compressing binaries with %s..."
diff --git a/scripts/po/ru.po b/scripts/po/ru.po
index 676f70c8..22d11deb 100644
--- a/scripts/po/ru.po
+++ b/scripts/po/ru.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # AlexanderR <alexander.r@gmx.com>, 2012
 # AlexanderR <alexander.r@gmx.com>, 2012
@@ -19,15 +19,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 03:32+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Russian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ru/)\n"
-"Language: ru\n"
+"Language-Team: Russian (http://www.transifex.com/toofishes/archlinux-pacman/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
-"%100>=11 && n%100<=14)? 2 : 3);\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: scripts/makepkg.sh.in:135
 msgid "Cleaning up..."
@@ -108,10 +105,9 @@ msgid "Generating checksums for source files..."
 msgstr "Подсчёт контрольных сумм исходных файлов..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Не удалось найти %s , необходимый для генерации контрольных сумм исходных "
-"файлов."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Не удалось найти %s , необходимый для генерации контрольных сумм исходных файлов."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -144,8 +140,7 @@ msgstr "Исходные файлы не прошли проверку цело
 
 #: scripts/makepkg.sh.in:489
 msgid "Integrity checks (%s) differ in size from the source array."
-msgstr ""
-"Количество контрольных сумм (%s) не совпадает с количеством исходных файлов."
+msgstr "Количество контрольных сумм (%s) не совпадает с количеством исходных файлов."
 
 #: scripts/makepkg.sh.in:531
 msgid "Integrity checks are missing for: %s"
@@ -359,9 +354,7 @@ msgstr "Не найдена программа '%s' для работы с за
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Не найдена программа '%s'. Для получения прав суперпользователя используется "
-"'%s'."
+msgstr "Не найдена программа '%s'. Для получения прав суперпользователя используется '%s'."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -378,8 +371,7 @@ msgstr "Не найдена программа '%s' для проверки по
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"Не найден %s, необходимый для проверки контрольных сумм исходных файлов."
+msgstr "Не найден %s, необходимый для проверки контрольных сумм исходных файлов."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
@@ -420,13 +412,12 @@ msgstr "Группа пакетов уже собрана, установка с
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Группа пакетов уже собрана. (Используйте параметр '%s' для перезаписи.)"
+msgstr "Группа пакетов уже собрана. (Используйте параметр '%s' для перезаписи.)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Часть группы пакетов уже собрана. (Используйте параметр '%s' для перезаписи.)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "Часть группы пакетов уже собрана. (Используйте параметр '%s' для перезаписи.)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -458,9 +449,7 @@ msgstr "  -d, --nodeps         Не проверять зависимости"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract      Не извлекать исходные файлы (использовать "
-"существующие в директории '%s')"
+msgstr "  -e, --noextract      Не извлекать исходные файлы (использовать существующие в директории '%s')"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -492,8 +481,7 @@ msgstr "  -o, --nobuild        Только загрузить и распако
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <файл>            Использовать указанный скрипт для сборки вместо '%s'"
+msgstr "  -p <файл>            Использовать указанный скрипт для сборки вместо '%s'"
 
 #: scripts/makepkg.sh.in:1714
 msgid ""
@@ -501,20 +489,18 @@ msgid ""
 msgstr "  -r, --rmdeps         Удалить установленные зависимости после сборки"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage      Переупаковать содержимое пакета без пересборки"
 
 #: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
-msgstr ""
-"  -s, --syncdeps       Установить недостающие зависимости с помощью '%s'"
+msgstr "  -s, --syncdeps       Установить недостающие зависимости с помощью '%s'"
 
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source         Создать архив с исходными файлами без загруженных "
-"файлов"
+msgstr "  -S, --source         Создать архив с исходными файлами без загруженных файлов"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -524,9 +510,7 @@ msgstr "  -V, --version        Показать версию и выйти"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"      --allsource      Создать архив с исходными файлами с загруженными "
-"файлами"
+msgstr "      --allsource      Создать архив с исходными файлами с загруженными файлами"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -534,8 +518,7 @@ msgstr "      --check          Выполнить функцию '%s' из '%s'"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"      --config <файл>  Использовать указанный файл с настройками вместо '%s'"
+msgstr "      --config <файл>  Использовать указанный файл с настройками вместо '%s'"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -543,7 +526,8 @@ msgstr "      --holdver        Не обновлять исходные файл
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
 msgstr "      --key <ключ>     Использовать указанный ключ для %s-подписи"
 
 #: scripts/makepkg.sh.in:1724
@@ -565,9 +549,7 @@ msgstr "      --nosign         Не создавать подпись для п
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"  --packagelist    Только вывести список пакетов которые будут созданы, без "
-"PKGEXT"
+msgstr "  --packagelist    Только вывести список пакетов которые будут созданы, без PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -594,9 +576,7 @@ msgstr "      --skippgpcheck   Не проверять PGP-подписи исх
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"      --verifysource   Загрузить исходные файлы (если необходимо) и провести "
-"проверки целостности"
+msgstr "      --verifysource   Загрузить исходные файлы (если необходимо) и провести проверки целостности"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -614,9 +594,7 @@ msgstr "      --needed         Не переустанавливать неус
 #: scripts/makepkg.sh.in:1740
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr ""
-"      --noconfirm      Не спрашивать подтверждения при разрешении "
-"зависимостей"
+msgstr "      --noconfirm      Не спрашивать подтверждения при разрешении зависимостей"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
@@ -628,10 +606,11 @@ msgstr "Если параметр '%s' не указан, то %s будет и
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
@@ -656,8 +635,7 @@ msgstr "У вас нет прав на запись для сохранения
 
 #: scripts/makepkg.sh.in:1946
 msgid "You do not have write permission to store source tarballs in %s."
-msgstr ""
-"У вас нет прав на запись для сохранения архива с исходными файлами в '%s'."
+msgstr "У вас нет прав на запись для сохранения архива с исходными файлами в '%s'."
 
 #: scripts/makepkg.sh.in:1959
 msgid "You do not have write permission to store logs in %s."
@@ -667,9 +645,7 @@ msgstr "У вас нет прав на запись для сохранения
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Запуск %s от имени суперпользователя не разрешён,\\nт. к. это может "
-"причинить катастрофический вред системе."
+msgstr "Запуск %s от имени суперпользователя не разрешён,\\nт. к. это может причинить катастрофический вред системе."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -705,9 +681,7 @@ msgstr "Сборка пакета %s"
 
 #: scripts/makepkg.sh.in:2133
 msgid "A source package has already been built. (use %s to overwrite)"
-msgstr ""
-"Пакет с исходными файлами уже собран. (Используйте параметр '%s' для "
-"перезаписи.)"
+msgstr "Пакет с исходными файлами уже собран. (Используйте параметр '%s' для перезаписи.)"
 
 #: scripts/makepkg.sh.in:2152
 msgid "Source package created: %s"
@@ -802,8 +776,7 @@ msgstr "  -p, --input <файл>        сценарий для сборки (п
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
-msgstr ""
-"  -o, --output <файл>       файл для вывода (по-умолчанию: входной файл)\n"
+msgstr "  -o, --output <файл>       файл для вывода (по-умолчанию: входной файл)\n"
 
 #: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
@@ -813,9 +786,7 @@ msgstr "  -n, --newest              обновить шаблоны\n"
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                            (по-умолчанию: использовать версию, указанную в "
-"шаблоне)\n"
+msgstr "                            (по-умолчанию: использовать версию, указанную в шаблоне)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
@@ -875,9 +846,9 @@ msgstr "      --nocolor        отключить цветные сообщен
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
@@ -895,8 +866,7 @@ msgstr "Недостаточно прав для оптимизации базы
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Обнаружен блокировочный файл pacman. Запуск невозможен, когда запущен pacman."
+msgstr "Обнаружен блокировочный файл pacman. Запуск невозможен, когда запущен pacman."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -912,9 +882,7 @@ msgstr "Обнаружен формат базы данных <4.2 -- обнов
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"символическая ссылка '%s' указывает за пределы директории pacman, необходимо "
-"исправить вручную"
+msgstr "символическая ссылка '%s' указывает за пределы директории pacman, необходимо исправить вручную"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -943,8 +911,7 @@ msgstr "  -e, --export              Экспортировать указанн
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              Вывести отпечатки выбранных или всех ключей"
+msgstr "  -f, --finger              Вывести отпечатки выбранных или всех ключей"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -976,15 +943,11 @@ msgstr "      --import              Импорт pubring.gpg из директо
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"      --import-trustdb      Импорт значений доверия владельцам из trustdb."
-"gpg в директории"
+msgstr "      --import-trustdb      Импорт значений доверия владельцам из trustdb.gpg в директории"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"      --init                Убедиться, что связка ключей правильно "
-"инициализирована"
+msgstr "      --init                Убедиться, что связка ключей правильно инициализирована"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
@@ -996,33 +959,26 @@ msgstr "      --lsign-key           Локально подписать указ
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"      --populate            Перезагрузить ключи по-умолчанию из (указанных) "
-"связок ключей\\n                            в '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "      --populate            Перезагрузить ключи по-умолчанию из (указанных) связок ключей\\n                            в '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"      --refresh-keys        Обновление указанных или всех ключей с сервера "
-"ключей"
+msgstr "      --refresh-keys        Обновление указанных или всех ключей с сервера ключей"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"      --config <файл>       Использовать указанный файл настроек вместо '%s'"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "      --config <файл>       Использовать указанный файл настроек вместо '%s'"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"      --gpgdir <каталог>    Использовать указанный каталог для GnuPG"
-"\\n                            вместо '%s'"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "      --gpgdir <каталог>    Использовать указанный каталог для GnuPG\\n                            вместо '%s'"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
@@ -1196,25 +1152,17 @@ msgstr "Использование: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize -- это небольшой костыль, позволяющий повысить "
-"быстродействие pacman\\nво время операций чтения/записи в его базе данных, "
-"основанной на файловой системе.\\n\\n"
+msgstr "pacman-optimize -- это небольшой костыль, позволяющий повысить быстродействие pacman\\nво время операций чтения/записи в его базе данных, основанной на файловой системе.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"pacman использует множество небольших файлов для отслеживания пакетов,\\nсо "
-"временем они подвержены фрагментации.\\nЭтот скрипт пытается переместить эти "
-"файлы в одну непрерывную область\\nна жёстком диске. В результате чтение "
-"должно быть быстрее,\\nтак как головкам диска нужно меньше перемещаться по "
-"поверхности диска.\\n"
+msgstr "pacman использует множество небольших файлов для отслеживания пакетов,\\nсо временем они подвержены фрагментации.\\nЭтот скрипт пытается переместить эти файлы в одну непрерывную область\\nна жёстком диске. В результате чтение должно быть быстрее,\\nтак как головкам диска нужно меньше перемещаться по поверхности диска.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1265,10 +1213,9 @@ msgid "Rotating database into place..."
 msgstr "Возвращение базы данных на место..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"Ошибка при подстановке новой базы данных. Проверьте директории '%s', '%s' и "
-"'%s'."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "Ошибка при подстановке новой базы данных. Проверьте директории '%s', '%s' и '%s'."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1282,9 +1229,7 @@ msgstr "Использование: pkgdelta [параметры] <пакет1>
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta создаёт дельта-файл с разницей между двумя пакетами.\\nДельта-файл "
-"может быть добавлен в репозиторий с помощью repo-add.\\n"
+msgstr "pkgdelta создаёт дельта-файл с разницей между двумя пакетами.\\nДельта-файл может быть добавлен в репозиторий с помощью repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1305,27 +1250,20 @@ msgstr "      --nocolor         не использовать цвет в выв
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"      --min-pkg-size    минимальный размер пакета для создания дельта-файла"
-"\\n"
+msgstr "      --min-pkg-size    минимальный размер пакета для создания дельта-файла\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"      --max-delta-size  процент от размера нового пакета, выше которого "
-"дельта не будет создана\\n"
+msgstr "      --max-delta-size  процент от размера нового пакета, выше которого дельта не будет создана\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nЭто свободное "
-"программное обеспечение; условия копирования — в исходном коде.\\nНИКАКИХ "
-"ГАРАНТИЙ в соответствии с законодательством.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nЭто свободное программное обеспечение; условия копирования — в исходном коде.\\nНИКАКИХ ГАРАНТИЙ в соответствии с законодательством.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1377,11 +1315,9 @@ msgstr "Использование: repo-add [параметры] <путь-к-
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add обновляет базу данных пакетов на основе файлов пакетов.\\nВ "
-"командной строке можно указать несколько пакетов.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add обновляет базу данных пакетов на основе файлов пакетов.\\nВ командной строке можно указать несколько пакетов.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1389,14 +1325,14 @@ msgstr "  -d, --delta       создавать дельта-файлы для п
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"  -n, --new         добавлять только пакеты, которых ещё нет в базе данных\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "  -n, --new         добавлять только пакеты, которых ещё нет в базе данных\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:66
@@ -1405,12 +1341,10 @@ msgstr "Использование: repo-remove [параметры] <путь-
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove удаляет указанный пакет из базы данных.\\nВ командной строке "
-"можно указать несколько пакетов.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove удаляет указанный пакет из базы данных.\\nВ командной строке можно указать несколько пакетов.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1422,13 +1356,11 @@ msgstr "      --nocolor     не использовать цвет в вывод
 
 #: scripts/repo-add.sh.in:80
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
-msgstr ""
-"  -s, --sign        подписать базу данных с помощью GnuPG после обновления\\n"
+msgstr "  -s, --sign        подписать базу данных с помощью GnuPG после обновления\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <ключ>  использовать указанный ключ для подписи базы данных\\n"
+msgstr "  -k, --key <ключ>  использовать указанный ключ для подписи базы данных\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
@@ -1437,15 +1369,12 @@ msgstr "  -v, --verify      проверить подпись базы данн
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nСмотрите %s(8) для более подробной информации и описания доступных "
-"параметров.\\n"
+msgstr "\\nСмотрите %s(8) для более подробной информации и описания доступных параметров.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Пример:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Пример:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1453,9 +1382,9 @@ msgstr "Пример:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:146
@@ -1747,18 +1676,21 @@ msgstr "Ошибка при получении '%s'"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Ссылка не распознана: '%s'"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Создание рабочей копии репозитория '%s' (%s)..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Ошибка при обновлении рабочей копии репозитория '%s' (%s)"
 
@@ -1790,12 +1722,14 @@ msgstr "Распаковка '%s' с помощью %s"
 msgid "Failed to extract %s"
 msgstr "Ошибка при распаковке '%s'"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Клонирование репозитория '%s' (%s)..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Ошибка при загрузке репозитория '%s' (%s)"
@@ -1804,12 +1738,14 @@ msgstr "Ошибка при загрузке репозитория '%s' (%s)"
 msgid "%s is not a clone of %s"
 msgstr "'%s' не является клоном '%s'"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Обновление репозитория '%s' (%s)..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Ошибка при обновлении репозитория '%s' (%s)"
diff --git a/scripts/po/sk.po b/scripts/po/sk.po
index 2d2a8100..a337757e 100644
--- a/scripts/po/sk.po
+++ b/scripts/po/sk.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # archetyp <archetyp@linuxmail.org>, 2013
 # archetyp <archetyp@linuxmail.org>, 2013-2015
@@ -14,12 +14,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 03:32+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Slovak (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/sk/)\n"
-"Language: sk\n"
+"Language-Team: Slovak (http://www.transifex.com/toofishes/archlinux-pacman/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: scripts/makepkg.sh.in:135
@@ -101,10 +100,9 @@ msgid "Generating checksums for source files..."
 msgstr "Generujem kontrolné súčty zdrojových súborov..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Nemôžno nájsť binárne súbory %s potrebné k vytvoreniu kontrolných súčtov "
-"zdrojových súborov."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Nemôžno nájsť binárne súbory %s potrebné k vytvoreniu kontrolných súčtov zdrojových súborov."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -339,14 +337,11 @@ msgstr "Neznámy protokol pre sťahovanie: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Nepodarilo sa nájsť %s súbor potrebný pre overenie požiadaviek VCS zdroja."
+msgstr "Nepodarilo sa nájsť %s súbor potrebný pre overenie požiadaviek VCS zdroja."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
-msgstr ""
-"Nepodarilo sa nájsť balíček %s potrebný pre spracovanie %s zdrojových "
-"súborov."
+msgstr "Nepodarilo sa nájsť balíček %s potrebný pre spracovanie %s zdrojových súborov."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
@@ -354,8 +349,7 @@ msgstr "Nepodarilo sa nájsť súbor %s potrebný pre operácie so závislosťam
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Nepodarilo sa nájsť súbor %s. Na získanie rootovských práv bude použitý %s."
+msgstr "Nepodarilo sa nájsť súbor %s. Na získanie rootovských práv bude použitý %s."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -372,14 +366,11 @@ msgstr "Nepodarilo sa nájsť súbor %s potrebný pre overenie zdrojových súbo
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"Nepodarilo sa nájsť súbor %s potrebný pre overenie kontrolných súčtov "
-"zdrojových súborov."
+msgstr "Nepodarilo sa nájsť súbor %s potrebný pre overenie kontrolných súčtov zdrojových súborov."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"Nepodarilo sa nájsť súbor %s potrebný pre komprimovanie binárnych súborov."
+msgstr "Nepodarilo sa nájsť súbor %s potrebný pre komprimovanie binárnych súborov."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
@@ -391,20 +382,15 @@ msgstr "Nepodarilo sa nájsť súbor %s potrebný pre distribuovanú kompiláciu
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Nepodarilo sa nájsť súbor %s  potrebný pre použitie vyrovnávacej pamäte "
-"kompilátora."
+msgstr "Nepodarilo sa nájsť súbor %s  potrebný pre použitie vyrovnávacej pamäte kompilátora."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"Nepodarilo sa nájsť binárny %s potrebný na odstraňovanie objektov súboru."
+msgstr "Nepodarilo sa nájsť binárny %s potrebný na odstraňovanie objektov súboru."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Nepodarilo sa nájsť binárny %s  potrebný pre kompresiu manuálových a info "
-"stránok."
+msgstr "Nepodarilo sa nájsť binárny %s  potrebný pre kompresiu manuálových a info stránok."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -424,7 +410,8 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "Skupina balíčkov už bola vytvorená. (použite %s pre prepísanie)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "Časť balíčkov zo skupiny  je už vytvorená. (použite %s pre prepísanie)"
 
 #: scripts/makepkg.sh.in:1696
@@ -457,8 +444,7 @@ msgstr "  -d, --nodeps     Preskoč všetky kontroly závislostí"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  Nerozbaľuj zdrojové súbory (použi existujúci %s adresár)"
+msgstr "  -e, --noextract  Nerozbaľuj zdrojové súbory (použi existujúci %s adresár)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -495,11 +481,11 @@ msgstr "  -p <file>        Použi alternatívny build skript (miesto '%s')"
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Po úspešnom zostavení odstráň nainštalované závislosti"
+msgstr "  -r, --rmdeps     Po úspešnom zostavení odstráň nainštalované závislosti"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  Znovu zabaľ obsah balíčka bez zostavenia"
 
 #: scripts/makepkg.sh.in:1716
@@ -509,8 +495,7 @@ msgstr "  -s, --syncdeps   Inštaluj chýbajúce závislosti s %s"
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source     Vytvor čisto zdrojový archív bez stiahnutých zdrojov"
+msgstr "  -S, --source     Vytvor čisto zdrojový archív bez stiahnutých zdrojov"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -536,7 +521,8 @@ msgstr "  --holdver        Neaktualizuj VCS zdroje"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
 msgstr "  --key <key>      Zadaj kľúč na podpísanie %s namiesto predvoleného"
 
 #: scripts/makepkg.sh.in:1724
@@ -558,8 +544,7 @@ msgstr "  --nosign         Nevytváraj podpis pre balíček"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"  --packagelist    Zobraz iba balíčky, ktoré by boli vytvorené, bez PKGEXT"
+msgstr "  --packagelist    Zobraz iba balíčky, ktoré by boli vytvorené, bez PKGEXT"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -576,8 +561,7 @@ msgstr "  --skipchecksums  Neoveruj kontrolné súčty zdrojových súborov"
 #: scripts/makepkg.sh.in:1732
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
-msgstr ""
-"  --skipinteg      Nevykonaj žiadne overovacie testy na zdrojových súboroch"
+msgstr "  --skipinteg      Nevykonaj žiadne overovacie testy na zdrojových súboroch"
 
 #: scripts/makepkg.sh.in:1733
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
@@ -587,8 +571,7 @@ msgstr "  --skippgpcheck   Neoveruj zdrojové súbory s PGP podpismi"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource   Stiahni zdrojové súbory (ak potrebné) and over integritu"
+msgstr "  --verifysource   Stiahni zdrojové súbory (ak potrebné) and over integritu"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -618,10 +601,11 @@ msgstr "Ak nie je zadané %s, %s bude hľadať '%s'"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
@@ -656,9 +640,7 @@ msgstr "Nemáte právo na zápis log súborov do %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Spustiť %s ako root nie je povolené, nakoľko by mohlo prísť k trvalému,"
-"\\nkatastrofálnemu poškodeniu Vášho systému."
+msgstr "Spustiť %s ako root nie je povolené, nakoľko by mohlo prísť k trvalému,\\nkatastrofálnemu poškodeniu Vášho systému."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -785,13 +767,11 @@ msgstr "Voľby:\n"
 #: scripts/makepkg-template.pl.in:178
 #, perl-format
 msgid "  --input, -p <file>    Build script to read (default: %s)\n"
-msgstr ""
-"  --input, -p <file>    Zostavovací skript na čítanie (prednastavené: %s)\n"
+msgstr "  --input, -p <file>    Zostavovací skript na čítanie (prednastavené: %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
-msgstr ""
-"  --output, -o <file>   výstupný súbor (prednastavené: súbor so vstupom)\n"
+msgstr "  --output, -o <file>   výstupný súbor (prednastavené: súbor so vstupom)\n"
 
 #: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
@@ -801,9 +781,7 @@ msgstr "  --newest, -n          aktualizovať šablóny na najnovšiu verziu\n"
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                        (prednastavené: použiť verziu uvedenú v značkách "
-"šablóny)\n"
+msgstr "                        (prednastavené: použiť verziu uvedenú v značkách šablóny)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
@@ -863,9 +841,9 @@ msgstr "  --nocolor            vypnúť farebný výstup správ"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
@@ -899,8 +877,7 @@ msgstr "Zistený formát databáze pred verziou 4.2 - aktualizujem..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"symlink '%s' ukazuje mimo koreňový adresár pacmana, manuálna oprava je nutná"
+msgstr "symlink '%s' ukazuje mimo koreňový adresár pacmana, manuálna oprava je nutná"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -916,9 +893,7 @@ msgstr "Operácie:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add                 Pridaj uvedené kľúče (prázdne pre štandardný "
-"vstup)"
+msgstr "  -a, --add                 Pridaj uvedené kľúče (prázdne pre štandardný vstup)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
@@ -931,8 +906,7 @@ msgstr "  -e, --export              Exportuj zadané alebo všetky kľúče"
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              Zobraz odtlačky pre zadané alebo všetky kľúče"
+msgstr "  -f, --finger              Zobraz odtlačky pre zadané alebo všetky kľúče"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -944,9 +918,7 @@ msgstr "  -r, --recv-keys           Stiahni zadané kľúče"
 
 #: scripts/pacman-key.sh.in:69
 msgid "  -u, --updatedb            Update the trustdb of pacman"
-msgstr ""
-"  -u, --updatedb            Aktualizuj databázu dôveryhodnosti (trustdb) "
-"pacmana."
+msgstr "  -u, --updatedb            Aktualizuj databázu dôveryhodnosti (trustdb) pacmana."
 
 #: scripts/pacman-key.sh.in:70
 msgid ""
@@ -966,14 +938,11 @@ msgstr "  --import                  Importuj pubring.gpg z adresárov"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          Importuj dôveryhodných vlastníkov z trustdb.gpg "
-"v zadaných adresároch"
+msgstr "  --import-trustdb          Importuj dôveryhodných vlastníkov z trustdb.gpg v zadaných adresároch"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                    Uisti sa, že kľúčenka je správne inicializovaná"
+msgstr "  --init                    Uisti sa, že kľúčenka je správne inicializovaná"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
@@ -985,39 +954,30 @@ msgstr "  --lsign-key               Lokálne podpíš uvedený kľúč"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                Znovu načítaj predvolené kľúče zo zadaných "
-"kľúčeniek\\n                            v '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                Znovu načítaj predvolené kľúče zo zadaných kľúčeniek\\n                            v '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            Aktualizuj zadané alebo všetky kľúče zo servera "
-"s kľúčmi"
+msgstr "  --refresh-keys            Aktualizuj zadané alebo všetky kľúče zo servera s kľúčmi"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <file>           Použi alternatívny konfiguračný súbor (namiesto"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <file>           Použi alternatívny konfiguračný súbor (namiesto\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            Nastav alternatívne adresár pre GnuPG (namiesto"
-"\\n                            '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            Nastav alternatívne adresár pre GnuPG (namiesto\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <server-url>  Použi zadaný server s kľúčmi v prípade potreby"
+msgstr "  --keyserver <server-url>  Použi zadaný server s kľúčmi v prípade potreby"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1187,24 +1147,17 @@ msgstr "Použitie: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize je malý hack, ktorý pomáha zlepšiť výkon pacmana\\npri "
-"čítaní a zápise do databázy na báze súborového systému.\\n\\n"
+msgstr "pacman-optimize je malý hack, ktorý pomáha zlepšiť výkon pacmana\\npri čítaní a zápise do databázy na báze súborového systému.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Pretože pacman používa mnoho malých súborov pre uchovávanie informácii\\no "
-"balíčkoch, má tendenciu v priebehu času tieto súbory fragmentovať.\\nTento "
-"skript sa pokúša premiestniť tieto malé súbory do jednej súvislej\\noblasti "
-"na disku. Vo výsledku by mal disk byť schopný čítať tieto súbory"
-"\\nrýchlejšie, pretože hlavičky disku sa nemusia tak často presúvať.\\n"
+msgstr "Pretože pacman používa mnoho malých súborov pre uchovávanie informácii\\no balíčkoch, má tendenciu v priebehu času tieto súbory fragmentovať.\\nTento skript sa pokúša premiestniť tieto malé súbory do jednej súvislej\\noblasti na disku. Vo výsledku by mal disk byť schopný čítať tieto súbory\\nrýchlejšie, pretože hlavičky disku sa nemusia tak často presúvať.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1255,7 +1208,8 @@ msgid "Rotating database into place..."
 msgstr "Vymieňajú sa databáze..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr "Zlyhalo nahradenie novou databázou. Overte adresáre %s, %s a %s."
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1270,9 +1224,7 @@ msgstr "Použitie: pkgdelta [voľby] <balíček1> <balíček2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta vytvorí delta súbor rozdielu medzi dvoma balíčkami.\\nTento delta "
-"súbor môže potom byť pridaný do databáze pomocou repo-add.\\n"
+msgstr "pkgdelta vytvorí delta súbor rozdielu medzi dvoma balíčkami.\\nTento delta súbor môže potom byť pridaný do databáze pomocou repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1293,27 +1245,20 @@ msgstr "  --nocolor         odstráni kolorizáciu z výstupu\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size    minimálna veľkosť balíčka predtým ako bude vytvorená "
-"delta\\n"
+msgstr "  --min-pkg-size    minimálna veľkosť balíčka predtým ako bude vytvorená delta\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  percentuálna veľkosť balíčka nad ktorú budú delty "
-"zamietnuté\\n"
+msgstr "  --max-delta-size  percentuálna veľkosť balíčka nad ktorú budú delty zamietnuté\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nToto je "
-"slobodný software; podmienky kopírovania nájdete v zdrojových súboroch\\nNa "
-"software sa nevzťahuje ŽIADNA ZÁRUKA. v rozsahu povoleného zákonom.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nToto je slobodný software; podmienky kopírovania nájdete v zdrojových súboroch\\nNa software sa nevzťahuje ŽIADNA ZÁRUKA. v rozsahu povoleného zákonom.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1365,45 +1310,36 @@ msgstr "Použitie: repo-add [voľby] <cesta-k-db> <balíčkek|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add aktualizuje databázu balíčkov pomocou čítania súboru balíčka.\\nNa "
-"príkazovom riadku môže byť uvedených viac balíčkov pre pridanie.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add aktualizuje databázu balíčkov pomocou čítania súboru balíčka.\\nNa príkazovom riadku môže byť uvedených viac balíčkov pre pridanie.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
-msgstr ""
-"  -d, --delta       vygeneruj a pridaj deltu pre aktualizáciu balíčka\\n"
+msgstr "  -d, --delta       vygeneruj a pridaj deltu pre aktualizáciu balíčka\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
-msgstr ""
-"  -n, --new         pridaj len tie balíčky, ktoré ešte nie sú v databáze\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
+msgstr "  -n, --new         pridaj len tie balíčky, ktoré ešte nie sú v databáze\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"  -R, --remove      odstráň staré balíčky z disku po aktualizácii databázy\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "  -R, --remove      odstráň staré balíčky z disku po aktualizácii databázy\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Použitie: repo-remove [voľby] &lt;cesta-k-db&gt; &lt;menobalíčka|"
-"delta&gt; ...\\n"
+msgstr "Použitie: repo-remove [voľby] &lt;cesta-k-db&gt; &lt;menobalíčka|delta&gt; ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove aktualizuje databázu balíčkov odstránením balíčka podľa mena"
-"\\nuvedeného na príkazovom riadku z danej databázy. Na príkazovom riadku "
-"môže byť\\nuvedených viacero balíčkov na odstránenie.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove aktualizuje databázu balíčkov odstránením balíčka podľa mena\\nuvedeného na príkazovom riadku z danej databázy. Na príkazovom riadku môže byť\\nuvedených viacero balíčkov na odstránenie.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1433,8 +1369,7 @@ msgstr "\\nPozri %s(8) pre podrobnosti a popis dostupných volieb.\\n"
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Príklad:  repo-add /cesta/k/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Príklad:  repo-add /cesta/k/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1442,9 +1377,9 @@ msgstr "Príklad:  repo-remove /cesta/d/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:146
@@ -1736,18 +1671,21 @@ msgstr "Chyba počas sťahovania %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Nerozpoznaný odkaz: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Vytváram pracovnú kópiu %s %s repozitára..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Chyba pri aktualizovaní pracovnej kópie %s repozitára %s"
 
@@ -1779,12 +1717,14 @@ msgstr "Rozbaľujem %s pomocou %s"
 msgid "Failed to extract %s"
 msgstr "Chyba pri rozbaľovaní %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Vytváram klon %s %s repozitára..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Chyba počas sťahovania %s %s repozitára"
@@ -1793,20 +1733,21 @@ msgstr "Chyba počas sťahovania %s %s repozitára"
 msgid "%s is not a clone of %s"
 msgstr "%s nie je klonom %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Aktualizujem %s %s repozitár..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Chyba počas aktualizácie %s %s repozitára"
 
 #: scripts/libmakepkg/source/local.sh.in:39
 msgid "%s was not found in the build directory and is not a URL."
-msgstr ""
-"%s nebol nájdený v adresári, kde sa robí zostavovanie, a nie je ani URL"
+msgstr "%s nebol nájdený v adresári, kde sa robí zostavovanie, a nie je ani URL"
 
 #: scripts/libmakepkg/tidy.sh.in:41
 msgid "Tidying install..."
@@ -1842,8 +1783,7 @@ msgstr "Odstraňujem súbory statických knižníc..."
 
 #: scripts/libmakepkg/tidy/strip.sh.in:85
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr ""
-"Odstraňujem nepotrebné ladiace informácie z binárnych súborov a knižníc..."
+msgstr "Odstraňujem nepotrebné ladiace informácie z binárnych súborov a knižníc..."
 
 #: scripts/libmakepkg/tidy/upx.sh.in:35
 msgid "Compressing binaries with %s..."
diff --git a/scripts/po/sl.po b/scripts/po/sl.po
index 3b9244ea..5ab430f1 100644
--- a/scripts/po/sl.po
+++ b/scripts/po/sl.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Abomination1 <drozic1989@gmail.com>, 2015
 # ansich <mojmejlzaforume@gmail.com>, 2014
@@ -19,14 +19,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 03:32+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Slovenian (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/sl/)\n"
-"Language: sl\n"
+"Language-Team: Slovenian (http://www.transifex.com/toofishes/archlinux-pacman/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
 #: scripts/makepkg.sh.in:135
 msgid "Cleaning up..."
@@ -107,15 +105,13 @@ msgid "Generating checksums for source files..."
 msgstr "Ustvarjanje kontrolnih vsot izvornih datotek..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Binarne datoteke %s, za izračun kontrolne vsote izvorne datoteke, ni bilo "
-"mogoče najti."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Binarne datoteke %s, za izračun kontrolne vsote izvorne datoteke, ni bilo mogoče najti."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
-msgstr ""
-"Algoritem, ki je bil podan za preverjanje integritete '%s' , je neveljaven."
+msgstr "Algoritem, ki je bil podan za preverjanje integritete '%s' , je neveljaven."
 
 #: scripts/makepkg.sh.in:440
 msgid "Skipped"
@@ -326,8 +322,7 @@ msgstr "Ustvarjanje izvorne paketne datoteke spodletelo."
 
 #: scripts/makepkg.sh.in:1389
 msgid "Failed to create symlink to source package file."
-msgstr ""
-"Simbolne povezave do izvorne paketne datoteke ni bilo mogoče ustvariti."
+msgstr "Simbolne povezave do izvorne paketne datoteke ni bilo mogoče ustvariti."
 
 #: scripts/makepkg.sh.in:1401
 msgid "Installing package %s with %s..."
@@ -359,8 +354,7 @@ msgstr "Ne najdem %s binarno datoteko potrebne za odvisnosti operacij."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Ne najdem %s binarno datoteko. Bo uporabil %s za pridobiti root pravic."
+msgstr "Ne najdem %s binarno datoteko. Bo uporabil %s za pridobiti root pravic."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -368,14 +362,11 @@ msgstr "Ne najdem %s binarno datoteko."
 
 #: scripts/makepkg.sh.in:1531
 msgid "Cannot find the %s binary required for signing packages."
-msgstr ""
-"Ni možno najti %s binarne datoteke, ki je potrebna za podpisovanje paketov."
+msgstr "Ni možno najti %s binarne datoteke, ki je potrebna za podpisovanje paketov."
 
 #: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
-"Ni možno najti %s binarne datoteke, ki je potrebna za preverjanje datotek "
-"izvorne kode."
+msgstr "Ni možno najti %s binarne datoteke, ki je potrebna za preverjanje datotek izvorne kode."
 
 #: scripts/makepkg.sh.in:1547
 msgid ""
@@ -384,9 +375,7 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"Ni možno najti %s binarne datoteke, ki je potrebna za stiskanje binarnih "
-"datotek."
+msgstr "Ni možno najti %s binarne datoteke, ki je potrebna za stiskanje binarnih datotek."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
@@ -394,27 +383,19 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"Ni možno najti %s binarne datoteke, ki je potrebna za distribuirano "
-"prevajanje."
+msgstr "Ni možno najti %s binarne datoteke, ki je potrebna za distribuirano prevajanje."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Ni možno najti %s binarne datoteke, ki je potrebna za uporabo predpomnilnika "
-"prevajalnika."
+msgstr "Ni možno najti %s binarne datoteke, ki je potrebna za uporabo predpomnilnika prevajalnika."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"Ni možno najti %s binarne datoteke, ki je potrebna za okrnitev predmetne "
-"datoteke."
+msgstr "Ni možno najti %s binarne datoteke, ki je potrebna za okrnitev predmetne datoteke."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Ni možno najti %s binarne datoteke, ki je potrebna za stiskanje strani "
-"navodil (man in info)."
+msgstr "Ni možno najti %s binarne datoteke, ki je potrebna za stiskanje strani navodil (man in info)."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -427,15 +408,15 @@ msgstr "Paket je že bil izgrajen. (uporabite %s za prepis)"
 #: scripts/makepkg.sh.in:1638
 msgid ""
 "The package group has already been built, installing existing packages..."
-msgstr ""
-"Ta paketna skupina je že bila izgrajena, nameščajo se obstoječi paketi ..."
+msgstr "Ta paketna skupina je že bila izgrajena, nameščajo se obstoječi paketi ..."
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "Ta paketna skupina je že bila nameščena. (uporabite %s za prepis)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "Del paketne skupine je že bil izgrajen. (uporabite %s za prepis)"
 
 #: scripts/makepkg.sh.in:1696
@@ -468,8 +449,7 @@ msgstr "-d, --nodeps Prezri vsa preverjanja odvisnosti"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"-e, --noextract Ne razširi datotek izvorne kode (uporabi obstoječo mapo %s)"
+msgstr "-e, --noextract Ne razširi datotek izvorne kode (uporabi obstoječo mapo %s)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -477,8 +457,7 @@ msgstr "-f, --force Prepiši obstoječi paket"
 
 #: scripts/makepkg.sh.in:1707
 msgid "  -g, --geninteg   Generate integrity checks for source files"
-msgstr ""
-"-g, --geninteg Ustvari preverjanja celovitosti za datoteke izvorne kode"
+msgstr "-g, --geninteg Ustvari preverjanja celovitosti za datoteke izvorne kode"
 
 #: scripts/makepkg.sh.in:1708
 msgid "  -h, --help       Show this help message and exit"
@@ -510,9 +489,9 @@ msgid ""
 msgstr "-r, --rmdeps Po uspešni izgradnji odstrani nameščene odvisnosti"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
-msgstr ""
-"-R, --repackage Ponovno pakiraj vsebino paketa, a brez ponovne izgradnje"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
+msgstr "-R, --repackage Ponovno pakiraj vsebino paketa, a brez ponovne izgradnje"
 
 #: scripts/makepkg.sh.in:1716
 msgid "  -s, --syncdeps   Install missing dependencies with %s"
@@ -521,9 +500,7 @@ msgstr "-s, --syncdeps Namesti manjkajoče odvisnosti z %s"
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"-S, --source Ustvari arhivsko datoteko zgolj izvorne kode, brez prenešenih "
-"virov"
+msgstr "-S, --source Ustvari arhivsko datoteko zgolj izvorne kode, brez prenešenih virov"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -533,9 +510,7 @@ msgstr "-V, --version Pokaži različico programa in izstopi"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"--allsource Ustvari arhivsko datoteko zgolj izvorne kode, vključno s "
-"prenešenimi viri"
+msgstr "--allsource Ustvari arhivsko datoteko zgolj izvorne kode, vključno s prenešenimi viri"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -543,8 +518,7 @@ msgstr "--check Izvedi funkcijo %s v %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"--config <datoteka> Uporabi alternativno nastavitveno datoteko (namesto '%s')"
+msgstr "--config <datoteka> Uporabi alternativno nastavitveno datoteko (namesto '%s')"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -552,10 +526,9 @@ msgstr "--holdver Ne posodobi VCS virov"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"--key <ključ> Navedite ključ, ki naj bo, namesto privzetega ključa, "
-"uporabljen za %s podpisovanje"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "--key <ključ> Navedite ključ, ki naj bo, namesto privzetega ključa, uporabljen za %s podpisovanje"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -603,9 +576,7 @@ msgstr "--skippgpcheck  Ne preverjaj izvornih datotek z PGP podpisi"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"--verifysource  Prenesi izvorne datoteke (če je potrebno) in opravi pregled "
-"celovitosti"
+msgstr "--verifysource  Prenesi izvorne datoteke (če je potrebno) in opravi pregled celovitosti"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -635,10 +606,11 @@ msgstr "Če %s ni podan, bo %s iskal '%s'"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
@@ -651,38 +623,29 @@ msgstr "%s ni bil najden."
 
 #: scripts/makepkg.sh.in:1909 scripts/makepkg.sh.in:1916
 msgid "You do not have write permission to create packages in %s."
-msgstr ""
-"Nimate ustreznega dovoljenja za pisanje, da bi lahko ustvarjali pakete v %s"
+msgstr "Nimate ustreznega dovoljenja za pisanje, da bi lahko ustvarjali pakete v %s"
 
 #: scripts/makepkg.sh.in:1929
 msgid "You do not have write permission to store packages in %s."
-msgstr ""
-"Nimate ustreznega dovoljenja za pisanje, da bi lahko shranjevali pakete v %s."
+msgstr "Nimate ustreznega dovoljenja za pisanje, da bi lahko shranjevali pakete v %s."
 
 #: scripts/makepkg.sh.in:1937
 msgid "You do not have write permission to store downloads in %s."
-msgstr ""
-"Nimate ustreznega dovoljenja za pisanje, da bi lahko prenose shranjali v %s."
+msgstr "Nimate ustreznega dovoljenja za pisanje, da bi lahko prenose shranjali v %s."
 
 #: scripts/makepkg.sh.in:1946
 msgid "You do not have write permission to store source tarballs in %s."
-msgstr ""
-"Nimate ustreznega dovoljenja za pisanje, da bi lahko shranjevali izvorne "
-"pakete v %s."
+msgstr "Nimate ustreznega dovoljenja za pisanje, da bi lahko shranjevali izvorne pakete v %s."
 
 #: scripts/makepkg.sh.in:1959
 msgid "You do not have write permission to store logs in %s."
-msgstr ""
-"Nimate ustreznega dovoljenja za pisanje, da bi lahko shranjevali dnevnik v "
-"%s."
+msgstr "Nimate ustreznega dovoljenja za pisanje, da bi lahko shranjevali dnevnik v %s."
 
 #: scripts/makepkg.sh.in:1972
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Začeti %s kot root ni dovoljeno, saj lahko povzroči trajne,\\nkatastrofalne "
-"poškodbe vašemu sistem."
+msgstr "Začeti %s kot root ni dovoljeno, saj lahko povzroči trajne,\\nkatastrofalne poškodbe vašemu sistem."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -883,9 +846,9 @@ msgstr "--nocolor onemogoči barvna izhodna sporočila"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
@@ -903,15 +866,11 @@ msgstr "Za nadgraditev podatkovne baze morate imeti ustrezna dovoljenja."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Najdena je bila zaklenitvena datoteka pacman. Ni možno izvesti, medtem ko se "
-"pacman izvaja."
+msgstr "Najdena je bila zaklenitvena datoteka pacman. Ni možno izvesti, medtem ko se pacman izvaja."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
-msgstr ""
-"Zaznan je bil format podatkovne baze, ki predhaja različici 3.5 - "
-"nadgrajevanje ..."
+msgstr "Zaznan je bil format podatkovne baze, ki predhaja različici 3.5 - nadgrajevanje ..."
 
 #: scripts/pacman-db-upgrade.sh.in:169
 msgid "Done."
@@ -1000,8 +959,8 @@ msgstr ""
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:79
@@ -1011,14 +970,14 @@ msgstr ""
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
 msgstr ""
 
 #: scripts/pacman-key.sh.in:86
@@ -1197,19 +1156,13 @@ msgstr ""
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Ker pacman uporablja številne majhne datoteke za spremljanje paketov,"
-"\\nobstaja možnost da te datoteke sčasoma postanejo razdrobljene.\\nTa "
-"scenarij poskuša preseliti te majhne datoteke v eno\\nneprekinjeno lokacijo "
-"na trdem disku.Posledica tega je da bi ta trdi\\ndisk moral prebrati jih "
-"hitreje, ker se glavi trdega disk\\nni treba premakniti okoli diska toliko."
-"\\n"
+msgstr "Ker pacman uporablja številne majhne datoteke za spremljanje paketov,\\nobstaja možnost da te datoteke sčasoma postanejo razdrobljene.\\nTa scenarij poskuša preseliti te majhne datoteke v eno\\nneprekinjeno lokacijo na trdem disku.Posledica tega je da bi ta trdi\\ndisk moral prebrati jih hitreje, ker se glavi trdega disk\\nni treba premakniti okoli diska toliko.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1253,17 +1206,16 @@ msgstr "Preverjanje celovitosti..."
 
 #: scripts/pacman-optimize.sh.in:162
 msgid "Integrity check FAILED, reverting to old database."
-msgstr ""
-"Preverjanje integritete je spodletelo, prejemanje stare podatkovne baze."
+msgstr "Preverjanje integritete je spodletelo, prejemanje stare podatkovne baze."
 
 #: scripts/pacman-optimize.sh.in:166
 msgid "Rotating database into place..."
 msgstr "Vrtenje podatkovno baze v mesto..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"Nova zamenjava podatkovne baze ni uspela. Preverite za %s, %s in %s mape."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "Nova zamenjava podatkovne baze ni uspela. Preverite za %s, %s in %s mape."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1277,9 +1229,7 @@ msgstr ""
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta bo ustvaril datoteko delta med dvema paketi.\\nTa delta datoteke se "
-"lahko nato doda v bazo podatkov s pomočjo repo-add.\\n"
+msgstr "pkgdelta bo ustvaril datoteko delta med dvema paketi.\\nTa delta datoteke se lahko nato doda v bazo podatkov s pomočjo repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1306,18 +1256,14 @@ msgstr "--min-pkg-size minimalna velikost paketa, preden se ustvari delte\\n"
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"--max-delta-size odstotkov novega paketa, nad katero se bo delta zavrgla\\n"
+msgstr "--max-delta-size odstotkov novega paketa, nad katero se bo delta zavrgla\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Avtorske pravice (c) 2009Xavier Chantry <shiningxc@gmail.com>.\\n\\nTo je "
-"brezplačna programska oprema; glej vir za pogoje kopiranja.\\nBREZ JAMSTVA, "
-"v obsegu ki ga dovoljuje zakon.\\n"
+msgstr "Avtorske pravice (c) 2009Xavier Chantry <shiningxc@gmail.com>.\\n\\nTo je brezplačna programska oprema; glej vir za pogoje kopiranja.\\nBREZ JAMSTVA, v obsegu ki ga dovoljuje zakon.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1369,11 +1315,9 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add bo posodobil paketno podatkovno bazo z branjem paketne datoteke."
-"\\nVeč paketov za dodajanje lahko podate v ukazni vrstici.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add bo posodobil paketno podatkovno bazo z branjem paketne datoteke.\\nVeč paketov za dodajanje lahko podate v ukazni vrstici.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1381,13 +1325,14 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:66
@@ -1396,13 +1341,10 @@ msgstr ""
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove bo posodobil paketno podatkovno bazo z odstranitvijo ime paketa "
-"\\ndoločeno v ukazni vrstici od danega repo baze podatkov. Več\\npaketov se "
-"lahko določi za odstranitev v ukazni vrstici.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove bo posodobil paketno podatkovno bazo z odstranitvijo ime paketa \\ndoločeno v ukazni vrstici od danega repo baze podatkov. Več\\npaketov se lahko določi za odstranitev v ukazni vrstici.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1418,8 +1360,7 @@ msgstr "-s, --sign Podpiši podatkovno bazo z GnuPG po posodobitvi\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"-k --key <ključ> uporabi določen ključ za podpisovanje baze podatkov\\n"
+msgstr "-k --key <ključ> uporabi določen ključ za podpisovanje baze podatkov\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
@@ -1433,8 +1374,7 @@ msgstr "\\nGlej %s(8) za več podrobnosti in opise razpoložljivih možnosti.\\n
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Primer: repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Primer: repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1442,9 +1382,9 @@ msgstr "Primer: repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:146
@@ -1736,18 +1676,21 @@ msgstr "Med prenosom %s, je prišlo do napake"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Neprepoznan sklic: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Ustvarjanje delovne kopije od %s %s repo..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Napaka med posodabljanjem delovne kopije od %s %s repo"
 
@@ -1779,12 +1722,14 @@ msgstr "Izvažanje %s s/z %s"
 msgid "Failed to extract %s"
 msgstr "Izvažanje %s, je spodletelo"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Cloning %s %s repo..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Napaka pri prenosu %s %s repo"
@@ -1793,12 +1738,14 @@ msgstr "Napaka pri prenosu %s %s repo"
 msgid "%s is not a clone of %s"
 msgstr "%s ni clone od %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Posodabljanje %s %s repo..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Napaka pri posodabljanju %s %s repo..."
diff --git a/scripts/po/sr.po b/scripts/po/sr.po
index 65316151..a37b288a 100644
--- a/scripts/po/sr.po
+++ b/scripts/po/sr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Mladen Pejaković <pejakm@autistici.org>, 2013
 # Mladen Pejaković <pejakm@autistici.org>, 2013
@@ -14,14 +14,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 12:09+0000\n"
 "Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/sr/)\n"
-"Language: sr\n"
+"Language-Team: Serbian (http://www.transifex.com/toofishes/archlinux-pacman/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: scripts/makepkg.sh.in:135
 msgid "Cleaning up..."
@@ -102,10 +100,9 @@ msgid "Generating checksums for source files..."
 msgstr "Стварам суму за проверу изворних фајлова... "
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Не могу да нађем извршни фајл %s неопходан за стварање сума за проверу "
-"изворних фајлова."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Не могу да нађем извршни фајл %s неопходан за стварање сума за проверу изворних фајлова."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -138,8 +135,7 @@ msgstr "Један или више фајлова нису прошли пров
 
 #: scripts/makepkg.sh.in:489
 msgid "Integrity checks (%s) differ in size from the source array."
-msgstr ""
-"Провере интегритета (%s) се разликују величином у односу на одељак извора."
+msgstr "Провере интегритета (%s) се разликују величином у односу на одељак извора."
 
 #: scripts/makepkg.sh.in:531
 msgid "Integrity checks are missing for: %s"
@@ -341,8 +337,7 @@ msgstr "Непознат протокол за преузимање: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Не могу да нађем бинарни фајл %s неопходан за проверу зависности ВЦС извора."
+msgstr "Не могу да нађем бинарни фајл %s неопходан за проверу зависности ВЦС извора."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
@@ -350,14 +345,11 @@ msgstr "Не могу да нађем бинарни фајл %s неопход
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
-msgstr ""
-"Не могу да нађем бинарни фајл %s неопходан за операције са зависностима."
+msgstr "Не могу да нађем бинарни фајл %s неопходан за операције са зависностима."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Не могу да нађем бинарни фајл %s, за добијање корених привилегија биће "
-"употребљен %s."
+msgstr "Не могу да нађем бинарни фајл %s, за добијање корених привилегија биће употребљен %s."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -378,8 +370,7 @@ msgstr "Не могу да нађем бинар %s, неопходан за п
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"Не могу да нађем извршни фајл %s неопходан за компресовање бинарних фајлова."
+msgstr "Не могу да нађем извршни фајл %s неопходан за компресовање бинарних фајлова."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
@@ -387,8 +378,7 @@ msgstr "Не могу да нађем бинар %s, неопходан за о
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"Не могу да нађем извршни фајл %s неопходан за дистрибуирано компилирање."
+msgstr "Не могу да нађем извршни фајл %s неопходан за дистрибуирано компилирање."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
@@ -396,14 +386,11 @@ msgstr "Не могу да нађем извршни фајл %s неопход
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"Не могу да нађем извршни фајл %s неопходан за огољавање објектних фајлова."
+msgstr "Не могу да нађем извршни фајл %s неопходан за огољавање објектних фајлова."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Не могу да нађем извршни фајл %s неопходан за компресовање ман и инфо "
-"страница."
+msgstr "Не могу да нађем извршни фајл %s неопходан за компресовање ман и инфо страница."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -423,7 +410,8 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "Група пакета је већ изграђена (употребите %s да је препишете)."
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "Део групе пакета је већ изграђен (употребите %s да га препишете)."
 
 #: scripts/makepkg.sh.in:1696
@@ -456,9 +444,7 @@ msgstr "  -d, --nodeps     Прескаче све провере зависно
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  Не распакуј изворне фајлове (користи постојећу %s "
-"фасциклу)"
+msgstr "  -e, --noextract  Не распакуј изворне фајлове (користи постојећу %s фасциклу)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -490,8 +476,7 @@ msgstr "  -o, --nobuild    Само преузима и распакује фа
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <фајл>        Користи алтернативну инсталациону скрипту (уместо „%s“)"
+msgstr "  -p <фајл>        Користи алтернативну инсталациону скрипту (уместо „%s“)"
 
 #: scripts/makepkg.sh.in:1714
 msgid ""
@@ -499,7 +484,8 @@ msgid ""
 msgstr "  -r, --rmdeps     Уклања инсталиране зависности након успешне градње"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  Препакује садржај пакета без поновне градње"
 
 #: scripts/makepkg.sh.in:1716
@@ -509,8 +495,7 @@ msgstr "  -s, --syncdeps   Инсталирај недостајуће зави
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source     Generate a source-only tarball without downloaded sources"
+msgstr "  -S, --source     Generate a source-only tarball without downloaded sources"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -536,9 +521,9 @@ msgstr "  --holdver        Не ажурирај ВЦС изворе"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <кључ>      Назначи кључ за потписивање %s уместо подразумеваног"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <кључ>      Назначи кључ за потписивање %s уместо подразумеваног"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -559,9 +544,7 @@ msgstr "  --nosign         Не потписуј пакет"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"--packagelist  Само листа пакете који ће бити направљени, без екстензија "
-"(PKGEXT)"
+msgstr "--packagelist  Само листа пакете који ће бити направљени, без екстензија (PKGEXT)"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -588,9 +571,7 @@ msgstr "  --skippgpcheck   Не оверавај изворне фајлове 
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource    Преузима фајлове извора (ако је потребно) и врши провере "
-"исправности"
+msgstr "  --verifysource    Преузима фајлове извора (ако је потребно) и врши провере исправности"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -620,15 +601,12 @@ msgstr "Уколико %s није одређено, %s ће тражити „%
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for copying conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -662,9 +640,7 @@ msgstr "Немате дозволе уписа за складиштење дн
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Није дозвољено окретати %s као корени корисник, јер то може\n"
-"узроковати трајну, катастрофалну штету на систему."
+msgstr "Није дозвољено окретати %s као корени корисник, јер то може\nузроковати трајну, катастрофалну штету на систему."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -791,9 +767,7 @@ msgstr "Опције:\n"
 #: scripts/makepkg-template.pl.in:178
 #, perl-format
 msgid "  --input, -p <file>    Build script to read (default: %s)\n"
-msgstr ""
-"  --input, -p <фајл>    Скрипта са инструкцијама за градњу (подразумевано: "
-"%s)\n"
+msgstr "  --input, -p <фајл>    Скрипта са инструкцијама за градњу (подразумевано: %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
@@ -807,9 +781,7 @@ msgstr "  --newest, -n          ажурира шаблоне на послед
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                        (подразумевано: користи верзије назначене у "
-"ствараоцима шаблона)\n"
+msgstr "                        (подразумевано: користи верзије назначене у ствараоцима шаблона)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
@@ -833,11 +805,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
-"This is free software; see the source for copying conditions.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-"\n"
+msgstr "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\nThis is free software; see the source for copying conditions.\nThere is NO WARRANTY, to the extent permitted by law.\n\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -873,13 +841,10 @@ msgstr "  --nocolor            bez obojenih izlaznih poruka"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nThis is free software; see the source for copying conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -896,9 +861,7 @@ msgstr "Морате имати одговарајуће дозволе за н
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Нађен је пакменов забравни фајл. Не могу да извршим ако је пакмен већ "
-"покренут."
+msgstr "Нађен је пакменов забравни фајл. Не могу да извршим ако је пакмен већ покренут."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -914,8 +877,7 @@ msgstr "Нађена је база у пре-4.2 формату — надогр
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"симболичка веза „%s“ води изван пакменовог корена, потребна је ручна поправка"
+msgstr "симболичка веза „%s“ води изван пакменовог корена, потребна је ручна поправка"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -931,9 +893,7 @@ msgstr "Операције:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add                 Додаје наведене кључеве (празно за стандардни "
-"улаз)"
+msgstr "  -a, --add                 Додаје наведене кључеве (празно за стандардни улаз)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
@@ -946,8 +906,7 @@ msgstr "  -e, --export              Извози наведене или све
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              Наведи отиске за изабрани или све ИД.ове кључева."
+msgstr "  -f, --finger              Наведи отиске за изабрани или све ИД.ове кључева."
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -969,9 +928,7 @@ msgstr "  -v, --verify              Оверава фајл(ове) наведе
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key                Приказује мени за послове управљања кључевима "
-"према ИД-овима"
+msgstr "  --edit-key                Приказује мени за послове управљања кључевима према ИД-овима"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
@@ -981,9 +938,7 @@ msgstr "  --import                  Увози pubring.gpg из фасцикле
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          Увози вредности власничког поверења из trustdb."
-"gpg из фасцикле(и)"
+msgstr "  --import-trustdb          Увози вредности власничког поверења из trustdb.gpg из фасцикле(и)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
@@ -999,40 +954,30 @@ msgstr "  --lsign-key               Локално потписује навед
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                Поново учитај подразумеване кључеве из (задатих) "
-"свежњева\\n                            у „%s“//"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                Поново учитај подразумеване кључеве из (задатих) свежњева\\n                            у „%s“//"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            Ажурира наведени кључ или све кључеве са сервера "
-"кључева"
+msgstr "  --refresh-keys            Ажурира наведени кључ или све кључеве са сервера кључева"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <file>          Користи алтернативни фајл поставки уместо"
-"\\n                            „%s“)"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <file>          Користи алтернативни фајл поставки уместо\\n                            „%s“)"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            Постави алтернативну фасциклу за ГнуПГ (уместо"
-"\\n                            „%s“)"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            Постави алтернативну фасциклу за ГнуПГ (уместо\\n                            „%s“)"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <урл сервера>  Одређује који сервер кључева се користи, "
-"уколико је потребно"
+msgstr "  --keyserver <урл сервера>  Одређује који сервер кључева се користи, уколико је потребно"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1202,25 +1147,17 @@ msgstr "Употреба: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize је малени захват који би требао да поправи перформансе\n"
-"пакмена при читању или уписивању у базу у систему фајлова.\n"
-"\\n"
+msgstr "pacman-optimize је малени захват који би требао да поправи перформансе\nпакмена при читању или уписивању у базу у систему фајлова.\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Обзиром да пакмен користи много малих фајлова за праћење пакета,\\nсклон је "
-"фрагментацији тих фајлова током времена.\\nОва скрипта покушава да релоцира "
-"те фајлове у једну\\nцеловиту локацију на диску. Резултат тога је да би диск"
-"\\nтребао брже да их чита, обзиром да глава диска\\nне мора толико често да "
-"се помера.\\n"
+msgstr "Обзиром да пакмен користи много малих фајлова за праћење пакета,\\nсклон је фрагментацији тих фајлова током времена.\\nОва скрипта покушава да релоцира те фајлове у једну\\nцеловиту локацију на диску. Резултат тога је да би диск\\nтребао брже да их чита, обзиром да глава диска\\nне мора толико често да се помера.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1271,7 +1208,8 @@ msgid "Rotating database into place..."
 msgstr "Ротирам базе на место..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr "Замена нове базе није успела. Проверите фасцикле %s, %s и %s."
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1286,9 +1224,7 @@ msgstr "Употреба: pkgdelta [опције] <пакет1> <пакет2>\\n
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta ће направити делту међу два пакета\\nОвај фајл делте се може додати "
-"у базу помоћу repo-add.\\n"
+msgstr "pkgdelta ће направити делту међу два пакета\\nОвај фајл делте се може додати у базу помоћу repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1309,26 +1245,20 @@ msgstr "  --nocolor        без обојеног излаза\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size    минимална величина пакета која покреће стварање делте\\n"
+msgstr "  --min-pkg-size    минимална величина пакета која покреће стварање делте\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  проценат величине новог пакета изнад ког се делта "
-"одбацује\\n"
+msgstr "  --max-delta-size  проценат величине новог пакета изнад ког се делта одбацује\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"© 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nОво је слободан софтвер; "
-"услове умножавања потражити у извору.\\nНе постоји гаранција, у законом "
-"допуштеним границама.\\n"
+msgstr "© 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nОво је слободан софтвер; услове умножавања потражити у извору.\\nНе постоји гаранција, у законом допуштеним границама.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1376,16 +1306,13 @@ msgstr "Не могу да нађем извршни фајл xdelta3! Да ли
 
 #: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr ""
-"Употреба: repo-remove [опције] <путања-до-базе> <имепакета|делта> ...\\n"
+msgstr "Употреба: repo-remove [опције] <путања-до-базе> <имепакета|делта> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add ће ажурурати ризницу пакета читањем фајла пакета.\\nВишеструки "
-"фајлови се могу додати набрајањем у командној линији.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add ће ажурурати ризницу пакета читањем фајла пакета.\\nВишеструки фајлови се могу додати набрајањем у командној линији.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1393,30 +1320,26 @@ msgstr "  -d, --delta       направи и додај делту за над
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr "  -n, --new         само пакети који нису већ у бази\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"  -R, --remove      уклања стари фајл пакета са диска након ажурирања базе\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "  -R, --remove      уклања стари фајл пакета са диска након ажурирања базе\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Употреба: repo-remove [опције] <путања до базе> <име пакета|делте> ...\\n"
+msgstr "Употреба: repo-remove [опције] <путања до базе> <име пакета|делте> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove ће ажурирати базу пакета уклањањем пакета по имену\\nнаведеном у "
-"командној линији из задате ризнице. Вишеструки\\пакети за уклањање се моги "
-"набројати у командној линији.\\n "
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove ће ажурирати базу пакета уклањањем пакета по имену\\nнаведеном у командној линији из задате ризнице. Вишеструки\\пакети за уклањање се моги набројати у командној линији.\\n "
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1446,9 +1369,7 @@ msgstr "\\nПогледајте %s(8) за више детаља и описе 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Пример:  repo-add /путања/до/ризница.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz"
-"\\n"
+msgstr "Пример:  repo-add /путања/до/ризница.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1456,13 +1377,10 @@ msgstr "Example:  repo-remove /путања/до/ризница.db.tar.gz kernel
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n\\nThis is free software; see the source for copying conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1753,18 +1671,21 @@ msgstr "Неуспешно довлачење %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Непозната референцa: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Стварам радну копију %s %s ризнице..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Неуспешно освежавање радне копије %s %s ризнице.."
 
@@ -1796,12 +1717,14 @@ msgstr "Распакујем %s помоћу %s"
 msgid "Failed to extract %s"
 msgstr "Неуспело распакивање %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Клонирам %s %s ризницу..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Неуспешно преузимање %s %s ризнице"
@@ -1810,12 +1733,14 @@ msgstr "Неуспешно преузимање %s %s ризнице"
 msgid "%s is not a clone of %s"
 msgstr "%s није клон %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Освежавам %s %s ризницу..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Грешка при ажурирању %s %s ризнице"
diff --git a/scripts/po/sr@latin.po b/scripts/po/sr@latin.po
index b6a36e00..cb1c069d 100644
--- a/scripts/po/sr@latin.po
+++ b/scripts/po/sr@latin.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Mladen Pejaković <pejakm@autistici.org>, 2013
 # Mladen Pejaković <pejakm@autistici.org>, 2013
@@ -14,14 +14,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 12:12+0000\n"
 "Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/sr@latin/)\n"
-"Language: sr@latin\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/toofishes/archlinux-pacman/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: scripts/makepkg.sh.in:135
 msgid "Cleaning up..."
@@ -102,10 +100,9 @@ msgid "Generating checksums for source files..."
 msgstr "Stvaram sumu za proveru izvornih fajlova... "
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Ne mogu da nađem izvršni fajl %s neophodan za stvaranje suma za proveru "
-"izvornih fajlova."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Ne mogu da nađem izvršni fajl %s neophodan za stvaranje suma za proveru izvornih fajlova."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -138,8 +135,7 @@ msgstr "Jedan ili više fajlova nisu prošli proveru ispravnosti!"
 
 #: scripts/makepkg.sh.in:489
 msgid "Integrity checks (%s) differ in size from the source array."
-msgstr ""
-"Provere integriteta (%s) se razlikuju veličinom u odnosu na odeljak izvora."
+msgstr "Provere integriteta (%s) se razlikuju veličinom u odnosu na odeljak izvora."
 
 #: scripts/makepkg.sh.in:531
 msgid "Integrity checks are missing for: %s"
@@ -341,8 +337,7 @@ msgstr "Nepoznat protokol za preuzimanje: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Ne mogu da nađem binarni fajl %s neophodan za proveru zavisnosti VCS izvora."
+msgstr "Ne mogu da nađem binarni fajl %s neophodan za proveru zavisnosti VCS izvora."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
@@ -350,14 +345,11 @@ msgstr "Ne mogu da nađem binarni fajl %s neophodan za upravljanje %s izvorima."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
-msgstr ""
-"Ne mogu da nađem binarni fajl %s neophodan za operacije sa zavisnostima."
+msgstr "Ne mogu da nađem binarni fajl %s neophodan za operacije sa zavisnostima."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Ne mogu da nađem binarni fajl %s, za dobijanje korenih privilegija biće "
-"upotrebljen %s."
+msgstr "Ne mogu da nađem binarni fajl %s, za dobijanje korenih privilegija biće upotrebljen %s."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -378,8 +370,7 @@ msgstr "Ne mogu da nađem binar %s, neophodan za proveru suma fajla izvora."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"Ne mogu da nađem izvršni fajl %s neophodan za kompresovanje binarnih fajlova."
+msgstr "Ne mogu da nađem izvršni fajl %s neophodan za kompresovanje binarnih fajlova."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
@@ -387,8 +378,7 @@ msgstr "Ne mogu da nađem binar %s, neophodan za optimizaciju PNG slika."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
-msgstr ""
-"Ne mogu da nađem izvršni fajl %s neophodan za distribuirano kompiliranje."
+msgstr "Ne mogu da nađem izvršni fajl %s neophodan za distribuirano kompiliranje."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
@@ -396,14 +386,11 @@ msgstr "Ne mogu da nađem izvršni fajl %s neophodan za potrebe keša kompajlera
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"Ne mogu da nađem izvršni fajl %s neophodan za ogoljavanje objektnih fajlova."
+msgstr "Ne mogu da nađem izvršni fajl %s neophodan za ogoljavanje objektnih fajlova."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Ne mogu da nađem izvršni fajl %s neophodan za kompresovanje man i info "
-"stranica."
+msgstr "Ne mogu da nađem izvršni fajl %s neophodan za kompresovanje man i info stranica."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -423,7 +410,8 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "Grupa paketa je već izgrađena (upotrebite %s da je prepišete)."
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "Deo grupe paketa je već izgrađen (upotrebite %s da ga prepišete)."
 
 #: scripts/makepkg.sh.in:1696
@@ -456,9 +444,7 @@ msgstr "  -d, --nodeps     Preskače sve provere zavisnosti"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  Ne raspakuj izvorne fajlove (koristi postojeću %s "
-"fasciklu)"
+msgstr "  -e, --noextract  Ne raspakuj izvorne fajlove (koristi postojeću %s fasciklu)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -490,17 +476,16 @@ msgstr "  -o, --nobuild    Samo preuzima i raspakuje fajlove"
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <fajl>        Koristi alternativnu instalacionu skriptu (umesto „%s“)"
+msgstr "  -p <fajl>        Koristi alternativnu instalacionu skriptu (umesto „%s“)"
 
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Uklanja instalirane zavisnosti nakon uspešne gradnje"
+msgstr "  -r, --rmdeps     Uklanja instalirane zavisnosti nakon uspešne gradnje"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  Prepakuje sadržaj paketa bez ponovne gradnje"
 
 #: scripts/makepkg.sh.in:1716
@@ -510,8 +495,7 @@ msgstr "  -s, --syncdeps   Instaliraj nedostajuće zavisnosti pomoću %s"
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source     Generate a source-only tarball without downloaded sources"
+msgstr "  -S, --source     Generate a source-only tarball without downloaded sources"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -537,9 +521,9 @@ msgstr "  --holdver        Ne ažuriraj VCS izvore"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <ključ>      Naznači ključ za potpisivanje %s umesto podrazumevanog"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <ključ>      Naznači ključ za potpisivanje %s umesto podrazumevanog"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -560,9 +544,7 @@ msgstr "  --nosign         Ne potpisuj paket"
 #: scripts/makepkg.sh.in:1728
 msgid ""
 "  --packagelist    Only list packages that would be produced, without PKGEXT"
-msgstr ""
-"--packagelist  Samo lista pakete koji će biti napravljeni, bez ekstenzija "
-"(PKGEXT)"
+msgstr "--packagelist  Samo lista pakete koji će biti napravljeni, bez ekstenzija (PKGEXT)"
 
 #: scripts/makepkg.sh.in:1729
 msgid "  --printsrcinfo   Print the generated SRCINFO and exit"
@@ -589,9 +571,7 @@ msgstr "  --skippgpcheck   Ne overavaj izvorne fajlove putem PGP potpisa"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource    Preuzima fajlove izvora (ako je potrebno) i vrši provere "
-"ispravnosti"
+msgstr "  --verifysource    Preuzima fajlove izvora (ako je potrebno) i vrši provere ispravnosti"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -621,15 +601,12 @@ msgstr "Ukoliko %s nije određeno, %s će tražiti „%s“"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for copying conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -663,9 +640,7 @@ msgstr "Nemate dozvole upisa za skladištenje dnevnika u %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Nije dozvoljeno okretati %s kao koreni korisnik, jer to može\n"
-"uzrokovati trajnu, katastrofalnu štetu na sistemu."
+msgstr "Nije dozvoljeno okretati %s kao koreni korisnik, jer to može\nuzrokovati trajnu, katastrofalnu štetu na sistemu."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -792,9 +767,7 @@ msgstr "Opcije:\n"
 #: scripts/makepkg-template.pl.in:178
 #, perl-format
 msgid "  --input, -p <file>    Build script to read (default: %s)\n"
-msgstr ""
-"  --input, -p <fajl>    Skripta sa instrukcijama za gradnju (podrazumevano: "
-"%s)\n"
+msgstr "  --input, -p <fajl>    Skripta sa instrukcijama za gradnju (podrazumevano: %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
@@ -808,9 +781,7 @@ msgstr "  --newest, -n          ažurira šablone na poslednju verziju\n"
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                        (podrazumevano: koristi verzije naznačene u "
-"stvaraocima šablona)\n"
+msgstr "                        (podrazumevano: koristi verzije naznačene u stvaraocima šablona)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
@@ -834,10 +805,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>\n"
-"This is free software; see the source for copying conditions.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>\nThis is free software; see the source for copying conditions.\nThere is NO WARRANTY, to the extent permitted by law.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -873,13 +841,10 @@ msgstr "  --nocolor            bez obojenih izlaznih poruka"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>.\\nThis is free software; see the source for copying conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -896,9 +861,7 @@ msgstr "Morate imati odgovarajuće dozvole za nadogradnju baze."
 
 #: scripts/pacman-db-upgrade.sh.in:150 scripts/pacman-optimize.sh.in:119
 msgid "Pacman lock file was found. Cannot run while pacman is running."
-msgstr ""
-"Nađen je pacmanov zabravni fajl. Ne mogu da izvršim ako je pacman već "
-"pokrenut."
+msgstr "Nađen je pacmanov zabravni fajl. Ne mogu da izvršim ako je pacman već pokrenut."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
@@ -914,8 +877,7 @@ msgstr "Nađena je baza u pre-4.2 formatu — nadograđujem..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"simbolička veza „%s“ vodi izvan pacmanovog korena, potrebna je ručna popravka"
+msgstr "simbolička veza „%s“ vodi izvan pacmanovog korena, potrebna je ručna popravka"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -931,9 +893,7 @@ msgstr "Operacije:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add                 Dodaje navedene ključeve (prazno za standardni "
-"ulaz)"
+msgstr "  -a, --add                 Dodaje navedene ključeve (prazno za standardni ulaz)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
@@ -946,9 +906,7 @@ msgstr "  -e, --export              Izvozi navedene ili sve ID-ove ključeva"
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              Navedi otiske za izabrani ili sve ID.ove "
-"ključeva."
+msgstr "  -f, --finger              Navedi otiske za izabrani ili sve ID.ove ključeva."
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -970,9 +928,7 @@ msgstr "  -v, --verify              Overava fajl(ove) navedene potpisom(ima)"
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key                Prikazuje meni za poslove upravljanja ključevima "
-"prema ID-ovima"
+msgstr "  --edit-key                Prikazuje meni za poslove upravljanja ključevima prema ID-ovima"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
@@ -982,9 +938,7 @@ msgstr "  --import                  Uvozi pubring.gpg iz fascikle(i)"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb          Uvozi vrednosti vlasničkog poverenja iz trustdb."
-"gpg iz fascikle(i)"
+msgstr "  --import-trustdb          Uvozi vrednosti vlasničkog poverenja iz trustdb.gpg iz fascikle(i)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
@@ -1000,40 +954,30 @@ msgstr "  --lsign-key               Lokalno potpisuje navedeni ID ključa"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                Ponovo učitaj podrazumevane ključeve iz "
-"(zadatih) svežnjeva\\n                            u „%s“//"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                Ponovo učitaj podrazumevane ključeve iz (zadatih) svežnjeva\\n                            u „%s“//"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys            Ažurira navedeni ključ ili sve ključeve sa "
-"servera ključeva"
+msgstr "  --refresh-keys            Ažurira navedeni ključ ili sve ključeve sa servera ključeva"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <file>          Koristi alternativni fajl postavki umesto"
-"\\n                            „%s“)"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <file>          Koristi alternativni fajl postavki umesto\\n                            „%s“)"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            Postavi alternativnu fasciklu za GnuPG (umesto"
-"\\n                            „%s“)"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            Postavi alternativnu fasciklu za GnuPG (umesto\\n                            „%s“)"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <url servera>  Određuje koji server ključeva se koristi, "
-"ukoliko je potrebno"
+msgstr "  --keyserver <url servera>  Određuje koji server ključeva se koristi, ukoliko je potrebno"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1203,25 +1147,17 @@ msgstr "Upotreba: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize je maleni zahvat koji bi trebao da popravi performanse\n"
-"pacmana pri čitanju ili upisivanju u bazu u sistemu fajlova.\n"
-"\\n"
+msgstr "pacman-optimize je maleni zahvat koji bi trebao da popravi performanse\npacmana pri čitanju ili upisivanju u bazu u sistemu fajlova.\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Obzirom da pacman koristi mnogo malih fajlova za praćenje paketa,\\nsklon je "
-"fragmentaciji tih fajlova tokom vremena.\\nOva skripta pokušava da relocira "
-"te fajlove u jednu\\ncelovitu lokaciju na disku. Rezultat toga je da bi disk"
-"\\ntrebao brže da ih čita, obzirom da glava diska\\nne mora toliko često da "
-"se pomera.\\n"
+msgstr "Obzirom da pacman koristi mnogo malih fajlova za praćenje paketa,\\nsklon je fragmentaciji tih fajlova tokom vremena.\\nOva skripta pokušava da relocira te fajlove u jednu\\ncelovitu lokaciju na disku. Rezultat toga je da bi disk\\ntrebao brže da ih čita, obzirom da glava diska\\nne mora toliko često da se pomera.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1272,7 +1208,8 @@ msgid "Rotating database into place..."
 msgstr "Rotiram baze na mesto..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr "Zamena nove baze nije uspela. Proverite fascikle %s, %s i %s."
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1287,9 +1224,7 @@ msgstr "Upotreba: pkgdelta [opcije] <paket1> <paket2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta će napraviti deltu među dva paketa\\nOvaj fajl delte se može dodati "
-"u bazu pomoću repo-add.\\n"
+msgstr "pkgdelta će napraviti deltu među dva paketa\\nOvaj fajl delte se može dodati u bazu pomoću repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1310,26 +1245,20 @@ msgstr "  --nocolor        bez obojenog izlaza\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size    minimalna veličina paketa koja pokreće stvaranje delte\\n"
+msgstr "  --min-pkg-size    minimalna veličina paketa koja pokreće stvaranje delte\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  procenat veličine novog paketa iznad kog se delta "
-"odbacuje\\n"
+msgstr "  --max-delta-size  procenat veličine novog paketa iznad kog se delta odbacuje\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"© 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nOvo je slobodan softver; "
-"uslove umnožavanja potražiti u izvoru.\\nNe postoji garancija, u zakonom "
-"dopuštenim granicama.\\n"
+msgstr "© 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nOvo je slobodan softver; uslove umnožavanja potražiti u izvoru.\\nNe postoji garancija, u zakonom dopuštenim granicama.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1377,16 +1306,13 @@ msgstr "Ne mogu da nađem izvršni fajl xdelta3! Da li je xdelta3 instaliran?"
 
 #: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr ""
-"Upotreba: repo-remove [opcije] <putanja-do-baze> <imepaketa|delta> ...\\n"
+msgstr "Upotreba: repo-remove [opcije] <putanja-do-baze> <imepaketa|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add će ažururati riznicu paketa čitanjem fajla paketa.\\nVišestruki "
-"fajlovi se mogu dodati nabrajanjem u komandnoj liniji.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add će ažururati riznicu paketa čitanjem fajla paketa.\\nVišestruki fajlovi se mogu dodati nabrajanjem u komandnoj liniji.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1394,31 +1320,26 @@ msgstr "  -d, --delta       napravi i dodaj deltu za nadogradnju paketa\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr "  -n, --new         samo paketi koji nisu već u bazi\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"  -R, --remove      uklanja stari fajl paketa sa diska nakon ažuriranja baze"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "  -R, --remove      uklanja stari fajl paketa sa diska nakon ažuriranja baze\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Upotreba: repo-remove [opcije] <putanja do baze> <ime paketa|delte> ...\\n"
+msgstr "Upotreba: repo-remove [opcije] <putanja do baze> <ime paketa|delte> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove će ažurirati bazu paketa uklanjanjem paketa po imenu\\nnavedenom "
-"u komandnoj liniji iz zadate riznice. Višestruki\\paketi za uklanjanje se "
-"mogi nabrojati u komandnoj liniji.\\n "
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove će ažurirati bazu paketa uklanjanjem paketa po imenu\\nnavedenom u komandnoj liniji iz zadate riznice. Višestruki\\paketi za uklanjanje se mogi nabrojati u komandnoj liniji.\\n "
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1448,9 +1369,7 @@ msgstr "\\nPogledajte %s(8) za više detalja i opise dostupnih opcija.\\n"
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Primer:  repo-add /putanja/do/riznica.db.tar.gz pacman-3.0.0-1-i686.pkg.tar."
-"gz\\n"
+msgstr "Primer:  repo-add /putanja/do/riznica.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1458,13 +1377,10 @@ msgstr "Example:  repo-remove /putanja/do/riznica.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n\\nThis is free software; see the source for copying conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1755,18 +1671,21 @@ msgstr "Neuspešno dovlačenje %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Nepoznata referenca: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Stvaram radnu kopiju %s %s riznice..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Neuspešno osvežavanje radne kopije %s %s riznice.."
 
@@ -1798,12 +1717,14 @@ msgstr "Raspakujem %s pomoću %s"
 msgid "Failed to extract %s"
 msgstr "Neuspelo raspakivanje %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Kloniram %s %s riznicu..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Neuspešno preuzimanje %s %s riznice"
@@ -1812,12 +1733,14 @@ msgstr "Neuspešno preuzimanje %s %s riznice"
 msgid "%s is not a clone of %s"
 msgstr "%s nije klon %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Osvežavam %s %s riznicu..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Greška pri ažuriranju %s %s riznice"
diff --git a/scripts/po/sv.po b/scripts/po/sv.po
index 81fb8539..c933f09b 100644
--- a/scripts/po/sv.po
+++ b/scripts/po/sv.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Daniel Sandman <revoltism@gmail.com>, 2013,2015
 # Johannes Löthberg <johannes@kyriasis.com>, 2015
@@ -13,12 +13,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 03:32+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/sv/)\n"
-"Language: sv\n"
+"Language-Team: Swedish (http://www.transifex.com/toofishes/archlinux-pacman/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -100,10 +99,9 @@ msgid "Generating checksums for source files..."
 msgstr "Generera kontrollsummor för källfiler."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Kunde inte hitta %s binär som krävs för att generera kontrollsumma för "
-"källkodsfil"
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Kunde inte hitta %s binär som krävs för att generera kontrollsumma för källkodsfil"
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -350,8 +348,7 @@ msgstr "Kan inte hitta %s binären som krävs för beroendehantering."
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Kan inte hitta %s binär. Kommer använda %s för att få root-rättigheter."
+msgstr "Kan inte hitta %s binär. Kommer använda %s för att få root-rättigheter."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -372,8 +369,7 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"Kan inte finna %s binära fil som krävs för att komprimera binära filer."
+msgstr "Kan inte finna %s binära fil som krävs för att komprimera binära filer."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
@@ -385,8 +381,7 @@ msgstr "Kan inte finna %s binära fil som krävs för distribuerad kompilering."
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Kan inte finna %s binära fil som krävs för kompilator cache användande."
+msgstr "Kan inte finna %s binära fil som krävs för kompilator cache användande."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
@@ -394,9 +389,7 @@ msgstr "Kan inte finna %s binära fil som krävs för objektfil skalning."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Kan inte finna %s binära fil som krävs för att komprimera manual och info "
-"sidor."
+msgstr "Kan inte finna %s binära fil som krävs för att komprimera manual och info sidor."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -416,10 +409,9 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "Paketgruppen har redan blivit byggd. (använd %s för att skriva över)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"En del av paketgruppen har redan blivit byggd. (använd %s för att skriva "
-"över)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "En del av paketgruppen har redan blivit byggd. (använd %s för att skriva över)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -451,8 +443,7 @@ msgstr "  -d, --nodeps     Hoppa över alla beroendekontroller"
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"-e, --noextract Extrahera inte källfiler (använd existerande %s katalog)"
+msgstr "-e, --noextract Extrahera inte källfiler (använd existerande %s katalog)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -492,7 +483,8 @@ msgid ""
 msgstr "  -r, --rmdeps     Ta bort installerade beroenden efter lyckat bygge"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  Packa om innehållet i paketet utan att bygga om"
 
 #: scripts/makepkg.sh.in:1716
@@ -502,9 +494,7 @@ msgstr "-s, --syncdeps Installera saknade beroenden med %s"
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"-S, --source Generera en tarball med enbart källkod utan nerladdade "
-"källkodsfiler"
+msgstr "-S, --source Generera en tarball med enbart källkod utan nerladdade källkodsfiler"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -514,9 +504,7 @@ msgstr "-V, --version Visa versionsinformation och avsluta"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"      --allsource  Generera en tarball innehållandes enbart nerladdade "
-"källkodsfiler"
+msgstr "      --allsource  Generera en tarball innehållandes enbart nerladdade källkodsfiler"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -524,8 +512,7 @@ msgstr "--check Kör %s funktionen i %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <file> Använd en alternativ konfigurationsfil (istället för '%s')"
+msgstr "  --config <file> Använd en alternativ konfigurationsfil (istället för '%s')"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -533,10 +520,9 @@ msgstr "--holdver Uppdatera inte VCS-källor"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"--key <key> Ange en nyckel att användas för %s signering istället för den "
-"som är standard"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "--key <key> Ange en nyckel att användas för %s signering istället för den som är standard"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -584,9 +570,7 @@ msgstr "--skippgpcheck Verifiera inte källkodsfilerna med PGP-signaturer"
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"--verifysource Ladda ner källkodsfiler (om det behövs) och göra "
-"integritetskontroller"
+msgstr "--verifysource Ladda ner källkodsfiler (om det behövs) och göra integritetskontroller"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -604,15 +588,11 @@ msgstr "--needed Ominstallera inte mål som redan är fullt uppdaterade"
 #: scripts/makepkg.sh.in:1740
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr ""
-"      --noconfirm      Fråga inte efter bekräftelse vid bestämmande av "
-"beroenden"
+msgstr "      --noconfirm      Fråga inte efter bekräftelse vid bestämmande av beroenden"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"      --noprogressbar  Visa inte en förloppsindikator vid nerladdning av "
-"filer"
+msgstr "      --noprogressbar  Visa inte en förloppsindikator vid nerladdning av filer"
 
 #: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
@@ -620,10 +600,11 @@ msgstr "Om %s inte är angiven, %s kommer söka efter '%s'"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
@@ -658,14 +639,11 @@ msgstr "Du har inte tillräckliga skrivrättigheter för att spara loggar i %s."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Att köra %s som root är inte tillåtet eftersom det kan skapa permanent,"
-"\\nkatastrofal skada på ditt system."
+msgstr "Att köra %s som root är inte tillåtet eftersom det kan skapa permanent,\\nkatastrofal skada på ditt system."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
-msgstr ""
-"Använd inte %s alternativet. Detta alternativ är endast för användning av %s."
+msgstr "Använd inte %s alternativet. Detta alternativ är endast för användning av %s."
 
 #: scripts/makepkg.sh.in:1989
 msgid "%s does not exist."
@@ -697,8 +675,7 @@ msgstr "Skapar paket: %s"
 
 #: scripts/makepkg.sh.in:2133
 msgid "A source package has already been built. (use %s to overwrite)"
-msgstr ""
-"Ett källkodspaket har redan blivit byggt, (använd %s för att skriva över)"
+msgstr "Ett källkodspaket har redan blivit byggt, (använd %s för att skriva över)"
 
 #: scripts/makepkg.sh.in:2152
 msgid "Source package created: %s"
@@ -863,9 +840,9 @@ msgstr "--nocolor inaktivera färglagd utdata"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
@@ -887,8 +864,7 @@ msgstr "Pacmans låsfil hittades. Kan inte köras medans pacman körs."
 
 #: scripts/pacman-db-upgrade.sh.in:162
 msgid "Pre-3.5 database format detected - upgrading..."
-msgstr ""
-"Databas med ett format tidigare än version 3.5 har upptäckts - uppgraderar..."
+msgstr "Databas med ett format tidigare än version 3.5 har upptäckts - uppgraderar..."
 
 #: scripts/pacman-db-upgrade.sh.in:169
 msgid "Done."
@@ -896,14 +872,11 @@ msgstr "Klar."
 
 #: scripts/pacman-db-upgrade.sh.in:173
 msgid "Pre-4.2 database format detected - upgrading..."
-msgstr ""
-"Databas med ett format tidigare än version 4.2 har upptäckts - uppgraderar..."
+msgstr "Databas med ett format tidigare än version 4.2 har upptäckts - uppgraderar..."
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"Den symboliska länken '%s' pekar utanför pacman:s root. Manuell reparation "
-"krävs"
+msgstr "Den symboliska länken '%s' pekar utanför pacman:s root. Manuell reparation krävs"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -964,9 +937,7 @@ msgstr "--import Importera pubring.gpg från katalog(er)"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"--import-trustdb Importerar ägarbetrodda värden från trustdb.gpg i "
-"katalog(er)"
+msgstr "--import-trustdb Importerar ägarbetrodda värden från trustdb.gpg i katalog(er)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
@@ -982,35 +953,30 @@ msgstr "--lsign-key Signera det angivna nyckelid:t lokalt"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"--populate Ladda om standardnycklarna från (givna) nyckelringar\\n i '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "--populate Ladda om standardnycklarna från (givna) nyckelringar\\n i '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"--refresh-keys Uppdatera angiven eller alla nycklar från en nyckelserver"
+msgstr "--refresh-keys Uppdatera angiven eller alla nycklar från en nyckelserver"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"--config <file> Använd en alternativ konfigurationsfil (istället för\\n '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "--config <file> Använd en alternativ konfigurationsfil (istället för\\n '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"--gpgdir <dir> Ange en alternativ katalog för GnuPG (istället\\n för '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "--gpgdir <dir> Ange en alternativ katalog för GnuPG (istället\\n för '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"--keyserver <serveradress> Ange en nyckelserver att användas om nödvändigt"
+msgstr "--keyserver <serveradress> Ange en nyckelserver att användas om nödvändigt"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1180,25 +1146,17 @@ msgstr "Använding: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize är ett litet hack som skall förbättra prestandan\\navpacman "
-"vid läsning/skrivning till dess filsystems-baserade databas.\\n\\n"
+msgstr "pacman-optimize är ett litet hack som skall förbättra prestandan\\navpacman vid läsning/skrivning till dess filsystems-baserade databas.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"På grund av att pacman använder flera mindre filer för att hålla koll på "
-"paketen,\\nså finns det en tendens att dessa filer blir fragmenterade över "
-"tiden.\\nDetta skript försöker att omlokalisera dessa små filer till en"
-"\\nkontinuerlig plats på hårddsiken. Resultatet är att hårddisken\\nborde "
-"kunna läsa dom snabbare, eftersom hårdiskens huvud\\ninte behöver flytta "
-"runt sig på disken så mycket.\\n"
+msgstr "På grund av att pacman använder flera mindre filer för att hålla koll på paketen,\\nså finns det en tendens att dessa filer blir fragmenterade över tiden.\\nDetta skript försöker att omlokalisera dessa små filer till en\\nkontinuerlig plats på hårddsiken. Resultatet är att hårddisken\\nborde kunna läsa dom snabbare, eftersom hårdiskens huvud\\ninte behöver flytta runt sig på disken så mycket.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1249,10 +1207,9 @@ msgid "Rotating database into place..."
 msgstr "Roterar databasen på plats..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
-msgstr ""
-"Bytet till ny databas misslyckades. Kontrollera efter %s, %s och %s "
-"kataloger."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
+msgstr "Bytet till ny databas misslyckades. Kontrollera efter %s, %s och %s kataloger."
 
 #: scripts/pacman-optimize.sh.in:184
 msgid "Finished. Your pacman database has been optimized."
@@ -1266,9 +1223,7 @@ msgstr "Använding: pkgdelta [alternativ] <paket1> <paket2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta kommer skapa en delta-fil mellan två packet.\\nDenna delta-fil kan "
-"sedan läggas till i en databad genom att använda repo-add.\\n"
+msgstr "pkgdelta kommer skapa en delta-fil mellan två packet.\\nDenna delta-fil kan sedan läggas till i en databad genom att använda repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1302,10 +1257,7 @@ msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nDetta är fri "
-"mjukvara; kolla källkoden för under vilka förhållanden kopiering kan göras."
-"\\nDet finns INGEN GARANTI, i den utsträckning som lagen tillåter.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nDetta är fri mjukvara; kolla källkoden för under vilka förhållanden kopiering kan göras.\\nDet finns INGEN GARANTI, i den utsträckning som lagen tillåter.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1357,11 +1309,9 @@ msgstr "Användning: repo-add [options] <path-to-db> <package|delta>...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add kommer uppdatera en paketdatabas genom att läsa en paketfil."
-"\\nFlertal paket att läggas till kan anges via kommandoraden.\\n\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add kommer uppdatera en paketdatabas genom att läsa en paketfil.\\nFlertal paket att läggas till kan anges via kommandoraden.\\n\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1369,13 +1319,14 @@ msgstr "-d, --delta generera och lägg till delta för paketuppdatering\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr "-n, --new lägg bara till paket som inte redan finns i databasen\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:66
@@ -1384,14 +1335,10 @@ msgstr "Användning: repo-remove [options] <sökväg-till-db> <paket|delta>...\\
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove kommer att uppdatera en paketdatabas genom att ta bort "
-"paketnamnet\\nsom angetts via kommandotolken från den givna "
-"förrådsdatabasen. Flera\\npaket att tas bort kan anges via kommandotolken.\\n"
-"\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove kommer att uppdatera en paketdatabas genom att ta bort paketnamnet\\nsom angetts via kommandotolken från den givna förrådsdatabasen. Flera\\npaket att tas bort kan anges via kommandotolken.\\n\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1416,15 +1363,12 @@ msgstr "-v, --verify verifiera databasernas signatur före uppdatering\\n"
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nSe %s(8) för fler detaljer och beskrivningar av de tillgängliga "
-"alternativen.\\n"
+msgstr "\\nSe %s(8) för fler detaljer och beskrivningar av de tillgängliga alternativen.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Exempel:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Exempel:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1432,9 +1376,9 @@ msgstr "Exempel:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:146
@@ -1671,8 +1615,7 @@ msgstr "%s måste vara en decimal, inte %s."
 
 #: scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in:39
 msgid "%s is not allowed to contain colons, hyphens or whitespace."
-msgstr ""
-"%s är inte tillåten att innehålla kolon, bindestreck eller blanktecken."
+msgstr "%s är inte tillåten att innehålla kolon, bindestreck eller blanktecken."
 
 #: scripts/libmakepkg/lint_pkgbuild/provides.sh.in:56
 msgid "%s array cannot contain comparison (< or >) operators."
@@ -1727,18 +1670,21 @@ msgstr "Misslyckande vid nerdragning av %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Okänd referens: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Skapar arbetskopia av %s %s repo..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Misslyckande under uppdatering av arbetskopia av %s %s repo"
 
@@ -1770,12 +1716,14 @@ msgstr "Extraherar %s med %s"
 msgid "Failed to extract %s"
 msgstr "Misslyckades att extrahera %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Klonar %s %s repo..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Misslyckande vid nerladdning av %s %s repo"
@@ -1784,12 +1732,14 @@ msgstr "Misslyckande vid nerladdning av %s %s repo"
 msgid "%s is not a clone of %s"
 msgstr "%s är inte en klon av %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Uppdaterar %s %s repo..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Misslyckande vid uppdatering av %s %s repo"
diff --git a/scripts/po/tr.po b/scripts/po/tr.po
index 5a8ee298..4c306a76 100644
--- a/scripts/po/tr.po
+++ b/scripts/po/tr.po
@@ -1,23 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Atilla Öntaş <tarakbumba@gmail.com>, 2011-2015
+# Demiray Muhterem <mdemiray@msn.com>, 2016
 # Samed Beyribey <samed@ozguryazilim.com.tr>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
-"PO-Revision-Date: 2016-01-17 03:32+0000\n"
-"Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Turkish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/tr/)\n"
-"Language: tr\n"
+"PO-Revision-Date: 2016-02-02 19:23+0000\n"
+"Last-Translator: Demiray Muhterem <mdemiray@msn.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/toofishes/archlinux-pacman/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: scripts/makepkg.sh.in:135
@@ -99,10 +99,9 @@ msgid "Generating checksums for source files..."
 msgstr "Kaynak kodları için bütünlük kontrolleri oluşturuluyor..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Kaynak dosya bütünlük doğrulamalarının üretimi için gerekli %s ikili dosyası "
-"bulunamıyor."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Kaynak dosya bütünlük doğrulamalarının üretimi için gerekli %s ikili dosyası bulunamıyor."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -127,7 +126,7 @@ msgstr "BAŞARISIZ"
 
 #: scripts/makepkg.sh.in:478
 msgid "Validating %s files with %s..."
-msgstr ""
+msgstr "%s ile %s dosyası doğrulanıyor..."
 
 #: scripts/makepkg.sh.in:485
 msgid "One or more files did not pass the validity check!"
@@ -135,9 +134,7 @@ msgstr "Bir ya da daha fazla dosya doğrulama kontrolünü geçemedi."
 
 #: scripts/makepkg.sh.in:489
 msgid "Integrity checks (%s) differ in size from the source array."
-msgstr ""
-"Bütünlük kontrolleri (%s) kaynak dizisindeki dosyaların boyutlarıyla "
-"örtüşmüyor."
+msgstr "Bütünlük kontrolleri (%s) kaynak dizisindeki dosyaların boyutlarıyla örtüşmüyor."
 
 #: scripts/makepkg.sh.in:531
 msgid "Integrity checks are missing for: %s"
@@ -230,8 +227,7 @@ msgstr "%s() işlemine başlanıyor..."
 
 #: scripts/makepkg.sh.in:938
 msgid "Library listed in %s is not required by any files: %s"
-msgstr ""
-"%s içerisinde listelenen kitaplığa herhangi bir dosya ihtiyaç duymuyor: %s"
+msgstr "%s içerisinde listelenen kitaplığa herhangi bir dosya ihtiyaç duymuyor: %s"
 
 #: scripts/makepkg.sh.in:967
 msgid "Library listed in %s is not versioned: %s"
@@ -340,14 +336,11 @@ msgstr "Bilinmeyen indirme protokolü: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"VCS kaynak gerekliliklerini doğrulamak için gerekli olan %s ikili dosyası "
-"bulunamıyor."
+msgstr "VCS kaynak gerekliliklerini doğrulamak için gerekli olan %s ikili dosyası bulunamıyor."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
-msgstr ""
-"%s ikili dosyası %s kaynaklarını işlemek için gerekli ancak bulunamıyor."
+msgstr "%s ikili dosyası %s kaynaklarını işlemek için gerekli ancak bulunamıyor."
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
@@ -367,8 +360,7 @@ msgstr "Paketleri imzalamak için gerekli olan %s ikili dosyası bulunamıyor."
 
 #: scripts/makepkg.sh.in:1539
 msgid "Cannot find the %s binary required for verifying source files."
-msgstr ""
-"Kaynak dosyaları doğrulamak için gerekli olan %s ikili dosyası bulunamıyor."
+msgstr "Kaynak dosyaları doğrulamak için gerekli olan %s ikili dosyası bulunamıyor."
 
 #: scripts/makepkg.sh.in:1547
 msgid ""
@@ -377,8 +369,7 @@ msgstr ""
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
-msgstr ""
-"Sıkıştırılmış ikili dosyalar için gerekli olan %s ikili dosyası bulunamıyor."
+msgstr "Sıkıştırılmış ikili dosyalar için gerekli olan %s ikili dosyası bulunamıyor."
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
@@ -390,19 +381,15 @@ msgstr "Dağıtılmış derleme için gerekli olan %s ikili dosyası bulunamıyo
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Derleyici önbelleği kullanımı için gerekli olan %s ikili dosyası bulunamıyor."
+msgstr "Derleyici önbelleği kullanımı için gerekli olan %s ikili dosyası bulunamıyor."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
-msgstr ""
-"Nesne dosyası ayıklamak için gerekli olan %s ikili dosyası bulunamıyor."
+msgstr "Nesne dosyası ayıklamak için gerekli olan %s ikili dosyası bulunamıyor."
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Man ve info sayfalarını sıkıştırmak için gerekli olan %s ikili dosyası "
-"bulunamıyor."
+msgstr "Man ve info sayfalarını sıkıştırmak için gerekli olan %s ikili dosyası bulunamıyor."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -410,8 +397,7 @@ msgstr "Paketlerden biri zaten derlenmiş, mevcut paket yükleniyor..."
 
 #: scripts/makepkg.sh.in:1619
 msgid "A package has already been built. (use %s to overwrite)"
-msgstr ""
-"Bir paket zaten önceden oluşturulmuş. (üzerine yazmak için %s kullanın)"
+msgstr "Bir paket zaten önceden oluşturulmuş. (üzerine yazmak için %s kullanın)"
 
 #: scripts/makepkg.sh.in:1638
 msgid ""
@@ -420,14 +406,12 @@ msgstr "Paket grubu zaten derlenmiş, var olan paketler kuruluyor..."
 
 #: scripts/makepkg.sh.in:1642
 msgid "The package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Paket grubu zaten önceden oluşturulmuş. (üzerine yazmak için %s kullanın)"
+msgstr "Paket grubu zaten önceden oluşturulmuş. (üzerine yazmak için %s kullanın)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
-msgstr ""
-"Paket grubunun bir kısmı zaten önceden oluşturulmuş. (üzerine yazmak için %s "
-"kullanın)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
+msgstr "Paket grubunun bir kısmı zaten önceden oluşturulmuş. (üzerine yazmak için %s kullanın)"
 
 #: scripts/makepkg.sh.in:1696
 msgid "Make packages compatible for use with pacman"
@@ -496,12 +480,11 @@ msgstr "  -p <dosya>  '%s' yerine farklı bir derleme betiği kullan"
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Derlenme tamamlandıktan sonra yüklenen bağımlılıkları "
-"kaldır"
+msgstr "  -r, --rmdeps     Derlenme tamamlandıktan sonra yüklenen bağımlılıkları kaldır"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  Derleme yapmadan yeniden paketle"
 
 #: scripts/makepkg.sh.in:1716
@@ -511,9 +494,7 @@ msgstr "  -s, --syncdeps   Eksik bağımlılıkları %s ile kur"
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source     İndirilen kaynak dosyaları olmadan bir kaynak arşivi "
-"oluştur."
+msgstr "  -S, --source     İndirilen kaynak dosyaları olmadan bir kaynak arşivi oluştur."
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -523,9 +504,7 @@ msgstr "  -V, --version    Sürüm bilgisini göster ve çık"
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      İndirilmiş arşivlerle birlikte sadece kaynak barındıran "
-"bir arşiv oluştur"
+msgstr "  --allsource      İndirilmiş arşivlerle birlikte sadece kaynak barındıran bir arşiv oluştur"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -541,10 +520,9 @@ msgstr "  --holdver        Sürüm takip sistemi kaynaklarını güncelleme"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <key>      Öntanımlı yerine %s imzalama işlemi için başka bir "
-"anahtar belirt"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <key>      Öntanımlı yerine %s imzalama işlemi için başka bir anahtar belirt"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -582,8 +560,7 @@ msgstr "  --skipchecksums  Kaynak dosyaların sağlama toplamalarını denetleme
 #: scripts/makepkg.sh.in:1732
 msgid ""
 "  --skipinteg      Do not perform any verification checks on source files"
-msgstr ""
-"  --skipinteg      Kaynak dosyalarında herhangi bir doğrulama denetimi yapma"
+msgstr "  --skipinteg      Kaynak dosyalarında herhangi bir doğrulama denetimi yapma"
 
 #: scripts/makepkg.sh.in:1733
 msgid "  --skippgpcheck   Do not verify source files with PGP signatures"
@@ -623,10 +600,11 @@ msgstr "%s belirtilmemişse; %s, '%s' arayacaktır"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
 msgstr ""
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
@@ -647,9 +625,7 @@ msgstr "Paketleri %s dizininde saklamak için yazma izniniz yok."
 
 #: scripts/makepkg.sh.in:1937
 msgid "You do not have write permission to store downloads in %s."
-msgstr ""
-"İndirilenleri %s dizininde saklayabilmenizi sağlayacak izinlere sahip "
-"değilsiniz."
+msgstr "İndirilenleri %s dizininde saklayabilmenizi sağlayacak izinlere sahip değilsiniz."
 
 #: scripts/makepkg.sh.in:1946
 msgid "You do not have write permission to store source tarballs in %s."
@@ -663,14 +639,11 @@ msgstr "Kayıtları %s içerisinde tutmak için yazma yetkiniz bulunmuyor."
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"%s kök olarak çalıştırılamaz. Çünkü,\\nsisteminizde kalıcı hasara yol "
-"açabilir."
+msgstr "%s kök olarak çalıştırılamaz. Çünkü,\\nsisteminizde kalıcı hasara yol açabilir."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
-msgstr ""
-"%s seçeneğini kullanma. Bu seçenek sadece %s tarafından kullanılabilir."
+msgstr "%s seçeneğini kullanma. Bu seçenek sadece %s tarafından kullanılabilir."
 
 #: scripts/makepkg.sh.in:1989
 msgid "%s does not exist."
@@ -702,9 +675,7 @@ msgstr "%s paketi oluşturuluyor"
 
 #: scripts/makepkg.sh.in:2133
 msgid "A source package has already been built. (use %s to overwrite)"
-msgstr ""
-"Bir kaynak paketi zaten önceden oluşturulmuş. (üzerine yazmak için %s "
-"kullanın)"
+msgstr "Bir kaynak paketi zaten önceden oluşturulmuş. (üzerine yazmak için %s kullanın)"
 
 #: scripts/makepkg.sh.in:2152
 msgid "Source package created: %s"
@@ -762,9 +733,7 @@ msgstr "geçersiz şablon satırı: şablon adı bulunamıyor\n"
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr ""
-"'%s' adında geçersiz karakterler kullanılmış. İzin verilenler:  [:alnum:]+_."
-"@-\n"
+msgstr "'%s' adında geçersiz karakterler kullanılmış. İzin verilenler:  [:alnum:]+_.@-\n"
 
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
@@ -801,9 +770,7 @@ msgstr "  --input, -p <file>   Okunacak derleme betiği (öntanımlı: %s)\n"
 
 #: scripts/makepkg-template.pl.in:179
 msgid "  --output, -o <file>   file to output to (default: input file)\n"
-msgstr ""
-"  --output, -o <dosya>   çıktı olarak verilecek dosya (öntanımlı: girdi "
-"dosyası)\n"
+msgstr "  --output, -o <dosya>   çıktı olarak verilecek dosya (öntanımlı: girdi dosyası)\n"
 
 #: scripts/makepkg-template.pl.in:180
 msgid "  --newest, -n          update templates to newest version\n"
@@ -873,9 +840,9 @@ msgstr "  --nocolor            renklendirilmiş çıktı kullanma"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
@@ -909,9 +876,7 @@ msgstr "4.2 sürümü öncesi veritabanı biçimi algılandı - yükseltiliyor..
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"'%s' sembolik bağlantısı pacman kökünden başka yere bağlanıyor, elle onarım "
-"gerekli"
+msgstr "'%s' sembolik bağlantısı pacman kökünden başka yere bağlanıyor, elle onarım gerekli"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -940,8 +905,7 @@ msgstr "  -e, --export             Belirtilen anahtarları dışarı aktar"
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger              Belirtilen anahtarların parmak izini listele"
+msgstr "  -f, --finger              Belirtilen anahtarların parmak izini listele"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -963,28 +927,21 @@ msgstr "  -v, --verify             Dosyaları belirtilen imza ile doğrula"
 #: scripts/pacman-key.sh.in:71
 msgid ""
 "  --edit-key                Present a menu for key management task on keyids"
-msgstr ""
-"  --edit-key              Belirtilen anahtarlar için anahtar yönetimi menüsü "
-"aç"
+msgstr "  --edit-key              Belirtilen anahtarlar için anahtar yönetimi menüsü aç"
 
 #: scripts/pacman-key.sh.in:72
 msgid "  --import                  Imports pubring.gpg from dir(s)"
-msgstr ""
-"  --import                 Dizindeki pubring.pgp dosyasını içeri aktarır"
+msgstr "  --import                 Dizindeki pubring.pgp dosyasını içeri aktarır"
 
 #: scripts/pacman-key.sh.in:73
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb           trustdb.gpg dosyasındaki güvenirlilik "
-"bilgilerini içeri aktarır"
+msgstr "  --import-trustdb           trustdb.gpg dosyasındaki güvenirlilik bilgilerini içeri aktarır"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                    Anahtarlığın uygun şekilde başlatıldığından emin "
-"ol"
+msgstr "  --init                    Anahtarlığın uygun şekilde başlatıldığından emin ol"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
@@ -996,39 +953,30 @@ msgstr "  --lsign-key              Belirtilen anahtarı yerelde imzala"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate             Belirtilen anahtarlıktan anahtarları tekrar yükle"
-"\\n                            '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate             Belirtilen anahtarlıktan anahtarları tekrar yükle\\n                            '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
 "  --refresh-keys            Update specified or all keys from a keyserver"
-msgstr ""
-"  --refresh-keys          Belirtilen veya tüm anahtarları anahtar sunucudan "
-"güncelle"
+msgstr "  --refresh-keys          Belirtilen veya tüm anahtarları anahtar sunucudan güncelle"
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <file>           Farklı bir yapılandırma dosyası kullan. ('%s'\n"
-"                            yerine)"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <file>           Farklı bir yapılandırma dosyası kullan. ('%s'\n                            yerine)"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            GnuPG için farklı bir dizin ayarla. ('%s'\n"
-"                            yerine)"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            GnuPG için farklı bir dizin ayarla. ('%s'\n                            yerine)"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
-msgstr ""
-"  --keyserver <sunucu-url>  Gerektiğinde kullanılabilecek anahtar sunucu"
+msgstr "  --keyserver <sunucu-url>  Gerektiğinde kullanılabilecek anahtar sunucu"
 
 #: scripts/pacman-key.sh.in:88
 msgid "  -h, --help                Show this help message and exit"
@@ -1198,25 +1146,17 @@ msgstr "Kullanım: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize, pacman'in dosya sistemi tabanlı veritabanını okumasını ve"
-"\\nyazmasını hızlandırmak amacıyla kullanılan bir araçtır.\\n\\n"
+msgstr "pacman-optimize, pacman'in dosya sistemi tabanlı veritabanını okumasını ve\\nyazmasını hızlandırmak amacıyla kullanılan bir araçtır.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"pacman, paketleri takip etmek için bir sürü küçük dosya ile uğraşmak zorunda"
-"\\nolduğundan, bu dosyaların zamanla derlenip toplanması iyi olacaktır.\\nBu "
-"betik, bahsi geçen küçük dosyaları bulup onları sabit diskinizdeki"
-"\\nkesintisiz bir bölümde bir araya toplar. Sabit diskinizin okuma kafası"
-"\\ndiskin farklı kısımlarında gezmek zorunda kalmayacağından, sonuçta"
-"\\nfarkedilir bir performans artışı olması muhtemeldir.\\n"
+msgstr "pacman, paketleri takip etmek için bir sürü küçük dosya ile uğraşmak zorunda\\nolduğundan, bu dosyaların zamanla derlenip toplanması iyi olacaktır.\\nBu betik, bahsi geçen küçük dosyaları bulup onları sabit diskinizdeki\\nkesintisiz bir bölümde bir araya toplar. Sabit diskinizin okuma kafası\\ndiskin farklı kısımlarında gezmek zorunda kalmayacağından, sonuçta\\nfarkedilir bir performans artışı olması muhtemeldir.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1267,7 +1207,8 @@ msgid "Rotating database into place..."
 msgstr "Veritabanı dönüştürülüyor..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr "Veritabanı yer değiştiremedi. %s, %s ve %s dizinlerini kontrol edin."
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1282,9 +1223,7 @@ msgstr "Kullanımı: pkgdelta [seçenekler] <paket1> <paket2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta iki paket arasında bir delta dosyası oluşturacak.\\nBu delta "
-"dosyası repo-add kullanılarak bir veritabanına eklenebilir.\\n"
+msgstr "pkgdelta iki paket arasında bir delta dosyası oluşturacak.\\nBu delta dosyası repo-add kullanılarak bir veritabanına eklenebilir.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1305,26 +1244,20 @@ msgstr "  --nocolor      renkli çıktı verme\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size  fark dosyaları oluşturulmadan önceki minimum paket boyutu"
-"\\n"
+msgstr "  --min-pkg-size  fark dosyaları oluşturulmadan önceki minimum paket boyutu\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  fark dosyasının üretilmeyeceği yeni paket yüzdesi\\n "
+msgstr "  --max-delta-size  fark dosyasının üretilmeyeceği yeni paket yüzdesi\\n "
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
-"software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
-"the extent permitted by law.\\n"
+msgstr "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free software; see the source for copying conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1372,16 +1305,13 @@ msgstr "xdelta3 ikili dosyası bulunamıyor! Sisteminizde xdelta3 kurulu mu?"
 
 #: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr ""
-"Kullanımı: repo-add [seçenekler] <veritabanı-konumu> <paket|delta> ...\\n"
+msgstr "Kullanımı: repo-add [seçenekler] <veritabanı-konumu> <paket|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add bir paket dosyası okuyarak paket veritabanını güncelleyecektir."
-"\\nEklenecek birden fazla paket komut satırından belirtilebilir.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add bir paket dosyası okuyarak paket veritabanını güncelleyecektir.\\nEklenecek birden fazla paket komut satırından belirtilebilir.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1389,13 +1319,14 @@ msgstr "  -d, --delta       paket güncellemesi için delta üret ve ekle\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr "  -n, --new        sadece veritabanında yer almayan paketleri ekle\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:66
@@ -1404,13 +1335,10 @@ msgstr "Kullanım: repo-remove [seçenek] <veritabanı> <paket|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove komut satırından verilen veritabanını kullanarak paket  ismini"
-"\\n paket veritabanından çıkararak paket veritabanını günceller. Birden\\n "
-"fazla paket komut satırından belirtilebilir.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove komut satırından verilen veritabanını kullanarak paket  ismini\\n paket veritabanından çıkararak paket veritabanını günceller. Birden\\n fazla paket komut satırından belirtilebilir.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1422,31 +1350,25 @@ msgstr "  --nocolor         renkli çıktı verme\\n"
 
 #: scripts/repo-add.sh.in:80
 msgid "  -s, --sign        sign database with GnuPG after update\\n"
-msgstr ""
-"  -s, --sign        güncellemeden sonra veritabanını GnuPG ile imzala\\n"
+msgstr "  -s, --sign        güncellemeden sonra veritabanını GnuPG ile imzala\\n"
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <key>   veritabanını imzalamak için belirtilen anahtarı kullan\\n"
+msgstr "  -k, --key <key>   veritabanını imzalamak için belirtilen anahtarı kullan\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
-msgstr ""
-"  -v, --verify      güncellemeden önce veritabanlarının imzalarını doğrula\\n"
+msgstr "  -v, --verify      güncellemeden önce veritabanlarının imzalarını doğrula\\n"
 
 #: scripts/repo-add.sh.in:83
 msgid ""
 "\\nSee %s(8) for more details and descriptions of the available options.\\n"
-msgstr ""
-"\\nMevcut seçeneklere ilişkin ayrıntılı bilgi almak için %s(8) "
-"inceleyebilirsiniz.\\n"
+msgstr "\\nMevcut seçeneklere ilişkin ayrıntılı bilgi almak için %s(8) inceleyebilirsiniz.\\n"
 
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Örnek:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Örnek:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1454,9 +1376,9 @@ msgstr "Örnek:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 msgstr ""
 
 #: scripts/repo-add.sh.in:146
@@ -1609,8 +1531,7 @@ msgstr "Geçersiz komut '%s' belirtilmiş."
 
 #: scripts/repo-add.sh.in:734
 msgid "Cannot create temp directory for database building."
-msgstr ""
-"Veritabanı oluşturulması için gerekli olan geçici dizin oluşturulamadı."
+msgstr "Veritabanı oluşturulması için gerekli olan geçici dizin oluşturulamadı."
 
 #: scripts/repo-add.sh.in:812
 msgid "Creating updated database file '%s'"
@@ -1749,18 +1670,21 @@ msgstr "%s çekilirken hata meydana geldi"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Bilinmeyen referans: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "%s %s deposunun çalışan bir kopyası oluşturuluyor..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "%s %s deposunun çalışan bir kopyası güncellenirken hata meydana geldi"
 
@@ -1792,12 +1716,14 @@ msgstr "%s ile %s açılıyor"
 msgid "Failed to extract %s"
 msgstr "%s arşivi açılamadı"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "%s %s deposu klonlanıyor..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "%s %s deposu indirilirken hata meydana geldi"
@@ -1806,12 +1732,14 @@ msgstr "%s %s deposu indirilirken hata meydana geldi"
 msgid "%s is not a clone of %s"
 msgstr "%s %s deposunun klonu değil"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "%s %s deposu güncelleniyor..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "%s %s deposu güncellenirken hata meydana geldi"
@@ -1854,9 +1782,7 @@ msgstr "Statik kütüphane dosyaları kaldırılıyor..."
 
 #: scripts/libmakepkg/tidy/strip.sh.in:85
 msgid "Stripping unneeded symbols from binaries and libraries..."
-msgstr ""
-"İkilik dosyalardan ve kütüphanelerden gereksiz ayıklama sembolleri "
-"ayıklanıyor..."
+msgstr "İkilik dosyalardan ve kütüphanelerden gereksiz ayıklama sembolleri ayıklanıyor..."
 
 #: scripts/libmakepkg/tidy/upx.sh.in:35
 msgid "Compressing binaries with %s..."
diff --git a/scripts/po/uk.po b/scripts/po/uk.po
index cf19582f..0046b3e5 100644
--- a/scripts/po/uk.po
+++ b/scripts/po/uk.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Max Lyashuk <m_lyashuk@ukr.net>, 2015-2016
 # Rax Garfield <admin@dvizho.ks.ua>, 2012
@@ -13,14 +13,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 07:13+0000\n"
 "Last-Translator: Max Lyashuk <m_lyashuk@ukr.net>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/uk/)\n"
-"Language: uk\n"
+"Language-Team: Ukrainian (http://www.transifex.com/toofishes/archlinux-pacman/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: scripts/makepkg.sh.in:135
 msgid "Cleaning up..."
@@ -101,10 +99,9 @@ msgid "Generating checksums for source files..."
 msgstr "Генерування контрольних сум для вихідних файлів..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
-msgstr ""
-"Не можу знайти бінарний файл %s, необхідний для генерації контрольної суми "
-"джерельного файлу."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
+msgstr "Не можу знайти бінарний файл %s, необхідний для генерації контрольної суми джерельного файлу."
 
 #: scripts/makepkg.sh.in:422
 msgid "Invalid integrity algorithm '%s' specified."
@@ -339,9 +336,7 @@ msgstr "Невідомий протокол звантаження: %s"
 
 #: scripts/makepkg.sh.in:1457
 msgid "Cannot find the %s binary needed to check VCS source requirements."
-msgstr ""
-"Неможливо знайти бінарник %s, який потрібен для перевірки вимагань VCS "
-"джерела."
+msgstr "Неможливо знайти бінарник %s, який потрібен для перевірки вимагань VCS джерела."
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
@@ -353,9 +348,7 @@ msgstr "Не можу знайти бінарник %s, який вимагає
 
 #: scripts/makepkg.sh.in:1516
 msgid "Cannot find the %s binary. Will use %s to acquire root privileges."
-msgstr ""
-"Неможливо знайти бінарник %s. Буде використовуватися %s для отримання прав "
-"суперкористувача."
+msgstr "Неможливо знайти бінарник %s. Буде використовуватися %s для отримання прав суперкористувача."
 
 #: scripts/makepkg.sh.in:1523
 msgid "Cannot find the %s binary."
@@ -372,9 +365,7 @@ msgstr "Не можу знайти бінарник %s, потрібний дл
 #: scripts/makepkg.sh.in:1547
 msgid ""
 "Cannot find the %s binary required for validating source file checksums."
-msgstr ""
-"Не можу знайти бінарник %s, потрібний для перевірки контрольних сум "
-"джерельних файлів."
+msgstr "Не можу знайти бінарник %s, потрібний для перевірки контрольних сум джерельних файлів."
 
 #: scripts/makepkg.sh.in:1555
 msgid "Cannot find the %s binary required for compressing binaries."
@@ -382,8 +373,7 @@ msgstr "Не можу знайти бінарник %s, потрібний дл
 
 #: scripts/makepkg.sh.in:1563
 msgid "Cannot find the %s binary required for optimizing PNG images."
-msgstr ""
-"Не можу знайти бінарник %s, який вимагається для оптимізації малюнків PNG."
+msgstr "Не можу знайти бінарник %s, який вимагається для оптимізації малюнків PNG."
 
 #: scripts/makepkg.sh.in:1571
 msgid "Cannot find the %s binary required for distributed compilation."
@@ -391,8 +381,7 @@ msgstr "Не можу знайти бінарник %s, потрібний дл
 
 #: scripts/makepkg.sh.in:1579
 msgid "Cannot find the %s binary required for compiler cache usage."
-msgstr ""
-"Не можу знайти бінарник %s, потрібний для використання кешу компілятором."
+msgstr "Не можу знайти бінарник %s, потрібний для використання кешу компілятором."
 
 #: scripts/makepkg.sh.in:1587
 msgid "Cannot find the %s binary required for object file stripping."
@@ -400,9 +389,7 @@ msgstr "Не можу знайти бінарник %s, потрібний дл
 
 #: scripts/makepkg.sh.in:1595
 msgid "Cannot find the %s binary required for compressing man and info pages."
-msgstr ""
-"Не можу знайти бінарник %s, потрібний для стиснення довідки man і сторінок "
-"інформації."
+msgstr "Не можу знайти бінарник %s, потрібний для стиснення довідки man і сторінок інформації."
 
 #: scripts/makepkg.sh.in:1615
 msgid "A package has already been built, installing existing package..."
@@ -422,7 +409,8 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "Група пакунків вже зібрана (використайте %s для перезапису)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "Частина групи пакунків вже зібрано. (Використовуєте %s для перезапису)"
 
 #: scripts/makepkg.sh.in:1696
@@ -455,9 +443,7 @@ msgstr "  -d, --nodeps     Пропускати всі перевірки зал
 
 #: scripts/makepkg.sh.in:1705
 msgid "  -e, --noextract  Do not extract source files (use existing %s dir)"
-msgstr ""
-"  -e, --noextract  Не розпаковувати джерельні файли (використати існуючу "
-"теку %s)"
+msgstr "  -e, --noextract  Не розпаковувати джерельні файли (використати існуючу теку %s)"
 
 #: scripts/makepkg.sh.in:1706
 msgid "  -f, --force      Overwrite existing package"
@@ -489,17 +475,16 @@ msgstr "  -o, --nobuild    Тільки завантажити і розпаку
 
 #: scripts/makepkg.sh.in:1713
 msgid "  -p <file>        Use an alternate build script (instead of '%s')"
-msgstr ""
-"  -p <file>        Використовувати інший скрипт збирання (замість '%s')"
+msgstr "  -p <file>        Використовувати інший скрипт збирання (замість '%s')"
 
 #: scripts/makepkg.sh.in:1714
 msgid ""
 "  -r, --rmdeps     Remove installed dependencies after a successful build"
-msgstr ""
-"  -r, --rmdeps     Вилучити встановлені залежності після успішного збирання"
+msgstr "  -r, --rmdeps     Вилучити встановлені залежності після успішного збирання"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  Перепакувати вміст пакунка без збирання"
 
 #: scripts/makepkg.sh.in:1716
@@ -509,9 +494,7 @@ msgstr "  -s, --syncdeps   Встановити пропущені залежн
 #: scripts/makepkg.sh.in:1717
 msgid ""
 "  -S, --source     Generate a source-only tarball without downloaded sources"
-msgstr ""
-"  -S, --source     Згенерувати архів tar тільки з вихідними файлами без "
-"завантажених джерельних файлів"
+msgstr "  -S, --source     Згенерувати архів tar тільки з вихідними файлами без завантажених джерельних файлів"
 
 #: scripts/makepkg.sh.in:1718
 msgid "  -V, --version    Show version information and exit"
@@ -521,8 +504,7 @@ msgstr "  -V, --version             Показати версію програм
 msgid ""
 "  --allsource      Generate a source-only tarball including downloaded "
 "sources"
-msgstr ""
-"  --allsource      Генерувати пакунок вихідного коду, включно із завантаженим"
+msgstr "  --allsource      Генерувати пакунок вихідного коду, включно із завантаженим"
 
 #: scripts/makepkg.sh.in:1720
 msgid "  --check          Run the %s function in the %s"
@@ -530,8 +512,7 @@ msgstr "  --check          Запустити функцію %s в %s"
 
 #: scripts/makepkg.sh.in:1721
 msgid "  --config <file>  Use an alternate config file (instead of '%s')"
-msgstr ""
-"  --config <file>  Використовувати інший файл налаштувань (замість '%s')"
+msgstr "  --config <file>  Використовувати інший файл налаштувань (замість '%s')"
 
 #: scripts/makepkg.sh.in:1722
 msgid "  --holdver        Do not update VCS sources"
@@ -539,10 +520,9 @@ msgstr "  --holdver        Не оновлювати файли з VCS"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
-msgstr ""
-"  --key <key>      Визначити ключ для використання для підпису %s замість "
-"типового ключа"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
+msgstr "  --key <key>      Визначити ключ для використання для підпису %s замість типового ключа"
 
 #: scripts/makepkg.sh.in:1724
 msgid "  --noarchive      Do not create package archive"
@@ -590,9 +570,7 @@ msgstr "  --skippgpcheck   Не перевіряти джерельні файл
 msgid ""
 "  --verifysource   Download source files (if needed) and perform integrity "
 "checks"
-msgstr ""
-"  --verifysource   Звантажити вихідні файли (якщо потрібно) і провести "
-"перевірку цілісності"
+msgstr "  --verifysource   Звантажити вихідні файли (якщо потрібно) і провести перевірку цілісності"
 
 #: scripts/makepkg.sh.in:1736
 msgid "These options can be passed to %s:"
@@ -610,14 +588,11 @@ msgstr "      --needed         Не перевстановлювати паку
 #: scripts/makepkg.sh.in:1740
 msgid ""
 "  --noconfirm      Do not ask for confirmation when resolving dependencies"
-msgstr ""
-"  --noconfirm      Не питати підтвердження під час розв'язання залежностей"
+msgstr "  --noconfirm      Не питати підтвердження під час розв'язання залежностей"
 
 #: scripts/makepkg.sh.in:1741
 msgid "  --noprogressbar  Do not show a progress bar when downloading files"
-msgstr ""
-"  --noprogressbar  Не показувати індикатор прогресу під час завантаження "
-"файлів"
+msgstr "  --noprogressbar  Не показувати індикатор прогресу під час завантаження файлів"
 
 #: scripts/makepkg.sh.in:1743
 msgid "If %s is not specified, %s will look for '%s'"
@@ -625,16 +600,12 @@ msgstr "Якщо %s не вказано, %s буде шукати '%s'"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Всі права захищено (c) 2006-2016 Командою Розробників Pacman <pacman-"
-"dev@archlinux.org>.\\nВсі права захищено (C) 2002-2006 Judd Vinet "
-"<jvinet@zeroflux.org>.\\n\\nЦе є вільне програмне забезпечення; перегляньте "
-"джерельний код щодо умов копіювання.\\nНе існує ЖОДНИХ ГАРАНТІЙ в межах, "
-"дозволених законом.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Всі права захищено (c) 2006-2016 Командою Розробників Pacman <pacman-dev@archlinux.org>.\\nВсі права захищено (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nЦе є вільне програмне забезпечення; перегляньте джерельний код щодо умов копіювання.\\nНе існує ЖОДНИХ ГАРАНТІЙ в межах, дозволених законом.\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -668,14 +639,11 @@ msgstr "У Вас немає прав для того, щоб зберегти 
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"Запуск %s з привілеями суперкористувача - це ДУЖЕ ПОГАНА ІДЕЯ і може "
-"спричинити невідворотну,\\nкатастрофічну шкоду Вашій системі."
+msgstr "Запуск %s з привілеями суперкористувача - це ДУЖЕ ПОГАНА ІДЕЯ і може спричинити невідворотну,\\nкатастрофічну шкоду Вашій системі."
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
-msgstr ""
-"Не використовуйте опцію %s. Ця опція доступна тільки для використання в %s."
+msgstr "Не використовуйте опцію %s. Ця опція доступна тільки для використання в %s."
 
 #: scripts/makepkg.sh.in:1989
 msgid "%s does not exist."
@@ -765,8 +733,7 @@ msgstr "неправильне лінійка шаблону: неможливо
 #: scripts/makepkg-template.pl.in:87
 #, perl-format
 msgid "invalid chars used in name '%s'. allowed: [:alnum:]+_.@-\n"
-msgstr ""
-"в назві використано неправильні символи '%s'. дозволено: [:alnum:]+_.@-\n"
+msgstr "в назві використано неправильні символи '%s'. дозволено: [:alnum:]+_.@-\n"
 
 #: scripts/makepkg-template.pl.in:114
 #, perl-format
@@ -813,9 +780,7 @@ msgstr "  --newest, -n          оновлення шаблонів до нов
 msgid ""
 "                        (default: use version specified in the template "
 "markers)\n"
-msgstr ""
-"                        (типово: використання версії, вказаній в маркерах "
-"шаблону)\n"
+msgstr "                        (типово: використання версії, вказаній в маркерах шаблону)\n"
 
 #: scripts/makepkg-template.pl.in:182
 msgid "  --template-dir <dir>  directory to search for templates\n"
@@ -839,12 +804,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Всі права захищено (c) 2013-2016 Командою Розробників Pacman <pacman-"
-"dev@archlinux.org>.\n"
-"Це є вільне програмне забезпечення; перегляньте джерельний код щодо умов "
-"копіювання.\n"
-"Не існує ЖОДНИХ ГАРАНТІЙ в межах, дозволених законом.\n"
+msgstr "Всі права захищено (c) 2013-2016 Командою Розробників Pacman <pacman-dev@archlinux.org>.\nЦе є вільне програмне забезпечення; перегляньте джерельний код щодо умов копіювання.\nНе існує ЖОДНИХ ГАРАНТІЙ в межах, дозволених законом.\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -856,8 +816,7 @@ msgstr "параметри:"
 
 #: scripts/pacman-db-upgrade.sh.in:43
 msgid "  -b, --dbpath <path>  set an alternate database location"
-msgstr ""
-"  -b, --dbpath <path>  використовувати альтернативний шлях до бази даних"
+msgstr "  -b, --dbpath <path>  використовувати альтернативний шлях до бази даних"
 
 #: scripts/pacman-db-upgrade.sh.in:44
 msgid "  -h, --help           show this help message and exit"
@@ -865,8 +824,7 @@ msgstr "  -h, --help показати це повідомлення і вийт
 
 #: scripts/pacman-db-upgrade.sh.in:45
 msgid "  -r, --root <path>    set an alternate installation root"
-msgstr ""
-"  -r, --root <path> використати альтернативний кореневий каталог встановлення"
+msgstr "  -r, --root <path> використати альтернативний кореневий каталог встановлення"
 
 #: scripts/pacman-db-upgrade.sh.in:46
 msgid "  -V, --version        show version information and exit"
@@ -882,14 +840,10 @@ msgstr "  -m, --nocolor вимкнути кольорові повідомлен
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Всі права захищено (c) 2010-2016 Командою Розробників Pacman <pacman-"
-"dev@archlinux.org>.\\nЦе є вільне програмне забезпечення; перегляньте "
-"джерельний код щодо умов копіювання.\\nНе існує ЖОДНИХ ГАРАНТІЙ, в межах, "
-"дозволених законом.\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Всі права захищено (c) 2010-2016 Командою Розробників Pacman <pacman-dev@archlinux.org>.\\nЦе є вільне програмне забезпечення; перегляньте джерельний код щодо умов копіювання.\\nНе існує ЖОДНИХ ГАРАНТІЙ, в межах, дозволених законом.\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -922,9 +876,7 @@ msgstr "Виявлено формат бази даних перед версі
 
 #: scripts/pacman-db-upgrade.sh.in:195
 msgid "symlink '%s' points outside pacman root, manual repair required"
-msgstr ""
-"символьне посилання '%s' провадить поза кореневу теку pacman, потрібне ручне "
-"втручання"
+msgstr "символьне посилання '%s' провадить поза кореневу теку pacman, потрібне ручне втручання"
 
 #: scripts/pacman-key.sh.in:58
 msgid "Usage: %s [options] operation [targets]"
@@ -940,26 +892,20 @@ msgstr "Операції:"
 
 #: scripts/pacman-key.sh.in:63
 msgid "  -a, --add                 Add the specified keys (empty for stdin)"
-msgstr ""
-"  -a, --add                 Додати вказані ключі (залишити пустим для "
-"вхідного потоку)"
+msgstr "  -a, --add                 Додати вказані ключі (залишити пустим для вхідного потоку)"
 
 #: scripts/pacman-key.sh.in:64
 msgid "  -d, --delete              Remove the specified keyids"
-msgstr ""
-"  -d, --delete              Вилучити ключі з вказаними ідентифікаторами"
+msgstr "  -d, --delete              Вилучити ключі з вказаними ідентифікаторами"
 
 #: scripts/pacman-key.sh.in:65
 msgid "  -e, --export              Export the specified or all keyids"
-msgstr ""
-"  -e, --export              Експорт вказаних або всіх ключів з таким "
-"ідентифікатором"
+msgstr "  -e, --export              Експорт вказаних або всіх ключів з таким ідентифікатором"
 
 #: scripts/pacman-key.sh.in:66
 msgid ""
 "  -f, --finger              List fingerprint for specified or all keyids"
-msgstr ""
-"  -f, --finger  Список відбитків для вказаних або всіх ідентифікаторів ключів"
+msgstr "  -f, --finger  Список відбитків для вказаних або всіх ідентифікаторів ключів"
 
 #: scripts/pacman-key.sh.in:67
 msgid "  -l, --list-keys           List the specified or all keys"
@@ -991,15 +937,11 @@ msgstr "  --import  Імпорт pubring.gpg з теки(тек)"
 msgid ""
 "  --import-trustdb          Imports ownertrust values from trustdb.gpg in "
 "dir(s)"
-msgstr ""
-"  --import-trustdb Імпортувати довірених власників з trustdb.gpg в "
-"теці(теках)"
+msgstr "  --import-trustdb Імпортувати довірених власників з trustdb.gpg в теці(теках)"
 
 #: scripts/pacman-key.sh.in:74
 msgid "  --init                    Ensure the keyring is properly initialized"
-msgstr ""
-"  --init                    Впевнитися що зв’язка ключів правильно "
-"ініціалізована"
+msgstr "  --init                    Впевнитися що зв’язка ключів правильно ініціалізована"
 
 #: scripts/pacman-key.sh.in:75
 msgid "  --list-sigs               List keys and their signatures"
@@ -1007,16 +949,13 @@ msgstr "  --list-sigs    Список ключів і їх підписів"
 
 #: scripts/pacman-key.sh.in:76
 msgid "  --lsign-key               Locally sign the specified keyid"
-msgstr ""
-"  --lsign-key    Локально підписати вказаний ключ з таким ідентифікатором"
+msgstr "  --lsign-key    Локально підписати вказаний ключ з таким ідентифікатором"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate  Перезавантажити типові ключі з (заданих) зв’язок"
-"\\n                            в '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate  Перезавантажити типові ключі з (заданих) зв’язок\\n                            в '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
@@ -1025,19 +964,15 @@ msgstr "  --refresh-keys Оновити вказані або всі ключі
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <file>           Використати альтернативний файл конфігурації "
-"(замість\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <file>           Використати альтернативний файл конфігурації (замість\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            Встановити альтернативну теку для GnuPG (замість"
-"\\n                            '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            Встановити альтернативну теку для GnuPG (замість\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
@@ -1211,24 +1146,17 @@ msgstr "Використання: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize - це маленька програмка, яка покращить швидкодію\\npacman "
-"при читанні/запису до базованої на файловій системі бази даних.\\n\\n"
+msgstr "pacman-optimize - це маленька програмка, яка покращить швидкодію\\npacman при читанні/запису до базованої на файловій системі бази даних.\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"Оскільки pacman використовує багато маленьких файлів для стеження\\nза "
-"пакунками, є можливість їхньої фрагментації з часом.\\nЦей скрипт дає "
-"можливість помістити ці малі файли в одну\\nнеперервну область на вашому "
-"жорсткому диску.\\nВ результаті, жорсткий диск буде в змозі прочитати їх "
-"швидше.\\n"
+msgstr "Оскільки pacman використовує багато маленьких файлів для стеження\\nза пакунками, є можливість їхньої фрагментації з часом.\\nЦей скрипт дає можливість помістити ці малі файли в одну\\nнеперервну область на вашому жорсткому диску.\\nВ результаті, жорсткий диск буде в змозі прочитати їх швидше.\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1279,7 +1207,8 @@ msgid "Rotating database into place..."
 msgstr "Встановлення нової бази даних..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr "Підстановка нової бази не вдалася. Перевірте теки %s, %s, і %s."
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1294,9 +1223,7 @@ msgstr "Використання: pkgdelta [параметри] <пакунок1
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta створить дельта-файл відмінностей між двома пакунками.\\nЦей дельта-"
-"файл можна буде додати до бази даних за допомогою repo-add.\\n"
+msgstr "pkgdelta створить дельта-файл відмінностей між двома пакунками.\\nЦей дельта-файл можна буде додати до бази даних за допомогою repo-add.\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1317,27 +1244,20 @@ msgstr "  --nocolor         вилучити колір з виводу\\n"
 
 #: scripts/pkgdelta.sh.in:62
 msgid "  --min-pkg-size    minimum package size before deltas are generated\\n"
-msgstr ""
-"  --min-pkg-size    мінімальний розмір пакунка перед створенням відмінностей"
-"\\n"
+msgstr "  --min-pkg-size    мінімальний розмір пакунка перед створенням відмінностей\\n"
 
 #: scripts/pkgdelta.sh.in:63
 msgid ""
 "  --max-delta-size  percent of new package above which the delta will be "
 "discarded\\n"
-msgstr ""
-"  --max-delta-size  процент від розміру пакунка, більше від якого "
-"відмінності будуть нехтуватися\\n"
+msgstr "  --max-delta-size  процент від розміру пакунка, більше від якого відмінності будуть нехтуватися\\n"
 
 #: scripts/pkgdelta.sh.in:68
 msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"Всі права застережено (C) 2009 Ксавьє Чантри <shiningxc@gmail.com> . \\n "
-"\\nЦе є вільним програмним забезпеченням; перегляньте джерело для умов "
-"копіювання\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Всі права застережено (C) 2009 Ксавьє Чантри <shiningxc@gmail.com> . \\n \\nЦе є вільним програмним забезпеченням; перегляньте джерело для умов копіювання\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1385,16 +1305,13 @@ msgstr "Неможливо знайти бінарний файл xdelta3! Чи
 
 #: scripts/repo-add.sh.in:55
 msgid "Usage: repo-add [options] <path-to-db> <package|delta> ...\\n"
-msgstr ""
-"Використання: repo-add [параметри] <шлях-до-бази> <пакунок|дельта> ...\\n"
+msgstr "Використання: repo-add [параметри] <шлях-до-бази> <пакунок|дельта> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add оновить базу даних пакунків читаючи файл пакунку.\\nМожна додати "
-"кілька пакунків в одному командному рядку.\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add оновить базу даних пакунків читаючи файл пакунку.\\nМожна додати кілька пакунків в одному командному рядку.\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1402,31 +1319,26 @@ msgstr "  -d, --delta       генерує і додає дельту для о
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr "  -n, --new         тільки додати пакунки, яких ще немає в базі\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
-msgstr ""
-"  -R, --remove      вилучити старий файл пакунку з диску після оновлення "
-"бази даних\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
+msgstr "  -R, --remove      вилучити старий файл пакунку з диску після оновлення бази даних\\n"
 
 #: scripts/repo-add.sh.in:66
 msgid "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\\n"
-msgstr ""
-"Використання: repo-remove [параметри] <шлях-до-бази> <пакунок|дельта> ...\\n"
+msgstr "Використання: repo-remove [параметри] <шлях-до-бази> <пакунок|дельта> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove оновить базу даних пакунків, вилучаючи назву пакунка,"
-"\\nвказаного в командному рядку з даної бази сховища пакунків. \\nМожна "
-"ваказати кілька пакунків в одному командному рядку.\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove оновить базу даних пакунків, вилучаючи назву пакунка,\\nвказаного в командному рядку з даної бази сховища пакунків. \\nМожна ваказати кілька пакунків в одному командному рядку.\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1442,8 +1354,7 @@ msgstr "  -s, --sign        підписати базу даних з GnuPG пі
 
 #: scripts/repo-add.sh.in:81
 msgid "  -k, --key <key>   use the specified key to sign the database\\n"
-msgstr ""
-"  -k, --key <ключ>   використати вибраний ключ для підпису бази даних\\n"
+msgstr "  -k, --key <ключ>   використати вибраний ключ для підпису бази даних\\n"
 
 #: scripts/repo-add.sh.in:82
 msgid "  -v, --verify      verify database's signature before update\\n"
@@ -1457,8 +1368,7 @@ msgstr "\\nДивіться %s(8) про більше деталей і опис
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"Приклад:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "Приклад:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1466,14 +1376,10 @@ msgstr "Приклад:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Всі права захищено (c) 2006-2016 Командою Розробників Pacman <pacman-"
-"dev@archlinux.org>.\\nЦе є вільне програмне забезпечення; перегляньте "
-"джерельний код щодо умов копіювання.\\nНе існує ЖОДНИХ ГАРАНТІЙ, в межах, "
-"дозволених законом.\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Всі права захищено (c) 2006-2016 Командою Розробників Pacman <pacman-dev@archlinux.org>.\\nЦе є вільне програмне забезпечення; перегляньте джерельний код щодо умов копіювання.\\nНе існує ЖОДНИХ ГАРАНТІЙ, в межах, дозволених законом.\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1764,18 +1670,21 @@ msgstr "Невдача під час долучення %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "Нерозпізнана згадка про: %s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "Створення робочої копії %s %s сховища..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "Невдача оновлення робочої копії %s сховища %s"
 
@@ -1807,12 +1716,14 @@ msgstr "Розпаковування %s з %s... "
 msgid "Failed to extract %s"
 msgstr "Не вдалося розпакувати %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "Клонування %s з %s сховища..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "Невдача під час звантаження %s з %s сховища"
@@ -1821,12 +1732,14 @@ msgstr "Невдача під час звантаження %s з %s схови
 msgid "%s is not a clone of %s"
 msgstr "%s не є клоном %s"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "Оновлення %s з %s сховища..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "Невдача при оновлення %s %s сховища"
diff --git a/scripts/po/uz.po b/scripts/po/uz.po
index 35a8d5f2..8a2d53c2 100644
--- a/scripts/po/uz.po
+++ b/scripts/po/uz.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2016-01-17 13:21+1000\n"
+"POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-17 03:32+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
 "Language-Team: Uzbek (http://www.transifex.com/toofishes/archlinux-pacman/language/uz/)\n"
@@ -695,23 +695,23 @@ msgstr ""
 msgid "Could not resolve all dependencies."
 msgstr ""
 
-#: scripts/makepkg.sh.in:2196
+#: scripts/makepkg.sh.in:2197
 msgid "Using existing %s tree"
 msgstr ""
 
-#: scripts/makepkg.sh.in:2203 scripts/makepkg.sh.in:2225
+#: scripts/makepkg.sh.in:2204 scripts/makepkg.sh.in:2227
 msgid "Removing existing %s directory..."
 msgstr ""
 
-#: scripts/makepkg.sh.in:2220
+#: scripts/makepkg.sh.in:2222
 msgid "Sources are ready."
 msgstr ""
 
-#: scripts/makepkg.sh.in:2246
+#: scripts/makepkg.sh.in:2248
 msgid "Package directory is ready."
 msgstr ""
 
-#: scripts/makepkg.sh.in:2250
+#: scripts/makepkg.sh.in:2252
 msgid "Finished making: %s"
 msgstr ""
 
diff --git a/scripts/po/zh_CN.po b/scripts/po/zh_CN.po
index 57b0f353..eb92779d 100644
--- a/scripts/po/zh_CN.po
+++ b/scripts/po/zh_CN.po
@@ -1,9 +1,9 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Felix Yan <felixonmars@gmail.com>, 2015
+# Felix Yan <felixonmars@gmail.com>, 2015-2016
 # Isaac Ge <acgtyrant@gmail.com>, 2014
 # leonfeng <chaofeng111@gmail.com>, 2011
 # leonfeng <chaofeng111@gmail.com>, 2011
@@ -20,14 +20,13 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
-"PO-Revision-Date: 2016-01-17 05:29+0000\n"
-"Last-Translator: mytbk <mytbk920423@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/zh_CN/)\n"
-"Language: zh_CN\n"
+"PO-Revision-Date: 2016-02-01 15:41+0000\n"
+"Last-Translator: Felix Yan <felixonmars@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/toofishes/archlinux-pacman/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: scripts/makepkg.sh.in:135
@@ -109,7 +108,8 @@ msgid "Generating checksums for source files..."
 msgstr "正在为源代码文件创建完整性检查值..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
 msgstr "无法找到生成源文件检验值所需的 %s 库。"
 
 #: scripts/makepkg.sh.in:422
@@ -349,7 +349,7 @@ msgstr "找不到用来检查 VCS 源需求的 %s 库"
 
 #: scripts/makepkg.sh.in:1485
 msgid "Cannot find the %s package needed to handle %s sources."
-msgstr "找不到 % 软件包以处理 %s 源。"
+msgstr "找不到 %s 软件包以处理 %s 源。"
 
 #: scripts/makepkg.sh.in:1508
 msgid "Cannot find the %s binary required for dependency operations."
@@ -418,7 +418,8 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "该软件包组已创建过。(使用 %s 覆盖)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "软件包组的一部分已经创建过。(使用 %s 覆盖)"
 
 #: scripts/makepkg.sh.in:1696
@@ -491,7 +492,8 @@ msgid ""
 msgstr "  -r, --rmdeps     编译成功后删除安装的依赖关系"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  不编译而重新打包软件包内容"
 
 #: scripts/makepkg.sh.in:1716
@@ -527,7 +529,8 @@ msgstr "--holdver 不升级版本控制系统源"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
 msgstr "--key <密匙>      指定签名 %s 使用的密匙而不用默认密匙"
 
 #: scripts/makepkg.sh.in:1724
@@ -606,14 +609,12 @@ msgstr "如果没有指定 %s,%s 将寻找 '%s'"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman 开发小组 <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\n本程序是自"
-"由软件;版权情况请详见源代码。\\n无法律所允许范围内的任何担保。 \\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman 开发小组 <pacman-dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\n本程序是自由软件;版权情况请详见源代码。\\n无法律所允许范围内的任何担保。 \\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -812,10 +813,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (c) 2013-2016 Pacman 开发小组 <pacman-dev@archlinux.org>。\n"
-"本程序是自由软件;版权情况请详见源代码。\n"
-"无法律所允许范围内的任何担保。\n"
+msgstr "Copyright (c) 2013-2016 Pacman 开发小组 <pacman-dev@archlinux.org>。\n本程序是自由软件;版权情况请详见源代码。\n无法律所允许范围内的任何担保。\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -851,12 +849,10 @@ msgstr "--nocolor 禁止彩色输出信息"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2010-2016 Pacman 开发小组 <pacman-dev@archlinux.org>.\\n本程序"
-"是自由软件;版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2010-2016 Pacman 开发小组 <pacman-dev@archlinux.org>.\\n本程序是自由软件;版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -966,10 +962,9 @@ msgstr "  --lsign-key                  在本地签名指定的密匙识别号"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate              从 (给定的) 密匙环中重新加载默认密匙\\n(在'%s'中)"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate              从 (给定的) 密匙环中重新加载默认密匙\\n(在'%s'中)"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
@@ -978,17 +973,15 @@ msgstr "  --refresh-keys            从密匙服务器中更新指定的或所
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
 msgstr "--config <file>           使用另外的配置文件(而不是\\n '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            为 GnuPG 设定的另外目录 (而"
-"\\n                            非 '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            为 GnuPG 设定的另外目录 (而\\n                            非 '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
@@ -1162,22 +1155,17 @@ msgstr "用法: %s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize 是一个小 hack,用于提高 pacman\\n读/写基于文件系统的数据库时"
-"的性能。\\n\\n"
+msgstr "pacman-optimize 是一个小 hack,用于提高 pacman\\n读/写基于文件系统的数据库时的性能。\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"因为 pacman 使用许多小文件来跟踪软件包。\\n久而久之这些文件有倾向变得零"
-"碎。\\n本脚本尝试把这些小文件重新放置到硬盘上的一个连续的位置。\\n结果是硬盘"
-"磁头由于不用再在碟片上移来移去,从而可以读取得更快。\\n"
+msgstr "因为 pacman 使用许多小文件来跟踪软件包。\\n久而久之这些文件有倾向变得零碎。\\n本脚本尝试把这些小文件重新放置到硬盘上的一个连续的位置。\\n结果是硬盘磁头由于不用再在碟片上移来移去,从而可以读取得更快。\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1228,7 +1216,8 @@ msgid "Rotating database into place..."
 msgstr "正在把数据库放置到位..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr "替换新数据库失败。请检查 %s、%s 和 %s 目录。"
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1243,9 +1232,7 @@ msgstr "用法: pkgdelta [options] <package1> <package2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta 将在两个软件包中创建增量文件。\\n该增量文件可通过使用 repo-add 添加"
-"到数据库中。\\n"
+msgstr "pkgdelta 将在两个软件包中创建增量文件。\\n该增量文件可通过使用 repo-add 添加到数据库中。\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1279,9 +1266,7 @@ msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"版权所有 (c)  2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\n本程序是自由软"
-"件;请参阅版权条款。\\n没有任何担保,在法律允许的范围内。\\n"
+msgstr "版权所有 (c)  2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\n本程序是自由软件;请参阅版权条款。\\n没有任何担保,在法律允许的范围内。\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1333,11 +1318,9 @@ msgstr "用法:repo-add [选项] <到数据库路径> <软件包|delta增量
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add 会通过读取某个软件包来更新软件包数据库。\\n可以在命令行中添加多个指"
-"定的软件包。\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add 会通过读取某个软件包来更新软件包数据库。\\n可以在命令行中添加多个指定的软件包。\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1345,13 +1328,14 @@ msgstr "  -d, --delta       生成并添加软件包更新所用的 delta 增量
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr " -n, --new 只增加数据库中没有的包\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
 msgstr "-R, --remove 在更新数据库之后,删除旧的软件包文件\\n"
 
 #: scripts/repo-add.sh.in:66
@@ -1360,12 +1344,10 @@ msgstr "用法:repo-remove [选项] <数据库路径> <软件包名|增量包>
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove 会通过移除从给定的软件库数据库的命令行中\\n指定的软件包名来更新软"
-"件包数据库。\\n可以在命令行中移除多个指定的软件包。\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove 会通过移除从给定的软件库数据库的命令行中\\n指定的软件包名来更新软件包数据库。\\n可以在命令行中移除多个指定的软件包。\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1395,8 +1377,7 @@ msgstr "\\n更多可用选项的描述及细节请参见 %s(8)。\\n"
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"示例:repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "示例:repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1404,12 +1385,10 @@ msgstr "示例:repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"Copyright (c) 2006-2016 Pacman 开发小组 <pacman-dev@archlinux.org>.\\n本程序"
-"是自由软件;版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "Copyright (c) 2006-2016 Pacman 开发小组 <pacman-dev@archlinux.org>.\\n本程序是自由软件;版权情况请详见源代码。\\n无法律所允许范围内的任何担保。\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1700,18 +1679,21 @@ msgstr "获取 %s 的最新版本失败"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "未知引用:%s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "正在建立 %s %s 仓库的拷贝..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "升级 %s %s 仓库的活动拷贝失败"
 
@@ -1743,12 +1725,14 @@ msgstr "正在解压缩 %s,使用 %s"
 msgid "Failed to extract %s"
 msgstr "无法解压缩 %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "正在克隆 %s %s 仓库..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "下载 %s %s 仓库失败"
@@ -1757,12 +1741,14 @@ msgstr "下载 %s %s 仓库失败"
 msgid "%s is not a clone of %s"
 msgstr "%s 不是 %s 的克隆"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "正在升级 %s %s 仓库..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "升级 %s %s 仓库失败"
diff --git a/scripts/po/zh_TW.po b/scripts/po/zh_TW.po
index ef2684ab..7ae8abe1 100644
--- a/scripts/po/zh_TW.po
+++ b/scripts/po/zh_TW.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # BrLi <rainman59118@gmail.com>, 2014-2015
 # dlin <dlin.tw@gmail.com>, 2014
@@ -14,12 +14,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-30 10:08+1000\n"
 "PO-Revision-Date: 2016-01-18 03:19+0000\n"
 "Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/zh_TW/)\n"
-"Language: zh_TW\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/toofishes/archlinux-pacman/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: scripts/makepkg.sh.in:135
@@ -101,7 +100,8 @@ msgid "Generating checksums for source files..."
 msgstr "正在生成來源檔案的校驗碼..."
 
 #: scripts/makepkg.sh.in:408
-msgid "Cannot find the %s binary required for generating sourcefile checksums."
+msgid ""
+"Cannot find the %s binary required for generating sourcefile checksums."
 msgstr "找不到生成來源檔案校驗碼所需的二進位檔 %s 。"
 
 #: scripts/makepkg.sh.in:422
@@ -410,7 +410,8 @@ msgid "The package group has already been built. (use %s to overwrite)"
 msgstr "套件群組早已建置過。(使用 %s 將之覆蓋)"
 
 #: scripts/makepkg.sh.in:1647
-msgid "Part of the package group has already been built. (use %s to overwrite)"
+msgid ""
+"Part of the package group has already been built. (use %s to overwrite)"
 msgstr "套件群組的其中一部份早已建置過。(使用 %s 將之覆蓋)"
 
 #: scripts/makepkg.sh.in:1696
@@ -483,7 +484,8 @@ msgid ""
 msgstr "  -r, --rmdeps     在建置成功後移除安裝的依賴關係"
 
 #: scripts/makepkg.sh.in:1715
-msgid "  -R, --repackage  Repackage contents of the package without rebuilding"
+msgid ""
+"  -R, --repackage  Repackage contents of the package without rebuilding"
 msgstr "  -R, --repackage  重新打包套件的內容但不重新建置"
 
 #: scripts/makepkg.sh.in:1716
@@ -519,7 +521,8 @@ msgstr "  --holdver        不更新 VCS 來源檔案"
 
 #: scripts/makepkg.sh.in:1723
 msgid ""
-"  --key <key>      Specify a key to use for %s signing instead of the default"
+"  --key <key>      Specify a key to use for %s signing instead of the "
+"default"
 msgstr "  --key <key>      指定一個金鑰用以簽署 %s ,而非使用預設的"
 
 #: scripts/makepkg.sh.in:1724
@@ -598,14 +601,12 @@ msgstr "若未指定 %s,則 %s 將查找「%s」"
 
 #: scripts/makepkg.sh.in:1749 scripts/pacman-optimize.sh.in:53
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nCopyright (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>.\\n\\nThis is "
-"free software; see the source for copying conditions.\\nThere is NO "
-"WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"著作權所有 (c) 2006-2016 Pacman 開發團隊 <pacman-dev@archlinux.org>。\\n著作"
-"權所有 (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>。\\n\\n這是自由軟體;請"
-"見原始碼瞭解授權條款。\\n於法律許可範圍之內「不予任何保證」。\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nCopyright (C) 2002-2006 Judd Vinet "
+"<jvinet@zeroflux.org>.\\n\\nThis is free software; see the source for "
+"copying conditions.\\nThere is NO WARRANTY, to the extent permitted by "
+"law.\\n"
+msgstr "著作權所有 (c) 2006-2016 Pacman 開發團隊 <pacman-dev@archlinux.org>。\\n著作權所有 (C) 2002-2006 Judd Vinet <jvinet@zeroflux.org>。\\n\\n這是自由軟體;請見原始碼瞭解授權條款。\\n於法律許可範圍之內「不予任何保證」。\\n"
 
 #: scripts/makepkg.sh.in:1851 scripts/repo-add.sh.in:743
 msgid "%s signal caught. Exiting..."
@@ -639,9 +640,7 @@ msgstr "您尚未獲得在 %s 中儲存記錄的寫入許可。"
 msgid ""
 "Running %s as root is not allowed as it can cause permanent,\\ncatastrophic "
 "damage to your system."
-msgstr ""
-"由於以 root 身份執行 %s 會導致永恆的、無法收拾的\\n悲劇性系統毀滅,所以很抱"
-"歉,不能允許這麼做。"
+msgstr "由於以 root 身份執行 %s 會導致永恆的、無法收拾的\\n悲劇性系統毀滅,所以很抱歉,不能允許這麼做。"
 
 #: scripts/makepkg.sh.in:1978
 msgid "Do not use the %s option. This option is only for use by %s."
@@ -806,10 +805,7 @@ msgid ""
 "Copyright (c) 2013-2016 Pacman Development Team <pacman-dev@archlinux.org>.\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"著作權所有 (c) 2013-2016 Pacman 開發團隊 <pacman-dev@archlinux.org>。\n"
-"這是自由軟體;請見原始碼瞭解授權條款。\n"
-"於法律許可範圍之內「不予任何保證」。\n"
+msgstr "著作權所有 (c) 2013-2016 Pacman 開發團隊 <pacman-dev@archlinux.org>。\n這是自由軟體;請見原始碼瞭解授權條款。\n於法律許可範圍之內「不予任何保證」。\n"
 
 #: scripts/pacman-db-upgrade.sh.in:38
 msgid "Upgrade the local pacman database to a newer format"
@@ -845,13 +841,10 @@ msgstr "  --nocolor            停用色彩化輸出訊息"
 
 #: scripts/pacman-db-upgrade.sh.in:54 scripts/pacman-key.sh.in:94
 msgid ""
-"Copyright (c) 2010-2016 Pacman Development Team <pacman-dev@archlinux.org>."
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"著作權所有 (c) 2010-2016 Pacman 開發團隊 <pacman-dev@archlinux.org>。\\n\\n這"
-"是自由軟體;請見原始碼瞭解授權條款。\\n於法律許可範圍之內「不予任何保"
-"證」。\\n"
+"Copyright (c) 2010-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>.\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "著作權所有 (c) 2010-2016 Pacman 開發團隊 <pacman-dev@archlinux.org>。\\n\\n這是自由軟體;請見原始碼瞭解授權條款。\\n於法律許可範圍之內「不予任何保證」。\\n"
 
 #: scripts/pacman-db-upgrade.sh.in:132 scripts/pacman-optimize.sh.in:105
 #: scripts/repo-add.sh.in:514
@@ -961,11 +954,9 @@ msgstr "  --lsign-key               本地端簽署指定的金鑰代號"
 
 #: scripts/pacman-key.sh.in:77
 msgid ""
-"  --populate                Reload the default keys from the (given) keyrings"
-"\\n                            in '%s'"
-msgstr ""
-"  --populate                重新自鑰匙圈載入預設的金鑰"
-"\\n                            自 '%s'"
+"  --populate                Reload the default keys from the (given) "
+"keyrings\\n                            in '%s'"
+msgstr "  --populate                重新自鑰匙圈載入預設的金鑰\\n                            自 '%s'"
 
 #: scripts/pacman-key.sh.in:79
 msgid ""
@@ -974,19 +965,15 @@ msgstr "  --refresh-keys            從金鑰伺服器更新指定或全部的
 
 #: scripts/pacman-key.sh.in:82
 msgid ""
-"  --config <file>           Use an alternate config file (instead of"
-"\\n                            '%s')"
-msgstr ""
-"  --config <file>           另行指定設定檔(代替"
-"\\n                            '%s')"
+"  --config <file>           Use an alternate config file (instead of\\n"
+"                            '%s')"
+msgstr "  --config <file>           另行指定設定檔(代替\\n                            '%s')"
 
 #: scripts/pacman-key.sh.in:84
 msgid ""
-"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead"
-"\\n                            of '%s')"
-msgstr ""
-"  --gpgdir <dir>            給 GnuPG 設定其他的目錄 (代替"
-"\\n                             '%s')"
+"  --gpgdir <dir>            Set an alternate directory for GnuPG (instead\\n"
+"                            of '%s')"
+msgstr "  --gpgdir <dir>            給 GnuPG 設定其他的目錄 (代替\\n                             '%s')"
 
 #: scripts/pacman-key.sh.in:86
 msgid "  --keyserver <server-url>  Specify a keyserver to use if necessary"
@@ -1160,23 +1147,17 @@ msgstr "用法:%s [--nocolor] [pacman_db_root]"
 msgid ""
 "pacman-optimize is a little hack that should improve the performance\\nof "
 "pacman when reading/writing to its filesystem-based database.\\n\\n"
-msgstr ""
-"pacman-optimize 是個應可改善 pacman 讀取/寫入其\\n檔案系統式資料庫之效率的小"
-"小 hack。\\n\\n"
+msgstr "pacman-optimize 是個應可改善 pacman 讀取/寫入其\\n檔案系統式資料庫之效率的小小 hack。\\n\\n"
 
 #: scripts/pacman-optimize.sh.in:42
 msgid ""
-"Because pacman uses many small files to keep track of packages,\\nthere is a "
-"tendency for these files to become fragmented over time.\\nThis script "
+"Because pacman uses many small files to keep track of packages,\\nthere is a"
+" tendency for these files to become fragmented over time.\\nThis script "
 "attempts to relocate these small files into one\\ncontinuous location on "
 "your hard drive. The result is that the hard\\ndrive should be able to read "
 "them faster, since the hard drive head\\ndoes not have to move around the "
 "disk as much.\\n"
-msgstr ""
-"由於 pacman 使用許多小檔案來追蹤套件,\\n所以隨著時間過去,這些檔案容易逐漸碎"
-"亂。\\n本指令稿會試圖重新將這些小檔案放置在硬碟\\n連續的位置上。結果應該可以"
-"讓硬碟讀取這些\\n檔案時能快一些,因為硬碟讀取頭就不必像以\\n往那般奔波勞累"
-"了。\\n"
+msgstr "由於 pacman 使用許多小檔案來追蹤套件,\\n所以隨著時間過去,這些檔案容易逐漸碎亂。\\n本指令稿會試圖重新將這些小檔案放置在硬碟\\n連續的位置上。結果應該可以讓硬碟讀取這些\\n檔案時能快一些,因為硬碟讀取頭就不必像以\\n往那般奔波勞累了。\\n"
 
 #: scripts/pacman-optimize.sh.in:101
 msgid "Cannot find the %s binary required for verifying integrity."
@@ -1227,7 +1208,8 @@ msgid "Rotating database into place..."
 msgstr "正將資料庫旋轉到位..."
 
 #: scripts/pacman-optimize.sh.in:175
-msgid "New database substitution failed. Check for %s, %s, and %s directories."
+msgid ""
+"New database substitution failed. Check for %s, %s, and %s directories."
 msgstr "新資料庫替換失敗。檢查 %s、%s 與 %s 目錄。"
 
 #: scripts/pacman-optimize.sh.in:184
@@ -1242,9 +1224,7 @@ msgstr "用法:pkgdelta [選項] <package1> <package2>\\n"
 msgid ""
 "pkgdelta will create a delta file between two packages.\\nThis delta file "
 "can then be added to a database using repo-add.\\n"
-msgstr ""
-"pkgdelta 會根據兩個套件之間的差異建立增修檔。\\n此增修檔接著可以用 repo-add "
-"加入資料庫中。\\n"
+msgstr "pkgdelta 會根據兩個套件之間的差異建立增修檔。\\n此增修檔接著可以用 repo-add 加入資料庫中。\\n"
 
 #: scripts/pkgdelta.sh.in:57
 msgid "Example:  pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz"
@@ -1278,9 +1258,7 @@ msgid ""
 "Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>.\\n\\nThis is free "
 "software; see the source for copying conditions.\\nThere is NO WARRANTY, to "
 "the extent permitted by law.\\n"
-msgstr ""
-"著作權所有 (c) 2009 Xavier Chantry <shiningxc@gmail.com>。\\n\\n這是自由軟"
-"體;請見原始碼瞭解授權規約。\\n於法律許可範圍之內「不予任何保證」。\\n"
+msgstr "著作權所有 (c) 2009 Xavier Chantry <shiningxc@gmail.com>。\\n\\n這是自由軟體;請見原始碼瞭解授權規約。\\n於法律許可範圍之內「不予任何保證」。\\n"
 
 #: scripts/pkgdelta.sh.in:94 scripts/repo-add.sh.in:346
 msgid "Invalid package file '%s'."
@@ -1332,11 +1310,9 @@ msgstr "用法:repo-add [options] <path-to-db> <package|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:57
 msgid ""
-"repo-add will update a package database by reading a package file."
-"\\nMultiple packages to add can be specified on the command line.\\n"
-msgstr ""
-"repo-add 會讀取套件檔案來更新套件資料庫。\\n可以在指令列指定要加入多份套"
-"件。\\n"
+"repo-add will update a package database by reading a package "
+"file.\\nMultiple packages to add can be specified on the command line.\\n"
+msgstr "repo-add 會讀取套件檔案來更新套件資料庫。\\n可以在指令列指定要加入多份套件。\\n"
 
 #: scripts/repo-add.sh.in:62
 msgid "  -d, --delta       generate and add delta for package update\\n"
@@ -1344,13 +1320,14 @@ msgstr "  -d, --delta       生成並為套件更新加入增修檔\\n"
 
 #: scripts/repo-add.sh.in:63
 msgid ""
-"  -n, --new         only add packages that are not already in the database\\n"
+"  -n, --new         only add packages that are not already in the "
+"database\\n"
 msgstr "  -n, --new         僅加入尚未在資料庫中的套件\\n"
 
 #: scripts/repo-add.sh.in:64
 msgid ""
-"  -R, --remove      remove old package file from disk after updating database"
-"\\n"
+"  -R, --remove      remove old package file from disk after updating "
+"database\\n"
 msgstr "  -R, --remove      更新資料庫後從磁碟移除舊的套件檔案\\n"
 
 #: scripts/repo-add.sh.in:66
@@ -1359,12 +1336,10 @@ msgstr "用法:repo-remove [選項] <path-to-db> <packagename|delta> ...\\n"
 
 #: scripts/repo-add.sh.in:68
 msgid ""
-"repo-remove will update a package database by removing the package name"
-"\\nspecified on the command line from the given repo database. Multiple"
-"\\npackages to remove can be specified on the command line.\\n"
-msgstr ""
-"repo-remove 會從給定的套件資料庫中移除指令列內指定的\\n套件名稱來更新套件資料"
-"庫。可以在指令列中\\n指定多個要移除的套件。\\n"
+"repo-remove will update a package database by removing the package "
+"name\\nspecified on the command line from the given repo database. "
+"Multiple\\npackages to remove can be specified on the command line.\\n"
+msgstr "repo-remove 會從給定的套件資料庫中移除指令列內指定的\\n套件名稱來更新套件資料庫。可以在指令列中\\n指定多個要移除的套件。\\n"
 
 #: scripts/repo-add.sh.in:75
 msgid "Please move along, there is nothing to see here.\\n"
@@ -1394,8 +1369,7 @@ msgstr "\\n請見 %s(8) 瞭解更多可用選項的細節與描述。\\n"
 #: scripts/repo-add.sh.in:87
 msgid ""
 "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
-msgstr ""
-"範例:repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
+msgstr "範例:repo-add /path/to/repo.db.tar.gz pacman-3.0.0-1-i686.pkg.tar.gz\\n"
 
 #: scripts/repo-add.sh.in:89
 msgid "Example:  repo-remove /path/to/repo.db.tar.gz kernel26\\n"
@@ -1403,12 +1377,10 @@ msgstr "範例:repo-remove /path/to/repo.db.tar.gz kernel26\\n"
 
 #: scripts/repo-add.sh.in:96
 msgid ""
-"Copyright (c) 2006-2016 Pacman Development Team <pacman-dev@archlinux.org>\\n"
-"\\nThis is free software; see the source for copying conditions.\\nThere is "
-"NO WARRANTY, to the extent permitted by law.\\n"
-msgstr ""
-"著作權所有 (c) 2006-2016 Pacman 開發團隊 <pacman-dev@archlinux.org>\\n\\n這是"
-"自由軟體;請見原始碼瞭解授權條款。\\n於法律許可範圍之內「不予任何保證」。\\n"
+"Copyright (c) 2006-2016 Pacman Development Team <pacman-"
+"dev@archlinux.org>\\n\\nThis is free software; see the source for copying "
+"conditions.\\nThere is NO WARRANTY, to the extent permitted by law.\\n"
+msgstr "著作權所有 (c) 2006-2016 Pacman 開發團隊 <pacman-dev@archlinux.org>\\n\\n這是自由軟體;請見原始碼瞭解授權條款。\\n於法律許可範圍之內「不予任何保證」。\\n"
 
 #: scripts/repo-add.sh.in:146
 msgid "No database entry for package '%s'."
@@ -1699,18 +1671,21 @@ msgstr "拉出 %s 時失敗"
 
 #: scripts/libmakepkg/source/bzr.sh.in:80
 #: scripts/libmakepkg/source/git.sh.in:112
-#: scripts/libmakepkg/source/hg.sh.in:84 scripts/libmakepkg/source/svn.sh.in:57
+#: scripts/libmakepkg/source/hg.sh.in:84
+#: scripts/libmakepkg/source/svn.sh.in:57
 msgid "Unrecognized reference: %s"
 msgstr "無法辨識的參考點:%s"
 
 #: scripts/libmakepkg/source/bzr.sh.in:89
-#: scripts/libmakepkg/source/git.sh.in:81 scripts/libmakepkg/source/hg.sh.in:74
+#: scripts/libmakepkg/source/git.sh.in:81
+#: scripts/libmakepkg/source/hg.sh.in:74
 #: scripts/libmakepkg/source/svn.sh.in:90
 msgid "Creating working copy of %s %s repo..."
 msgstr "正在建立 %s %s 庫的工作副本..."
 
 #: scripts/libmakepkg/source/bzr.sh.in:95
-#: scripts/libmakepkg/source/git.sh.in:89 scripts/libmakepkg/source/hg.sh.in:93
+#: scripts/libmakepkg/source/git.sh.in:89
+#: scripts/libmakepkg/source/hg.sh.in:93
 msgid "Failure while updating working copy of %s %s repo"
 msgstr "更新 %s %s 庫的工作副本時失敗"
 
@@ -1742,12 +1717,14 @@ msgstr "正在解壓縮 %s 使用 %s"
 msgid "Failed to extract %s"
 msgstr "無法解壓縮 %s"
 
-#: scripts/libmakepkg/source/git.sh.in:44 scripts/libmakepkg/source/hg.sh.in:44
+#: scripts/libmakepkg/source/git.sh.in:44
+#: scripts/libmakepkg/source/hg.sh.in:44
 #: scripts/libmakepkg/source/svn.sh.in:64
 msgid "Cloning %s %s repo..."
 msgstr "再製 %s %s 庫中..."
 
-#: scripts/libmakepkg/source/git.sh.in:46 scripts/libmakepkg/source/hg.sh.in:46
+#: scripts/libmakepkg/source/git.sh.in:46
+#: scripts/libmakepkg/source/hg.sh.in:46
 #: scripts/libmakepkg/source/svn.sh.in:67
 msgid "Failure while downloading %s %s repo"
 msgstr "下載 %s %s 庫時失敗"
@@ -1756,12 +1733,14 @@ msgstr "下載 %s %s 庫時失敗"
 msgid "%s is not a clone of %s"
 msgstr "%s 並非 %s 的再製本"
 
-#: scripts/libmakepkg/source/git.sh.in:58 scripts/libmakepkg/source/hg.sh.in:51
+#: scripts/libmakepkg/source/git.sh.in:58
+#: scripts/libmakepkg/source/hg.sh.in:51
 #: scripts/libmakepkg/source/svn.sh.in:72
 msgid "Updating %s %s repo..."
 msgstr "更新 %s %s 庫中..."
 
-#: scripts/libmakepkg/source/git.sh.in:61 scripts/libmakepkg/source/hg.sh.in:55
+#: scripts/libmakepkg/source/git.sh.in:61
+#: scripts/libmakepkg/source/hg.sh.in:55
 #: scripts/libmakepkg/source/svn.sh.in:76
 msgid "Failure while updating %s %s repo"
 msgstr "更新 %s %s 庫時失敗"
diff --git a/src/pacman/po/ar.po b/src/pacman/po/ar.po
index 8ec8edcd..650a0e62 100644
--- a/src/pacman/po/ar.po
+++ b/src/pacman/po/ar.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # kraim <biskraim@gmail.com>, 2013
 # kraim <biskraim@gmail.com>, 2013
@@ -19,14 +19,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 03:30+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Arabic (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ar/)\n"
-"Language: ar\n"
+"Language-Team: Arabic (http://www.transifex.com/toofishes/archlinux-pacman/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #: src/pacman/callback.c:182
 #, c-format
@@ -183,7 +181,8 @@ msgstr "%s تتعارض مع %s ‏(%s). أأزيل %s؟"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
 msgstr[0] "رُقّيت كلّ الحزم\n"
 msgstr[1] "تعذّرت ترقية الحزمة الآتية بسبب عدم استيفاء اعتماديّاتها:\n"
 msgstr[2] "تعذّرت ترقية الحزمتين الآتيتين بسبب عدم استيفاء اعتماديّاتيهما:\n"
@@ -218,9 +217,7 @@ msgstr[5] ""
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"الملف %s تالف (%s).\n"
-"أتريد حذفه؟"
+msgstr "الملف %s تالف (%s).\nأتريد حذفه؟"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -458,9 +455,7 @@ msgstr "تعذّرت إضافة المرآة '%s' إلى قاعدة البيان
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"تعذّر تمهيد مكتبة alpm\n"
-"(%s: %s)\n"
+msgstr "تعذّر تمهيد مكتبة alpm\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -785,14 +780,13 @@ msgstr "العمليّات:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"استخدم '‎%s {-h --help}‎' مع عمليّة من الخيارات المتوفّرة\n"
+msgstr "\nاستخدم '‎%s {-h --help}‎' مع عمليّة من الخيارات المتوفّرة\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
 msgstr "‎-c،‏ ‎--cascade أزل الحزم وأزل كلّ ما يعتمد عليها\n"
 
 #: src/pacman/pacman.c:126
@@ -805,9 +799,7 @@ msgstr "‎-n،‏ ‎--nosave أزل ملفّات الضّبط\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"‎-s،‏ ‎--recursive أزل الحزم غير الضّروريّة\n"
-"(‎-ss يضمّن أيضًا الاعتماديّات المثبّتة بوضوح)\n"
+msgstr "‎-s،‏ ‎--recursive أزل الحزم غير الضّروريّة\n(‎-ss يضمّن أيضًا الاعتماديّات المثبّتة بوضوح)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -842,8 +834,7 @@ msgstr "‎-g،‏ ‎--groups اعرض كلّ أعضاء مجموعة حزم\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
 msgstr "‎-i،‏ ‎--info اعرض معلومات الحزمة (‎-ii لملفّات النّسخ الاحتياطيّ)\n"
 
 #: src/pacman/pacman.c:142
@@ -863,19 +854,14 @@ msgstr "‎-l،‏ ‎--list اعرض الملفّات الّتي تملكها 
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"‎-m،‏ ‎--foreign اعرض الحزم المثبّتة غير المعثور عليها في قاعدة/قواعد بيانات "
-"المزامة [مرشّح]\n"
+msgstr "‎-m،‏ ‎--foreign اعرض الحزم المثبّتة غير المعثور عليها في قاعدة/قواعد بيانات المزامة [مرشّح]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"‎-n،‏ ‎--native اسرد الحزم المثبّتة المعثور عليها فقط في قاعدة/قواعد البيانات "
-"[مرشّح]\n"
-"\n"
+msgstr "‎-n،‏ ‎--native اسرد الحزم المثبّتة المعثور عليها فقط في قاعدة/قواعد البيانات [مرشّح]\n\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -890,26 +876,21 @@ msgstr "  -p, --file <package> استعلم عن ملف الحزمة بدلًا
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"‎-q،‏ ‎--quiet أظهر معلومات أقلّ للاستعلام والبحث\n"
-"\n"
+msgstr "‎-q،‏ ‎--quiet أظهر معلومات أقلّ للاستعلام والبحث\n\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"-s,   --search <regex> بحث محليا عن الحزم المثبته في المقاطع المطابقة\n"
+msgstr "-s,   --search <regex> بحث محليا عن الحزم المثبته في المقاطع المطابقة\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"‎-t،‏ ‎--unrequired اسرد الحزم الّتي لا تطلبها (الاختياريّة) أيّة حزمة (‎--t لتجاهل "
-"optdepends) [مرشّح]\n"
+msgstr "‎-t،‏ ‎--unrequired اسرد الحزم الّتي لا تطلبها (الاختياريّة) أيّة حزمة (‎--t لتجاهل optdepends) [مرشّح]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -928,18 +909,14 @@ msgstr "‎-c،‏ ‎--clean أزل الحزم القديمة من دليل ا
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"‎-g،‏ ‎--groups اعرض كلّ أعضاء مجموعة حزم (‎--gg لعرض كلّ المجموعات وأعضائها)\n"
-"\n"
+msgstr "‎-g،‏ ‎--groups اعرض كلّ أعضاء مجموعة حزم (‎--gg لعرض كلّ المجموعات وأعضائها)\n\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info           أظهر معلومات الحزمة (-ii من أجل المعلومات الممتدة )\n"
-"\n"
+msgstr "  -i, --info           أظهر معلومات الحزمة (-ii من أجل المعلومات الممتدة )\n\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -948,8 +925,7 @@ msgstr "-l, --list <repo> اظهر قائمة الحزم التى في repo\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr "-s, --search <regex> ابحث في الحزم البعيدة عن المقاطع المطابقة\n"
 
 #: src/pacman/pacman.c:163
@@ -970,9 +946,7 @@ msgstr "-w, --downloadonly حمل الحزم ولكن لا تثبتها او ت
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"-y, --refresh حمل نسخه حديثه من قاعدة بيانات الحزمة من الخادم\n"
-"(-yy نسخه حديثه حتي ولو كانت اخر اصادر)\n"
+msgstr "-y, --refresh حمل نسخه حديثه من قاعدة بيانات الحزمة من الخادم\n(-yy نسخه حديثه حتي ولو كانت اخر اصادر)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -1035,9 +1009,7 @@ msgstr "--ignore <pkg> تجاهل ترقية الحزمة (ممكن ان يست
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"--ignoregroup <grp>\n"
-"تجاهل ترقية المجموعة (ممكن ان يستخدم اكثر من مرة)\n"
+msgstr "--ignoregroup <grp>\nتجاهل ترقية المجموعة (ممكن ان يستخدم اكثر من مرة)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
@@ -1051,14 +1023,11 @@ msgstr "-d, --nodeps تخطى اعتمادية التحقق من الاصدار
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"--assume-installed <package=version>\n"
-"اضف حزمة وهميه لتلبية التبعيات\n"
+msgstr "--assume-installed <package=version>\nاضف حزمة وهميه لتلبية التبعيات\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
 msgstr "--dbonly عدل فقط مدخلات قاعدة البيانات ,وليس ملفات الحزمة\n"
 
 #: src/pacman/pacman.c:203
@@ -1085,9 +1054,7 @@ msgstr "-p, --print اطبع الاهداف بدل من اداء العمليه\
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-" --print-format <string>\n"
-"حدد كيفية طباعة الأهداف\n"
+msgstr " --print-format <string>\nحدد كيفية طباعة الأهداف\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1159,9 +1126,7 @@ msgstr "  --confirm    إسأل دائماعن التّوكيد\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       يمكن نشر هذا البرنامج بحرية تحت شروط\n"
-"                       رخصة غنو العمومية.\n"
+msgstr "                       يمكن نشر هذا البرنامج بحرية تحت شروط\n                       رخصة غنو العمومية.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1206,9 +1171,7 @@ msgstr "فشل في إعادة قراءة المدخلات: (%s)\n"
 #: src/pacman/pacman.c:1184
 #, c-format
 msgid "argument '-' specified with empty stdin\n"
-msgstr ""
-"المعطى '-' تم تخصيصه بدون إدخالات\n"
-"\n"
+msgstr "المعطى '-' تم تخصيصه بدون إدخالات\n\n"
 
 #: src/pacman/pacman.c:1189
 #, c-format
@@ -1434,9 +1397,7 @@ msgstr "'%s' ملف، هل تقصد %s بدلا من %s؟\n"
 #: src/pacman/sync.c:697
 #, c-format
 msgid "Starting full system upgrade...\n"
-msgstr ""
-"بدأ ترقية كاملة للنظام...\n"
-"\n"
+msgstr "بدأ ترقية كاملة للنظام...\n\n"
 
 #: src/pacman/sync.c:717
 #, c-format
@@ -1456,9 +1417,7 @@ msgstr "الحزمة %s ليس لديها بنية صالحة\n"
 #: src/pacman/sync.c:759
 #, c-format
 msgid "%s and %s are in conflict\n"
-msgstr ""
-"%s و %s في تعارض\n"
-"\n"
+msgstr "%s و %s في تعارض\n\n"
 
 #: src/pacman/sync.c:763
 #, c-format
@@ -1530,9 +1489,7 @@ msgstr "تعذر قفل قاعدة البيانات:  %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  إذا كنت متأكدًا من أن مدير الحزم لا يعمل حاليًا ،\n"
-"  تستطيع أن تحذف %s\n"
+msgstr "  إذا كنت متأكدًا من أن مدير الحزم لا يعمل حاليًا ،\n  تستطيع أن تحذف %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/az_AZ.po b/src/pacman/po/az_AZ.po
index b0fb345e..549b421a 100644
--- a/src/pacman/po/az_AZ.po
+++ b/src/pacman/po/az_AZ.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Zaur_Baku, 2015
 # Zaur_Baku, 2015
@@ -12,12 +12,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 03:30+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Azerbaijani (Azerbaijan) (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/az_AZ/)\n"
-"Language: az_AZ\n"
+"Language-Team: Azerbaijani (Azerbaijan) (http://www.transifex.com/toofishes/archlinux-pacman/language/az_AZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: az_AZ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
@@ -175,11 +174,10 @@ msgstr "%s və %s konflikt var (%s). Silmək %s ?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Aşağıdakı paketlər həll olmayan bağlılıklarına görə yenilənə bilməz:\n"
-msgstr[1] ""
-"Aşağıdakı paketlər həll olmayan bağlılıklarına görə yenilənə bilməz:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Aşağıdakı paketlər həll olmayan bağlılıklarına görə yenilənə bilməz:\n"
+msgstr[1] "Aşağıdakı paketlər həll olmayan bağlılıklarına görə yenilənə bilməz:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -752,7 +750,8 @@ msgstr ""
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
 msgstr ""
 
 #: src/pacman/pacman.c:126
@@ -800,8 +799,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
 msgstr ""
 
 #: src/pacman/pacman.c:142
@@ -892,8 +890,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
 
 #: src/pacman/pacman.c:163
@@ -995,8 +992,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
 msgstr ""
 
 #: src/pacman/pacman.c:203
diff --git a/src/pacman/po/br.po b/src/pacman/po/br.po
index 5602bb23..71992f14 100644
--- a/src/pacman/po/br.po
+++ b/src/pacman/po/br.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Gwenn M <tornoz@laposte.net>, 2015-2016
 msgid ""
@@ -11,12 +11,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 15:55+0000\n"
 "Last-Translator: Gwenn M <tornoz@laposte.net>\n"
-"Language-Team: Breton (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/br/)\n"
-"Language: br\n"
+"Language-Team: Breton (http://www.transifex.com/toofishes/archlinux-pacman/language/br/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: br\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/pacman/callback.c:182
@@ -174,23 +173,17 @@ msgstr "Tabutoù a zo etre %s ha %s (%s). Dilemel %s ?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"N'haller ket hizivaat ar pakad da-heul abalamour da amzalc'hoù n'haller ket "
-"diskoulmañ :\n"
-msgstr[1] ""
-"N'haller ket hizivaat ar pakadoù da-heul abalamour da amzalc'hoù n'haller "
-"ket diskoulmañ :\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "N'haller ket hizivaat ar pakad da-heul abalamour da amzalc'hoù n'haller ket diskoulmañ :\n"
+msgstr[1] "N'haller ket hizivaat ar pakadoù da-heul abalamour da amzalc'hoù n'haller ket diskoulmañ :\n"
 
 #: src/pacman/callback.c:442
 #, c-format
 msgid "Do you want to skip the above package for this upgrade?"
 msgid_plural "Do you want to skip the above packages for this upgrade?"
-msgstr[0] ""
-"Fellout a ra deoc'h leuskel ar pakad a-us da-gostez evit an hizivadenn-mañ ?"
-msgstr[1] ""
-"Fellout a ra deoc'h leuskel ar pakadoù a-us da-gostez evit an hizivadenn-"
-"mañ ?"
+msgstr[0] "Fellout a ra deoc'h leuskel ar pakad a-us da-gostez evit an hizivadenn-mañ ?"
+msgstr[1] "Fellout a ra deoc'h leuskel ar pakadoù a-us da-gostez evit an hizivadenn-mañ ?"
 
 #: src/pacman/callback.c:453
 #, c-format
@@ -204,9 +197,7 @@ msgstr[1] "%zu a bourchaserien hegerz a zo evit %s :\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Kontronet eo ar restr %s (%s)\n"
-"Fellout a ra deoc'h dilemel anezhañ ?"
+msgstr "Kontronet eo ar restr %s (%s)\nFellout a ra deoc'h dilemel anezhañ ?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -395,30 +386,23 @@ msgstr "restr kefluniañ %s, linenn %d : talvoud direizh evit '%s' : '%s'\n"
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"restr kefluniañ %s, linenn %d : dibarzh '%s' direizh, skor sinadur ebet\n"
+msgstr "restr kefluniañ %s, linenn %d : dibarzh '%s' direizh, skor sinadur ebet\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"restr kefluniañ %s, linenn %d : n'eo ket anavezet ar sturiad '%s' er "
-"c'hevrenn '%s'.\n"
-"\n"
+msgstr "restr kefluniañ %s, linenn %d : n'eo ket anavezet ar sturiad '%s' er c'hevrenn '%s'.\n\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"ar melezour '%s' a endalc'h an argemmenn '%s', met n'eus '%s' ebet "
-"andespizet.\n"
+msgstr "ar melezour '%s' a endalc'h an argemmenn '%s', met n'eus '%s' ebet andespizet.\n"
 
 #: src/pacman/conf.c:641
 #, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
-msgstr ""
-"n'haller ket ouzhpennañ URL an dafariad d'ar stlennvon '%s' : %s (%s)\n"
+msgstr "n'haller ket ouzhpennañ URL an dafariad d'ar stlennvon '%s' : %s (%s)\n"
 
 #: src/pacman/conf.c:661
 #, c-format
@@ -435,9 +419,7 @@ msgstr "n'haller ket ouzhpennañ ar melezour '%s' er stlennvon '%s' (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"c'hwitadenn war deraouekaat al levraoueg alpm\n"
-"(%s : %s)\n"
+msgstr "c'hwitadenn war deraouekaat al levraoueg alpm\n(%s : %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -472,20 +454,17 @@ msgstr "C'hwitadenn evit tremen %s enankad da libpalm"
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"restr kefluniañ %s, linenn %d : '%s' n'eo ket anavezet an dibarzh '%s'\n"
+msgstr "restr kefluniañ %s, linenn %d : '%s' n'eo ket anavezet an dibarzh '%s'\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
-"restr kefluniañ %s, linenn %d : ezhomm en deus ar sturiad '%s' un talvoud\n"
+msgstr "restr kefluniañ %s, linenn %d : ezhomm en deus ar sturiad '%s' un talvoud\n"
 
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"Dezrannañ ar c'hefluniadur a zo aet dreist an askizadenn donnañ evit %d.\n"
+msgstr "Dezrannañ ar c'hefluniadur a zo aet dreist an askizadenn donnañ evit %d.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -495,9 +474,7 @@ msgstr "n'haller ket lenn ar restr kefluniañ %s : %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"restr kefluniañ %s, linenn %d : an holl sturiadoù o deus ezhomm bezañ en ur "
-"c'hevrenn\n"
+msgstr "restr kefluniañ %s, linenn %d : an holl sturiadoù o deus ezhomm bezañ en ur c'hevrenn\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -767,16 +744,14 @@ msgstr "oberatadennoù :\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"implijit '%s {-h --help}' gant un oberatadenn evit an dibarzhioù hegerz\n"
+msgstr "\nimplijit '%s {-h --help}' gant un oberatadenn evit an dibarzhioù hegerz\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"-c, --cascade dilemel ar pakadoù hag an holl pakadoù amzalc'het ganto\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "-c, --cascade dilemel ar pakadoù hag an holl pakadoù amzalc'het ganto\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -788,9 +763,7 @@ msgstr "-n, --nosave dilemel ar restroù kefluniañ\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"-s, --recursive dilemel amzalc'hoù n'int ket dleet\n"
-"(-ss evit enderc'hel an amzalc'hoù staliet a-ratozh) \n"
+msgstr "-s, --recursive dilemel amzalc'hoù n'int ket dleet\n(-ss evit enderc'hel an amzalc'hoù staliet a-ratozh) \n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -825,8 +798,7 @@ msgstr "-g, --groups sellet holl izili ur strollad pakadoù\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
 msgstr "-i, --info sellet titouroù ar pakad (-ii evit ar restroù gwarediñ)\n"
 
 #: src/pacman/pacman.c:142
@@ -834,9 +806,7 @@ msgstr "-i, --info sellet titouroù ar pakad (-ii evit ar restroù gwarediñ)\n"
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"-k, --check gwiriañ ez eus eus ar restroù pakad (-kk evit perzhioù ar "
-"restr)\n"
+msgstr "-k, --check gwiriañ ez eus eus ar restroù pakad (-kk evit perzhioù ar restr)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
@@ -848,18 +818,14 @@ msgstr "-l, --list roll ar restroù perc'hennet gant ar pakad en azgoulenn\n"
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"-m, --foreign roll ar pakadoù staliet n'int ket er stlennvon goubredet "
-"[sil]\n"
+msgstr "-m, --foreign roll ar pakadoù staliet n'int ket er stlennvon goubredet [sil]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"-n, --native roll ar pakadoù staliet ha ne vez kavet nemet er stlennvon "
-"goubredet [sil]\n"
+msgstr "-n, --native roll ar pakadoù staliet ha ne vez kavet nemet er stlennvon goubredet [sil]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -874,26 +840,21 @@ msgstr "-p, --file <pakad> azgoulenn ur restr pakad e plas ar stlennvon\n"
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"-q, --quiet diskouez nebeutoc'h a titouroù evit an azgoulenn hag an enklask\n"
+msgstr "-q, --quiet diskouez nebeutoc'h a titouroù evit an azgoulenn hag an enklask\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"-s, --search <regex> klask ar chadennoù kenglotus e-touez ar pakadoù "
-"lec'hel\n"
+msgstr "-s, --search <regex> klask ar chadennoù kenglotus e-touez ar pakadoù lec'hel\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"-t, --unrequired roll ar pakadoù ha n'int ket dleet (diret) gant pakad\n"
-"ebet (-tt evit mont leuskel optdepends a-gostez) [sil]\n"
+msgstr "-t, --unrequired roll ar pakadoù ha n'int ket dleet (diret) gant pakad\nebet (-tt evit mont leuskel optdepends a-gostez) [sil]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -905,17 +866,14 @@ msgstr "-u, --upgrades roll ar pakadoù diamzeret [sil]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"-c, --clean dilemel ar pakadoù kozh eus ar c'hrubuilh (-cc evit an holl)\n"
+msgstr "-c, --clean dilemel ar pakadoù kozh eus ar c'hrubuilh (-cc evit an holl)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"g, --groups sellet holl izili ur strollad pakadoù\n"
-"(-gg evit an holl strolladoù hag izili)\n"
+msgstr "g, --groups sellet holl izili ur strollad pakadoù\n(-gg evit an holl strolladoù hag izili)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
@@ -931,35 +889,28 @@ msgstr "-l, --list <milec'h> sellet roll ar pakadoù en ur mirlec'h\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr "-s, --search <regex> klask chadennoù kenglotus e mirlec'hioù a-bell\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"-u, --sysupgrade hizivaat ar pakadoù staliet (-uu evit gweredekaat diskenn "
-"handelvoù)\n"
+msgstr "-u, --sysupgrade hizivaat ar pakadoù staliet (-uu evit gweredekaat diskenn handelvoù)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"-w, --downloadonly pellgargañ ar pakadoù met chom hep staliañ/hizivaat "
-"anezhe\n"
+msgstr "-w, --downloadonly pellgargañ ar pakadoù met chom hep staliañ/hizivaat anezhe\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"-y, --refresh pellgargañ ur stlennvon pakadoù fresk adalek an dafariad\n"
-"(-yy evit rediañ un azbevaat zoken m'eo hizivaet)\n"
+msgstr "-y, --refresh pellgargañ ur stlennvon pakadoù fresk adalek an dafariad\n(-yy evit rediañ un azbevaat zoken m'eo hizivaet)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -976,16 +927,12 @@ msgstr "--asexplicit merkañ pakadoù evel staliet a-ratozh\n"
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"-k, --check prouadiñ talvoudegezh ar stlennvon lec'hel (-kk evit goubredañ "
-"ar stlennvonioù)\n"
+msgstr "-k, --check prouadiñ talvoudegezh ar stlennvon lec'hel (-kk evit goubredañ ar stlennvonioù)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
-"  -s, --search <restr>  klask war-lec'h chadennoù kenglotus evit anvioù "
-"pakadoù\n"
+msgstr "  -s, --search <restr>  klask war-lec'h chadennoù kenglotus evit anvioù pakadoù\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
@@ -997,9 +944,7 @@ msgstr "  -x, --regex          gweredekaat an enklask gant bommoù reol\n"
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"--machinereadable\n"
-"ec'hankad lennus gant ur mekanik\n"
+msgstr "--machinereadable\nec'hankad lennus gant ur mekanik\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
@@ -1021,51 +966,39 @@ msgstr "--asexplicit staliañ ar pakadoù evel staliet a-ratozh\n"
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"--ignore <pakad> leuskel hizivadenn ar pakad a-gostez (gallout a ra bezañ "
-"implijet meur a wech)\n"
+msgstr "--ignore <pakad> leuskel hizivadenn ar pakad a-gostez (gallout a ra bezañ implijet meur a wech)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"--ignoregroup <strollad>\n"
-"leuskel ur strollad a-gostez (gallout a ra bezañ implijet meur a wech)\n"
+msgstr "--ignoregroup <strollad>\nleuskel ur strollad a-gostez (gallout a ra bezañ implijet meur a wech)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"-d, --nodeps tremen ar gwiriadur handelv amzalc'hoù (-dd evit tremen an holl "
-"gwiriadurioù)\n"
+msgstr "-d, --nodeps tremen ar gwiriadur handelv amzalc'hoù (-dd evit tremen an holl gwiriadurioù)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"--assume-installed <pakad=handelv>\n"
-"ouzhpennañ ur pakad galloudel evit plegañ d'an amzalc'hoù\n"
+msgstr "--assume-installed <pakad=handelv>\nouzhpennañ ur pakad galloudel evit plegañ d'an amzalc'hoù\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"--dbonly kemmañ enankadoù ar stlennvon nemetken, ket ar restroù pakad\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "--dbonly kemmañ enankadoù ar stlennvon nemetken, ket ar restroù pakad\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"--noprogressbar chom hep diskouez ar varren araokaat e-pad pellgargadur ar "
-"restroù\n"
+msgstr "--noprogressbar chom hep diskouez ar varren araokaat e-pad pellgargadur ar restroù\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
@@ -1085,9 +1018,7 @@ msgstr "-p, --print moullañ ar bukennoù e plas erounit an oberatadenn\n"
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"--print-format <chadenn>\n"
-"erspizañ penaos e rank ar chadenn bezañ moullet\n"
+msgstr "--print-format <chadenn>\nerspizañ penaos e rank ar chadenn bezañ moullet\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1159,9 +1090,7 @@ msgstr "--confirm atav goulenn kadarnaat\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"Gallout a ra ar meziant-mañ bezañ addasparzhet\n"
-"dindan divizoù ar GNU General Public License.\n"
+msgstr "Gallout a ra ar meziant-mañ bezañ addasparzhet\ndindan divizoù ar GNU General Public License.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1453,9 +1382,7 @@ msgstr "tabutoù a zo etre %s ha %s\n"
 #: src/pacman/sync.c:763
 #, c-format
 msgid "%s and %s are in conflict (%s)\n"
-msgstr ""
-"tabutoù a zo etre %s ha %s (%s)\n"
-"\n"
+msgstr "tabutoù a zo etre %s ha %s (%s)\n\n"
 
 #: src/pacman/sync.c:797
 #, c-format
@@ -1522,9 +1449,7 @@ msgstr "n'haller ket prennañ ar stlennvon : %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"m'oc'h sur n'eus ardoer pakad ebet o vezañ erounezet\n"
-"tu zo deoc'h dilemel %s\n"
+msgstr "m'oc'h sur n'eus ardoer pakad ebet o vezañ erounezet\ntu zo deoc'h dilemel %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/ca.po b/src/pacman/po/ca.po
index 6e790e53..839f8fa9 100644
--- a/src/pacman/po/ca.po
+++ b/src/pacman/po/ca.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Dan McGee <dpmcgee@gmail.com>, 2011
 # Davidmp <medipas@gmail.com>, 2015
@@ -16,14 +16,13 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
-"PO-Revision-Date: 2016-01-18 16:13+0000\n"
+"PO-Revision-Date: 2016-02-08 09:50+0000\n"
 "Last-Translator: Davidmp <medipas@gmail.com>\n"
-"Language-Team: Catalan (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ca/)\n"
-"Language: ca\n"
+"Language-Team: Catalan (http://www.transifex.com/toofishes/archlinux-pacman/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
@@ -59,7 +58,7 @@ msgstr "s'estan cercant parquets conflictius...\n"
 #: src/pacman/callback.c:211
 #, c-format
 msgid "Processing package changes...\n"
-msgstr "Processant canvis en els paquets...\n"
+msgstr "S'estan processant els canvis dels paquets...\n"
 
 #: src/pacman/callback.c:218
 #, c-format
@@ -181,13 +180,10 @@ msgstr "%s i %s tenen conflictes (%s). Elimino %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"El següent paquet no es pot actualitzar a causa de dependències sense "
-"resolució:\n"
-msgstr[1] ""
-"Els paquets següents no es poden actualitzar a causa de dependències sense "
-"resolució:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "El següent paquet no es pot actualitzar a causa de dependències sense resolució:\n"
+msgstr[1] "Els paquets següents no es poden actualitzar a causa de dependències sense resolució:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -208,9 +204,7 @@ msgstr[1] "Hi ha %zu proveïdors disponibles per a %s:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"El fitxer %s és corrupte (%s).\n"
-"Voleu esborrar-lo?"
+msgstr "El fitxer %s és corrupte (%s).\nVoleu esborrar-lo?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -250,7 +244,7 @@ msgstr "s'està eliminant"
 #: src/pacman/callback.c:555
 #, c-format
 msgid "checking for file conflicts"
-msgstr "s'estan comprovant els conflictes entre fitxers"
+msgstr "s'estan comprovant els conflictes entre els fitxers"
 
 #: src/pacman/callback.c:558
 #, c-format
@@ -364,8 +358,7 @@ msgstr[1] "%jd fitxers modificats\n"
 msgid "malloc failure: could not allocate %zu byte\n"
 msgid_plural "malloc failure: could not allocate %zu bytes\n"
 msgstr[0] "fallada d'assignació de memòria: no s'ha pogut assignar %zu byte\n"
-msgstr[1] ""
-"fallada d'assignació de memòria: no s'han pogut assignar %zu bytes\n"
+msgstr[1] "fallada d'assignació de memòria: no s'han pogut assignar %zu bytes\n"
 
 #: src/pacman/conf.c:251
 #, c-format
@@ -395,35 +388,28 @@ msgstr "no s'ha pogut restaurar el directori de treball (%s)\n"
 #: src/pacman/conf.c:397 src/pacman/conf.c:447 src/pacman/conf.c:541
 #, c-format
 msgid "config file %s, line %d: invalid value for '%s' : '%s'\n"
-msgstr ""
-"fitxer de configuració %s, línia %d: valor no vàlid per a \"%s\": \"%s\"\n"
+msgstr "fitxer de configuració %s, línia %d: valor no vàlid per a \"%s\": \"%s\"\n"
 
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"fitxer de configuració %s, línia %d: \"%s\" opció no vàlida, sense suport de "
-"signatura\n"
+msgstr "fitxer de configuració %s, línia %d: \"%s\" opció no vàlida, sense suport de signatura\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"fitxer de configuració %s, línia %d: la directiva \"%s\" a la secció \"%s\" "
-"no és reconeguda.\n"
+msgstr "fitxer de configuració %s, línia %d: la directiva \"%s\" a la secció \"%s\" no és reconeguda.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"la rèplica \"%s\" conté la variable '%s\", però no s'ha definit cap \"%s\".\n"
+msgstr "la rèplica \"%s\" conté la variable '%s\", però no s'ha definit cap \"%s\".\n"
 
 #: src/pacman/conf.c:641
 #, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
-msgstr ""
-"no es pot afegir l'URL del servidor a la base de dades «%s» : %s (%s)\n"
+msgstr "no es pot afegir l'URL del servidor a la base de dades «%s» : %s (%s)\n"
 
 #: src/pacman/conf.c:661
 #, c-format
@@ -433,24 +419,19 @@ msgstr "no es pot registrar la base de dades «%s» (%s)\n"
 #: src/pacman/conf.c:676
 #, c-format
 msgid "could not add mirror '%s' to database '%s' (%s)\n"
-msgstr ""
-"no s'ha pogut afegir la rèplica \"%s\" a la base de dades \"%s\" (%s)\n"
+msgstr "no s'ha pogut afegir la rèplica \"%s\" a la base de dades \"%s\" (%s)\n"
 
 #: src/pacman/conf.c:722
 #, c-format
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"ha fallat iniciar la llibreria alpm\n"
-"(%s: %s)\n"
+msgstr "ha fallat iniciar la llibreria alpm\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
 msgid "try running pacman-db-upgrade\n"
-msgstr ""
-"proveu d'executar pacman-db-upgrade\n"
-"\n"
+msgstr "proveu d'executar pacman-db-upgrade\n\n"
 
 #: src/pacman/conf.c:744
 #, c-format
@@ -480,21 +461,17 @@ msgstr "Ha fallat passar l'entrada %s a libalpm"
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"fitxer de configuració %s, línia %d: \"%s\" l'opció \"%s\" no es reconeix\n"
+msgstr "fitxer de configuració %s, línia %d: \"%s\" l'opció \"%s\" no es reconeix\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
-"fitxer de configuració %s, línia %d: la directiva \"%s\" necessita un valor\n"
+msgstr "fitxer de configuració %s, línia %d: la directiva \"%s\" necessita un valor\n"
 
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"L'anàlisi de configuració ha superat la profunditat màxima de recursió en "
-"%d.\n"
+msgstr "L'anàlisi de configuració ha superat la profunditat màxima de recursió en %d.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -504,9 +481,7 @@ msgstr "no s'ha pogut llegir el fitxer %s de configuració: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"fitxer de configuració %s, línia %d: totes les directives han de pertànyer a "
-"una secció.\n"
+msgstr "fitxer de configuració %s, línia %d: totes les directives han de pertànyer a una secció.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -527,14 +502,12 @@ msgstr "no s'ha pogut establir el motiu d'instal·lació per al paquet %s (%s)\n
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
-"%s: el motiu d'instal·lació s'ha fixat a \"instal·lat com a dependència\"\n"
+msgstr "%s: el motiu d'instal·lació s'ha fixat a \"instal·lat com a dependència\"\n"
 
 #: src/pacman/database.c:80
 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
-msgstr ""
-"%s: el motiu d'instal·lació s'ha establert a \"instal·lat explícitament\"\n"
+msgstr "%s: el motiu d'instal·lació s'ha establert a \"instal·lat explícitament\"\n"
 
 #: src/pacman/package.c:97
 #, c-format
@@ -778,17 +751,14 @@ msgstr "operacions:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"useu \"%s {-h --help}\" amb una operació per veure'n les opcions "
-"disponibles\n"
+msgstr "\nuseu \"%s {-h --help}\" amb una operació per veure'n les opcions disponibles\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        elimina paquets i tots els paques que en depenen\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        elimina paquets i tots els paques que en depenen\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -800,9 +770,7 @@ msgstr "  -n, --nosave         esborra els fitxers de configuració\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      elimina les dependències innecessàries\n"
-"                       (-ss inclou dependències installades explícitament)\n"
+msgstr "  -s, --recursive      elimina les dependències innecessàries\n                       (-ss inclou dependències installades explícitament)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -823,16 +791,12 @@ msgstr "  -c, --changelog      mostra el registre de canvis d'un paquet\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           llista els paquets instal·lats com a dependència "
-"[filtre]\n"
+msgstr "  -d, --deps           llista els paquets instal·lats com a dependència [filtre]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       llista els paquets instal·lats explícitament "
-"[filtre]\n"
+msgstr "  -e, --explicit       llista els paquets instal·lats explícitament [filtre]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -841,44 +805,34 @@ msgstr "  -g, --groups         mostra tots els membres d'un grup de paquets\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           mostra informació dels paquets (-ii per a fitxers de "
-"còpia de seguretat)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           mostra informació dels paquets (-ii per a fitxers de còpia de seguretat)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          comprova que els fitxers del paquet existeixin (-kk "
-"per a les propietats del fitxer)\n"
+msgstr "  -k, --check          comprova que els fitxers del paquet existeixin (-kk per a les propietats del fitxer)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"  -l, --list           llista els fitxers que pertanyen al paquet consultat\n"
+msgstr "  -l, --list           llista els fitxers que pertanyen al paquet consultat\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        llista els paquets instal·lats que no es troben a les "
-"bases de dades de sincronització [filtre]\n"
+msgstr "  -m, --foreign        llista els paquets instal·lats que no es troben a les bases de dades de sincronització [filtre]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         llista els paquets instal·lats trobats únicament a "
-"les bases de dades de sincronització [filtre]\n"
+msgstr "  -n, --native         llista els paquets instal·lats trobats únicament a les bases de dades de sincronització [filtre]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -888,34 +842,26 @@ msgstr "  -o, --own <fitxer>   consulta el paquet al qual pertany <fitxer>\n"
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"  -p, --file <paquet>  consulta un fitxer de paquet en comptes de la base de "
-"dades\n"
+msgstr "  -p, --file <paquet>  consulta un fitxer de paquet en comptes de la base de dades\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          mostra menys informació per a consultes i cerques\n"
+msgstr "  -q, --quiet          mostra menys informació per a consultes i cerques\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <exreg> cerca cadenes coincidents en paquets instal·lats "
-"localment\n"
+msgstr "  -s, --search <exreg> cerca cadenes coincidents en paquets instal·lats localment\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     llista els paquets no (opcionalment) requerits per "
-"cap\n"
-"paquet (-tt per ignorar dependències opcionals) [filtre]\n"
+msgstr "  -t, --unrequired     llista els paquets no (opcionalment) requerits per cap\npaquet (-tt per ignorar dependències opcionals) [filtre]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -927,95 +873,73 @@ msgstr "  -u, --upgrades       llista els paquets obsolets [filtre]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          elimina paquets antics del directori de memòria cau (-"
-"cc per a tots)\n"
+msgstr "  -c, --clean          elimina paquets antics del directori de memòria cau (-cc per a tots)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"-g, --groups         mostra tots els membres d'un grup de paquets\n"
-"(-gg per veure tots els grups i els membres)\n"
+msgstr "-g, --groups         mostra tots els membres d'un grup de paquets\n(-gg per veure tots els grups i els membres)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info            mostra informació dels paquets (-ii per obtenir-ne "
-"informació ampliada)\n"
+msgstr "  -i, --info            mostra informació dels paquets (-ii per obtenir-ne informació ampliada)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr ""
-"  -l, --list <repo>    mostra una llista dels paquets en un repositori\n"
+msgstr "  -l, --list <repo>    mostra una llista dels paquets en un repositori\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <exreg> cerca cadenes coincidents en repositoris remots\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <exreg> cerca cadenes coincidents en repositoris remots\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     actualitza els paquets instal·lats (-uu permet la "
-"desactualització)\n"
+msgstr "  -u, --sysupgrade     actualitza els paquets instal·lats (-uu permet la desactualització)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   baixa els paquets però no instal·lis/actualitzis res\n"
+msgstr "  -w, --downloadonly   baixa els paquets però no instal·lis/actualitzis res\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        refresca les bases de dades de paquets des del "
-"servidor\n"
-"(-yy per forçar una actualització de la base de dades, encara que ja estigui "
-"actualitzada)\n"
+msgstr "  -y, --refresh        refresca les bases de dades de paquets des del servidor\n(-yy per forçar una actualització de la base de dades, encara que ja estigui actualitzada)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         marca els paquets com a no instal·lats explícitament\n"
+msgstr "      --asdeps         marca els paquets com a no instal·lats explícitament\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     marca els paquets com a explícitament instal·lats\n"
+msgstr "      --asexplicit     marca els paquets com a explícitament instal·lats\n"
 
 #: src/pacman/pacman.c:173
 #, c-format
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"  -k, --check          comprova la validesa de la base de dades local (-kk "
-"per sincronitzar les bases de dades)\n"
+msgstr "  -k, --check          comprova la validesa de la base de dades local (-kk per sincronitzar les bases de dades)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
-"  -s, --search <fitxer>  cerca cadenes coincidents als noms de fitxer dels "
-"paquets\n"
+msgstr "  -s, --search <fitxer>  cerca cadenes coincidents als noms de fitxer dels paquets\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
@@ -1027,22 +951,17 @@ msgstr "  -x, --regex          habilita la cerca amb expressions regulars\n"
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"      --machinereadable\n"
-"                       produeix una sortida llegible per màquina\n"
+msgstr "      --machinereadable\n                       produeix una sortida llegible per màquina\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          força la instal·lació, sobreescrivint els fitxers amb "
-"conflictes\n"
+msgstr "      --force          força la instal·lació, sobreescrivint els fitxers amb conflictes\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         instal·la paquets com a no instal·lats explícitament\n"
+msgstr "      --asdeps         instal·la paquets com a no instal·lats explícitament\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
@@ -1054,89 +973,69 @@ msgstr "--asexplicit     instal·la paquets com a explícitament instal·lats\n"
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"--ignore <paq>\n"
-"ignora l'actualització d'un paquet (es pot usar més d'un cop)\n"
+msgstr "--ignore <paq>\nignora l'actualització d'un paquet (es pot usar més d'un cop)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"--ignoregroup <grup>\n"
-"ignora l'actualització d'un grup (es pot usar més d'un cop)\n"
+msgstr "--ignoregroup <grup>\nignora l'actualització d'un grup (es pot usar més d'un cop)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         omet les comprovacions de versions de les "
-"dependències (-dd per ometre totes les comprovacions)\n"
+msgstr "  -d, --nodeps         omet les comprovacions de versions de les dependències (-dd per ometre totes les comprovacions)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"--assume-installed <paquet=versió>\n"
-"afegeix un paquet virtual per satisfer les dependències\n"
+msgstr "--assume-installed <paquet=versió>\nafegeix un paquet virtual per satisfer les dependències\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         modifica entrades del paquet a la base de dades, però "
-"no fitxers\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         modifica entrades del paquet a la base de dades, però no fitxers\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  no mostris una barra de progrés en baixar fitxers\n"
+msgstr "      --noprogressbar  no mostris una barra de progrés en baixar fitxers\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet    no executis l'scriptlet d'instal·lació si existeix\n"
+msgstr "      --noscriptlet    no executis l'scriptlet d'instal·lació si existeix\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          imprimeix els objectius en comptes d'executar "
-"l'operació\n"
+msgstr "  -p, --print          imprimeix els objectius en comptes d'executar l'operació\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"--print-format <string>\n"
-"especifica com s'han d'imprimir els objectius\n"
+msgstr "--print-format <string>\nespecifica com s'han d'imprimir els objectius\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
-msgstr ""
-"  -b, --dbpath <ruta>  estableix una ubicació alternativa de la base de "
-"dades\n"
+msgstr "  -b, --dbpath <ruta>  estableix una ubicació alternativa de la base de dades\n"
 
 #: src/pacman/pacman.c:212
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
-msgstr ""
-"  -r, --root <ruta>    estableix una arrel d'instal·lació alternativa\n"
+msgstr "  -r, --root <ruta>    estableix una arrel d'instal·lació alternativa\n"
 
 #: src/pacman/pacman.c:213
 #, c-format
@@ -1151,9 +1050,7 @@ msgstr "      --arch <arch>    estableix una arquitectura alternativa\n"
 #: src/pacman/pacman.c:215
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <dir> estableix una ubicació de la memòria cau de paquets "
-"alternativa\n"
+msgstr "      --cachedir <dir> estableix una ubicació de la memòria cau de paquets alternativa\n"
 
 #: src/pacman/pacman.c:216
 #, c-format
@@ -1168,8 +1065,7 @@ msgstr "      --color <quan>   empra color al text de sortida\n"
 #: src/pacman/pacman.c:218
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
-msgstr ""
-"      --config <ruta>  estableix un fitxer de configuració alternatiu\n"
+msgstr "      --config <ruta>  estableix un fitxer de configuració alternatiu\n"
 
 #: src/pacman/pacman.c:219
 #, c-format
@@ -1194,18 +1090,14 @@ msgstr "      --noconfirm      no demanis cap confirmació\n"
 #: src/pacman/pacman.c:223
 #, c-format
 msgid "      --confirm        always ask for confirmation\n"
-msgstr ""
-"      --confirm        demana'n sempre la confirmació\n"
-"\n"
+msgstr "      --confirm        demana'n sempre la confirmació\n\n"
 
 #: src/pacman/pacman.c:242
 #, c-format
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Aquest programa es pot distribuir lliurement sota\n"
-"                       els termes de la llicència pública general de GNU.\n"
+msgstr "                       Aquest programa es pot distribuir lliurement sota\n                       els termes de la llicència pública general de GNU.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1250,9 +1142,7 @@ msgstr "ha fallat reobrir stdin per a la lectura: (%s)\n"
 #: src/pacman/pacman.c:1184
 #, c-format
 msgid "argument '-' specified with empty stdin\n"
-msgstr ""
-"argument '-' especificat amb stdin buit\n"
-"\n"
+msgstr "argument '-' especificat amb stdin buit\n\n"
 
 #: src/pacman/pacman.c:1189
 #, c-format
@@ -1452,9 +1342,7 @@ msgstr "el repositori «%s» no existeix\n"
 #: src/pacman/sync.c:470
 #, c-format
 msgid "repository \"%s\" was not found.\n"
-msgstr ""
-"no s'ha trobat el repositori «%s».\n"
-"\n"
+msgstr "no s'ha trobat el repositori «%s».\n\n"
 
 #: src/pacman/sync.c:560
 #, c-format
@@ -1568,9 +1456,7 @@ msgstr "no s'ha pogut bloquejar la base de dades: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  si esteu segur que no hi ha cap gestor de paquets\n"
-"  en execució, podeu eliminar %s\n"
+msgstr "  si esteu segur que no hi ha cap gestor de paquets\n  en execució, podeu eliminar %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
@@ -1605,8 +1491,7 @@ msgstr "ha fallat la sincronització d'algunes bases de dades\n"
 #: src/pacman/util.c:639
 #, c-format
 msgid "insufficient columns available for table display\n"
-msgstr ""
-"no hi ha columnes disponibles suficients per a la presentació de la taula\n"
+msgstr "no hi ha columnes disponibles suficients per a la presentació de la taula\n"
 
 #: src/pacman/util.c:760
 #, c-format
diff --git a/src/pacman/po/cs.po b/src/pacman/po/cs.po
index e59831bb..890467c3 100644
--- a/src/pacman/po/cs.po
+++ b/src/pacman/po/cs.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Allan McRae <allan@archlinux.org>, 2013
 # Allan McRae <allan@archlinux.org>, 2013-2014
@@ -20,12 +20,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-24 21:55+0000\n"
 "Last-Translator: Jaroslav Lichtblau <dragonlord@seznam.cz>\n"
-"Language-Team: Czech (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/cs/)\n"
-"Language: cs\n"
+"Language-Team: Czech (http://www.transifex.com/toofishes/archlinux-pacman/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: src/pacman/callback.c:182
@@ -183,16 +182,11 @@ msgstr "%s a %s jsou v konfliktu (%s). Odstranit %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Následující balíček nemůže být aktualizován, nepodařilo se vyřešit "
-"závislosti:\n"
-msgstr[1] ""
-"Následující balíčky nemohou být aktualizovány, nepodařilo se vyřešit "
-"závislosti:\n"
-msgstr[2] ""
-"Následující balíčky nemohou být aktualizovány, nepodařilo se vyřešit "
-"závislosti:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Následující balíček nemůže být aktualizován, nepodařilo se vyřešit závislosti:\n"
+msgstr[1] "Následující balíčky nemohou být aktualizovány, nepodařilo se vyřešit závislosti:\n"
+msgstr[2] "Následující balíčky nemohou být aktualizovány, nepodařilo se vyřešit závislosti:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -215,9 +209,7 @@ msgstr[2] "Existuje %zu balíčků poskytujících %s\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Soubor %s je poškozen (%s).\n"
-"Odstranit ho? "
+msgstr "Soubor %s je poškozen (%s).\nOdstranit ho? "
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -410,17 +402,13 @@ msgstr "konfigurační soubor %s, řádka %d: neplatná hodnota pro '%s' : '%s'\
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"konfigurační soubor %s, řádka %d: volba '%s' není platná, chybí podpora pro "
-"podepisování\n"
+msgstr "konfigurační soubor %s, řádka %d: volba '%s' není platná, chybí podpora pro podepisování\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"konfigurační soubor %s, řádek %d: direktiva '%s' v sekci '%s' nebyla "
-"rozpoznána.\n"
+msgstr "konfigurační soubor %s, řádek %d: direktiva '%s' v sekci '%s' nebyla rozpoznána.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
@@ -447,9 +435,7 @@ msgstr "nelze přidat zrcadlo '%s' do databáze '%s' (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"chyba inicializace knihovny alpm\n"
-"(%s: %s)\n"
+msgstr "chyba inicializace knihovny alpm\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -489,8 +475,7 @@ msgstr "konfigurační soubor %s, řádek %d: '%s' volba '%s' nebyla rozpoznána
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
-"konfigurační soubor %s, řádek %d: direktiva '%s' vyžaduje zadanou hodnotu\n"
+msgstr "konfigurační soubor %s, řádek %d: direktiva '%s' vyžaduje zadanou hodnotu\n"
 
 #: src/pacman/conf.c:948
 #, c-format
@@ -505,9 +490,7 @@ msgstr "konfigurační soubor %s nelze přečíst: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"konfigurační soubor %s, řádek %d: Všechny direktivy musí náležet nějaké "
-"sekci.\n"
+msgstr "konfigurační soubor %s, řádek %d: Všechny direktivy musí náležet nějaké sekci.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -735,9 +718,7 @@ msgstr "seznam změn pro '%s' není dostupný.\n"
 #: src/pacman/package.c:457
 #, c-format
 msgid "Changelog for %s:\n"
-msgstr ""
-"seznam změn pro %s:\n"
-" \n"
+msgstr "seznam změn pro %s:\n \n"
 
 #: src/pacman/package.c:482 src/pacman/package.c:484
 #, c-format
@@ -779,16 +760,14 @@ msgstr "operace:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"použijte '%s {-h --help}' s přepínačem operace pro další nápovědu\n"
+msgstr "\npoužijte '%s {-h --help}' s přepínačem operace pro další nápovědu\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        odstranit balíčky včetně všech, které na nich závisí\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        odstranit balíčky včetně všech, které na nich závisí\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -800,9 +779,7 @@ msgstr "  -n, --nosave         odstraní konfigurační soubory\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      odstraní nepotřebné závislosti\n"
-"                       (-ss včetně výslovně nainstalovaných závislostí)\n"
+msgstr "  -s, --recursive      odstraní nepotřebné závislosti\n                       (-ss včetně výslovně nainstalovaných závislostí)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -812,8 +789,7 @@ msgstr "  -u, --unneeded       odstraní nepotřebné závislosti\n"
 #: src/pacman/pacman.c:132 src/pacman/pacman.c:167
 #, c-format
 msgid "      --needed         do not reinstall up to date packages\n"
-msgstr ""
-"      --needed         nepřeinstalovávát balíčky, které jsou stále aktuální\n"
+msgstr "      --needed         nepřeinstalovávát balíčky, které jsou stále aktuální\n"
 
 #: src/pacman/pacman.c:137
 #, c-format
@@ -824,15 +800,12 @@ msgstr "  -c, --changelog      vypsat seznam změn balíčku\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           seznam všech balíčků instalovaných jako závislosti "
-"[filter]\n"
+msgstr "  -d, --deps           seznam všech balíčků instalovaných jako závislosti [filter]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       seznam všech výslovně instalovaných balíčků [filter]\n"
+msgstr "  -e, --explicit       seznam všech výslovně instalovaných balíčků [filter]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -841,20 +814,15 @@ msgstr "  -g, --groups         vypsat všechny balíčky ve skupině\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           zobrazit informace o balíčku (-ii zálohované "
-"soubory)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           zobrazit informace o balíčku (-ii zálohované soubory)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          kontrola, zda jsou přítomny všechny soubory z balíčku "
-"(-kk pro vlastnosti souborů)\n"
+msgstr "  -k, --check          kontrola, zda jsou přítomny všechny soubory z balíčku (-kk pro vlastnosti souborů)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
@@ -866,18 +834,14 @@ msgstr "-l, --list soubory vlastněné dotazovaným balíčkem\n"
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        seznam nainstalovaných balíčků nalezených "
-"repozitářích  [filter]\n"
+msgstr "  -m, --foreign        seznam nainstalovaných balíčků nalezených repozitářích  [filter]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native        seznam nainstalovaných balíčků nalezených pouze v sync "
-"db [filter]\n"
+msgstr "  -n, --native        seznam nainstalovaných balíčků nalezených pouze v sync db [filter]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -899,49 +863,40 @@ msgstr "  -q, --quiet          zobrazit méně informací při dotazu a hledán
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex> vyhledat nainstalované balíčky, odpovídající řetězci\n"
+msgstr "  -s, --search <regex> vyhledat nainstalované balíčky, odpovídající řetězci\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"-t, --unrequired seznam balíčků nepožadovaných žádným jiným\n"
-"(volitelným) balíčkem (-tt ignorovat volitelné) [filter]\n"
+msgstr "-t, --unrequired seznam balíčků nepožadovaných žádným jiným\n(volitelným) balíčkem (-tt ignorovat volitelné) [filter]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
 msgid "  -u, --upgrades       list outdated packages [filter]\n"
-msgstr ""
-"  -u, --upgrades       seznam všech aktualizovatelných balíčků [filter]\n"
+msgstr "  -u, --upgrades       seznam všech aktualizovatelných balíčků [filter]\n"
 
 #: src/pacman/pacman.c:156
 #, c-format
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          odstranit staré balíčky z mezipaměti (-cc pro "
-"všechny)\n"
+msgstr "  -c, --clean          odstranit staré balíčky z mezipaměti (-cc pro všechny)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"-g, --groups vypsat všechny balíčky ve skupině\n"
-"(-gg vypsat všechny skupiny a balíčky)\n"
+msgstr "-g, --groups vypsat všechny balíčky ve skupině\n(-gg vypsat všechny skupiny a balíčky)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"-i, --info zobrazit informace o balíčku (-ii pro rozšířené informace)\n"
+msgstr "-i, --info zobrazit informace o balíčku (-ii pro rozšířené informace)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -950,36 +905,28 @@ msgstr "  -l, --list <repo>    zobrazit seznam balíčků v repozitáři\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <regex> vyhledat balíčky v repozitářích, odpovídající "
-"řetězci\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regex> vyhledat balíčky v repozitářích, odpovídající řetězci\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"-u, --sysupgrade aktualizovat nainstalované balíčky (--uu povolí snížení "
-"verze)\n"
+msgstr "-u, --sysupgrade aktualizovat nainstalované balíčky (--uu povolí snížení verze)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   pouze stáhnout balíčky, neinstalovat/neaktualizovat\n"
+msgstr "  -w, --downloadonly   pouze stáhnout balíčky, neinstalovat/neaktualizovat\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"-y, --refresh stáhnout aktuální databázi balíčků ze serveru\n"
-"(-yy vynutit stažení i při aktuálním stavu)\n"
+msgstr "-y, --refresh stáhnout aktuální databázi balíčků ze serveru\n(-yy vynutit stažení i při aktuálním stavu)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -996,36 +943,29 @@ msgstr "      --asexplicit     označit balíčky jako výslovně instalované\n
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"  -k, --check          kontrola platnosti místní databáze (-kk pro "
-"synchronizaci databází)\n"
+msgstr "  -k, --check          kontrola platnosti místní databáze (-kk pro synchronizaci databází)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
-"  -s, --search <file>  hledat jména souborů balíčků, odpovídající řetězci\n"
+msgstr "  -s, --search <file>  hledat jména souborů balíčků, odpovídající řetězci\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
 msgid "  -x, --regex          enable searching using regular expressions\n"
-msgstr ""
-"  -x, --regex          povolit vyhledávání za pomoci regulárních výrazů\n"
+msgstr "  -x, --regex          povolit vyhledávání za pomoci regulárních výrazů\n"
 
 #: src/pacman/pacman.c:185
 #, c-format
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"      --machinereadable\n"
-"                       produkovat strojově čitelný výstup\n"
+msgstr "      --machinereadable\n                       produkovat strojově čitelný výstup\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          vynucená instalace, přepíše konfliktní soubory\n"
+msgstr "      --force          vynucená instalace, přepíše konfliktní soubory\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
@@ -1035,48 +975,39 @@ msgstr "      --asdeps         nainstalovat balíčky jako závislosti\n"
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     nainstalovat balíčky jako výslovně instalované\n"
+msgstr "      --asexplicit     nainstalovat balíčky jako výslovně instalované\n"
 
 #: src/pacman/pacman.c:194
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg>   ignorovat aktualizaci balíčku (lze použít vícekrát)\n"
+msgstr "      --ignore <pkg>   ignorovat aktualizaci balíčku (lze použít vícekrát)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                       ignorovat aktualizaci skupiny (lze použít vícekrát)\n"
+msgstr "      --ignoregroup <grp>\n                       ignorovat aktualizaci skupiny (lze použít vícekrát)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         přeskočí kontrolu verze závislostí\n"
-"                       (-dd přeskočí všechny kontroly)\n"
+msgstr "  -d, --nodeps         přeskočí kontrolu verze závislostí\n                       (-dd přeskočí všechny kontroly)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <package=version>\n"
-"                       přidat virtuální balíček pro splnění závislostí\n"
+msgstr "      --assume-installed <package=version>\n                       přidat virtuální balíček pro splnění závislostí\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
 msgstr "      --dbonly         upraví pouze záznamy v databázi, ne balíčky\n"
 
 #: src/pacman/pacman.c:203
@@ -1096,17 +1027,14 @@ msgstr "      --noscriptlet    nespouštět instalační skripty\n"
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          pouze vypíše cíle, neprovede skutečnou operaci\n"
+msgstr "  -p, --print          pouze vypíše cíle, neprovede skutečnou operaci\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                       určí, jak mají být cíle vypsány\n"
+msgstr "      --print-format <string>\n                       určí, jak mají být cíle vypsány\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1178,10 +1106,7 @@ msgstr "--confirm vždy požadovat potvrzení\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Tento program  může být svobodně šířen za\n"
-"                       podmínek stanovených GNU GPL (General Public "
-"License).\n"
+msgstr "                       Tento program  může být svobodně šířen za\n                       podmínek stanovených GNU GPL (General Public License).\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1541,9 +1466,7 @@ msgstr "nelze uzamknout databázi: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  pokud jste si jisti, že právě neběží správce balíčků,\n"
-"  můžete odstranit %s\n"
+msgstr "  pokud jste si jisti, že právě neběží správce balíčků,\n  můžete odstranit %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/da.po b/src/pacman/po/da.po
index 41e86800..5d9c7e14 100644
--- a/src/pacman/po/da.po
+++ b/src/pacman/po/da.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Chris Darnell <chris@cedeel.com>, 2014
 # Freso <transifex.net@freso.dk>, 2011,2013
@@ -20,12 +20,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-19 11:20+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
-"Language-Team: Danish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/da/)\n"
-"Language: da\n"
+"Language-Team: Danish (http://www.transifex.com/toofishes/archlinux-pacman/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
@@ -183,11 +182,10 @@ msgstr "%s og %s er i konflikt (%s). Fjern %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Følgende pakke kan ikke opgraderes på grund af uløselige afhængigheder:\n"
-msgstr[1] ""
-"Følgende pakker kan ikke opgraderes på grund af uløselige afhængigheder:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Følgende pakke kan ikke opgraderes på grund af uløselige afhængigheder:\n"
+msgstr[1] "Følgende pakker kan ikke opgraderes på grund af uløselige afhængigheder:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -208,9 +206,7 @@ msgstr[1] "Der er %zu udbydere tilgængelige for %s:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Filen %s er ødelagt (%s).\n"
-"Ønsker du at slette den?"
+msgstr "Filen %s er ødelagt (%s).\nØnsker du at slette den?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -399,23 +395,18 @@ msgstr "konfigurationsfil %s, linie %d: ugyldig værdi for '%s': '%s'\n"
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"konfigurationsfil %s, linie %d: '%s' valgmulighed ugyldig, ingen "
-"signaturrapport\n"
+msgstr "konfigurationsfil %s, linie %d: '%s' valgmulighed ugyldig, ingen signaturrapport\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"konfigurationsfil: %s, linie %d: direktiv '%s' i sektion '%s' blev ikke "
-"genkendt.\n"
+msgstr "konfigurationsfil: %s, linie %d: direktiv '%s' i sektion '%s' blev ikke genkendt.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"filspejl '%s' indeholder variablen '%s', men ingen '%s' er defineret.\n"
+msgstr "filspejl '%s' indeholder variablen '%s', men ingen '%s' er defineret.\n"
 
 #: src/pacman/conf.c:641
 #, c-format
@@ -437,10 +428,7 @@ msgstr "kunne ikke tilføje filspejl '%s' til database '%s' (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"kunne ikke initialisere alpm-bibliotek\n"
-"(%s: %s)\n"
-"\n"
+msgstr "kunne ikke initialisere alpm-bibliotek\n(%s: %s)\n\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -475,8 +463,7 @@ msgstr "Kunne ikke vidregive %s indtastningen til libalpm"
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"kofigurationsfil %s, linje %d: '%s' valgmulighed '%s' blev ikke genkendt\n"
+msgstr "kofigurationsfil %s, linje %d: '%s' valgmulighed '%s' blev ikke genkendt\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
@@ -496,8 +483,7 @@ msgstr "konfigurationsfil %s kunne ikke læses: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"konfigurationsfil %s, linje %d: Alle direktiver skal tilhøre et afsnit.\n"
+msgstr "konfigurationsfil %s, linje %d: Alle direktiver skal tilhøre et afsnit.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -518,8 +504,7 @@ msgstr "kunne ikke angive installationsårsag for pakke %s (%s)\n"
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
-"%s: installationsårsag er blevet angivet til 'installeret som afhængighed'\n"
+msgstr "%s: installationsårsag er blevet angivet til 'installeret som afhængighed'\n"
 
 #: src/pacman/database.c:80
 #, c-format
@@ -768,34 +753,26 @@ msgstr "handlinger:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"Brug »%s {-h --help}« sammen med en handling for at se tilgængelige "
-"indstillinger\n"
+msgstr "\nBrug »%s {-h --help}« sammen med en handling for at se tilgængelige indstillinger\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        fjern pakker og alle pakker som afhænger af dem\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        fjern pakker og alle pakker som afhænger af dem\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
 msgid "  -n, --nosave         remove configuration files\n"
-msgstr ""
-"  -n, --nosave         fjern konfigurationsfiler\n"
-"\n"
+msgstr "  -n, --nosave         fjern konfigurationsfiler\n\n"
 
 #: src/pacman/pacman.c:127
 #, c-format
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      fjern unødvendige afhængigheder\n"
-"                       (-ss inkluderer eksplicit installerede "
-"afhængigheder)\n"
+msgstr "  -s, --recursive      fjern unødvendige afhængigheder\n                       (-ss inkluderer eksplicit installerede afhængigheder)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -816,8 +793,7 @@ msgstr "  -c, --changelog      vis ændringsloggen for en pakke\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           vis pakker installeret som afhængigheder [filter]\n"
+msgstr "  -d, --deps           vis pakker installeret som afhængigheder [filter]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
@@ -831,10 +807,8 @@ msgstr "  -g, --groups         vis alle medlemmer af en pakkegruppe\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           vis pakkeinformation (-ii for sikkerhedskopier)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           vis pakkeinformation (-ii for sikkerhedskopier)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
@@ -846,27 +820,21 @@ msgstr "-k, --check kontroller at pakkefiler findes (-kk for filegenskaber)\n"
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"  -l, --list           vis filerne som ejes af pakked der er sat i kø\n"
-"\n"
+msgstr "  -l, --list           vis filerne som ejes af pakked der er sat i kø\n\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        vis installerede pakker der ikke blev fundet i sync "
-"db(s) [filter]\n"
+msgstr "  -m, --foreign        vis installerede pakker der ikke blev fundet i sync db(s) [filter]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"-n, --native vis installerede pakker som kun er fundet i sync db(s) "
-"[filter]\n"
+msgstr "-n, --native vis installerede pakker som kun er fundet i sync db(s) [filter]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -881,26 +849,21 @@ msgstr "  -p, --file <pakke> forespørg en pakkefil i steden for databasen\n"
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          vis mindre information for forespørgsel og søgning\n"
+msgstr "  -q, --quiet          vis mindre information for forespørgsel og søgning\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regulært udtryk> søg i lokalt installerede pakker for ens "
-"strenge\n"
+msgstr "  -s, --search <regulært udtryk> søg i lokalt installerede pakker for ens strenge\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     vis pakker som ikke (eventuelt) er krævet af\n"
-"andre pakker (-tt for at ignorere valgfrie pakker) [filter]\n"
+msgstr "  -t, --unrequired     vis pakker som ikke (eventuelt) er krævet af\nandre pakker (-tt for at ignorere valgfrie pakker) [filter]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -912,26 +875,21 @@ msgstr "  -u, --upgrades       vis uddaterede pakker [filter]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          fjern gamle pakker fra mellemlagermappe (-cc for "
-"alle)\n"
+msgstr "  -c, --clean          fjern gamle pakker fra mellemlagermappe (-cc for alle)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         vis alle medlemmer af en pakkegruppe\n"
-"(-gg for at vise alle grupper og medlemmer)\n"
+msgstr "  -g, --groups         vis alle medlemmer af en pakkegruppe\n(-gg for at vise alle grupper og medlemmer)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info           vis pakkeinformation (-ii for udvidet information)\n"
+msgstr "  -i, --info           vis pakkeinformation (-ii for udvidet information)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -940,36 +898,28 @@ msgstr "  -l, --list <arkiv>    vis en liste over pakker i et arkiv\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <regulært udtryk> søg i eksterne arkiver efter ens strenge\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regulært udtryk> søg i eksterne arkiver efter ens strenge\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     opgrader installerede pakker (-uu slår nedgraderinger "
-"til)\n"
+msgstr "  -u, --sysupgrade     opgrader installerede pakker (-uu slår nedgraderinger til)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   hent pakker men installer ikke eller opgrader ikke "
-"noget\n"
+msgstr "  -w, --downloadonly   hent pakker men installer ikke eller opgrader ikke noget\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        hent friske pakkedatabaser fra serveren\n"
-"(-yy for at gennemtvinge en opfriskning selvom databasen er ajour)\n"
+msgstr "  -y, --refresh        hent friske pakkedatabaser fra serveren\n(-yy for at gennemtvinge en opfriskning selvom databasen er ajour)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -986,16 +936,12 @@ msgstr "      --asexplicit     marker pakker som eksplicit installeret\n"
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"  -k, --check          test lokal database for validitet (-kk for "
-"synkronisering af databaser)\n"
+msgstr "  -k, --check          test lokal database for validitet (-kk for synkronisering af databaser)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
-"  -s, --search <fil>  søg efter arkiver med matchende strenge\n"
-"\n"
+msgstr "  -s, --search <fil>  søg efter arkiver med matchende strenge\n\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
@@ -1007,73 +953,55 @@ msgstr " -x, --regex aktiver søgning med regulære udtryk\n"
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"--machinereadable\n"
-"lav mankin-læsbar uddata\n"
+msgstr "--machinereadable\nlav mankin-læsbar uddata\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          tving installation, overskriv filer i konflikt\n"
+msgstr "      --force          tving installation, overskriv filer i konflikt\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         installer pakker så de fremstår som værende "
-"ikkeeksplicit installeret\n"
+msgstr "      --asdeps         installer pakker så de fremstår som værende ikkeeksplicit installeret\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     installer pakker som værende eksplicit installerede\n"
+msgstr "      --asexplicit     installer pakker som værende eksplicit installerede\n"
 
 #: src/pacman/pacman.c:194
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pakke>   ignorer en pakkeopgradering (kan bruges mere end en "
-"gang)\n"
+msgstr "      --ignore <pakke>   ignorer en pakkeopgradering (kan bruges mere end en gang)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <gruppe>\n"
-"                       ignorer en gruppeopgradering (kan bruges mere end en "
-"gang)\n"
+msgstr "      --ignoregroup <gruppe>\n                       ignorer en gruppeopgradering (kan bruges mere end en gang)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         spring over versionstjek af afhængigheder (-dd for at "
-"springe over alle tjek)\n"
+msgstr "  -d, --nodeps         spring over versionstjek af afhængigheder (-dd for at springe over alle tjek)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <pakke=version>\n"
-"                       tilføj en virtuel pakke for at tilfredsstille "
-"afhængigheder\n"
+msgstr "      --assume-installed <pakke=version>\n                       tilføj en virtuel pakke for at tilfredsstille afhængigheder\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         modificer kun databasepunkter, ikke pakkefiler\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         modificer kun databasepunkter, ikke pakkefiler\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
@@ -1085,25 +1013,21 @@ msgstr "      --noprogressbar  vis ikke en statusbjælke når der hentes filer\n
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet    kør ikke installationsskriplet hvis en sådan findes\n"
+msgstr "      --noscriptlet    kør ikke installationsskriplet hvis en sådan findes\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          udskriv målene i stedet for at udføre operationen\n"
+msgstr "  -p, --print          udskriv målene i stedet for at udføre operationen\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                       angiv hvordan målene skal vises\n"
+msgstr "      --print-format <string>\n                       angiv hvordan målene skal vises\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1128,8 +1052,7 @@ msgstr "      --arch <arkit.>    angiv en alternativ arkitektur\n"
 #: src/pacman/pacman.c:215
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <mappe> angiv en alternativ pakkemellemlagerplacering\n"
+msgstr "      --cachedir <mappe> angiv en alternativ pakkemellemlagerplacering\n"
 
 #: src/pacman/pacman.c:216
 #, c-format
@@ -1176,9 +1099,7 @@ msgstr "      --confirm        spørg altid om bekræftelse\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Dette program kan frit videredistribueres under\n"
-"                       betingelserne i GNU General Public License.\n"
+msgstr "                       Dette program kan frit videredistribueres under\n                       betingelserne i GNU General Public License.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1233,8 +1154,7 @@ msgstr "argumentet '-' angivet uden inddata til stdin\n"
 #: src/pacman/pacman.c:1218
 #, c-format
 msgid "you cannot perform this operation unless you are root.\n"
-msgstr ""
-"du kan ikke udføre denne handling med mindre du er administrator (root).\n"
+msgstr "du kan ikke udføre denne handling med mindre du er administrator (root).\n"
 
 #: src/pacman/pacman.c:1272
 #, c-format
@@ -1538,9 +1458,7 @@ msgstr "kunne ikke låse database: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  hvis du er sikker på at en pakkehåndtering ikke \n"
-"  allerede kører, kan du fjerne %s\n"
+msgstr "  hvis du er sikker på at en pakkehåndtering ikke \n  allerede kører, kan du fjerne %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/de.po b/src/pacman/po/de.po
index 8ef341fe..577469d9 100644
--- a/src/pacman/po/de.po
+++ b/src/pacman/po/de.po
@@ -1,12 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # WhiteKnight, 2013
 # Azd325 <tim.kleinschmidt@gmail.com>, 2015
 # Dan McGee <dpmcgee@gmail.com>, 2011
 # Frank Theile, 2016
+# Frank Theile, 2016
 # Jakob Gahde (J5lx) <j5lx@fmail.co.uk>, 2014-2015
 # mar77i <inactive+mar77i@transifex.com>, 2013
 # mar77i <inactive+mar77i@transifex.com>, 2013
@@ -35,12 +36,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 15:11+0000\n"
 "Last-Translator: Frank Theile\n"
-"Language-Team: German (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/de/)\n"
-"Language: de\n"
+"Language-Team: German (http://www.transifex.com/toofishes/archlinux-pacman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
@@ -198,22 +198,17 @@ msgstr "%s und %s stehen miteinander in Konflikt (%s). %s entfernen?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Das folgende Paket kann aufgrund nicht auflösbarer Abhängigkeiten nicht "
-"aktualisiert werden:\n"
-msgstr[1] ""
-"Die folgenden Pakete können aufgrund nicht auflösbarer Abhängigkeiten nicht "
-"aktualisiert werden:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Das folgende Paket kann aufgrund nicht auflösbarer Abhängigkeiten nicht aktualisiert werden:\n"
+msgstr[1] "Die folgenden Pakete können aufgrund nicht auflösbarer Abhängigkeiten nicht aktualisiert werden:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
 msgid "Do you want to skip the above package for this upgrade?"
 msgid_plural "Do you want to skip the above packages for this upgrade?"
-msgstr[0] ""
-"Möchten Sie das obengenannte Paket bei dieser Aktualisierung überspringen?"
-msgstr[1] ""
-"Möchten Sie die obengenannten Pakete bei dieser Aktualisierung überspringen?"
+msgstr[0] "Möchten Sie das obengenannte Paket bei dieser Aktualisierung überspringen?"
+msgstr[1] "Möchten Sie die obengenannten Pakete bei dieser Aktualisierung überspringen?"
 
 #: src/pacman/callback.c:453
 #, c-format
@@ -227,9 +222,7 @@ msgstr[1] "Es stehen %zu Provider für %s zur Verfügung:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Datei %s ist beschädigt (%s).\n"
-"Soll die Datei entfernt werden?"
+msgstr "Datei %s ist beschädigt (%s).\nSoll die Datei entfernt werden?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -418,23 +411,18 @@ msgstr "Konfigurations-Datei %s, Zeile %d: Ungültiger Wert für '%s' : '%s'\n"
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"Konfigurations-Datei %s, Zeile %d: Option '%s' ungültig, keine Signatur-"
-"Unterstützung\n"
+msgstr "Konfigurations-Datei %s, Zeile %d: Option '%s' ungültig, keine Signatur-Unterstützung\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"Konfigurations-Datei %s, Zeile %d: Direktive '%s in Sektion '%s' wird nicht "
-"erkannt.\n"
+msgstr "Konfigurations-Datei %s, Zeile %d: Direktive '%s in Sektion '%s' wird nicht erkannt.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"Spiegel '%s' enthält die Variable '%s', doch ist kein '%s' definiert.\n"
+msgstr "Spiegel '%s' enthält die Variable '%s', doch ist kein '%s' definiert.\n"
 
 #: src/pacman/conf.c:641
 #, c-format
@@ -456,9 +444,7 @@ msgstr "Konnte Spiegel '%s' nicht zur Datenbank '%s' hinzufügen (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"Konnte alpm-Bibliothek nicht initialisieren\n"
-"(%s: %s)\n"
+msgstr "Konnte alpm-Bibliothek nicht initialisieren\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -498,15 +484,12 @@ msgstr "Konfigurations-Datei %s, Zeile %d: %s-Option '%s' nicht erkannt\n"
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
-"Konfigurations-Datei %s, Zeile %d: Direktive '%s' verlangt einen Wert\n"
+msgstr "Konfigurations-Datei %s, Zeile %d: Direktive '%s' verlangt einen Wert\n"
 
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"Einlesen der Konfigurations-Datei hat die maximale Rekursionstiefe %d "
-"überschritten.\n"
+msgstr "Einlesen der Konfigurations-Datei hat die maximale Rekursionstiefe %d überschritten.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -516,9 +499,7 @@ msgstr "Konfigurations-Datei %s konnte nicht gelesen werden: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"Konfigurations-Datei %s, Zeile %d: Alle Direktiven müssen zu einer Sektion "
-"gehören.\n"
+msgstr "Konfigurations-Datei %s, Zeile %d: Alle Direktiven müssen zu einer Sektion gehören.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -539,14 +520,12 @@ msgstr "Konnte den Installations-Grund für %s nicht festsetzen (%s)\n"
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
-"%s: Installations-Grund wurde auf \"Installiert als Abhängigkeit\" gesetzt\n"
+msgstr "%s: Installations-Grund wurde auf \"Installiert als Abhängigkeit\" gesetzt\n"
 
 #: src/pacman/database.c:80
 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
-msgstr ""
-"%s: Installations-Grund wurde auf \"Ausdrücklich installiert\" gesetzt\n"
+msgstr "%s: Installations-Grund wurde auf \"Ausdrücklich installiert\" gesetzt\n"
 
 #: src/pacman/package.c:97
 #, c-format
@@ -790,18 +769,14 @@ msgstr "Operationen:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"Benutzen Sie '%s {-h --help}' zusammen mit einer Operation für verfügbare "
-"Optionen\n"
+msgstr "\nBenutzen Sie '%s {-h --help}' zusammen mit einer Operation für verfügbare Optionen\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        Entfernt Pakete und alle Pakete, die von ihnen "
-"abhängen\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        Entfernt Pakete und alle Pakete, die von ihnen abhängen\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -813,10 +788,7 @@ msgstr "  -n, --nosave         Auch Konfigurationsdateien entfernen\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      Entfernt unnötige Abhängigkeiten\n"
-"                       (-ss Auch explizit installierte Abhängigkeiten "
-"entfernen)\n"
+msgstr "  -s, --recursive      Entfernt unnötige Abhängigkeiten\n                       (-ss Auch explizit installierte Abhängigkeiten entfernen)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -837,16 +809,12 @@ msgstr "  -c, --changelog      Zeigt das Änderungsprotokoll eines Pakets an\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           Zeigt Pakete an, die als Abhängigkeiten installiert "
-"wurden [Filter]\n"
+msgstr "  -d, --deps           Zeigt Pakete an, die als Abhängigkeiten installiert wurden [Filter]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       Zeigt Pakete an, die ausdrücklich installiert wurden "
-"[Filter]\n"
+msgstr "  -e, --explicit       Zeigt Pakete an, die ausdrücklich installiert wurden [Filter]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -855,45 +823,34 @@ msgstr "  -g, --groups         Zeigt alle Mitglieder einer Paket-Gruppe an\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           Zeigt Paketinformationen an (-ii für Sicherungs-"
-"Dateien)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           Zeigt Paketinformationen an (-ii für Sicherungs-Dateien)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          Überprüfe, ob die zu den Paketen gehörenden Dateien "
-"vorhanden sind (-kk: Prüfe Datei-Eigenschaften)\n"
+msgstr "  -k, --check          Überprüfe, ob die zu den Paketen gehörenden Dateien vorhanden sind (-kk: Prüfe Datei-Eigenschaften)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"  -l, --list           Listet die im abgefragten Paket enthaltenen Dateien "
-"auf\n"
+msgstr "  -l, --list           Listet die im abgefragten Paket enthaltenen Dateien auf\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        Zeigt installierte Pakete an, die nicht in den Sync-"
-"DB(s) gefunden wurden [Filter]\n"
+msgstr "  -m, --foreign        Zeigt installierte Pakete an, die nicht in den Sync-DB(s) gefunden wurden [Filter]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         Zeigt installierte Pakete an, die in den Sync-DB(s) "
-"gefunden wurden [Filter]\n"
+msgstr "  -n, --native         Zeigt installierte Pakete an, die in den Sync-DB(s) gefunden wurden [Filter]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -903,31 +860,26 @@ msgstr "  -o, --owns <Datei>   Fragt das Paket ab, das <Datei> enthält\n"
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"  -p, --file <Paket>   Fragt eine Paketdatei anstatt der Datenbank ab\n"
+msgstr "  -p, --file <Paket>   Fragt eine Paketdatei anstatt der Datenbank ab\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          Zeigt weniger Information bei Abfragen und Suche an\n"
+msgstr "  -q, --quiet          Zeigt weniger Information bei Abfragen und Suche an\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex> Durchsucht lokal installierte Pakete nach einem Wort\n"
+msgstr "  -s, --search <regex> Durchsucht lokal installierte Pakete nach einem Wort\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     Listet von keinem Paket (optional) benötigte Pakete "
-"auf (-tt um optionale Abhängigkeiten zu ignorieren) [Filter]\n"
+msgstr "  -t, --unrequired     Listet von keinem Paket (optional) benötigte Pakete auf (-tt um optionale Abhängigkeiten zu ignorieren) [Filter]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -939,73 +891,56 @@ msgstr "  -u, --upgrades       Zeigt aktualisierbare Pakete an [Filter]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          Entfernt alte Pakete aus dem Paketpuffer (-cc für "
-"alle)\n"
+msgstr "  -c, --clean          Entfernt alte Pakete aus dem Paketpuffer (-cc für alle)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         Zeigt alle Mitglieder einer Paket-Gruppe an\n"
-"                       (-gg um alle Gruppen samt Mitgliedern anzuzeigen)\n"
+msgstr "  -g, --groups         Zeigt alle Mitglieder einer Paket-Gruppe an\n                       (-gg um alle Gruppen samt Mitgliedern anzuzeigen)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info           Zeigt Paketinformationen an (-ii für erweiterte "
-"Informationen)\n"
+msgstr "  -i, --info           Zeigt Paketinformationen an (-ii für erweiterte Informationen)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr ""
-"  -l, --list <repo>    Zeigt eine Liste aller Pakete eines Repositoriums an\n"
+msgstr "  -l, --list <repo>    Zeigt eine Liste aller Pakete eines Repositoriums an\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <regex> Durchsucht entfernte Repositorien nach einem Wort\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regex> Durchsucht entfernte Repositorien nach einem Wort\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     Aktualisiert installierte Pakete (-uu ermöglicht "
-"Downgrades)\n"
+msgstr "  -u, --sysupgrade     Aktualisiert installierte Pakete (-uu ermöglicht Downgrades)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   Lädt Pakete herunter, ohne etwas zu installieren oder "
-"aktualisieren\n"
+msgstr "  -w, --downloadonly   Lädt Pakete herunter, ohne etwas zu installieren oder aktualisieren\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        Lädt aktuelle Paketdatenbanken vom Server herunter\n"
-"                       (-yy um eine Aktualisierung auch bei aktuellen "
-"Datenbanken durchzuführen)\n"
+msgstr "  -y, --refresh        Lädt aktuelle Paketdatenbanken vom Server herunter\n                       (-yy um eine Aktualisierung auch bei aktuellen Datenbanken durchzuführen)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         Markiert Pakete als nicht-ausdrücklich installiert\n"
+msgstr "      --asdeps         Markiert Pakete als nicht-ausdrücklich installiert\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
@@ -1017,9 +952,7 @@ msgstr "      --asexplicit     Markiert Pakete als ausdrücklich installiert\n"
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"-k, --check Überprüfe die zu den Paketen gehörenden Dateien auf Gültigkeit (-"
-"kk für Datenbank-Synchronisation)\n"
+msgstr "-k, --check Überprüfe die zu den Paketen gehörenden Dateien auf Gültigkeit (-kk für Datenbank-Synchronisation)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
@@ -1036,105 +969,81 @@ msgstr "-x, --regex aktiviere Suche mit regulären Ausdrücken\n"
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"--machinereadable\n"
-"erzeuge machinenlesbare Ausgabe\n"
+msgstr "--machinereadable\nerzeuge machinenlesbare Ausgabe\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          Installation erzwingen, Dateikonflikte überschreiben\n"
+msgstr "      --force          Installation erzwingen, Dateikonflikte überschreiben\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         Installiert Pakete als nicht-ausdrücklich "
-"installiert\n"
+msgstr "      --asdeps         Installiert Pakete als nicht-ausdrücklich installiert\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     Installiert Pakete als ausdrücklich installiert\n"
+msgstr "      --asexplicit     Installiert Pakete als ausdrücklich installiert\n"
 
 #: src/pacman/pacman.c:194
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg>   Ignoriert ein neues Paket (kann mehrfach genutzt "
-"werden)\n"
+msgstr "      --ignore <pkg>   Ignoriert ein neues Paket (kann mehrfach genutzt werden)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                       Ignoriert Upgrade einer Gruppe (kann mehrfach genutzt "
-"werden)\n"
+msgstr "      --ignoregroup <grp>\n                       Ignoriert Upgrade einer Gruppe (kann mehrfach genutzt werden)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         Überspringt die Versionsüberprüfungen für "
-"Abhängigkeiten (-dd um alle Überprüfungen zu überspringen)\n"
+msgstr "  -d, --nodeps         Überspringt die Versionsüberprüfungen für Abhängigkeiten (-dd um alle Überprüfungen zu überspringen)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <package=version>\n"
-"                       Fügt ein virtuelles Paket hinzu, um Abhängigkeiten zu "
-"erfüllen\n"
+msgstr "      --assume-installed <package=version>\n                       Fügt ein virtuelles Paket hinzu, um Abhängigkeiten zu erfüllen\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         Verändert nur Datenbank-Einträge, keine Paketdateien\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         Verändert nur Datenbank-Einträge, keine Paketdateien\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  Keine Fortschrittsanzeige anzeigen, wenn Dateien "
-"heruntergeladen werden\n"
+msgstr "      --noprogressbar  Keine Fortschrittsanzeige anzeigen, wenn Dateien heruntergeladen werden\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet    Installationsskript nicht ausführen, falls vorhanden\n"
+msgstr "      --noscriptlet    Installationsskript nicht ausführen, falls vorhanden\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          Zeigt die Ziele an, statt die Operation auszuführen\n"
+msgstr "  -p, --print          Zeigt die Ziele an, statt die Operation auszuführen\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                       Legt fest, wie die Ziele ausgegeben werden sollen\n"
+msgstr "      --print-format <string>\n                       Legt fest, wie die Ziele ausgegeben werden sollen\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1144,9 +1053,7 @@ msgstr "  -b, --dbpath <Pfad>  Setzt einen anderen Ort für die Datenbank\n"
 #: src/pacman/pacman.c:212
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
-msgstr ""
-"  -r, --root <Pfad>    Setzt ein alternatives Wurzelverzeichnis zur "
-"Installation\n"
+msgstr "  -r, --root <Pfad>    Setzt ein alternatives Wurzelverzeichnis zur Installation\n"
 
 #: src/pacman/pacman.c:213
 #, c-format
@@ -1161,8 +1068,7 @@ msgstr "      --arch <arch>    Setzt eine alternative Architektur\n"
 #: src/pacman/pacman.c:215
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <Verzeichnis>  Setzt einen anderen Ort für den Paketpuffer\n"
+msgstr "      --cachedir <Verzeichnis>  Setzt einen anderen Ort für den Paketpuffer\n"
 
 #: src/pacman/pacman.c:216
 #, c-format
@@ -1187,9 +1093,7 @@ msgstr "      --debug          Zeigt Debug-Meldungen an\n"
 #: src/pacman/pacman.c:220
 #, c-format
 msgid "      --gpgdir <path>  set an alternate home directory for GnuPG\n"
-msgstr ""
-"      --gpgdir <path>  Setzt alternatives Konfigurationsverzeichnis für "
-"GnuPG\n"
+msgstr "      --gpgdir <path>  Setzt alternatives Konfigurationsverzeichnis für GnuPG\n"
 
 #: src/pacman/pacman.c:221
 #, c-format
@@ -1211,9 +1115,7 @@ msgstr "      --confirm        Immer nach einer Bestätigung fragen\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Dieses Programm darf unter Bedingungen der GNU\n"
-"                       General Public License frei weiterverbreitet werden.\n"
+msgstr "                       Dieses Programm darf unter Bedingungen der GNU\n                       General Public License frei weiterverbreitet werden.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1363,9 +1265,7 @@ msgstr "%s ist als ein HoldPkg gekennzeichnet.\n"
 #: src/pacman/remove.c:149
 #, c-format
 msgid "HoldPkg was found in target list. Do you want to continue?"
-msgstr ""
-"Ein als HoldPkg markiertes Paket wurde in der Ziel-Liste gefunden. Möchten "
-"Sie fortfahren?"
+msgstr "Ein als HoldPkg markiertes Paket wurde in der Ziel-Liste gefunden. Möchten Sie fortfahren?"
 
 #: src/pacman/remove.c:157 src/pacman/sync.c:781
 #, c-format
@@ -1492,8 +1392,7 @@ msgstr "%s: benötigt %s\n"
 #: src/pacman/sync.c:720
 #, c-format
 msgid "%s: installing %s (%s) breaks dependency '%s'\n"
-msgstr ""
-"%s: das Installieren von %s (%s) löscht ein benötigtes Packet von '%s'\n"
+msgstr "%s: das Installieren von %s (%s) löscht ein benötigtes Packet von '%s'\n"
 
 #: src/pacman/sync.c:744
 #, c-format
@@ -1575,9 +1474,7 @@ msgstr "Konnte Datenbank nicht sperren: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  Wenn Sie sicher sind, dass nicht bereits ein\n"
-"  Paketmanager läuft, können Sie %s entfernen\n"
+msgstr "  Wenn Sie sicher sind, dass nicht bereits ein\n  Paketmanager läuft, können Sie %s entfernen\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/el.po b/src/pacman/po/el.po
index edced016..74f7a8ce 100644
--- a/src/pacman/po/el.po
+++ b/src/pacman/po/el.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Achilleas Pipinellis, 2013-2014
 # Achilleas Pipinellis, 2014
@@ -9,7 +9,7 @@
 # Achilleas Pipinellis, 2013
 # Axilleas P <markeleas@gmail.com>, 2011
 # Achilleas Pipinellis, 2013
-# Christos Nouskas <nous@archlinux.us>, 2011-2014
+# Christos Nouskas <nous@archlinux.us>, 2011-2014,2016
 # Christos Nouskas <nous@archlinux.us>, 2013
 # flamelab <panosfilip@gmail.com>, 2011
 # ifaigios <ifaigios@gmail.com>, 2013,2015-2016
@@ -24,25 +24,24 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
-"PO-Revision-Date: 2016-01-17 04:37+0000\n"
-"Last-Translator: ifaigios <ifaigios@gmail.com>\n"
-"Language-Team: Greek (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/el/)\n"
-"Language: el\n"
+"PO-Revision-Date: 2016-02-02 11:11+0000\n"
+"Last-Translator: Christos Nouskas <nous@archlinux.us>\n"
+"Language-Team: Greek (http://www.transifex.com/toofishes/archlinux-pacman/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
 #, c-format
 msgid "Running pre-transaction hooks...\n"
-msgstr "Εκτέλεση hooks πριν τη διεκπεραίωση...\n"
+msgstr "Εκτέλεση hooks πριν από την διεκπεραίωση...\n"
 
 #: src/pacman/callback.c:184
 #, c-format
 msgid "Running post-transaction hooks...\n"
-msgstr "Εκτέλεση hooks μετά τη διεκπεραίωση...\n"
+msgstr "Εκτέλεση hooks μετά την διεκπεραίωση...\n"
 
 #: src/pacman/callback.c:197
 #, c-format
@@ -189,11 +188,10 @@ msgstr "Διένεξη %s με %s (%s). Κατάργηση %s;"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Αδυναμία αναβάθμισης του ακόλουθου πακέτου λόγω ανεπίλυτων εξαρτήσεων:\n"
-msgstr[1] ""
-"Αδυναμία αναβάθμισης των ακόλουθων πακέτων λόγω ανεπίλυτων εξαρτήσεων:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Αδυναμία αναβάθμισης του ακόλουθου πακέτου λόγω ανεπίλυτων εξαρτήσεων:\n"
+msgstr[1] "Αδυναμία αναβάθμισης των ακόλουθων πακέτων λόγω ανεπίλυτων εξαρτήσεων:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -214,15 +212,12 @@ msgstr[1] "Υπάρχουν %zu πάροχοι διαθέσιμοι για το
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Το αρχείο %s είναι κατεστραμμένο (%s).\n"
-"Διαγραφή;"
+msgstr "Το αρχείο %s είναι κατεστραμμένο (%s).\nΔιαγραφή;"
 
 #: src/pacman/callback.c:478
 #, c-format
 msgid "Import PGP key %u%c/%s, \"%s\", created: %s (revoked)?"
-msgstr ""
-"Εισαγωγή κλειδιού PGP %u%c/%s, \"%s\", δημιουργημένου την: %s (ανακλήθηκε);"
+msgstr "Εισαγωγή κλειδιού PGP %u%c/%s, \"%s\", δημιουργημένου την: %s (ανακλήθηκε);"
 
 #: src/pacman/callback.c:481
 #, c-format
@@ -406,9 +401,7 @@ msgstr "αρχείο ρυθμίσεων %s, γραμμή %d: άκυρη τιμή
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"αρχείο ρυθμίσεων %s, γραμμή %d: επιλογή '%s' άκυρη, χωρίς υποστήριξη "
-"υπογραφής\n"
+msgstr "αρχείο ρυθμίσεων %s, γραμμή %d: επιλογή '%s' άκυρη, χωρίς υποστήριξη υπογραφής\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
@@ -419,8 +412,7 @@ msgstr "αρχείο επιλογών %s, γραμμή %d: άγνωστη εντ
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"ο διακομιστής '%s' περιέχει την μεταβλητή '%s', αλλά δεν έχει ορισθεί '%s'\n"
+msgstr "ο διακομιστής '%s' περιέχει την μεταβλητή '%s', αλλά δεν έχει ορισθεί '%s'\n"
 
 #: src/pacman/conf.c:641
 #, c-format
@@ -442,14 +434,12 @@ msgstr "αδυναμία προσθήκης διακομιστή '%s' στην 
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"αποτυχία εκκίνησης βιβλιοθήκης alpm\n"
-"(%s: %s)\n"
+msgstr "αποτυχία εκκίνησης βιβλιοθήκης alpm\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
 msgid "try running pacman-db-upgrade\n"
-msgstr "δοκιμάστε να εκτελέσετε την pacman-db-upgrade\n"
+msgstr "δοκιμάστε την pacman-db-upgrade\n"
 
 #: src/pacman/conf.c:744
 #, c-format
@@ -474,14 +464,12 @@ msgstr "δέν έχει ρυθμιστεί κανένα '%s'\n"
 #: src/pacman/conf.c:830
 #, c-format
 msgid "Failed to pass %s entry to libalpm"
-msgstr "Αποτυχία καταχώρισης του %s στην libalpm"
+msgstr "Αποτυχία μετάδοσης του %s στην libalpm"
 
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"αρχείο ρυθμίσεων %s, γραμμή %d: επιλογή του '%s' μη αναγνωρίσιμη: %s\n"
-"\n"
+msgstr "αρχείο ρυθμίσεων %s, γραμμή %d: επιλογή του '%s' μη αναγνωρίσιμη: %s\n\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
@@ -491,8 +479,7 @@ msgstr "αρχείο ρυθμίσεων %s, γραμμή %d: η εντολή '%s
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"υπέρβαση μέγιστου βάθους αναδρομής (%d) κατά την ανάλυση αρχείου ρυθμίσεων.\n"
+msgstr "υπέρβαση μέγιστου βάθους αναδρομής (%d) κατά την ανάλυση αρχείου ρυθμίσεων.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -502,9 +489,7 @@ msgstr "αδυναμία ανάγνωσης αρχείου ρυθμίσεων %s
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"αρχείο ρυθμίσεων %s, γραμμή %d: όλες οι οδηγίες πρέπει να ανήκουν σε "
-"ενότητα.\n"
+msgstr "αρχείο ρυθμίσεων %s, γραμμή %d: όλες οι οδηγίες πρέπει να ανήκουν σε ενότητα.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -727,12 +712,12 @@ msgstr "(ουδέν)\n"
 #: src/pacman/package.c:453
 #, c-format
 msgid "no changelog available for '%s'.\n"
-msgstr "μη διαθέσιμο ημερολόγιο αλλαγών για '%s'.\n"
+msgstr "μη διαθέσιμη καταγραφή αλλαγών για '%s'.\n"
 
 #: src/pacman/package.c:457
 #, c-format
 msgid "Changelog for %s:\n"
-msgstr "Ημερολόγιο αλλαγών για %s:\n"
+msgstr "Καταγραφή αλλαγών για %s:\n"
 
 #: src/pacman/package.c:482 src/pacman/package.c:484
 #, c-format
@@ -774,16 +759,14 @@ msgstr "λειτουργίες:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"χρήση: '%s {-h --help}' με μια λειτουργία για προβολή διαθέσιμων επιλογών\n"
+msgstr "\nχρήση: '%s {-h --help}' με μία λειτουργία για προβολή διαθέσιμων επιλογών\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        κατάργηση πακέτων και όλων όσων εξαρτώνται από αυτά\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        κατάργηση πακέτων και όλων όσων εξαρτώνται από αυτά\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -795,9 +778,7 @@ msgstr "  -n, --nosave         διαγραφή αρχείων ρυθμίσεω
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      κατάργηση αχρείαστων εξαρτήσεων\n"
-"                       (-ss και ρητώς εγκατεστημένων εξαρτήσεων)\n"
+msgstr "  -s, --recursive      κατάργηση αχρείαστων εξαρτήσεων\n                       (-ss και ρητώς εγκατεστημένων εξαρτήσεων)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -818,15 +799,12 @@ msgstr "  -c, --changelog      εμφάνιση του ημερολογίου α
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           παράθεση πακέτων εγκατεστημένων ως εξαρτήσεις "
-"[φίλτρο]\n"
+msgstr "  -d, --deps           παράθεση πακέτων εγκατεστημένων ως εξαρτήσεις [φίλτρο]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       παράθεση πακέτων εγκατεστημένων ρητώς [φίλτρο]\n"
+msgstr "  -e, --explicit       παράθεση πακέτων εγκατεστημένων ρητώς [φίλτρο]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -835,51 +813,39 @@ msgstr "  -g, --groups         εμφάνιση όλων των πακέτων 
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           εμφάνιση πληροφοριών πακέτου (-ii για εφεδρικά "
-"αρχεία)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           εμφάνιση πληροφοριών πακέτου (-ii για εφεδρικά αρχεία)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          έλεγχος παρουσίας αρχείων που ανήκουν σε πακέτα (-kk "
-"για έλεγχο ιδιοτήτων)\n"
+msgstr "  -k, --check          έλεγχος παρουσίας αρχείων που ανήκουν σε πακέτα (-kk για έλεγχο ιδιοτήτων)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"  -l, --list           παράθεση αρχείων πακέτου\n"
-"\n"
+msgstr "  -l, --list           παράθεση αρχείων πακέτου\n\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        παράθεση εγκατεστημένων πακέτων εκτός βάσης "
-"συγχρονισμού [φίλτρο]\n"
+msgstr "  -m, --foreign        παράθεση εγκατεστημένων πακέτων εκτός βάσης συγχρονισμού [φίλτρο]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         παράθεση μόνο πακέτων εντός βάσεων συγχρονισμού "
-"[φίλτρο]\n"
+msgstr "  -n, --native         παράθεση μόνο πακέτων εντός βάσεων συγχρονισμού [φίλτρο]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
-msgstr ""
-"  -o, --owns <file>    αναζήτηση πακέτου στο οποίο ανήκει το <αρχείο>\n"
+msgstr "  -o, --owns <file>    αναζήτηση πακέτου στο οποίο ανήκει το <αρχείο>\n"
 
 #: src/pacman/pacman.c:147
 #, c-format
@@ -896,17 +862,14 @@ msgstr "  -q, --quiet          εμφάνιση λιγότερων πληροφ
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex> αναζήτηση συμβολοσειράς στα εγκατεστημένα πακέτα\n"
+msgstr "  -s, --search <regex> αναζήτηση συμβολοσειρών στα εγκατεστημένα πακέτα\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     παράθεση πακέτων μη (προαιρετικά) απαιτούμενων από\n"
-"                       κάποιο πακέτο (-tt για αγνόηση optdepends) [φίλτρο]\n"
+msgstr "  -t, --unrequired     παράθεση πακέτων μη (προαιρετικά) απαιτούμενων από\n                       κάποιο πακέτο (-tt για αγνόηση optdepends) [φίλτρο]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -918,27 +881,21 @@ msgstr "  -u, --upgrades       παράθεση αναβαθμίσιμων πα
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          διαγραφή παλαιών πακέτων από την τοπική κρύπτη (-cc "
-"για διαγραφή όλων)\n"
+msgstr "  -c, --clean          διαγραφή παλαιών πακέτων από την τοπική κρύπτη (-cc για διαγραφή όλων)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         εμφάνιση όλων των μελών ομάδας πακέτων\n"
-"                       (-gg εμφάνιση όλων των ομάδων και μελών)\n"
+msgstr "  -g, --groups         εμφάνιση όλων των μελών ομάδας πακέτων\n                       (-gg εμφάνιση όλων των ομάδων και μελών)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info           εμφάνιση πληροφοριών πακέτου (-ii για εκτεταμένες "
-"πληροφορίες)\n"
+msgstr "  -i, --info           εμφάνιση πληροφοριών πακέτου (-ii για εκτεταμένες πληροφορίες)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -947,34 +904,28 @@ msgstr "  -l, --list <repo>    εμφάνιση λίστας πακέτων απ
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr "  -s, --search <regex> αναζήτηση συμβολοσειρών στις αποθήκες\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     αναβάθμιση εγκατεστημένων πακέτων (-uu επιτρέπει "
-"υποβάθμιση)\n"
+msgstr "  -u, --sysupgrade     αναβάθμιση εγκατεστημένων πακέτων (-uu επιτρέπει υποβάθμιση)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   μόνο λήψη πακέτων, χωρίς εγκατάσταση/αναβάθμιση\n"
+msgstr "  -w, --downloadonly   μόνο λήψη πακέτων, χωρίς εγκατάσταση/αναβάθμιση\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        λήψη ανανεωμένης βάσης πακέτων από διακομιστή\n"
-"                       (-yy εξαναγκασμός ανανέωσης ήδη ενημερωμένων)\n"
+msgstr "  -y, --refresh        λήψη ανανεωμένης βάσης πακέτων από διακομιστή\n                       (-yy εξαναγκασμός ανανέωσης ήδη ενημερωμένων)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -991,42 +942,34 @@ msgstr "      --asexplicit     σήμανση πακέτων ως ρητώς ε
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"-k, --check έλεγχος εγκυρότητας τοπικής βάσης (-kk για βάσεις συγχρονισμού)\n"
+msgstr "  -k, --check          έλεγχος εγκυρότητας τοπικής βάσης (-kk για βάσεις συγχρονισμού)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
-"-s, --search <file> αναζήτηση συμβολοσειράς στα ονομάτα αρχείων πακέτων\n"
+msgstr "  -s, --search <file>  αναζήτηση συμβολοσειράς στα ονομάτα αρχείων πακέτων\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
 msgid "  -x, --regex          enable searching using regular expressions\n"
-msgstr "-x, --regex ενεργοποίηση αναζήτησης με χρήση τυπικών εκφράσεων\n"
+msgstr "  -x, --regex          ενεργοποίηση αναζήτησης με χρήση τυπικών εκφράσεων\n"
 
 #: src/pacman/pacman.c:185
 #, c-format
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"--machinereadable\n"
-"έξοδος αναγνώσιμη από μηχανή\n"
+msgstr "      --machinereadable\n                       έξοδος αναγνώσιμη από μηχανή\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          επιβολή εγκατάστασης, αντικατάσταση υπαρχόντων "
-"αρχείων\n"
-"\n"
+msgstr "      --force          επιβολή εγκατάστασης, αντικατάσταση υπαρχόντων αρχείων\n\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         εγκατάσταση πακέτων ως μη-ρητώς εγκατεστημένων\n"
+msgstr "      --asdeps         εγκατάσταση πακέτων ως μη-ρητώς εγκατεστημένων\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
@@ -1038,46 +981,33 @@ msgstr "      --asexplicit     εγκατάσταση πακέτων ως ρητ
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg>   παράβλεψη αναβάθμισης πακέτου (επιτρέπεται πολλαπλή "
-"χρήση)\n"
+msgstr "      --ignore <pkg>   παράβλεψη αναβάθμισης πακέτου (επιτρέπεται πολλαπλή χρήση)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                       παράβλεψη αναβάθμισης ομάδας (επιτρέπεται πολλαπλή "
-"χρήση)\n"
+msgstr "      --ignoregroup <grp>\n                       παράβλεψη αναβάθμισης ομάδας (επιτρέπεται πολλαπλή χρήση)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         παράλειψη ελέγχου έκδοσης εξαρτήσεων (-dd για "
-"παράλειψη όλων των ελέγχων)\n"
+msgstr "  -d, --nodeps         παράλειψη ελέγχου έκδοσης εξαρτήσεων (-dd για παράλειψη όλων των ελέγχων)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <package=version>\n"
-"                       προσθήκη εικονικού πακέτου για ικανοποίηση "
-"εξαρτήσεων\n"
+msgstr "      --assume-installed <package=version>\n                       προσθήκη εικονικού πακέτου για ικανοποίηση εξαρτήσεων\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         τροποποίηση μόνο εγγραφών βάσης, χωρίς εγκατάσταση "
-"πακέτων\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         τροποποίηση μόνο εγγραφών βάσης, χωρίς εγκατάσταση πακέτων\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
@@ -1089,9 +1019,7 @@ msgstr "      --noprogressbar  απόκρυψη γραμμής προόδου λ
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet    μη εκτέλεση σεναρίου εγκατάστασης, εάν υφίσταται "
-"τέτοιο\n"
+msgstr "      --noscriptlet    μη εκτέλεση σεναρίου εγκατάστασης, εάν υφίσταται τέτοιο\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
@@ -1105,9 +1033,7 @@ msgstr "  -p, --print          προβολή στόχων, χωρίς εκτέ
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                       ορισμός τρόπου εμφάνισης στόχων\n"
+msgstr "      --print-format <string>\n                       ορισμός τρόπου εμφάνισης στόχων\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1137,12 +1063,12 @@ msgstr "      --cachedir <dir> ορισμός εναλλακτικής θέση
 #: src/pacman/pacman.c:216
 #, c-format
 msgid "      --hookdir <dir>  set an alternate hook location\n"
-msgstr "--hookdir <dir> ορισμός εναλλακτικής θέσης για hooks\n"
+msgstr "      --hookdir <dir>  ορισμός εναλλακτικής θέσης hooks\n"
 
 #: src/pacman/pacman.c:217
 #, c-format
 msgid "      --color <when>   colorize the output\n"
-msgstr "  --color <when>       χρωματισμός πληροφοριών εξόδου\n"
+msgstr "      --color <when>   χρωματισμός εξόδου\n"
 
 #: src/pacman/pacman.c:218
 #, c-format
@@ -1179,9 +1105,7 @@ msgstr "      --confirm        πάντοτε επιβεβαίωση\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Το πρόγραμμα αυτό μπορεί να αναδιανεμηθεί ελεύθερα\n"
-"                       υπό τους όρους της Γενικής Δημόσιας Άδειας GNU GPL.\n"
+msgstr "                       Το πρόγραμμα αυτό μπορεί να αναδιανεμηθεί ελεύθερα\n                       υπό τους όρους της Γενικής Δημόσιας Άδειας GNU GPL.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1286,12 +1210,12 @@ msgstr "[αγνοήθηκε]"
 #: src/pacman/query.c:380
 #, c-format
 msgid "group '%s' was not found\n"
-msgstr "δε βρέθηκε ομάδα '%s'\n"
+msgstr "δεν βρέθηκε ομάδα '%s'\n"
 
 #: src/pacman/query.c:471 src/pacman/sync.c:429
 #, c-format
 msgid "package '%s' was not found\n"
-msgstr "το πακέτο '%s' δε βρέθηκε\n"
+msgstr "το πακέτο '%s' δεν βρέθηκε\n"
 
 #: src/pacman/query.c:474
 #, c-format
@@ -1311,7 +1235,7 @@ msgstr "παράλειψη πακέτου-στόχου: %s\n"
 #: src/pacman/remove.c:63 src/pacman/sync.c:546
 #, c-format
 msgid "target not found: %s\n"
-msgstr "δε βρέθηκε το πακέτο-στόχος: %s\n"
+msgstr "δεν βρέθηκε το πακέτο-στόχος: %s\n"
 
 #: src/pacman/remove.c:118 src/pacman/sync.c:738
 #, c-format
@@ -1540,9 +1464,7 @@ msgstr "αδυναμία κλειδώματος βάσης: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  εάν είσαι βέβαιος ότι ο διαχειριστής πακέτων δεν εκτελείται ήδη,\n"
-"  μπορείς να διαγράψεις το %s\n"
+msgstr "  εάν είσαι βέβαιος ότι ο διαχειριστής πακέτων δεν εκτελείται ήδη,\n  μπορείς να διαγράψεις το %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/en_GB.po b/src/pacman/po/en_GB.po
index 95317a93..dfd03386 100644
--- a/src/pacman/po/en_GB.po
+++ b/src/pacman/po/en_GB.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Allan McRae <allan@archlinux.org>, 2013
 # Allan McRae <allan@archlinux.org>, 2013-2016
@@ -14,12 +14,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 04:18+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/en_GB/)\n"
-"Language: en_GB\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/toofishes/archlinux-pacman/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
@@ -177,11 +176,10 @@ msgstr "%s and %s are in conflict (%s). Remove %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"The following package cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[1] ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "The following package cannot be upgraded due to unresolvable dependencies:\n"
+msgstr[1] "The following packages cannot be upgraded due to unresolvable dependencies:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -202,9 +200,7 @@ msgstr[1] "There are %zu providers available for %s:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"File %s is corrupted (%s).\n"
-"Do you want to delete it?"
+msgstr "File %s is corrupted (%s).\nDo you want to delete it?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -399,8 +395,7 @@ msgstr "config file %s, line %d: '%s' option invalid, no signature support\n"
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"config file %s, line %d: directive '%s' in section '%s' not recognised.\n"
+msgstr "config file %s, line %d: directive '%s' in section '%s' not recognised.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
@@ -427,9 +422,7 @@ msgstr "could not add mirror '%s' to database '%s' (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"failed to initialise alpm library\n"
-"(%s: %s)\n"
+msgstr "failed to initialise alpm library\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -754,16 +747,14 @@ msgstr "operations:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"use '%s {-h --help}' with an operation for available options\n"
+msgstr "\nuse '%s {-h --help}' with an operation for available options\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        remove packages and all packages that depend on them\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -775,9 +766,7 @@ msgstr "  -n, --nosave         remove configuration files\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      remove unnecessary dependencies\n"
-"                       (-ss includes explicitly installed dependencies)\n"
+msgstr "  -s, --recursive      remove unnecessary dependencies\n                       (-ss includes explicitly installed dependencies)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -798,8 +787,7 @@ msgstr "  -c, --changelog      view the changelog of a package\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           list packages installed as dependencies [filter]\n"
+msgstr "  -d, --deps           list packages installed as dependencies [filter]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
@@ -813,19 +801,15 @@ msgstr "  -g, --groups         view all members of a package group\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           view package information (-ii for backup files)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           view package information (-ii for backup files)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          check that package files exist (-kk for file "
-"properties)\n"
+msgstr "  -k, --check          check that package files exist (-kk for file properties)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
@@ -837,18 +821,14 @@ msgstr "  -l, --list           list the files owned by the queried package\n"
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        list installed packages not found in sync db(s) "
-"[filter]\n"
+msgstr "  -m, --foreign        list installed packages not found in sync db(s) [filter]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         list installed packages only found in sync db(s) "
-"[filter]\n"
+msgstr "  -n, --native         list installed packages only found in sync db(s) [filter]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -870,18 +850,14 @@ msgstr "  -q, --quiet          show less information for query and search\n"
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex> search locally-installed packages for matching "
-"strings\n"
+msgstr "  -s, --search <regex> search locally-installed packages for matching strings\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     list packages not (optionally) required by any\n"
-"                       package (-tt to ignore optdepends) [filter]\n"
+msgstr "  -t, --unrequired     list packages not (optionally) required by any\n                       package (-tt to ignore optdepends) [filter]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -893,27 +869,21 @@ msgstr "  -u, --upgrades       list outdated packages [filter]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          remove old packages from cache directory (-cc for "
-"all)\n"
+msgstr "  -c, --clean          remove old packages from cache directory (-cc for all)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         view all members of a package group\n"
-"                       (-gg to view all groups and members)\n"
+msgstr "  -g, --groups         view all members of a package group\n                       (-gg to view all groups and members)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info           view package information (-ii for extended "
-"information)\n"
+msgstr "  -i, --info           view package information (-ii for extended information)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -922,35 +892,28 @@ msgstr "  -l, --list <repo>    view a list of packages in a repo\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regex> search remote repositories for matching strings\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
+msgstr "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   download packages but do not install/upgrade "
-"anything\n"
+msgstr "  -w, --downloadonly   download packages but do not install/upgrade anything\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        download fresh package databases from the server\n"
-"                       (-yy to force a refresh even if up to date)\n"
+msgstr "  -y, --refresh        download fresh package databases from the server\n                       (-yy to force a refresh even if up to date)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -967,15 +930,12 @@ msgstr "      --asexplicit     mark packages as explicitly installed\n"
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"  -k, --check          test local database for validity (-kk for sync "
-"databases)\n"
+msgstr "  -k, --check          test local database for validity (-kk for sync databases)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
-"  -s, --search <file>  search package file names for matching strings\n"
+msgstr "  -s, --search <file>  search package file names for matching strings\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
@@ -987,9 +947,7 @@ msgstr "  -x, --regex          enable searching using regular expressions\n"
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"      --machinereadable\n"
-"                       produce machine-readable output\n"
+msgstr "      --machinereadable\n                       produce machine-readable output\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
@@ -1011,75 +969,59 @@ msgstr "      --asexplicit     install packages as explicitly installed\n"
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg>   ignore a package upgrade (can be used more than "
-"once)\n"
+msgstr "      --ignore <pkg>   ignore a package upgrade (can be used more than once)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                       ignore a group upgrade (can be used more than once)\n"
+msgstr "      --ignoregroup <grp>\n                       ignore a group upgrade (can be used more than once)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         skip dependency version checks (-dd to skip all "
-"checks)\n"
+msgstr "  -d, --nodeps         skip dependency version checks (-dd to skip all checks)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <package=version>\n"
-"                       add a virtual package to satisfy dependencies\n"
+msgstr "      --assume-installed <package=version>\n                       add a virtual package to satisfy dependencies\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         only modify database entries, not package files\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  do not show a progress bar when downloading files\n"
+msgstr "      --noprogressbar  do not show a progress bar when downloading files\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet    do not execute the install scriptlet if one exists\n"
+msgstr "      --noscriptlet    do not execute the install scriptlet if one exists\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          print the targets instead of performing the "
-"operation\n"
+msgstr "  -p, --print          print the targets instead of performing the operation\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                       specify how the targets should be printed\n"
+msgstr "      --print-format <string>\n                       specify how the targets should be printed\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1151,9 +1093,7 @@ msgstr "      --confirm        always ask for confirmation\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       This program may be freely redistributed under\n"
-"                       the terms of the GNU General Public License.\n"
+msgstr "                       This program may be freely redistributed under\n                       the terms of the GNU General Public License.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1512,9 +1452,7 @@ msgstr "could not lock database: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  if you're sure a package manager is not already\n"
-"  running, you can remove %s\n"
+msgstr "  if you're sure a package manager is not already\n  running, you can remove %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/eo.po b/src/pacman/po/eo.po
index 906e38a5..0be3f9ef 100644
--- a/src/pacman/po/eo.po
+++ b/src/pacman/po/eo.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Joop Kiefte <ikojba@gmail.com>, 2014
 # Joop Kiefte <ikojba@gmail.com>, 2014
@@ -18,12 +18,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-27 11:46+0000\n"
 "Last-Translator: pizzaiolo\n"
-"Language-Team: Esperanto (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/eo/)\n"
-"Language: eo\n"
+"Language-Team: Esperanto (http://www.transifex.com/toofishes/archlinux-pacman/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
@@ -134,9 +133,7 @@ msgstr "fiasko.\n"
 #: src/pacman/callback.c:291
 #, c-format
 msgid "Retrieving packages ...\n"
-msgstr ""
-"Obtenado de pakaĵoj...\n"
-"\n"
+msgstr "Obtenado de pakaĵoj...\n\n"
 
 #: src/pacman/callback.c:295
 #, c-format
@@ -183,11 +180,10 @@ msgstr "%s kaj %s konfliktas (%s). Ĉu forigi %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Oni ne eblas ĝisdatigi la jenan pakaĵon pro nesolveblaj dependecoj:\n"
-msgstr[1] ""
-"Oni ne eblas ĝisdatigi la jenajn pakaĵojn pro nesolveblaj dependecoj:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Oni ne eblas ĝisdatigi la jenan pakaĵon pro nesolveblaj dependecoj:\n"
+msgstr[1] "Oni ne eblas ĝisdatigi la jenajn pakaĵojn pro nesolveblaj dependecoj:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -208,9 +204,7 @@ msgstr[1] "Estas %zu provizantoj disponeblaj por %s\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Dosiero %s estas difektita (%s).\n"
-"Ĉu vi volas forviŝi ĝin?"
+msgstr "Dosiero %s estas difektita (%s).\nĈu vi volas forviŝi ĝin?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -399,18 +393,13 @@ msgstr "agorda dosiero %s, linio %d: ne valida valoro por '%s': '%s'\n"
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"agorda dosiero %s, linio %d: '%s' ne estas valida opcio, nenia subteno por "
-"subskriboj\n"
+msgstr "agorda dosiero %s, linio %d: '%s' ne estas valida opcio, nenia subteno por subskriboj\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"agorda dosiero %s, linio %d: direktivo '%s' en sekcio '%s' ne estis "
-"komprenita.\n"
-"\n"
+msgstr "agorda dosiero %s, linio %d: direktivo '%s' en sekcio '%s' ne estis komprenita.\n\n"
 
 #: src/pacman/conf.c:632
 #, c-format
@@ -437,9 +426,7 @@ msgstr "ne eblis aldoni spegulon '%s' al datumbazo '%s' (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"eko de alpm-biblioteko malsukcesis\n"
-"(%s: %s)\n"
+msgstr "eko de alpm-biblioteko malsukcesis\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -474,9 +461,7 @@ msgstr "Malsukcesis pasi eron %s al libalpm"
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"agorda dosiero %s, linio %d: '%s' opcio '%s' ne estis komprenita\n"
-"\n"
+msgstr "agorda dosiero %s, linio %d: '%s' opcio '%s' ne estis komprenita\n\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
@@ -486,8 +471,7 @@ msgstr "agorda dosiero %s, linio %d: direktivo '%s' bezonas valoron\n"
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"analizado de agordo superis maksimuman profundecon de rekursio por %d.\n"
+msgstr "analizado de agordo superis maksimuman profundecon de rekursio por %d.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -497,9 +481,7 @@ msgstr "ne eblis legi agordan dosieron %s: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"agorda dosiero %s, linio %d: Ĉiuj direktivoj devas aparteni al sekcion.\n"
-"\n"
+msgstr "agorda dosiero %s, linio %d: Ĉiuj direktivoj devas aparteni al sekcion.\n\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -769,16 +751,14 @@ msgstr "agoj:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"uzu '%s {-h --help}' kun operacio por vidi haveblajn opciojn\n"
+msgstr "\nuzu '%s {-h --help}' kun operacio por vidi haveblajn opciojn\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        forigi pakaĵon kaj ĉiujn dependantajn pakaĵojn\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        forigi pakaĵon kaj ĉiujn dependantajn pakaĵojn\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -790,9 +770,7 @@ msgstr "  -n, --nosave         forigi agordajn dosierojn\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      forigi nebezonatajn dependencojn\n"
-"                       (-ss inkluzivas dependecojn eksplicite instalitajn)\n"
+msgstr "  -s, --recursive      forigi nebezonatajn dependencojn\n                       (-ss inkluzivas dependecojn eksplicite instalitajn)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -807,23 +785,18 @@ msgstr "      --needed         ne reinstali ĝisdatigitajn pakaĵojn\n"
 #: src/pacman/pacman.c:137
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
-msgstr ""
-"  -c, --changelog      vidi la ŝanĝoregistron de pakaĵo\n"
-"\n"
+msgstr "  -c, --changelog      vidi la ŝanĝoregistron de pakaĵo\n\n"
 
 #: src/pacman/pacman.c:138
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           listigi pakaĵojn instalitajn kiel dependecoj "
-"[filtrilo]\n"
+msgstr "  -d, --deps           listigi pakaĵojn instalitajn kiel dependecoj [filtrilo]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       listigi pakaĵojn eksplicite instalitajn [filtrilo]\n"
+msgstr "  -e, --explicit       listigi pakaĵojn eksplicite instalitajn [filtrilo]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -832,80 +805,63 @@ msgstr "  -g, --groups         vidi ĉiujn anojn de pakaĵa grupo\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           vidi pakaĵan informon (-ii por restaŭrkopiaj "
-"dosieroj)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           vidi pakaĵan informon (-ii por restaŭrkopiaj dosieroj)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          kontroli ke la pakaĵaj dosieroj ekzistas (-kk por "
-"dosieraj ecoj)\n"
+msgstr "  -k, --check          kontroli ke la pakaĵaj dosieroj ekzistas (-kk por dosieraj ecoj)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"  -l, --list           listigi la dosierojn de la pakaĵo informpetita\n"
+msgstr "  -l, --list           listigi la dosierojn de la pakaĵo informpetita\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        listigi instalitajn pakaĵojn ne trovitaj en "
-"sinkronigo de db(j) [filtro]\n"
+msgstr "  -m, --foreign        listigi instalitajn pakaĵojn ne trovitaj en sinkronigo de db(j) [filtro]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         listigi instalitajn pakaĵojn nur trovitaj en "
-"sinkronigaj db(j) [filtro]\n"
+msgstr "  -n, --native         listigi instalitajn pakaĵojn nur trovitaj en sinkronigaj db(j) [filtro]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
-msgstr ""
-"  -o, --owns <file>    informpeti la pakaĵon kiu posedas la dosieron <file>\n"
+msgstr "  -o, --owns <file>    informpeti la pakaĵon kiu posedas la dosieron <file>\n"
 
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"  -p, --file <package> informpeti pakaĵan dosieron anstataŭ datumbazon\n"
+msgstr "  -p, --file <package> informpeti pakaĵan dosieron anstataŭ datumbazon\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          montri malpli da informojn dum informpetoj kaj "
-"serĉado\n"
+msgstr "  -q, --quiet          montri malpli da informojn dum informpetoj kaj serĉado\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex> serĉi loke instalitajn pakaĵojn por kongruaj ĉenoj\n"
+msgstr "  -s, --search <regex> serĉi loke instalitajn pakaĵojn por kongruaj ĉenoj\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     listigi pakaĵojn ne bezonataj por iu\n"
-"                       pakaĵo (-tt por ignori optdepends) [filtro]\n"
+msgstr "  -t, --unrequired     listigi pakaĵojn ne bezonataj por iu\n                       pakaĵo (-tt por ignori optdepends) [filtro]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -917,26 +873,21 @@ msgstr "  -u, --upgrades       listigi neĝisdatajn pakaĵojn [filtro]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          forviŝi malnovajn pakaĵojn de la kaŝmemora dosierujo "
-"(-cc por ĉiuj)\n"
+msgstr "  -c, --clean          forviŝi malnovajn pakaĵojn de la kaŝmemora dosierujo (-cc por ĉiuj)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-" -g, --groups vidi ĉiujn anojn de pakaĵa grupo\n"
-"                       (-gg por vidi ĉiujn grupojn kaj anojn)\n"
+msgstr " -g, --groups vidi ĉiujn anojn de pakaĵa grupo\n                       (-gg por vidi ĉiujn grupojn kaj anojn)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info           vidi pakaĵan informon (-ii por pliaj informoj)\n"
+msgstr "  -i, --info           vidi pakaĵan informon (-ii por pliaj informoj)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -945,17 +896,14 @@ msgstr "  -l, --list <repo>    vidi liston de pakaĵoj en deponejo\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr "  -s, --search <regex> serĉi forajn deponejojn por kongruaj ĉenoj\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     ĝisdatigi instalitajn pakaĵojn (-uu ebligas "
-"malpromociojn)\n"
+msgstr "  -u, --sysupgrade     ĝisdatigi instalitajn pakaĵojn (-uu ebligas malpromociojn)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
@@ -969,10 +917,7 @@ msgstr "  -w, --downloadonly   elŝuti pakaĵojn sed ne instali/ĝisdatigi ion\n
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        elŝuti novajn pakaĵajn datumbazojn de la servilo\n"
-"                       (-yy por trude aktualigi mem se ĝi estas "
-"ĝisdatigita)\n"
+msgstr "  -y, --refresh        elŝuti novajn pakaĵajn datumbazojn de la servilo\n                       (-yy por trude aktualigi mem se ĝi estas ĝisdatigita)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -989,9 +934,7 @@ msgstr "      --asexplicit     marki pakaĵojn kiel eksplicite instalitaj\n"
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"  -k, --check          kontroltesti lokan datumbazon por valideco (-kk por "
-"sinkronigi datumbazojn)\n"
+msgstr "  -k, --check          kontroltesti lokan datumbazon por valideco (-kk por sinkronigi datumbazojn)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
@@ -1008,16 +951,12 @@ msgstr "  -x, --regex          ebligi serĉadon uzante regulajn esprimojn\n"
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"      --machinereadable\n"
-"                       produkti maŝinlegeblan eligon\n"
+msgstr "      --machinereadable\n                       produkti maŝinlegeblan eligon\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          trude instali, superskribante konfliktantajn "
-"dosierojn\n"
+msgstr "      --force          trude instali, superskribante konfliktantajn dosierojn\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
@@ -1034,59 +973,45 @@ msgstr "      --asexplicit     instali pakaĵojn kiel de vi instalitaj\n"
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg>   ignori ĝisdatigon de pakaĵo (oni povas uzi ĝin "
-"multfoje)\n"
+msgstr "      --ignore <pkg>   ignori ĝisdatigon de pakaĵo (oni povas uzi ĝin multfoje)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                       ignori grupan ĝisdatigon (oni povas uzi ĝin "
-"multfoje)\n"
+msgstr "      --ignoregroup <grp>\n                       ignori grupan ĝisdatigon (oni povas uzi ĝin multfoje)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         preterpasi kontrolojn de versio de dependenco (-dd "
-"por preterpasi ĉiujn kontrolojn)\n"
+msgstr "  -d, --nodeps         preterpasi kontrolojn de versio de dependenco (-dd por preterpasi ĉiujn kontrolojn)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <package=version>\n"
-"                       aldoni virtualan pakaĵon por sufiĉigi dependencojn\n"
+msgstr "      --assume-installed <package=version>\n                       aldoni virtualan pakaĵon por sufiĉigi dependencojn\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         nur ŝanĝi datumbazajn aĵojn, ne pakaĵajn dosierojn\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         nur ŝanĝi datumbazajn aĵojn, ne pakaĵajn dosierojn\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  ne montri progresbreton kiam elŝutante dosierojn\n"
+msgstr "      --noprogressbar  ne montri progresbreton kiam elŝutante dosierojn\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet    ne funkciigi la instala skripteto se unu jam "
-"ekzistas\n"
+msgstr "      --noscriptlet    ne funkciigi la instala skripteto se unu jam ekzistas\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
@@ -1100,9 +1025,7 @@ msgstr "  -p, --print          printi la celojn anstataŭ fari la operacion\n"
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                       precizigi kiel la celoj devas esti montrataj\n"
+msgstr "      --print-format <string>\n                       precizigi kiel la celoj devas esti montrataj\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1174,9 +1097,7 @@ msgstr "      --confirm        ĉiam petu konfirmon\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"Ĉi tiu programo povas esti libere redistribuita sub\n"
-"la kondiĉoj de la GNU-a Ĝenerala Publika Permesilo.\n"
+msgstr "Ĉi tiu programo povas esti libere redistribuita sub\nla kondiĉoj de la GNU-a Ĝenerala Publika Permesilo.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1291,9 +1212,7 @@ msgstr "la pakaĵo '%s' ne estis trovita\n"
 #: src/pacman/query.c:474
 #, c-format
 msgid "'%s' is a file, you might want to use %s.\n"
-msgstr ""
-"'%s' estas dosiero, eble vi volas uzi %s.\n"
-"\n"
+msgstr "'%s' estas dosiero, eble vi volas uzi %s.\n\n"
 
 #: src/pacman/query.c:480
 #, c-format
@@ -1537,9 +1456,7 @@ msgstr "ne eblis ŝlosi datumbazon: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"se vi certas ke pakaĵmastrumilo ne jam\n"
-"funkcias ĉi-momente, forigu %s\n"
+msgstr "se vi certas ke pakaĵmastrumilo ne jam\nfunkcias ĉi-momente, forigu %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/es.po b/src/pacman/po/es.po
index 36604e6c..30e619f4 100644
--- a/src/pacman/po/es.po
+++ b/src/pacman/po/es.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Allan McRae <allan@archlinux.org>, 2014
 # Angel Velasquez <angvp@archlinux.org>, 2011
@@ -26,14 +26,13 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
-"PO-Revision-Date: 2016-01-19 22:01+0000\n"
-"Last-Translator: Pedro Román <roizheim@gmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/es/)\n"
-"Language: es\n"
+"PO-Revision-Date: 2016-02-12 12:51+0000\n"
+"Last-Translator: picodotdev <pico.dev@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/toofishes/archlinux-pacman/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
@@ -69,7 +68,7 @@ msgstr "buscando conflictos entre paquetes…\n"
 #: src/pacman/callback.c:211
 #, c-format
 msgid "Processing package changes...\n"
-msgstr "Procesando los cambios del paquete...\n"
+msgstr "Procesando los cambios de los paquetes...\n"
 
 #: src/pacman/callback.c:218
 #, c-format
@@ -191,13 +190,10 @@ msgstr "%s y %s están en conflicto (%s). ¿Quitar %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"El siguiente paquete no se puede actualizar debido a dependencias que no se "
-"pudieron resolver:\n"
-msgstr[1] ""
-"Los siguientes paquetes no pueden ser actualizados debido a dependencias que "
-"no se pudieron resolver:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "El siguiente paquete no se puede actualizar debido a dependencias que no se pudieron resolver:\n"
+msgstr[1] "Los siguientes paquetes no pueden ser actualizados debido a dependencias que no se pudieron resolver:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -218,9 +214,7 @@ msgstr[1] "Existen %zu proveedores disponibles para %s:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"El archivo %s está dañado (%s).\n"
-"¿Quiere eliminarlo?"
+msgstr "El archivo %s está dañado (%s).\n¿Quiere eliminarlo?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -404,37 +398,28 @@ msgstr "no se pudo restaurar el directorio de trabajo (%s)\n"
 #: src/pacman/conf.c:397 src/pacman/conf.c:447 src/pacman/conf.c:541
 #, c-format
 msgid "config file %s, line %d: invalid value for '%s' : '%s'\n"
-msgstr ""
-"archivo de configuración %s, línea %d: valor incorrecto para «%s» : «%s»\n"
+msgstr "archivo de configuración %s, línea %d: valor incorrecto para «%s» : «%s»\n"
 
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"archivo de configuración %s, línea %d: opción «%s» no válida, sin soporte de "
-"firma\n"
+msgstr "archivo de configuración %s, línea %d: opción «%s» no válida, sin soporte de firma\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"archivo de configuración %s, linea %d: directiva «%s» en sección «%s» no "
-"reconocida.\n"
+msgstr "archivo de configuración %s, linea %d: directiva «%s» en sección «%s» no reconocida.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"el servidor de réplica «%s» contiene la variable «%s», pero «%s» no está "
-"definida.\n"
+msgstr "el servidor de réplica «%s» contiene la variable «%s», pero «%s» no está definida.\n"
 
 #: src/pacman/conf.c:641
 #, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
-msgstr ""
-"no se pudo añadir la dirección del servidor a la base de datos «%s»: %s "
-"(%s)\n"
+msgstr "no se pudo añadir la dirección del servidor a la base de datos «%s»: %s (%s)\n"
 
 #: src/pacman/conf.c:661
 #, c-format
@@ -444,17 +429,14 @@ msgstr "no se pudo registrar la base de datos «%s» (%s)\n"
 #: src/pacman/conf.c:676
 #, c-format
 msgid "could not add mirror '%s' to database '%s' (%s)\n"
-msgstr ""
-"no se pudo añadir el servidor de réplica «%s» a la base de datos «%s» (%s)\n"
+msgstr "no se pudo añadir el servidor de réplica «%s» a la base de datos «%s» (%s)\n"
 
 #: src/pacman/conf.c:722
 #, c-format
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"no se pudo iniciar la biblioteca alpm\n"
-"(%s: %s)\n"
+msgstr "no se pudo iniciar la biblioteca alpm\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -489,22 +471,17 @@ msgstr "No se pudo pasar la entrada %s a libalpm"
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"archivo de configuración %s, linea %d: no se reconoce la opción «%s» de "
-"«%s»\n"
+msgstr "archivo de configuración %s, linea %d: no se reconoce la opción «%s» de «%s»\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
-"archivo de configuración %s, linea %d: la directiva «%s» necesita un valor\n"
+msgstr "archivo de configuración %s, linea %d: la directiva «%s» necesita un valor\n"
 
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"el análisis de la configuración excedió la profundidad de recursión máxima "
-"de %d.\n"
+msgstr "el análisis de la configuración excedió la profundidad de recursión máxima de %d.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -514,9 +491,7 @@ msgstr "el archivo de configuración  %s no pudo ser leído: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"archivo de configuración %s, línea %d: Todas las directivas deben pertenecer "
-"a una sección.\n"
+msgstr "archivo de configuración %s, línea %d: Todas las directivas deben pertenecer a una sección.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -532,22 +507,17 @@ msgstr "motivo de instalación no especificado (use -h para ayuda)\n"
 #: src/pacman/database.c:73
 #, c-format
 msgid "could not set install reason for package %s (%s)\n"
-msgstr ""
-"no se pudo establecer el motivo de la instalación para el paquete %s (%s)\n"
+msgstr "no se pudo establecer el motivo de la instalación para el paquete %s (%s)\n"
 
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
-"%s: el motivo de la instalación ha sido establecido como «instalado como "
-"dependencia»\n"
+msgstr "%s: el motivo de la instalación ha sido establecido como «instalado como dependencia»\n"
 
 #: src/pacman/database.c:80
 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
-msgstr ""
-"%s: el motivo de la instalación ha sido establecido como «explícitamente "
-"instalado»\n"
+msgstr "%s: el motivo de la instalación ha sido establecido como «explícitamente instalado»\n"
 
 #: src/pacman/package.c:97
 #, c-format
@@ -791,17 +761,14 @@ msgstr "operaciones:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"utilice «%s {-h --help}» con una operación para ver las opciones "
-"disponibles\n"
+msgstr "\nutilice «%s {-h --help}» con una operación para ver las opciones disponibles\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade quita los paquetes, junto a todos los que dependan de estos\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade quita los paquetes, junto a todos los que dependan de estos\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -813,9 +780,7 @@ msgstr "  -n, --nosave quita los archivos de configuración\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive quita las dependencias que no son necesarias\n"
-"(-ss hace que se incluyan las dependencias instaladas de forma explícita)\n"
+msgstr "  -s, --recursive quita las dependencias que no son necesarias\n(-ss hace que se incluyan las dependencias instaladas de forma explícita)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -836,108 +801,77 @@ msgstr "  -c, --changelog      muestra el registro de cambios de un paquete\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           lista todos los paquetes instalados como dependencias "
-"[filtro]\n"
+msgstr "  -d, --deps           lista todos los paquetes instalados como dependencias [filtro]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       lista todos los paquetes instalados explícitamente "
-"[filtro]\n"
+msgstr "  -e, --explicit       lista todos los paquetes instalados explícitamente [filtro]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
-msgstr ""
-"  -g, --groups         muestra todos los elementos del grupo de paquetes \n"
+msgstr "  -g, --groups         muestra todos los elementos del grupo de paquetes \n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           muestra la información del paquete (-ii para conocer "
-"los archivos de respaldo)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           muestra la información del paquete (-ii para conocer los archivos de respaldo)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          verifica que los archivos del paquete existen (-kk "
-"para comprobar las propiedades del archivo)\n"
+msgstr "  -k, --check          verifica que los archivos del paquete existen (-kk para comprobar las propiedades del archivo)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"  -l, --list           lista los archivos que pertenecen al paquete "
-"consultado\n"
+msgstr "  -l, --list           lista los archivos que pertenecen al paquete consultado\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        lista los paquetes instalados, exceptuando los que "
-"tienen su equivalente\n"
-"                       en las bases de datos de sincronización [filtro]\n"
+msgstr "  -m, --foreign        lista los paquetes instalados, exceptuando los que tienen su equivalente\n                       en las bases de datos de sincronización [filtro]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         lista los paquetes instalados, pero únicamente los "
-"que tienen su\n"
-"                       equivalente en las bases de datos de sincronización "
-"[filtro]\n"
+msgstr "  -n, --native         lista los paquetes instalados, pero únicamente los que tienen su\n                       equivalente en las bases de datos de sincronización [filtro]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
-msgstr ""
-"  -o, --owns <archivo> consulta el paquete al que pertenece el <archivo>\n"
+msgstr "  -o, --owns <archivo> consulta el paquete al que pertenece el <archivo>\n"
 
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"  -p, --file <paquete> consulta un archivo de paquetes en lugar de la base "
-"de datos\n"
+msgstr "  -p, --file <paquete> consulta un archivo de paquetes en lugar de la base de datos\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          muestra menos información para la consulta y "
-"búsqueda\n"
+msgstr "  -q, --quiet          muestra menos información para la consulta y búsqueda\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <vocablo>\n"
-"                       busca los paquetes instalados que coincidan con la "
-"cadena especificada\n"
+msgstr "  -s, --search <vocablo>\n                       busca los paquetes instalados que coincidan con la cadena especificada\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     lista paquetes no requeridos (opcionalmente) por "
-"algún\n"
-"                       paquete especificado (-tt ignora dependencias "
-"opcionales) [Filtro]\n"
+msgstr "  -t, --unrequired     lista paquetes no requeridos (opcionalmente) por algún\n                       paquete especificado (-tt ignora dependencias opcionales) [Filtro]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -949,99 +883,73 @@ msgstr "  -u, --upgrades       muestra los paquetes no actualizados [filtro]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean quita los paquetes antiguos del directorio de la caché (-cc "
-"para quitar todos los paquetes)\n"
+msgstr "  -c, --clean quita los paquetes antiguos del directorio de la caché (-cc para quitar todos los paquetes)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --group          muestra los miembros de un grupo de paquetes\n"
-"                       (-gg para ver todos los miembros del grupo)\n"
+msgstr "  -g, --group          muestra los miembros de un grupo de paquetes\n                       (-gg para ver todos los miembros del grupo)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info           muestra información del paquete (-ii muestra más "
-"información)\n"
+msgstr "  -i, --info           muestra información del paquete (-ii muestra más información)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr ""
-"  -l, --list <repositorio> visualiza una lista de los paquetes presentes en "
-"un repositorio\n"
+msgstr "  -l, --list <repositorio> visualiza una lista de los paquetes presentes en un repositorio\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <vocablo>  busca en los repositorios remotos las "
-"coincidencias con la cadena especificada\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <vocablo>  busca en los repositorios remotos las coincidencias con la cadena especificada\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysypgrade     actualiza los paquetes instalados (-uu permite "
-"desactualizar)\n"
+msgstr "  -u, --sysypgrade     actualiza los paquetes instalados (-uu permite desactualizar)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   únicamente descarga los paquetes, sin instalar/"
-"actualizar nada\n"
+msgstr "  -w, --downloadonly   únicamente descarga los paquetes, sin instalar/actualizar nada\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        descarga las bases de datos de paquetes del servidor\n"
-"                       (-yy para forzar una actualización de la base de "
-"datos, aun si está actualizada)\n"
+msgstr "  -y, --refresh        descarga las bases de datos de paquetes del servidor\n                       (-yy para forzar una actualización de la base de datos, aun si está actualizada)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         marca los paquetes como instalados de forma no "
-"explícita\n"
+msgstr "      --asdeps         marca los paquetes como instalados de forma no explícita\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     marca los paquetes como instalados de forma "
-"explícita\n"
+msgstr "      --asexplicit     marca los paquetes como instalados de forma explícita\n"
 
 #: src/pacman/pacman.c:173
 #, c-format
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"  -k, --check          comprueba la validez de la base de datos local\n"
-"(-kk para sincronizar las bases de datos)\n"
+msgstr "  -k, --check          comprueba la validez de la base de datos local\n(-kk para sincronizar las bases de datos)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
-"  -s, --search <ruta>  busca archivos de paquete que coincidan con la "
-"cadena\n"
+msgstr "  -s, --search <ruta>  busca archivos de paquete que coincidan con la cadena\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
@@ -1053,123 +961,91 @@ msgstr "  -x, --regex          buscar utilizando expresiones regulares\n"
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"      --machinereadable\n"
-"                       produce una salida legible por el sistema\n"
+msgstr "      --machinereadable\n                       produce una salida legible por el sistema\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          fuerza la instalación, y sobrescribe los archivos en "
-"conflicto\n"
+msgstr "      --force          fuerza la instalación, y sobrescribe los archivos en conflicto\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         instala paquetes como dependencia (no-"
-"explícitamente)\n"
+msgstr "      --asdeps         instala paquetes como dependencia (no-explícitamente)\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     instala paquetes como instalados explícitamente \n"
+msgstr "      --asexplicit     instala paquetes como instalados explícitamente \n"
 
 #: src/pacman/pacman.c:194
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <paquete> ignora la actualización de un paquete (puede ser "
-"usado más de una vez) \n"
+msgstr "      --ignore <paquete> ignora la actualización de un paquete (puede ser usado más de una vez) \n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grupo>\n"
-"                       ignora la actualización de un grupo de paquetes "
-"(puede ser usado más de una vez)\n"
+msgstr "      --ignoregroup <grupo>\n                       ignora la actualización de un grupo de paquetes (puede ser usado más de una vez)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         omite las comprobaciones de las versiones de las "
-"dependencias (-dd omite todas las comprobaciones)\n"
+msgstr "  -d, --nodeps         omite las comprobaciones de las versiones de las dependencias (-dd omite todas las comprobaciones)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <paquete = versión>\n"
-"                       añade un paquete virtual para satisfacer "
-"dependencias\n"
+msgstr "      --assume-installed <paquete = versión>\n                       añade un paquete virtual para satisfacer dependencias\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         modifica únicamente las entradas de la base de datos, "
-"no los paquetes en sí\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         modifica únicamente las entradas de la base de datos, no los paquetes en sí\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  no muestra la barra de progreso cuando se descargan "
-"archivos\n"
+msgstr "      --noprogressbar  no muestra la barra de progreso cuando se descargan archivos\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet    no ejecuta el intérprete de instalación si existe "
-"alguno\n"
+msgstr "      --noscriptlet    no ejecuta el intérprete de instalación si existe alguno\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          muestra los objetivos (paquetes) en lugar de realizar "
-"la operación\n"
+msgstr "  -p, --print          muestra los objetivos (paquetes) en lugar de realizar la operación\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <cadena>\n"
-"                       define cómo serán mostrados los objetivos (paquetes)\n"
+msgstr "      --print-format <cadena>\n                       define cómo serán mostrados los objetivos (paquetes)\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
-msgstr ""
-"  -b, --dbpath <ruta>  define una ubicación alternativa para la base de "
-"datos\n"
+msgstr "  -b, --dbpath <ruta>  define una ubicación alternativa para la base de datos\n"
 
 #: src/pacman/pacman.c:212
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
-msgstr ""
-"  -r, --root <ruta>    define un directorio raíz alternativo para la "
-"instalación\n"
+msgstr "  -r, --root <ruta>    define un directorio raíz alternativo para la instalación\n"
 
 #: src/pacman/pacman.c:213
 #, c-format
@@ -1184,16 +1060,12 @@ msgstr "      --arch <arquitectura>  define una arquitectura alternativa\n"
 #: src/pacman/pacman.c:215
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <directorio> define un directorio alternativo para la caché "
-"de los paquetes\n"
+msgstr "      --cachedir <directorio> define un directorio alternativo para la caché de los paquetes\n"
 
 #: src/pacman/pacman.c:216
 #, c-format
 msgid "      --hookdir <dir>  set an alternate hook location\n"
-msgstr ""
-"      --hookdir <ruta> define una ubicación alternativa para el directorio "
-"de hooks\n"
+msgstr "      --hookdir <ruta> define una ubicación alternativa para el directorio de hooks\n"
 
 #: src/pacman/pacman.c:217
 #, c-format
@@ -1203,8 +1075,7 @@ msgstr "      --color <cuando> colorea los mensajes salida\n"
 #: src/pacman/pacman.c:218
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
-msgstr ""
-"      --config <ruta>  define un archivo de configuración alternativo\n"
+msgstr "      --config <ruta>  define un archivo de configuración alternativo\n"
 
 #: src/pacman/pacman.c:219
 #, c-format
@@ -1214,9 +1085,7 @@ msgstr "      --debug          muestra los mensajes de depuración de errores\n"
 #: src/pacman/pacman.c:220
 #, c-format
 msgid "      --gpgdir <path>  set an alternate home directory for GnuPG\n"
-msgstr ""
-"      --gpgdir <ruta>  define un directorio principal alternativo para "
-"GnuPG\n"
+msgstr "      --gpgdir <ruta>  define un directorio principal alternativo para GnuPG\n"
 
 #: src/pacman/pacman.c:221
 #, c-format
@@ -1238,10 +1107,7 @@ msgstr "      --confirm        siempre solicita confirmación\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Este programa puede distribuirse libremente bajo\n"
-"                       los términos de la licencia GNU General Public "
-"License\n"
+msgstr "                       Este programa puede distribuirse libremente bajo\n                       los términos de la licencia GNU General Public License\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1286,16 +1152,12 @@ msgstr "no se pudo reabrir la entrada para su lectura: (%s)\n"
 #: src/pacman/pacman.c:1184
 #, c-format
 msgid "argument '-' specified with empty stdin\n"
-msgstr ""
-"el argumento «-» se ha especificado sin referencia respecto a la entrada "
-"estándar\n"
+msgstr "el argumento «-» se ha especificado sin referencia respecto a la entrada estándar\n"
 
 #: src/pacman/pacman.c:1189
 #, c-format
 msgid "argument '-' specified without input on stdin\n"
-msgstr ""
-"el argumento «-» se ha especificado sin referencia respecto a la entrada "
-"estándar\n"
+msgstr "el argumento «-» se ha especificado sin referencia respecto a la entrada estándar\n"
 
 #: src/pacman/pacman.c:1218
 #, c-format
@@ -1395,8 +1257,7 @@ msgstr "%s está indicado en HoldPkg.\n"
 #: src/pacman/remove.c:149
 #, c-format
 msgid "HoldPkg was found in target list. Do you want to continue?"
-msgstr ""
-"Se encontró HoldPkg en la lista de objetivos. ¿Seguro que desea continuar?"
+msgstr "Se encontró HoldPkg en la lista de objetivos. ¿Seguro que desea continuar?"
 
 #: src/pacman/remove.c:157 src/pacman/sync.c:781
 #, c-format
@@ -1431,12 +1292,12 @@ msgstr "Directorio de la base de datos: %s\n"
 #: src/pacman/sync.c:138
 #, c-format
 msgid "Do you want to remove unused repositories?"
-msgstr "¿Desea quitar estos repositorios no utilizados?"
+msgstr "¿Desea quitar los repositorios no utilizados?"
 
 #: src/pacman/sync.c:141
 #, c-format
 msgid "removing unused sync repositories...\n"
-msgstr "eliminando repositorios de sincronización no utilizados…\n"
+msgstr "quitando repositorios de sincronización no utilizados…\n"
 
 #: src/pacman/sync.c:167
 #, c-format
@@ -1553,9 +1414,7 @@ msgstr "¿Continuar con la instalación?"
 #: src/pacman/sync.c:813
 #, c-format
 msgid "unable to %s directory-file conflicts\n"
-msgstr ""
-"Imposible determinar los conflictos de %s respecto de directorios y/o "
-"archivos\n"
+msgstr "Imposible determinar los conflictos de %s respecto de directorios y/o archivos\n"
 
 #: src/pacman/sync.c:819
 #, c-format
@@ -1607,9 +1466,7 @@ msgstr "no se pudo bloquear la base de datos: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  si está seguro de que no se está ejecutando\n"
-"  un administrador de paquetes, puede quitar %s\n"
+msgstr "  si está seguro de que no se está ejecutando\n  un administrador de paquetes, puede quitar %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/es_419.po b/src/pacman/po/es_419.po
index 1d142d94..d6770c8c 100644
--- a/src/pacman/po/es_419.po
+++ b/src/pacman/po/es_419.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Allan McRae <allan@archlinux.org>, 2014
 # Angel Velasquez <angvp@archlinux.org>, 2011
@@ -22,12 +22,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-24 04:06+0000\n"
 "Last-Translator: Julio Nadal <ice.modding@gmail.com>\n"
-"Language-Team: Spanish (Latin America) (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/es_419/)\n"
-"Language: es_419\n"
+"Language-Team: Spanish (Latin America) (http://www.transifex.com/toofishes/archlinux-pacman/language/es_419/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es_419\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
@@ -185,13 +184,10 @@ msgstr "%s y %s están en conflicto (%s). ¿Quitar %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"El siguiente paquete no se puede actualizar debido a dependencias que no se "
-"pudieron resolver:\n"
-msgstr[1] ""
-"Los siguientes paquetes no pueden ser actualizados debido a dependencias que "
-"no se pudieron resolver:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "El siguiente paquete no se puede actualizar debido a dependencias que no se pudieron resolver:\n"
+msgstr[1] "Los siguientes paquetes no pueden ser actualizados debido a dependencias que no se pudieron resolver:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -212,9 +208,7 @@ msgstr[1] ""
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"El archivo %s está dañado (%s).\n"
-"¿Quiere eliminarlo?"
+msgstr "El archivo %s está dañado (%s).\n¿Quiere eliminarlo?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -398,36 +392,28 @@ msgstr "no se pudo restaurar el directorio de trabajo (%s)\n"
 #: src/pacman/conf.c:397 src/pacman/conf.c:447 src/pacman/conf.c:541
 #, c-format
 msgid "config file %s, line %d: invalid value for '%s' : '%s'\n"
-msgstr ""
-"archivo de configuración %s, línea %d: valor incorrecto para «%s» : «%s»\n"
+msgstr "archivo de configuración %s, línea %d: valor incorrecto para «%s» : «%s»\n"
 
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"archivo de configuración %s, línea %d: «%s» opción inválida, no existe "
-"soporte de firma\n"
+msgstr "archivo de configuración %s, línea %d: «%s» opción inválida, no existe soporte de firma\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"archivo de configuración %s, linea %d: directiva «%s» en sección «%s» no "
-"reconocida.\n"
+msgstr "archivo de configuración %s, linea %d: directiva «%s» en sección «%s» no reconocida.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"el mirror «%s» contiene la variable «%s», pero «%s» no está definido.\n"
+msgstr "el mirror «%s» contiene la variable «%s», pero «%s» no está definido.\n"
 
 #: src/pacman/conf.c:641
 #, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
-msgstr ""
-"no se pudo añadir la dirección del servidor a la base de datos «%s»: %s "
-"(%s)\n"
+msgstr "no se pudo añadir la dirección del servidor a la base de datos «%s»: %s (%s)\n"
 
 #: src/pacman/conf.c:661
 #, c-format
@@ -444,9 +430,7 @@ msgstr "no se pudo añadir el mirror «%s» a la base de datos «%s» (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"no se pudo iniciar la biblioteca alpm\n"
-"(%s: %s)\n"
+msgstr "no se pudo iniciar la biblioteca alpm\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -481,16 +465,12 @@ msgstr "Error al pasar la entrada %s a libalpm"
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"archivo de configuración %s, linea %d: «%s» de la opción «%s» no "
-"reconocida.\n"
-"\n"
+msgstr "archivo de configuración %s, linea %d: «%s» de la opción «%s» no reconocida.\n\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
-"archivo de configuración %s, linea %d: directiva «%s» necesita un valor\n"
+msgstr "archivo de configuración %s, linea %d: directiva «%s» necesita un valor\n"
 
 #: src/pacman/conf.c:948
 #, c-format
@@ -505,9 +485,7 @@ msgstr ""
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"archivo de configuración %s, línea %d: Todas las directivas deben pertenecer "
-"a una sección.\n"
+msgstr "archivo de configuración %s, línea %d: Todas las directivas deben pertenecer a una sección.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -523,22 +501,17 @@ msgstr "motivo de instalación no especificado (use -h para ayuda)\n"
 #: src/pacman/database.c:73
 #, c-format
 msgid "could not set install reason for package %s (%s)\n"
-msgstr ""
-"no se pudo establecer el motivo de la instalación para el paquete %s (%s)\n"
+msgstr "no se pudo establecer el motivo de la instalación para el paquete %s (%s)\n"
 
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
-"%s: el motivo de la instalación ha sido establecido como «instalado como "
-"dependencia»\n"
+msgstr "%s: el motivo de la instalación ha sido establecido como «instalado como dependencia»\n"
 
 #: src/pacman/database.c:80
 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
-msgstr ""
-"%s: el motivo de la instalación ha sido establecido como «explícitamente "
-"instalado»\n"
+msgstr "%s: el motivo de la instalación ha sido establecido como «explícitamente instalado»\n"
 
 #: src/pacman/package.c:97
 #, c-format
@@ -782,18 +755,14 @@ msgstr "operaciones:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"utilice «%s {-h --help}» con una operación para ver las opciones "
-"disponibles\n"
+msgstr "\nutilice «%s {-h --help}» con una operación para ver las opciones disponibles\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        quita los paquetes, junto a todos los que dependan de "
-"estos\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        quita los paquetes, junto a todos los que dependan de estos\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -805,10 +774,7 @@ msgstr "  -n, --nosave         elimina los archivos de configuración\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      elimina las dependencias que no son necesarias\n"
-"                       (-ss hace que se incluyan las dependencias instaladas "
-"de forma explícita)\n"
+msgstr "  -s, --recursive      elimina las dependencias que no son necesarias\n                       (-ss hace que se incluyan las dependencias instaladas de forma explícita)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -829,39 +795,29 @@ msgstr "  -c, --changelog      muestra el registro de cambios de un paquete\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           lista todos los paquetes instalados como dependencias "
-"[filtro]\n"
+msgstr "  -d, --deps           lista todos los paquetes instalados como dependencias [filtro]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       lista todos los paquetes instalados explícitamente "
-"[filtro]\n"
+msgstr "  -e, --explicit       lista todos los paquetes instalados explícitamente [filtro]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
-msgstr ""
-"  -g, --groups         muestra todos los elementos del grupo de paquetes \n"
+msgstr "  -g, --groups         muestra todos los elementos del grupo de paquetes \n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           muestra la información del paquete (-ii para archivos "
-"de respaldo)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           muestra la información del paquete (-ii para archivos de respaldo)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          verifica que los archivos del paquete existen (-kk "
-"para las propiedades del archivo)\n"
+msgstr "  -k, --check          verifica que los archivos del paquete existen (-kk para las propiedades del archivo)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
@@ -873,57 +829,43 @@ msgstr "-l , --list   lista de los ficheros propiedad del paquete consultado\n"
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        lista los paquetes instalados, exceptuando los que "
-"tienen su equivalente en las bases de datos de sincronización [filtro]\n"
+msgstr "  -m, --foreign        lista los paquetes instalados, exceptuando los que tienen su equivalente en las bases de datos de sincronización [filtro]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"-n, --native         lista los paquetes instalados, pero únicamente los que "
-"tienen su equivalente en las bases de datos de sincronización [filtro]\n"
+msgstr "-n, --native         lista los paquetes instalados, pero únicamente los que tienen su equivalente en las bases de datos de sincronización [filtro]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
-msgstr ""
-"  -o, --owns <archivo>    consulta el paquete al que pertenece el <archivo>\n"
+msgstr "  -o, --owns <archivo>    consulta el paquete al que pertenece el <archivo>\n"
 
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"  -p, --file <paquete> consulta un archivo de paquetes en lugar de la base "
-"de datos\n"
+msgstr "  -p, --file <paquete> consulta un archivo de paquetes en lugar de la base de datos\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          muestra menos información para la consulta y "
-"búsqueda\n"
+msgstr "  -q, --quiet          muestra menos información para la consulta y búsqueda\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <vocablo>\n"
-"                       busca los paquetes instalados que coincidan con la "
-"cadena especificada\n"
+msgstr "  -s, --search <vocablo>\n                       busca los paquetes instalados que coincidan con la cadena especificada\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"-t, --unrequired lista paquetes no (opcionalmente) requeridos por algún\n"
-"paquete especificado (-tt ignora dependencias opcionales) [Filtro]\n"
+msgstr "-t, --unrequired lista paquetes no (opcionalmente) requeridos por algún\npaquete especificado (-tt ignora dependencias opcionales) [Filtro]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -935,84 +877,61 @@ msgstr "  -u, --upgrades       muestra los paquetes no actualizados [filtro]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          elimina paquetes antiguos del directorio de la caché "
-"(-cc para todos los paquetes)\n"
+msgstr "  -c, --clean          elimina paquetes antiguos del directorio de la caché (-cc para todos los paquetes)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"-g, --group muestra los miembros de un grupo de paquetes\n"
-"(-gg para ver todos los miembros del grupo)\n"
+msgstr "-g, --group muestra los miembros de un grupo de paquetes\n(-gg para ver todos los miembros del grupo)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"-i, --info muestra información del paquete (-ii muestra más información)\n"
+msgstr "-i, --info muestra información del paquete (-ii muestra más información)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr ""
-"  -l, --list <repositorio>\n"
-"                       visualiza una lista de los paquetes presentes en un "
-"repositorio\n"
+msgstr "  -l, --list <repositorio>\n                       visualiza una lista de los paquetes presentes en un repositorio\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <vocablo>\n"
-"                       busca en los repositorios remotos las coincidencias "
-"con la cadena especificada\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <vocablo>\n                       busca en los repositorios remotos las coincidencias con la cadena especificada\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"-u, --sysypgrade actualiza los paquetes instalados (-uu permite "
-"desactualizar)\n"
+msgstr "-u, --sysypgrade actualiza los paquetes instalados (-uu permite desactualizar)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   únicamente descarga los paquetes, sin instalar/"
-"actualizar nada\n"
+msgstr "  -w, --downloadonly   únicamente descarga los paquetes, sin instalar/actualizar nada\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"-y, --refresh descarga la bases de datos de paquetes del servidor\n"
-"(-yy para forzar una actualización de la base de datos, aun si está "
-"actualizada)\n"
+msgstr "-y, --refresh descarga la bases de datos de paquetes del servidor\n(-yy para forzar una actualización de la base de datos, aun si está actualizada)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         marca los paquetes como instalados de forma no "
-"explícita\n"
+msgstr "      --asdeps         marca los paquetes como instalados de forma no explícita\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     marca los paquetes como instalados de forma "
-"explícita\n"
+msgstr "      --asexplicit     marca los paquetes como instalados de forma explícita\n"
 
 #: src/pacman/pacman.c:173
 #, c-format
@@ -1041,117 +960,86 @@ msgstr ""
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          fuerza la instalación, y sobrescribe los archivos en "
-"conflicto\n"
+msgstr "      --force          fuerza la instalación, y sobrescribe los archivos en conflicto\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         instala paquetes como dependencia (no-"
-"explícitamente)\n"
+msgstr "      --asdeps         instala paquetes como dependencia (no-explícitamente)\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     instala paquetes como instalados explícitamente \n"
+msgstr "      --asexplicit     instala paquetes como instalados explícitamente \n"
 
 #: src/pacman/pacman.c:194
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <paquete>\n"
-"                       ignora la actualización de un paquete (puede ser "
-"usado más de una vez)\n"
+msgstr "      --ignore <paquete>\n                       ignora la actualización de un paquete (puede ser usado más de una vez)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grupo>\n"
-"                       ignora la actualización de un grupo de paquetes "
-"(puede ser usado más de una vez)\n"
+msgstr "      --ignoregroup <grupo>\n                       ignora la actualización de un grupo de paquetes (puede ser usado más de una vez)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         omite las comprobaciones de las versiones de las "
-"dependencias (-dd omite todas las comprobaciones)\n"
+msgstr "  -d, --nodeps         omite las comprobaciones de las versiones de las dependencias (-dd omite todas las comprobaciones)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"--assume-installad <paquete = versión>\n"
-"añade un paquete virtual para satisfacer dependencias\n"
+msgstr "--assume-installad <paquete = versión>\nañade un paquete virtual para satisfacer dependencias\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"--dbonly         únicamente modifica las entradas de la base de datos, no "
-"los\n"
-"                       paquetes en sí\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "--dbonly         únicamente modifica las entradas de la base de datos, no los\n                       paquetes en sí\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  no muestra la barra de progreso cuando se descargan "
-"archivos\n"
+msgstr "      --noprogressbar  no muestra la barra de progreso cuando se descargan archivos\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet    no ejecuta el intérprete de instalación si existe "
-"alguno\n"
+msgstr "      --noscriptlet    no ejecuta el intérprete de instalación si existe alguno\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          muestra los objetivos (paquetes) en lugar de realizar "
-"la operación\n"
+msgstr "  -p, --print          muestra los objetivos (paquetes) en lugar de realizar la operación\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <cadena>\n"
-"                       define cómo serán mostrados los objetivos (paquetes)\n"
+msgstr "      --print-format <cadena>\n                       define cómo serán mostrados los objetivos (paquetes)\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
-msgstr ""
-"  -b, --dbpath <ruta>  define una ubicación alternativa para la base de "
-"datos\n"
+msgstr "  -b, --dbpath <ruta>  define una ubicación alternativa para la base de datos\n"
 
 #: src/pacman/pacman.c:212
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
-msgstr ""
-"  -r, --root <ruta>    define un directorio raíz alternativo para la "
-"instalación\n"
+msgstr "  -r, --root <ruta>    define un directorio raíz alternativo para la instalación\n"
 
 #: src/pacman/pacman.c:213
 #, c-format
@@ -1161,17 +1049,12 @@ msgstr "  -v, --verbose        muestra toda la información\n"
 #: src/pacman/pacman.c:214
 #, c-format
 msgid "      --arch <arch>    set an alternate architecture\n"
-msgstr ""
-"      --arch <arquitectura>\n"
-"                       define una arquitectura alternativa\n"
+msgstr "      --arch <arquitectura>\n                       define una arquitectura alternativa\n"
 
 #: src/pacman/pacman.c:215
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <directorio>\n"
-"                       define un directorio alternativo para la caché de los "
-"paquetes\n"
+msgstr "      --cachedir <directorio>\n                       define un directorio alternativo para la caché de los paquetes\n"
 
 #: src/pacman/pacman.c:216
 #, c-format
@@ -1186,8 +1069,7 @@ msgstr "      --color <cuando> colorea la salida\n"
 #: src/pacman/pacman.c:218
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
-msgstr ""
-"      --config <ruta>  define un archivo de configuración alternativo\n"
+msgstr "      --config <ruta>  define un archivo de configuración alternativo\n"
 
 #: src/pacman/pacman.c:219
 #, c-format
@@ -1197,9 +1079,7 @@ msgstr "      --debug          muestra los mensajes de depuración de errores\n"
 #: src/pacman/pacman.c:220
 #, c-format
 msgid "      --gpgdir <path>  set an alternate home directory for GnuPG\n"
-msgstr ""
-"      --gpgdir <ruta>  define un directorio principal alternativo para "
-"GnuPG\n"
+msgstr "      --gpgdir <ruta>  define un directorio principal alternativo para GnuPG\n"
 
 #: src/pacman/pacman.c:221
 #, c-format
@@ -1221,10 +1101,7 @@ msgstr "      --confirm      siempre solicita confirmación alguna\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Este programa puede distribuirse libremente bajo\n"
-"                       los términos de la licencia GNU General Public "
-"License\n"
+msgstr "                       Este programa puede distribuirse libremente bajo\n                       los términos de la licencia GNU General Public License\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1254,9 +1131,7 @@ msgstr "opción «-%c» no válida\n"
 #: src/pacman/pacman.c:1012
 #, c-format
 msgid "invalid option '--%s'\n"
-msgstr ""
-"opción «--%s» no válida\n"
-"\n"
+msgstr "opción «--%s» no válida\n\n"
 
 #: src/pacman/pacman.c:1170
 #, c-format
@@ -1271,15 +1146,12 @@ msgstr "no se pudo reabrir la entrada para su lectura: (%s)\n"
 #: src/pacman/pacman.c:1184
 #, c-format
 msgid "argument '-' specified with empty stdin\n"
-msgstr ""
-"el argumento «-» se ha especificado sin referencia respecto a la entrada\n"
-"\n"
+msgstr "el argumento «-» se ha especificado sin referencia respecto a la entrada\n\n"
 
 #: src/pacman/pacman.c:1189
 #, c-format
 msgid "argument '-' specified without input on stdin\n"
-msgstr ""
-"el argumento «-» se ha especificado sin referencia respecto a la entrada\n"
+msgstr "el argumento «-» se ha especificado sin referencia respecto a la entrada\n"
 
 #: src/pacman/pacman.c:1218
 #, c-format
@@ -1536,9 +1408,7 @@ msgstr "¿Continuar con la instalación?"
 #: src/pacman/sync.c:813
 #, c-format
 msgid "unable to %s directory-file conflicts\n"
-msgstr ""
-"Imposible determinar los conflictos de %s respecto de directorios y/o "
-"archivos\n"
+msgstr "Imposible determinar los conflictos de %s respecto de directorios y/o archivos\n"
 
 #: src/pacman/sync.c:819
 #, c-format
@@ -1590,9 +1460,7 @@ msgstr "no se pudo bloquear la base de datos: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  si está seguro de que no se está ejecutando un\n"
-"  administrador de paquetes, puede eliminar %s.\n"
+msgstr "  si está seguro de que no se está ejecutando un\n  administrador de paquetes, puede eliminar %s.\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/fa.po b/src/pacman/po/fa.po
index 5071a90c..951ba2b2 100644
--- a/src/pacman/po/fa.po
+++ b/src/pacman/po/fa.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Ali Mousavi <ali.mousavi@gmail.com>, 2011
 # Alireza Savand <agahia.com@gmail.com>, 2011
@@ -13,12 +13,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 03:30+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Persian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/fa/)\n"
-"Language: fa\n"
+"Language-Team: Persian (http://www.transifex.com/toofishes/archlinux-pacman/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/pacman/callback.c:182
@@ -64,9 +63,7 @@ msgstr "در حال نصب %s...\n"
 #: src/pacman/callback.c:221
 #, c-format
 msgid "upgrading %s...\n"
-msgstr ""
-"در حال ارتقاء %s ...\n"
-"\n"
+msgstr "در حال ارتقاء %s ...\n\n"
 
 #: src/pacman/callback.c:224
 #, c-format
@@ -178,7 +175,8 @@ msgstr "%s و %s با هم تداخل دارند(%s). %s را حذف کنم؟"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
 msgstr[0] ""
 
 #: src/pacman/callback.c:442
@@ -741,14 +739,13 @@ msgstr "عملیات:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"برای مرور گزینه‌ها از «%s {-h --help}» با یک عملیات استفاده کنید\n"
+msgstr "\nبرای مرور گزینه‌ها از «%s {-h --help}» با یک عملیات استفاده کنید\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
 msgstr "-c, --cascade حذف بسته و تمام بسته‌هایی که به آن نیاز دارند.\n"
 
 #: src/pacman/pacman.c:126
@@ -796,8 +793,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
 msgstr ""
 
 #: src/pacman/pacman.c:142
@@ -888,8 +884,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
 
 #: src/pacman/pacman.c:163
@@ -991,8 +986,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
 msgstr ""
 
 #: src/pacman/pacman.c:203
@@ -1019,9 +1013,7 @@ msgstr ""
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"--print-format <string>\n"
-"نحوه‌ی چاپ را مشخص کنید.\n"
+msgstr "--print-format <string>\nنحوه‌ی چاپ را مشخص کنید.\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
diff --git a/src/pacman/po/fi.po b/src/pacman/po/fi.po
index 7545e7f1..16cf9537 100644
--- a/src/pacman/po/fi.po
+++ b/src/pacman/po/fi.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # No User, 2011
 # Dan McGee <dpmcgee@gmail.com>, 2011
@@ -19,14 +19,13 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
-"PO-Revision-Date: 2016-01-17 03:30+0000\n"
-"Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Finnish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/fi/)\n"
-"Language: fi\n"
+"PO-Revision-Date: 2016-01-30 00:49+0000\n"
+"Last-Translator: Lasse Liehu <larso@gmx.com>\n"
+"Language-Team: Finnish (http://www.transifex.com/toofishes/archlinux-pacman/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
@@ -62,7 +61,7 @@ msgstr "etsitään ristiriitaisia paketteja...\n"
 #: src/pacman/callback.c:211
 #, c-format
 msgid "Processing package changes...\n"
-msgstr ""
+msgstr "Prosessoidaan pakettien muutoksia...\n"
 
 #: src/pacman/callback.c:218
 #, c-format
@@ -162,8 +161,7 @@ msgstr "%s tallennettu nimellä %s.pacsave\n"
 #: src/pacman/callback.c:390
 #, c-format
 msgid "%s is in IgnorePkg/IgnoreGroup. Install anyway?"
-msgstr ""
-"Paketti %s on IgnorePkg/IgnoreGroup -listalla. Asenna siitä huolimatta?"
+msgstr "Paketti %s on IgnorePkg/IgnoreGroup -listalla. Asenna siitä huolimatta?"
 
 #: src/pacman/callback.c:400
 #, c-format
@@ -173,27 +171,22 @@ msgstr "Korvaa paketti %s paketilla %s/%s?"
 #: src/pacman/callback.c:412
 #, c-format
 msgid "%s and %s are in conflict. Remove %s?"
-msgstr ""
-"Paketit %s ja %s ovat ristiriidassa keskenään. Poistetaanko paketti %s?"
+msgstr "Paketit %s ja %s ovat ristiriidassa keskenään. Poistetaanko paketti %s?"
 
 #: src/pacman/callback.c:417
 #, c-format
 msgid "%s and %s are in conflict (%s). Remove %s?"
-msgstr ""
-"Paketit %s ja %s ovat ristiriidassa keskenään (%s). Poistetaanko paketti %s?"
+msgstr "Paketit %s ja %s ovat ristiriidassa keskenään (%s). Poistetaanko paketti %s?"
 
 #: src/pacman/callback.c:436
 #, c-format
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Seuraavaa pakettia ei voida päivittää selvittämättömien riippuvuuksien "
-"vuoksi:\n"
-msgstr[1] ""
-"Seuraavia paketteja ei voida päivittää selvittämättömien riippuvuuksien "
-"vuoksi:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Seuraavaa pakettia ei voida päivittää selvittämättömien riippuvuuksien vuoksi:\n"
+msgstr[1] "Seuraavia paketteja ei voida päivittää selvittämättömien riippuvuuksien vuoksi:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -214,9 +207,7 @@ msgstr[1] "%zu pakettia tarjoaa paketin %s:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Tiedosto %s on vahingoittunut (%s).\n"
-"Haluatko poistaa sen?"
+msgstr "Tiedosto %s on vahingoittunut (%s).\nHaluatko poistaa sen?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -405,23 +396,18 @@ msgstr "asetustiedosto %s, rivi %d: virheellinen '%s'-arvo : '%s'\n"
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"asetustiedosto %s, rivi %d: virheellinen valinta '%s', ei "
-"allekirjoitustukea\n"
+msgstr "asetustiedosto %s, rivi %d: virheellinen valinta '%s', ei allekirjoitustukea\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"asetustiedosto %s rivi %d: direktiiviä '%s' osiossa '%s' ei tunnistettu.\n"
+msgstr "asetustiedosto %s rivi %d: direktiiviä '%s' osiossa '%s' ei tunnistettu.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"peilipalvelimen '%s' asetuksissa on '%s'-muuttuja, mutta arvoa '%s' ei ole "
-"määritetty.\n"
+msgstr "peilipalvelimen '%s' asetuksissa on '%s'-muuttuja, mutta arvoa '%s' ei ole määritetty.\n"
 
 #: src/pacman/conf.c:641
 #, c-format
@@ -443,9 +429,7 @@ msgstr "ei voitu lisätä peilipalvelinta \"%s\" tietokantaan \"%s\" (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"alpm-kirjaston alustaminen epäonnistui\n"
-"(%s: %s)\n"
+msgstr "alpm-kirjaston alustaminen epäonnistui\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -500,9 +484,7 @@ msgstr "asetustiedostoa %s ei voitu lukea: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"asetustiedosto %s, rivi %d: Kaikkien asetusvalintojen tulee kuulua johonkin "
-"osioon.\n"
+msgstr "asetustiedosto %s, rivi %d: Kaikkien asetusvalintojen tulee kuulua johonkin osioon.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -772,17 +754,14 @@ msgstr "operaatiot:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"suorita '%s {-h --help}' operaation kanssa käytettävissä olevien valitsimien "
-"listaamiseksi.\n"
+msgstr "\nsuorita '%s {-h --help}' operaation kanssa käytettävissä olevien valitsimien listaamiseksi.\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade          poista paketit ja kaikki niiden riippuvuudet\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade          poista paketit ja kaikki niiden riippuvuudet\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -794,10 +773,7 @@ msgstr "  -n, --nosave           poista myös asetustiedostot\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive        poista tarpeettomat riippuvuuden\n"
-"                         (-ss poista myös itsenäisesti asennetut "
-"riippuvuudet)\n"
+msgstr "  -s, --recursive        poista tarpeettomat riippuvuuden\n                         (-ss poista myös itsenäisesti asennetut riippuvuudet)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -807,8 +783,7 @@ msgstr "  -u, --unneeded         poista tarpeettomat paketit\n"
 #: src/pacman/pacman.c:132 src/pacman/pacman.c:167
 #, c-format
 msgid "      --needed         do not reinstall up to date packages\n"
-msgstr ""
-"      --needed           älä asenna ajan tasalla olevia pakatteja uudelleen\n"
+msgstr "      --needed           älä asenna ajan tasalla olevia pakatteja uudelleen\n"
 
 #: src/pacman/pacman.c:137
 #, c-format
@@ -819,14 +794,12 @@ msgstr "  -c, --changelog        näytä paketin muutosloki\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps             listaa riippuvuuksina asennetut paketit [suodatin]\n"
+msgstr "  -d, --deps             listaa riippuvuuksina asennetut paketit [suodatin]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit         listaa itsenäisesti asennetut paketit [suodatin]\n"
+msgstr "  -e, --explicit         listaa itsenäisesti asennetut paketit [suodatin]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -835,19 +808,15 @@ msgstr "  -g, --groups           listaa ryhmän paketit\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info             näytä paketin tiedot (-ii listaa varmuuskopiot)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info             näytä paketin tiedot (-ii listaa varmuuskopiot)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check            varmistaa, että kaikki paketin tiedostot ovat "
-"levyllä (-kk tarkistaa myös tiedostojen ominaisuudet)\n"
+msgstr "  -k, --check            varmistaa, että kaikki paketin tiedostot ovat levyllä (-kk tarkistaa myös tiedostojen ominaisuudet)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
@@ -859,24 +828,19 @@ msgstr "  -l, --list           listaa etsittävän paketin omistamat tiedostot\n
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign          listaa paketit, jotka eivät ole millään "
-"pakettilistalla [suodatin]\n"
+msgstr "  -m, --foreign          listaa paketit, jotka eivät ole millään pakettilistalla [suodatin]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         listaa vain ne paketit, jotka ovat pakettilistalla "
-"[suodatin]\n"
+msgstr "  -n, --native         listaa vain ne paketit, jotka ovat pakettilistalla [suodatin]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
-msgstr ""
-"  -o, --owns <tiedosto>  etsi pakettia, joka omistaa kyseisen tiedoston\n"
+msgstr "  -o, --owns <tiedosto>  etsi pakettia, joka omistaa kyseisen tiedoston\n"
 
 #: src/pacman/pacman.c:147
 #, c-format
@@ -900,44 +864,33 @@ msgstr "  -s, --search <regex>   etsi merkkijonoa asennetuista paketeista\n"
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired       listaa paketit, jotka eivät ole (valinnaisia) "
-"riippuvuuksia\n"
-"                         (-tt jättää valinnaiset riippuvuudet huomiotta) "
-"[suodatin]\n"
+msgstr "  -t, --unrequired       listaa paketit, jotka eivät ole (valinnaisia) riippuvuuksia\n                         (-tt jättää valinnaiset riippuvuudet huomiotta) [suodatin]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
 msgid "  -u, --upgrades       list outdated packages [filter]\n"
-msgstr ""
-"  -u, --upgrades         listaa paketit, joille on saatavilla päivityksiä "
-"[suodatin]\n"
+msgstr "  -u, --upgrades         listaa paketit, joille on saatavilla päivityksiä [suodatin]\n"
 
 #: src/pacman/pacman.c:156
 #, c-format
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean            poista vanhat paketit varastosta (-cc poistaa "
-"kaikki)\n"
+msgstr "  -c, --clean            poista vanhat paketit varastosta (-cc poistaa kaikki)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups           listaa ryhmän paketit\n"
-"                         (--g listaa kaikki ryhmät ja niiden paketit)\n"
+msgstr "  -g, --groups           listaa ryhmän paketit\n                         (--g listaa kaikki ryhmät ja niiden paketit)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info           näytä paketin tiedot (-ii näyttää lisää tietoa)\n"
+msgstr "  -i, --info           näytä paketin tiedot (-ii näyttää lisää tietoa)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -946,41 +899,33 @@ msgstr "  -l, --list <varasto>   listaa varaston sisältämät paketit\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr "  -s, --search <regex>   etsi merkkijonoa pakettivarastoista\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     päivitä asennetut paketit (-uu ottaa käyttöön "
-"varhentamisen)\n"
+msgstr "  -u, --sysupgrade     päivitä asennetut paketit (-uu ottaa käyttöön varhentamisen)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly     lataa paketit, mutta älä asenna/päivitä mitään\n"
+msgstr "  -w, --downloadonly     lataa paketit, mutta älä asenna/päivitä mitään\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh          lataa uusimmat pakettilistat palvelimelta\n"
-"                         (-yy pakottaa päivityksen, vaikka listat ovat jo "
-"ajan tasalla)\n"
+msgstr "  -y, --refresh          lataa uusimmat pakettilistat palvelimelta\n                         (-yy pakottaa päivityksen, vaikka listat ovat jo ajan tasalla)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps           merkitse paketit riippuvuuksina asennetuiksi\n"
+msgstr "      --asdeps           merkitse paketit riippuvuuksina asennetuiksi\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
@@ -992,9 +937,7 @@ msgstr "      --asexplicit       merkitse paketit itsenäisesti asennetuiksi\n"
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"  -k, --check          tarkista paikallisen tietokannan validius (-kk "
-"synkronointitietokannoille)\n"
+msgstr "  -k, --check          tarkista paikallisen tietokannan validius (-kk synkronointitietokannoille)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
@@ -1011,16 +954,12 @@ msgstr "  -x, --regex          ota käyttöön haku säännöllisillä lausekkei
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"      --machinereadable\n"
-"                       tuota koneluettavaa tulostetta\n"
+msgstr "      --machinereadable\n                       tuota koneluettavaa tulostetta\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          pakota asennus korvaamalla ristiriidassa olevat "
-"tiedostot\n"
+msgstr "      --force          pakota asennus korvaamalla ristiriidassa olevat tiedostot\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
@@ -1037,83 +976,64 @@ msgstr "      --asexplicit       asenna paketit itsenäisinä\n"
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <paketti> ohita paketin päivitys (voidaan käyttää useamman "
-"kerran)\n"
+msgstr "      --ignore <paketti> ohita paketin päivitys (voidaan käyttää useamman kerran)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <ryhmä>\n"
-"                         ohita ryhmän päivitys (voidaan käyttää useamman "
-"kerran)\n"
+msgstr "      --ignoregroup <ryhmä>\n                         ohita ryhmän päivitys (voidaan käyttää useamman kerran)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps           ohita versio riippuvuudet (-dd ohittaa kaikki "
-"riippuvuudet)\n"
+msgstr "  -d, --nodeps           ohita versio riippuvuudet (-dd ohittaa kaikki riippuvuudet)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <paketti=versio>\n"
-"                       lisää virtuaalipaketti riippuvuusten ratkaisemiseksi\n"
+msgstr "      --assume-installed <paketti=versio>\n                       lisää virtuaalipaketti riippuvuusten ratkaisemiseksi\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly           tee muutokset vain tietokantamerkintöihin, ei "
-"paketteihin\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly           tee muutokset vain tietokantamerkintöihin, ei paketteihin\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar    älä näytä edistymispalkkia tiedostoja ladattaessa\n"
+msgstr "      --noprogressbar    älä näytä edistymispalkkia tiedostoja ladattaessa\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriplet       älä suorita asennusskriptiä, jos sellainen on "
-"olemassa\n"
+msgstr "      --noscriplet       älä suorita asennusskriptiä, jos sellainen on olemassa\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print            tulosta kohteet toiminnon suorittamisen sijasta\n"
+msgstr "  -p, --print            tulosta kohteet toiminnon suorittamisen sijasta\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <rimpsu>\n"
-"                         missä muodossa paketit tulisi listata\n"
+msgstr "      --print-format <rimpsu>\n                         missä muodossa paketit tulisi listata\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
-msgstr ""
-"  -b, --dbpath <polku>   määritä vaihtoehtoinen sijainti tietokannalle\n"
+msgstr "  -b, --dbpath <polku>   määritä vaihtoehtoinen sijainti tietokannalle\n"
 
 #: src/pacman/pacman.c:212
 #, c-format
@@ -1133,8 +1053,7 @@ msgstr "      --arch <arch>      määritä vaihtoehtoinen arkkitehtuuri\n"
 #: src/pacman/pacman.c:215
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <kansio> määritä vaihtoehtoinen sijainti välimuistille\n"
+msgstr "      --cachedir <kansio> määritä vaihtoehtoinen sijainti välimuistille\n"
 
 #: src/pacman/pacman.c:216
 #, c-format
@@ -1181,9 +1100,7 @@ msgstr "      --confirm        pyydä aina vahvistusta\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                     Tätä ohjelmaa saa jakaa vapaasti GNU\n"
-"                     General Public Licensen ehtojen mukaisesti.\n"
+msgstr "                     Tätä ohjelmaa saa jakaa vapaasti GNU\n                     General Public Licensen ehtojen mukaisesti.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1542,9 +1459,7 @@ msgstr "tietokannan lukitseminen epäonnistui: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  jos olet varma, että pakettienhallinta ei ole\n"
-"  käynnissä, voit poistaa tiedoston %s\n"
+msgstr "  jos olet varma, että pakettienhallinta ei ole\n  käynnissä, voit poistaa tiedoston %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/fr.po b/src/pacman/po/fr.po
index 44cd70d8..93ed928b 100644
--- a/src/pacman/po/fr.po
+++ b/src/pacman/po/fr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Antoine Lubineau <antoine@lubignon.info>, 2012-2013
 # Antoine Lubineau <antoine@lubignon.info>, 2012
@@ -23,12 +23,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 09:57+0000\n"
 "Last-Translator: Charles Monzat <superboa@hotmail.fr>\n"
-"Language-Team: French (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/fr/)\n"
-"Language: fr\n"
+"Language-Team: French (http://www.transifex.com/toofishes/archlinux-pacman/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/pacman/callback.c:182
@@ -164,9 +163,7 @@ msgstr "%s enregistré en tant que %s.pacsave\n"
 #: src/pacman/callback.c:390
 #, c-format
 msgid "%s is in IgnorePkg/IgnoreGroup. Install anyway?"
-msgstr ""
-"%s est défini comme paquet à ignorer (IgnorePkg/IgnoreGroup). L’installer "
-"tout de même ?"
+msgstr "%s est défini comme paquet à ignorer (IgnorePkg/IgnoreGroup). L’installer tout de même ?"
 
 #: src/pacman/callback.c:400
 #, c-format
@@ -188,13 +185,10 @@ msgstr "%s et %s sont en conflit (%s). Supprimer %s ?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Le paquet suivant ne peut être mis à jour à cause de dépendances "
-"insolubles :\n"
-msgstr[1] ""
-"Les paquets suivants ne peuvent être mis à jour à cause de dépendances "
-"insolubles :\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Le paquet suivant ne peut être mis à jour à cause de dépendances insolubles :\n"
+msgstr[1] "Les paquets suivants ne peuvent être mis à jour à cause de dépendances insolubles :\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -215,9 +209,7 @@ msgstr[1] "Il y a %zu fournisseurs disponibles pour %s :\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Le fichier %s est corrompu (%s).\n"
-"Voulez-vous le supprimer ?"
+msgstr "Le fichier %s est corrompu (%s).\nVoulez-vous le supprimer ?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -371,8 +363,7 @@ msgstr[1] "%jd fichiers modifiés\n"
 msgid "malloc failure: could not allocate %zu byte\n"
 msgid_plural "malloc failure: could not allocate %zu bytes\n"
 msgstr[0] "erreur d’allocation mémoire : malloc n’a pas pu allouer %zu octet\n"
-msgstr[1] ""
-"erreur d’allocation mémoire : malloc n’a pas pu allouer %zu octets\n"
+msgstr[1] "erreur d’allocation mémoire : malloc n’a pas pu allouer %zu octets\n"
 
 #: src/pacman/conf.c:251
 #, c-format
@@ -402,37 +393,28 @@ msgstr "impossible de restaurer le répertoire de travail (%s)\n"
 #: src/pacman/conf.c:397 src/pacman/conf.c:447 src/pacman/conf.c:541
 #, c-format
 msgid "config file %s, line %d: invalid value for '%s' : '%s'\n"
-msgstr ""
-"le fichier de configuration %s possède une entrée invalide à la ligne %d : "
-"la valeur de « %s » est incorrecte : « %s »\n"
+msgstr "le fichier de configuration %s possède une entrée invalide à la ligne %d : la valeur de « %s » est incorrecte : « %s »\n"
 
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"le fichier de configuration %s possède une entrée invalide à la ligne %d : "
-"l’option « %s » est incorrecte, pas de support des signatures\n"
+msgstr "le fichier de configuration %s possède une entrée invalide à la ligne %d : l’option « %s » est incorrecte, pas de support des signatures\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"fichier de configuration %s, ligne %d : l’instruction « %s » dans la section "
-"« %s » n’est pas valide.\n"
+msgstr "fichier de configuration %s, ligne %d : l’instruction « %s » dans la section « %s » n’est pas valide.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"le miroir « %s » contient la variable « %s » mais « %s » n’est pas définie.\n"
+msgstr "le miroir « %s » contient la variable « %s » mais « %s » n’est pas définie.\n"
 
 #: src/pacman/conf.c:641
 #, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
-msgstr ""
-"ne peut pas ajouter l'URL du serveur « %2$s » à la base de données "
-"« %1$s » (%3$s)\n"
+msgstr "ne peut pas ajouter l'URL du serveur « %2$s » à la base de données « %1$s » (%3$s)\n"
 
 #: src/pacman/conf.c:661
 #, c-format
@@ -442,18 +424,14 @@ msgstr "l’enregistrement de la base de données « %s » a échoué (%s)\n
 #: src/pacman/conf.c:676
 #, c-format
 msgid "could not add mirror '%s' to database '%s' (%s)\n"
-msgstr ""
-"impossible d’ajouter le miroir « %s » à la base de données « %s » (%s)\n"
+msgstr "impossible d’ajouter le miroir « %s » à la base de données « %s » (%s)\n"
 
 #: src/pacman/conf.c:722
 #, c-format
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"l’initialisation de la bibliothèque alpm a échouée\n"
-"(%s : %s)\n"
-"\n"
+msgstr "l’initialisation de la bibliothèque alpm a échouée\n(%s : %s)\n\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -488,23 +466,17 @@ msgstr "Échec de transmission de l'entrée %s dans libpalm"
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"fichier de configuration %s, ligne %d: '%s' l'option « %s » n'est pas "
-"valide\n"
+msgstr "fichier de configuration %s, ligne %d: '%s' l'option « %s » n'est pas valide\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
-"fichier de configuration %s, ligne %d : l’instruction « %s » a besoin d’une "
-"valeur\n"
+msgstr "fichier de configuration %s, ligne %d : l’instruction « %s » a besoin d’une valeur\n"
 
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"l’analyse de la configuration a dépassé le niveau maximal de récursion "
-"(%d).\n"
+msgstr "l’analyse de la configuration a dépassé le niveau maximal de récursion (%d).\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -514,9 +486,7 @@ msgstr "le fichier %s ne peut pas être lu : %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"fichier de configuration %s, ligne %d : toutes les instructions doivent "
-"appartenir à une section.\n"
+msgstr "fichier de configuration %s, ligne %d : toutes les instructions doivent appartenir à une section.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -786,18 +756,14 @@ msgstr "opérations :\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"utilisez « %s {-h --help} » avec une opération pour voir les options "
-"disponibles.\n"
+msgstr "\nutilisez « %s {-h --help} » avec une opération pour voir les options disponibles.\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade            supprime les paquets ainsi que tous ceux qui en "
-"dépendent\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade            supprime les paquets ainsi que tous ceux qui en dépendent\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -809,10 +775,7 @@ msgstr "  -n, --nosave             supprime les fichiers de configuration\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive          supprime les dépendances inutiles\n"
-"                           (-ss inclut les dépendances installées "
-"explicitement)\n"
+msgstr "  -s, --recursive          supprime les dépendances inutiles\n                           (-ss inclut les dépendances installées explicitement)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -822,9 +785,7 @@ msgstr "  -u, --unneeded           supprime les paquets inutiles\n"
 #: src/pacman/pacman.c:132 src/pacman/pacman.c:167
 #, c-format
 msgid "      --needed         do not reinstall up to date packages\n"
-msgstr ""
-"      --needed             ne pas réinstaller les paquets à jour\n"
-"\n"
+msgstr "      --needed             ne pas réinstaller les paquets à jour\n\n"
 
 #: src/pacman/pacman.c:137
 #, c-format
@@ -835,39 +796,29 @@ msgstr "  -c, --changelog          affiche les changements du paquet\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps               liste tous les paquets installés en tant que "
-"dépendances [filtre]\n"
+msgstr "  -d, --deps               liste tous les paquets installés en tant que dépendances [filtre]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit           liste tous les paquets installés explicitement "
-"[filtre]\n"
+msgstr "  -e, --explicit           liste tous les paquets installés explicitement [filtre]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
-msgstr ""
-"  -g, --groups             affiche tous les éléments d’un groupe de paquets\n"
+msgstr "  -g, --groups             affiche tous les éléments d’un groupe de paquets\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info               affiche les informations d’un paquet (-ii pour "
-"les fichiers de config protégés)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info               affiche les informations d’un paquet (-ii pour les fichiers de config protégés)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check              vérifie que les fichiers du paquet sont tous bien "
-"présents (-kk pour vérifier les propriétés des fichiers)\n"
+msgstr "  -k, --check              vérifie que les fichiers du paquet sont tous bien présents (-kk pour vérifier les propriétés des fichiers)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
@@ -879,32 +830,24 @@ msgstr "  -l, --list liste les fichiers appartenant au paquet interrogé\n"
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign            liste les paquets non trouvés dans la ou les "
-"bases de données de synchronisation [filtre]\n"
+msgstr "  -m, --foreign            liste les paquets non trouvés dans la ou les bases de données de synchronisation [filtre]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native             liste les paquets installés trouvés seulement "
-"dans les base de données synchronisées [filtre]\n"
+msgstr "  -n, --native             liste les paquets installés trouvés seulement dans les base de données synchronisées [filtre]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
-msgstr ""
-"  -o, --owns <fichier>     recherche le paquet contenant le fichier "
-"<fichier>\n"
+msgstr "  -o, --owns <fichier>     recherche le paquet contenant le fichier <fichier>\n"
 
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"  -p, --file <paquet>      interroge le fichier <paquet> au lieu de la base "
-"de données\n"
+msgstr "  -p, --file <paquet>      interroge le fichier <paquet> au lieu de la base de données\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
@@ -916,53 +859,40 @@ msgstr "  -q, --quiet              montre moins d’informations\n"
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex>     recherche la chaîne correspondante dans les "
-"paquets installés localement\n"
+msgstr "  -s, --search <regex>     recherche la chaîne correspondante dans les paquets installés localement\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired liste les paquets qui ne sont requis (optionnellement)\n"
-"par aucun autre paquet (-tt pour ignorer les dépendances optionnelles) "
-"[filtre]\n"
+msgstr "  -t, --unrequired liste les paquets qui ne sont requis (optionnellement)\npar aucun autre paquet (-tt pour ignorer les dépendances optionnelles) [filtre]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
 msgid "  -u, --upgrades       list outdated packages [filter]\n"
-msgstr ""
-"  -u, --upgrades           liste tous les paquets pouvant être mis à jour "
-"[filtre]\n"
+msgstr "  -u, --upgrades           liste tous les paquets pouvant être mis à jour [filtre]\n"
 
 #: src/pacman/pacman.c:156
 #, c-format
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean              supprime les paquets obsolètes du cache (-cc pour "
-"tous)\n"
+msgstr "  -c, --clean              supprime les paquets obsolètes du cache (-cc pour tous)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups affiche tous les éléments d’un groupe de paquets\n"
-"(-gg pour voir tous les groupes et leurs membres)\n"
+msgstr "  -g, --groups affiche tous les éléments d’un groupe de paquets\n(-gg pour voir tous les groupes et leurs membres)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info affiche les informations d’un paquet (-ii pour les informations "
-"détaillées)\n"
+msgstr "  -i, --info affiche les informations d’un paquet (-ii pour les informations détaillées)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -971,37 +901,28 @@ msgstr "  -l, --list <dépôt>       liste tous les paquets d’un dépôt\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <regex>     recherche la chaîne correspondante dans les "
-"dépôts distants\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regex>     recherche la chaîne correspondante dans les dépôts distants\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"-u, --sysupgrade met à jour tous les paquets installés\n"
-"(-uu permet de restaurer des versions antérieures)\n"
+msgstr "-u, --sysupgrade met à jour tous les paquets installés\n(-uu permet de restaurer des versions antérieures)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly       ne fait que télécharger les paquets, sans rien "
-"installer\n"
+msgstr "  -w, --downloadonly       ne fait que télécharger les paquets, sans rien installer\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"-y, --refresh met à jour les bases de données depuis le serveur\n"
-"(-yy pour forcer une mise à jour des données à jour)\n"
+msgstr "-y, --refresh met à jour les bases de données depuis le serveur\n(-yy pour forcer une mise à jour des données à jour)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -1011,52 +932,41 @@ msgstr "      --asdeps             marque les paquets comme dépendances\n"
 #: src/pacman/pacman.c:172
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit         marque les paquets comme explicitement installés\n"
+msgstr "      --asexplicit         marque les paquets comme explicitement installés\n"
 
 #: src/pacman/pacman.c:173
 #, c-format
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"-k, --check teste la base de données locale pour validité (-kk pour "
-"synchroniser les bases de données)\n"
+msgstr "-k, --check teste la base de données locale pour validité (-kk pour synchroniser les bases de données)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
-"-s, --search <file> recherche les noms de paquet pour les chaînes "
-"correspondantes\n"
+msgstr "-s, --search <file> recherche les noms de paquet pour les chaînes correspondantes\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
 msgid "  -x, --regex          enable searching using regular expressions\n"
-msgstr ""
-"-x, --regex active la recherche en utilisant des expressions régulières\n"
+msgstr "-x, --regex active la recherche en utilisant des expressions régulières\n"
 
 #: src/pacman/pacman.c:185
 #, c-format
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"--machinereadable\n"
-"produit une sortie lisible par une machine\n"
+msgstr "--machinereadable\nproduit une sortie lisible par une machine\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force              installation forcée, écrase les fichiers en "
-"conflit\n"
+msgstr "      --force              installation forcée, écrase les fichiers en conflit\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps             installe les paquets en tant que dépendances\n"
+msgstr "      --asdeps             installe les paquets en tant que dépendances\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
@@ -1068,85 +978,64 @@ msgstr "      --asexplicit         installe les paquets explicitement\n"
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <paquet>    ignore un paquet lors de la màj (peut être "
-"utilisé plusieurs fois)\n"
+msgstr "      --ignore <paquet>    ignore un paquet lors de la màj (peut être utilisé plusieurs fois)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                           ignore un groupe lors de la màj (peut être "
-"utilisé plusieurs fois)\n"
+msgstr "      --ignoregroup <grp>\n                           ignore un groupe lors de la màj (peut être utilisé plusieurs fois)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps             ignore les versions des dépendances\n"
-"                           (-dd pour ignorer complètement toute dépendance)\n"
+msgstr "  -d, --nodeps             ignore les versions des dépendances\n                           (-dd pour ignorer complètement toute dépendance)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"--asume-installed <paquet=version>\n"
-"ajoute un paquet virtuel pour satisfaire les dépendances\n"
+msgstr "--asume-installed <paquet=version>\najoute un paquet virtuel pour satisfaire les dépendances\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly             modifie uniquement les entrées de la base de "
-"données mais pas les paquets.\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly             modifie uniquement les entrées de la base de données mais pas les paquets.\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar      n’affiche pas la barre de progression pendant le "
-"téléchargement\n"
+msgstr "      --noprogressbar      n’affiche pas la barre de progression pendant le téléchargement\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet        n’exécute pas le script d’installation, si le "
-"paquet en contient\n"
+msgstr "      --noscriptlet        n’exécute pas le script d’installation, si le paquet en contient\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print              imprime les cibles au lieu d’effectuer les "
-"opérations\n"
+msgstr "  -p, --print              imprime les cibles au lieu d’effectuer les opérations\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <format>\n"
-"                           spécifie le format d’affichage\n"
+msgstr "      --print-format <format>\n                           spécifie le format d’affichage\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
-msgstr ""
-"  -b, --dbpath <chemin>    définit l’emplacement de la base de données\n"
+msgstr "  -b, --dbpath <chemin>    définit l’emplacement de la base de données\n"
 
 #: src/pacman/pacman.c:212
 #, c-format
@@ -1181,8 +1070,7 @@ msgstr "      --color <quand>      affiche le texte en couleur\n"
 #: src/pacman/pacman.c:218
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
-msgstr ""
-"      --config <chemin>    impose un fichier de configuration alternatif\n"
+msgstr "      --config <chemin>    impose un fichier de configuration alternatif\n"
 
 #: src/pacman/pacman.c:219
 #, c-format
@@ -1192,9 +1080,7 @@ msgstr "      --debug              affiche les messages de débogage\n"
 #: src/pacman/pacman.c:220
 #, c-format
 msgid "      --gpgdir <path>  set an alternate home directory for GnuPG\n"
-msgstr ""
-"      --gpgdir <chemin>    spécifie le chemin du dossier personnel pour "
-"GnuPG\n"
+msgstr "      --gpgdir <chemin>    spécifie le chemin du dossier personnel pour GnuPG\n"
 
 #: src/pacman/pacman.c:221
 #, c-format
@@ -1216,15 +1102,12 @@ msgstr "--confirm toujours demander une confirmation\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Ce programme peut être librement redistribué\n"
-"                       sous les termes de la licence GNU GPL.\n"
+msgstr "                       Ce programme peut être librement redistribué\n                       sous les termes de la licence GNU GPL.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
 msgid "invalid option: '%s' and '%s' may not be used together\n"
-msgstr ""
-"option invalide : '%s' et '%s' ne peuvent pas être utilisés simultanément\n"
+msgstr "option invalide : '%s' et '%s' ne peuvent pas être utilisés simultanément\n"
 
 #: src/pacman/pacman.c:386
 #, c-format
@@ -1369,8 +1252,7 @@ msgstr "%s est indiqué comme paquet à conserver (HoldPkg).\n"
 #: src/pacman/remove.c:149
 #, c-format
 msgid "HoldPkg was found in target list. Do you want to continue?"
-msgstr ""
-"Une des cibles est un paquet à conserver (HoldPkg). Voulez-vous continuer ?"
+msgstr "Une des cibles est un paquet à conserver (HoldPkg). Voulez-vous continuer ?"
 
 #: src/pacman/remove.c:157 src/pacman/sync.c:781
 #, c-format
@@ -1579,9 +1461,7 @@ msgstr "ne peut pas bloquer la base de données : %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  Si vous êtes sûr qu’un gestionnaire de paquet n’est pas déjà\n"
-"  en cours de fonctionnement, vous pouvez supprimer %s.\n"
+msgstr "  Si vous êtes sûr qu’un gestionnaire de paquet n’est pas déjà\n  en cours de fonctionnement, vous pouvez supprimer %s.\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/gl.po b/src/pacman/po/gl.po
index a5b14af5..816d0462 100644
--- a/src/pacman/po/gl.po
+++ b/src/pacman/po/gl.po
@@ -1,13 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Adrián Chaves Fernández <adriyetichaves@gmail.com>, 2013-2015
+# Adrián Chaves Fernández <adriyetichaves@gmail.com>, 2013-2016
 # Adrián Chaves Fernández <adriyetichaves@gmail.com>, 2015
 # Alexandre Filgueira <faidoc@gmail.com>, 2013
 # Alexandre Filgueira <faidoc@gmail.com>, 2013
 # Daniel, 2016
+# Daniel, 2016
 # Alexandre Filgueira <faidoc@gmail.com>, 2013
 # Alexandre Filgueira <faidoc@gmail.com>, 2013
 msgid ""
@@ -15,25 +16,24 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
-"PO-Revision-Date: 2016-01-22 21:15+0000\n"
-"Last-Translator: Daniel\n"
-"Language-Team: Galician (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/gl/)\n"
-"Language: gl\n"
+"PO-Revision-Date: 2016-02-07 15:46+0000\n"
+"Last-Translator: Adrián Chaves Fernández <adriyetichaves@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.com/toofishes/archlinux-pacman/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
 #, c-format
 msgid "Running pre-transaction hooks...\n"
-msgstr ""
+msgstr "Executando os ganchos pre-transacción…\n"
 
 #: src/pacman/callback.c:184
 #, c-format
 msgid "Running post-transaction hooks...\n"
-msgstr ""
+msgstr "Executando os ganchos post-transacción…\n"
 
 #: src/pacman/callback.c:197
 #, c-format
@@ -58,7 +58,7 @@ msgstr "Buscando conflitos entre paquetes…\n"
 #: src/pacman/callback.c:211
 #, c-format
 msgid "Processing package changes...\n"
-msgstr ""
+msgstr "Procesando os cambios de paquetes…\n"
 
 #: src/pacman/callback.c:218
 #, c-format
@@ -180,13 +180,10 @@ msgstr "%s e %s están en conflito (%s). Quitar %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"O seguinte paquete non se pode actualizar debido a dependencias que non se "
-"puideron resolver:\n"
-msgstr[1] ""
-"Os seguintes paquetes non poden ser actualizados debido a dependencias que "
-"non se puideron resolver:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "O seguinte paquete non se pode actualizar debido a dependencias que non se puideron resolver:\n"
+msgstr[1] "Os seguintes paquetes non poden ser actualizados debido a dependencias que non se puideron resolver:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -199,27 +196,25 @@ msgstr[1] "Quere omitir os seguintes paquetes para esta actualización?"
 #, c-format
 msgid "There is %zu provider available for %s\n"
 msgid_plural "There are %zu providers available for %s:\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hai %zu provedor dispoñíbel para %s\n"
+msgstr[1] "Hai %zu provedores dispoñíbeis para %s:\n"
 
 #: src/pacman/callback.c:464
 #, c-format
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"O ficheiro «%s» está en mal estado (%s).\n"
-"Quere eliminalo?"
+msgstr "O ficheiro «%s» está en mal estado (%s).\nQuere eliminalo?"
 
 #: src/pacman/callback.c:478
 #, c-format
 msgid "Import PGP key %u%c/%s, \"%s\", created: %s (revoked)?"
-msgstr ""
+msgstr "Importar a chave PGP %u%c/%s, «%s», creada: %s (revogada)?"
 
 #: src/pacman/callback.c:481
 #, c-format
 msgid "Import PGP key %u%c/%s, \"%s\", created: %s?"
-msgstr ""
+msgstr "Importar a chave PGP %u%c/%s, «%s», creada: %s?"
 
 #: src/pacman/callback.c:540
 #, c-format
@@ -363,9 +358,7 @@ msgstr[1] "%jd ficheiros alterados.\n"
 msgid "malloc failure: could not allocate %zu byte\n"
 msgid_plural "malloc failure: could not allocate %zu bytes\n"
 msgstr[0] "erro en malloc: non se puido reservar %zu byte\n"
-msgstr[1] ""
-"erro en malloc: non se puido reservar %zu bytes\n"
-"\n"
+msgstr[1] "erro en malloc: non se puido reservar %zu bytes\n\n"
 
 #: src/pacman/conf.c:251
 #, c-format
@@ -395,35 +388,28 @@ msgstr "Non foi posíbel restablecer o directorio de traballo (%s).\n"
 #: src/pacman/conf.c:397 src/pacman/conf.c:447 src/pacman/conf.c:541
 #, c-format
 msgid "config file %s, line %d: invalid value for '%s' : '%s'\n"
-msgstr ""
-"Ficheiro de configuración «%s», liña %d: valor incorrecto para «%s»: «%s».\n"
+msgstr "Ficheiro de configuración «%s», liña %d: valor incorrecto para «%s»: «%s».\n"
 
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"Ficheiro de configuración «%s», liña %d: a opción «%s» é incorrecta, non "
-"será posíbel asinar paquetes.\n"
+msgstr "Ficheiro de configuración «%s», liña %d: a opción «%s» é incorrecta, non será posíbel asinar paquetes.\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"Ficheiro de configuración %s, liña %d: non se recoñeceu a directiva «%s» da "
-"sección «%s».\n"
+msgstr "Ficheiro de configuración %s, liña %d: non se recoñeceu a directiva «%s» da sección «%s».\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"O espello «%s» contén a variábel «%s», pero non se definiu ningún «%s».\n"
+msgstr "O espello «%s» contén a variábel «%s», pero non se definiu ningún «%s».\n"
 
 #: src/pacman/conf.c:641
 #, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
-msgstr ""
-"Non foi posíbel engadir o URL do servidor á base de datos «%s»: %s (%s).\n"
+msgstr "Non foi posíbel engadir o URL do servidor á base de datos «%s»: %s (%s).\n"
 
 #: src/pacman/conf.c:661
 #, c-format
@@ -433,29 +419,24 @@ msgstr "Non foi posíbel rexistrar a base de datos «%s» (%s).\n"
 #: src/pacman/conf.c:676
 #, c-format
 msgid "could not add mirror '%s' to database '%s' (%s)\n"
-msgstr ""
-"Produciuse un erro ao engadir o servidor espello «%s» á base de datos "
-"«%s» (%s).\n"
+msgstr "Produciuse un erro ao engadir o servidor espello «%s» á base de datos «%s» (%s).\n"
 
 #: src/pacman/conf.c:722
 #, c-format
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"Non foi posíbel iniciar a biblioteca «alpm».\n"
-"(%s: %s)\n"
+msgstr "Non foi posíbel iniciar a biblioteca «alpm».\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
 msgid "try running pacman-db-upgrade\n"
-msgstr ""
+msgstr "probe a executar pacman-db-upgrade\n"
 
 #: src/pacman/conf.c:744
 #, c-format
 msgid "problem setting logfile '%s' (%s)\n"
-msgstr ""
-"Produciuse un erro ao definir a ruta do ficheiro de rexistro «%s» (%s).\n"
+msgstr "Produciuse un erro ao definir a ruta do ficheiro de rexistro «%s» (%s).\n"
 
 #: src/pacman/conf.c:754
 #, c-format
@@ -465,7 +446,7 @@ msgstr "Produciuse un erro ao definir a ruta do cartafol de GPG «%s» (%s).\n"
 #: src/pacman/conf.c:763 src/pacman/conf.c:771
 #, c-format
 msgid "problem adding hookdir '%s' (%s)\n"
-msgstr ""
+msgstr "problema ao engadir o cartafol de ganchos «%s» (%s)\n"
 
 #: src/pacman/conf.c:802
 #, c-format
@@ -475,28 +456,22 @@ msgstr "Non se configurou ningún «%s».\n"
 #: src/pacman/conf.c:830
 #, c-format
 msgid "Failed to pass %s entry to libalpm"
-msgstr ""
+msgstr "Non foi posíbel pasarlle a entrada %s a libalpm"
 
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"Ficheiro de configuración «%s», liña %d: non se recoñece a seguinte opción "
-"de «%s»: «%s».\n"
+msgstr "Ficheiro de configuración «%s», liña %d: non se recoñece a seguinte opción de «%s»: «%s».\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
-"Ficheiro de configuración «%s», liña %d: a directiva «%s» necesita un "
-"valor.\n"
+msgstr "Ficheiro de configuración «%s», liña %d: a directiva «%s» necesita un valor.\n"
 
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"a lectura do arquivo de configuración excediu a profundidade de recursión "
-"máxima: %d.\n"
+msgstr "a lectura do arquivo de configuración excediu a profundidade de recursión máxima: %d.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -506,16 +481,13 @@ msgstr "Non foi posíbel ler o ficheiro de configuración «%s»: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"Ficheiro de configuración «%s», liña %d: todas as directivas deben pertencer "
-"a unha sección.\n"
+msgstr "Ficheiro de configuración «%s», liña %d: todas as directivas deben pertencer a unha sección.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
 #, c-format
 msgid "no targets specified (use -h for help)\n"
-msgstr ""
-"Non se indicaron obxectivos (empregue a opción «-h» para obter axuda).\n"
+msgstr "Non se indicaron obxectivos (empregue a opción «-h» para obter axuda).\n"
 
 #: src/pacman/database.c:59
 #, c-format
@@ -530,8 +502,7 @@ msgstr "non se puido establecer motivo de instalación para o paquete %s (%s)\n"
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
-"%s: definiuse como motivo da instalación «instalado como dependencia».\n"
+msgstr "%s: definiuse como motivo da instalación «instalado como dependencia».\n"
 
 #: src/pacman/database.c:80
 #, c-format
@@ -656,27 +627,27 @@ msgstr "Requíreno"
 #: src/pacman/package.c:120 src/pacman/package.c:235
 #, c-format
 msgid "SHA-256 Sum"
-msgstr ""
+msgstr "Suma SHA-256"
 
 #: src/pacman/package.c:121
 #, c-format
 msgid "Signatures"
-msgstr ""
+msgstr "Sinaturas"
 
 #: src/pacman/package.c:122
 #, c-format
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: src/pacman/package.c:123
 #, c-format
 msgid "Validated By"
-msgstr ""
+msgstr "Validado por"
 
 #: src/pacman/package.c:124
 #, c-format
 msgid "Version"
-msgstr ""
+msgstr "Versión"
 
 #: src/pacman/package.c:167 src/pacman/util.c:1205
 #, c-format
@@ -780,18 +751,14 @@ msgstr "operacións:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"Empregue «%s {-h --help}» cunha operación para ver as opcións dispoñíbeis.\n"
+msgstr "\nEmpregue «%s {-h --help}» cunha operación para ver as opcións dispoñíbeis.\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        Desinstalar tanto os paquetes como aqueles paquetes "
-"que\n"
-"                       dependan deles.\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        Desinstalar tanto os paquetes como aqueles paquetes que\n                       dependan deles.\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -803,11 +770,7 @@ msgstr "  -n, --nosave         Eliminar os ficheiros de configuración.\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      Eliminar as dependencias que non sexan necesarias\n"
-"                       («-ss» fai que se inclúan as dependencias instaladas "
-"de\n"
-"                       forma explícita).\n"
+msgstr "  -s, --recursive      Eliminar as dependencias que non sexan necesarias\n                       («-ss» fai que se inclúan as dependencias instaladas de\n                       forma explícita).\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -828,106 +791,77 @@ msgstr "  -c, --changelog      Mostrar o historial de cambios do paquete.\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           Listar os paquetes instalados como dependencias\n"
-"                       (filtro).\n"
+msgstr "  -d, --deps           Listar os paquetes instalados como dependencias\n                       (filtro).\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       Listar os paquetes instalados explicitamente "
-"(filtro).\n"
+msgstr "  -e, --explicit       Listar os paquetes instalados explicitamente (filtro).\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
-msgstr ""
-"  -g, --groups         Ver todos os paquetes que pertencen a un grupo.\n"
+msgstr "  -g, --groups         Ver todos os paquetes que pertencen a un grupo.\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           Ver a información do paquete («-ii» para os "
-"ficheiros\n"
-"                       da copia de seguranza).\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           Ver a información do paquete («-ii» para os ficheiros\n                       da copia de seguranza).\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          Comprobar que os ficheiros de paquetes existen («-"
-"kk»\n"
-"                       para comprobar as súas propiedades).\n"
+msgstr "  -k, --check          Comprobar que os ficheiros de paquetes existen («-kk»\n                       para comprobar as súas propiedades).\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"  -l, --list           Listar os ficheiros que pertencen ao paquete "
-"indicado.\n"
+msgstr "  -l, --list           Listar os ficheiros que pertencen ao paquete indicado.\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        Listar os paquetes instalados que non se atopan nas\n"
-"                       bases de datos sincronizadas (filtro).\n"
+msgstr "  -m, --foreign        Listar os paquetes instalados que non se atopan nas\n                       bases de datos sincronizadas (filtro).\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         Listar os paquetes instalados que só se atopasen nas\n"
-"                       bases de datos sincronizadas (filtro).\n"
+msgstr "  -n, --native         Listar os paquetes instalados que só se atopasen nas\n                       bases de datos sincronizadas (filtro).\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
-msgstr ""
-"  -o, --own <ruta>     Consultar o paquete que contén o ficheiro que se "
-"atopa\n"
-"                       na ruta indicada.\n"
+msgstr "  -o, --own <ruta>     Consultar o paquete que contén o ficheiro que se atopa\n                       na ruta indicada.\n"
 
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"  -p, --file <paquete> Consultar o ficheiro de paquete indicado en vez de a\n"
-"                       base de datos.\n"
+msgstr "  -p, --file <paquete> Consultar o ficheiro de paquete indicado en vez de a\n                       base de datos.\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          Mostrar menos información para a consulta e a busca.\n"
+msgstr "  -q, --quiet          Mostrar menos información para a consulta e a busca.\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <expr>  Buscar texto nos paquetes instalados localmente que\n"
-"                       coincidan coa expresión regular indicada.\n"
+msgstr "  -s, --search <expr>  Buscar texto nos paquetes instalados localmente que\n                       coincidan coa expresión regular indicada.\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     Listar paquetes que ningún outro paquete require\n"
-"                       (filtro). Use «-tt» para ignorar as dependencias\n"
-"                       opcionais.\n"
+msgstr "  -t, --unrequired     Listar paquetes que ningún outro paquete require\n                       (filtro). Use «-tt» para ignorar as dependencias\n                       opcionais.\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -939,125 +873,95 @@ msgstr "  -u, --upgrades       Mostrar os paquetes obsoletos (filtro).\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          Eliminar os paquetes antigos do cartafol da caché\n"
-"                       («-cc» para eliminalos todos).\n"
+msgstr "  -c, --clean          Eliminar os paquetes antigos do cartafol da caché\n                       («-cc» para eliminalos todos).\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         Ver todos os paquetes que pertencen a un grupo («-"
-"gg»\n"
-"                       para ver todos os grupos e os seus paquetes).\n"
+msgstr "  -g, --groups         Ver todos os paquetes que pertencen a un grupo («-gg»\n                       para ver todos os grupos e os seus paquetes).\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info           Ver información do paquete («-ii» para ver "
-"información\n"
-"                       detallada).\n"
+msgstr "  -i, --info           Ver información do paquete («-ii» para ver información\n                       detallada).\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr ""
-"  -l, --list <repo>    Visualiza unha lista de paquetes nun repositorio.\n"
+msgstr "  -l, --list <repo>    Visualiza unha lista de paquetes nun repositorio.\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <exp.>  Busca texto nos repositorios remotos que coincida "
-"coa\n"
-"                       expresión regular indicada.\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <exp.>  Busca texto nos repositorios remotos que coincida coa\n                       expresión regular indicada.\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     Anovar os paquetes instalados («-uu» tamén instala\n"
-"                       versións antigas de paquetes se a versión local é "
-"máis\n"
-"                       moderna que a do repositorio).\n"
+msgstr "  -u, --sysupgrade     Anovar os paquetes instalados («-uu» tamén instala\n                       versións antigas de paquetes se a versión local é máis\n                       moderna que a do repositorio).\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   Só descarga os paquetes, sen instalar ou actualizar\n"
-"                       nada.\n"
+msgstr "  -w, --downloadonly   Só descarga os paquetes, sen instalar ou actualizar\n                       nada.\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        Actualiza as bases de datos locais cos datos do "
-"servidor\n"
-"                       («-yy» actualízaas aínda que estean ao día).\n"
+msgstr "  -y, --refresh        Actualiza as bases de datos locais cos datos do servidor\n                       («-yy» actualízaas aínda que estean ao día).\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         Marca os paquetes como instalados de forma non\n"
-"                       explícita.\n"
+msgstr "      --asdeps         Marca os paquetes como instalados de forma non\n                       explícita.\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     Marca os paquetes como instalados de forma "
-"explícita.\n"
+msgstr "      --asexplicit     Marca os paquetes como instalados de forma explícita.\n"
 
 #: src/pacman/pacman.c:173
 #, c-format
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
+msgstr "  -k, --check          Probar a validez da base de datos local\n                       (-kk para sincronizar as bases de datos).\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
+msgstr "  -s, --search <fich>  Buscar coincidencias nos nomes de ficheiro dos paquetes.\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
 msgid "  -x, --regex          enable searching using regular expressions\n"
-msgstr ""
+msgstr "  -x, --regex          Activar a busca mediante expresións regulares.\n"
 
 #: src/pacman/pacman.c:185
 #, c-format
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
+msgstr "      --machinereadable\n                       Producir unha saída que poida ler unha máquina.\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          Forzar a instalación, substituíndo ficheiros en "
-"conflito.\n"
+msgstr "      --force          Forzar a instalación, substituíndo ficheiros en conflito.\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         Instala paquetes como dependencia, de maneira non\n"
-"                       explícita.\n"
+msgstr "      --asdeps         Instala paquetes como dependencia, de maneira non\n                       explícita.\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
@@ -1069,56 +973,39 @@ msgstr "      --asexplicit     Instala paquetes de forma explícita.\n"
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <paqu.> Non anova o paquete indicado. Pode usar esta opción\n"
-"                       varias veces.\n"
+msgstr "      --ignore <paqu.> Non anova o paquete indicado. Pode usar esta opción\n                       varias veces.\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grupo>\n"
-"                       Non anova o grupo de paquetes indicado. Pode usar "
-"esta\n"
-"                       opción varias veces.\n"
+msgstr "      --ignoregroup <grupo>\n                       Non anova o grupo de paquetes indicado. Pode usar esta\n                       opción varias veces.\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps                Saltase as comprobacións da versión das "
-"dependencias\n"
-"                       («-dd» para saltarse todas as comprobacións).\n"
+msgstr "  -d, --nodeps                Saltase as comprobacións da versión das dependencias\n                       («-dd» para saltarse todas as comprobacións).\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <paquete=versión>\n"
-"                       Engadir un paquete virtual para satisfacer "
-"dependencias.\n"
+msgstr "      --assume-installed <paquete=versión>\n                       Engadir un paquete virtual para satisfacer dependencias.\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         Só modificar entradas das bases de datos, non "
-"ficheiros de paquetes.\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         Só modificar entradas das bases de datos, non ficheiros de paquetes.\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  Non mostrar unha barra de progreso ao descargar\n"
-"                       ficheiros.\n"
+msgstr "      --noprogressbar  Non mostrar unha barra de progreso ao descargar\n                       ficheiros.\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
@@ -1131,30 +1018,24 @@ msgstr "      --noscriptlet    Non executa o script de instalación.\n"
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          Imprimir os obxectivos in vez de realizar a "
-"operación.\n"
+msgstr "  -p, --print          Imprimir os obxectivos in vez de realizar a operación.\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <formato>\n"
-"                       Define como se mostran os resultados.\n"
+msgstr "      --print-format <formato>\n                       Define como se mostran os resultados.\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
-msgstr ""
-"  -b, --dbpath <ruta>  Define a ruta dunha base de datos alternativa.\n"
+msgstr "  -b, --dbpath <ruta>  Define a ruta dunha base de datos alternativa.\n"
 
 #: src/pacman/pacman.c:212
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
-msgstr ""
-"  -r, --root <ruta>    Define unha ruta raíz de instalación alternativa.\n"
+msgstr "  -r, --root <ruta>    Define unha ruta raíz de instalación alternativa.\n"
 
 #: src/pacman/pacman.c:213
 #, c-format
@@ -1169,15 +1050,12 @@ msgstr "      --arch <arquit.> Define unha arquitectura alternativa.\n"
 #: src/pacman/pacman.c:215
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <dir> Definir unha ruta alternativa («dir») para o "
-"cartafol\n"
-"                       da caché de paquetes.\n"
+msgstr "      --cachedir <dir> Definir unha ruta alternativa («dir») para o cartafol\n                       da caché de paquetes.\n"
 
 #: src/pacman/pacman.c:216
 #, c-format
 msgid "      --hookdir <dir>  set an alternate hook location\n"
-msgstr ""
+msgstr "      --hookdir <dir>  Definir unha ruta de ganchos alternativa.\n"
 
 #: src/pacman/pacman.c:217
 #, c-format
@@ -1187,8 +1065,7 @@ msgstr "      --color <when>   Colorar a saída.\n"
 #: src/pacman/pacman.c:218
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
-msgstr ""
-"      --config <ruta>  Definir un ficheiro de configuración alternativo.\n"
+msgstr "      --config <ruta>  Definir un ficheiro de configuración alternativo.\n"
 
 #: src/pacman/pacman.c:219
 #, c-format
@@ -1198,8 +1075,7 @@ msgstr "      --debug          Mostra mensaxes de depuración.\n"
 #: src/pacman/pacman.c:220
 #, c-format
 msgid "      --gpgdir <path>  set an alternate home directory for GnuPG\n"
-msgstr ""
-"      --gpgdir <ruta>  Configurar un cartafol persoal diferente para GnuPG.\n"
+msgstr "      --gpgdir <ruta>  Configurar un cartafol persoal diferente para GnuPG.\n"
 
 #: src/pacman/pacman.c:221
 #, c-format
@@ -1221,9 +1097,7 @@ msgstr "      --confirm        Pide sempre confirmación.\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Este programa pode distribuírse libremente baixo os\n"
-"                       termos da Licenza Pública Xeral de GNU.\n"
+msgstr "                       Este programa pode distribuírse libremente baixo os\n                       termos da Licenza Pública Xeral de GNU.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1298,9 +1172,7 @@ msgstr "Non se indicou ningunha ruta de ficheiro para a opción «--owns».\n"
 #: src/pacman/query.c:176
 #, c-format
 msgid "failed to find '%s' in PATH: %s\n"
-msgstr ""
-"Non foi posíbel atopar «%s» nos cartafoles da variable de ambiente «PATH»: "
-"%s\n"
+msgstr "Non foi posíbel atopar «%s» nos cartafoles da variable de ambiente «PATH»: %s\n"
 
 #: src/pacman/query.c:181
 #, c-format
@@ -1365,7 +1237,7 @@ msgstr "error ao preparar a transacción (%s)\n"
 #: src/pacman/remove.c:125 src/pacman/sync.c:724
 #, c-format
 msgid "%s: removing %s breaks dependency '%s'\n"
-msgstr ""
+msgstr "%s: desinstalar %s rompe a dependencia «%s».\n"
 
 #: src/pacman/remove.c:144
 #, c-format
@@ -1375,9 +1247,7 @@ msgstr "%s está indicado en HoldPkg.\n"
 #: src/pacman/remove.c:149
 #, c-format
 msgid "HoldPkg was found in target list. Do you want to continue?"
-msgstr ""
-"A lista de obxectivos contén un paquete marcado como «non actualizar». Quere "
-"actualizalo de todos xeitos?"
+msgstr "A lista de obxectivos contén un paquete marcado como «non actualizar». Quere actualizalo de todos xeitos?"
 
 #: src/pacman/remove.c:157 src/pacman/sync.c:781
 #, c-format
@@ -1504,7 +1374,7 @@ msgstr "::%s: necesita %s\n"
 #: src/pacman/sync.c:720
 #, c-format
 msgid "%s: installing %s (%s) breaks dependency '%s'\n"
-msgstr ""
+msgstr "%s: instalar %s (%s) rompe a dependencia «%s».\n"
 
 #: src/pacman/sync.c:744
 #, c-format
@@ -1586,9 +1456,7 @@ msgstr "Non foi posíbel reservar a base de datos: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"se está seguro que non se está executando un administrados de paquetes, pode "
-"eliminar %s.\n"
+msgstr "se está seguro que non se está executando un administrados de paquetes, pode eliminar %s.\n"
 
 #: src/pacman/util.c:96
 #, c-format
@@ -1623,9 +1491,7 @@ msgstr "non se puido sincronizar nungunha base de datos\n"
 #: src/pacman/util.c:639
 #, c-format
 msgid "insufficient columns available for table display\n"
-msgstr ""
-"non hai columnas dabondo para mostrar a tabla\n"
-"\n"
+msgstr "non hai columnas dabondo para mostrar a tabla\n\n"
 
 #: src/pacman/util.c:760
 #, c-format
diff --git a/src/pacman/po/hr.po b/src/pacman/po/hr.po
index 92a11b4f..43093b38 100644
--- a/src/pacman/po/hr.po
+++ b/src/pacman/po/hr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Semsudin Abdic <abdic88@gmail.com>, 2013
 # Ivica  Kolić <ikoli@yahoo.com>, 2012-2015
@@ -13,14 +13,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 03:30+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Croatian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/hr/)\n"
-"Language: hr\n"
+"Language-Team: Croatian (http://www.transifex.com/toofishes/archlinux-pacman/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: src/pacman/callback.c:182
 #, c-format
@@ -35,31 +33,17 @@ msgstr ""
 #: src/pacman/callback.c:197
 #, c-format
 msgid "checking dependencies...\n"
-msgstr ""
-"provjeravam zavisnosti...\n"
-"\n"
-"\n"
-"\n"
+msgstr "provjeravam zavisnosti...\n\n\n\n"
 
 #: src/pacman/callback.c:201
 #, c-format
 msgid "checking for file conflicts...\n"
-msgstr ""
-"provjeravam sukobe datoteka...\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
+msgstr "provjeravam sukobe datoteka...\n\n\n\n\n\n"
 
 #: src/pacman/callback.c:205
 #, c-format
 msgid "resolving dependencies...\n"
-msgstr ""
-"rješavam zavisnosti...\n"
-"\n"
-"\n"
-"\n"
+msgstr "rješavam zavisnosti...\n\n\n\n"
 
 #: src/pacman/callback.c:208
 #, c-format
@@ -74,10 +58,7 @@ msgstr ""
 #: src/pacman/callback.c:218
 #, c-format
 msgid "installing %s...\n"
-msgstr ""
-"instaliram %s...\n"
-"\n"
-"\n"
+msgstr "instaliram %s...\n\n\n"
 
 #: src/pacman/callback.c:221
 #, c-format
@@ -87,9 +68,7 @@ msgstr "nadograđujem %s...\n"
 #: src/pacman/callback.c:224
 #, c-format
 msgid "reinstalling %s...\n"
-msgstr ""
-"ponovno instaliram %s...\n"
-"\n"
+msgstr "ponovno instaliram %s...\n\n"
 
 #: src/pacman/callback.c:227
 #, c-format
@@ -124,10 +103,7 @@ msgstr "učitavam datoteke paketa...\n"
 #: src/pacman/callback.c:271
 #, c-format
 msgid "checking delta integrity...\n"
-msgstr ""
-"provjeravam delta integritet...\n"
-"\n"
-"\n"
+msgstr "provjeravam delta integritet...\n\n\n"
 
 #: src/pacman/callback.c:274
 #, c-format
@@ -152,9 +128,7 @@ msgstr "neuspjelo.\n"
 #: src/pacman/callback.c:291
 #, c-format
 msgid "Retrieving packages ...\n"
-msgstr ""
-"Primam pakete...\n"
-"\n"
+msgstr "Primam pakete...\n\n"
 
 #: src/pacman/callback.c:295
 #, c-format
@@ -169,16 +143,12 @@ msgstr ""
 #: src/pacman/callback.c:320 src/pacman/callback.c:326
 #, c-format
 msgid "%s installed as %s.pacnew\n"
-msgstr ""
-"%s instalirano kao %s.pacnew\n"
-"\n"
+msgstr "%s instalirano kao %s.pacnew\n\n"
 
 #: src/pacman/callback.c:336 src/pacman/callback.c:342
 #, c-format
 msgid "%s saved as %s.pacsave\n"
-msgstr ""
-"%s spremljeno kao %s.pacsave\n"
-"\n"
+msgstr "%s spremljeno kao %s.pacsave\n\n"
 
 #: src/pacman/callback.c:390
 #, c-format
@@ -205,14 +175,11 @@ msgstr "%s i %s su u sukobu (%s). Ukloni %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Slijedeći paket se ne može nadograditi zbog nerješenih zavisnosti:\n"
-"\n"
-msgstr[1] ""
-":Slijedeći paketi se ne mogu nadograditi zbog nerješenih zavisnosti:\n"
-msgstr[2] ""
-":Slijedeći paketi se ne mogu nadograditi zbog nerješenih zavisnosti:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Slijedeći paket se ne može nadograditi zbog nerješenih zavisnosti:\n\n"
+msgstr[1] ":Slijedeći paketi se ne mogu nadograditi zbog nerješenih zavisnosti:\n"
+msgstr[2] ":Slijedeći paketi se ne mogu nadograditi zbog nerješenih zavisnosti:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -235,9 +202,7 @@ msgstr[2] ""
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Datoteka %s je oštećena (%s).\n"
-"Želite li je izbrisati?"
+msgstr "Datoteka %s je oštećena (%s).\nŽelite li je izbrisati?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -302,16 +267,12 @@ msgstr "učitavam datoteke paketa"
 #: src/pacman/callback.c:679
 #, c-format
 msgid "downloading %s...\n"
-msgstr ""
-"preuzimam %s...\n"
-"\n"
+msgstr "preuzimam %s...\n\n"
 
 #: src/pacman/check.c:63 src/pacman/check.c:232
 #, c-format
 msgid "%s: %s (File type mismatch)\n"
-msgstr ""
-"%s: %s (Nepodudaranje datotečnog imena)\n"
-"\n"
+msgstr "%s: %s (Nepodudaranje datotečnog imena)\n\n"
 
 #: src/pacman/check.c:82
 #, c-format
@@ -326,9 +287,7 @@ msgstr "%s: %s (GID nepodudaranje )\n"
 #: src/pacman/check.c:101
 #, c-format
 msgid "%s: %s (Permissions mismatch)\n"
-msgstr ""
-"%s: %s (Nepodudaranje dozvola)\n"
-"\n"
+msgstr "%s: %s (Nepodudaranje dozvola)\n\n"
 
 #: src/pacman/check.c:115 src/pacman/check.c:162
 #, c-format
@@ -353,9 +312,7 @@ msgstr ""
 #: src/pacman/check.c:164 src/pacman/check.c:170
 #, c-format
 msgid "%s: %s (Size mismatch)\n"
-msgstr ""
-"%s: %s (Nepodudaranje veličine)\n"
-"\n"
+msgstr "%s: %s (Nepodudaranje veličine)\n\n"
 
 #: src/pacman/check.c:207 src/pacman/check.c:222 src/pacman/check.c:267
 #: src/pacman/check.c:316
@@ -428,23 +385,17 @@ msgstr "ne mogu preimenovati %s u %s (%s)\n"
 #: src/pacman/conf.c:288
 #, c-format
 msgid "could not restore working directory (%s)\n"
-msgstr ""
-"ne mogu obnoviti radni direktorij (%s)\n"
-"\n"
-"\n"
+msgstr "ne mogu obnoviti radni direktorij (%s)\n\n\n"
 
 #: src/pacman/conf.c:397 src/pacman/conf.c:447 src/pacman/conf.c:541
 #, c-format
 msgid "config file %s, line %d: invalid value for '%s' : '%s'\n"
-msgstr ""
-"konfiguracijska datoteka %s, red %d: neispravna vrijednost za '%s' : '%s'\n"
+msgstr "konfiguracijska datoteka %s, red %d: neispravna vrijednost za '%s' : '%s'\n"
 
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"konfiguracijska datoteka %s, redak %d: '%s neispravna opcija, nema podrške "
-"potpisa\n"
+msgstr "konfiguracijska datoteka %s, redak %d: '%s neispravna opcija, nema podrške potpisa\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
@@ -465,17 +416,12 @@ msgstr "ne mogu dodati URL poslužitelja bazi podataka  '%s': %s (%s)\n"
 #: src/pacman/conf.c:661
 #, c-format
 msgid "could not register '%s' database (%s)\n"
-msgstr ""
-"ne mogu registrirati '%s' bazu podataka (%s)\n"
-"\n"
-"\n"
+msgstr "ne mogu registrirati '%s' bazu podataka (%s)\n\n\n"
 
 #: src/pacman/conf.c:676
 #, c-format
 msgid "could not add mirror '%s' to database '%s' (%s)\n"
-msgstr ""
-"ne mogu dodati zrcalo '%s' u bazu podataka '%s' (%s)\n"
-"\n"
+msgstr "ne mogu dodati zrcalo '%s' u bazu podataka '%s' (%s)\n\n"
 
 #: src/pacman/conf.c:722
 #, c-format
@@ -548,30 +494,22 @@ msgstr "nijedna meta nije određena (koristite -h za pomoć)\n"
 #: src/pacman/database.c:59
 #, c-format
 msgid "no install reason specified (use -h for help)\n"
-msgstr ""
-"nije određen nijedani razlog instalacije (koristi -h za pomoć)\n"
-"\n"
+msgstr "nije određen nijedani razlog instalacije (koristi -h za pomoć)\n\n"
 
 #: src/pacman/database.c:73
 #, c-format
 msgid "could not set install reason for package %s (%s)\n"
-msgstr ""
-"ne mogu postaviti instalacijski razlog za paket %s (%s)\n"
-"\n"
+msgstr "ne mogu postaviti instalacijski razlog za paket %s (%s)\n\n"
 
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
-"%s: instalacijski razlog je postavljen na 'instalirano kao zavisnost'\n"
-"\n"
+msgstr "%s: instalacijski razlog je postavljen na 'instalirano kao zavisnost'\n\n"
 
 #: src/pacman/database.c:80
 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
-msgstr ""
-"%s: instalacijski razlog je postavljen na 'eksplicitno instaliran'\n"
-"\n"
+msgstr "%s: instalacijski razlog je postavljen na 'eksplicitno instaliran'\n\n"
 
 #: src/pacman/package.c:97
 #, c-format
@@ -763,9 +701,7 @@ msgstr "ne mogu izračunati checksums za %s\n"
 #: src/pacman/package.c:416
 #, c-format
 msgid "(none)\n"
-msgstr ""
-"(nijedan)\n"
-"\n"
+msgstr "(nijedan)\n\n"
 
 #: src/pacman/package.c:453
 #, c-format
@@ -817,51 +753,36 @@ msgstr "operacije:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"koristi '%s {-h --help}' sa operacijom za dostupne opcije\n"
-"\n"
+msgstr "\nkoristi '%s {-h --help}' sa operacijom za dostupne opcije\n\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        ukloni pakete i sve pakete koji o njima ovise\n"
-"\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        ukloni pakete i sve pakete koji o njima ovise\n\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
 msgid "  -n, --nosave         remove configuration files\n"
-msgstr ""
-"  -n, --nosave         ukloni konfiguracijske datoteke\n"
-"\n"
+msgstr "  -n, --nosave         ukloni konfiguracijske datoteke\n\n"
 
 #: src/pacman/pacman.c:127
 #, c-format
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive ukloni nepotrbne zavisnosti\n"
-"                       (-ss uključuje eksplicitno instalirane zavisnosti)\n"
-"\n"
-"\n"
+msgstr "  -s, --recursive ukloni nepotrbne zavisnosti\n                       (-ss uključuje eksplicitno instalirane zavisnosti)\n\n\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
 msgid "  -u, --unneeded       remove unneeded packages\n"
-msgstr ""
-"  -u, --unneeded       ukloni nepotebne pakete\n"
-"\n"
+msgstr "  -u, --unneeded       ukloni nepotebne pakete\n\n"
 
 #: src/pacman/pacman.c:132 src/pacman/pacman.c:167
 #, c-format
 msgid "      --needed         do not reinstall up to date packages\n"
-msgstr ""
-"      --needed         nemoj ponovno instalirati ažurirane pakete\n"
-"\n"
-"\n"
+msgstr "      --needed         nemoj ponovno instalirati ažurirane pakete\n\n\n"
 
 #: src/pacman/pacman.c:137
 #, c-format
@@ -872,18 +793,12 @@ msgstr ""
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           izlistaj pakete instalirane kao zavisnosti [filter]\n"
-"\n"
+msgstr "  -d, --deps           izlistaj pakete instalirane kao zavisnosti [filter]\n\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit izlistaj eksplicitno instalirane pakete [filter]\n"
-"\n"
-"\n"
-"\n"
+msgstr "  -e, --explicit izlistaj eksplicitno instalirane pakete [filter]\n\n\n\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -892,14 +807,8 @@ msgstr "  \n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info pogledaj informacije o paketu (-ii za datoteke sigurnosne "
-"kopije)\n"
-"\n"
-"\n"
-"\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info pogledaj informacije o paketu (-ii za datoteke sigurnosne kopije)\n\n\n\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
@@ -959,10 +868,7 @@ msgstr ""
 #: src/pacman/pacman.c:152
 #, c-format
 msgid "  -u, --upgrades       list outdated packages [filter]\n"
-msgstr ""
-"  -u, --upgrades izlistaj zastarjele pakete [filter]\n"
-"\n"
-"\n"
+msgstr "  -u, --upgrades izlistaj zastarjele pakete [filter]\n\n\n"
 
 #: src/pacman/pacman.c:156
 #, c-format
@@ -988,14 +894,11 @@ msgstr ""
 #: src/pacman/pacman.c:160
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr ""
-"  -l, --list <repo>    pogledaj listu paketa u repozitoriju\n"
-"\n"
+msgstr "  -l, --list <repo>    pogledaj listu paketa u repozitoriju\n\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
 
 #: src/pacman/pacman.c:163
@@ -1009,10 +912,7 @@ msgstr ""
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly  preuzmi pakete ali ništa ne instalraj/nadograđuj\n"
-"\n"
-"\n"
+msgstr "  -w, --downloadonly  preuzmi pakete ali ništa ne instalraj/nadograđuj\n\n\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
@@ -1024,21 +924,12 @@ msgstr ""
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps označi pakete kao ne-eksplicitno instalirane\n"
-"\n"
-"\n"
-"\n"
+msgstr "      --asdeps označi pakete kao ne-eksplicitno instalirane\n\n\n\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit označi pakete kao eksplicitno instalirane\n"
-"\n"
-"\n"
-"\n"
-"\n"
+msgstr "      --asexplicit označi pakete kao eksplicitno instalirane\n\n\n\n\n"
 
 #: src/pacman/pacman.c:173
 #, c-format
@@ -1072,40 +963,26 @@ msgstr ""
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps instaliraj pakete kao ne-ekplicitno instalirane\n"
-"\n"
-"\n"
-"\n"
+msgstr "      --asdeps instaliraj pakete kao ne-ekplicitno instalirane\n\n\n\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit instaliraj pakete kao ekplicitno instalirane\n"
-"\n"
-"\n"
-"\n"
+msgstr "      --asexplicit instaliraj pakete kao ekplicitno instalirane\n\n\n\n"
 
 #: src/pacman/pacman.c:194
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg> ignoriraj nadogradnju paketa (može biti korišteno više "
-"puta)\n"
-"\n"
+msgstr "      --ignore <pkg> ignoriraj nadogradnju paketa (može biti korišteno više puta)\n\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                       ignoriraj nadogradnju grupe (može biti korišteno više "
-"puta)\n"
+msgstr "      --ignoregroup <grp>\n                       ignoriraj nadogradnju grupe (može biti korišteno više puta)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
@@ -1123,17 +1000,14 @@ msgstr ""
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
 msgstr ""
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  ne pokazuj traku napretka pri preuzimanju datoteka\n"
-"\n"
+msgstr "      --noprogressbar  ne pokazuj traku napretka pri preuzimanju datoteka\n\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
@@ -1153,18 +1027,12 @@ msgstr ""
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                       određuje kako mete trebaju biti ispisane\n"
-"\n"
-"\n"
+msgstr "      --print-format <string>\n                       određuje kako mete trebaju biti ispisane\n\n\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
-msgstr ""
-"  -b, --dbpath <path>  postavi alternativnu lokaciju baze podataka\n"
-"\n"
+msgstr "  -b, --dbpath <path>  postavi alternativnu lokaciju baze podataka\n\n"
 
 #: src/pacman/pacman.c:212
 #, c-format
@@ -1174,16 +1042,12 @@ msgstr ""
 #: src/pacman/pacman.c:213
 #, c-format
 msgid "  -v, --verbose        be verbose\n"
-msgstr ""
-"  -v, --verbose        budi opširan\n"
-"\n"
+msgstr "  -v, --verbose        budi opširan\n\n"
 
 #: src/pacman/pacman.c:214
 #, c-format
 msgid "      --arch <arch>    set an alternate architecture\n"
-msgstr ""
-"      --arch <arch>   postavi alternativnu arhitekturu\n"
-"\n"
+msgstr "      --arch <arch>   postavi alternativnu arhitekturu\n\n"
 
 #: src/pacman/pacman.c:215
 #, c-format
@@ -1198,16 +1062,12 @@ msgstr ""
 #: src/pacman/pacman.c:217
 #, c-format
 msgid "      --color <when>   colorize the output\n"
-msgstr ""
-"      --color <when>   oboji izlaz\n"
-"\n"
+msgstr "      --color <when>   oboji izlaz\n\n"
 
 #: src/pacman/pacman.c:218
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
-msgstr ""
-"      --config <path>  postavi altenativnu konfiguracijsku datoteku\n"
-"\n"
+msgstr "      --config <path>  postavi altenativnu konfiguracijsku datoteku\n\n"
 
 #: src/pacman/pacman.c:219
 #, c-format
@@ -1227,32 +1087,24 @@ msgstr ""
 #: src/pacman/pacman.c:222
 #, c-format
 msgid "      --noconfirm      do not ask for any confirmation\n"
-msgstr ""
-"      --noconfirm do not ask for any confirmation\n"
-"\n"
+msgstr "      --noconfirm do not ask for any confirmation\n\n"
 
 #: src/pacman/pacman.c:223
 #, c-format
 msgid "      --confirm        always ask for confirmation\n"
-msgstr ""
-"      --confirm        uvijek pitaj za potvrdu\n"
-"\n"
+msgstr "      --confirm        uvijek pitaj za potvrdu\n\n"
 
 #: src/pacman/pacman.c:242
 #, c-format
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"Ovaj program može biti slobodno distribuiran \n"
-"sukladno pravilima GNU General Public License.\n"
+msgstr "Ovaj program može biti slobodno distribuiran \nsukladno pravilima GNU General Public License.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
 msgid "invalid option: '%s' and '%s' may not be used together\n"
-msgstr ""
-"neispravna opcija: '%s' i '%s' se ne mogu koristiti zajedno\n"
-"\n"
+msgstr "neispravna opcija: '%s' i '%s' se ne mogu koristiti zajedno\n\n"
 
 #: src/pacman/pacman.c:386
 #, c-format
@@ -1312,10 +1164,7 @@ msgstr "nije određena nijedna operacija (koristite -h za pomoć)\n"
 #: src/pacman/query.c:86
 #, c-format
 msgid "%s is owned by %s %s\n"
-msgstr ""
-"%s je u vlasništvu %s %s\n"
-"\n"
-"\n"
+msgstr "%s je u vlasništvu %s %s\n\n\n"
 
 #: src/pacman/query.c:147
 #, c-format
@@ -1325,9 +1174,7 @@ msgstr ""
 #: src/pacman/query.c:176
 #, c-format
 msgid "failed to find '%s' in PATH: %s\n"
-msgstr ""
-"neuspjelo nalaženje '%s' u PUTANJI: %s\n"
-"\n"
+msgstr "neuspjelo nalaženje '%s' u PUTANJI: %s\n\n"
 
 #: src/pacman/query.c:181
 #, c-format
@@ -1357,9 +1204,7 @@ msgstr ""
 #: src/pacman/query.c:380
 #, c-format
 msgid "group '%s' was not found\n"
-msgstr ""
-"grupa '%s' nije nađena\n"
-"\n"
+msgstr "grupa '%s' nije nađena\n\n"
 
 #: src/pacman/query.c:471 src/pacman/sync.c:429
 #, c-format
@@ -1374,16 +1219,12 @@ msgstr "'%s' je datoteka, možda želite koristiti %s.\n"
 #: src/pacman/query.c:480
 #, c-format
 msgid "could not load package '%s': %s\n"
-msgstr ""
-"ne mogu učitati paket '%s': %s\n"
-"\n"
+msgstr "ne mogu učitati paket '%s': %s\n\n"
 
 #: src/pacman/remove.c:49 src/pacman/sync.c:526 src/pacman/sync.c:610
 #, c-format
 msgid "skipping target: %s\n"
-msgstr ""
-"preskačem metu: %s\n"
-"\n"
+msgstr "preskačem metu: %s\n\n"
 
 #: src/pacman/remove.c:63 src/pacman/sync.c:546
 #, c-format
@@ -1413,9 +1254,7 @@ msgstr "HoldPkg je nađen na ciljanoj listi. Želite li nastaviti?"
 #: src/pacman/remove.c:157 src/pacman/sync.c:781
 #, c-format
 msgid " there is nothing to do\n"
-msgstr ""
-" nema ništa za učiniti\n"
-"\n"
+msgstr " nema ništa za učiniti\n\n"
 
 #: src/pacman/remove.c:169
 #, c-format
@@ -1455,16 +1294,12 @@ msgstr ""
 #: src/pacman/sync.c:167
 #, c-format
 msgid "Packages to keep:\n"
-msgstr ""
-"Paketi za zadržati: \n"
-"\n"
+msgstr "Paketi za zadržati: \n\n"
 
 #: src/pacman/sync.c:169
 #, c-format
 msgid "  All locally installed packages\n"
-msgstr ""
-"  Svi lokalno instalirani paketi\n"
-"\n"
+msgstr "  Svi lokalno instalirani paketi\n\n"
 
 #: src/pacman/sync.c:172
 #, c-format
@@ -1494,17 +1329,12 @@ msgstr "Želite li ukloniti SVE datoteke iz cache-a?"
 #: src/pacman/sync.c:195
 #, c-format
 msgid "removing all files from cache...\n"
-msgstr ""
-"uklanjam sve datoteke iz privremene memorije...\n"
-"\n"
-"\n"
+msgstr "uklanjam sve datoteke iz privremene memorije...\n\n\n"
 
 #: src/pacman/sync.c:201
 #, c-format
 msgid "could not access cache directory %s\n"
-msgstr ""
-"ne mogu pristupiti direktoriju privremene memorije %s\n"
-"\n"
+msgstr "ne mogu pristupiti direktoriju privremene memorije %s\n\n"
 
 #: src/pacman/sync.c:424
 #, c-format
@@ -1532,16 +1362,12 @@ msgstr "baza podataka nije nađena: %s\n"
 #: src/pacman/sync.c:667
 #, c-format
 msgid "'%s' is a file, did you mean %s instead of %s?\n"
-msgstr ""
-"'%s' je datoteka, mislite li %s umjesto %s?\n"
-"\n"
+msgstr "'%s' je datoteka, mislite li %s umjesto %s?\n\n"
 
 #: src/pacman/sync.c:697
 #, c-format
 msgid "Starting full system upgrade...\n"
-msgstr ""
-"Započinjem punu nadogradnju sustava...\n"
-"\n"
+msgstr "Započinjem punu nadogradnju sustava...\n\n"
 
 #: src/pacman/sync.c:717
 #, c-format
@@ -1561,9 +1387,7 @@ msgstr "paket %s nema valjanu arhitekturu\n"
 #: src/pacman/sync.c:759
 #, c-format
 msgid "%s and %s are in conflict\n"
-msgstr ""
-"%s i %s su u sukobu\n"
-"\n"
+msgstr "%s i %s su u sukobu\n\n"
 
 #: src/pacman/sync.c:763
 #, c-format
@@ -1593,9 +1417,7 @@ msgstr "%s postoji u oba '%s' i '%s'\n"
 #: src/pacman/sync.c:823
 #, c-format
 msgid "%s: %s exists in filesystem\n"
-msgstr ""
-"%s: %s postoji u datotečnom sustavu\n"
-"\n"
+msgstr "%s: %s postoji u datotečnom sustavu\n\n"
 
 #: src/pacman/sync.c:836
 #, c-format
@@ -1610,9 +1432,7 @@ msgstr "Došlo je do greške,paketi nisu nadograđeni.\n"
 #: src/pacman/sync.c:889
 #, c-format
 msgid "Synchronizing package databases...\n"
-msgstr ""
-"Sinkroniziram baze podataka paketa...\n"
-"\n"
+msgstr "Sinkroniziram baze podataka paketa...\n\n"
 
 #: src/pacman/upgrade.c:56
 #, c-format
@@ -1654,9 +1474,7 @@ msgstr "nijedan upotrebljivi repozitorij paketa nije konfiguriran.\n"
 #: src/pacman/util.c:138
 #, c-format
 msgid "database '%s' is not valid (%s)\n"
-msgstr ""
-"baza podataka '%s' nije valjana (%s)\n"
-"\n"
+msgstr "baza podataka '%s' nije valjana (%s)\n\n"
 
 #: src/pacman/util.c:157
 #, c-format
@@ -1666,9 +1484,7 @@ msgstr "neuspjelo ažuriranje %s (%s)\n"
 #: src/pacman/util.c:160
 #, c-format
 msgid " %s is up to date\n"
-msgstr ""
-" %s je ažuriran\n"
-"\n"
+msgstr " %s je ažuriran\n\n"
 
 #: src/pacman/util.c:172
 #, c-format
@@ -1808,9 +1624,7 @@ msgstr "Opcionalne zavisnosti za %s\n"
 #: src/pacman/util.c:1266
 #, c-format
 msgid "Repository %s\n"
-msgstr ""
-"Repozitorij%s\n"
-"\n"
+msgstr "Repozitorij%s\n\n"
 
 #: src/pacman/util.c:1306
 #, c-format
diff --git a/src/pacman/po/hu.po b/src/pacman/po/hu.po
index da4d6490..0e04bc2d 100644
--- a/src/pacman/po/hu.po
+++ b/src/pacman/po/hu.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # György Balló <ballogy@freestart.hu>, 2014
 # Gábor Nagy <ngaba@bibl.u-szeged.hu>, 2011,2013
@@ -15,12 +15,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 03:30+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Hungarian (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/hu/)\n"
-"Language: hu\n"
+"Language-Team: Hungarian (http://www.transifex.com/toofishes/archlinux-pacman/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
@@ -171,19 +170,17 @@ msgstr "A(z) %s és a(z) %s ütközik egymással. Eltávolítja a(z) %s csomagot
 #: src/pacman/callback.c:417
 #, c-format
 msgid "%s and %s are in conflict (%s). Remove %s?"
-msgstr ""
-"A(z) %s és a(z) %s ütközik egymással (%s). Eltávolítja a(z) %s csomagot?"
+msgstr "A(z) %s és a(z) %s ütközik egymással (%s). Eltávolítja a(z) %s csomagot?"
 
 #: src/pacman/callback.c:436
 #, c-format
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Az alábbi csomagot nem lehet telepíteni feloldhatatlan függőségek miatt:\n"
-msgstr[1] ""
-"Az alábbi csomagokat nem lehet telepíteni feloldhatatlan függőségek miatt:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Az alábbi csomagot nem lehet telepíteni feloldhatatlan függőségek miatt:\n"
+msgstr[1] "Az alábbi csomagokat nem lehet telepíteni feloldhatatlan függőségek miatt:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -204,9 +201,7 @@ msgstr[1] ""
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"A %s fájl sérült (%s).\n"
-"Szeretné törölni?"
+msgstr "A %s fájl sérült (%s).\nSzeretné törölni?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -395,17 +390,13 @@ msgstr "%s konfigurációs fájl, %d. sor: érvénytelen érték ehhez: '%s' : '
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"%s konfigurációs fájl, %d. sor: a(z) '%s' opció érvénytelen, nincs aláírás-"
-"támogatás\n"
+msgstr "%s konfigurációs fájl, %d. sor: a(z) '%s' opció érvénytelen, nincs aláírás-támogatás\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"%s konfigurációs fájl, %d. sor: ismeretlen '%s' direktíva a(z) '%s' "
-"szekcióban.\n"
+msgstr "%s konfigurációs fájl, %d. sor: ismeretlen '%s' direktíva a(z) '%s' szekcióban.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
@@ -432,9 +423,7 @@ msgstr "nem sikerült hozzáadni a(z) '%s' tükröt a(z) '%s' adatbázishoz (%s)
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"az alpm függvénytár inicializálása sikertelen\n"
-"(%s: %s)\n"
+msgstr "az alpm függvénytár inicializálása sikertelen\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -469,20 +458,17 @@ msgstr ""
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"%s konfigurációs fájl, %d. sor: a '%s' opció '%s' értéke nem értelmezhető\n"
+msgstr "%s konfigurációs fájl, %d. sor: a '%s' opció '%s' értéke nem értelmezhető\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
-"%s konfigurációs fájl, %d. sor: a '%s' direktívának értéket kell adni\n"
+msgstr "%s konfigurációs fájl, %d. sor: a '%s' direktívának értéket kell adni\n"
 
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"a beállítás értelmezése meghaladta a maximális %d rekurzív mélységet.\n"
+msgstr "a beállítás értelmezése meghaladta a maximális %d rekurzív mélységet.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -492,9 +478,7 @@ msgstr "a %s konfigurációs fájl nem olvasható: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"%s konfigurációs fájl, %d. sor: Minden direktívának egy szekcióhoz kell "
-"tartoznia.\n"
+msgstr "%s konfigurációs fájl, %d. sor: Minden direktívának egy szekcióhoz kell tartoznia.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -515,8 +499,7 @@ msgstr "nem sikerült beállítani a telepítés okát a(z) %s csomaghoz (%s)\n"
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
-"%s: a telepítés okát beállítottam arra, hogy 'függőségként telepítve'\n"
+msgstr "%s: a telepítés okát beállítottam arra, hogy 'függőségként telepítve'\n"
 
 #: src/pacman/database.c:80
 #, c-format
@@ -765,16 +748,14 @@ msgstr "műveletek:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"a '%s {-h --help}' után egy műveletet megadva a vonatkozó opciókat kapjuk\n"
+msgstr "\na '%s {-h --help}' után egy műveletet megadva a vonatkozó opciókat kapjuk\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        csomagok és az azokat igénylő csomagok eltávolítása\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        csomagok és az azokat igénylő csomagok eltávolítása\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -786,22 +767,17 @@ msgstr "  -n, --nosave         törölje a konfigurációs fájlokat\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      a feleslegessé váló függőségeket is távolítsa el\n"
-"                       (-ss a kézzel telepített függőségeket is "
-"eltávolítja)\n"
+msgstr "  -s, --recursive      a feleslegessé váló függőségeket is távolítsa el\n                       (-ss a kézzel telepített függőségeket is eltávolítja)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
 msgid "  -u, --unneeded       remove unneeded packages\n"
-msgstr ""
-"  -u, --unneeded       más csomag által nem igényelt csomagok eltávolítása\n"
+msgstr "  -u, --unneeded       más csomag által nem igényelt csomagok eltávolítása\n"
 
 #: src/pacman/pacman.c:132 src/pacman/pacman.c:167
 #, c-format
 msgid "      --needed         do not reinstall up to date packages\n"
-msgstr ""
-"      --needed         a naprakész csomagok ne legyenek újratelepítve\n"
+msgstr "      --needed         a naprakész csomagok ne legyenek újratelepítve\n"
 
 #: src/pacman/pacman.c:137
 #, c-format
@@ -812,14 +788,12 @@ msgstr "  -c, --changelog      egy csomag változási naplójának megtekintése
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           a függőségként telepített csomagok listázása [szűrő]\n"
+msgstr "  -d, --deps           a függőségként telepített csomagok listázása [szűrő]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       a kézzel telepített csomagok listázása [szűrő]\n"
+msgstr "  -e, --explicit       a kézzel telepített csomagok listázása [szűrő]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -828,46 +802,34 @@ msgstr "  -g, --groups         egy csoport összes tagjának megtekintése\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           csomaginformációk megtekintése (-ii: backup fájlok "
-"is)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           csomaginformációk megtekintése (-ii: backup fájlok is)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          a csomag(ok) által telepített fájlok jelenlétének\n"
-"                       ellenőrzése (-kk: a fájlok módosításainak "
-"vizsgálata)\n"
+msgstr "  -k, --check          a csomag(ok) által telepített fájlok jelenlétének\n                       ellenőrzése (-kk: a fájlok módosításainak vizsgálata)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"  -l, --list           a lekérdezett csomag által tulajdonolt fájlok "
-"listája\n"
+msgstr "  -l, --list           a lekérdezett csomag által tulajdonolt fájlok listája\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        a távoli tárolókban nem található telepített\n"
-"                       csomagok listázása [szűrő]\n"
+msgstr "  -m, --foreign        a távoli tárolókban nem található telepített\n                       csomagok listázása [szűrő]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         csak a távoli tárolókban is megtalálható telepített\n"
-"                       csomagok listázása [szűrő]\n"
+msgstr "  -n, --native         csak a távoli tárolókban is megtalálható telepített\n                       csomagok listázása [szűrő]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -877,15 +839,12 @@ msgstr "  -o, --owns <fájl>    a <fájl>-t tartalmazó csomag lekérdezése\n"
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"  -p, --file <csomag>  egy csomagfájl lekérdezése az adatbázis helyett\n"
+msgstr "  -p, --file <csomag>  egy csomagfájl lekérdezése az adatbázis helyett\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          kevesebb információ megjelenítése\n"
-"                       lekérdezésnél és keresésnél\n"
+msgstr "  -q, --quiet          kevesebb információ megjelenítése\n                       lekérdezésnél és keresésnél\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
@@ -899,9 +858,7 @@ msgstr "  -s, --search <regex> keresés a helyileg telepített csomagok között
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     más csomagok által (opcionálisan) nem igényelt\n"
-"                       csomagok listája (-tt: optdepends mellőzése) [szűrő]\n"
+msgstr "  -t, --unrequired     más csomagok által (opcionálisan) nem igényelt\n                       csomagok listája (-tt: optdepends mellőzése) [szűrő]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -913,27 +870,21 @@ msgstr "  -u, --upgrades       az elavult csomagok listázása [szűrő]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          a régi csomagok törlése a gyorsítótár-könyvtárból\n"
-"                       (használja a '-cc'-t az összeshez)\n"
+msgstr "  -c, --clean          a régi csomagok törlése a gyorsítótár-könyvtárból\n                       (használja a '-cc'-t az összeshez)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         egy csomagcsoport összes tagjának megtekintése\n"
-"                       (-gg: az összes csoport és tagjainak megtekintése)\n"
+msgstr "  -g, --groups         egy csomagcsoport összes tagjának megtekintése\n                       (-gg: az összes csoport és tagjainak megtekintése)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info           csomaginformáció megtekintése (-ii: kibővített\n"
-"                       információk)\n"
+msgstr "  -i, --info           csomaginformáció megtekintése (-ii: kibővített\n                       információk)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -942,18 +893,14 @@ msgstr "  -l, --list <tároló>  egy tároló csomagjainak listázása\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr "  -s, --search <regex> keresés a távoli tárolókban\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     telepített csomagok frissítése (-uu: "
-"visszafejlesztések\n"
-"                       engedélyezése)\n"
+msgstr "  -u, --sysupgrade     telepített csomagok frissítése (-uu: visszafejlesztések\n                       engedélyezése)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
@@ -967,15 +914,12 @@ msgstr "  -w, --downloadonly   csak letöltés, de nem telepít/frissít semmit\
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        friss csomagadatbázisok letöltése a szerverről\n"
-"                       (-yy: frissítés kényszerítése akkor is, ha friss)\n"
+msgstr "  -y, --refresh        friss csomagadatbázisok letöltése a szerverről\n                       (-yy: frissítés kényszerítése akkor is, ha friss)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         csomagok megjelölése függőségként telepítettként\n"
+msgstr "      --asdeps         csomagok megjelölése függőségként telepítettként\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
@@ -1009,8 +953,7 @@ msgstr ""
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          a telepítés kényszerítése, ütköző fájlok felülírása\n"
+msgstr "      --force          a telepítés kényszerítése, ütköző fájlok felülírása\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
@@ -1020,59 +963,46 @@ msgstr "      --asdeps         csomagok telepítése 'függőség' jelöléssel\
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     csomagok telepítése 'kézzel telepítve' jelöléssel\n"
+msgstr "      --asexplicit     csomagok telepítése 'kézzel telepítve' jelöléssel\n"
 
 #: src/pacman/pacman.c:194
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <csomag>\n"
-"                       csomagfrissítés mellőzése (többször is használható)\n"
+msgstr "      --ignore <csomag>\n                       csomagfrissítés mellőzése (többször is használható)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <csoport>\n"
-"                       csoportfrissítés mellőzése (többször is használható)\n"
+msgstr "      --ignoregroup <csoport>\n                       csoportfrissítés mellőzése (többször is használható)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         függőségverzió-ellenőrzések kihagyása\n"
-"                       (-dd: minden függőségellenőrzés kihagyása)\n"
+msgstr "  -d, --nodeps         függőségverzió-ellenőrzések kihagyása\n                       (-dd: minden függőségellenőrzés kihagyása)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <package=version>\n"
-"                       virtuális csomag hozzáadása függőségek "
-"teljesítéséhez\n"
+msgstr "      --assume-installed <package=version>\n                       virtuális csomag hozzáadása függőségek teljesítéséhez\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         csak adatbázis-bejegyzést módosítson, csomagfájlt ne\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         csak adatbázis-bejegyzést módosítson, csomagfájlt ne\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  ne mutasson folyamatsávot a fájlok letöltése közben\n"
+msgstr "      --noprogressbar  ne mutasson folyamatsávot a fájlok letöltése közben\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
@@ -1085,30 +1015,24 @@ msgstr "      --noscriptlet    ne futtassa az install szkripteket, ha van\n"
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          célok kiírása a műveletek végrehajtása helyett\n"
+msgstr "  -p, --print          célok kiírása a műveletek végrehajtása helyett\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <sztring>\n"
-"                       a megadott formátum használata csomaglistázás során\n"
+msgstr "      --print-format <sztring>\n                       a megadott formátum használata csomaglistázás során\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
-msgstr ""
-"  -b, --dbpath <útvonal>\n"
-"                       alternatív adatbáziskönyvtár beállítása\n"
+msgstr "  -b, --dbpath <útvonal>\n                       alternatív adatbáziskönyvtár beállítása\n"
 
 #: src/pacman/pacman.c:212
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
-msgstr ""
-"  -r, --root <útvonal> alternatív telepítési gyökérkönyvtár beállítása\n"
+msgstr "  -r, --root <útvonal> alternatív telepítési gyökérkönyvtár beállítása\n"
 
 #: src/pacman/pacman.c:213
 #, c-format
@@ -1123,9 +1047,7 @@ msgstr "      --arch <arch>    alternatív architektúra beállítása\n"
 #: src/pacman/pacman.c:215
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <könyvtár> \n"
-"                       alternatív csomaggyorsítótár-könyvtár beállítása\n"
+msgstr "      --cachedir <könyvtár> \n                       alternatív csomaggyorsítótár-könyvtár beállítása\n"
 
 #: src/pacman/pacman.c:216
 #, c-format
@@ -1140,9 +1062,7 @@ msgstr "      --color <mikor>  színes kimenet\n"
 #: src/pacman/pacman.c:218
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
-msgstr ""
-"      --config <útvonal>\n"
-"                       alternatív konfigurációs fájl beállítása\n"
+msgstr "      --config <útvonal>\n                       alternatív konfigurációs fájl beállítása\n"
 
 #: src/pacman/pacman.c:219
 #, c-format
@@ -1152,16 +1072,12 @@ msgstr "      --debug          hibakeresési üzenetek megjelenítése\n"
 #: src/pacman/pacman.c:220
 #, c-format
 msgid "      --gpgdir <path>  set an alternate home directory for GnuPG\n"
-msgstr ""
-"      --gpgdir <útvonal>\n"
-"                       alternatív saját könyvtár beállítása a GnuPG-hez\n"
+msgstr "      --gpgdir <útvonal>\n                       alternatív saját könyvtár beállítása a GnuPG-hez\n"
 
 #: src/pacman/pacman.c:221
 #, c-format
 msgid "      --logfile <path> set an alternate log file\n"
-msgstr ""
-"      --logfile <útvonal>\n"
-"                       alternatív naplófájl beállítása\n"
+msgstr "      --logfile <útvonal>\n                       alternatív naplófájl beállítása\n"
 
 #: src/pacman/pacman.c:222
 #, c-format
@@ -1178,9 +1094,7 @@ msgstr "      --confirm        mindig kérjen megerősítést\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Ez a program szabadon terjeszthető a GNU\n"
-"                       General Public License feltételei szerint.\n"
+msgstr "                       Ez a program szabadon terjeszthető a GNU\n                       General Public License feltételei szerint.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1539,9 +1453,7 @@ msgstr "nem zárolható az adatbázis: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  ha biztos benne, hogy nem fut másik csomagkezelő,\n"
-"  akkor eltávolíthatja a %s fájlt\n"
+msgstr "  ha biztos benne, hogy nem fut másik csomagkezelő,\n  akkor eltávolíthatja a %s fájlt\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/id.po b/src/pacman/po/id.po
index 1c3b672e..964142ff 100644
--- a/src/pacman/po/id.po
+++ b/src/pacman/po/id.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Ibnu Daru Aji, 2013
 # Gregori, 2013
 # Ibnu Daru Aji, 2013-2014
-# Ibnu Daru Aji, 2013
+# Ibnu Daru Aji, 2013,2016
 # Ibnu Daru Aji, 2016
 msgid ""
 msgstr ""
@@ -15,12 +15,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 09:46+0000\n"
 "Last-Translator: Ibnu Daru Aji\n"
-"Language-Team: Indonesian (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/id/)\n"
-"Language: id\n"
+"Language-Team: Indonesian (http://www.transifex.com/toofishes/archlinux-pacman/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/pacman/callback.c:182
@@ -178,7 +177,8 @@ msgstr "%s dan %s konflik (%s). Hapus %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
 msgstr[0] "Paket berikut tidak dapat diupgrade karena masalah dependensi:\n"
 
 #: src/pacman/callback.c:442
@@ -198,9 +198,7 @@ msgstr[0] "Ada %zu penyedia yang tersedia untuk %s:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"File %s korup (%s).\n"
-"Apakah anda ingin menghapusnya?"
+msgstr "File %s korup (%s).\nApakah anda ingin menghapusnya?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -385,17 +383,13 @@ msgstr "berkas konfigurasi %s, baris %d: nilai invalid pada '%s' : '%s'\n"
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"berkas konfigurasi %s, baris %d: '%s' opsi tidak valid, tidak ada dukungan "
-"signature\n"
+msgstr "berkas konfigurasi %s, baris %d: '%s' opsi tidak valid, tidak ada dukungan signature\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"berkas konfigurasi %s, baris %d: direktif '%s' pada bagian '%s' tidak "
-"dikenal.\n"
+msgstr "berkas konfigurasi %s, baris %d: direktif '%s' pada bagian '%s' tidak dikenal.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
@@ -422,9 +416,7 @@ msgstr "tidak dapat menambahkan mirror '%s' pada database '%s' (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"gagal memulai pustaka alpm\n"
-"(%s: %s)\n"
+msgstr "gagal memulai pustaka alpm\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -479,9 +471,7 @@ msgstr "berkas konfigurasi %s tidak dapat dibaca: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"berkas konfigurasi %s, baris %d: Semua arahan harus mengarah pada sebuah "
-"seksi.\n"
+msgstr "berkas konfigurasi %s, baris %d: Semua arahan harus mengarah pada sebuah seksi.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -492,8 +482,7 @@ msgstr "tidak ada target yang ditentukan (gunakan -h untuk bantuan)\n"
 #: src/pacman/database.c:59
 #, c-format
 msgid "no install reason specified (use -h for help)\n"
-msgstr ""
-"tidak ada alasan pemasangan yang ditentukan (gunakan -h untuk bantuan)\n"
+msgstr "tidak ada alasan pemasangan yang ditentukan (gunakan -h untuk bantuan)\n"
 
 #: src/pacman/database.c:73
 #, c-format
@@ -752,16 +741,14 @@ msgstr "operasi:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"gunakan '%s {-h --help}' dengan sebuah operasi untuk opsi tersedia\n"
+msgstr "\ngunakan '%s {-h --help}' dengan sebuah operasi untuk opsi tersedia\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"-c, --cascade menghapus paket dan semua paket yang tergantung padanya\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "-c, --cascade menghapus paket dan semua paket yang tergantung padanya\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -773,9 +760,7 @@ msgstr "-n, --nosave hapus berkas konfigurasi\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"-s, --recursive hapus dependensi yang tak dibutuhkan\n"
-"(-ss termasuk dependensi terpasang eksplisit)\n"
+msgstr "-s, --recursive hapus dependensi yang tak dibutuhkan\n(-ss termasuk dependensi terpasang eksplisit)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -810,8 +795,7 @@ msgstr "-g, --groups melihat semua anggota dari grup paket\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
 msgstr "-i, --info melihat informasi paket (-ii untuk berkas cadangan)\n"
 
 #: src/pacman/pacman.c:142
@@ -819,9 +803,7 @@ msgstr "-i, --info melihat informasi paket (-ii untuk berkas cadangan)\n"
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"-k, --check memeriksa berkas paket tersebut ada atau tidak (-kk untuk "
-"properti berkas)\n"
+msgstr "-k, --check memeriksa berkas paket tersebut ada atau tidak (-kk untuk properti berkas)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
@@ -833,18 +815,14 @@ msgstr "-l, --list daftar dari berkas yang dimiliki oleh paket terkueri\n"
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"-m, --foreign daftar paket terpasang yang tidak terdapat pada db(s) "
-"sinkronisasi [filter]\n"
+msgstr "-m, --foreign daftar paket terpasang yang tidak terdapat pada db(s) sinkronisasi [filter]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"-n, --native daftar paket yang hanya terdapa pada db(s) sinkronisasi "
-"[filter]\n"
+msgstr "-n, --native daftar paket yang hanya terdapa pada db(s) sinkronisasi [filter]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -859,27 +837,21 @@ msgstr "-p, --file <paket> mencari berkas paket daripada database\n"
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"-q, --quiet perlihatkan informasi yang lebih sedikit untuk pencarian dan "
-"pendaftaran\n"
+msgstr "-q, --quiet perlihatkan informasi yang lebih sedikit untuk pencarian dan pendaftaran\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"-s, --search <regex> mencari paket yang terpasang lokal yang sesuai dengan "
-"string\n"
+msgstr "-s, --search <regex> mencari paket yang terpasang lokal yang sesuai dengan string\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"-t, --unrequired daftar paket yang tidak (opsional) dibutuhkan oleh paket\n"
-"manapun (-tt untuk mengabaikan optdepends) [filter]\n"
+msgstr "-t, --unrequired daftar paket yang tidak (opsional) dibutuhkan oleh paket\nmanapun (-tt untuk mengabaikan optdepends) [filter]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -898,9 +870,7 @@ msgstr "-c, --clean hapus paket lama dari direktori cache (-cc untuk semua)\n"
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"-g, --groups melihat semua anggota dari grup paket\n"
-"(-gg untuk melihat semua grup dan anggota)\n"
+msgstr "-g, --groups melihat semua anggota dari grup paket\n(-gg untuk melihat semua grup dan anggota)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
@@ -916,35 +886,28 @@ msgstr "-l, --list <repo> melihat daftar paket pada repositori\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"-s, --search <regex> mencari pada repositori remote yang sama dengan string\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "-s, --search <regex> mencari pada repositori remote yang sama dengan string\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"-u, --sysupgrade meningkatkan paket terpasang (-uu untuk mengaktifkan "
-"penurunan)\n"
+msgstr "-u, --sysupgrade meningkatkan paket terpasang (-uu untuk mengaktifkan penurunan)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"-w, --downloadonly mengunduh paket namun tidak dipasang/tingkatkan apapun\n"
+msgstr "-w, --downloadonly mengunduh paket namun tidak dipasang/tingkatkan apapun\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"-y, --refresh mengunduh database paket baru dari server\n"
-"(-yy untuk memaksa penyegaran bahkan jika sudah terbaru)\n"
+msgstr "-y, --refresh mengunduh database paket baru dari server\n(-yy untuk memaksa penyegaran bahkan jika sudah terbaru)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -961,9 +924,7 @@ msgstr "--asexplicit tandai paket sebagai dipasang eksplisit\n"
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"-k, --check memeriksa validitas basis data loka (-kk untuk sinkronisasi "
-"basis data)\n"
+msgstr "-k, --check memeriksa validitas basis data loka (-kk untuk sinkronisasi basis data)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
@@ -980,9 +941,7 @@ msgstr "-x, --regex melakukan pencarian menggunakan regular expressions\n"
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"--machinereadable\n"
-"hasilkan keluaran untuk mesin\n"
+msgstr "--machinereadable\nhasilkan keluaran untuk mesin\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
@@ -1004,41 +963,32 @@ msgstr "--asexplicit pasang paket sebagai pasang eksplisit\n"
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"--ignore <paket> mengabaikan sebuah paket untuk ditingkatkan (bisa digunakan "
-"lebih dari satu kali)\n"
+msgstr "--ignore <paket> mengabaikan sebuah paket untuk ditingkatkan (bisa digunakan lebih dari satu kali)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"--ignoregroup <grup>\n"
-"mengabaikan peningkatan grup (dapat digunakan lebih dari sekali)\n"
+msgstr "--ignoregroup <grup>\nmengabaikan peningkatan grup (dapat digunakan lebih dari sekali)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"-d, --nodeps lewati pemeriksaan veri dependensi (-dd untuk melewati semua "
-"pemeriksaan)\n"
+msgstr "-d, --nodeps lewati pemeriksaan veri dependensi (-dd untuk melewati semua pemeriksaan)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"--assume-installed <package=version>\n"
-"tambahkan sebuah paket virtual untuk mencukupkan ketergantungan\n"
+msgstr "--assume-installed <package=version>\ntambahkan sebuah paket virtual untuk mencukupkan ketergantungan\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
 msgstr "--dbonly hanya modifikasi masukan database, bukan berkas paket\n"
 
 #: src/pacman/pacman.c:203
@@ -1065,9 +1015,7 @@ msgstr "-p, --print cetak target daripada melakukan operasi\n"
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"--print-format <string>\n"
-"menentukan aturan pencetakan target\n"
+msgstr "--print-format <string>\nmenentukan aturan pencetakan target\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1139,9 +1087,7 @@ msgstr "--confirm selalu minta konfirmasi\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"Program ini bebas didistribusikan ulang dibawah\n"
-"batasan GNU General Public License.\n"
+msgstr "Program ini bebas didistribusikan ulang dibawah\nbatasan GNU General Public License.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1499,9 +1445,7 @@ msgstr "tidak dapat mengunci database: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"jika anda yakin manajer paket tidak berjalan\n"
-"anda bisa menghapus %s\n"
+msgstr "jika anda yakin manajer paket tidak berjalan\nanda bisa menghapus %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/is.po b/src/pacman/po/is.po
index 9828d049..ecb45850 100644
--- a/src/pacman/po/is.po
+++ b/src/pacman/po/is.po
@@ -1,9 +1,10 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Kristján Magnússon, 2016
+# Kristján Magnússon, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
@@ -11,12 +12,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-27 21:23+0000\n"
 "Last-Translator: Kristján Magnússon\n"
-"Language-Team: Icelandic (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/is/)\n"
-"Language: is\n"
+"Language-Team: Icelandic (http://www.transifex.com/toofishes/archlinux-pacman/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
 #: src/pacman/callback.c:182
@@ -174,7 +174,8 @@ msgstr ""
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -749,7 +750,8 @@ msgstr ""
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
 msgstr ""
 
 #: src/pacman/pacman.c:126
@@ -797,8 +799,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
 msgstr ""
 
 #: src/pacman/pacman.c:142
@@ -889,8 +890,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
 
 #: src/pacman/pacman.c:163
@@ -992,8 +992,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
 msgstr ""
 
 #: src/pacman/pacman.c:203
diff --git a/src/pacman/po/it.po b/src/pacman/po/it.po
index aa8f3006..99ec7abd 100644
--- a/src/pacman/po/it.po
+++ b/src/pacman/po/it.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrea Scarpino <inactive+bash@transifex.com>, 2011-2012,2014
 # Andrea Scarpino <inactive+bash@transifex.com>, 2014
@@ -17,12 +17,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 20:28+0000\n"
 "Last-Translator: Saverio <saverio.brancaccio@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/it/)\n"
-"Language: it\n"
+"Language-Team: Italian (http://www.transifex.com/toofishes/archlinux-pacman/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
@@ -180,13 +179,10 @@ msgstr "%s e %s vanno in conflitto (%s). Vuoi rimuovere %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Il seguente pacchetto non può essere aggiornato a causa di alcune dipendenze "
-"irrisolvibili:\n"
-msgstr[1] ""
-"I seguenti pacchetti non possono essere aggiornati a causa di alcune "
-"dipendenze irrisolvibili:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Il seguente pacchetto non può essere aggiornato a causa di alcune dipendenze irrisolvibili:\n"
+msgstr[1] "I seguenti pacchetti non possono essere aggiornati a causa di alcune dipendenze irrisolvibili:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -207,9 +203,7 @@ msgstr[1] "Ci sono %zu fornitori disponibili per %s\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Il file %s è corrotto (%s).\n"
-"Vuoi eliminarlo?"
+msgstr "Il file %s è corrotto (%s).\nVuoi eliminarlo?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -393,29 +387,23 @@ msgstr "impossibile ripristinare la directory di lavoro (%s)\n"
 #: src/pacman/conf.c:397 src/pacman/conf.c:447 src/pacman/conf.c:541
 #, c-format
 msgid "config file %s, line %d: invalid value for '%s' : '%s'\n"
-msgstr ""
-"file di configurazione %s, riga %d: valore non valido per '%s' : '%s'\n"
+msgstr "file di configurazione %s, riga %d: valore non valido per '%s' : '%s'\n"
 
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"file di configurazione %s, riga %d: '%s' opzione non valida, nessun supporto "
-"della firma\n"
+msgstr "file di configurazione %s, riga %d: '%s' opzione non valida, nessun supporto della firma\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"file di configurazione %s, riga %d: la direttiva '%s' presente nella sezione "
-"'%s' non è stata riconosciuta.\n"
+msgstr "file di configurazione %s, riga %d: la direttiva '%s' presente nella sezione '%s' non è stata riconosciuta.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"il mirror '%s' contiene la variabile '%s', ma non è stato definito '%s'\n"
+msgstr "il mirror '%s' contiene la variabile '%s', ma non è stato definito '%s'\n"
 
 #: src/pacman/conf.c:641
 #, c-format
@@ -437,9 +425,7 @@ msgstr "impossibile aggiungere il mirror '%s' al database '%s' (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"impossibile inizializzare la libreria alpm\n"
-"(%s: %s)\n"
+msgstr "impossibile inizializzare la libreria alpm\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -449,15 +435,12 @@ msgstr "prova ad avviare pacman-db-upgrade\n"
 #: src/pacman/conf.c:744
 #, c-format
 msgid "problem setting logfile '%s' (%s)\n"
-msgstr ""
-"si è verificato un errore durante l'impostazione del file di log '%s' (%s)\n"
+msgstr "si è verificato un errore durante l'impostazione del file di log '%s' (%s)\n"
 
 #: src/pacman/conf.c:754
 #, c-format
 msgid "problem setting gpgdir '%s' (%s)\n"
-msgstr ""
-"si è verificato un errore durante l'impostazione della directory gpg "
-"'%s' (%s)\n"
+msgstr "si è verificato un errore durante l'impostazione della directory gpg '%s' (%s)\n"
 
 #: src/pacman/conf.c:763 src/pacman/conf.c:771
 #, c-format
@@ -482,15 +465,12 @@ msgstr "file di configurazione %s, linea %d: '%s' opzione '%s' sconosciuta\n"
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
-"file di configurazione %s, riga %d: la direttiva '%s' necessita di un "
-"valore\n"
+msgstr "file di configurazione %s, riga %d: la direttiva '%s' necessita di un valore\n"
 
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"l'analisi della configurazione ha superato la profondità massima di %d.\n"
+msgstr "l'analisi della configurazione ha superato la profondità massima di %d.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -500,9 +480,7 @@ msgstr "il file di configurazione %s non può essere letto: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"file di configurazione %s, linea %d: tutte le direttive devono appartenere "
-"ad una sezione.\n"
+msgstr "file di configurazione %s, linea %d: tutte le direttive devono appartenere ad una sezione.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -513,29 +491,22 @@ msgstr "non è stato specificato nessun pacchetto (usa -h per un aiuto)\n"
 #: src/pacman/database.c:59
 #, c-format
 msgid "no install reason specified (use -h for help)\n"
-msgstr ""
-"non è stato specificato nessun motivo per l'installazione (usa -h per un "
-"aiuto)\n"
+msgstr "non è stato specificato nessun motivo per l'installazione (usa -h per un aiuto)\n"
 
 #: src/pacman/database.c:73
 #, c-format
 msgid "could not set install reason for package %s (%s)\n"
-msgstr ""
-"impossibile impostare un motivo per l'installazione del pacchetto %s (%s)\n"
+msgstr "impossibile impostare un motivo per l'installazione del pacchetto %s (%s)\n"
 
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
-"%s: il motivo dell'installazione è stato impostato come 'installato come "
-"dipendenza'\n"
+msgstr "%s: il motivo dell'installazione è stato impostato come 'installato come dipendenza'\n"
 
 #: src/pacman/database.c:80
 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
-msgstr ""
-"%s: il motivo dell'installazione è stato impostato come 'installato "
-"esplicitamente'\n"
+msgstr "%s: il motivo dell'installazione è stato impostato come 'installato esplicitamente'\n"
 
 #: src/pacman/package.c:97
 #, c-format
@@ -779,17 +750,14 @@ msgstr "operazioni:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"usa '%s {-h --help}' con un'operazione per le opzioni disponibili\n"
+msgstr "\nusa '%s {-h --help}' con un'operazione per le opzioni disponibili\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        rimuove i pacchetti e tutti quelli che dipendono da "
-"essi\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        rimuove i pacchetti e tutti quelli che dipendono da essi\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -801,10 +769,7 @@ msgstr "  -n, --nosave         rimuove i file di configurazione\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      rimuove le dipendenze non necessarie\n"
-"                       (-ss include le dipendenze installate "
-"esplicitamente)\n"
+msgstr "  -s, --recursive      rimuove le dipendenze non necessarie\n                       (-ss include le dipendenze installate esplicitamente)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -825,16 +790,12 @@ msgstr "  -c, --changelog      mostra il changelog di un pacchetto\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           elenca i pacchetti installati come dipendenze "
-"[filtro]\n"
+msgstr "  -d, --deps           elenca i pacchetti installati come dipendenze [filtro]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       elenca i pacchetti installati esplicitamente "
-"[filtro]\n"
+msgstr "  -e, --explicit       elenca i pacchetti installati esplicitamente [filtro]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -843,20 +804,15 @@ msgstr "  -g, --groups         mostra tutti i pacchetti di un gruppo\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           mostra le informazioni del pacchetto (-ii per i file "
-"di backup)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           mostra le informazioni del pacchetto (-ii per i file di backup)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          controlla che i file del pacchetto esistono (-kk per "
-"le proprietà dei file)\n"
+msgstr "  -k, --check          controlla che i file del pacchetto esistono (-kk per le proprietà dei file)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
@@ -868,18 +824,14 @@ msgstr "-l, --list visualizza la lista dei file contenuti nel pacchetto\n"
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        elenca i pacchetti installati ma non trovati nei "
-"database [filtro]\n"
+msgstr "  -m, --foreign        elenca i pacchetti installati ma non trovati nei database [filtro]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         elenca solo i pacchetti installati presenti nei db(s) "
-"[filtro]\n"
+msgstr "  -n, --native         elenca solo i pacchetti installati presenti nei db(s) [filtro]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -889,33 +841,26 @@ msgstr "  -o, --owns <file>    interroga il pacchetto che contiene il <file>\n"
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"  -p, --file <package> interroga un file del pacchetto invece del database\n"
+msgstr "  -p, --file <package> interroga un file del pacchetto invece del database\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          mostra meno informazioni per la query e per la "
-"ricerca\n"
+msgstr "  -q, --quiet          mostra meno informazioni per la query e per la ricerca\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex> cerca nei pacchetti installati le stringhe "
-"corrispondenti\n"
+msgstr "  -s, --search <regex> cerca nei pacchetti installati le stringhe corrispondenti\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"-t, --unrequired visualizza i pacchetti non (opzionalmente) richiesti da "
-"alcun pacchetto (-tt per ignorare le dipendenze opzionali) [filtro]\n"
+msgstr "-t, --unrequired visualizza i pacchetti non (opzionalmente) richiesti da alcun pacchetto (-tt per ignorare le dipendenze opzionali) [filtro]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -927,181 +872,139 @@ msgstr "  -u, --upgrades       elenca i pacchetti non aggiornati [filtro]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          rimuove i vecchi pacchetti dalla cache\n"
-"                       (usa -cc per rimuoverli tutti)\n"
+msgstr "  -c, --clean          rimuove i vecchi pacchetti dalla cache\n                       (usa -cc per rimuoverli tutti)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"-g, --groups visualizza tutti i pacchetti appartenenti ad un gruppo\n"
-"(-gg per visualizzare tutti i gruppi e tutti i pacchetti)\n"
+msgstr "-g, --groups visualizza tutti i pacchetti appartenenti ad un gruppo\n(-gg per visualizzare tutti i gruppi e tutti i pacchetti)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"-i, --info visualizza le informazioni di un pacchetto (-ii per estendere "
-"tali le informazioni)\n"
+msgstr "-i, --info visualizza le informazioni di un pacchetto (-ii per estendere tali le informazioni)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr ""
-"  -l, --list <repo>    mostra la lista dei pacchetti di un repository\n"
+msgstr "  -l, --list <repo>    mostra la lista dei pacchetti di un repository\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <regex> cerca le stringhe corrispondenti nei repository "
-"remoti\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regex> cerca le stringhe corrispondenti nei repository remoti\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"-u, --sysupgrade aggiorna i pacchetti installati (-uu abilita i downgrade)\n"
+msgstr "-u, --sysupgrade aggiorna i pacchetti installati (-uu abilita i downgrade)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   scarica i pacchetti senza installarli/aggiornarli\n"
+msgstr "  -w, --downloadonly   scarica i pacchetti senza installarli/aggiornarli\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"-y --refresh scarica il database aggiornato dei pacchetti dal server\n"
-"(-yy per forzare un aggiornamento anche se il database è già aggiornato)\n"
+msgstr "-y --refresh scarica il database aggiornato dei pacchetti dal server\n(-yy per forzare un aggiornamento anche se il database è già aggiornato)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         marca i pacchetti come non esplicitamente installati\n"
+msgstr "      --asdeps         marca i pacchetti come non esplicitamente installati\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     marca i pacchetti come esplicitamente installati\n"
+msgstr "      --asexplicit     marca i pacchetti come esplicitamente installati\n"
 
 #: src/pacman/pacman.c:173
 #, c-format
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"-k, --check controlla la validità del database locale (-kk per sincronizzare "
-"i database)\n"
+msgstr "-k, --check controlla la validità del database locale (-kk per sincronizzare i database)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
-"-s, --search <file> cerca nei pacchetti i nomi dei file corrispondenti alle "
-"stringhe\n"
+msgstr "-s, --search <file> cerca nei pacchetti i nomi dei file corrispondenti alle stringhe\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
 msgid "  -x, --regex          enable searching using regular expressions\n"
-msgstr ""
-"-x, --regex abilita la ricerca all'utilizzo delle espressioni regolari\n"
+msgstr "-x, --regex abilita la ricerca all'utilizzo delle espressioni regolari\n"
 
 #: src/pacman/pacman.c:185
 #, c-format
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"--machinereadable\n"
-"fornisce l'output di machine-readable\n"
+msgstr "--machinereadable\nfornisce l'output di machine-readable\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          forza l'installazione, sovrascrive i file in "
-"conflitto\n"
+msgstr "      --force          forza l'installazione, sovrascrive i file in conflitto\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         installa i pacchetti come non esplicitamente "
-"installati\n"
+msgstr "      --asdeps         installa i pacchetti come non esplicitamente installati\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     installa i pacchetti come esplicitamente installati\n"
+msgstr "      --asexplicit     installa i pacchetti come esplicitamente installati\n"
 
 #: src/pacman/pacman.c:194
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg>   ignora l'aggiornamento di un pacchetto (può essere "
-"usato più volte)\n"
+msgstr "      --ignore <pkg>   ignora l'aggiornamento di un pacchetto (può essere usato più volte)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                       ignora l'aggiornamento di un gruppo (può essere usato "
-"più volte)\n"
+msgstr "      --ignoregroup <grp>\n                       ignora l'aggiornamento di un gruppo (può essere usato più volte)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         salta il controllo delle versioni delle dipendenze\n"
-"                       (-dd salta tutti i controlli)\n"
+msgstr "  -d, --nodeps         salta il controllo delle versioni delle dipendenze\n                       (-dd salta tutti i controlli)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"--assume-installed <package=version>\n"
-"aggiunge un pacchetto virtuale per soddisfare le dipendenze\n"
+msgstr "--assume-installed <package=version>\naggiunge un pacchetto virtuale per soddisfare le dipendenze\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         modifica solo le voci del database, non i file del "
-"pacchetto\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         modifica solo le voci del database, non i file del pacchetto\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  non mostra la barra di avanzamento durante il "
-"download dei file\n"
+msgstr "      --noprogressbar  non mostra la barra di avanzamento durante il download dei file\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
@@ -1114,31 +1017,24 @@ msgstr "      --noscriptlet    non esegue un eventuale script di install\n"
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          visualizza i pacchetti invece di effettuare "
-"l'operazione\n"
+msgstr "  -p, --print          visualizza i pacchetti invece di effettuare l'operazione\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                       specifica come i pacchetti dovrebbero essere "
-"elencati\n"
+msgstr "      --print-format <string>\n                       specifica come i pacchetti dovrebbero essere elencati\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
-msgstr ""
-"  -b, --dbpath <path>  imposta un percorso alternativo per il database\n"
+msgstr "  -b, --dbpath <path>  imposta un percorso alternativo per il database\n"
 
 #: src/pacman/pacman.c:212
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
-msgstr ""
-"  -r, --root <path>    imposta una root alternativa per l'installazione\n"
+msgstr "  -r, --root <path>    imposta una root alternativa per l'installazione\n"
 
 #: src/pacman/pacman.c:213
 #, c-format
@@ -1200,10 +1096,7 @@ msgstr "--confirm chiede sempre una conferma\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Questo programma può essere liberamente "
-"ridistribuito\n"
-"                       sotto i termini della GNU General Public License.\n"
+msgstr "                       Questo programma può essere liberamente ridistribuito\n                       sotto i termini della GNU General Public License.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1530,8 +1423,7 @@ msgstr "%s non è valido oppure è corrotto\n"
 #: src/pacman/sync.c:844
 #, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
-msgstr ""
-"Si sono verificati degli errori, nessun pacchetto è stato aggiornato.\n"
+msgstr "Si sono verificati degli errori, nessun pacchetto è stato aggiornato.\n"
 
 #: src/pacman/sync.c:889
 #, c-format
@@ -1563,9 +1455,7 @@ msgstr "impossibile bloccare il database: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  se sei sicuro che il gestore dei pacchetti non sia già\n"
-"  in esecuzione, puoi rimuovere %s\n"
+msgstr "  se sei sicuro che il gestore dei pacchetti non sia già\n  in esecuzione, puoi rimuovere %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/ja.po b/src/pacman/po/ja.po
index 4fcd6508..a06e4d3a 100644
--- a/src/pacman/po/ja.po
+++ b/src/pacman/po/ja.po
@@ -1,25 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # ABE Satoru <s@polamjag.info>, 2015
 #  <info@astaricsoft.net>, 2013
-# kusakata <shohei@kusakata.com>, 2015
-# kusakata <shohei@kusakata.com>, 2015-2016
+# kusakata, 2015
+# kusakata, 2015-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 07:10+0000\n"
-"Last-Translator: kusakata <shohei@kusakata.com>\n"
-"Language-Team: Japanese (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ja/)\n"
-"Language: ja\n"
+"Last-Translator: kusakata\n"
+"Language-Team: Japanese (http://www.transifex.com/toofishes/archlinux-pacman/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/pacman/callback.c:182
@@ -177,7 +176,8 @@ msgstr "%s と %s が衝突しています (%s)。%s を削除しますか?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
 msgstr[0] "依存関係を解決できないために以下のパッケージを更新できません:\n"
 
 #: src/pacman/callback.c:442
@@ -197,9 +197,7 @@ msgstr[0] "%zu 個の選択肢が %s にはあります:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"ファイル %s は破損しています (%s)。\n"
-"ファイルを削除しますか?"
+msgstr "ファイル %s は破損しています (%s)。\nファイルを削除しますか?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -390,15 +388,12 @@ msgstr "設定ファイル %s, %d 行: '%s' オプションは無効です\n"
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"設定ファイル %s, %d 行: セクション '%s' のディレクティブ '%s' が実行できませ"
-"ん。\n"
+msgstr "設定ファイル %s, %d 行: セクション '%s' のディレクティブ '%s' が実行できません。\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"ミラー '%s' に '%s' 変数が含まれていますが、'%s' が定義されていません。\n"
+msgstr "ミラー '%s' に '%s' 変数が含まれていますが、'%s' が定義されていません。\n"
 
 #: src/pacman/conf.c:641
 #, c-format
@@ -420,9 +415,7 @@ msgstr "ミラー '%s' をデータベース '%s' に追加できませんでし
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"alpm ライブラリの初期化に失敗しました\n"
-"(%s: %s)\n"
+msgstr "alpm ライブラリの初期化に失敗しました\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -477,9 +470,7 @@ msgstr "設定ファイル %s を読み込めませんでした: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"設定ファイル %s, %d 行: 全てのディレクティブはセクションに入れる必要がありま"
-"す。\n"
+msgstr "設定ファイル %s, %d 行: 全てのディレクティブはセクションに入れる必要があります。\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -500,8 +491,7 @@ msgstr "パッケージ %s のインストール方法を設定できません
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
-"%s: インストール方法は '依存関係としてインストール' に設定されています\n"
+msgstr "%s: インストール方法は '依存関係としてインストール' に設定されています\n"
 
 #: src/pacman/database.c:80
 #, c-format
@@ -750,18 +740,14 @@ msgstr "オペレーション:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"オペレーションと一緒に '%s {-h --help}' を使うことでオプションを一覧できま"
-"す\n"
+msgstr "\nオペレーションと一緒に '%s {-h --help}' を使うことでオプションを一覧できます\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        指定したパッケージとそのパッケージに依存している全ての"
-"パッケージを削除\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        指定したパッケージとそのパッケージに依存している全てのパッケージを削除\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -773,9 +759,7 @@ msgstr "  -n, --nosave         設定ファイルを削除\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      不要な依存関係を削除\n"
-"                       (-ss で明示的にインストールした依存関係も削除)\n"
+msgstr "  -s, --recursive      不要な依存関係を削除\n                       (-ss で明示的にインストールした依存関係も削除)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -796,62 +780,48 @@ msgstr "  -c, --changelog      パッケージの変更履歴を表示\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           依存関係としてインストールされたパッケージを表示 "
-"[filter]\n"
+msgstr "  -d, --deps           依存関係としてインストールされたパッケージを表示 [filter]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       明示的にインストールされたパッケージを表示 [filter]\n"
+msgstr "  -e, --explicit       明示的にインストールされたパッケージを表示 [filter]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
-msgstr ""
-"  -g, --groups         パッケージグループに含まれている全てのパッケージを表"
-"示\n"
+msgstr "  -g, --groups         パッケージグループに含まれている全てのパッケージを表示\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           パッケージ情報の表示 (-ii でバックアップの表示)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           パッケージ情報の表示 (-ii でバックアップの表示)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          パッケージファイルが存在しているかチェックする (-kk で"
-"ファイルプロパティ)\n"
+msgstr "  -k, --check          パッケージファイルが存在しているかチェックする (-kk でファイルプロパティ)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"  -l, --list           指定したパッケージが保有しているファイルを表示\n"
+msgstr "  -l, --list           指定したパッケージが保有しているファイルを表示\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        インストールしたパッケージの中で同期データベースに存在"
-"しないパッケージを表示 [filter]\n"
+msgstr "  -m, --foreign        インストールしたパッケージの中で同期データベースに存在しないパッケージを表示 [filter]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         インストールしたパッケージの中で同期データベースに存在"
-"するパッケージだけ表示 [filter]\n"
+msgstr "  -n, --native         インストールしたパッケージの中で同期データベースに存在するパッケージだけ表示 [filter]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -880,9 +850,7 @@ msgstr "  -s, --search <regex> インストールされたパッケージの部
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     どのパッケージからも必要とされないパッケージを表示\n"
-"                       (-tt で optdepends を無視する) [filter]\n"
+msgstr "  -t, --unrequired     どのパッケージからも必要とされないパッケージを表示\n                       (-tt で optdepends を無視する) [filter]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -894,18 +862,14 @@ msgstr "  -u, --upgrades       バージョンが古いパッケージを表示
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          キャッシュディレクトリから古いパッケージを削除 (-cc で"
-"全てのキャッシュを削除)\n"
+msgstr "  -c, --clean          キャッシュディレクトリから古いパッケージを削除 (-cc で全てのキャッシュを削除)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         パッケージグループに含まれているパッケージを全て表示\n"
-"                       (-gg で全てのグループとそのパッケージを表示)\n"
+msgstr "  -g, --groups         パッケージグループに含まれているパッケージを全て表示\n                       (-gg で全てのグループとそのパッケージを表示)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
@@ -917,63 +881,49 @@ msgstr "  -i, --info           パッケージ情報を表示 (-ii で詳細情
 #: src/pacman/pacman.c:160
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr ""
-"  -l, --list <repo>    リポジトリに含まれているパッケージの一覧を表示\n"
+msgstr "  -l, --list <repo>    リポジトリに含まれているパッケージの一覧を表示\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr "  -s, --search <regex> 外部リポジトリの部分一致検索\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     インストールしたパッケージのアップグレード (-uu でダウ"
-"ングレードを有効)\n"
+msgstr "  -u, --sysupgrade     インストールしたパッケージのアップグレード (-uu でダウングレードを有効)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   インストール・アップグレードをせずパッケージのダウン"
-"ロードだけ行う\n"
+msgstr "  -w, --downloadonly   インストール・アップグレードをせずパッケージのダウンロードだけ行う\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        サーバーから最新のパッケージデータベースをダウンロー"
-"ド\n"
-"                       (-yy で最新の場合も強制的に更新を行う)\n"
+msgstr "  -y, --refresh        サーバーから最新のパッケージデータベースをダウンロード\n                       (-yy で最新の場合も強制的に更新を行う)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         パッケージを依存関係としてインストールしたと印をつけ"
-"る\n"
+msgstr "      --asdeps         パッケージを依存関係としてインストールしたと印をつける\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     パッケージを明示的にインストールしたと印をつける\n"
+msgstr "      --asexplicit     パッケージを明示的にインストールしたと印をつける\n"
 
 #: src/pacman/pacman.c:173
 #, c-format
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"  -k, --check          ローカルデータベースの整合性をテスト (-kk でデータベー"
-"スを同期)\n"
+msgstr "  -k, --check          ローカルデータベースの整合性をテスト (-kk でデータベースを同期)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
@@ -990,29 +940,22 @@ msgstr "  -x, --regex          正規表現による検索を使用する\n"
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"      --machinereadable\n"
-"                       コンピュータが扱える出力を生成\n"
+msgstr "      --machinereadable\n                       コンピュータが扱える出力を生成\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          強制的にインストール、衝突しているファイルを上書きす"
-"る\n"
+msgstr "      --force          強制的にインストール、衝突しているファイルを上書きする\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         パッケージを依存関係としてインストールしたと印をつけ"
-"る\n"
+msgstr "      --asdeps         パッケージを依存関係としてインストールしたと印をつける\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     パッケージを明示的にインストールしたと印をつける\n"
+msgstr "      --asexplicit     パッケージを明示的にインストールしたと印をつける\n"
 
 #: src/pacman/pacman.c:194
 #, c-format
@@ -1026,50 +969,38 @@ msgstr "      --ignore <pkg>   指定したパッケージの更新を無視\n"
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                       指定したグループの更新を無視\n"
+msgstr "      --ignoregroup <grp>\n                       指定したグループの更新を無視\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         依存バージョンチェックをスキップ (-dd で全てのチェック"
-"をスキップ)\n"
+msgstr "  -d, --nodeps         依存バージョンチェックをスキップ (-dd で全てのチェックをスキップ)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <package=version>\n"
-"                       依存関係を満たすための仮想パッケージを追加\n"
+msgstr "      --assume-installed <package=version>\n                       依存関係を満たすための仮想パッケージを追加\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         データベースエントリだけを修正してパッケージファイルを"
-"触らない\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         データベースエントリだけを修正してパッケージファイルを触らない\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  ファイルのダウンロード中にプログレスバーを表示しない\n"
+msgstr "      --noprogressbar  ファイルのダウンロード中にプログレスバーを表示しない\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet    インストールスクリプトレットが存在する場合それを実行し"
-"ない\n"
+msgstr "      --noscriptlet    インストールスクリプトレットが存在する場合それを実行しない\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
@@ -1083,9 +1014,7 @@ msgstr "  -p, --print          操作を実行するかわりに対象を表示
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                       対象を表示する形式を指定する\n"
+msgstr "      --print-format <string>\n                       対象を表示する形式を指定する\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1157,9 +1086,7 @@ msgstr "      --confirm        毎回確認を行います\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       This program may be freely redistributed under\n"
-"                       the terms of the GNU General Public License.\n"
+msgstr "                       This program may be freely redistributed under\n                       the terms of the GNU General Public License.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1420,8 +1347,7 @@ msgstr "データベースが見つかりませんでした: %s\n"
 #: src/pacman/sync.c:667
 #, c-format
 msgid "'%s' is a file, did you mean %s instead of %s?\n"
-msgstr ""
-"'%s' はファイルです、あなたが行いたいのは %s で %s ではありませんか?\n"
+msgstr "'%s' はファイルです、あなたが行いたいのは %s で %s ではありませんか?\n"
 
 #: src/pacman/sync.c:697
 #, c-format
@@ -1518,9 +1444,7 @@ msgstr "データベースをロックできませんでした: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  パッケージマネージャを動かしてないのなら\n"
-"  %s を削除することができます\n"
+msgstr "  パッケージマネージャを動かしてないのなら\n  %s を削除することができます\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/ka.po b/src/pacman/po/ka.po
index e822105c..32e3cd74 100644
--- a/src/pacman/po/ka.po
+++ b/src/pacman/po/ka.po
@@ -1,23 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # arabuli <arabulibeqa@yahoo.com>, 2015
-# arabuli <arabulibeqa@yahoo.com>, 2015
+# arabuli <arabulibeqa@yahoo.com>, 2015-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
-"PO-Revision-Date: 2016-01-17 03:31+0000\n"
-"Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Georgian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ka/)\n"
-"Language: ka\n"
+"PO-Revision-Date: 2016-02-07 15:38+0000\n"
+"Last-Translator: arabuli <arabulibeqa@yahoo.com>\n"
+"Language-Team: Georgian (http://www.transifex.com/toofishes/archlinux-pacman/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/pacman/callback.c:182
@@ -78,9 +77,7 @@ msgstr "ადრეულ ვერსიაზე გადადის %s...\
 #: src/pacman/callback.c:230
 #, c-format
 msgid "removing %s...\n"
-msgstr ""
-"იშლება %s...\n"
-"\n"
+msgstr "იშლება %s...\n\n"
 
 #: src/pacman/callback.c:254
 #, c-format
@@ -177,7 +174,8 @@ msgstr "%s და %s კონფლქიტში არიან (%s). წა
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
 msgstr[0] "ეს პაკეტები გადაუჭრელი დამოკიდებულებების გამო ვერ განახლდება:\n"
 
 #: src/pacman/callback.c:442
@@ -197,9 +195,7 @@ msgstr[0] "%2$s-სთვის ხელმისაწვდომია %1$zu
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"ფაილი %s დაზიანებულია (%s).\n"
-"გსურთ მისი წაშლა?"
+msgstr "ფაილი %s დაზიანებულია (%s).\nგსურთ მისი წაშლა?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -384,9 +380,7 @@ msgstr "კონფიგის ფაილი %s, ხაზი %d: არა
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"კონფიგ ფაილი %s, ხაზი %d: '%s' არასწორი პარამეტრი, ხელმოწერის მხარდაჭერა "
-"არაა\n"
+msgstr "კონფიგ ფაილი %s, ხაზი %d: '%s' არასწორი პარამეტრი, ხელმოწერის მხარდაჭერა არაა\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
@@ -424,7 +418,7 @@ msgstr ""
 #: src/pacman/conf.c:725
 #, c-format
 msgid "try running pacman-db-upgrade\n"
-msgstr ""
+msgstr "სცადეთ გაუშვათ pacman-db-upgrade\n"
 
 #: src/pacman/conf.c:744
 #, c-format
@@ -744,18 +738,14 @@ msgstr "ოპერაციები:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"ხელმისაწვდომი პარამეტრების სანახავად ოპერაციასთანგამოიყენეთ '%s {-h --"
-"help}'\n"
+msgstr "\nხელმისაწვდომი პარამეტრების სანახავად ოპერაციასთანგამოიყენეთ '%s {-h --help}'\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        პაკეტების და ყველა იმ პაკეტის წაშლა, რომელიც მათზეა "
-"დამოკიდებულიn\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        პაკეტების და ყველა იმ პაკეტის წაშლა, რომელიც მათზეა დამოკიდებულიn\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -767,10 +757,7 @@ msgstr "  -n, --nosave         კონფიგურაციის ფაი
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      უსარგებლო დამოკიდებულეების წაშლა\n"
-"                       (-ss მოიცავს აშკარად დაინსტალირებულ "
-"დამოკიდებულებებს )\n"
+msgstr "  -s, --recursive      უსარგებლო დამოკიდებულეების წაშლა\n                       (-ss მოიცავს აშკარად დაინსტალირებულ დამოკიდებულებებს )\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -791,15 +778,12 @@ msgstr "  -c, --changelog      პაკეტის ცვლილებებ
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           დამოკიდებულებებად დაინსტალირებული პაკეტების სია "
-"[filter]\n"
+msgstr "  -d, --deps           დამოკიდებულებებად დაინსტალირებული პაკეტების სია [filter]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       აშკარად დაინსტალირებული პაკეტების სია [filter]\n"
+msgstr "  -e, --explicit       აშკარად დაინსტალირებული პაკეტების სია [filter]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -808,20 +792,15 @@ msgstr "  -g, --groups         პაკეტის ჯგუფის ყვ
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           პაკეტის ინფორმაციის ნახვა (-ii for მარქაფის "
-"ფაილებისთვის)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           პაკეტის ინფორმაციის ნახვა (-ii for მარქაფის ფაილებისთვის)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"-k, --check შემოწმება, არსებობს თუ არა პაკეტის ფაილები (-kk ფაილის "
-"თვისებებისთვის)\n"
+msgstr "-k, --check შემოწმება, არსებობს თუ არა პაკეტის ფაილები (-kk ფაილის თვისებებისთვის)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
@@ -833,9 +812,7 @@ msgstr "-l, --list მოკითხული პაკეტის კუთ
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"-m, --foreign სინქრონიზაციის მბ(ებ)-ში ვერ ნაპოვნი დაინსტალირებული პაკეტების "
-"სია [filter]\n"
+msgstr "-m, --foreign სინქრონიზაციის მბ(ებ)-ში ვერ ნაპოვნი დაინსტალირებული პაკეტების სია [filter]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
@@ -906,8 +883,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
 
 #: src/pacman/pacman.c:163
@@ -1009,8 +985,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
 msgstr ""
 
 #: src/pacman/pacman.c:203
@@ -1445,7 +1420,7 @@ msgstr ""
 #: src/pacman/upgrade.c:56
 #, c-format
 msgid "memory exhausted\n"
-msgstr ""
+msgstr "მეხსიერება ამოწორულია\n"
 
 #: src/pacman/upgrade.c:87
 #, c-format
@@ -1487,17 +1462,17 @@ msgstr ""
 #: src/pacman/util.c:157
 #, c-format
 msgid "failed to update %s (%s)\n"
-msgstr ""
+msgstr " %s (%s) განახლება ჩაიშალა\n"
 
 #: src/pacman/util.c:160
 #, c-format
 msgid " %s is up to date\n"
-msgstr ""
+msgstr " %s უახლესია\n"
 
 #: src/pacman/util.c:172
 #, c-format
 msgid "failed to synchronize any databases\n"
-msgstr ""
+msgstr "ვერცერთი მონაცემთა ბაზა ვერ დასინქრონირდა\n"
 
 #: src/pacman/util.c:639
 #, c-format
diff --git a/src/pacman/po/kk.po b/src/pacman/po/kk.po
index 7309ffad..036ef140 100644
--- a/src/pacman/po/kk.po
+++ b/src/pacman/po/kk.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2011
 msgid ""
@@ -11,12 +11,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 03:30+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Kazakh (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/kk/)\n"
-"Language: kk\n"
+"Language-Team: Kazakh (http://www.transifex.com/toofishes/archlinux-pacman/language/kk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: kk\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/pacman/callback.c:182
@@ -174,9 +173,9 @@ msgstr "%s және %s өзара ерегіседі (%s). %s өшіруді қ
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Келесі десте(лер) шешілмейтін тәуелділіктер салдарынан жаңарту мүмкін емес:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Келесі десте(лер) шешілмейтін тәуелділіктер салдарынан жаңарту мүмкін емес:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -195,9 +194,7 @@ msgstr[0] ""
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"%s файлы зақымдалған (%s).\n"
-"Оны өшіруді қалайсыз ба?"
+msgstr "%s файлы зақымдалған (%s).\nОны өшіруді қалайсыз ба?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -382,16 +379,13 @@ msgstr "баптаулар файлы %s, жол %d: '%s' үшін мән қат
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"баптаулар файлы %s, жол %d: '%s' опциясы қате, қолтаңбаларға қолдау жоқ\n"
+msgstr "баптаулар файлы %s, жол %d: '%s' опциясы қате, қолтаңбаларға қолдау жоқ\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"баптаулар файлы %s, жол %d: '%s' директивасына, '%s' секциясында, "
-"танылмады.\n"
+msgstr "баптаулар файлы %s, жол %d: '%s' директивасына, '%s' секциясында, танылмады.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
@@ -418,9 +412,7 @@ msgstr "'%s' айнасын '%s' (%s) дерекқорына қосу мүмкі
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"alpm библиотекасын іске қосу қатесі\n"
-"(%s: %s)\n"
+msgstr "alpm библиотекасын іске қосу қатесі\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -475,9 +467,7 @@ msgstr ""
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"баптаулар файлы %s, жол %d: бар директивалар секциялардың ішінде болуы "
-"керек.\n"
+msgstr "баптаулар файлы %s, жол %d: бар директивалар секциялардың ішінде болуы керек.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -747,18 +737,14 @@ msgstr "әрекеттер:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"опцияларды қарап шығу үшін '%s { -h --help}' басқа әрекеттермен бірге "
-"қолданыңыз\n"
+msgstr "\nопцияларды қарап шығу үшін '%s { -h --help}' басқа әрекеттермен бірге қолданыңыз\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        дестені мен оған тәуелді болып тұрған дестелерді "
-"өшіру\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        дестені мен оған тәуелді болып тұрған дестелерді өшіру\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -770,9 +756,7 @@ msgstr "  -n, --nosave         баптаулар файлдарын өшіру\
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      керек емес тәуелділіктерді өшіру\n"
-"                       (-ss нақты орнатылған тәуелділіктерді де қоса)\n"
+msgstr "  -s, --recursive      керек емес тәуелділіктерді өшіру\n                       (-ss нақты орнатылған тәуелділіктерді де қоса)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -793,16 +777,12 @@ msgstr "  -c, --changelog      дестенің өзгерістер тарих
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           тәуелділік ретінде орнатылған барлық дестелер тізімін "
-"шығару [фильтр]\n"
+msgstr "  -d, --deps           тәуелділік ретінде орнатылған барлық дестелер тізімін шығару [фильтр]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       нақты орнатылған барлық дестелер тізімін шығару "
-"[фильтр]\n"
+msgstr "  -e, --explicit       нақты орнатылған барлық дестелер тізімін шығару [фильтр]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -811,20 +791,15 @@ msgstr "  -g, --groups         бұл топтағы барлық дестеле
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           десте ақпаратын шығару (-ii резервті көшірмелері "
-"үшін)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           десте ақпаратын шығару (-ii резервті көшірмелері үшін)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          дестенің бар болғанын тексеру (-kk файл қасиеттері "
-"үшін)\n"
+msgstr "  -k, --check          дестенің бар болғанын тексеру (-kk файл қасиеттері үшін)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
@@ -836,18 +811,14 @@ msgstr "  -l, --list           сұралған дестенің файлдар
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        дерекқор(лар)дан табылмаған барлық дестелер тізімін "
-"шығару [фильтр]\n"
+msgstr "  -m, --foreign        дерекқор(лар)дан табылмаған барлық дестелер тізімін шығару [фильтр]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         тек синхродау дерекқорынан табылған орнатылған "
-"дестелерді тізіп шығару [сүзгі]\n"
+msgstr "  -n, --native         тек синхродау дерекқорынан табылған орнатылған дестелерді тізіп шығару [сүзгі]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -857,34 +828,26 @@ msgstr "  -o, --owns <файл>    құрамында <файл> бар дест
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"  -p, --file <десте>   ақпаратты десте файлынан алу, дерекқордан емес\n"
+msgstr "  -p, --file <десте>   ақпаратты десте файлынан алу, дерекқордан емес\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          сұранымдар мен іздеу кезінде аздау ақпаратты көрсету\n"
+msgstr "  -q, --quiet          сұранымдар мен іздеу кезінде аздау ақпаратты көрсету\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex> көрсетілген мәтінді жергілікті орнатылған дестелер "
-"ішінен іздеу\n"
+msgstr "  -s, --search <regex> көрсетілген мәтінді жергілікті орнатылған дестелер ішінен іздеу\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     бірде-бір десте талап етпейтін (міндетті емес) "
-"дестелер\n"
-"                       тізімін шығару (-tt міндетті емес тәуелділіктерді "
-"елемеу) [сүзгі]\n"
+msgstr "  -t, --unrequired     бірде-бір десте талап етпейтін (міндетті емес) дестелер\n                       тізімін шығару (-tt міндетті емес тәуелділіктерді елемеу) [сүзгі]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -896,64 +859,51 @@ msgstr "  -u, --upgrades       ескірген дестелер тізімін
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          кэштен ескі дестелерді өшіру (-cc барлығы үшін)\n"
+msgstr "  -c, --clean          кэштен ескі дестелерді өшіру (-cc барлығы үшін)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         дестелер тобының барлық мүшелерін қарау\n"
-"                       (-gg барлық топтар және мүшелерді қарау үшін)\n"
+msgstr "  -g, --groups         дестелер тобының барлық мүшелерін қарау\n                       (-gg барлық топтар және мүшелерді қарау үшін)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info           десте ақпаратын қарау (-ii кеңейтілген ақпарат үшін)\n"
+msgstr "  -i, --info           десте ақпаратын қарау (-ii кеңейтілген ақпарат үшін)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr ""
-"  -l, --list <repo>    бұл репозиторийде бар барлық дестелер тізімін шығару\n"
+msgstr "  -l, --list <repo>    бұл репозиторийде бар барлық дестелер тізімін шығару\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <regex> қашықтағы репозиторийлардың ішінен көрсетілген "
-"мәтінді іздеу\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regex> қашықтағы репозиторийлардың ішінен көрсетілген мәтінді іздеу\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     орнатылған дестелерді жаңарту (-uu нұсқаны "
-"төмендетуді рұқсат етеді)\n"
+msgstr "  -u, --sysupgrade     орнатылған дестелерді жаңарту (-uu нұсқаны төмендетуді рұқсат етеді)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   дестелерді серверден жүктеп алу, бірақ орнатпау\n"
+msgstr "  -w, --downloadonly   дестелерді серверден жүктеп алу, бірақ орнатпау\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        серверден дестелердің жаңалау дерекқорын жүктеп алу\n"
-"                       (-yy жергілікті нұсқасы жаңа болса да жаңарту)\n"
+msgstr "  -y, --refresh        серверден дестелердің жаңалау дерекқорын жүктеп алу\n                       (-yy жергілікті нұсқасы жаңа болса да жаңарту)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -992,9 +942,7 @@ msgstr ""
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          орнатуды мәжбүрлету, ерегісетін файлдарды үстінен "
-"жазу\n"
+msgstr "      --force          орнатуды мәжбүрлету, ерегісетін файлдарды үстінен жазу\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
@@ -1011,52 +959,39 @@ msgstr "      --asexplicit     дестелерді нақты орнатылғ
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <десте> жаңарту кезінде дестені елемеу (бірнеше рет "
-"қолданылуы мүмкін)\n"
+msgstr "      --ignore <десте> жаңарту кезінде дестені елемеу (бірнеше рет қолданылуы мүмкін)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <топ>\n"
-"          жаңарту кезінде топты елемеу (бірнеше рет қолданылуы мүмкін)\n"
+msgstr "      --ignoregroup <топ>\n          жаңарту кезінде топты елемеу (бірнеше рет қолданылуы мүмкін)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         тәуелділіктер нұсқаларын тексеруді аттап кету (-dd "
-"барлық тексерулерді аттап кету)\n"
+msgstr "  -d, --nodeps         тәуелділіктер нұсқаларын тексеруді аттап кету (-dd барлық тексерулерді аттап кету)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <десте=нұсқасы>\n"
-"                       тәуелділіктерді қанағаттандыру үшін виртуалды дестені "
-"қосу\n"
+msgstr "      --assume-installed <десте=нұсқасы>\n                       тәуелділіктерді қанағаттандыру үшін виртуалды дестені қосу\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         тек дерекқор жазбаларын өзгерту, дестелер файлдарын "
-"емес\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         тек дерекқор жазбаларын өзгерту, дестелер файлдарын емес\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  файлдарды жүктеу кезінде үрдіс жолағын көрсетпеу\n"
+msgstr "      --noprogressbar  файлдарды жүктеу кезінде үрдіс жолағын көрсетпеу\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
@@ -1069,17 +1004,14 @@ msgstr "      --noscriptlet    орнату скриптері бар болса
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          әрекетті орындау орнына мақсаттарды тізіп шығару\n"
+msgstr "  -p, --print          әрекетті орындау орнына мақсаттарды тізіп шығару\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                       мақсаттар қалай шығарылатынын көрсетеді\n"
+msgstr "      --print-format <string>\n                       мақсаттар қалай шығарылатынын көрсетеді\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1151,9 +1083,7 @@ msgstr "      --confirm        әрқашан растауды сұрау\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Бұл бағдарлама GNU General Public License\n"
-"                       аясында еркін таратылуы мүмкін.\n"
+msgstr "                       Бұл бағдарлама GNU General Public License\n                       аясында еркін таратылуы мүмкін.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1511,9 +1441,7 @@ msgstr "дерекқорды блоктау мүмкін емес: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  pacman қазір қосылып тұрмағанына сенімді болсаңыз\n"
-"  %s өшіре аласыз\n"
+msgstr "  pacman қазір қосылып тұрмағанына сенімді болсаңыз\n  %s өшіре аласыз\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/ko.po b/src/pacman/po/ko.po
index 9fa64807..84e8af62 100644
--- a/src/pacman/po/ko.po
+++ b/src/pacman/po/ko.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Alan Lee <bkrhlim@aol.com>, 2013
 # Seong-ho Cho <darkcircle.0426@gmail.com>, 2013
@@ -17,14 +17,13 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
-"PO-Revision-Date: 2016-01-18 11:30+0000\n"
+"PO-Revision-Date: 2016-01-30 17:00+0000\n"
 "Last-Translator: Taegil Bae <esrevinu@gmail.com>\n"
-"Language-Team: Korean (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ko/)\n"
-"Language: ko\n"
+"Language-Team: Korean (http://www.transifex.com/toofishes/archlinux-pacman/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/pacman/callback.c:182
@@ -182,9 +181,9 @@ msgstr "%s와 %s가 충돌합니다(%s). %s를 제거하시겠습니까?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"해결할 수 없는 의존성 때문에 다음 꾸러미를 업그레이드 할 수 없습니다:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "해결할 수 없는 의존성 때문에 다음 꾸러미를 업그레이드 할 수 없습니다:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -203,9 +202,7 @@ msgstr[0] "%2$s에 대해 이용할 수 있는 %1$zu 제공자가 있습니다:\
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"%s 파일이 깨졌습니다(%s).\n"
-"삭제하시겠습니까?"
+msgstr "%s 파일이 깨졌습니다(%s).\n삭제하시겠습니까?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -390,16 +387,13 @@ msgstr "구성파일 %s, %d번째 줄: '%s'에 대한 잘못된 값입니다: '%
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"구성파일 %s, %d번째 줄: '%s' 옵션이 잘못되었으며, 서명을 지원하지 않습니다\n"
+msgstr "구성파일 %s, %d번째 줄: '%s' 옵션이 잘못되었으며, 서명을 지원하지 않습니다\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"구성파일 %1$s, %2$d번째 줄: '%4$s' 섹션의 '%3$s' 지시자를 인식하지 못했습니"
-"다.\n"
+msgstr "구성파일 %1$s, %2$d번째 줄: '%4$s' 섹션의 '%3$s' 지시자를 인식하지 못했습니다.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
@@ -426,9 +420,7 @@ msgstr "'%s' 미러를 '%s' 데이터베이스에 추가할 수 없습니다(%s)
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"ALPM 라이브러리를 초기화하지 못했습니다\n"
-"(%s: %s)\n"
+msgstr "ALPM 라이브러리를 초기화하지 못했습니다\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -554,7 +546,7 @@ msgstr "다운로드 크기"
 #: src/pacman/package.c:105
 #, c-format
 msgid "Groups"
-msgstr "그룹들"
+msgstr "모음들"
 
 #: src/pacman/package.c:106
 #, c-format
@@ -753,32 +745,26 @@ msgstr "동작:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"사용할 수 있는 옵션에 대한 동작을 보려면 '%s {-h --help}'를 사용하십시오.\n"
+msgstr "\n사용할 수 있는 옵션에 대한 동작을 보려면 '%s {-h --help}'를 사용하십시오.\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        꾸러미에 의존하는 모든 꾸러미와 해당 꾸러미를 제거합니"
-"다.\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        꾸러미에 의존하는 모든 꾸러미와 해당 꾸러미를 제거합니다.\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
 msgid "  -n, --nosave         remove configuration files\n"
-msgstr "  -n, --nosave 설정 파일을 제거합니다.\n"
+msgstr "  -n, --nosave         설정 파일을 제거합니다.\n"
 
 #: src/pacman/pacman.c:127
 #, c-format
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      필요하지 않은 의존성을 제거합니다\n"
-"                       (명시적으로 설치한 요소의 의존성을 포함하려면 -ss를 사"
-"용하십시오.)\n"
+msgstr "  -s, --recursive      필요하지 않은 의존성 요소를 제거합니다\n                       (명시적으로 설치한 의존성 요소도 포함하려면 -ss 사용)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -799,8 +785,7 @@ msgstr "  -c, --changelog      꾸러미 변경 로그를 봅니다.\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           의존성에 따라 설치한 꾸러미를 조회합니다 [필터]\n"
+msgstr "  -d, --deps           의존성에 따라 설치한 꾸러미를 조회합니다 [필터]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
@@ -810,12 +795,11 @@ msgstr "  -e, --explicit       명시적으로 설치한 꾸러미를 조회합
 #: src/pacman/pacman.c:140
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
-msgstr "  -g, --groups         꾸러미 모음의 모든 구성 요소를 봅니다.\n"
+msgstr "  -g, --groups         꾸러미 모음의 모든 구성원을 봅니다.\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
 msgstr "  -i, --info           꾸러미 정보를 확인합니다. (백업 파일은 -ii)\n"
 
 #: src/pacman/pacman.c:142
@@ -823,9 +807,7 @@ msgstr "  -i, --info           꾸러미 정보를 확인합니다. (백업 파
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          꾸러미 파일이 존재하는지 검사합니다. (파일 속성은 -"
-"kk)\n"
+msgstr "  -k, --check          꾸러미 파일이 존재하는지 검사합니다. (파일 속성은 -kk)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
@@ -837,18 +819,14 @@ msgstr "  -l, --list           조회된 꾸러미에 포함된 파일을 나열
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        동기화 DB에서 찾지 못한 설치 꾸러미를 조회합니다. [필"
-"터]\n"
+msgstr "  -m, --foreign        동기화 DB에서 찾지 못한 설치 꾸러미를 조회합니다. [필터]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         동기화 DB에서만 찾을 수 있는 설치한 꾸러미를 조회합니"
-"다. [필터]\n"
+msgstr "  -n, --native         동기화 DB에만 있는 설치된 꾸러미를 조회합니다. [필터]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -863,26 +841,21 @@ msgstr "  -p, --file <package> 데이터베이스 대신 꾸러미 파일을 요
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          요청 및 검색에 대한 정보를 더 간단하게 보여줍니다.\n"
+msgstr "  -q, --quiet          요청 및 검색에 대한 정보를 더 간단하게 보여줍니다.\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex> 로컬에 설치한 문자열이 일치하는 꾸러미를 검색합니다.\n"
+msgstr "  -s, --search <regex> 로컬에 설치한 문자열이 일치하는 꾸러미를 검색합니다.\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     다른 꾸러미가 필요로 하지 않는 (선택적인) 꾸러미들을 "
-"나열\n"
-"                       합니다. (-tt 옵션은 선택의존성을 무시합니다.) [필터]\n"
+msgstr "  -t, --unrequired     다른 꾸러미가 필요로 하지 않는 (선택적인) 꾸러미들을 나열\n                       합니다. (-tt 옵션은 선택의존성을 무시합니다.) [필터]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -894,18 +867,14 @@ msgstr "  -u, --upgrades       오래된 꾸러미를 조회합니다. [필터]\
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          캐시 디렉터리의 오래된 꾸러미를 제거합니다. (모두는 -"
-"cc)\n"
+msgstr "  -c, --clean          캐시 디렉터리의 오래된 꾸러미를 제거합니다. (모두는 -cc)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         꾸러미 그룹의 모든 멤버를 봅니다.\n"
-"                       (-gg 는 모든 그룹과 멤버를 다 볼 수 있습니다.)\n"
+msgstr "  -g, --groups         꾸러미 모음의 모든 구성원을 봅니다.\n                       (-gg는 모든 모음과 구성원을 볼 수 있습니다.)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
@@ -917,45 +886,37 @@ msgstr "  -i, --info           꾸러미 정보를 봅니다. (-ii 경우 더 
 #: src/pacman/pacman.c:160
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr "  -l, --list <저장소>  저장소에 있는 꾸러미 목록을 봅니다.\n"
+msgstr "  -l, --list <repo>    저장소에 있는 꾸러미 목록을 봅니다.\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr "  -s, --search <regex> 문자열과 일치하는 원격 저장소를 검색합니다.\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     설치된 꾸러미를 업그레이드합니다.\n"
-"                       (-uu 경우 다운그레이드도 가능)\n"
+msgstr "  -u, --sysupgrade     설치된 꾸러미를 업그레이드합니다.\n                       (-uu 경우 다운그레이드도 가능)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   꾸러미를 다운로드하지만 설치/업그레이드를 하지 않습니"
-"다.\n"
+msgstr "  -w, --downloadonly   꾸러미를 다운로드하지만 설치/업그레이드를 하지 않습니다.\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        서버로부터 새로운 꾸러미 데이터베이스를 받아옵니다.\n"
-"                       (-yy 경우 최신이더라도 강제로 갱신합니다.)\n"
+msgstr "  -y, --refresh        서버로부터 새로운 꾸러미 데이터베이스를 받아옵니다.\n                       (-yy 경우 최신이더라도 강제로 갱신합니다.)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         꾸러미를 명시적으로 설치하지 않은 것으로 표시합니다.\n"
+msgstr "      --asdeps         꾸러미를 명시적으로 설치하지 않은 것으로 표시합니다.\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
@@ -967,9 +928,7 @@ msgstr "      --asexplicit     꾸러미를 명시적으로 설치한 것으로
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"  -k, --check          로컬 데이터베이스가 유효한지 검사 (-kk 경우 데이터베이"
-"스 동기화)\n"
+msgstr "  -k, --check          로컬 데이터베이스가 유효한지 검사 (-kk 경우 데이터베이스 동기화)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
@@ -986,9 +945,7 @@ msgstr "  -x, --regex          정규표현식을 사용해서 검색할 수 있
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"      --machinereadable\n"
-"                       기계가 읽을 수 있는 출력을 생성합니다.\n"
+msgstr "      --machinereadable\n                       기계가 읽을 수 있는 출력을 생성합니다.\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
@@ -998,8 +955,7 @@ msgstr "      --force          충돌하는 파일을 덮어쓰고 강제로 설
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         명시적으로 설치하지 않은 꾸러미처럼 설치합니다.\n"
+msgstr "      --asdeps         명시적으로 설치하지 않은 꾸러미처럼 설치합니다.\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
@@ -1011,57 +967,45 @@ msgstr "      --asexplicit     명시적으로 설치한 꾸러미처럼 설치
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg>   꾸러미 업그레이드를 무시합니다. (한 번 이상 사용 가"
-"능)\n"
+msgstr "      --ignore <pkg>   꾸러미 업그레이드를 무시합니다. (한 번 이상 사용 가능)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                       그룹 업그레이드를 무시합니다. (한 번 이상 사용 가능)\n"
+msgstr "      --ignoregroup <grp>\n                       모음의 업그레이드를 무시합니다. (한 번 이상 사용 가능)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         의존성 버전 검사를 건너뜁니다. (-dd는 모든 검사 건너"
-"뜀)\n"
+msgstr "  -d, --nodeps         의존성 버전 검사를 건너뜁니다. (-dd는 모든 검사 건너뜀)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <package=version>\n"
-"                       의존성을 만족시키기 위해 가상 꾸러미를 추가합니다.\n"
+msgstr "      --assume-installed <package=version>\n                       의존성을 만족시키기 위해 가상 꾸러미를 추가합니다.\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         꾸러미 파일이 아닌 데이터베이스 항목만 수정합니다.\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         꾸러미 파일이 아닌 데이터베이스 항목만 수정합니다.\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  파일 다운로드 중 진행 표시줄을 보이지 않습니다.\n"
+msgstr "      --noprogressbar  파일 다운로드 중 진행 표시줄을 보이지 않습니다.\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet    설치 스크립틀릿이 존재한다면 실행하지 않습니다.\n"
+msgstr "      --noscriptlet    설치 스크립틀릿이 존재한다면 실행하지 않습니다.\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
@@ -1075,9 +1019,7 @@ msgstr "  -p, --print          동작을 수행하는 대신에 대상을 출력
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                       대상을 어떻게 화면에 출력할지 정합니다.\n"
+msgstr "      --print-format <string>\n                       대상을 어떻게 화면에 출력할지 정합니다.\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1149,9 +1091,7 @@ msgstr "      --confirm        항상 확인 메시지를 묻습니다.\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       이 프로그램은 GNU 일반 공중 사용허가서의\n"
-"                       조항에 따라 자유롭게 배포할 수 있습니다.\n"
+msgstr "                       이 프로그램은 GNU 일반 공중 사용허가서의\n                       조항에 따라 자유롭게 배포할 수 있습니다.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1256,7 +1196,7 @@ msgstr "[무시]"
 #: src/pacman/query.c:380
 #, c-format
 msgid "group '%s' was not found\n"
-msgstr "'%s' 그룹을 찾을 수 없습니다\n"
+msgstr "'%s' 모음을 찾을 수 없습니다\n"
 
 #: src/pacman/query.c:471 src/pacman/sync.c:429
 #, c-format
@@ -1402,7 +1342,7 @@ msgstr "\"%s\" 저장소가 없습니다.\n"
 #, c-format
 msgid "There is %d member in group %s:\n"
 msgid_plural "There are %d members in group %s:\n"
-msgstr[0] "%2$s 그룹에 %1$d 개의 구성원이 있습니다:\n"
+msgstr[0] "%2$s 모음에 %1$d 개의 구성원이 있습니다:\n"
 
 #: src/pacman/sync.c:639
 #, c-format
@@ -1509,9 +1449,7 @@ msgstr "데이터베이스를 잠글 수 없습니다: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  꾸러미 관리자가 이미 실행 중이지 않음을 확신한다면\n"
-"  %s를 제거할 수 있습니다\n"
+msgstr "  꾸러미 관리자가 이미 실행 중이지 않음을 확신한다면\n  %s를 제거할 수 있습니다\n"
 
 #: src/pacman/util.c:96
 #, c-format
@@ -1521,7 +1459,7 @@ msgstr "릴리즈 트랜잭션에 실패했습니다. (%s)\n"
 #: src/pacman/util.c:129
 #, c-format
 msgid "no usable package repositories configured.\n"
-msgstr "설정한 꾸러미 저장소 중 사용할 수 있는 요소가 없습니다.\n"
+msgstr "가용한 꾸러미 저장소가 설정되지 않았습니다.\n"
 
 #: src/pacman/util.c:138
 #, c-format
diff --git a/src/pacman/po/lt.po b/src/pacman/po/lt.po
index bf7e0f5a..98d3963b 100644
--- a/src/pacman/po/lt.po
+++ b/src/pacman/po/lt.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Algimantas Margevičius <gymka@archlinux.lt>, 2013
 # Algimantas Margevičius <gymka@mail.ru>, 2011
@@ -18,14 +18,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-21 23:26+0000\n"
 "Last-Translator: Moo\n"
-"Language-Team: Lithuanian (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/lt/)\n"
-"Language: lt\n"
+"Language-Team: Lithuanian (http://www.transifex.com/toofishes/archlinux-pacman/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/pacman/callback.c:182
 #, c-format
@@ -182,13 +180,11 @@ msgstr "%s ir %s nesuderinama (%s). Pašalinti %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Šio paketo atnaujinti neįmanoma, dėl neišsprendžiamų priklausomybių:\n"
-msgstr[1] ""
-"Šių paketų atnaujinti neįmanoma, dėl neišsprendžiamų priklausomybių:\n"
-msgstr[2] ""
-"Šių paketų atnaujinti neįmanoma, dėl neišsprendžiamų priklausomybių:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Šio paketo atnaujinti neįmanoma, dėl neišsprendžiamų priklausomybių:\n"
+msgstr[1] "Šių paketų atnaujinti neįmanoma, dėl neišsprendžiamų priklausomybių:\n"
+msgstr[2] "Šių paketų atnaujinti neįmanoma, dėl neišsprendžiamų priklausomybių:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -211,9 +207,7 @@ msgstr[2] "Yra prieinama %zu %s tiekėjų\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Failas %s yra sugadintas (%s).\n"
-"Ar norite jį ištrinti?"
+msgstr "Failas %s yra sugadintas (%s).\nAr norite jį ištrinti?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -283,9 +277,7 @@ msgstr "parsisiunčiama %s...\n"
 #: src/pacman/check.c:63 src/pacman/check.c:232
 #, c-format
 msgid "%s: %s (File type mismatch)\n"
-msgstr ""
-"%s: %s (nesutampa failo tipas)\n"
-"\n"
+msgstr "%s: %s (nesutampa failo tipas)\n\n"
 
 #: src/pacman/check.c:82
 #, c-format
@@ -295,9 +287,7 @@ msgstr "%s: %s (nesutampa UID)\n"
 #: src/pacman/check.c:91
 #, c-format
 msgid "%s: %s (GID mismatch)\n"
-msgstr ""
-"%s: %s (nesutampa GID)\n"
-"\n"
+msgstr "%s: %s (nesutampa GID)\n\n"
 
 #: src/pacman/check.c:101
 #, c-format
@@ -322,9 +312,7 @@ msgstr "perskaityti simbolinės nuorodos turinio nepavyko: %s\n"
 #: src/pacman/check.c:147
 #, c-format
 msgid "%s: %s (Symlink path mismatch)\n"
-msgstr ""
-"%s: %s (nesutampa simbolinės nuorodos kelias)\n"
-"\n"
+msgstr "%s: %s (nesutampa simbolinės nuorodos kelias)\n\n"
 
 #: src/pacman/check.c:164 src/pacman/check.c:170
 #, c-format
@@ -412,17 +400,13 @@ msgstr "konfigūracijos failas %s, eilutė %d: netinkama reikšmė „%s“ : 
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"konfigūracijos failas %s, eilutė %d: „%s“ pasirinktis neteisinga, nėra "
-"pasirašymo palaikymo\n"
+msgstr "konfigūracijos failas %s, eilutė %d: „%s“ pasirinktis neteisinga, nėra pasirašymo palaikymo\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"konfigūracijos failas %s, eilutė %d: direktyva „%s“ sekcijoj „%s“ "
-"neatpažinta.\n"
+msgstr "konfigūracijos failas %s, eilutė %d: direktyva „%s“ sekcijoj „%s“ neatpažinta.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
@@ -449,9 +433,7 @@ msgstr "nepavyko pridėti veidrodžio „%s“ į duomenų bazę „%s“ (%s)\n
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"nepavyko inicijuoti alpm bibliotekos\n"
-"(%s: %s)\n"
+msgstr "nepavyko inicijuoti alpm bibliotekos\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -486,14 +468,12 @@ msgstr "Nepavyko perduoti %s įrašo į libalpm"
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"konfigūracijos failas %s, eilutė %d: \"%s\" parinktis \"%s\" neatpažinta\n"
+msgstr "konfigūracijos failas %s, eilutė %d: \"%s\" parinktis \"%s\" neatpažinta\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
-"konfigūracijos failas %s, eilutė %d: direktyva „%s“ turi turėt reikšmę\n"
+msgstr "konfigūracijos failas %s, eilutė %d: direktyva „%s“ turi turėt reikšmę\n"
 
 #: src/pacman/conf.c:948
 #, c-format
@@ -508,9 +488,7 @@ msgstr "konfigūracijos failas %s neperskaitomas: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"konfigūracijos failas %s, eilutė %d: Visos direktyvos turi priklausyti "
-"skyriuj\n"
+msgstr "konfigūracijos failas %s, eilutė %d: Visos direktyvos turi priklausyti skyriuj\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -780,18 +758,14 @@ msgstr "operacijos:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"naudokite „%s {-h --help}“ kartu su operacija galimoms pasirinktims "
-"pamatyti\n"
+msgstr "\nnaudokite „%s {-h --help}“ kartu su operacija galimoms pasirinktims pamatyti\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade          pašalinti pačius paketus ir visus kurie priklauso "
-"nuo jų\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade          pašalinti pačius paketus ir visus kurie priklauso nuo jų\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -803,10 +777,7 @@ msgstr "  -n, --nosave           pašalina konfigūracijos failus\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive        pašalina nereikalingas priklausomybes\n"
-"                         (-ss įterpia savarankiškai įdiegtas "
-"priklausomybes)\n"
+msgstr "  -s, --recursive        pašalina nereikalingas priklausomybes\n                         (-ss įterpia savarankiškai įdiegtas priklausomybes)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -827,15 +798,12 @@ msgstr "  -c, --changelog        peržiūrėti paketo keitimų žurnalą\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps             parodo paketus įdiegtus kaip priklausomybės "
-"[filtras]\n"
+msgstr "  -d, --deps             parodo paketus įdiegtus kaip priklausomybės [filtras]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit         parodo savarankiškai įdiegtus paketus [filtras]\n"
+msgstr "  -e, --explicit         parodo savarankiškai įdiegtus paketus [filtras]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -844,44 +812,34 @@ msgstr "  -g, --groups           peržiūrėti visus grupės narius\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info             peržiūrėti paketo informaciją (-ii atsarginės "
-"kopijos failam)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info             peržiūrėti paketo informaciją (-ii atsarginės kopijos failam)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check            patikrinti ar egzistuoja paketo failai (failo "
-"savybėms naudokite -kk)\n"
+msgstr "  -k, --check            patikrinti ar egzistuoja paketo failai (failo savybėms naudokite -kk)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"  -l, --list           išvardinti failus, priklausančius užklaustam paketui\n"
+msgstr "  -l, --list           išvardinti failus, priklausančius užklaustam paketui\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign          parodyti paketus kurių nėra sinchronizacijos "
-"duomenų bazėje [filtras]\n"
+msgstr "  -m, --foreign          parodyti paketus kurių nėra sinchronizacijos duomenų bazėje [filtras]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native           parodo paketų sąrašą, kurie yra tik "
-"sinchronizacijos duomenų bazėje [filtras]\n"
+msgstr "  -n, --native           parodo paketų sąrašą, kurie yra tik sinchronizacijos duomenų bazėje [filtras]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -896,26 +854,21 @@ msgstr "  -p, --file <paketas>   užklausti paketo failą vietoj duomenų bazės
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet            rodyti mažiau informacijos užklausoms ir paieškai\n"
+msgstr "  -q, --quiet            rodyti mažiau informacijos užklausoms ir paieškai\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex>   ieškoti įdiegtų paketų kurie atitinka kriterijus\n"
+msgstr "  -s, --search <regex>   ieškoti įdiegtų paketų kurie atitinka kriterijus\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     išvardinti paketus (nebūtinus), kurių nereikalauja\n"
-"                       kiti paketai (-tt , kad būtų nepaisoma nebūtinų "
-"priklausomybių) [filtras]\n"
+msgstr "  -t, --unrequired     išvardinti paketus (nebūtinus), kurių nereikalauja\n                       kiti paketai (-tt , kad būtų nepaisoma nebūtinų priklausomybių) [filtras]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -927,27 +880,21 @@ msgstr "  -u, --upgrades         parodyti pasenusius paketus [filtras]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean            pašalinti senus paketus iš podėlio (-cc norint "
-"pašalint visus)\n"
+msgstr "  -c, --clean            pašalinti senus paketus iš podėlio (-cc norint pašalint visus)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         peržiūrėti visus grupės narius\n"
-"                       (-gg , kad peržiūrėtumėte visas grupes ir narius)\n"
+msgstr "  -g, --groups         peržiūrėti visus grupės narius\n                       (-gg , kad peržiūrėtumėte visas grupes ir narius)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info           peržiūrėti paketo informaciją (-ii išsamiai "
-"informacijai)\n"
+msgstr "  -i, --info           peržiūrėti paketo informaciją (-ii išsamiai informacijai)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -956,85 +903,67 @@ msgstr "  -l, --list <repo>      peržiūrėti paketus kurie yra saugykloje\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr "  -s, --search <regex>   ieškoti nutolusių saugyklų pagal kriterijų\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     atnaujinti įdiegtus paketus (-uu leidžia pasendinti)\n"
+msgstr "  -u, --sysupgrade     atnaujinti įdiegtus paketus (-uu leidžia pasendinti)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly     parsisiųsti paketus, bet nediegti/neatnaujinti\n"
+msgstr "  -w, --downloadonly     parsisiųsti paketus, bet nediegti/neatnaujinti\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        atsisiųsti naujas paketų duomenų bazes iš serverio\n"
-"                       (-yy priversti įkelti iš naujo, net jeigu "
-"atnaujinta)\n"
+msgstr "  -y, --refresh        atsisiųsti naujas paketų duomenų bazes iš serverio\n                       (-yy priversti įkelti iš naujo, net jeigu atnaujinta)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps           pažymėti paketus kaip nesavarankiškai įdiegtus\n"
+msgstr "      --asdeps           pažymėti paketus kaip nesavarankiškai įdiegtus\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit       pažymėti paketus kaip savarankiškai įdiegtus\n"
+msgstr "      --asexplicit       pažymėti paketus kaip savarankiškai įdiegtus\n"
 
 #: src/pacman/pacman.c:173
 #, c-format
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"  -k, --check          atlikti duomenų bazės tapatumo patikrą (-kk duomenų "
-"bazių sinchronizavimui)\n"
+msgstr "  -k, --check          atlikti duomenų bazės tapatumo patikrą (-kk duomenų bazių sinchronizavimui)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
-"  -s, --search <failas>  ieškoti paketų failų pavadinimus, kurie atitinka "
-"kriterijus\n"
+msgstr "  -s, --search <failas>  ieškoti paketų failų pavadinimus, kurie atitinka kriterijus\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
 msgid "  -x, --regex          enable searching using regular expressions\n"
-msgstr ""
-"  -x, --regex          įjungti reguliariuosius reiškinius naudojančią "
-"paiešką\n"
+msgstr "  -x, --regex          įjungti reguliariuosius reiškinius naudojančią paiešką\n"
 
 #: src/pacman/pacman.c:185
 #, c-format
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"      --machinereadable\n"
-"                       sukurti kompiuterio skaitomą išvestį\n"
+msgstr "      --machinereadable\n                       sukurti kompiuterio skaitomą išvestį\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force            priverstinai diegti, perrašyti nesuderinamus "
-"failus\n"
+msgstr "      --force            priverstinai diegti, perrašyti nesuderinamus failus\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
@@ -1051,46 +980,33 @@ msgstr "      --asexplicit       įdiegti paketus kaip savarankiškus\n"
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg>     ignoruoti paketo atnaujinimą (galima naudoti "
-"daugiau nei vieną kartą)\n"
+msgstr "      --ignore <pkg>     ignoruoti paketo atnaujinimą (galima naudoti daugiau nei vieną kartą)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                         ignoruoti grupinį atnaujinimą (galima naudoti "
-"daugiau nei vieną kartą)\n"
+msgstr "      --ignoregroup <grp>\n                         ignoruoti grupinį atnaujinimą (galima naudoti daugiau nei vieną kartą)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps           praleisti priklausomybių versijų tikrinimą (-dd "
-"praleisti visus tikrinimus)\n"
+msgstr "  -d, --nodeps           praleisti priklausomybių versijų tikrinimą (-dd praleisti visus tikrinimus)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <paketas=versija>\n"
-"                       pridėti virtualų paketą, kad būtų patenkintos "
-"priklausomybės\n"
+msgstr "      --assume-installed <paketas=versija>\n                       pridėti virtualų paketą, kad būtų patenkintos priklausomybės\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly           pakeisti tik duomenų bazės įrašus, bet ne paketo "
-"failus\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly           pakeisti tik duomenų bazės įrašus, bet ne paketo failus\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
@@ -1102,25 +1018,21 @@ msgstr "      --noprogressbar    siunčiant failus nerodyti pažangos juostos\n"
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet      nevykdyti diegimo scenarijaus, jei toks egzistuoja\n"
+msgstr "      --noscriptlet      nevykdyti diegimo scenarijaus, jei toks egzistuoja\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print            parodyti objektus vietoje užduoties įvykdymo\n"
+msgstr "  -p, --print            parodyti objektus vietoje užduoties įvykdymo\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                         nurodyti kaip objektai turi būti atvaizduoti\n"
+msgstr "      --print-format <string>\n                         nurodyti kaip objektai turi būti atvaizduoti\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1130,8 +1042,7 @@ msgstr "  -b, --dbpath <kelias>  nurodyti alternatyvią duomenų bazės vietą\n
 #: src/pacman/pacman.c:212
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
-msgstr ""
-"  -r, --root <kelias>    nurodyti alternatyvų diegimo šakninį katalogą\n"
+msgstr "  -r, --root <kelias>    nurodyti alternatyvų diegimo šakninį katalogą\n"
 
 #: src/pacman/pacman.c:213
 #, c-format
@@ -1193,15 +1104,12 @@ msgstr "      --confirm        visada reikalauti patvirtinimo\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Ši programa gali būti laisvai platinama\n"
-"                       pagal GNU General Public License.\n"
+msgstr "                       Ši programa gali būti laisvai platinama\n                       pagal GNU General Public License.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
 msgid "invalid option: '%s' and '%s' may not be used together\n"
-msgstr ""
-"neteisinga pasirinktis: \"%s\" ir \"%s\" negali būti naudojamos kartu\n"
+msgstr "neteisinga pasirinktis: \"%s\" ir \"%s\" negali būti naudojamos kartu\n"
 
 #: src/pacman/pacman.c:386
 #, c-format
@@ -1556,9 +1464,7 @@ msgstr "nepavyko užrakinti duomenų bazės: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  jeigu jūs esate tikras, kad paketų tvarkytuvė\n"
-"  nėra paleista, galite pašalinti %s\n"
+msgstr "  jeigu jūs esate tikras, kad paketų tvarkytuvė\n  nėra paleista, galite pašalinti %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/nb.po b/src/pacman/po/nb.po
index 6a60fcdf..2ca346c1 100644
--- a/src/pacman/po/nb.po
+++ b/src/pacman/po/nb.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Alexander F Rødseth <rodseth@gmail.com>, 2014-2015
 # Alexander F Rødseth <rodseth@gmail.com>, 2011-2014
@@ -16,12 +16,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-28 10:05+0000\n"
 "Last-Translator: Thor K. H. <nitrolinken@gmail.com>\n"
-"Language-Team: Norwegian Bokmål (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/nb/)\n"
-"Language: nb\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/toofishes/archlinux-pacman/language/nb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
@@ -179,19 +178,17 @@ msgstr "konflikt mellom %s og %s (%s). Fjerne %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Denne pakken kunne ikke oppgraderes grunnet uoppfylte avhengigheter:\n"
-msgstr[1] ""
-"Følgende pakker kunne ikke oppgraderes på grunn av uoppfylte avhengigheter:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Denne pakken kunne ikke oppgraderes grunnet uoppfylte avhengigheter:\n"
+msgstr[1] "Følgende pakker kunne ikke oppgraderes på grunn av uoppfylte avhengigheter:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
 msgid "Do you want to skip the above package for this upgrade?"
 msgid_plural "Do you want to skip the above packages for this upgrade?"
 msgstr[0] "Vil du hoppe over den overnevnte pakken for denne oppgraderingen?"
-msgstr[1] ""
-"Ønsker du å hoppe over de overnevnte pakkene for denne oppgraderingen?"
+msgstr[1] "Ønsker du å hoppe over de overnevnte pakkene for denne oppgraderingen?"
 
 #: src/pacman/callback.c:453
 #, c-format
@@ -205,9 +202,7 @@ msgstr[1] "Det finnes %zu tilbydere for %s:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Filen %s er korrupt (%s).\n"
-"Vil du slette den?"
+msgstr "Filen %s er korrupt (%s).\nVil du slette den?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -396,23 +391,18 @@ msgstr "konfigurasjonsfil %s, linje %d: ugyldig verdi for '%s': '%s'\n"
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"konfigurasjonsfil %s, linje %d: valget '%s' er ugyldig, ingen "
-"signaturstøtte\n"
+msgstr "konfigurasjonsfil %s, linje %d: valget '%s' er ugyldig, ingen signaturstøtte\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"konfigurasjonsfil %s, linje %d: direktiv '%s' i seksjon '%s' ikke "
-"gjenkjent.\n"
+msgstr "konfigurasjonsfil %s, linje %d: direktiv '%s' i seksjon '%s' ikke gjenkjent.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"pakkebrønnen '%s' inneholder variablen '%s', men ingen '%s' er definert.\n"
+msgstr "pakkebrønnen '%s' inneholder variablen '%s', men ingen '%s' er definert.\n"
 
 #: src/pacman/conf.c:641
 #, c-format
@@ -434,9 +424,7 @@ msgstr "kunne ikke legge pakkebrønn '%s' til '%s' databasen (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"kunne ikke initialisere alpm-biblioteket\n"
-"(%s: %s)\n"
+msgstr "kunne ikke initialisere alpm-biblioteket\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -491,8 +479,7 @@ msgstr "kunne ikke lese konfigurasjonsfil %s: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"konfigurasjonsfil %s, linje %d: Alle direktiver må høre til en seksjon.\n"
+msgstr "konfigurasjonsfil %s, linje %d: Alle direktiver må høre til en seksjon.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -762,14 +749,13 @@ msgstr "handlinger:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"bruk '%s {-h --help}' sammen med en handling, for tilgjengelige valg\n"
+msgstr "\nbruk '%s {-h --help}' sammen med en handling, for tilgjengelige valg\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
 msgstr "-c, --cascade fjern pakker og alle pakker som avhenger av dem\n"
 
 #: src/pacman/pacman.c:126
@@ -782,9 +768,7 @@ msgstr "-n, --nosave fjern konfigurasjonsfiler\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"-s, --recursive fjern unødvendige avhengigheter\n"
-"(-ss inkluderer manuelt installerte avhengigheter)\n"
+msgstr "-s, --recursive fjern unødvendige avhengigheter\n(-ss inkluderer manuelt installerte avhengigheter)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -805,14 +789,12 @@ msgstr "-c, --changelog vis endringsloggen for en pakke\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"-d, --deps list alle pakker som er installert som avhengigheter [filter]\n"
+msgstr "-d, --deps list alle pakker som er installert som avhengigheter [filter]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"-e, --explicit list opp all pakker som er installert manuelt [filter]\n"
+msgstr "-e, --explicit list opp all pakker som er installert manuelt [filter]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -821,8 +803,7 @@ msgstr "-g, --groups list opp alle pakker i en pakkegruppe\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
 msgstr "-i, --info vis pakkeinformasjon (-ii for sikkerhetskopierte filer)\n"
 
 #: src/pacman/pacman.c:142
@@ -842,18 +823,14 @@ msgstr "-l, --list list filer eid av den gitte pakken\n"
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"-m, --foreign list opp installerte pakker som ikke er i synkdatabasen(e) "
-"[filter]\n"
+msgstr "-m, --foreign list opp installerte pakker som ikke er i synkdatabasen(e) [filter]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"-n, --native list installerte pakker bare funnet i synkdatabasen(e) "
-"[filter]\n"
+msgstr "-n, --native list installerte pakker bare funnet i synkdatabasen(e) [filter]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -863,8 +840,7 @@ msgstr "-o, --owns <fil> finn pakken som eier <fil>\n"
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"-p, --file <pakke> ta utgangspunkt i en pakkefil istedenfor databasen\n"
+msgstr "-p, --file <pakke> ta utgangspunkt i en pakkefil istedenfor databasen\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
@@ -876,19 +852,14 @@ msgstr "-q, --quiet vis mindre informasjon for forespørsler og søk\n"
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"-s, --search <regex> søk i lokalt installerte pakker for samsvarende tekst-"
-"strenger\n"
+msgstr "-s, --search <regex> søk i lokalt installerte pakker for samsvarende tekst-strenger\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"-t, --unrequired vis pakker som ikke kreves av (eller er valgfrie for)\n"
-"noen installerte pakker (bruk -tt for å ignorere valgfrie avhengigeter) "
-"[filter]\n"
+msgstr "-t, --unrequired vis pakker som ikke kreves av (eller er valgfrie for)\nnoen installerte pakker (bruk -tt for å ignorere valgfrie avhengigeter) [filter]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -900,17 +871,14 @@ msgstr "-u, --upgrades list opp utdaterte pakker [filter]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"-c, --clean fjern gamle pakker fra mellomlagringsmappen (-cc for alt)\n"
+msgstr "-c, --clean fjern gamle pakker fra mellomlagringsmappen (-cc for alt)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"-g, --groups vis alle medlemmer i en pakkegruppe\n"
-"(bruk -gg for å vise alle grupper og medlemmer)\n"
+msgstr "-g, --groups vis alle medlemmer i en pakkegruppe\n(bruk -gg for å vise alle grupper og medlemmer)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
@@ -926,37 +894,28 @@ msgstr "-l, --list <brønn> vis en liste over pakker i en pakkebrønn\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <regex> søk i eksterne pakkebrønner etter samsvarende tekst-"
-"strenger\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regex> søk i eksterne pakkebrønner etter samsvarende tekst-strenger\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade oppgradér installerte pakker (--uu tillater "
-"nedgraderinger)\n"
+msgstr "  -u, --sysupgrade oppgradér installerte pakker (--uu tillater nedgraderinger)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"-w, --downloadonly last ned pakker uten å installere/oppgradere noen ting\n"
+msgstr "-w, --downloadonly last ned pakker uten å installere/oppgradere noen ting\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh last ned oppdaterte pakkedatabaser fra serveren\n"
-"                       (bruk -yy for å tvinge nedlasting av oppdarerte "
-"lister)\n"
+msgstr "  -y, --refresh last ned oppdaterte pakkedatabaser fra serveren\n                       (bruk -yy for å tvinge nedlasting av oppdarerte lister)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -973,16 +932,12 @@ msgstr "      --asexplicit     marker pakker som manuelt installert\n"
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"-k, --check sjekk gyldighet til lokal pakkedatabase (-kk for synk.-"
-"databaser)\n"
+msgstr "-k, --check sjekk gyldighet til lokal pakkedatabase (-kk for synk.-databaser)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
-"-s, --search <fil> søk gjennom pakkenes fillister etter samsvarende "
-"tekststrenger\n"
+msgstr "-s, --search <fil> søk gjennom pakkenes fillister etter samsvarende tekststrenger\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
@@ -994,29 +949,22 @@ msgstr "-x, --regex bruk regulære uttrykk til søking\n"
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"--machinereadable\n"
-"produserer maskinlesbar utdata\n"
+msgstr "--machinereadable\nproduserer maskinlesbar utdata\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          tving installasjon, skriv over eksisterende filer\n"
+msgstr "      --force          tving installasjon, skriv over eksisterende filer\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         installér pakker som om de skulle vært installert "
-"automatisk\n"
+msgstr "      --asdeps         installér pakker som om de skulle vært installert automatisk\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     installér pakker som om de skulle vært manuelt "
-"installert\n"
+msgstr "      --asexplicit     installér pakker som om de skulle vært manuelt installert\n"
 
 #: src/pacman/pacman.c:194
 #, c-format
@@ -1030,35 +978,26 @@ msgstr "      --ignore <pakke> ignorer en (kommaseparert) liste med pakker\n"
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <gruppe>\n"
-"                       ignorer en (kommaseparert) liste med pakkegrupper\n"
+msgstr "      --ignoregroup <gruppe>\n                       ignorer en (kommaseparert) liste med pakkegrupper\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         hopp over kontroll av versjon for avhengigheter (-dd "
-"for å hoppe over alle)\n"
+msgstr "  -d, --nodeps         hopp over kontroll av versjon for avhengigheter (-dd for å hoppe over alle)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"  --assume-installed   <pakke=versjon>\n"
-"                       legger til en virtuell pakke for å tilfredsstille "
-"avhengigheter\n"
+msgstr "  --assume-installed   <pakke=versjon>\n                       legger til en virtuell pakke for å tilfredsstille avhengigheter\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         kun endre databaseoppføringer, ikke pakkefiler\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         kun endre databaseoppføringer, ikke pakkefiler\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
@@ -1070,26 +1009,21 @@ msgstr "      --noprogressbar   ikke vis framdrift ved nedlasting av filer\n"
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet     ikke kjør installasjons-scriptet, om det finnes\n"
+msgstr "      --noscriptlet     ikke kjør installasjons-scriptet, om det finnes\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          lister valgte pakker istedenfor å utføre den valgte "
-"handlingen\n"
+msgstr "  -p, --print          lister valgte pakker istedenfor å utføre den valgte handlingen\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                       angir hvordan valgene skal listes\n"
+msgstr "      --print-format <string>\n                       angir hvordan valgene skal listes\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1114,9 +1048,7 @@ msgstr "      --arch <arch>    bruk en alternativ arkitektur\n"
 #: src/pacman/pacman.c:215
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <mappe> bruk en alternativ plassering for mellomlagring av "
-"pakker\n"
+msgstr "      --cachedir <mappe> bruk en alternativ plassering for mellomlagring av pakker\n"
 
 #: src/pacman/pacman.c:216
 #, c-format
@@ -1163,9 +1095,7 @@ msgstr "      --confirm alltid spør om bekreftelse\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Dette programmet kan fritt distribueres under\n"
-"                       betingelsene til GNU General Public License.\n"
+msgstr "                       Dette programmet kan fritt distribueres under\n                       betingelsene til GNU General Public License.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1524,9 +1454,7 @@ msgstr "kunne ikke låse database: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  hvis du vet at ingen pakkebehandler kjører allerede,\n"
-"  kan du fjerne %s\n"
+msgstr "  hvis du vet at ingen pakkebehandler kjører allerede,\n  kan du fjerne %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
@@ -1561,8 +1489,7 @@ msgstr "kunne ikke synkronisere noen databaser\n"
 #: src/pacman/util.c:639
 #, c-format
 msgid "insufficient columns available for table display\n"
-msgstr ""
-"det er et utilstrekkelig antall kolonner tilgjengelig for tabellvisning\n"
+msgstr "det er et utilstrekkelig antall kolonner tilgjengelig for tabellvisning\n"
 
 #: src/pacman/util.c:760
 #, c-format
diff --git a/src/pacman/po/nl.po b/src/pacman/po/nl.po
index dfe1ae4b..56d25133 100644
--- a/src/pacman/po/nl.po
+++ b/src/pacman/po/nl.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Jan-Jaap Korpershoek <jjkorpershoek96@gmail.com>, 2015
 # Jente <inactive+Unia@transifex.com>, 2013
@@ -19,12 +19,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 11:42+0000\n"
 "Last-Translator: Peter van den Hurk\n"
-"Language-Team: Dutch (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/nl/)\n"
-"Language: nl\n"
+"Language-Team: Dutch (http://www.transifex.com/toofishes/archlinux-pacman/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
@@ -150,16 +149,12 @@ msgstr "%s vereist optioneel %s\n"
 #: src/pacman/callback.c:320 src/pacman/callback.c:326
 #, c-format
 msgid "%s installed as %s.pacnew\n"
-msgstr ""
-"%s is geïnstalleerd als %s.pacnew\n"
-"\n"
+msgstr "%s is geïnstalleerd als %s.pacnew\n\n"
 
 #: src/pacman/callback.c:336 src/pacman/callback.c:342
 #, c-format
 msgid "%s saved as %s.pacsave\n"
-msgstr ""
-"%s is opgeslagen als %s.pacsave\n"
-"\n"
+msgstr "%s is opgeslagen als %s.pacsave\n\n"
 
 #: src/pacman/callback.c:390
 #, c-format
@@ -186,13 +181,10 @@ msgstr "%s en %s conflicteren (%s). %s verwijderen?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Het volgende pakket kan niet worden geüpgrade vanwege onoplosbare "
-"afhankelijkheden:\n"
-msgstr[1] ""
-"De volgende pakketten kunnen niet worden geüpgraded vanwege onoplosbare "
-"afhankelijkheden:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Het volgende pakket kan niet worden geüpgrade vanwege onoplosbare afhankelijkheden:\n"
+msgstr[1] "De volgende pakketten kunnen niet worden geüpgraded vanwege onoplosbare afhankelijkheden:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -213,15 +205,12 @@ msgstr[1] "Er zijn %zu providers beschikbaar voor %s:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Bestand %s is corrupt (%s).\n"
-"Wilt u dit bestand verwijderen?"
+msgstr "Bestand %s is corrupt (%s).\nWilt u dit bestand verwijderen?"
 
 #: src/pacman/callback.c:478
 #, c-format
 msgid "Import PGP key %u%c/%s, \"%s\", created: %s (revoked)?"
-msgstr ""
-"Importeren van PGP sleutel %u%c/%s, \"%s\", aangemaakt: %s (herroepen)?"
+msgstr "Importeren van PGP sleutel %u%c/%s, \"%s\", aangemaakt: %s (herroepen)?"
 
 #: src/pacman/callback.c:481
 #, c-format
@@ -405,17 +394,13 @@ msgstr "configuratiebestand %s, regel %d: ongeldige waarde voor '%s' : '%s'\n"
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"configuratiebestand %s, regel %d: '%s' optie ongeldig, geen ondersteuning "
-"voor handtekeningen\n"
+msgstr "configuratiebestand %s, regel %d: '%s' optie ongeldig, geen ondersteuning voor handtekeningen\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"Configuratiebstand %s, regel %d: richtlijn '%s' in sectie '%s' niet "
-"herkend.\n"
+msgstr "Configuratiebstand %s, regel %d: richtlijn '%s' in sectie '%s' niet herkend.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
@@ -442,10 +427,7 @@ msgstr "kan mirror '%s' niet toevoegen aan database '%s' (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"fout bij het initialiseren van de alpm bibliotheek\n"
-"(%s: %s)\n"
-"\n"
+msgstr "fout bij het initialiseren van de alpm bibliotheek\n(%s: %s)\n\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -480,21 +462,17 @@ msgstr "Doorgeven van %s aan libalpm mislukt"
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"Configuratiebestand %s, regel %d: optie '%s' in sectie '%s' niet herkend.\n"
+msgstr "Configuratiebestand %s, regel %d: optie '%s' in sectie '%s' niet herkend.\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
-"configuratiebestand %s, regel %d: richtlijn '%s' heeft een waarde nodig\n"
+msgstr "configuratiebestand %s, regel %d: richtlijn '%s' heeft een waarde nodig\n"
 
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"het verwerken van de configuratie overschreed de maximale recursiediepte van "
-"%d.\n"
+msgstr "het verwerken van de configuratie overschreed de maximale recursiediepte van %d.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -504,9 +482,7 @@ msgstr "configuratiebestand %s kan niet worden gelezen: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"configuratiebestand %s, regel %d: Alle richtlijnen moeten tot een sectie "
-"behoren.\n"
+msgstr "configuratiebestand %s, regel %d: Alle richtlijnen moeten tot een sectie behoren.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -527,8 +503,7 @@ msgstr "kon installatiereden niet instellen voor pakket %s (%s)\n"
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
-"%s: installatiereden is ingesteld tot 'geïnstalleerd als afhankelijkheid'\n"
+msgstr "%s: installatiereden is ingesteld tot 'geïnstalleerd als afhankelijkheid'\n"
 
 #: src/pacman/database.c:80
 #, c-format
@@ -777,18 +752,14 @@ msgstr "operaties:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"gebruik '%s {-h --help}' met een operatie om de beschikbare opties weer te "
-"geven\n"
+msgstr "\ngebruik '%s {-h --help}' met een operatie om de beschikbare opties weer te geven\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"-c, --cascade        verwijder pakketten en alle pakketten die daar "
-"afhankelijk van zijn\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "-c, --cascade        verwijder pakketten en alle pakketten die daar afhankelijk van zijn\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -800,10 +771,7 @@ msgstr "  -n, --nosave         verwijder configuratiebestanden\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      verwijder onbenodigde afhankelijkheden\n"
-"                       (-ss verwijdert ook expliciet geïnstalleerde "
-"afhankelijkheden)\n"
+msgstr "  -s, --recursive      verwijder onbenodigde afhankelijkheden\n                       (-ss verwijdert ook expliciet geïnstalleerde afhankelijkheden)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -824,16 +792,12 @@ msgstr "  -c, --changelog      geef het changelog van een pakket weer\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           geef pakketten weer die geïnstalleerd zijn als "
-"afhankelijkheden [filter]\n"
+msgstr "  -d, --deps           geef pakketten weer die geïnstalleerd zijn als afhankelijkheden [filter]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       geef pakketten weer die expliciet geïnstalleerd zijn "
-"[filter]\n"
+msgstr "  -e, --explicit       geef pakketten weer die expliciet geïnstalleerd zijn [filter]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -842,81 +806,63 @@ msgstr "  -g, --groups         geef alle leden weer van een pakketgroep\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           geef pakketinformatie weer (-ii in geval van "
-"backupbestanden)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           geef pakketinformatie weer (-ii in geval van backupbestanden)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          controleer dat bestand bestaat (-kk voor "
-"bestandseigenschappen)\n"
+msgstr "  -k, --check          controleer dat bestand bestaat (-kk voor bestandseigenschappen)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"-l, --list geeft de bestanden weer waar het bevraagde pakket eigenaar van "
-"is\n"
+msgstr "-l, --list geeft de bestanden weer waar het bevraagde pakket eigenaar van is\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        geef geïnstalleerde pakketten weer die niet in "
-"gesynchroniseerde databases gevonden worden [filter]\n"
+msgstr "  -m, --foreign        geef geïnstalleerde pakketten weer die niet in gesynchroniseerde databases gevonden worden [filter]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         geef geïnstalleerde pakketten weer die alleen in "
-"gesynchroniseerde databases gevonden worden [filter]\n"
+msgstr "  -n, --native         geef geïnstalleerde pakketten weer die alleen in gesynchroniseerde databases gevonden worden [filter]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
-msgstr ""
-"  -o, --owns <bestand>    zoek het pakket op dat eigenaar is van <bestand>\n"
+msgstr "  -o, --owns <bestand>    zoek het pakket op dat eigenaar is van <bestand>\n"
 
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"  -p, --file <pakket> doorzoek een pakketbestand in plaats van de database\n"
+msgstr "  -p, --file <pakket> doorzoek een pakketbestand in plaats van de database\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          geef minder uitvoer weer bij opvragen en zoeken\n"
+msgstr "  -q, --quiet          geef minder uitvoer weer bij opvragen en zoeken\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex> zoek naar overeenstemmende tekst in lokaal "
-"geïnstalleerde pakketten\n"
+msgstr "  -s, --search <regex> zoek naar overeenstemmende tekst in lokaal geïnstalleerde pakketten\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"-t, --unrequired Toon pakketten die niet (optioneel) door een ander pakket "
-"worden vereist (-tt negeert optionele afhankelijkheden) [filter]\n"
+msgstr "-t, --unrequired Toon pakketten die niet (optioneel) door een ander pakket worden vereist (-tt negeert optionele afhankelijkheden) [filter]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -928,19 +874,14 @@ msgstr "  -u, --upgrades       geef verouderde pakketten weer [filter]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          verwijder oude pakketten uit de cache (-cc verwijdert "
-"alle pakketten)\n"
+msgstr "  -c, --clean          verwijder oude pakketten uit de cache (-cc verwijdert alle pakketten)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"-g, --groups geef alle leden weer van een pakketgroep\n"
-"(-gg om alle groepen en leden te zien)\n"
-"\n"
+msgstr "-g, --groups geef alle leden weer van een pakketgroep\n(-gg om alle groepen en leden te zien)\n\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
@@ -956,43 +897,33 @@ msgstr "  -l, --list <repo>    geef de lijst met pakketten in een repo weer\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <regex> zoek overeenstemmende tekst in repositories op "
-"afstand\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regex> zoek overeenstemmende tekst in repositories op afstand\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade upgrade geïnstalleerde pakketten (-uu staat downgrades "
-"toe)\n"
+msgstr "  -u, --sysupgrade upgrade geïnstalleerde pakketten (-uu staat downgrades toe)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   pakketten enkel downloaden en niet installeren/"
-"upgraden\n"
+msgstr "  -w, --downloadonly   pakketten enkel downloaden en niet installeren/upgraden\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"-y, --refresh download verse pakket-databases van de server\n"
-"(-yy forceert een verversing, ook als de database actueel is)\n"
+msgstr "-y, --refresh download verse pakket-databases van de server\n(-yy forceert een verversing, ook als de database actueel is)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         markeer pakketten als niet-expliciet geïnstalleerd\n"
+msgstr "      --asdeps         markeer pakketten als niet-expliciet geïnstalleerd\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
@@ -1004,16 +935,12 @@ msgstr "      --asexplicit     markeer pakketten als expliciet geïnstalleerd\n"
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"-k, --check test lokale database op geldigheid (-kk om de databases te "
-"synchroniseren)\n"
+msgstr "-k, --check test lokale database op geldigheid (-kk om de databases te synchroniseren)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
-"-s, --search <bestand> doorzoek pakketbestandsnamen op overeenstemmende "
-"tekst\n"
+msgstr "-s, --search <bestand> doorzoek pakketbestandsnamen op overeenstemmende tekst\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
@@ -1025,107 +952,81 @@ msgstr "-x, --regex maak mogelijk om te zoeken m.b.v. reguliere expressies\n"
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"--machinereadable\n"
-"maak output machine-leesbaar\n"
+msgstr "--machinereadable\nmaak output machine-leesbaar\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          forceer installatie, conflicterende bestanden "
-"overschrijven\n"
+msgstr "      --force          forceer installatie, conflicterende bestanden overschrijven\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         installeer pakketten als niet-expliciet "
-"geïnstalleerd\n"
+msgstr "      --asdeps         installeer pakketten als niet-expliciet geïnstalleerd\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     installeer pakketten als expliciet geïnstalleerd\n"
+msgstr "      --asexplicit     installeer pakketten als expliciet geïnstalleerd\n"
 
 #: src/pacman/pacman.c:194
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg>   negeer de upgrade van een pakket (kan meer dan eens "
-"gebruikt worden)\n"
+msgstr "      --ignore <pkg>   negeer de upgrade van een pakket (kan meer dan eens gebruikt worden)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                       negeer de upgrade van een groep (kan meer dan eens "
-"gebruikt worden)\n"
+msgstr "      --ignoregroup <grp>\n                       negeer de upgrade van een groep (kan meer dan eens gebruikt worden)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         controles van versie van afhankelijk overslaan (-dd "
-"om alle controles over te slaan)\n"
+msgstr "  -d, --nodeps         controles van versie van afhankelijk overslaan (-dd om alle controles over te slaan)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"--assume-installed <pakket=versie>\n"
-"voeg een virtueel pakket toe om afhankelijkheden te voldoen\n"
+msgstr "--assume-installed <pakket=versie>\nvoeg een virtueel pakket toe om afhankelijkheden te voldoen\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         alleen database entries aanpassen, niet de "
-"pakketbestanden\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         alleen database entries aanpassen, niet de pakketbestanden\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  geef geen voortgangsbalk weer bij het downloaden van "
-"bestanden\n"
+msgstr "      --noprogressbar  geef geen voortgangsbalk weer bij het downloaden van bestanden\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet    installatiescript niet uitvoeren als er een bestaat\n"
+msgstr "      --noscriptlet    installatiescript niet uitvoeren als er een bestaat\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          geef de doelen weer in plaats van het uitvoeren van "
-"de operatie\n"
+msgstr "  -p, --print          geef de doelen weer in plaats van het uitvoeren van de operatie\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                       specificeer hoe de doelen moeten worden weergegeven\n"
+msgstr "      --print-format <string>\n                       specificeer hoe de doelen moeten worden weergegeven\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1150,9 +1051,7 @@ msgstr "      --arch <arch>    stel een alternatieve architectuur in\n"
 #: src/pacman/pacman.c:215
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <map> stel een alternatieve locatie voor de pakket-cache "
-"in\n"
+msgstr "      --cachedir <map> stel een alternatieve locatie voor de pakket-cache in\n"
 
 #: src/pacman/pacman.c:216
 #, c-format
@@ -1199,9 +1098,7 @@ msgstr "--confirm vraag altijd om bevestiging\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Dit programma mag vrij gedistribueerd worden\n"
-"                       conform de GNU General Public License.\n"
+msgstr "                       Dit programma mag vrij gedistribueerd worden\n                       conform de GNU General Public License.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1560,9 +1457,7 @@ msgstr "kon database niet locken: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  als u zeker bent dat er geen andere pakketbeheerder\n"
-"  draait, dan kunt u %s verwijderen\n"
+msgstr "  als u zeker bent dat er geen andere pakketbeheerder\n  draait, dan kunt u %s verwijderen\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/pl.po b/src/pacman/po/pl.po
index 82da60a3..e808ad6e 100644
--- a/src/pacman/po/pl.po
+++ b/src/pacman/po/pl.po
@@ -1,41 +1,41 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Bartek Piotrowski <barthalion@gmail.com>, 2011
 # Bartłomiej Piotrowski <spam@bpiotrowski.pl>, 2013-2014
 # dominik232 <dominik232@gmail.com>, 2016
+# dominik232 <dominik232@gmail.com>, 2016
 # kichawa <boxbolky@gmail.com>, 2013
 # Chris Warrick <kwpolska@gmail.com>, 2011-2012
 # megamann, 2014
 # megamann, 2014
+# megamann, 2016
 # Piotr Strębski <strebski@o2.pl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
-"PO-Revision-Date: 2016-01-17 07:58+0000\n"
-"Last-Translator: dominik232 <dominik232@gmail.com>\n"
-"Language-Team: Polish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/pl/)\n"
-"Language: pl\n"
+"PO-Revision-Date: 2016-01-30 09:08+0000\n"
+"Last-Translator: megamann\n"
+"Language-Team: Polish (http://www.transifex.com/toofishes/archlinux-pacman/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/pacman/callback.c:182
 #, c-format
 msgid "Running pre-transaction hooks...\n"
-msgstr ""
+msgstr "Uruchamianie przed-transakcji...\n\n"
 
 #: src/pacman/callback.c:184
 #, c-format
 msgid "Running post-transaction hooks...\n"
-msgstr ""
+msgstr "Uruchamianie po-transakcji...\n"
 
 #: src/pacman/callback.c:197
 #, c-format
@@ -182,16 +182,11 @@ msgstr "%s i %s konfliktują ze sobą (%s). Usunąć %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Następujący pakiet nie mógł zostać zaktualizowany w wyniku niespełnionych "
-"zależności:\n"
-msgstr[1] ""
-"Następujące pakiety nie mogły zostać zaktualizowane w wyniku niespełnionych "
-"zależności:\n"
-msgstr[2] ""
-"Następujące pakiety nie mogły zostać zaktualizowane w wyniku niespełnionych "
-"zależności:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Następujący pakiet nie mógł zostać zaktualizowany w wyniku niespełnionych zależności:\n"
+msgstr[1] "Następujące pakiety nie mogły zostać zaktualizowane w wyniku niespełnionych zależności:\n"
+msgstr[2] "Następujące pakiety nie mogły zostać zaktualizowane w wyniku niespełnionych zależności:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -205,28 +200,26 @@ msgstr[2] "Czy chcesz pominąć powyższe pakiety przy aktualizacji?"
 #, c-format
 msgid "There is %zu provider available for %s\n"
 msgid_plural "There are %zu providers available for %s:\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Dostępny jest %zu dostawca dla %s\n"
+msgstr[1] "Dostępnych jest %zu dostawców dla %s\n"
+msgstr[2] "Dostępnych jest %zu dostawców dla %s\n"
 
 #: src/pacman/callback.c:464
 #, c-format
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Plik %s jest uszkodzony (%s).\n"
-"Czy chcesz go usunąć?"
+msgstr "Plik %s jest uszkodzony (%s).\nCzy chcesz go usunąć?"
 
 #: src/pacman/callback.c:478
 #, c-format
 msgid "Import PGP key %u%c/%s, \"%s\", created: %s (revoked)?"
-msgstr ""
+msgstr "Zaimportować klucz PGP %u%c/%s, \"%s\", utworzony: %s (cofnięty)?"
 
 #: src/pacman/callback.c:481
 #, c-format
 msgid "Import PGP key %u%c/%s, \"%s\", created: %s?"
-msgstr ""
+msgstr "Zaimportować klucz PGP %u%c/%s, \"%s\", utworzony: %s?"
 
 #: src/pacman/callback.c:540
 #, c-format
@@ -372,9 +365,9 @@ msgstr[2] "%jd zmienionych plików\n"
 #, c-format
 msgid "malloc failure: could not allocate %zu byte\n"
 msgid_plural "malloc failure: could not allocate %zu bytes\n"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "błąd malloc: nie udało się przydzielić %zu bajtu\n"
+msgstr[1] "błąd malloc: nie udało się przydzielić %zu bajtów\n"
+msgstr[2] "błąd malloc: nie udało się przydzielić %zu bajtów\n"
 
 #: src/pacman/conf.c:251
 #, c-format
@@ -404,30 +397,23 @@ msgstr "nie udało się przywrócić katalogu roboczego (%s)\n"
 #: src/pacman/conf.c:397 src/pacman/conf.c:447 src/pacman/conf.c:541
 #, c-format
 msgid "config file %s, line %d: invalid value for '%s' : '%s'\n"
-msgstr ""
-"plik konfiguracyjny %s, linia %d: niewłaściwa wartość dla '%s' : '%s'\n"
+msgstr "plik konfiguracyjny %s, linia %d: niewłaściwa wartość dla '%s' : '%s'\n"
 
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"plik konfiguracyjny %s, linia %d: opcja '%s' nieprawidłowa, brak wsparcia "
-"dla sygnatur\n"
+msgstr "plik konfiguracyjny %s, linia %d: opcja '%s' nieprawidłowa, brak wsparcia dla sygnatur\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"plik konfiguracyjny %s, linia %d: dyrektywa '%s' w sekcji '%s' nie została "
-"rozpoznana.\n"
+msgstr "plik konfiguracyjny %s, linia %d: dyrektywa '%s' w sekcji '%s' nie została rozpoznana.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"serwer lustrzany '%s' zawiera zmienną '%s', ale %s nie zostało "
-"zdefiniowane.\n"
+msgstr "serwer lustrzany '%s' zawiera zmienną '%s', ale %s nie zostało zdefiniowane.\n"
 
 #: src/pacman/conf.c:641
 #, c-format
@@ -449,14 +435,12 @@ msgstr "nie udało się dodać serwera lustrzanego '%s' do bazy '%s' (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"Nie można zainicjować biblioteki alpm\n"
-"(%s: %s)\n"
+msgstr "Nie można zainicjować biblioteki alpm\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
 msgid "try running pacman-db-upgrade\n"
-msgstr ""
+msgstr "spróbuj uruchomić pacman-db-upgrade\n"
 
 #: src/pacman/conf.c:744
 #, c-format
@@ -471,7 +455,7 @@ msgstr "problem z ustawieniem katalogu gpg '%s' (%s)\n"
 #: src/pacman/conf.c:763 src/pacman/conf.c:771
 #, c-format
 msgid "problem adding hookdir '%s' (%s)\n"
-msgstr ""
+msgstr "problem z dodaniem katalogu (hookdir) '%s' (%s)\n"
 
 #: src/pacman/conf.c:802
 #, c-format
@@ -481,13 +465,12 @@ msgstr "nie ma skonfigurowanego '%s'\n"
 #: src/pacman/conf.c:830
 #, c-format
 msgid "Failed to pass %s entry to libalpm"
-msgstr ""
+msgstr "Nie udało się zdać wpisu %s do libalpm"
 
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"plik konfiguracyjny %s, linia %d: '%s' opcja '%s' nie została rozpoznana\n"
+msgstr "plik konfiguracyjny %s, linia %d: '%s' opcja '%s' nie została rozpoznana\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
@@ -497,8 +480,7 @@ msgstr "plik konfiguracyjny %s, linia %d: dyrektywa %s potrzebuje wartości\n"
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"parsowanie konfiguracji przekroczyło maksymalną głębokość rekurencji, %d.\n"
+msgstr "parsowanie konfiguracji przekroczyło maksymalną głębokość rekurencji, %d.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -549,7 +531,7 @@ msgstr "Pliki kopii zapasowej"
 #: src/pacman/package.c:99
 #, c-format
 msgid "Build Date"
-msgstr ""
+msgstr "Data zbudowania"
 
 #: src/pacman/package.c:100
 #, c-format
@@ -629,52 +611,52 @@ msgstr "Opcjonalny dla"
 #: src/pacman/package.c:115
 #, c-format
 msgid "Packager"
-msgstr ""
+msgstr "Autor pakietu"
 
 #: src/pacman/package.c:116
 #, c-format
 msgid "Provides"
-msgstr ""
+msgstr "Dostarcza"
 
 #: src/pacman/package.c:117
 #, c-format
 msgid "Replaces"
-msgstr ""
+msgstr "Zastępuje"
 
 #: src/pacman/package.c:118
 #, c-format
 msgid "Repository"
-msgstr ""
+msgstr "Repozytorium"
 
 #: src/pacman/package.c:119
 #, c-format
 msgid "Required By"
-msgstr ""
+msgstr "Wymagany przez"
 
 #: src/pacman/package.c:120 src/pacman/package.c:235
 #, c-format
 msgid "SHA-256 Sum"
-msgstr ""
+msgstr "Suma SHA256"
 
 #: src/pacman/package.c:121
 #, c-format
 msgid "Signatures"
-msgstr ""
+msgstr "Podpisy"
 
 #: src/pacman/package.c:122
 #, c-format
 msgid "URL"
-msgstr ""
+msgstr "Adres url"
 
 #: src/pacman/package.c:123
 #, c-format
 msgid "Validated By"
-msgstr ""
+msgstr "Potwierdzone przez"
 
 #: src/pacman/package.c:124
 #, c-format
 msgid "Version"
-msgstr ""
+msgstr "Wersja"
 
 #: src/pacman/package.c:167 src/pacman/util.c:1205
 #, c-format
@@ -778,14 +760,13 @@ msgstr "operacje:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"użyj '%s {-h --help}' wraz z operacją aby sprawdzić dostępne opcje\n"
+msgstr "\nużyj '%s {-h --help}' wraz z operacją aby sprawdzić dostępne opcje\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
 msgstr "  -c, --cascade        usuń pakiet i wszystkie zależne pakiety\n"
 
 #: src/pacman/pacman.c:126
@@ -798,9 +779,7 @@ msgstr "  -n, --nosave         usuwa pliki konfiguracyjne\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      usuń niepotrzebne zależności\n"
-"                       (-ss obejmuje ręcznie zainstalowane)\n"
+msgstr "  -s, --recursive      usuń niepotrzebne zależności\n                       (-ss obejmuje ręcznie zainstalowane)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -835,20 +814,15 @@ msgstr "  -g, --groups         wyświetl zawartość grupy pakietów\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           wyświetl informacje o pakiecie (-ii o kopiach "
-"bezpieczeństwa.)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           wyświetl informacje o pakiecie (-ii o kopiach bezpieczeństwa.)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          sprawdź czy pliki należące do pakietów istnieją (-kk "
-"sprawdza właściwości plików)\n"
+msgstr "  -k, --check          sprawdź czy pliki należące do pakietów istnieją (-kk sprawdza właściwości plików)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
@@ -860,17 +834,14 @@ msgstr "-l, --list wyświetla zawartość pytanego pakietu\n"
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        pokaż pakiety nieznalezione w repozytoriach [filtr]\n"
+msgstr "  -m, --foreign        pokaż pakiety nieznalezione w repozytoriach [filtr]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         pokaż wyłącznie pakiety dostępne w repozytoriach "
-"[filtr]\n"
+msgstr "  -n, --native         pokaż wyłącznie pakiety dostępne w repozytoriach [filtr]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -880,33 +851,26 @@ msgstr "  -o, --owns <plik>    sprawdź do którego pakietu należy dany plik\n"
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"  -p, --file <package> sprawdź zapytanie bezpośrednio w pakiecie zamiast w "
-"bazie danych\n"
+msgstr "  -p, --file <package> sprawdź zapytanie bezpośrednio w pakiecie zamiast w bazie danych\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          pokaż mniej informacji w wynikach wyszukiwania\n"
+msgstr "  -q, --quiet          pokaż mniej informacji w wynikach wyszukiwania\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex> przeszukaj lokalnie zainstalowane pakiety pod kątem "
-"szukanego ciągu\n"
+msgstr "  -s, --search <regex> przeszukaj lokalnie zainstalowane pakiety pod kątem szukanego ciągu\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"-t, --unrequired wyświetla pakiety (opcjonalnie) nie wymagane przez żaden\n"
-"pakiet (-tt dla zignorowania opcjonalnych zależności) [filtr]\n"
+msgstr "-t, --unrequired wyświetla pakiety (opcjonalnie) nie wymagane przez żaden\npakiet (-tt dla zignorowania opcjonalnych zależności) [filtr]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -918,27 +882,21 @@ msgstr "  -u, --upgrades       pokaż nieaktualne pakiety [filtr]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          usuń stare pakiety z pamięci podręcznej (-cc usuwa "
-"wszystkie)\n"
+msgstr "  -c, --clean          usuń stare pakiety z pamięci podręcznej (-cc usuwa wszystkie)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"-g, --groups wyświetla całą zawartość grupy pakietów\n"
-"(-gg dla wyświetlenia wszystkich grup i zawartości)\n"
+msgstr "-g, --groups wyświetla całą zawartość grupy pakietów\n(-gg dla wyświetlenia wszystkich grup i zawartości)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"-i, --info wyświetla informacje o pakiecie (-ii dla rozszerzonej "
-"informacji)\n"
+msgstr "-i, --info wyświetla informacje o pakiecie (-ii dla rozszerzonej informacji)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -947,37 +905,28 @@ msgstr "  -l, --list <repo>    pokaż listę pakietów w repozytorium \n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <regex> przeszukuje zdalne repozytoria pod kątem szukanego "
-"ciągu\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regex> przeszukuje zdalne repozytoria pod kątem szukanego ciągu\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"-u, --sysupgrade aktualizacja zainstalowanych pakietów (-uu pozwala na "
-"przywrócenie poprzednich wersji)\n"
+msgstr "-u, --sysupgrade aktualizacja zainstalowanych pakietów (-uu pozwala na przywrócenie poprzednich wersji)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   wyłącznie pobierz pakiety, bez instalacji/"
-"aktualizacji czegokolwiek\n"
+msgstr "  -w, --downloadonly   wyłącznie pobierz pakiety, bez instalacji/aktualizacji czegokolwiek\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"-y, --refresh pobiera świeże bazy danych pakietów z serwera\n"
-"(-yy dla wymuszenia odświeżenia nawet jeśli są aktualne)\n"
+msgstr "-y, --refresh pobiera świeże bazy danych pakietów z serwera\n(-yy dla wymuszenia odświeżenia nawet jeśli są aktualne)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -994,31 +943,29 @@ msgstr "      --asexplicit     oznacz pakiety jako zainstalowane ręcznie\n"
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
+msgstr "-k, --check sprawdź ważność lokalnej bazy danych (-kk dla synchronizacji baz danych)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
+msgstr "-s, --search <file> szukaj nazw plików pakietów pasujących dla ciągów\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
 msgid "  -x, --regex          enable searching using regular expressions\n"
-msgstr ""
+msgstr "-x, --regex umożliwiaj wyszukiwanie za pomocą wyrażeń regularnych\n"
 
 #: src/pacman/pacman.c:185
 #, c-format
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
+msgstr "--machinereadable\nwytwórz wyjście do odczytu maszynowego\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          wymuś instalację, w tym nadpisanie konfliktujących "
-"plików\n"
+msgstr "      --force          wymuś instalację, w tym nadpisanie konfliktujących plików\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
@@ -1035,52 +982,39 @@ msgstr "      --asexplicit     zainstaluj pakiet jako zainstalowany ręcznie\n"
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg>   pomiń aktualizację pakietu (może zostać użyte więcej "
-"niż raz)\n"
+msgstr "      --ignore <pkg>   pomiń aktualizację pakietu (może zostać użyte więcej niż raz)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                       poniń aktualizację grupy (może zostać użyte więcej "
-"niż raz)\n"
+msgstr "      --ignoregroup <grp>\n                       poniń aktualizację grupy (może zostać użyte więcej niż raz)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         pomiń sprawdzanie wersji zależności (-dd pomija "
-"wszystkie sprawdzenia)\n"
+msgstr "  -d, --nodeps         pomiń sprawdzanie wersji zależności (-dd pomija wszystkie sprawdzenia)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"--assume-installed <package=version>\n"
-"dodaje pakiet wirtualny, by spełnić zależności\n"
+msgstr "--assume-installed <package=version>\ndodaje pakiet wirtualny, by spełnić zależności\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         zmodyfikuj tylko wpisy w bazie danych, nie pliki "
-"pakietów\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         zmodyfikuj tylko wpisy w bazie danych, nie pliki pakietów\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  nie pokazuj paska postępu podczas pobierania plików\n"
+msgstr "      --noprogressbar  nie pokazuj paska postępu podczas pobierania plików\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
@@ -1100,9 +1034,7 @@ msgstr "  -p, --print          wypisz cele zamiast wykonać operację\n"
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                       opisuje sposób wypisania celów\n"
+msgstr "      --print-format <string>\n                       opisuje sposób wypisania celów\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1127,14 +1059,12 @@ msgstr "      --arch <arch>    ustaw alternatywną architekturę\n"
 #: src/pacman/pacman.c:215
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <dir> ustaw alternatywną lokalizację pamięci podręcznej "
-"pakietów\n"
+msgstr "      --cachedir <dir> ustaw alternatywną lokalizację pamięci podręcznej pakietów\n"
 
 #: src/pacman/pacman.c:216
 #, c-format
 msgid "      --hookdir <dir>  set an alternate hook location\n"
-msgstr ""
+msgstr "--hookdir <dir> ustaw alternatywną lokalizację zaczepów\n"
 
 #: src/pacman/pacman.c:217
 #, c-format
@@ -1176,9 +1106,7 @@ msgstr "--confirm zawsze pytaj o potwierdzenie\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Ten program może być swobodnie rozpowszechniany na\n"
-"                       zasadach licencji GNU General Public License.\n"
+msgstr "                       Ten program może być swobodnie rozpowszechniany na\n                       zasadach licencji GNU General Public License.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1318,7 +1246,7 @@ msgstr "nie udało się przygotować transakcji (%s)\n"
 #: src/pacman/remove.c:125 src/pacman/sync.c:724
 #, c-format
 msgid "%s: removing %s breaks dependency '%s'\n"
-msgstr ""
+msgstr "%s: usuwanie %s zależność przerw '%s'\n"
 
 #: src/pacman/remove.c:144
 #, c-format
@@ -1328,9 +1256,7 @@ msgstr "%s desygnowany jest jako HoldPkg.\n"
 #: src/pacman/remove.c:149
 #, c-format
 msgid "HoldPkg was found in target list. Do you want to continue?"
-msgstr ""
-"Na liście celów znaleziono pakiet oznaczony jako HoldPkg. Czy chcesz "
-"kontynuować?"
+msgstr "Na liście celów znaleziono pakiet oznaczony jako HoldPkg. Czy chcesz kontynuować?"
 
 #: src/pacman/remove.c:157 src/pacman/sync.c:781
 #, c-format
@@ -1458,7 +1384,7 @@ msgstr "%s: wymaga %s\n"
 #: src/pacman/sync.c:720
 #, c-format
 msgid "%s: installing %s (%s) breaks dependency '%s'\n"
-msgstr ""
+msgstr "%s: instalacja %s (%s) zależność przerw '%s'\n"
 
 #: src/pacman/sync.c:744
 #, c-format
@@ -1540,9 +1466,7 @@ msgstr "nie udało się zablokować bazy danych: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  jeśli jesteś pewien, że menedżer pakietów nie jest\n"
-"  już uruchomiony, możesz usunąć %s.\n"
+msgstr "  jeśli jesteś pewien, że menedżer pakietów nie jest\n  już uruchomiony, możesz usunąć %s.\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/pt.po b/src/pacman/po/pt.po
index 5348a307..81a6e0eb 100644
--- a/src/pacman/po/pt.po
+++ b/src/pacman/po/pt.po
@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Allan McRae <allan@archlinux.org>, 2013
 # Allan McRae <allan@archlinux.org>, 2013
 # ArchGalileu <geral@gasparsantos.eu>, 2011,2014
-# Bruno Guerreiro <american.jesus.pt@gmail.com>, 2013,2015
+# Bruno Guerreiro <american.jesus.pt@gmail.com>, 2013,2015-2016
 # Dan McGee <dpmcgee@gmail.com>, 2011
 # DarkVenger <thedarkvenger@gmail.com>, 2012
 # ArchGalileu <geral@gasparsantos.eu>, 2011
 # Paulo Santos <paulo.r.santos@sapo.pt>, 2011
-# R00KIE <registosites@hotmail.com>, 2011
+# R00KIE <registosites@hotmail.com>, 2011,2016
 # R00KIE <registosites@hotmail.com>, 2016
 # R00KIE <registosites@hotmail.com>, 2011
 # DarkVenger <thedarkvenger@gmail.com>, 2012
@@ -20,14 +20,13 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
-"PO-Revision-Date: 2016-01-17 14:47+0000\n"
-"Last-Translator: R00KIE <registosites@hotmail.com>\n"
-"Language-Team: Portuguese (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/pt/)\n"
-"Language: pt\n"
+"PO-Revision-Date: 2016-02-01 20:19+0000\n"
+"Last-Translator: Bruno Guerreiro <american.jesus.pt@gmail.com>\n"
+"Language-Team: Portuguese (http://www.transifex.com/toofishes/archlinux-pacman/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
@@ -108,9 +107,7 @@ msgstr "a transferir chaves necessárias...\n"
 #: src/pacman/callback.c:267
 #, c-format
 msgid "loading package files...\n"
-msgstr ""
-"a carregar ficheiros dos pacotes...\n"
-"\n"
+msgstr "a carregar ficheiros dos pacotes...\n"
 
 #: src/pacman/callback.c:271
 #, c-format
@@ -150,7 +147,7 @@ msgstr "a verificar espaço disponível no disco...\n"
 #: src/pacman/callback.c:302
 #, c-format
 msgid "%s optionally requires %s\n"
-msgstr "%s  requer opcionalmente %s\n"
+msgstr "%s requer opcionalmente %s\n"
 
 #: src/pacman/callback.c:320 src/pacman/callback.c:326
 #, c-format
@@ -187,13 +184,10 @@ msgstr "%s e %s estão em conflito (%s). Remover %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"O seguinte pacote não pode ser actualizado devido a dependências não "
-"resolvidas:\n"
-msgstr[1] ""
-"Os seguintes pacotes não pode ser actualizados devido a dependências não "
-"resolvidas:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "O seguinte pacote não pode ser actualizado devido a dependências não resolvidas:\n"
+msgstr[1] "Os seguintes pacotes não pode ser actualizados devido a dependências não resolvidas:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -206,7 +200,7 @@ msgstr[1] "Deseja ignorar os pacotes acima para esta atualização?"
 #, c-format
 msgid "There is %zu provider available for %s\n"
 msgid_plural "There are %zu providers available for %s:\n"
-msgstr[0] "Existe %zu fornecedor disponível para %s:\n"
+msgstr[0] "Existe %zu fornecedor disponível para %s\n"
 msgstr[1] "Existem %zu fornecedores disponíveis para %s:\n"
 
 #: src/pacman/callback.c:464
@@ -214,9 +208,7 @@ msgstr[1] "Existem %zu fornecedores disponíveis para %s:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"O ficheiro %s está corrompido (%s).\n"
-"Deseja apagá-lo?"
+msgstr "O ficheiro %s está corrompido (%s).\nDeseja apagá-lo?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -301,7 +293,7 @@ msgstr "%s: %s (GID não corresponde)\n"
 #: src/pacman/check.c:101
 #, c-format
 msgid "%s: %s (Permissions mismatch)\n"
-msgstr "%s: %s (Permissões não correspondem) \n"
+msgstr "%s: %s (Permissões não correspondem)\n"
 
 #: src/pacman/check.c:115 src/pacman/check.c:162
 #, c-format
@@ -356,7 +348,7 @@ msgstr "%s: nenhum ficheiro mtree\n"
 #: src/pacman/check.c:333
 #, c-format
 msgid "file type not recognized: %s%s\n"
-msgstr "Tipo de ficheiro não reconhecido: %s%s\n"
+msgstr "tipo de ficheiro não reconhecido: %s%s\n"
 
 #: src/pacman/check.c:382
 #, c-format
@@ -390,7 +382,7 @@ msgstr "a executar XferCommand: erro no fork!\n"
 #: src/pacman/conf.c:277
 #, c-format
 msgid "could not rename %s to %s (%s)\n"
-msgstr "Não foi possível renomear %s para %s (%s)\n"
+msgstr "não foi possível renomear %s para %s (%s)\n"
 
 #: src/pacman/conf.c:288
 #, c-format
@@ -400,30 +392,23 @@ msgstr "não é possível restaurar diretório em trabalho (%s)\n"
 #: src/pacman/conf.c:397 src/pacman/conf.c:447 src/pacman/conf.c:541
 #, c-format
 msgid "config file %s, line %d: invalid value for '%s' : '%s'\n"
-msgstr ""
-"ficheiro de configuração %s, linha %d: valor inválido para '%s' : '%s'\n"
+msgstr "ficheiro de configuração %s, linha %d: valor inválido para '%s' : '%s'\n"
 
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"ficheiro de configuração %s, linha %d: '%s' opção inválida, sem suporte para "
-"assinatura\n"
+msgstr "ficheiro de configuração %s, linha %d: '%s' opção inválida, sem suporte para assinatura\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"ficheiro de configuração %s, linha %d: directiva '%s' na secção '%s' não "
-"reconhecida.\n"
+msgstr "ficheiro de configuração %s, linha %d: directiva '%s' na secção '%s' não reconhecida.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"a alternativa '%s' contém a variável '%s', mas '%s' não está definida.\n"
-"\n"
+msgstr "a alternativa '%s' contém a variável '%s', mas '%s' não está definida.\n"
 
 #: src/pacman/conf.c:641
 #, c-format
@@ -438,17 +423,14 @@ msgstr "não foi possível registrar a base de dados '%s' (%s)\n"
 #: src/pacman/conf.c:676
 #, c-format
 msgid "could not add mirror '%s' to database '%s' (%s)\n"
-msgstr ""
-"Não foi possível adicionar a alternativa '%s' à base de dados '%s' (%s)\n"
+msgstr "não foi possível adicionar a alternativa '%s' à base de dados '%s' (%s)\n"
 
 #: src/pacman/conf.c:722
 #, c-format
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"falhou a inicialização da libraria alpm\n"
-"(%s: %s)\n"
+msgstr "falhou a inicialização da libraria alpm\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -468,7 +450,7 @@ msgstr "problema ao configurar gpgdir '%s' (%s)\n"
 #: src/pacman/conf.c:763 src/pacman/conf.c:771
 #, c-format
 msgid "problem adding hookdir '%s' (%s)\n"
-msgstr "problema ao adicionar hookdir  '%s' (%s)\n"
+msgstr "problema ao adicionar hookdir '%s' (%s)\n"
 
 #: src/pacman/conf.c:802
 #, c-format
@@ -483,9 +465,7 @@ msgstr "Falha so passar a entrada %s para libalpm"
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"No ficheiro de configurações %s, linha %d: '%s' opção '%s' não é "
-"reconhecida\n"
+msgstr "no ficheiro de configurações %s, linha %d: '%s' opção '%s' não é reconhecida\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
@@ -495,8 +475,7 @@ msgstr "no ficheiro de configuração %s, linha %d: '%s' necessita um valor\n"
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"análise de configuração ultrapassou profundidade de recursão máxima de %d.\n"
+msgstr "análise de configuração ultrapassou profundidade de recursão máxima de %d.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -506,9 +485,7 @@ msgstr "ficheiro de configuração %s não pode ser lido: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"ficheiro de configuração %s, linha %d: Todas as instruções devem pertencer a "
-"uma secção.\n"
+msgstr "ficheiro de configuração %s, linha %d: Todas as instruções devem pertencer a uma secção.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -519,8 +496,7 @@ msgstr "nenhum alvo definido (use -h para obter ajuda)\n"
 #: src/pacman/database.c:59
 #, c-format
 msgid "no install reason specified (use -h for help)\n"
-msgstr ""
-"não foi especificada nenhuma razão para a instalação (use -h para ajuda)\n"
+msgstr "não foi especificada nenhuma razão para a instalação (use -h para ajuda)\n"
 
 #: src/pacman/database.c:73
 #, c-format
@@ -530,12 +506,12 @@ msgstr "não foi possível definir a razão de instalação para o pacote %s (%s
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr "%s: razão de instalação definida para \"instalado como dependência\"\n"
+msgstr "%s: razão de instalação definida para 'instalado como dependência'\n"
 
 #: src/pacman/database.c:80
 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
-msgstr "%s: razão de instalação definida para \"instalado explicitamente\"\n"
+msgstr "%s: razão de instalação definida para 'instalado explicitamente'\n"
 
 #: src/pacman/package.c:97
 #, c-format
@@ -680,7 +656,7 @@ msgstr "Versão"
 #: src/pacman/package.c:167 src/pacman/util.c:1205
 #, c-format
 msgid " [installed]"
-msgstr "[instalado]"
+msgstr " [instalado]"
 
 #: src/pacman/package.c:216
 #, c-format
@@ -779,17 +755,14 @@ msgstr "operações:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"use '%s --help' com uma operação para visualizar as opções disponíveis\n"
+msgstr "\nuse '%s {-h --help}' com uma operação para visualizar as opções disponíveis\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade            remover pacotes e todos os pacotes que dependem "
-"deles\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        remover pacotes e todos os pacotes que dependem deles\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -801,87 +774,69 @@ msgstr "  -n, --nosave         remove os ficheiros de configuração\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      remove as dependências desnecessárias\n"
-"                       (-ss inclui dependências instaladas explicitamente)\n"
+msgstr "  -s, --recursive      remove as dependências desnecessárias\n                       (-ss inclui dependências instaladas explicitamente)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
 msgid "  -u, --unneeded       remove unneeded packages\n"
-msgstr "  -u, --unneeded                 remover aplicações desnecessárias\n"
+msgstr "  -u, --unneeded       remover aplicações desnecessárias\n"
 
 #: src/pacman/pacman.c:132 src/pacman/pacman.c:167
 #, c-format
 msgid "      --needed         do not reinstall up to date packages\n"
-msgstr "      --needed                  não reinstalar pacotes actualizados\n"
+msgstr "      --needed         não reinstalar pacotes actualizados\n"
 
 #: src/pacman/pacman.c:137
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
-msgstr "  -c, --changelog           visualizar o changelog de um pacote\n"
+msgstr "  -c, --changelog      visualizar o changelog de um pacote\n"
 
 #: src/pacman/pacman.c:138
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps                     listar os pacotes instalados como "
-"dependências [filtro] \n"
+msgstr "  -d, --deps           listar os pacotes instalados como dependências [filtro]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit                 listar os pacotes explicitamente instalados "
-"[filtro]\n"
+msgstr "  -e, --explicit       listar os pacotes explicitamente instalados [filtro]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
-msgstr ""
-"  -g, --groups                 visualizar todos os membros de um grupo de "
-"pacotes\n"
+msgstr "  -g, --groups         visualizar todos os membros de um grupo de pacotes\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info                        visualizar informações do pacote (-ii "
-"para ficheiros em cópia de segurança)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           visualizar informações do pacote (-ii para ficheiros em cópia de segurança)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"-k, --check verifica se os ficheiros do(s) pacote(s) estão presentes (-kk "
-"para propriedades dos ficheiros)\n"
+msgstr "  -k, --check          verifica se os ficheiros do(s) pacote(s) estão presentes (-kk para propriedades dos ficheiros)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"-l, --listar listar os ficheiros em propriedade pelo pacote requerido\n"
+msgstr "  -l, --listar          listar os ficheiros em propriedade pelo pacote requerido\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign                 listar o(s) pacotes instalado(s) não "
-"encontrado(s) na(s) base(s) de dados sincronizada(s) [filtro]\n"
+msgstr "  -m, --foreign        listar o(s) pacotes instalado(s) não encontrado(s) na(s) base(s) de dados sincronizada(s) [filtro]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"-n, --native listar pacotes instalado(s) somente encontrado(s) na(s) base(s) "
-"de dados sincronizada(s) [filtro]\n"
+msgstr "  -n, --native         listar pacotes instalado(s) somente encontrado(s) na(s) base(s) de dados sincronizada(s) [filtro]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -891,302 +846,235 @@ msgstr "  -o, --owns <arquivo>  consultar qual o pacote que contém <arquivo>\n"
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"  -p, --file <pacote>       consultar um ficheiro do pacote em vez da base "
-"de dados\n"
+msgstr "  -p, --file <pacote>  consultar um ficheiro do pacote em vez da base de dados\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet                     mostrar menos informações nas consultas e "
-"pesquisas\n"
+msgstr "  -q, --quiet          mostrar menos informações nas consultas e pesquisas\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex>   pesquisar as palavras correspondentes nos pacotes "
-"instalados\n"
+msgstr "  -s, --search <regex> pesquisar as palavras correspondentes nos pacotes instalados\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"-t --não-requeridas listar pacotes não (opcional) requerido por qualquer\n"
-"pacote (-tt para ignorar dependências-opcionais) [filtrar]\n"
+msgstr "  -t, --unrequired     listar pacotes não (opcional) requerido por qualquer\n                       pacote (-tt para ignorar dependências-opcionais) [filtrar]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
 msgid "  -u, --upgrades       list outdated packages [filter]\n"
-msgstr ""
-"  -u, --upgrades              listar todos os pacotes desactualizados "
-"[filtro]\n"
+msgstr "  -u, --upgrades       listar todos os pacotes desactualizados [filtro]\n"
 
 #: src/pacman/pacman.c:156
 #, c-format
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean                     remover pacotes antigos do diretório de "
-"cache (usar -cc para remover todos)\n"
+msgstr "  -c, --clean          remover pacotes antigos do diretório de cache (usar -cc para remover todos)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"-g, --grupos visualizar todos os membros do grupo de pacotes\n"
-"(-gg para visualizar todos os grupos e membros)\n"
+msgstr "  -g, --groups         visualizar todos os membros do grupo de pacotes\n                       (-gg para visualizar todos os grupos e membros)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"-i, --info visualizar a informação do pacote (-ii para informações "
-"completa)\n"
+msgstr "  -i, --info           visualizar a informação do pacote (-ii para informações completa)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr ""
-"  -l, --list <repo>           visualizat a lista dos pacotes num "
-"repositório\n"
+msgstr "  -l, --list <repo>    visualizar a lista dos pacotes num repositório\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <regex>  pesquisar repositórios remotos palavras "
-"correspondentes\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regex> pesquisar repositórios remotos palavras correspondentes\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"-u, --atualizar-sistema atualizar os pacotes instalados (-uu aciona os "
-"downgrades)\n"
+msgstr "  -u, --sysupgrade     atualizar os pacotes instalados (-uu aciona os downgrades)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly     baixar os pacotes mas não instalar/actualizar "
-"nenhum\n"
+msgstr "  -w, --downloadonly   baixar os pacotes mas não instalar/atualizar nenhum\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"-y, --recarregar descarregar a base de dados de pacotes atualizada\n"
-"(-yy para forçar a atualização mesmo que já atualizada)\n"
+msgstr "  -y, --refresh        descarregar a base de dados de pacotes atualizada\n                       (-yy para forçar a atualização mesmo que já atualizada)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps                  marcar o(s) pacote(s) como não-"
-"explicitamente instalado(s)\n"
+msgstr "      --asdeps         marcar o(s) pacote(s) como não-explicitamente instalado(s)\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit              marcar o(s) pacote(s) como explicitamente "
-"instalado(s)\n"
+msgstr "      --asexplicit     marcar o(s) pacote(s) como explicitamente instalado(s)\n"
 
 #: src/pacman/pacman.c:173
 #, c-format
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"-k, --check testa a validade da base de dados local (-kk para a base de "
-"dados de sincronização)\n"
+msgstr "  -k, --check          testa a validade da base de dados local (-kk para a base de dados de sincronização)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr "-s, --search <ficheiro> pesquisar nomes dos pacotes por palavras\n"
+msgstr "  -s, --search <ficheiro>  pesquisar nomes dos pacotes por palavras\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
 msgid "  -x, --regex          enable searching using regular expressions\n"
-msgstr "-x, --regex activa a pesquisa utilizando expressões regulares\n"
+msgstr "  -x, --regex          ativa a pesquisa utilizando expressões regulares\n"
 
 #: src/pacman/pacman.c:185
 #, c-format
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"--machinereadable\n"
-"produz uma saída processável por máquina\n"
+msgstr "      --machinereadable\n                       produz uma saída processável por máquina\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr "--force forçar instalação, sobrescrever ficheiros em conflito\n"
+msgstr "      --force          forçar instalação, sobrescrever ficheiros em conflito\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps                 instalar pacotes como não-explicitamente "
-"instalados\n"
+msgstr "      --asdeps         instalar pacotes como não-explicitamente instalados\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit              instalar pacotes como explicitamente "
-"instalados\n"
+msgstr "      --asexplicit     instalar pacotes como explicitamente instalados\n"
 
 #: src/pacman/pacman.c:194
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg>       ignorar a actualização de um pacote (pode ser "
-"usado mais de uma vez)\n"
+msgstr "      --ignore <pkg>   ignorar a actualização de um pacote (pode ser usado mais de uma vez)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"--ignoregroup <grp>\n"
-"ignorar a actualização de um grupo (pode ser usado mais de uma vez)\n"
+msgstr "      --ignoregroup <grp>\n                       ignorar a atualização de um grupo (pode ser usado mais de uma vez)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         ignorar verificação de dependências (-dd para ignorar "
-"todas as verificações)\n"
+msgstr "  -d, --nodeps         ignorar verificação de dependências (-dd para ignorar todas as verificações)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"--assumir-instalado <package=version>\n"
-"adicionar o pacote virtual para satisfazer as dependências\n"
+msgstr "      --assume-installed <package=version>\n                       adicionar o pacote virtual para satisfazer as dependências\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         apenas alterar entradas da base de dados, não "
-"ficheiros dos pacotes\n"
-"\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         apenas alterar entradas da base de dados, não ficheiros dos pacotes\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar     não mostrar a barra de progresso enquanto "
-"descarrega os ficheiros\n"
+msgstr "      --noprogressbar  não mostrar a barra de progresso enquanto descarrega os ficheiros\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet            não executar o script de instalação se o "
-"mesmo existir\n"
+msgstr "      --noscriptlet    não executar o script de instalação se o mesmo existir\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          exibir os pacotes-alvo em vez de executar a operação\n"
-"\n"
+msgstr "  -p, --print          exibir os pacotes-alvo em vez de executar a operação\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"--print-format <string>\n"
-"especificar como os pacotes alvo devem ser visualizados\n"
+msgstr "      --print-format <string>\n                       especificar como os pacotes alvo devem ser visualizados\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
-msgstr ""
-"  -b, --dbpath <path>   definir uma localização diferente para a base de "
-"dados\n"
+msgstr "  -b, --dbpath <path>  definir uma localização diferente para a base de dados\n"
 
 #: src/pacman/pacman.c:212
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
-msgstr ""
-"  -r, --root <path>         definir uma localização raiz diferente para a "
-"instalação\n"
+msgstr "  -r, --root <path>    definir uma localização raiz diferente para a instalação\n"
 
 #: src/pacman/pacman.c:213
 #, c-format
 msgid "  -v, --verbose        be verbose\n"
-msgstr "  -v, --verbose                ver informações detalhadas adicionais\n"
+msgstr "  -v, --verbose        ver informações detalhadas adicionais\n"
 
 #: src/pacman/pacman.c:214
 #, c-format
 msgid "      --arch <arch>    set an alternate architecture\n"
-msgstr "      --arch <arquitetura> definir uma arquitectura diferente\n"
+msgstr "      --arch <arquitetura>    definir uma arquitetura diferente\n"
 
 #: src/pacman/pacman.c:215
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <dir>      definir uma localização diferente para a cache "
-"de pacotes\n"
+msgstr "      --cachedir <dir> definir uma localização diferente para a cache de pacotes\n"
 
 #: src/pacman/pacman.c:216
 #, c-format
 msgid "      --hookdir <dir>  set an alternate hook location\n"
-msgstr ""
-"--hookdir <directoria> define uma localização alternativa para os hooks\n"
+msgstr "      --hookdir <directoria>  define uma localização alternativa para os hooks\n"
 
 #: src/pacman/pacman.c:217
 #, c-format
 msgid "      --color <when>   colorize the output\n"
-msgstr "--color <quando> colorir resultado\n"
+msgstr "      --color <quando> colorir resultado\n"
 
 #: src/pacman/pacman.c:218
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
-msgstr ""
-"      --config <path>      definir um ficheiro de configuração alternativo\n"
+msgstr "      --config <path>  definir um ficheiro de configuração alternativo\n"
 
 #: src/pacman/pacman.c:219
 #, c-format
 msgid "      --debug          display debug messages\n"
-msgstr "      --debug                    mostrar mensagens de debug\n"
+msgstr "      --debug          mostrar mensagens de debug\n"
 
 #: src/pacman/pacman.c:220
 #, c-format
@@ -1196,26 +1084,24 @@ msgstr "      --gpgdir <path>  definir um diretório alternativo para GnuPG\n"
 #: src/pacman/pacman.c:221
 #, c-format
 msgid "      --logfile <path> set an alternate log file\n"
-msgstr "      --logfile <path>      definir um ficheiro de log alternativo\n"
+msgstr "      --logfile <path> definir um ficheiro de registo alternativo\n"
 
 #: src/pacman/pacman.c:222
 #, c-format
 msgid "      --noconfirm      do not ask for any confirmation\n"
-msgstr "      --noconfirm              não pedir nenhuma confirmação\n"
+msgstr "      --noconfirm      não pedir nenhuma confirmação\n"
 
 #: src/pacman/pacman.c:223
 #, c-format
 msgid "      --confirm        always ask for confirmation\n"
-msgstr "--confirmar perguntar sempre por confirmação\n"
+msgstr "      --confirm        perguntar sempre por confirmação\n"
 
 #: src/pacman/pacman.c:242
 #, c-format
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Este programa pode ser redistribuído livremente sob\n"
-"                       os termos da GNU General Public License\n"
+msgstr "                       Este programa pode ser redistribuído livremente sob\n                       os termos da GNU General Public License.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1335,7 +1221,7 @@ msgstr "'%s' é um ficheiro, talvez pondere usar %s.\n"
 #: src/pacman/query.c:480
 #, c-format
 msgid "could not load package '%s': %s\n"
-msgstr "Não é possível carregar o pacote '%s':%s\n"
+msgstr "não é possível carregar o pacote '%s': %s\n"
 
 #: src/pacman/remove.c:49 src/pacman/sync.c:526 src/pacman/sync.c:610
 #, c-format
@@ -1405,7 +1291,7 @@ msgstr "Deseja remover repositórios não utilizados?"
 #: src/pacman/sync.c:141
 #, c-format
 msgid "removing unused sync repositories...\n"
-msgstr "A remover repositórios de sincronização não utilizados...\n"
+msgstr "a remover repositórios de sincronização não utilizados...\n"
 
 #: src/pacman/sync.c:167
 #, c-format
@@ -1497,7 +1383,7 @@ msgstr "%s: ao instalar %s (%s) quebra a dependência '%s'\n"
 #: src/pacman/sync.c:744
 #, c-format
 msgid "package %s does not have a valid architecture\n"
-msgstr "pacote '%s' não possui uma arquitectura válida\n"
+msgstr "pacote %s não possui uma arquitetura válida\n"
 
 #: src/pacman/sync.c:759
 #, c-format
@@ -1557,9 +1443,7 @@ msgstr "memória esgotada\n"
 #: src/pacman/upgrade.c:87
 #, c-format
 msgid "loading packages...\n"
-msgstr ""
-"a carregar pacotes...\n"
-"\n"
+msgstr "a carregar pacotes...\n"
 
 #: src/pacman/util.c:80
 #, c-format
@@ -1576,9 +1460,7 @@ msgstr "incapaz de bloquear a base de dados: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  caso tenha a certeza de que o gestor de pacotes não está\n"
-"  em execução, pode remover %s\n"
+msgstr "  caso tenha a certeza de que o gestor de pacotes não está\n  em execução, pode remover %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
@@ -1588,8 +1470,7 @@ msgstr "falhou ao liberar a transação (%s)\n"
 #: src/pacman/util.c:129
 #, c-format
 msgid "no usable package repositories configured.\n"
-msgstr ""
-"nenhum repositório de pacotes utilizável foi configurado corretamente.\n"
+msgstr "nenhum repositório de pacotes utilizável foi configurado corretamente.\n"
 
 #: src/pacman/util.c:138
 #, c-format
@@ -1674,7 +1555,7 @@ msgstr "confiança desconhecida"
 #: src/pacman/util.c:797
 #, c-format
 msgid "%s, %s from \"%s\""
-msgstr "%s,%s de \"%s\""
+msgstr "%s, %s de \"%s\""
 
 #: src/pacman/util.c:815
 #, c-format
@@ -1724,12 +1605,12 @@ msgstr "Tamanho Total Removido:"
 #: src/pacman/util.c:956
 #, c-format
 msgid "Net Upgrade Size:"
-msgstr "Tamanho de Actualização da Internet: "
+msgstr "Tamanho de Atualização da Internet:"
 
 #: src/pacman/util.c:1207
 #, c-format
 msgid " [pending]"
-msgstr "[pendente]"
+msgstr " [pendente]"
 
 #: src/pacman/util.c:1231
 #, c-format
@@ -1739,7 +1620,7 @@ msgstr "Novas dependências opcionais para %s\n"
 #: src/pacman/util.c:1253
 #, c-format
 msgid "Optional dependencies for %s\n"
-msgstr "Deps Opcionais para %s\n"
+msgstr "Dependências opcionais para %s\n"
 
 #: src/pacman/util.c:1266
 #, c-format
diff --git a/src/pacman/po/pt_BR.po b/src/pacman/po/pt_BR.po
index e283702b..492dad0f 100644
--- a/src/pacman/po/pt_BR.po
+++ b/src/pacman/po/pt_BR.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # ambaratti <ambaratti.listas@gmail.com>, 2011,2015
 # ambaratti <ambaratti.listas@gmail.com>, 2015
@@ -20,12 +20,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 16:24+0000\n"
 "Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/pt_BR/)\n"
-"Language: pt_BR\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/toofishes/archlinux-pacman/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/pacman/callback.c:182
@@ -183,13 +182,10 @@ msgstr "%s e %s estão em conflito (%s). Remover %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"O seguinte pacote não pode ser atualizado devido a dependências não "
-"resolvidas:\n"
-msgstr[1] ""
-"Os seguintes pacotes não podem ser atualizados devido a dependências não "
-"resolvidas:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "O seguinte pacote não pode ser atualizado devido a dependências não resolvidas:\n"
+msgstr[1] "Os seguintes pacotes não podem ser atualizados devido a dependências não resolvidas:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -210,9 +206,7 @@ msgstr[1] "Há %zu provedores disponíveis para %s:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Arquivo %s está corrompido (%s).\n"
-"Deseja apagá-lo?"
+msgstr "Arquivo %s está corrompido (%s).\nDeseja apagá-lo?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -396,36 +390,28 @@ msgstr "não foi possível recuperar diretório de trabalho (%s)\n"
 #: src/pacman/conf.c:397 src/pacman/conf.c:447 src/pacman/conf.c:541
 #, c-format
 msgid "config file %s, line %d: invalid value for '%s' : '%s'\n"
-msgstr ""
-"arquivo de configuração %s, linha %d: valor inválido para \"%s\" : \"%s\"\n"
+msgstr "arquivo de configuração %s, linha %d: valor inválido para \"%s\" : \"%s\"\n"
 
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"arquivo de configuração %s, linha %d: \"%s\" opção inválida, sem suporte a "
-"assinatura\n"
+msgstr "arquivo de configuração %s, linha %d: \"%s\" opção inválida, sem suporte a assinatura\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"arquivo de configuração %s, linha %d: diretiva \"%s\" na seção \"%s\" não "
-"foi reconhecida.\n"
+msgstr "arquivo de configuração %s, linha %d: diretiva \"%s\" na seção \"%s\" não foi reconhecida.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"espelho \"%s\" contém a variável \"%s\", mas nenhuma \"%s\" está definida.\n"
+msgstr "espelho \"%s\" contém a variável \"%s\", mas nenhuma \"%s\" está definida.\n"
 
 #: src/pacman/conf.c:641
 #, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
-msgstr ""
-"não foi possível adicionar a URL do servidor à base de dados \"%s\": %s "
-"(%s)\n"
+msgstr "não foi possível adicionar a URL do servidor à base de dados \"%s\": %s (%s)\n"
 
 #: src/pacman/conf.c:661
 #, c-format
@@ -435,18 +421,14 @@ msgstr "não foi possível registrar a base de dados \"%s\" (%s)\n"
 #: src/pacman/conf.c:676
 #, c-format
 msgid "could not add mirror '%s' to database '%s' (%s)\n"
-msgstr ""
-"não foi possível adicionar o espelho \"%s\" para a base de dados \"%s"
-"\" (%s)\n"
+msgstr "não foi possível adicionar o espelho \"%s\" para a base de dados \"%s\" (%s)\n"
 
 #: src/pacman/conf.c:722
 #, c-format
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"falha ao iniciar a biblioteca alpm\n"
-"(%s: %s)\n"
+msgstr "falha ao iniciar a biblioteca alpm\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -481,21 +463,17 @@ msgstr "Falha ao passar entrada %s para libalpm"
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"arquivo de configuração %s, linha %d: opção de \"%s\" %s não reconhecida\n"
+msgstr "arquivo de configuração %s, linha %d: opção de \"%s\" %s não reconhecida\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
-"arquivo de configuração %s, linha %d: diretiva \"%s\" precisa de um valor\n"
+msgstr "arquivo de configuração %s, linha %d: diretiva \"%s\" precisa de um valor\n"
 
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"a análise de configuração ultrapassou a profundidade máxima de recursão de "
-"%d.\n"
+msgstr "a análise de configuração ultrapassou a profundidade máxima de recursão de %d.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -505,9 +483,7 @@ msgstr "arquivo de configuração %s não pôde ser lido: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"arquivo de configuração %s, linha %d: todas as diretivas devem pertencer a "
-"uma seção.\n"
+msgstr "arquivo de configuração %s, linha %d: todas as diretivas devem pertencer a uma seção.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -528,14 +504,12 @@ msgstr "não foi possível definir o motivo da instalação do pacote %s (%s)\n"
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
-"%s: motivo da instalação foi definido como \"instalado como dependência\"\n"
+msgstr "%s: motivo da instalação foi definido como \"instalado como dependência\"\n"
 
 #: src/pacman/database.c:80
 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
-msgstr ""
-"%s: motivo da instalação foi definido como \"instalado explicitamente\"\n"
+msgstr "%s: motivo da instalação foi definido como \"instalado explicitamente\"\n"
 
 #: src/pacman/package.c:97
 #, c-format
@@ -779,16 +753,14 @@ msgstr "operações:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"use \"%s {-h --help}\" com uma operação para ver as opções disponíveis\n"
+msgstr "\nuse \"%s {-h --help}\" com uma operação para ver as opções disponíveis\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade          remove pacotes e todos os que dependem deles\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade          remove pacotes e todos os que dependem deles\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -800,10 +772,7 @@ msgstr "  -n, --nosave           remove os arquivos de configuração\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive        remove as dependências desnecessárias\n"
-"                         (-ss inclui dependências instaladas "
-"explicitamente)\n"
+msgstr "  -s, --recursive        remove as dependências desnecessárias\n                         (-ss inclui dependências instaladas explicitamente)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -824,63 +793,48 @@ msgstr "  -c, --changelog        visualiza o changelog de um pacote\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps             lista os pacotes instalados como dependências "
-"[filtro] \n"
+msgstr "  -d, --deps             lista os pacotes instalados como dependências [filtro] \n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit         lista os pacotes instalados explicitamente "
-"[filtro]\n"
+msgstr "  -e, --explicit         lista os pacotes instalados explicitamente [filtro]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
 msgid "  -g, --groups         view all members of a package group\n"
-msgstr ""
-"  -g, --groups           visualiza todos os membros de um grupo de pacotes\n"
+msgstr "  -g, --groups           visualiza todos os membros de um grupo de pacotes\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info             visualiza informações do pacote (-ii para arquivos\n"
-"                         de backup)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info             visualiza informações do pacote (-ii para arquivos\n                         de backup)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          verifica se os arquivos de pacote existem (-kk para\n"
-"                       propriedades dos arquivos)\n"
+msgstr "  -k, --check          verifica se os arquivos de pacote existem (-kk para\n                       propriedades dos arquivos)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"  -l, --list           lista dos arquivos fornecidos do pacote consultado\n"
+msgstr "  -l, --list           lista dos arquivos fornecidos do pacote consultado\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign          lista os pacotes instalados não encontrados na(s)\n"
-"                         base(s) de dados de sincronização [filtro]\n"
+msgstr "  -m, --foreign          lista os pacotes instalados não encontrados na(s)\n                         base(s) de dados de sincronização [filtro]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native           lista pacotes instalados encontrados apenas nas\n"
-"                         base de dados de sincronização [filtro]\n"
+msgstr "  -n, --native           lista pacotes instalados encontrados apenas nas\n                         base de dados de sincronização [filtro]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -890,34 +844,26 @@ msgstr "  -o, --owns <arquivo>   consulta qual o pacote que contém <arquivo>\n"
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"  -p, --file <pacote>    consulta arquivo de pacote ao invés da base de "
-"dados\n"
+msgstr "  -p, --file <pacote>    consulta arquivo de pacote ao invés da base de dados\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet            mostra menos informações nas consultas e pesquisas\n"
+msgstr "  -q, --quiet            mostra menos informações nas consultas e pesquisas\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex>   pesquisa nos pacotes instalados por strings\n"
-"                         correspondentes\n"
+msgstr "  -s, --search <regex>   pesquisa nos pacotes instalados por strings\n                         correspondentes\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     lista de pacotes não exigidos (opcionalmente) por\n"
-"                       qualquer pacote (-tt para ignorar optdepends "
-"[filtro]\n"
+msgstr "  -t, --unrequired     lista de pacotes não exigidos (opcionalmente) por\n                       qualquer pacote (-tt para ignorar optdepends [filtro]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -929,95 +875,73 @@ msgstr "  -u, --upgrades         lista os pacotes desatualizados [filtro]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean            remove pacotes antigos do diretório de cache (-cc "
-"para\n"
-"                         remover todos)\n"
+msgstr "  -c, --clean            remove pacotes antigos do diretório de cache (-cc para\n                         remover todos)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         ver todos membros de um grupo de pacotes\n"
-"                       (-gg pra ver todos os grupos e membros)\n"
+msgstr "  -g, --groups         ver todos membros de um grupo de pacotes\n                       (-gg pra ver todos os grupos e membros)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info           ver informação do pacote (-ii para informação "
-"extensa)\n"
+msgstr "  -i, --info           ver informação do pacote (-ii para informação extensa)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
 msgid "  -l, --list <repo>    view a list of packages in a repo\n"
-msgstr ""
-"  -l, --list <repo>      visualiza uma lista dos pacotes em um repositório\n"
+msgstr "  -l, --list <repo>      visualiza uma lista dos pacotes em um repositório\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <regex>   pesquisa em repositórios remotos por palavras\n"
-"                         coincidentes\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regex>   pesquisa em repositórios remotos por palavras\n                         coincidentes\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     atualiza pacotes instalados (-uu permite volta "
-"versão)\n"
+msgstr "  -u, --sysupgrade     atualiza pacotes instalados (-uu permite volta versão)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly     baixa os pacotes mas não instala/atualiza nenhum "
-"deles\n"
+msgstr "  -w, --downloadonly     baixa os pacotes mas não instala/atualiza nenhum deles\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        baixa pacotes novos da base de dados do servidor\n"
-"                       (-yy para forçar um renovação mesmo se atualizado)\n"
+msgstr "  -y, --refresh        baixa pacotes novos da base de dados do servidor\n                       (-yy para forçar um renovação mesmo se atualizado)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps           marca pacotes como instalados não explicitamente\n"
+msgstr "      --asdeps           marca pacotes como instalados não explicitamente\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit       marca pacotes como instalados explicitamente\n"
+msgstr "      --asexplicit       marca pacotes como instalados explicitamente\n"
 
 #: src/pacman/pacman.c:173
 #, c-format
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"-k, --check verifica a validade da base de dados local (-kk para sincronizar "
-"as bases de dados)\n"
+msgstr "-k, --check verifica a validade da base de dados local (-kk para sincronizar as bases de dados)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
-"-s, --search <file> pesquisa nos nomes de pacotes pelas strings fornecidas\n"
+msgstr "-s, --search <file> pesquisa nos nomes de pacotes pelas strings fornecidas\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
@@ -1029,120 +953,91 @@ msgstr "-x, --regex habilita a pesquisa usando expressões regulares\n"
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"--machinereadable\n"
-"produz saida legível por máquinas\n"
+msgstr "--machinereadable\nproduz saida legível por máquinas\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force            força instalação, sobrescreve arquivos "
-"conflitantes\n"
+msgstr "      --force            força instalação, sobrescreve arquivos conflitantes\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps           instala pacotes como instalados não explicitamente\n"
+msgstr "      --asdeps           instala pacotes como instalados não explicitamente\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit       instala pacotes como instalados explicitamente\n"
+msgstr "      --asexplicit       instala pacotes como instalados explicitamente\n"
 
 #: src/pacman/pacman.c:194
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pacote>  ignora a atualização de um pacote (pode ser usado "
-"mais\n"
-"                         de uma vez)\n"
+msgstr "      --ignore <pacote>  ignora a atualização de um pacote (pode ser usado mais\n                         de uma vez)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grupo>\n"
-"                         ignora a atualização de um grupo (pode ser usado "
-"mais\n"
-"                         de uma vez)\n"
+msgstr "      --ignoregroup <grupo>\n                         ignora a atualização de um grupo (pode ser usado mais\n                         de uma vez)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps           ignora verificações de versão da dependência\n"
-"                         (-dd para ignorar todas as verificações)\n"
+msgstr "  -d, --nodeps           ignora verificações de versão da dependência\n                         (-dd para ignorar todas as verificações)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <pacote=versão>\n"
-"                       adiciona pacote virtual para satisfazer dependências\n"
+msgstr "      --assume-installed <pacote=versão>\n                       adiciona pacote virtual para satisfazer dependências\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly           modifica apenas as entradas da base de dados, e "
-"não\n"
-"\t\t\t os arquivos de pacote\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly           modifica apenas as entradas da base de dados, e não\n\t\t\t os arquivos de pacote\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar    não mostra barra de progresso enquanto baixa "
-"arquivos\n"
+msgstr "      --noprogressbar    não mostra barra de progresso enquanto baixa arquivos\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet      não executa o script de instalação se ele existir\n"
+msgstr "      --noscriptlet      não executa o script de instalação se ele existir\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print            imprime os alvos ao invés de executar a operação\n"
+msgstr "  -p, --print            imprime os alvos ao invés de executar a operação\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                         especifica como os pacotes devem ser mostrados\n"
+msgstr "      --print-format <string>\n                         especifica como os pacotes devem ser mostrados\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
 msgid "  -b, --dbpath <path>  set an alternate database location\n"
-msgstr ""
-"  -b, --dbpath <caminho> define um local alternativo para a base de dados\n"
+msgstr "  -b, --dbpath <caminho> define um local alternativo para a base de dados\n"
 
 #: src/pacman/pacman.c:212
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
-msgstr ""
-"  -r, --root <caminho>   define um diretório raiz de instalação alternativo\n"
+msgstr "  -r, --root <caminho>   define um diretório raiz de instalação alternativo\n"
 
 #: src/pacman/pacman.c:213
 #, c-format
@@ -1152,16 +1047,12 @@ msgstr "  -v, --verbose          mostra informações adicionais\n"
 #: src/pacman/pacman.c:214
 #, c-format
 msgid "      --arch <arch>    set an alternate architecture\n"
-msgstr ""
-"      --arch <arquitetura>\n"
-"                         define uma arquitetura alternativa\n"
+msgstr "      --arch <arquitetura>\n                         define uma arquitetura alternativa\n"
 
 #: src/pacman/pacman.c:215
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <diretório>\n"
-"                         define um local alternativo para cache de pacotes\n"
+msgstr "      --cachedir <diretório>\n                         define um local alternativo para cache de pacotes\n"
 
 #: src/pacman/pacman.c:216
 #, c-format
@@ -1176,8 +1067,7 @@ msgstr "      --color <quando>   exibe saída colorida\n"
 #: src/pacman/pacman.c:218
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
-msgstr ""
-"      --config <caminho> define um arquivo de configuração alternativo\n"
+msgstr "      --config <caminho> define um arquivo de configuração alternativo\n"
 
 #: src/pacman/pacman.c:219
 #, c-format
@@ -1192,9 +1082,7 @@ msgstr "      --gpgdir <caminho> define um diretório alternativo para GnuPG\n"
 #: src/pacman/pacman.c:221
 #, c-format
 msgid "      --logfile <path> set an alternate log file\n"
-msgstr ""
-"      --logfile <caminho>\n"
-"                         define um arquivo de log alternativo\n"
+msgstr "      --logfile <caminho>\n                         define um arquivo de log alternativo\n"
 
 #: src/pacman/pacman.c:222
 #, c-format
@@ -1211,9 +1099,7 @@ msgstr "      --confirm        sempre solicitar confirmação\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Este programa pode ser redistribuído livremente sob\n"
-"                       os termos da GNU General Public License\n"
+msgstr "                       Este programa pode ser redistribuído livremente sob\n                       os termos da GNU General Public License\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1572,9 +1458,7 @@ msgstr "não foi possível travar a base de dados: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  se tiver certeza de que um gerenciador de pacotes não esteja\n"
-"  em execução, você pode remover %s\n"
+msgstr "  se tiver certeza de que um gerenciador de pacotes não esteja\n  em execução, você pode remover %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/ro.po b/src/pacman/po/ro.po
index 9fc23782..1a51eae0 100644
--- a/src/pacman/po/ro.po
+++ b/src/pacman/po/ro.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Arthur Țițeică <arthur.titeica@gmail.com>, 2013
 # Arthur Titeica <arthur@psw.ro>, 2013
@@ -21,14 +21,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-18 06:03+0000\n"
 "Last-Translator: mihaicris <Mihai.cristescu@gmail.com>\n"
-"Language-Team: Romanian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ro/)\n"
-"Language: ro\n"
+"Language-Team: Romanian (http://www.transifex.com/toofishes/archlinux-pacman/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
-"2:1));\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
 #: src/pacman/callback.c:182
 #, c-format
@@ -185,16 +183,11 @@ msgstr "%s și %s sunt în conflict (%s). Elimină %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Următorul pachet nu poate fi actualizat datorită unor dependențe "
-"nerezolvabile:\n"
-msgstr[1] ""
-"Următoarele pachete nu pot fi actualizate datorită unor dependențe "
-"nerezolvabile:\n"
-msgstr[2] ""
-"Următoarele pachete nu pot fi actualizate datorită unor dependențe "
-"nerezolvabile:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Următorul pachet nu poate fi actualizat datorită unor dependențe nerezolvabile:\n"
+msgstr[1] "Următoarele pachete nu pot fi actualizate datorită unor dependențe nerezolvabile:\n"
+msgstr[2] "Următoarele pachete nu pot fi actualizate datorită unor dependențe nerezolvabile:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -217,9 +210,7 @@ msgstr[2] "Există %zu de furnizori disponibili pentru %s\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Fișierul %s este corupt (%s).\n"
-"Doriți să îl ștergeți?"
+msgstr "Fișierul %s este corupt (%s).\nDoriți să îl ștergeți?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -407,35 +398,28 @@ msgstr "nu s-a putut restabili directorul de lucru curent (%s)\n"
 #: src/pacman/conf.c:397 src/pacman/conf.c:447 src/pacman/conf.c:541
 #, c-format
 msgid "config file %s, line %d: invalid value for '%s' : '%s'\n"
-msgstr ""
-"fișierul de configurare %s, linia %d: valoare nevalidă pentru '%s' : '%s'\n"
+msgstr "fișierul de configurare %s, linia %d: valoare nevalidă pentru '%s' : '%s'\n"
 
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"fișierul de configurare %s, linia %d: opțiunea '%s' nevalidă, fără suport "
-"pentru semnătură\n"
+msgstr "fișierul de configurare %s, linia %d: opțiunea '%s' nevalidă, fără suport pentru semnătură\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"fișierul de configurare %s, linia %d: directiva '%s' din secțiunea '%s' nu a "
-"fost recunoscută.\n"
+msgstr "fișierul de configurare %s, linia %d: directiva '%s' din secțiunea '%s' nu a fost recunoscută.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"oglinda '%s' conține variabila '%s', dar nu este definit niciun '%s'.\n"
+msgstr "oglinda '%s' conține variabila '%s', dar nu este definit niciun '%s'.\n"
 
 #: src/pacman/conf.c:641
 #, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
-msgstr ""
-"nu s-a putut adăuga adresa URL a serverului la baza de date '%s': %s (%s)\n"
+msgstr "nu s-a putut adăuga adresa URL a serverului la baza de date '%s': %s (%s)\n"
 
 #: src/pacman/conf.c:661
 #, c-format
@@ -452,9 +436,7 @@ msgstr "nu se poate adăuga oglinda '%s' la baza de date '%s' (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"eșec la inițializarea bibliotecii alpm\n"
-"(%s: %s)\n"
+msgstr "eșec la inițializarea bibliotecii alpm\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -489,22 +471,17 @@ msgstr "Eșec la transmiterea intrării %s către libalpm"
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"fișierul de configurare %s, linia %d: '%s' opțiunea '%s' nu a fost "
-"recunoscută\n"
+msgstr "fișierul de configurare %s, linia %d: '%s' opțiunea '%s' nu a fost recunoscută\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
-"fișierul de configurare %s, linia %d: directiva '%s' are nevoie de o "
-"valoare\n"
+msgstr "fișierul de configurare %s, linia %d: directiva '%s' are nevoie de o valoare\n"
 
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"parcurgerea configurării a depășit adâncimea max de recursivitate %d.\n"
+msgstr "parcurgerea configurării a depășit adâncimea max de recursivitate %d.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -514,9 +491,7 @@ msgstr "fișierul de configurare %s nu a putut fi citit: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"fișierul de configurare %s, linia %d: Toate directivele trebuie să aparțină "
-"unei secțiuni.\n"
+msgstr "fișierul de configurare %s, linia %d: Toate directivele trebuie să aparțină unei secțiuni.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -527,8 +502,7 @@ msgstr "nu sunt specificate ținte (folosiți -h pentru ajutor)\n"
 #: src/pacman/database.c:59
 #, c-format
 msgid "no install reason specified (use -h for help)\n"
-msgstr ""
-"nu este specificat un motiv pentru instalare (folosește -h pentru ajutor)\n"
+msgstr "nu este specificat un motiv pentru instalare (folosește -h pentru ajutor)\n"
 
 #: src/pacman/database.c:73
 #, c-format
@@ -538,8 +512,7 @@ msgstr "nu s-a putut seta motivul de instalare pentru pachetul %s (%s)\n"
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
-"%s: motivul pentru instalare a fost schimbat în 'instalat ca dependență'\n"
+msgstr "%s: motivul pentru instalare a fost schimbat în 'instalat ca dependență'\n"
 
 #: src/pacman/database.c:80
 #, c-format
@@ -788,17 +761,14 @@ msgstr "operațiuni:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"folosește '%s {-h --help}' cu o operațiune pentru opțiunile disponibile\n"
+msgstr "\nfolosește '%s {-h --help}' cu o operațiune pentru opțiunile disponibile\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        elimină pachete precum și toate pachetele care depind "
-"de ele\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        elimină pachete precum și toate pachetele care depind de ele\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -810,9 +780,7 @@ msgstr "  -n, --nosave         elimină fișierele de configurare\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      elimină dependențele inutile\n"
-"                       (-ss include dependențele instalate explicit\n"
+msgstr "  -s, --recursive      elimină dependențele inutile\n                       (-ss include dependențele instalate explicit\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -827,22 +795,18 @@ msgstr "      --needed         nu reinstalează pachetele deja actualizate\n"
 #: src/pacman/pacman.c:137
 #, c-format
 msgid "  -c, --changelog      view the changelog of a package\n"
-msgstr ""
-"  -c, --changelog      afișează istoricul de modificări al pachetului\n"
+msgstr "  -c, --changelog      afișează istoricul de modificări al pachetului\n"
 
 #: src/pacman/pacman.c:138
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           listează pachetele instalate ca dependențe [filtru]\n"
+msgstr "  -d, --deps           listează pachetele instalate ca dependențe [filtru]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       listează pachetele instalate în mod explicit "
-"[filtru]\n"
+msgstr "  -e, --explicit       listează pachetele instalate în mod explicit [filtru]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -851,46 +815,34 @@ msgstr "  -g, --groups         afișează toți membrii unui grup de pachete\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           afișează informații despre pachet\n"
-"                       (-ii pentru fișierele copie de siguranță)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           afișează informații despre pachet\n                       (-ii pentru fișierele copie de siguranță)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          verifică dacă fișierele pachetului există\n"
-"                       (-kk pentru proprietățile fișierului)\n"
+msgstr "  -k, --check          verifică dacă fișierele pachetului există\n                       (-kk pentru proprietățile fișierului)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"  -l, --list           listează fișierele deținute de pachetul interogat\n"
+msgstr "  -l, --list           listează fișierele deținute de pachetul interogat\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        listează pachetele instalate ce nu se găsesc în "
-"bazele\n"
-"                       de date ale depozitelor [filtru]\n"
+msgstr "  -m, --foreign        listează pachetele instalate ce nu se găsesc în bazele\n                       de date ale depozitelor [filtru]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         listează doar pachetele instalate care se regăsesc în "
-"bazele\n"
-"                       de date ale depozitelor [filtru]\n"
+msgstr "  -n, --native         listează doar pachetele instalate care se regăsesc în bazele\n                       de date ale depozitelor [filtru]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -900,34 +852,26 @@ msgstr "  -o, --owns <fișier>  interoghează pachetul care deține <fișier>\n"
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"  -p, --file <pachet>  interoghează un fișier pachet în locul bazei de date\n"
+msgstr "  -p, --file <pachet>  interoghează un fișier pachet în locul bazei de date\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          arată mai puține informații pentru interogare și "
-"căutare\n"
+msgstr "  -q, --quiet          arată mai puține informații pentru interogare și căutare\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex> caută pachete instalate local care se potrivesc "
-"șirurilor de caractere\n"
+msgstr "  -s, --search <regex> caută pachete instalate local care se potrivesc șirurilor de caractere\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     listează pachetele care nu sunt cerute (opțional) de "
-"niciun\n"
-"                       pachet (-tt pentru a ignora optdepends) [filtru]\n"
+msgstr "  -t, --unrequired     listează pachetele care nu sunt cerute (opțional) de niciun\n                       pachet (-tt pentru a ignora optdepends) [filtru]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -939,27 +883,21 @@ msgstr "  -u, --upgrades       listează pachetele învechite [filtru]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          elimină pachetele vechi din dosarul cache (-cc pentru "
-"toate)\n"
+msgstr "  -c, --clean          elimină pachetele vechi din dosarul cache (-cc pentru toate)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         vezi toți membrii unui grup de pachete\n"
-"                       (-gg pentru a vedea toate grupurile și toți membrii)\n"
+msgstr "  -g, --groups         vezi toți membrii unui grup de pachete\n                       (-gg pentru a vedea toate grupurile și toți membrii)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info           vezi informații despre pachet (-ii pentru informații "
-"extinse)\n"
+msgstr "  -i, --info           vezi informații despre pachet (-ii pentru informații extinse)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -968,39 +906,28 @@ msgstr "  -l, --list <repo>    vezi o listă a pachetelor dintr-un depozit\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <regex> caută în depozitele la distanță potriviri cu șirurile "
-"de caractere\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regex> caută în depozitele la distanță potriviri cu șirurile de caractere\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     actualizează pachetele instalate (-uu permite "
-"retrogradările)\n"
+msgstr "  -u, --sysupgrade     actualizează pachetele instalate (-uu permite retrogradările)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   descarcă pachete dar nu instalează/actualizează "
-"nimic\n"
+msgstr "  -w, --downloadonly   descarcă pachete dar nu instalează/actualizează nimic\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        descarcă baze de date actualizate ale pachetelor de "
-"pe server\n"
-"                       (-yy pentru a forța o împrospătare chiar și dacă deja "
-"actualizate)\n"
+msgstr "  -y, --refresh        descarcă baze de date actualizate ale pachetelor de pe server\n                       (-yy pentru a forța o împrospătare chiar și dacă deja actualizate)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -1010,48 +937,36 @@ msgstr "      --asdeps         marchează pachetele ca instalate ne-explicit\n"
 #: src/pacman/pacman.c:172
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     marchează pachetele ca instalate în mod explicit\n"
+msgstr "      --asexplicit     marchează pachetele ca instalate în mod explicit\n"
 
 #: src/pacman/pacman.c:173
 #, c-format
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"  -k, --check          testează baza de date locală pentru valabilitate\n"
-"                       (-kk pentru baze de date sync)\n"
+msgstr "  -k, --check          testează baza de date locală pentru valabilitate\n                       (-kk pentru baze de date sync)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
-"  -s, --search <fișier>\n"
-"                       caută nume de fișiere de pachete pentru șiruri\n"
-"                       de caractere care se potrivesc\n"
+msgstr "  -s, --search <fișier>\n                       caută nume de fișiere de pachete pentru șiruri\n                       de caractere care se potrivesc\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
 msgid "  -x, --regex          enable searching using regular expressions\n"
-msgstr ""
-"  -x, --regex          activează căutarea prin folosirea expresiilor "
-"regulate\n"
+msgstr "  -x, --regex          activează căutarea prin folosirea expresiilor regulate\n"
 
 #: src/pacman/pacman.c:185
 #, c-format
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"      --machinereadable\n"
-"                       produce un format optimizat pentru mașină\n"
+msgstr "      --machinereadable\n                       produce un format optimizat pentru mașină\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          instalare forțată, suprascrie fișierele aflate în "
-"conflict\n"
+msgstr "      --force          instalare forțată, suprascrie fișierele aflate în conflict\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
@@ -1061,86 +976,66 @@ msgstr "      --asdeps         instalează pachetele ca instalate ne-explicit\n"
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     instalează pachetele ca instalate în mod explicit\n"
+msgstr "      --asexplicit     instalează pachetele ca instalate în mod explicit\n"
 
 #: src/pacman/pacman.c:194
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg>   ignoră actualizările unui pachet (se poate folosi de "
-"mai multe ori)\n"
+msgstr "      --ignore <pkg>   ignoră actualizările unui pachet (se poate folosi de mai multe ori)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                       ignoră o actualizare de grup (se poate folosi de mai "
-"multe ori)\n"
+msgstr "      --ignoregroup <grp>\n                       ignoră o actualizare de grup (se poate folosi de mai multe ori)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         se omite verificare versiunii dependențelor (-dd "
-"pentru a omite toate verificările)\n"
+msgstr "  -d, --nodeps         se omite verificare versiunii dependențelor (-dd pentru a omite toate verificările)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <pachet=versiune>\n"
-"                       adaugă un pachet virtual pentru a satisface "
-"dependențele\n"
+msgstr "      --assume-installed <pachet=versiune>\n                       adaugă un pachet virtual pentru a satisface dependențele\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         modifică doar intrările în baza de date, nu și "
-"fișierele pachetului\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         modifică doar intrările în baza de date, nu și fișierele pachetului\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  nu afișa bara de progres la descărcarea fișierelor\n"
+msgstr "      --noprogressbar  nu afișa bara de progres la descărcarea fișierelor\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet    nu se execută scriptlet-ul de instalare dacă există "
-"deja unul\n"
+msgstr "      --noscriptlet    nu se execută scriptlet-ul de instalare dacă există deja unul\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          afișează țintele în loc de a efectua operațiunea\n"
+msgstr "  -p, --print          afișează țintele în loc de a efectua operațiunea\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <șir>\n"
-"                       specifică cum vor fi afișate țintele\n"
+msgstr "      --print-format <șir>\n                       specifică cum vor fi afișate țintele\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1165,9 +1060,7 @@ msgstr "      --arch <arhit>   setează o arhitectură alternativă\n"
 #: src/pacman/pacman.c:215
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <dir> setează o locație alternativă pentru cache-ul "
-"pachetului\n"
+msgstr "      --cachedir <dir> setează o locație alternativă pentru cache-ul pachetului\n"
 
 #: src/pacman/pacman.c:216
 #, c-format
@@ -1214,9 +1107,7 @@ msgstr "      --confirm        întotdeauna cere confirmare\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Acest program poate fi redistribuit liber sub\n"
-"                       termenii licenței GNU - General Public License.\n"
+msgstr "                       Acest program poate fi redistribuit liber sub\n                       termenii licenței GNU - General Public License.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1576,9 +1467,7 @@ msgstr "nu s-a putut bloca baza de date: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  dacă sunteți sigur că niciun manager de pachete\n"
-"  nu este activ, atunci puteți elimina %s\n"
+msgstr "  dacă sunteți sigur că niciun manager de pachete\n  nu este activ, atunci puteți elimina %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/ru.po b/src/pacman/po/ru.po
index 7f2e2521..273302f0 100644
--- a/src/pacman/po/ru.po
+++ b/src/pacman/po/ru.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # AlexanderR <alexander.r@gmx.com>, 2012
 # AlexanderR <alexander.r@gmx.com>, 2012
@@ -23,15 +23,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 03:30+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Russian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/ru/)\n"
-"Language: ru\n"
+"Language-Team: Russian (http://www.transifex.com/toofishes/archlinux-pacman/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
-"%100>=11 && n%100<=14)? 2 : 3);\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: src/pacman/callback.c:182
 #, c-format
@@ -188,15 +185,12 @@ msgstr "%s и %s конфликтуют (%s). Удалить %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Этот пакет не может быть обновлен из-за неразрешимых зависимостей:\n"
-msgstr[1] ""
-"Эти пакеты не могут быть обновлены из-за неразрешимых зависимостей:\n"
-msgstr[2] ""
-"Эти пакеты не могут быть обновлены из-за неразрешимых зависимостей:\n"
-msgstr[3] ""
-"Эти пакеты не могут быть обновлены из-за неразрешимых зависимостей:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Этот пакет не может быть обновлен из-за неразрешимых зависимостей:\n"
+msgstr[1] "Эти пакеты не могут быть обновлены из-за неразрешимых зависимостей:\n"
+msgstr[2] "Эти пакеты не могут быть обновлены из-за неразрешимых зависимостей:\n"
+msgstr[3] "Эти пакеты не могут быть обновлены из-за неразрешимых зависимостей:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -221,9 +215,7 @@ msgstr[3] "Найдено %zu поставщиков для %s:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Файл %s поврежден (%s).\n"
-"Хотите его удалить?"
+msgstr "Файл %s поврежден (%s).\nХотите его удалить?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -420,9 +412,7 @@ msgstr "файл %s, строка %d: недопустимое значение
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"файл %s, строка %d: '%s' недопустимый параметр, поддержка подписей "
-"недоступна\n"
+msgstr "файл %s, строка %d: '%s' недопустимый параметр, поддержка подписей недоступна\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
@@ -455,9 +445,7 @@ msgstr "не удалось добавить зеркало '%s' в базу д
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"не удалось инициализировать библиотеку alpm\n"
-"(%s: %s)\n"
+msgstr "не удалось инициализировать библиотеку alpm\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -502,8 +490,7 @@ msgstr "файл %s, строка %d: параметр '%s' требует зн
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"достинут максимум вложенности при разборе конфигурационного файла %d.\n"
+msgstr "достинут максимум вложенности при разборе конфигурационного файла %d.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -513,9 +500,7 @@ msgstr "файл конфигурации %s не может быть прочи
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"конфигурационный файл %s, строка %d: все директивы должны находиться в "
-"секциях.\n"
+msgstr "конфигурационный файл %s, строка %d: все директивы должны находиться в секциях.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -785,15 +770,13 @@ msgstr "действия:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"используйте '%s { -h --help}' вместе с другими операциями для просмотра "
-"параметров\n"
+msgstr "\nиспользуйте '%s { -h --help}' вместе с другими операциями для просмотра параметров\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
 msgstr "-c, --cascade удалить пакет и все зависящие от него пакеты\n"
 
 #: src/pacman/pacman.c:126
@@ -806,9 +789,7 @@ msgstr "-n, --nosave удалять конфигурационные файлы\
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"-s, --recursive удалять ненужные зависимости\n"
-"(-ss включая явно установленные)\n"
+msgstr "-s, --recursive удалять ненужные зависимости\n(-ss включая явно установленные)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -829,8 +810,7 @@ msgstr "-c, --changelog показать список изменений пак
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"-d, --deps показать все пакеты, установленные как зависимости [фильтр]\n"
+msgstr "-d, --deps показать все пакеты, установленные как зависимости [фильтр]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
@@ -844,8 +824,7 @@ msgstr "-g, --groups показать все пакеты данной груп
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
 msgstr "-i, --info показать информацию о пакете (-ii для резервных копий)\n"
 
 #: src/pacman/pacman.c:142
@@ -853,9 +832,7 @@ msgstr "-i, --info показать информацию о пакете (-ii д
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"-k, --check проверить, что все файлы пакета существуют (-kk для вывода "
-"свойств файла)\n"
+msgstr "-k, --check проверить, что все файлы пакета существуют (-kk для вывода свойств файла)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
@@ -867,18 +844,14 @@ msgstr "-l, --list показать список файлов пакета\n"
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"-m, --foreign показать установленные пакеты, не найденные в базе(ах) данных "
-"[фильтр]\n"
+msgstr "-m, --foreign показать установленные пакеты, не найденные в базе(ах) данных [фильтр]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"-n, --native показать установленные пакеты, найденные только в базе(ах) "
-"данных [фильтр]\n"
+msgstr "-n, --native показать установленные пакеты, найденные только в базе(ах) данных [фильтр]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -888,8 +861,7 @@ msgstr "-o, --owns <файл> найти пакет, содержащий <фа
 #: src/pacman/pacman.c:147
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
-msgstr ""
-"-p, --file <пакет> извлечь информацию из файла пакета, а не из базы данных\n"
+msgstr "-p, --file <пакет> извлечь информацию из файла пакета, а не из базы данных\n"
 
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
@@ -901,18 +873,14 @@ msgstr "-q, --quiet показывать меньше информации пр
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"-s, --search <regex> искать указанную строку в локально установленных "
-"пакетах\n"
+msgstr "-s, --search <regex> искать указанную строку в локально установленных пакетах\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"-t, --unrequired показать все пакеты, не требуемые ни одним пакетом\n"
-"(-tt игнорировать дополнительные зависимости) [фильтр]\n"
+msgstr "-t, --unrequired показать все пакеты, не требуемые ни одним пакетом\n(-tt игнорировать дополнительные зависимости) [фильтр]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -931,9 +899,7 @@ msgstr "-c, --clean удалить старые пакеты из кэша (-cc
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"-g, --groups показать все пакеты данной группы\n"
-"(-gg показывает все группы и пакеты)\n"
+msgstr "-g, --groups показать все пакеты данной группы\n(-gg показывает все группы и пакеты)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
@@ -949,17 +915,14 @@ msgstr "-l, --list <repo> показать все пакеты из этого 
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"-s, --search <regex> искать указанную строку в удаленных репозиториях\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "-s, --search <regex> искать указанную строку в удаленных репозиториях\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"-u, --sysupgrade обновить установленные пакеты(-uu разрешает откат версий)\n"
+msgstr "-u, --sysupgrade обновить установленные пакеты(-uu разрешает откат версий)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
@@ -973,9 +936,7 @@ msgstr "-w, --downloadonly загрузить пакеты с сервера, н
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        загрузить обновленные базы данных с серверов\n"
-"                       (-yy принудительно обновить даже если обновленные)\n"
+msgstr "  -y, --refresh        загрузить обновленные базы данных с серверов\n                       (-yy принудительно обновить даже если обновленные)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -992,9 +953,7 @@ msgstr "--asexplicit отметить пакеты как явно устано
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"-k, --check проверить валидность локальной бд (-kk для синхронизации баз)\n"
-"\n"
+msgstr "-k, --check проверить валидность локальной бд (-kk для синхронизации баз)\n\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
@@ -1004,17 +963,14 @@ msgstr "  -s, --search <file>  искать указанную строку в 
 #: src/pacman/pacman.c:182
 #, c-format
 msgid "  -x, --regex          enable searching using regular expressions\n"
-msgstr ""
-"  -x, --regex          включить использование регулярных выражений в поиске\n"
+msgstr "  -x, --regex          включить использование регулярных выражений в поиске\n"
 
 #: src/pacman/pacman.c:185
 #, c-format
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"      --machinereadable\n"
-"                       выдавать машинно-читаемый вывод\n"
+msgstr "      --machinereadable\n                       выдавать машинно-читаемый вывод\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
@@ -1036,42 +992,32 @@ msgstr "--asexplicit установить пакеты как явно уста
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"--ignore <пакет> пропустить пакет при обновлении (может быть использовано "
-"неоднократно)\n"
+msgstr "--ignore <пакет> пропустить пакет при обновлении (может быть использовано неоднократно)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"--ignoregroup <группа>\n"
-"пропустить группу при обновлении (может быть использовано неоднократно)\n"
+msgstr "--ignoregroup <группа>\nпропустить группу при обновлении (может быть использовано неоднократно)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         пропустить проверку версий (-dd пропускает все "
-"проверки)\n"
+msgstr "  -d, --nodeps         пропустить проверку версий (-dd пропускает все проверки)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <пакет=версия>\n"
-"                       добавить виртуальный пакет для удовлетворения "
-"зависимостей\n"
+msgstr "      --assume-installed <пакет=версия>\n                       добавить виртуальный пакет для удовлетворения зависимостей\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
 msgstr "--dbonly изменить только записи в базе данных, не файлы пакетов\n"
 
 #: src/pacman/pacman.c:203
@@ -1098,9 +1044,7 @@ msgstr "-p, --print вывести список целей вместо выпо
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"--print-format <строка>\n"
-"укажите формат вывода целей\n"
+msgstr "--print-format <строка>\nукажите формат вывода целей\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1172,15 +1116,12 @@ msgstr "--confirm всегда спрашивать подтверждения\n
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"Эта программа может свободно распространяться\n"
-"на условиях GNU General Public License\n"
+msgstr "Эта программа может свободно распространяться\nна условиях GNU General Public License\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
 msgid "invalid option: '%s' and '%s' may not be used together\n"
-msgstr ""
-"неправильный параметр: '%s' и '%s' не могут использоваться одновременно\n"
+msgstr "неправильный параметр: '%s' и '%s' не могут использоваться одновременно\n"
 
 #: src/pacman/pacman.c:386
 #, c-format
@@ -1380,9 +1321,7 @@ msgstr "  Все локально установленные пакеты\n"
 #: src/pacman/sync.c:172
 #, c-format
 msgid "  All current sync database packages\n"
-msgstr ""
-"  Все пакеты из базы данных\n"
-"\n"
+msgstr "  Все пакеты из базы данных\n\n"
 
 #: src/pacman/sync.c:182
 #, c-format
@@ -1428,18 +1367,10 @@ msgstr "репозиторий '%s' не найден.\n"
 #, c-format
 msgid "There is %d member in group %s:\n"
 msgid_plural "There are %d members in group %s:\n"
-msgstr[0] ""
-"%d объект в группе %s:\n"
-"\n"
-msgstr[1] ""
-"%d объекта в группе %s:\n"
-"\n"
-msgstr[2] ""
-"%d объектов в группе %s:\n"
-"\n"
-msgstr[3] ""
-"%d объектов в группе %s:\n"
-"\n"
+msgstr[0] "%d объект в группе %s:\n\n"
+msgstr[1] "%d объекта в группе %s:\n\n"
+msgstr[2] "%d объектов в группе %s:\n\n"
+msgstr[3] "%d объектов в группе %s:\n\n"
 
 #: src/pacman/sync.c:639
 #, c-format
@@ -1546,9 +1477,7 @@ msgstr "не удалось заблокировать базу: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  если вы уверены, что pacman не запущен, можно\n"
-"  удалить '%s'\n"
+msgstr "  если вы уверены, что pacman не запущен, можно\n  удалить '%s'\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/sk.po b/src/pacman/po/sk.po
index 2ac44ed6..d2ce8f22 100644
--- a/src/pacman/po/sk.po
+++ b/src/pacman/po/sk.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # archetyp <archetyp@linuxmail.org>, 2013
 # archetyp <archetyp@linuxmail.org>, 2013-2015
@@ -18,12 +18,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-22 14:04+0000\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
-"Language-Team: Slovak (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/sk/)\n"
-"Language: sk\n"
+"Language-Team: Slovak (http://www.transifex.com/toofishes/archlinux-pacman/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: src/pacman/callback.c:182
@@ -181,16 +180,11 @@ msgstr "%s a %s sú v konflikte (%s). Odstrániť %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Nasledovný balíček nemohol byť aktualizovaný kvôli nevyriešiteľným "
-"závislostiam:\n"
-msgstr[1] ""
-"Nasledovné balíčky nemohli byť aktualizované kvôli nevyriešiteľným "
-"závislostiam:\n"
-msgstr[2] ""
-"Nasledovné balíčky nemohli byť aktualizované kvôli nevyriešiteľným "
-"závislostiam:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Nasledovný balíček nemohol byť aktualizovaný kvôli nevyriešiteľným závislostiam:\n"
+msgstr[1] "Nasledovné balíčky nemohli byť aktualizované kvôli nevyriešiteľným závislostiam:\n"
+msgstr[2] "Nasledovné balíčky nemohli byť aktualizované kvôli nevyriešiteľným závislostiam:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -213,9 +207,7 @@ msgstr[2] "K dispozícii je %zu poskytovateľov pre %s:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Súbor %s je poškodený (%s).\n"
-"Chcete ho vymazať?"
+msgstr "Súbor %s je poškodený (%s).\nChcete ho vymazať?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -408,17 +400,13 @@ msgstr "konfiguračný súbor %s, riadok %d: neplatná hodnota pre '%s' : '%s'\n
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"konfiguračný súbor %s, riadok %d: voľba '%s'  nie je platná, cýba podpora "
-"pre podpisovanie\n"
+msgstr "konfiguračný súbor %s, riadok %d: voľba '%s'  nie je platná, cýba podpora pre podpisovanie\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"konfiguračný súbor %s, riadok %d: direktíva '%s' v sekcii '%s' nebola "
-"rozpoznaná.\n"
+msgstr "konfiguračný súbor %s, riadok %d: direktíva '%s' v sekcii '%s' nebola rozpoznaná.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
@@ -445,9 +433,7 @@ msgstr "nepodarilo sa pridať mirror '%s' do databáze '%s' (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"zlyhala inicializácia knižnice alpm\n"
-"(%s: %s)\n"
+msgstr "zlyhala inicializácia knižnice alpm\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -492,8 +478,7 @@ msgstr "konfiguračný súbor %s, riadok %d: direktíva '%s' vyžaduje hodnotu\n
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"parsovanie konfiguračného súboru prekročilo maximálnu hĺbku rekurzie %d.\n"
+msgstr "parsovanie konfiguračného súboru prekročilo maximálnu hĺbku rekurzie %d.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -503,9 +488,7 @@ msgstr "konfiguračný súbor %s nie je možné načítať: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"konfiguračný súbor %s, riadok %d: Všetky položky konfigurácie musia patriť "
-"do nejakej sekcie.\n"
+msgstr "konfiguračný súbor %s, riadok %d: Všetky položky konfigurácie musia patriť do nejakej sekcie.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -526,8 +509,7 @@ msgstr "nepodarilo sa nastaviť dôvod pre inštaláciu balíčku %s (%s)\n"
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
-"%s: dôvod pre inštaláciu bol nastavený na 'inštalovaný ako závislosť'\n"
+msgstr "%s: dôvod pre inštaláciu bol nastavený na 'inštalovaný ako závislosť'\n"
 
 #: src/pacman/database.c:80
 #, c-format
@@ -776,17 +758,14 @@ msgstr "operacie:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"použite '%s {-h --help}' s operáciou pre dalšie dostupné voľby\n"
+msgstr "\npoužite '%s {-h --help}' s operáciou pre dalšie dostupné voľby\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        odstrániť balíčky vrátane všetkých, ktoré na nich "
-"závisia\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        odstrániť balíčky vrátane všetkých, ktoré na nich závisia\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -798,9 +777,7 @@ msgstr "  -n, --nosave         odstrániť konfiguračné súbory\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      odstrániť nepotrebné závislosti\n"
-"                       (-ss zahŕňa explicitne nainštalované závislosti)\n"
+msgstr "  -s, --recursive      odstrániť nepotrebné závislosti\n                       (-ss zahŕňa explicitne nainštalované závislosti)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -821,16 +798,12 @@ msgstr "  -c, --changelog      vypísať zoznam zmien balíčka\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           zoznam všetkých balíčkov inštalovaných ako závislosti "
-"[filter]\n"
+msgstr "  -d, --deps           zoznam všetkých balíčkov inštalovaných ako závislosti [filter]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       zoznam všetkých explicitne inštalovaných balíčkov "
-"[filter]\n"
+msgstr "  -e, --explicit       zoznam všetkých explicitne inštalovaných balíčkov [filter]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -839,20 +812,15 @@ msgstr "  -g, --groups         vypísať všetky balíčky v skupine\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           zobraziť informácie o balíčku (-ii zálohované "
-"súbory)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           zobraziť informácie o balíčku (-ii zálohované súbory)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          over, že súbory balíčka existujú (-kk pre vlastnosti "
-"súboru)\n"
+msgstr "  -k, --check          over, že súbory balíčka existujú (-kk pre vlastnosti súboru)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
@@ -864,18 +832,14 @@ msgstr "  -l, --list           zoznam súborov v balíčku\n"
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        zoznam nainštalovaných balíčkov nenájdených v "
-"repozitároch [filter]\n"
+msgstr "  -m, --foreign        zoznam nainštalovaných balíčkov nenájdených v repozitároch [filter]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         vypíš inštalované balíčky nachádzajúce sa iba v sync "
-"db(s) [filter]\n"
+msgstr "  -n, --native         vypíš inštalované balíčky nachádzajúce sa iba v sync db(s) [filter]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -890,61 +854,47 @@ msgstr "  -p, --file <package> otázka na súbor balíčku miesto na databázu\n
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          zobraziť menej informácii pri otázke a hľadaní\n"
+msgstr "  -q, --quiet          zobraziť menej informácii pri otázke a hľadaní\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex> vyhľadať nainštalované balíčky, zodpovedajúce "
-"reťazcu\n"
+msgstr "  -s, --search <regex> vyhľadať nainštalované balíčky, zodpovedajúce reťazcu\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired    vypísať zoznam balíčkov nepožadovaných (voliteľne) "
-"iným\n"
-"                        balíčkom (-tt pre ignorovanie voliteľných "
-"závislostí) [filter]\n"
+msgstr "  -t, --unrequired    vypísať zoznam balíčkov nepožadovaných (voliteľne) iným\n                        balíčkom (-tt pre ignorovanie voliteľných závislostí) [filter]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
 msgid "  -u, --upgrades       list outdated packages [filter]\n"
-msgstr ""
-"  -u, --upgrades       vypísať zoznam všetkých aktualizovaných balíčkov "
-"[filter]\n"
+msgstr "  -u, --upgrades       vypísať zoznam všetkých aktualizovaných balíčkov [filter]\n"
 
 #: src/pacman/pacman.c:156
 #, c-format
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          odstrániť staré balíčky z cache (-cc pre všetky)\n"
+msgstr "  -c, --clean          odstrániť staré balíčky z cache (-cc pre všetky)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         vypísať všetky balíčky v skupine\n"
-"                       (-gg pre zobrazenie všetkých skupín a ich balíčkov)\n"
+msgstr "  -g, --groups         vypísať všetky balíčky v skupine\n                       (-gg pre zobrazenie všetkých skupín a ich balíčkov)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info            zobraziť informácie o balíčku (-ii pre rozšírenú "
-"informáciu)\n"
+msgstr "  -i, --info            zobraziť informácie o balíčku (-ii pre rozšírenú informáciu)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -953,37 +903,28 @@ msgstr "  -l, --list <repo>    zobraziť zoznam balíčkov v repozitári\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <regex> vyhľadať balíčky vo vzdialených repozitároch podľa "
-"reťazca\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regex> vyhľadať balíčky vo vzdialených repozitároch podľa reťazca\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     aktualizovať nainštalované balíčky (-uu povoľuje "
-"downgrade)\n"
+msgstr "  -u, --sysupgrade     aktualizovať nainštalované balíčky (-uu povoľuje downgrade)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   iba stiahnuť balíčky, neinštalovať/neaktualizovať\n"
+msgstr "  -w, --downloadonly   iba stiahnuť balíčky, neinštalovať/neaktualizovať\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh         stiahnuť aktuálnu databázu balíčkov zo servera\n"
-"                       (-yy pre vynútenie aktualizácie aj aktuálnych "
-"databáz)\n"
+msgstr "  -y, --refresh         stiahnuť aktuálnu databázu balíčkov zo servera\n                       (-yy pre vynútenie aktualizácie aj aktuálnych databáz)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -1000,16 +941,12 @@ msgstr "      --asexplicit     označiť balíčky ako explicitne inštalované\
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"  -k, --check          testuj lokálnu databázu na korektnosť (-kk pre synch. "
-"databáz)\n"
+msgstr "  -k, --check          testuj lokálnu databázu na korektnosť (-kk pre synch. databáz)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
-"  -s, --search <file>  hľadaj v názvoch súborov balíčka zodpovedajúce "
-"reťazce\n"
+msgstr "  -s, --search <file>  hľadaj v názvoch súborov balíčka zodpovedajúce reťazce\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
@@ -1021,9 +958,7 @@ msgstr "  -x, --regex          umožni hľadanie využitím regulárnych výrazo
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"      --machinereadable\n"
-"                       vytvor strojovo-čítateľný výstup\n"
+msgstr "      --machinereadable\n                       vytvor strojovo-čítateľný výstup\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
@@ -1038,50 +973,39 @@ msgstr "      --asdeps         nainštalovať balíčky ako závislosti\n"
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     nainštalovať balíčky ako explicitne inštalované\n"
+msgstr "      --asexplicit     nainštalovať balíčky ako explicitne inštalované\n"
 
 #: src/pacman/pacman.c:194
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg>   ignorovať aktualizáciu balíčka (možno použiť "
-"viackrát)\n"
+msgstr "      --ignore <pkg>   ignorovať aktualizáciu balíčka (možno použiť viackrát)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                       ignorovať aktualizáciu skupiny (možno poutiť "
-"viackrát)\n"
+msgstr "      --ignoregroup <grp>\n                       ignorovať aktualizáciu skupiny (možno poutiť viackrát)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         odstrániť kontroly závislostí verzii (-dd pre "
-"preskočenie všetkých kontrol)\n"
+msgstr "  -d, --nodeps         odstrániť kontroly závislostí verzii (-dd pre preskočenie všetkých kontrol)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <package=version>\n"
-"                       pridať virtuálny balíček pre splnenie závislostí\n"
+msgstr "      --assume-installed <package=version>\n                       pridať virtuálny balíček pre splnenie závislostí\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
 msgstr "--dbonly upraviť len záznamy v databáze, nie balíčky\n"
 
 #: src/pacman/pacman.c:203
@@ -1108,9 +1032,7 @@ msgstr "-p, --print vypíše ciele, nevykoná operáciu\n"
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                       určí, ako majú byť ciele vypísané\n"
+msgstr "      --print-format <string>\n                       určí, ako majú byť ciele vypísané\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1160,8 +1082,7 @@ msgstr "      --debug          zobraziť ladiace správy\n"
 #: src/pacman/pacman.c:220
 #, c-format
 msgid "      --gpgdir <path>  set an alternate home directory for GnuPG\n"
-msgstr ""
-"      --gpgdir <cesta> nastaviť alternatívny domáci adresár pre GnuPG\n"
+msgstr "      --gpgdir <cesta> nastaviť alternatívny domáci adresár pre GnuPG\n"
 
 #: src/pacman/pacman.c:221
 #, c-format
@@ -1183,9 +1104,7 @@ msgstr "      --confirm        vždy požaduj potvrdenie\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Tento program smie byť slobodne šírený pod\n"
-"                       licenciou GNU GPL (General Public License).\n"
+msgstr "                       Tento program smie byť slobodne šírený pod\n                       licenciou GNU GPL (General Public License).\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1195,9 +1114,7 @@ msgstr "neplatná voľba: '%s' a '%s' nemôžu byť použité súčasne\n"
 #: src/pacman/pacman.c:386
 #, c-format
 msgid "invalid argument '%s' for %s\n"
-msgstr ""
-"neplatný argument '%s' pre %s\n"
-"\n"
+msgstr "neplatný argument '%s' pre %s\n\n"
 
 #: src/pacman/pacman.c:409
 #, c-format
@@ -1337,8 +1254,7 @@ msgstr "%s je označený jako HoldPkg.\n"
 #: src/pacman/remove.c:149
 #, c-format
 msgid "HoldPkg was found in target list. Do you want to continue?"
-msgstr ""
-"Medzi cieľmi bol nájdený balíček označený ako HoldPkg. Chcete pokračovať?"
+msgstr "Medzi cieľmi bol nájdený balíček označený ako HoldPkg. Chcete pokračovať?"
 
 #: src/pacman/remove.c:157 src/pacman/sync.c:781
 #, c-format
@@ -1548,9 +1464,7 @@ msgstr "nepodarilo sa uzamknúť databázu: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  ak ste si istý, že práve nebeží správca balíčkov,\n"
-"  môžete odstrániť %s\n"
+msgstr "  ak ste si istý, že práve nebeží správca balíčkov,\n  môžete odstrániť %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/sl.po b/src/pacman/po/sl.po
index 08cb2a3c..4e46112b 100644
--- a/src/pacman/po/sl.po
+++ b/src/pacman/po/sl.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Abomination1 <drozic1989@gmail.com>, 2014
 # ansich <mojmejlzaforume@gmail.com>, 2014
@@ -18,14 +18,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 03:30+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Slovenian (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/sl/)\n"
-"Language: sl\n"
+"Language-Team: Slovenian (http://www.transifex.com/toofishes/archlinux-pacman/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
 #: src/pacman/callback.c:182
 #, c-format
@@ -90,9 +88,7 @@ msgstr "odstranjevanje: %s ...\n"
 #: src/pacman/callback.c:254
 #, c-format
 msgid "checking package integrity...\n"
-msgstr ""
-"preverjanje celovitosti paketa ...\n"
-"\n"
+msgstr "preverjanje celovitosti paketa ...\n\n"
 
 #: src/pacman/callback.c:259
 #, c-format
@@ -112,9 +108,7 @@ msgstr "nalaganje datoteke ...\n"
 #: src/pacman/callback.c:271
 #, c-format
 msgid "checking delta integrity...\n"
-msgstr ""
-"preverjanje celovitosti delte ...\n"
-"\n"
+msgstr "preverjanje celovitosti delte ...\n\n"
 
 #: src/pacman/callback.c:274
 #, c-format
@@ -186,19 +180,12 @@ msgstr "%s in %s sta v sporu (%s). Ali naj odstranim %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Naslednji paket ne more biti nadgrajen, ker odvisnosti ni mogoče uspešno "
-"razrešiti:\n"
-msgstr[1] ""
-"Naslednja paketa ne moreta biti nadgrajena, ker odvisnosti ni mogoče uspešno "
-"razrešiti:\n"
-msgstr[2] ""
-"Naslednji paketi ne morejo biti nadgrajeni, ker odvisnosti ni mogoče uspešno "
-"razrešiti:\n"
-msgstr[3] ""
-"Naslednji paketi ne morejo biti nadgrajeni, ker odvisnosti ni mogoče uspešno "
-"razrešiti:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Naslednji paket ne more biti nadgrajen, ker odvisnosti ni mogoče uspešno razrešiti:\n"
+msgstr[1] "Naslednja paketa ne moreta biti nadgrajena, ker odvisnosti ni mogoče uspešno razrešiti:\n"
+msgstr[2] "Naslednji paketi ne morejo biti nadgrajeni, ker odvisnosti ni mogoče uspešno razrešiti:\n"
+msgstr[3] "Naslednji paketi ne morejo biti nadgrajeni, ker odvisnosti ni mogoče uspešno razrešiti:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -223,9 +210,7 @@ msgstr[3] ""
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Datoteka %s je poškodovana (%s).\n"
-"Ali jo želite odstraniti?"
+msgstr "Datoteka %s je poškodovana (%s).\nAli jo želite odstraniti?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -356,14 +341,10 @@ msgstr[3] ""
 #, c-format
 msgid "%jd missing file\n"
 msgid_plural "%jd missing files\n"
-msgstr[0] ""
-"Manjkajoča datoteka %jd\n"
-"\n"
+msgstr[0] "Manjkajoča datoteka %jd\n\n"
 msgstr[1] "Manjkajoči datoteki %jd\n"
 msgstr[2] "Manjkajoče datoteke %jd\n"
-msgstr[3] ""
-"Manjkajoče datoteke %jd\n"
-"\n"
+msgstr[3] "Manjkajoče datoteke %jd\n\n"
 
 #: src/pacman/check.c:277
 #, c-format
@@ -421,29 +402,23 @@ msgstr "delovnega imenika (%s), ni mogoče obnoviti\n"
 #: src/pacman/conf.c:397 src/pacman/conf.c:447 src/pacman/conf.c:541
 #, c-format
 msgid "config file %s, line %d: invalid value for '%s' : '%s'\n"
-msgstr ""
-"nastavitvena datoteka %s, vrstica %d: neveljavna vrednost za '%s' : '%s'\n"
+msgstr "nastavitvena datoteka %s, vrstica %d: neveljavna vrednost za '%s' : '%s'\n"
 
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"nastavitvena datoteka %s, vrstica %d: neveljavna možnost '%s', ni podpore za "
-"podpis\n"
+msgstr "nastavitvena datoteka %s, vrstica %d: neveljavna možnost '%s', ni podpore za podpis\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"konfiguracijska datoteka %s, vrstica %d: direktiva '%s' v odseku '%s' ni "
-"bila prepoznana.\n"
+msgstr "konfiguracijska datoteka %s, vrstica %d: direktiva '%s' v odseku '%s' ni bila prepoznana.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"zrcalo '%s' vsebuje spremenljivko '%s', vendar ni definiran noben '%s'.\n"
+msgstr "zrcalo '%s' vsebuje spremenljivko '%s', vendar ni definiran noben '%s'.\n"
 
 #: src/pacman/conf.c:641
 #, c-format
@@ -465,9 +440,7 @@ msgstr "zrcala '%s' ni bilo mogoče dodati podatkovni bazi '%s' (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"napaka pri inicializaciji alpm knjižnice\n"
-"(%s: %s)\n"
+msgstr "napaka pri inicializaciji alpm knjižnice\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -502,21 +475,17 @@ msgstr ""
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"konfiguracijska datoteka %s, vrstica %d: '%s' možnost '%s' ni bila "
-"prepoznana.\n"
+msgstr "konfiguracijska datoteka %s, vrstica %d: '%s' možnost '%s' ni bila prepoznana.\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
-"konfiguracijska datoteka %s, vrstica %d: direktiva '%s' potrebuje vrednost\n"
+msgstr "konfiguracijska datoteka %s, vrstica %d: direktiva '%s' potrebuje vrednost\n"
 
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"razčlenjevanje nastavitev je preseglo maksimalno globino rekurzije %d.\n"
+msgstr "razčlenjevanje nastavitev je preseglo maksimalno globino rekurzije %d.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -526,9 +495,7 @@ msgstr "nastavitvene datoteke %s ni bilo mogoče prebrati: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"konfiguracijska datoteka %s, vrstica %d: Vse direktive morajo pripadati "
-"sekciji.\n"
+msgstr "konfiguracijska datoteka %s, vrstica %d: Vse direktive morajo pripadati sekciji.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -549,8 +516,7 @@ msgstr "ni bilo mogoče nastaviti namestitvenega razloga za paket %s (%s)\n"
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
-"%s: namestitveni razlog je bil nastavljen na 'nameščeno kot odvisnost'\n"
+msgstr "%s: namestitveni razlog je bil nastavljen na 'nameščeno kot odvisnost'\n"
 
 #: src/pacman/database.c:80
 #, c-format
@@ -799,17 +765,14 @@ msgstr "operacije:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"uporabite '%s {-h --help}' z operacijo in možnimi stikali\n"
+msgstr "\nuporabite '%s {-h --help}' z operacijo in možnimi stikali\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        odstranitev paketov in vseh paketov, ki so odvisni od "
-"njih\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        odstranitev paketov in vseh paketov, ki so odvisni od njih\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -821,9 +784,7 @@ msgstr "-n, --nosave odstranitev konfiguracijskih datotek\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"-s, --recursive odstranitev nepotrebnih odvisnosti\n"
-"(-ss vsebuje eksplicitne nameščene odvisnosti)\n"
+msgstr "-s, --recursive odstranitev nepotrebnih odvisnosti\n(-ss vsebuje eksplicitne nameščene odvisnosti)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -844,9 +805,7 @@ msgstr "  -c, --changelog      ogled seznama sprememb paketa\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           seznam paketov, nameščenih kot odvisni paketi "
-"[filter]\n"
+msgstr "  -d, --deps           seznam paketov, nameščenih kot odvisni paketi [filter]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
@@ -860,8 +819,7 @@ msgstr "  -g, --groups         izpis vseh pripadnikov skupine paketa\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
 msgstr "  -i, --info           izpis podatkov o paketu (-ii rezervne kopije)\n"
 
 #: src/pacman/pacman.c:142
@@ -869,9 +827,7 @@ msgstr "  -i, --info           izpis podatkov o paketu (-ii rezervne kopije)\n"
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check preverjanje, če so datoteke, ki jih poseduje paket, na voljo (-"
-"kk za lastnosti datotek)\n"
+msgstr "  -k, --check preverjanje, če so datoteke, ki jih poseduje paket, na voljo (-kk za lastnosti datotek)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
@@ -883,24 +839,19 @@ msgstr "  -l, --list seznam vsebine poizvedenega paketa\n"
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        seznam nameščenih paketov, ki niso v sinh. podatkovni "
-"bazi(ah) [filter]\n"
+msgstr "  -m, --foreign        seznam nameščenih paketov, ki niso v sinh. podatkovni bazi(ah) [filter]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"-n, --native seznam nameščenih paketov, najdenih le v sinh. podatkovni bazi "
-"oz. bazah [filter]\n"
+msgstr "-n, --native seznam nameščenih paketov, najdenih le v sinh. podatkovni bazi oz. bazah [filter]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
 msgid "  -o, --owns <file>    query the package that owns <file>\n"
-msgstr ""
-"  -o, --owns <datoteka>    paketna poizvedba paketa, ki poseduje <datoteko>\n"
+msgstr "  -o, --owns <datoteka>    paketna poizvedba paketa, ki poseduje <datoteko>\n"
 
 #: src/pacman/pacman.c:147
 #, c-format
@@ -936,18 +887,14 @@ msgstr "  -u, --upgrades       seznam zastarelih paketov [filter]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          odstranitev starih paketov iz predpomnilniškega "
-"imenika (-cc za vse)\n"
+msgstr "  -c, --clean          odstranitev starih paketov iz predpomnilniškega imenika (-cc za vse)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"-g, --groups izpis vseh pripadnikov skupine paketa\n"
-"(-gg izpis vseh skupin in pripadnikov)\n"
+msgstr "-g, --groups izpis vseh pripadnikov skupine paketa\n(-gg izpis vseh skupin in pripadnikov)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
@@ -963,17 +910,14 @@ msgstr "  -l, --list <skladišče>    izpis seznama paketov skladišča\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr "  -s, --search <izraz> iskanje po oddaljenih skladiščih po izrazu\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     nadgradnja obstoječih paketov (-uu dovoljeno "
-"degradiranje)\n"
+msgstr "  -u, --sysupgrade     nadgradnja obstoječih paketov (-uu dovoljeno degradiranje)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
@@ -987,9 +931,7 @@ msgstr "  -w, --downloadonly   prenos paketov, brez namestitve/posodobitve\n"
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh osvežitev podatkovnih baz preko strežnika (-yy prisili "
-"osvežitev, tudi če je baza podatkov že posodobljeno)\n"
+msgstr "  -y, --refresh osvežitev podatkovnih baz preko strežnika (-yy prisili osvežitev, tudi če je baza podatkov že posodobljeno)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -1045,43 +987,33 @@ msgstr "--asexplicit namesti pakete kot izrecno nameščene\n"
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <paket>   prezri nadgradnje paketa (lahko se uporabi "
-"večkrat)\n"
+msgstr "      --ignore <paket>   prezri nadgradnje paketa (lahko se uporabi večkrat)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <skupina>\n"
-"                       prezri nadgradnjo skupine (lahko se uporabi večkrat)\n"
+msgstr "      --ignoregroup <skupina>\n                       prezri nadgradnjo skupine (lahko se uporabi večkrat)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"-d, --nodeps izpusti preverjanja različic odvisnosti (-dd za izpust vseh "
-"preverjanj)\n"
+msgstr "-d, --nodeps izpusti preverjanja različic odvisnosti (-dd za izpust vseh preverjanj)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"--assume-installed <package=version>\n"
-"Dodaj virtualni paket za zadovoljevanje odvisnosti\n"
+msgstr "--assume-installed <package=version>\nDodaj virtualni paket za zadovoljevanje odvisnosti\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"--dbonly spremeni le vnose podatkovnih baz, ne pa tudi datotek paketov\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "--dbonly spremeni le vnose podatkovnih baz, ne pa tudi datotek paketov\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
@@ -1107,9 +1039,7 @@ msgstr "  -p, --print          izpis ciljev namesto izvajanja operacije\n"
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <niz>\n"
-"                       določitev, kako naj se cilji izpiše\n"
+msgstr "      --print-format <niz>\n                       določitev, kako naj se cilji izpiše\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1134,9 +1064,7 @@ msgstr "      --arch <arh>    nastavitev alternativne arhitekture\n"
 #: src/pacman/pacman.c:215
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <imenik> določitev alternativne lokacije predpomnilnika "
-"paketov\n"
+msgstr "      --cachedir <imenik> določitev alternativne lokacije predpomnilnika paketov\n"
 
 #: src/pacman/pacman.c:216
 #, c-format
@@ -1151,8 +1079,7 @@ msgstr "--color <kdaj> obarvaj izhod\n"
 #: src/pacman/pacman.c:218
 #, c-format
 msgid "      --config <path>  set an alternate configuration file\n"
-msgstr ""
-"      --config <pot>  določitev alternativne konfiguracijske datoteke\n"
+msgstr "      --config <pot>  določitev alternativne konfiguracijske datoteke\n"
 
 #: src/pacman/pacman.c:219
 #, c-format
@@ -1184,9 +1111,7 @@ msgstr "--confirm vedno vprašaj za potrditev\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Program je mogoče prosto distribuirat pod\n"
-"                       pogoji GNU General Public License.\n"
+msgstr "                       Program je mogoče prosto distribuirat pod\n                       pogoji GNU General Public License.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1206,10 +1131,7 @@ msgstr "'%s' ni veljavna stopnja razhroščevalnika\n"
 #: src/pacman/pacman.c:952
 #, c-format
 msgid "only one operation may be used at a time\n"
-msgstr ""
-"hkrati se lahko uporabi samo eno stikalo\n"
-"\n"
-"\n"
+msgstr "hkrati se lahko uporabi samo eno stikalo\n\n\n"
 
 #: src/pacman/pacman.c:1010
 #, c-format
@@ -1364,9 +1286,7 @@ msgstr "ni mogoče odstraniti %s: %s\n"
 #: src/pacman/sync.c:63
 #, c-format
 msgid "could not access database directory\n"
-msgstr ""
-"dostop do imenika podatkovne baze in mogoč\n"
-"\n"
+msgstr "dostop do imenika podatkovne baze in mogoč\n\n"
 
 #: src/pacman/sync.c:137
 #, c-format
@@ -1552,9 +1472,7 @@ msgstr "ni bilo možno zakleniti podatkovne baze: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"če ste prepričani, da upravljalnik paketov ni\n"
-"v teku, lahko odstranite %s\n"
+msgstr "če ste prepričani, da upravljalnik paketov ni\nv teku, lahko odstranite %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/sr.po b/src/pacman/po/sr.po
index 686deb3d..2b5fa182 100644
--- a/src/pacman/po/sr.po
+++ b/src/pacman/po/sr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Mladen Pejaković <pejakm@autistici.org>, 2013
 # Mladen Pejaković <pejakm@autistici.org>, 2013
@@ -18,14 +18,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 12:11+0000\n"
 "Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/sr/)\n"
-"Language: sr\n"
+"Language-Team: Serbian (http://www.transifex.com/toofishes/archlinux-pacman/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/pacman/callback.c:182
 #, c-format
@@ -182,13 +180,11 @@ msgstr "%s и %s су у сукобу (%s). Уклонити %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Следећи пакет не може бити надограђен због неразрешивих зависности:\n"
-msgstr[1] ""
-"Следећи пакети не могу бити надограђени услед неразрешивих зависности:\n"
-msgstr[2] ""
-"Следећи пакети не могу бити надограђени услед неразрешивих зависности:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Следећи пакет не може бити надограђен због неразрешивих зависности:\n"
+msgstr[1] "Следећи пакети не могу бити надограђени услед неразрешивих зависности:\n"
+msgstr[2] "Следећи пакети не могу бити надограђени услед неразрешивих зависности:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -211,9 +207,7 @@ msgstr[2] "Постоји %zu достављачa за %s\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Фајл %s је неисправан (%s).\n"
-"Желите ли да га обришете?"
+msgstr "Фајл %s је неисправан (%s).\nЖелите ли да га обришете?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -406,16 +400,13 @@ msgstr "фајл поставки %s, линија %d: неисправна вр
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"фајл поставки %s, линија %d: опција „%s“ је неисправна, нема подршке за "
-"потписе\n"
+msgstr "фајл поставки %s, линија %d: опција „%s“ је неисправна, нема подршке за потписе\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"фајл поставки %s, линија %d: директива „%s“ у одељку „%s“ није препозната.\n"
+msgstr "фајл поставки %s, линија %d: директива „%s“ у одељку „%s“ није препозната.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
@@ -442,9 +433,7 @@ msgstr "не могу да додам мирор „%s“ у базу „%s“ (
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"неуспела иницијелизација alpm библиотеке\n"
-"(%s: %s)\n"
+msgstr "неуспела иницијелизација alpm библиотеке\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -489,8 +478,7 @@ msgstr "фајл поставки %s, линија %d: директиви „%s
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"при обради фајла поставки премашена је максимална дубина рекурзије од %d.\n"
+msgstr "при обради фајла поставки премашена је максимална дубина рекурзије од %d.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -500,8 +488,7 @@ msgstr "не могу да прочитам фајл поставки %s: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"фајл поставки %s, линија %d: све директиве морају припадати одељцима.\n"
+msgstr "фајл поставки %s, линија %d: све директиве морају припадати одељцима.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -771,16 +758,14 @@ msgstr "операције :\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"употребите „%s {-h --help}” уз операцију за доступне опције\n"
+msgstr "\nупотребите „%s {-h --help}” уз операцију за доступне опције\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade          уклања пакете и све пакете који зависе од њих\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade          уклања пакете и све пакете који зависе од њих\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -792,10 +777,7 @@ msgstr "  -n, --nosave           уклања фајлове поставки\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive        уклања непотребне зависности\n"
-"                         (-ss укључује и експлицитно инсталиране "
-"зависности)\n"
+msgstr "  -s, --recursive        уклања непотребне зависности\n                         (-ss укључује и експлицитно инсталиране зависности)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -816,14 +798,12 @@ msgstr "  -c, --changelog        приказује дневник измена
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps             списак пакета инсталираних као зависности [филтер]\n"
+msgstr "  -d, --deps             списак пакета инсталираних као зависности [филтер]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit         списак експлицитно инсталираних пакета  [филтер]\n"
+msgstr "  -e, --explicit         списак експлицитно инсталираних пакета  [филтер]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -832,44 +812,34 @@ msgstr "  -g, --groups           приказује све пакете из г
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info             приказује податке о пакету (--ii за резервне "
-"фајлове)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info             приказује податке о пакету (--ii за резервне фајлове)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check            проверава да ли пакет постоји (-kk за својства "
-"фајла)\n"
+msgstr "  -k, --check            проверава да ли пакет постоји (-kk за својства фајла)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"  -l, --list           набраја фајлове који припадају упитаном пакету\n"
+msgstr "  -l, --list           набраја фајлове који припадају упитаном пакету\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign          набраја инсталиране пакете који нису у базама које "
-"се синхронизују [филтер]\n"
+msgstr "  -m, --foreign          набраја инсталиране пакете који нису у базама које се синхронизују [филтер]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native           набраја само инсталиране пакете који су у базама "
-"које се синхронизују [филтер]\n"
+msgstr "  -n, --native           набраја само инсталиране пакете који су у базама које се синхронизују [филтер]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -884,27 +854,21 @@ msgstr "  -p, --file <пакет>     тражи фајл пакета умес
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet            приказује мање информација за упите и претрагу\n"
+msgstr "  -q, --quiet            приказује мање информација за упите и претрагу\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <региз>   тражи локално инсталиране пакете према задатим "
-"нискама\n"
+msgstr "  -s, --search <региз>   тражи локално инсталиране пакете према задатим нискама\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     набраја пакете који нису (опционо) захтевани од\n"
-"                       било ког пакета (-tt игнорише опционе зависности) "
-"[filter]\n"
+msgstr "  -t, --unrequired     набраја пакете који нису (опционо) захтевани од\n                       било ког пакета (-tt игнорише опционе зависности) [filter]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -916,26 +880,21 @@ msgstr "  -u, --upgrades        набраја застареле пакете [
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean            уклања старе пакете из фасцикле кеша (-cc за све)\n"
+msgstr "  -c, --clean            уклања старе пакете из фасцикле кеша (-cc за све)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         приказује чланове групе пакета\n"
-"                       (-gg за приказ свих група и чланова)\n"
+msgstr "  -g, --groups         приказује чланове групе пакета\n                       (-gg за приказ свих група и чланова)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-" -i, --info           приказује информације о пакету (-ii за детаљније "
-"информације)\n"
+msgstr " -i, --info           приказује информације о пакету (-ii за детаљније информације)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -944,42 +903,33 @@ msgstr "  -l, --list <ризница>   приказује списак свих
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <региз>   тражи пакете у удаљеним ризницама на основу задатих "
-"ниски\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <региз>   тражи пакете у удаљеним ризницама на основу задатих ниски\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     надограђује инсталиране пакете (-uu дозвољава "
-"разградњу)\n"
+msgstr "  -u, --sysupgrade     надограђује инсталиране пакете (-uu дозвољава разградњу)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly     преузма пакете, али их не инсталира/надограђује\n"
+msgstr "  -w, --downloadonly     преузма пакете, али их не инсталира/надограђује\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        добавља освежене базе пакета са сервера\n"
-"                       (-yy приморава освежавање иако су базе ажурне)\n"
+msgstr "  -y, --refresh        добавља освежене базе пакета са сервера\n                       (-yy приморава освежавање иако су базе ажурне)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps           означава пакете као неексплицитно инсталиране\n"
+msgstr "      --asdeps           означава пакете као неексплицитно инсталиране\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
@@ -991,9 +941,7 @@ msgstr "      --asexplicit       означава пакете као експл
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"  -k, --check          тестира исправност локалне базе (-kk за "
-"синхронизовање база)\n"
+msgstr "  -k, --check          тестира исправност локалне базе (-kk за синхронизовање база)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
@@ -1010,85 +958,67 @@ msgstr "  -x, --regex          омогућава претрагу помоћу
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"--machinereadable\n"
-"ствара машински читљив илаз\n"
+msgstr "--machinereadable\nствара машински читљив илаз\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force            присиљава инсталацију, преписујући фајлове у "
-"конфликту\n"
+msgstr "      --force            присиљава инсталацију, преписујући фајлове у конфликту\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps           инсталира пакете као неексплицитно инсталиране\n"
+msgstr "      --asdeps           инсталира пакете као неексплицитно инсталиране\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit       инсталира пакете као експлицитно инсталиране\n"
+msgstr "      --asexplicit       инсталира пакете као експлицитно инсталиране\n"
 
 #: src/pacman/pacman.c:194
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <пакет>   игнорише надоградње пакета (може се употребити више "
-"пута)\n"
+msgstr "      --ignore <пакет>   игнорише надоградње пакета (може се употребити више пута)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <група>\n"
-"                         игнорише надоградњу групе (може се употребити више "
-"пута)\n"
+msgstr "      --ignoregroup <група>\n                         игнорише надоградњу групе (може се употребити више пута)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps           прескаче проверу верзија зависности (-dd прескаче "
-"све провере)\n"
+msgstr "  -d, --nodeps           прескаче проверу верзија зависности (-dd прескаче све провере)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <пакет=верзија>\n"
-"                       додаје виртуелни пакет ради задовољавања зависности\n"
+msgstr "      --assume-installed <пакет=верзија>\n                       додаје виртуелни пакет ради задовољавања зависности\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
 msgstr "      --dbonly           мења само уносе у бази, не и фајлове пакета\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar    скрива траку напретка при преузимању фајлова\n"
+msgstr "      --noprogressbar    скрива траку напретка при преузимању фајлова\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet      не извршава инсталациону скрипту уколико постоји\n"
+msgstr "      --noscriptlet      не извршава инсталациону скрипту уколико постоји\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
@@ -1102,9 +1032,7 @@ msgstr "  -p, --print            штампа циљеве уместо извр
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <ниска>\n"
-"                         одређује како ће циљеви бити штампани\n"
+msgstr "      --print-format <ниска>\n                         одређује како ће циљеви бити штампани\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1154,8 +1082,7 @@ msgstr "      --debug            приказује поруке за испра
 #: src/pacman/pacman.c:220
 #, c-format
 msgid "      --gpgdir <path>  set an alternate home directory for GnuPG\n"
-msgstr ""
-"      --gpgdir <путања>  поставља алтернативну домаћу фасциклу за GnuPG\n"
+msgstr "      --gpgdir <путања>  поставља алтернативну домаћу фасциклу за GnuPG\n"
 
 #: src/pacman/pacman.c:221
 #, c-format
@@ -1177,9 +1104,7 @@ msgstr "      --confirm        увек тражи потврду\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Овај програм се може слободно редистрибуирати\n"
-"                               под условима Гнуове Опште Јавне Лиценце.\n"
+msgstr "                       Овај програм се може слободно редистрибуирати\n                               под условима Гнуове Опште Јавне Лиценце.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1539,9 +1464,7 @@ msgstr "не могу да закључам базу: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  Ако сте сигурни да менаџер пакета није већ\n"
-"  покренут, можете уклонити %s\n"
+msgstr "  Ако сте сигурни да менаџер пакета није већ\n  покренут, можете уклонити %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
@@ -1711,9 +1634,7 @@ msgstr "Ризница %s\n"
 #: src/pacman/util.c:1306
 #, c-format
 msgid "invalid value: %d is not between %d and %d\n"
-msgstr ""
-"неисправна вредност: %d није између %d и %d\n"
-"\n"
+msgstr "неисправна вредност: %d није између %d и %d\n\n"
 
 #: src/pacman/util.c:1313
 #, c-format
diff --git a/src/pacman/po/sr@latin.po b/src/pacman/po/sr@latin.po
index f4a75f19..9db9fc29 100644
--- a/src/pacman/po/sr@latin.po
+++ b/src/pacman/po/sr@latin.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Mladen Pejaković <pejakm@autistici.org>, 2013
 # Mladen Pejaković <pejakm@autistici.org>, 2013
@@ -17,14 +17,12 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 12:09+0000\n"
 "Last-Translator: Slobodan Terzić <githzerai06@gmail.com>\n"
-"Language-Team: Serbian (Latin) (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/sr@latin/)\n"
-"Language: sr@latin\n"
+"Language-Team: Serbian (Latin) (http://www.transifex.com/toofishes/archlinux-pacman/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/pacman/callback.c:182
 #, c-format
@@ -181,13 +179,11 @@ msgstr "%s i %s su u sukobu (%s). Ukloniti %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Sledeći paket ne može biti nadograđen zbog nerazrešivih zavisnosti:\n"
-msgstr[1] ""
-"Sledeći paketi ne mogu biti nadograđeni usled nerazrešivih zavisnosti:\n"
-msgstr[2] ""
-"Sledeći paketi ne mogu biti nadograđeni usled nerazrešivih zavisnosti:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Sledeći paket ne može biti nadograđen zbog nerazrešivih zavisnosti:\n"
+msgstr[1] "Sledeći paketi ne mogu biti nadograđeni usled nerazrešivih zavisnosti:\n"
+msgstr[2] "Sledeći paketi ne mogu biti nadograđeni usled nerazrešivih zavisnosti:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -210,9 +206,7 @@ msgstr[2] "Postoji %zu dostavljača za %s\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Fajl %s je neispravan (%s).\n"
-"Želite li da ga obrišete?"
+msgstr "Fajl %s je neispravan (%s).\nŽelite li da ga obrišete?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -405,16 +399,13 @@ msgstr "fajl postavki %s, linija %d: neispravna vrednost za „%s“ : „%s“\
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"fajl postavki %s, linija %d: opcija „%s“ je neispravna, nema podrške za "
-"potpise\n"
+msgstr "fajl postavki %s, linija %d: opcija „%s“ je neispravna, nema podrške za potpise\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"fajl postavki %s, linija %d: direktiva „%s“ u odeljku „%s“ nije prepoznata.\n"
+msgstr "fajl postavki %s, linija %d: direktiva „%s“ u odeljku „%s“ nije prepoznata.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
@@ -441,9 +432,7 @@ msgstr "ne mogu da dodam miror „%s“ u bazu „%s“ (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"neuspela inicijelizacija alpm biblioteke\n"
-"(%s: %s)\n"
+msgstr "neuspela inicijelizacija alpm biblioteke\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -488,8 +477,7 @@ msgstr "fajl postavki %s, linija %d: direktivi „%s“ je potrebna vrednost.\n"
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"pri obradi fajla postavki premašena je maksimalna dubina rekurzije od %d.\n"
+msgstr "pri obradi fajla postavki premašena je maksimalna dubina rekurzije od %d.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -499,8 +487,7 @@ msgstr "ne mogu da pročitam fajl postavki %s: %s\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"fajl postavki %s, linija %d: sve direktive moraju pripadati odeljcima.\n"
+msgstr "fajl postavki %s, linija %d: sve direktive moraju pripadati odeljcima.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -770,16 +757,14 @@ msgstr "operacije :\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"upotrebite „%s {-h --help}” uz operaciju za dostupne opcije\n"
+msgstr "\nupotrebite „%s {-h --help}” uz operaciju za dostupne opcije\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade          uklanja pakete i sve pakete koji zavise od njih\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade          uklanja pakete i sve pakete koji zavise od njih\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -791,10 +776,7 @@ msgstr "  -n, --nosave           uklanja fajlove postavki\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive        uklanja nepotrebne zavisnosti\n"
-"                         (-ss uključuje i eksplicitno instalirane "
-"zavisnosti)\n"
+msgstr "  -s, --recursive        uklanja nepotrebne zavisnosti\n                         (-ss uključuje i eksplicitno instalirane zavisnosti)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -815,14 +797,12 @@ msgstr "  -c, --changelog        prikazuje dnevnik izmena paketa\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps             spisak paketa instaliranih kao zavisnosti [filter]\n"
+msgstr "  -d, --deps             spisak paketa instaliranih kao zavisnosti [filter]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit         spisak eksplicitno instaliranih paketa  [filter]\n"
+msgstr "  -e, --explicit         spisak eksplicitno instaliranih paketa  [filter]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -831,44 +811,34 @@ msgstr "  -g, --groups           prikazuje sve pakete iz grupe\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info             prikazuje podatke o paketu (--ii za rezervne "
-"fajlove)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info             prikazuje podatke o paketu (--ii za rezervne fajlove)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check            proverava da li paket postoji (-kk za svojstva "
-"fajla)\n"
+msgstr "  -k, --check            proverava da li paket postoji (-kk za svojstva fajla)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"  -l, --list           nabraja fajlove koji pripadaju upitanom paketu\n"
+msgstr "  -l, --list           nabraja fajlove koji pripadaju upitanom paketu\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign          nabraja instalirane pakete koji nisu u bazama koje "
-"se sinhronizuju [filter]\n"
+msgstr "  -m, --foreign          nabraja instalirane pakete koji nisu u bazama koje se sinhronizuju [filter]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native           nabraja samo instalirane pakete koji su u bazama "
-"koje se sinhronizuju [filter]\n"
+msgstr "  -n, --native           nabraja samo instalirane pakete koji su u bazama koje se sinhronizuju [filter]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -883,27 +853,21 @@ msgstr "  -p, --file <paket>     traži fajl paketa umesto unosa u bazi\n"
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet            prikazuje manje informacija za upite i pretragu\n"
+msgstr "  -q, --quiet            prikazuje manje informacija za upite i pretragu\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regiz>   traži lokalno instalirane pakete prema zadatim "
-"niskama\n"
+msgstr "  -s, --search <regiz>   traži lokalno instalirane pakete prema zadatim niskama\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     nabraja pakete koji nisu (opciono) zahtevani od\n"
-"                       bilo kog paketa (-tt ignoriše opcione zavisnosti) "
-"[filter]\n"
+msgstr "  -t, --unrequired     nabraja pakete koji nisu (opciono) zahtevani od\n                       bilo kog paketa (-tt ignoriše opcione zavisnosti) [filter]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -915,26 +879,21 @@ msgstr "  -u, --upgrades        nabraja zastarele pakete [filter]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean            uklanja stare pakete iz fascikle keša (-cc za sve)\n"
+msgstr "  -c, --clean            uklanja stare pakete iz fascikle keša (-cc za sve)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         prikazuje članove grupe paketa\n"
-"                       (-gg za prikaz svih grupa i članova)\n"
+msgstr "  -g, --groups         prikazuje članove grupe paketa\n                       (-gg za prikaz svih grupa i članova)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-" -i, --info           prikazuje informacije o paketu (-ii za detaljnije "
-"informacije)\n"
+msgstr " -i, --info           prikazuje informacije o paketu (-ii za detaljnije informacije)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -943,42 +902,33 @@ msgstr "  -l, --list <riznica>   prikazuje spisak svih paketa iz riznice\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <regiz>   traži pakete u udaljenim riznicama na osnovu "
-"zadatih niski\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regiz>   traži pakete u udaljenim riznicama na osnovu zadatih niski\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     nadograđuje instalirane pakete (-uu dozvoljava "
-"razgradnju)\n"
+msgstr "  -u, --sysupgrade     nadograđuje instalirane pakete (-uu dozvoljava razgradnju)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly     preuzma pakete, ali ih ne instalira/nadograđuje\n"
+msgstr "  -w, --downloadonly     preuzma pakete, ali ih ne instalira/nadograđuje\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        dobavlja osvežene baze paketa sa servera\n"
-"                       (-yy primorava osvežavanje iako su baze ažurne)\n"
+msgstr "  -y, --refresh        dobavlja osvežene baze paketa sa servera\n                       (-yy primorava osvežavanje iako su baze ažurne)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps           označava pakete kao neeksplicitno instalirane\n"
+msgstr "      --asdeps           označava pakete kao neeksplicitno instalirane\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
@@ -990,9 +940,7 @@ msgstr "      --asexplicit       označava pakete kao eksplicitno instalirane\n"
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"  -k, --check          testira ispravnost lokalne baze (-kk za "
-"sinhronizovanje baza)\n"
+msgstr "  -k, --check          testira ispravnost lokalne baze (-kk za sinhronizovanje baza)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
@@ -1009,87 +957,67 @@ msgstr "  -x, --regex          omogućava pretragu pomoću regularnih izraza\n"
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"--machinereadable\n"
-"stvara mašinski čitljiv ilaz\n"
+msgstr "--machinereadable\nstvara mašinski čitljiv ilaz\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force            prisiljava instalaciju, prepisujući fajlove u "
-"konfliktu\n"
+msgstr "      --force            prisiljava instalaciju, prepisujući fajlove u konfliktu\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps           instalira pakete kao neeksplicitno instalirane\n"
+msgstr "      --asdeps           instalira pakete kao neeksplicitno instalirane\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit       instalira pakete kao eksplicitno instalirane\n"
+msgstr "      --asexplicit       instalira pakete kao eksplicitno instalirane\n"
 
 #: src/pacman/pacman.c:194
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <paket>   ignoriše nadogradnje paketa (može se upotrebiti "
-"više puta)\n"
+msgstr "      --ignore <paket>   ignoriše nadogradnje paketa (može se upotrebiti više puta)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grupa>\n"
-"                         ignoriše nadogradnju grupe (može se upotrebiti više "
-"puta)\n"
+msgstr "      --ignoregroup <grupa>\n                         ignoriše nadogradnju grupe (može se upotrebiti više puta)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps           preskače proveru verzija zavisnosti (-dd preskače "
-"sve provere)\n"
+msgstr "  -d, --nodeps           preskače proveru verzija zavisnosti (-dd preskače sve provere)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <paket=verzija>\n"
-"                       dodaje virtuelni paket radi zadovoljavanja "
-"zavisnosti\n"
+msgstr "      --assume-installed <paket=verzija>\n                       dodaje virtuelni paket radi zadovoljavanja zavisnosti\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly           menja samo unose u bazi, ne i fajlove paketa\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly           menja samo unose u bazi, ne i fajlove paketa\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar    skriva traku napretka pri preuzimanju fajlova\n"
+msgstr "      --noprogressbar    skriva traku napretka pri preuzimanju fajlova\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet      ne izvršava instalacionu skriptu ukoliko postoji\n"
+msgstr "      --noscriptlet      ne izvršava instalacionu skriptu ukoliko postoji\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
@@ -1103,9 +1031,7 @@ msgstr "  -p, --print            štampa ciljeve umesto izvršavanja operacije\n
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <niska>\n"
-"                         određuje kako će ciljevi biti štampani\n"
+msgstr "      --print-format <niska>\n                         određuje kako će ciljevi biti štampani\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1155,8 +1081,7 @@ msgstr "      --debug            prikazuje poruke za ispravljanje grešaka\n"
 #: src/pacman/pacman.c:220
 #, c-format
 msgid "      --gpgdir <path>  set an alternate home directory for GnuPG\n"
-msgstr ""
-"      --gpgdir <putanja>  postavlja alternativnu domaću fasciklu za GnuPG\n"
+msgstr "      --gpgdir <putanja>  postavlja alternativnu domaću fasciklu za GnuPG\n"
 
 #: src/pacman/pacman.c:221
 #, c-format
@@ -1178,9 +1103,7 @@ msgstr "      --confirm        uvek traži potvrdu\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Ovaj program se može slobodno redistribuirati\n"
-"                               pod uslovima Gnuove Opšte Javne Licence.\n"
+msgstr "                       Ovaj program se može slobodno redistribuirati\n                               pod uslovima Gnuove Opšte Javne Licence.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1540,9 +1463,7 @@ msgstr "ne mogu da zaključam bazu: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  Ako ste sigurni da menadžer paketa nije već\n"
-"  pokrenut, možete ukloniti %s\n"
+msgstr "  Ako ste sigurni da menadžer paketa nije već\n  pokrenut, možete ukloniti %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
@@ -1712,9 +1633,7 @@ msgstr "Riznica %s\n"
 #: src/pacman/util.c:1306
 #, c-format
 msgid "invalid value: %d is not between %d and %d\n"
-msgstr ""
-"neispravna vrednost: %d nije između %d i %d\n"
-"\n"
+msgstr "neispravna vrednost: %d nije između %d i %d\n\n"
 
 #: src/pacman/util.c:1313
 #, c-format
diff --git a/src/pacman/po/sv.po b/src/pacman/po/sv.po
index 0b05a8a1..0cd7f563 100644
--- a/src/pacman/po/sv.po
+++ b/src/pacman/po/sv.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Daniel Sandman <revoltism@gmail.com>, 2013,2015
 # Kim Svensson <ks6g10@soton.ac.uk>, 2011-2012
@@ -14,12 +14,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 03:30+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Swedish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/sv/)\n"
-"Language: sv\n"
+"Language-Team: Swedish (http://www.transifex.com/toofishes/archlinux-pacman/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/pacman/callback.c:182
@@ -177,11 +176,10 @@ msgstr "%s och %s är i konflikt (%s). Radera %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Följande paket kan inte bli uppgraderat på grund av olösta beroenden:\n"
-msgstr[1] ""
-"Följande paket kan inte bli uppgraderade på grund av olösta beroenden:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Följande paket kan inte bli uppgraderat på grund av olösta beroenden:\n"
+msgstr[1] "Följande paket kan inte bli uppgraderade på grund av olösta beroenden:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -202,9 +200,7 @@ msgstr[1] ""
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Filen %s är korrumperad (%s).\n"
-"Vill du ta bort den?"
+msgstr "Filen %s är korrumperad (%s).\nVill du ta bort den?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -399,14 +395,12 @@ msgstr "konfigurationsfil %s, rad %d: val '%s' ogiltigt, inget signaturstöd\n"
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"konfigurationsfil %s, rad %d: känner ej igen direktiv '%s' i sektion '%s'.\n"
+msgstr "konfigurationsfil %s, rad %d: känner ej igen direktiv '%s' i sektion '%s'.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
 msgid "mirror '%s' contains the '%s' variable, but no '%s' is defined.\n"
-msgstr ""
-"spegeln '%s' innehåller variabeln '%s', men ingen/t '%s' är definerad/t.\n"
+msgstr "spegeln '%s' innehåller variabeln '%s', men ingen/t '%s' är definerad/t.\n"
 
 #: src/pacman/conf.c:641
 #, c-format
@@ -428,9 +422,7 @@ msgstr "kunde ej lägga till spegel '%s' till databasen '%s' (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"misslyckades att initialisera alpm bibliotek\n"
-"(%s: %s)\n"
+msgstr "misslyckades att initialisera alpm bibliotek\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -485,8 +477,7 @@ msgstr "konfigurationsfilen %s kunde inte avläsas: %s⏎\n"
 #: src/pacman/conf.c:1019
 #, c-format
 msgid "config file %s, line %d: All directives must belong to a section.\n"
-msgstr ""
-"konfigurationsfil %s, rad %d: Alla direktiv måste tillhöra en sektion.\n"
+msgstr "konfigurationsfil %s, rad %d: Alla direktiv måste tillhöra en sektion.\n"
 
 #: src/pacman/database.c:50 src/pacman/query.c:423 src/pacman/remove.c:91
 #: src/pacman/sync.c:929 src/pacman/upgrade.c:47
@@ -507,14 +498,12 @@ msgstr "kunde inte sätta installationsanledning för paketet %s (%s)\n"
 #: src/pacman/database.c:78
 #, c-format
 msgid "%s: install reason has been set to 'installed as dependency'\n"
-msgstr ""
-"%s: installationsanledning har blivit satt till 'installerad som beroende'\n"
+msgstr "%s: installationsanledning har blivit satt till 'installerad som beroende'\n"
 
 #: src/pacman/database.c:80
 #, c-format
 msgid "%s: install reason has been set to 'explicitly installed'\n"
-msgstr ""
-"%s: installationsanledning har blivit satt till 'uttryckligt installerad\n"
+msgstr "%s: installationsanledning har blivit satt till 'uttryckligt installerad\n"
 
 #: src/pacman/package.c:97
 #, c-format
@@ -758,16 +747,14 @@ msgstr "operationer:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"använd '%s {-h --help}' med en operation för tillgängliga alternativ\n"
+msgstr "\nanvänd '%s {-h --help}' med en operation för tillgängliga alternativ\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade          radera paket och alla paket som beror på dem\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade          radera paket och alla paket som beror på dem\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -779,9 +766,7 @@ msgstr "  -n, --nosave           radera konfigurationsfiler\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive       radera ej behövda beroenden\n"
-"                        (-ss inkluderar uttryckligt installerade beroenden)\n"
+msgstr "  -s, --recursive       radera ej behövda beroenden\n                        (-ss inkluderar uttryckligt installerade beroenden)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -802,14 +787,12 @@ msgstr "  -c, --changelog      visa ändringsloggen för ett paket\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           visa paket installerade som beroenden [filtrera]\n"
+msgstr "  -d, --deps           visa paket installerade som beroenden [filtrera]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       visa uttryckligt installerade paket [filtrera]\n"
+msgstr "  -e, --explicit       visa uttryckligt installerade paket [filtrera]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -818,43 +801,34 @@ msgstr "  -g, --groups         visa alla medlemmar ur paketgruppen\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           visa paketinformation (-ii för säkerhetskopierade "
-"filer)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           visa paketinformation (-ii för säkerhetskopierade filer)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"-k, --check kontrollera om paketfiler existerar (-kk för filegenskaper)⏎\n"
+msgstr "-k, --check kontrollera om paketfiler existerar (-kk för filegenskaper)⏎\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"  -l, --list           visa innehållet ägt av det efterfrågade paketet\n"
+msgstr "  -l, --list           visa innehållet ägt av det efterfrågade paketet\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        visa installerade paket som inte hittades i sync "
-"db(s) [filter]\n"
+msgstr "  -m, --foreign        visa installerade paket som inte hittades i sync db(s) [filter]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"-n, --native visa installerade paket endast funna i synkdatabasens "
-"[filter]⏎\n"
+msgstr "-n, --native visa installerade paket endast funna i synkdatabasens [filter]⏎\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -869,26 +843,21 @@ msgstr "  -p, --file <paket> fråga en paketfil istället för databasen\n"
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          visa mindre information för en förfrågan och sökning\n"
+msgstr "  -q, --quiet          visa mindre information för en förfrågan och sökning\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex> sök i lokalt installerade paket efter matchande "
-"strängar\n"
+msgstr "  -s, --search <regex> sök i lokalt installerade paket efter matchande strängar\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"-t, --unrequired visa paket som inte (valfritt) behövs av något annat\n"
-"paket (-tt för att ignorera optdepends) [filtrera]\n"
+msgstr "-t, --unrequired visa paket som inte (valfritt) behövs av något annat\npaket (-tt för att ignorera optdepends) [filtrera]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -900,28 +869,21 @@ msgstr "  -u, --upgrades       listar utdaterade paket [filter]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          ta bort gamla paket från cache katalogen(-cc för "
-"alla)\n"
+msgstr "  -c, --clean          ta bort gamla paket från cache katalogen(-cc för alla)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"-g, --groups visa alla medlemmar ur paketgruppen\n"
-"(-gg gör att se alla grupper och medlemmar)\n"
-"\n"
+msgstr "-g, --groups visa alla medlemmar ur paketgruppen\n(-gg gör att se alla grupper och medlemmar)\n\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"-i, --info visa paketinformation (-ii för utökad information)\n"
-"\n"
+msgstr "-i, --info visa paketinformation (-ii för utökad information)\n\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -930,44 +892,33 @@ msgstr "  -l, --list <förråd>    visa en lista över paket i ett förråd\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
-msgstr ""
-"  -s, --search <regex> sök i externa centralkataloger efter matchande "
-"strängar\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
+msgstr "  -s, --search <regex> sök i externa centralkataloger efter matchande strängar\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"-u, --sysupgrade uppgradera alla utdaterade paket (-uu möjliggör "
-"nedgradering)\n"
-"\n"
+msgstr "-u, --sysupgrade uppgradera alla utdaterade paket (-uu möjliggör nedgradering)\n\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   ladda ner paket men installera/uppdatera ingenting\n"
+msgstr "  -w, --downloadonly   ladda ner paket men installera/uppdatera ingenting\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"-y, --refresh ladda ner ny paketdatabas från servern\n"
-"(-yy för att tvinga igenom en uppdatering)\n"
-"\n"
+msgstr "-y, --refresh ladda ner ny paketdatabas från servern\n(-yy för att tvinga igenom en uppdatering)\n\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         markera paket som icke-utryckligt installerade\n"
+msgstr "      --asdeps         markera paket som icke-utryckligt installerade\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
@@ -1006,8 +957,7 @@ msgstr "--force tvingad installation. Skriv över motstridiga filer⏎\n"
 #: src/pacman/pacman.c:192
 #, c-format
 msgid "      --asdeps         install packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps         installera paket som icke-utryckligt installerade\n"
+msgstr "      --asdeps         installera paket som icke-utryckligt installerade\n"
 
 #: src/pacman/pacman.c:193
 #, c-format
@@ -1019,77 +969,59 @@ msgstr "      --asexplicit     installera paket som utryckligt installerade\n"
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg>   ignorera en paketuppdatering (kan användas mer än en "
-"gång)\n"
+msgstr "      --ignore <pkg>   ignorera en paketuppdatering (kan användas mer än en gång)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                       ignorera en gruppuppgradering (kan användas mer än en "
-"gång)\n"
+msgstr "      --ignoregroup <grp>\n                       ignorera en gruppuppgradering (kan användas mer än en gång)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         hoppa över beroendeversionskontroll (-dd för att "
-"hoppa över alla kontroller)\n"
+msgstr "  -d, --nodeps         hoppa över beroendeversionskontroll (-dd för att hoppa över alla kontroller)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"--assume-installed <paket=version>\n"
-"lägg till ett virtuellt paket för att tillfredsställa beroenden\n"
+msgstr "--assume-installed <paket=version>\nlägg till ett virtuellt paket för att tillfredsställa beroenden\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
 msgstr "      --dbonly         modifiera enbart databasinlägg, ej paketfiler\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  visa inte en förloppsindikator vid nerladdning av "
-"filer\n"
+msgstr "      --noprogressbar  visa inte en förloppsindikator vid nerladdning av filer\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
 msgid ""
 "      --noscriptlet    do not execute the install scriptlet if one exists\n"
-msgstr ""
-"      --noscriptlet    kör inte installations 'scriptlet' om en redan "
-"existerar\n"
+msgstr "      --noscriptlet    kör inte installations 'scriptlet' om en redan existerar\n"
 
 #: src/pacman/pacman.c:205
 #, c-format
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          skriv ut målen istället för att genomföra "
-"operationen\n"
+msgstr "  -p, --print          skriv ut målen istället för att genomföra operationen\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"        --print-format <string>\n"
-"                       specificera utskriftsformatet\n"
+msgstr "        --print-format <string>\n                       specificera utskriftsformatet\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1161,9 +1093,7 @@ msgstr "--confirm fråga alltid efter bekräftelse\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Det här programet får fritt distributeras under \n"
-"                       villkoren angivna i GNU General Public License.\n"
+msgstr "                       Det här programet får fritt distributeras under \n                       villkoren angivna i GNU General Public License.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1208,9 +1138,7 @@ msgstr "misslyckades att återöppna stdin för läsning: (%s)\n"
 #: src/pacman/pacman.c:1184
 #, c-format
 msgid "argument '-' specified with empty stdin\n"
-msgstr ""
-"argumentet '-' angavs med tomt stdin\n"
-"\n"
+msgstr "argumentet '-' angavs med tomt stdin\n\n"
 
 #: src/pacman/pacman.c:1189
 #, c-format
@@ -1260,9 +1188,7 @@ msgstr "Inget paket äger %s\n"
 #: src/pacman/query.c:204
 #, c-format
 msgid "path too long: %s/\n"
-msgstr ""
-"sökväg för lång: %s/\n"
-"\n"
+msgstr "sökväg för lång: %s/\n\n"
 
 #: src/pacman/query.c:329
 #, c-format
@@ -1526,9 +1452,7 @@ msgstr "kunde inte låsa databasen: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  om du är säker på att en pakethanterare inte redan\n"
-"  körs, så kan du ta bort %s\n"
+msgstr "  om du är säker på att en pakethanterare inte redan\n  körs, så kan du ta bort %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/th.po b/src/pacman/po/th.po
index d259c76e..651cd6cb 100644
--- a/src/pacman/po/th.po
+++ b/src/pacman/po/th.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Ella Rudland <atwwtkp@gmail.com>, 2015
 msgid ""
@@ -11,12 +11,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 03:30+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Thai (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/th/)\n"
-"Language: th\n"
+"Language-Team: Thai (http://www.transifex.com/toofishes/archlinux-pacman/language/th/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/pacman/callback.c:182
@@ -174,7 +173,8 @@ msgstr ""
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
 msgstr[0] ""
 
 #: src/pacman/callback.c:442
@@ -742,7 +742,8 @@ msgstr ""
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
 msgstr ""
 
 #: src/pacman/pacman.c:126
@@ -790,8 +791,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
 msgstr ""
 
 #: src/pacman/pacman.c:142
@@ -882,8 +882,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
 
 #: src/pacman/pacman.c:163
@@ -985,8 +984,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
 msgstr ""
 
 #: src/pacman/pacman.c:203
diff --git a/src/pacman/po/tr.po b/src/pacman/po/tr.po
index 7abf903b..c5eea561 100644
--- a/src/pacman/po/tr.po
+++ b/src/pacman/po/tr.po
@@ -1,35 +1,35 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Atilla Öntaş <tarakbumba@gmail.com>, 2011-2015
 # Atilla Öntaş <tarakbumba@gmail.com>, 2012
+# Demiray Muhterem <mdemiray@msn.com>, 2016
 # Samed Beyribey <ras0ir@eventualis.org>, 2011,2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
-"PO-Revision-Date: 2016-01-17 03:31+0000\n"
-"Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Turkish (http://www.transifex.com/toofishes/archlinux-pacman/"
-"language/tr/)\n"
-"Language: tr\n"
+"PO-Revision-Date: 2016-02-02 19:22+0000\n"
+"Last-Translator: Demiray Muhterem <mdemiray@msn.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/toofishes/archlinux-pacman/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: src/pacman/callback.c:182
 #, c-format
 msgid "Running pre-transaction hooks...\n"
-msgstr ""
+msgstr "Bağlantılı ön işlemler çalışıyor...\n"
 
 #: src/pacman/callback.c:184
 #, c-format
 msgid "Running post-transaction hooks...\n"
-msgstr ""
+msgstr "Bağlantılı işlemler listesi çalışıyor...\n"
 
 #: src/pacman/callback.c:197
 #, c-format
@@ -54,7 +54,7 @@ msgstr "varsa paketler arası çakışmalara bakılıyor...\n"
 #: src/pacman/callback.c:211
 #, c-format
 msgid "Processing package changes...\n"
-msgstr ""
+msgstr "Paket değişiklikleri işleniyor...\n"
 
 #: src/pacman/callback.c:218
 #, c-format
@@ -154,9 +154,7 @@ msgstr "%s, %s.pacsave olarak kaydedildi\n"
 #: src/pacman/callback.c:390
 #, c-format
 msgid "%s is in IgnorePkg/IgnoreGroup. Install anyway?"
-msgstr ""
-"%s paketi IgnorePkg ya da IgnoreGroup içerisinde bulunuyor. Yine de "
-"kurulmasını istiyor musunuz?"
+msgstr "%s paketi IgnorePkg ya da IgnoreGroup içerisinde bulunuyor. Yine de kurulmasını istiyor musunuz?"
 
 #: src/pacman/callback.c:400
 #, c-format
@@ -171,19 +169,17 @@ msgstr "%s, %s ile çakışıyor. %s paketinin kaldırılmasını istiyor musunu
 #: src/pacman/callback.c:417
 #, c-format
 msgid "%s and %s are in conflict (%s). Remove %s?"
-msgstr ""
-"%s, %s ile çakışıyor (%s). %s paketinin kaldırılmasını istiyor musunuz?"
+msgstr "%s, %s ile çakışıyor (%s). %s paketinin kaldırılmasını istiyor musunuz?"
 
 #: src/pacman/callback.c:436
 #, c-format
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"Aşağıdaki paketler çözümlenemeyen bağımlılıkları nedeniyle yükseltilemez:\n"
-msgstr[1] ""
-"Aşağıdaki paketler çözümlenemeyen bağımlılıkları nedeniyle yükseltilemez:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "Aşağıdaki paketler çözümlenemeyen bağımlılıkları nedeniyle yükseltilemez:\n"
+msgstr[1] "Aşağıdaki paketler çözümlenemeyen bağımlılıkları nedeniyle yükseltilemez:\n"
 
 #: src/pacman/callback.c:442
 #, c-format
@@ -204,19 +200,17 @@ msgstr[1] "%2$s için %1$zu sağlayıcı mevcut:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"%s dosyası bozuk (%s).\n"
-"Silinmesini istiyor musunuz?"
+msgstr "%s dosyası bozuk (%s).\nSilinmesini istiyor musunuz?"
 
 #: src/pacman/callback.c:478
 #, c-format
 msgid "Import PGP key %u%c/%s, \"%s\", created: %s (revoked)?"
-msgstr ""
+msgstr "%u%c/%s, PGP anahtarı içe aktarılıyor, \"%s\", oluşturuldu: %s (iptal edilsin mi)?"
 
 #: src/pacman/callback.c:481
 #, c-format
 msgid "Import PGP key %u%c/%s, \"%s\", created: %s?"
-msgstr ""
+msgstr "%u%c/%s, PGP anahtarı içe aktarılıyor, \"%s\", oluşturuldu: %s?"
 
 #: src/pacman/callback.c:540
 #, c-format
@@ -395,8 +389,7 @@ msgstr "%s yapılandırma dosyası, satır %d: '%s' için geçersiz değer: '%s'
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"%s yapılandırma dosyası, satır %d: '%s' seçeneği geçersiz, imza desteği yok\n"
+msgstr "%s yapılandırma dosyası, satır %d: '%s' seçeneği geçersiz, imza desteği yok\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
@@ -429,14 +422,12 @@ msgstr "'%s' yansısı '%s' veritabanına eklenemedi (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"alpm kütüphanesi başlatılamadı\n"
-"(%s. %s)\n"
+msgstr "alpm kütüphanesi başlatılamadı\n(%s. %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
 msgid "try running pacman-db-upgrade\n"
-msgstr ""
+msgstr "pacman-db-upgrade komutunu çalıştırmayı deneyin\n"
 
 #: src/pacman/conf.c:744
 #, c-format
@@ -451,7 +442,7 @@ msgstr "'%s' gpg dizini ayarlanırken sorun oluştu (%s)\n"
 #: src/pacman/conf.c:763 src/pacman/conf.c:771
 #, c-format
 msgid "problem adding hookdir '%s' (%s)\n"
-msgstr ""
+msgstr "bağlama sorunu ekleniyor '%s' (%s)\n"
 
 #: src/pacman/conf.c:802
 #, c-format
@@ -461,27 +452,22 @@ msgstr "herhangi bir '%s' yapılandırılmamış\n"
 #: src/pacman/conf.c:830
 #, c-format
 msgid "Failed to pass %s entry to libalpm"
-msgstr ""
+msgstr "libalpm için %s girdisi başarısız oldu"
 
 #: src/pacman/conf.c:870
 #, c-format
 msgid "config file %s, line %d: '%s' option '%s' not recognized\n"
-msgstr ""
-"ayar dosyası %s, satır %d: '%s' seçeneği '%s' bölümü tanınmıyor\n"
-"\n"
+msgstr "ayar dosyası %s, satır %d: '%s' seçeneği '%s' bölümü tanınmıyor\n\n"
 
 #: src/pacman/conf.c:890 src/pacman/conf.c:898 src/pacman/conf.c:941
 #, c-format
 msgid "config file %s, line %d: directive '%s' needs a value\n"
-msgstr ""
-"yapılandırma dosyası %s, satır %d: '%s' direktifine bir değer atanmalı\n"
+msgstr "yapılandırma dosyası %s, satır %d: '%s' direktifine bir değer atanmalı\n"
 
 #: src/pacman/conf.c:948
 #, c-format
 msgid "config parsing exceeded max recursion depth of %d.\n"
-msgstr ""
-"yapılandırma yorumlaması izin verilen maksimum çözümleme değeri olan %d  "
-"değerini aştı.\n"
+msgstr "yapılandırma yorumlaması izin verilen maksimum çözümleme değeri olan %d  değerini aştı.\n"
 
 #: src/pacman/conf.c:996
 #, c-format
@@ -522,37 +508,37 @@ msgstr "%s: kurulum sebebi 'doğrudan kurulmuş' olarak belirlendi\n"
 #: src/pacman/package.c:97
 #, c-format
 msgid "Architecture"
-msgstr ""
+msgstr "Mimari"
 
 #: src/pacman/package.c:98
 #, c-format
 msgid "Backup Files"
-msgstr ""
+msgstr "Yedekleme Dosyası"
 
 #: src/pacman/package.c:99
 #, c-format
 msgid "Build Date"
-msgstr ""
+msgstr "İnşa Tarihi"
 
 #: src/pacman/package.c:100
 #, c-format
 msgid "Compressed Size"
-msgstr ""
+msgstr "Sıkıştırılmış Boyut"
 
 #: src/pacman/package.c:101
 #, c-format
 msgid "Conflicts With"
-msgstr ""
+msgstr "Çakışıyor"
 
 #: src/pacman/package.c:102
 #, c-format
 msgid "Depends On"
-msgstr ""
+msgstr "Bağımlılıkları"
 
 #: src/pacman/package.c:103
 #, c-format
 msgid "Description"
-msgstr ""
+msgstr "Açıklama"
 
 #: src/pacman/package.c:104 src/pacman/util.c:821
 #, c-format
@@ -562,32 +548,32 @@ msgstr "İndirme Boyutu"
 #: src/pacman/package.c:105
 #, c-format
 msgid "Groups"
-msgstr ""
+msgstr "Gruplar"
 
 #: src/pacman/package.c:106
 #, c-format
 msgid "Install Date"
-msgstr ""
+msgstr "Yükleme Tarihi"
 
 #: src/pacman/package.c:107
 #, c-format
 msgid "Install Reason"
-msgstr ""
+msgstr "Yükleme Sebebi"
 
 #: src/pacman/package.c:108
 #, c-format
 msgid "Install Script"
-msgstr ""
+msgstr "Kurulum Betiği"
 
 #: src/pacman/package.c:109
 #, c-format
 msgid "Installed Size"
-msgstr ""
+msgstr "Kurulum Boyutu"
 
 #: src/pacman/package.c:110
 #, c-format
 msgid "Licenses"
-msgstr ""
+msgstr "Lisanslar"
 
 #: src/pacman/package.c:111 src/pacman/package.c:232
 #, c-format
@@ -602,62 +588,62 @@ msgstr "İsim"
 #: src/pacman/package.c:113
 #, c-format
 msgid "Optional Deps"
-msgstr ""
+msgstr "Tercihli Bağımlılıklar"
 
 #: src/pacman/package.c:114
 #, c-format
 msgid "Optional For"
-msgstr ""
+msgstr "İsteğe Bağlı"
 
 #: src/pacman/package.c:115
 #, c-format
 msgid "Packager"
-msgstr ""
+msgstr "Paketçi"
 
 #: src/pacman/package.c:116
 #, c-format
 msgid "Provides"
-msgstr ""
+msgstr "Sağlananlar"
 
 #: src/pacman/package.c:117
 #, c-format
 msgid "Replaces"
-msgstr ""
+msgstr "Değiştirilenler"
 
 #: src/pacman/package.c:118
 #, c-format
 msgid "Repository"
-msgstr ""
+msgstr "Depo"
 
 #: src/pacman/package.c:119
 #, c-format
 msgid "Required By"
-msgstr ""
+msgstr "İhtiyaç Duyulanlar"
 
 #: src/pacman/package.c:120 src/pacman/package.c:235
 #, c-format
 msgid "SHA-256 Sum"
-msgstr ""
+msgstr "SHA-256 Özeti"
 
 #: src/pacman/package.c:121
 #, c-format
 msgid "Signatures"
-msgstr ""
+msgstr "İmzalar"
 
 #: src/pacman/package.c:122
 #, c-format
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: src/pacman/package.c:123
 #, c-format
 msgid "Validated By"
-msgstr ""
+msgstr "Doğrulayan"
 
 #: src/pacman/package.c:124
 #, c-format
 msgid "Version"
-msgstr ""
+msgstr "Sürüm"
 
 #: src/pacman/package.c:167 src/pacman/util.c:1205
 #, c-format
@@ -761,16 +747,14 @@ msgstr "işlemler:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"daha ayrıntılı bilgi için '%s {-h --help}' kullanın\n"
+msgstr "\ndaha ayrıntılı bilgi için '%s {-h --help}' kullanın\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade       paket(ler)i ve on(lar)a ait tüm bağımlılıkları kaldır\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade       paket(ler)i ve on(lar)a ait tüm bağımlılıkları kaldır\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -782,9 +766,7 @@ msgstr "  -n, --nosave         yapılandırma dosyalarını kaldır\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      gereksiz bağımlılıkları kaldır\n"
-"                       (-ss doğrudan kurulmuş bağımlılıkları da içerir)\n"
+msgstr "  -s, --recursive      gereksiz bağımlılıkları kaldır\n                       (-ss doğrudan kurulmuş bağımlılıkları da içerir)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -805,9 +787,7 @@ msgstr "  -c, --changelog      paketin değişim kaydını göster\n"
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           bağımlılık olarak yüklenen paketleri listele "
-"[filtre]\n"
+msgstr "  -d, --deps           bağımlılık olarak yüklenen paketleri listele [filtre]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
@@ -821,43 +801,34 @@ msgstr "  -g, --groups         paket grubundaki tüm paketleri göster\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           paket bilgisini göster (yedek dosyaları için -ii)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           paket bilgisini göster (yedek dosyaları için -ii)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          paket dosyalarının varlığını kontrol et (dosya "
-"sahipliklerini görüntülemek  için -kk)\n"
+msgstr "  -k, --check          paket dosyalarının varlığını kontrol et (dosya sahipliklerini görüntülemek  için -kk)\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
 msgid "  -l, --list           list the files owned by the queried package\n"
-msgstr ""
-"  -l, --list          araştırılan paketin sahibi olduğu dosyaları listele\n"
+msgstr "  -l, --list          araştırılan paketin sahibi olduğu dosyaları listele\n"
 
 #: src/pacman/pacman.c:144
 #, c-format
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        senkronize veritabanında bulunmayan paketleri listele "
-"[filtre]\n"
+msgstr "  -m, --foreign        senkronize veritabanında bulunmayan paketleri listele [filtre]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native        sadece senkronize veritabanında bulunan paketleri kur "
-"[filtre]\n"
+msgstr "  -n, --native        sadece senkronize veritabanında bulunan paketleri kur [filtre]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -872,28 +843,21 @@ msgstr "  -p, --file <paket>  veritabanı yerine paket dosyasını sorgula\n"
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          sorgulama ve arama sırasında daha az bilgi göster\n"
+msgstr "  -q, --quiet          sorgulama ve arama sırasında daha az bilgi göster\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex> kurulu paketler içerisinde söz dizimine uyarak arama "
-"yap\n"
+msgstr "  -s, --search <regex> kurulu paketler içerisinde söz dizimine uyarak arama yap\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired    hiçbir paket tarafından isteğe bağlı olarak gereksinim "
-"duyulmayan \n"
-"                       paketleri listele (optdepends için -tt kullanın) "
-"[filtre]\n"
+msgstr "  -t, --unrequired    hiçbir paket tarafından isteğe bağlı olarak gereksinim duyulmayan \n                       paketleri listele (optdepends için -tt kullanın) [filtre]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -905,26 +869,21 @@ msgstr "  -u, --upgrades       güncellenebilecek paketleri listele [filtre]\n"
 msgid ""
 "  -c, --clean          remove old packages from cache directory (-cc for "
 "all)\n"
-msgstr ""
-"  -c, --clean          önbellekteki eski paketleri kaldır (hepsi için -cc)\n"
+msgstr "  -c, --clean          önbellekteki eski paketleri kaldır (hepsi için -cc)\n"
 
 #: src/pacman/pacman.c:157
 #, c-format
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         bir paket grubundaki tüm paketleri göster \n"
-"                       (tüm grupları ve üyeleri için -gg kullanın)\n"
+msgstr "  -g, --groups         bir paket grubundaki tüm paketleri göster \n                       (tüm grupları ve üyeleri için -gg kullanın)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-"  -i, --info           paket bilgisini göster (genişletilmiş bilgi için -ii "
-"kullanın) \n"
+msgstr "  -i, --info           paket bilgisini göster (genişletilmiş bilgi için -ii kullanın) \n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -933,77 +892,67 @@ msgstr "  -l, --list <depo>    depodaki paket listesini göster\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr "  -s, --search <regex> depo(lar)da söz dizimine uyan arama yap\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"  -u, --sysupgrade     kurulu paketleri yükselt (-uu eski sürüme çevirmeyi "
-"etkinleştirir) \n"
+msgstr "  -u, --sysupgrade     kurulu paketleri yükselt (-uu eski sürüme çevirmeyi etkinleştirir) \n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   paketleri sadece indir ve kurulum ya da güncelleme "
-"yapma\n"
+msgstr "  -w, --downloadonly   paketleri sadece indir ve kurulum ya da güncelleme yapma\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        sunucudan güncel paket veritabanını indir \n"
-"                       (güncel olsa bile zorlamak için -yy kullanın)\n"
+msgstr "  -y, --refresh        sunucudan güncel paket veritabanını indir \n                       (güncel olsa bile zorlamak için -yy kullanın)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
 msgid "      --asdeps         mark packages as non-explicitly installed\n"
-msgstr ""
-"      --asdeps     paketleri bağımlılık olarak kurulacak şekilde işaretle\n"
+msgstr "      --asdeps     paketleri bağımlılık olarak kurulacak şekilde işaretle\n"
 
 #: src/pacman/pacman.c:172
 #, c-format
 msgid "      --asexplicit     mark packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     paketleri doğrudan kurulmuş paket olarak işaretle\n"
+msgstr "      --asexplicit     paketleri doğrudan kurulmuş paket olarak işaretle\n"
 
 #: src/pacman/pacman.c:173
 #, c-format
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
+msgstr "yerel veritabanını doğrulamak için -k, --check ile test et (veritabanı senkronizasyonu için -kk)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
+msgstr "Dizgilerde tekrarlayan paket isimlerini -s, --search <file> biçiminde ara\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
 msgid "  -x, --regex          enable searching using regular expressions\n"
-msgstr ""
+msgstr "-x, --regex ifadelerini kullanarak aramayı etkinleştir\n"
 
 #: src/pacman/pacman.c:185
 #, c-format
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
+msgstr "--machinereadable\nmakine tarafından okunabilir bir çıktı üret\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          kuruluma zorla, çakışan dosyaların üzerine yaz\n"
+msgstr "      --force          kuruluma zorla, çakışan dosyaların üzerine yaz\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
@@ -1013,53 +962,40 @@ msgstr "      --asdeps         paket(ler)i bağımlılık olarak kur\n"
 #: src/pacman/pacman.c:193
 #, c-format
 msgid "      --asexplicit     install packages as explicitly installed\n"
-msgstr ""
-"      --asexplicit     paket(ler)i doğrudan kurulmuş paket olarak kur\n"
+msgstr "      --asexplicit     paket(ler)i doğrudan kurulmuş paket olarak kur\n"
 
 #: src/pacman/pacman.c:194
 #, c-format
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg>   paket güncellemesini görmezden gel (birden çok paket "
-"için kullanılabilir)\n"
+msgstr "      --ignore <pkg>   paket güncellemesini görmezden gel (birden çok paket için kullanılabilir)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                       güncelleme sırasında grubu görmezden gel (birden çok "
-"grup için kullanılabilir)\n"
+msgstr "      --ignoregroup <grp>\n                       güncelleme sırasında grubu görmezden gel (birden çok grup için kullanılabilir)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         bağımlılk sürüm denetimlerini atla (-dd tüm "
-"denetimleri atlar)\n"
+msgstr "  -d, --nodeps         bağımlılk sürüm denetimlerini atla (-dd tüm denetimleri atlar)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <paket=sürüm>\n"
-"                       bağımlılıkları sağlamak için sanal bir paket ekle\n"
+msgstr "      --assume-installed <paket=sürüm>\n                       bağımlılıkları sağlamak için sanal bir paket ekle\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         sadece veritabanı girdilerini değiştir, paket "
-"dosyalarını değiştirme\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         sadece veritabanı girdilerini değiştir, paket dosyalarını değiştirme\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
@@ -1078,17 +1014,14 @@ msgstr "      --noscriptlet    kurulum betiği varsa çalıştırma\n"
 msgid ""
 "  -p, --print          print the targets instead of performing the "
 "operation\n"
-msgstr ""
-"  -p, --print          işlem gerçekleştirmek yerine hedefleri görüntüle\n"
+msgstr "  -p, --print          işlem gerçekleştirmek yerine hedefleri görüntüle\n"
 
 #: src/pacman/pacman.c:206
 #, c-format
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <dizgi>\n"
-"                       çıktı biçiminin nasıl gösterileceğini belirle\n"
+msgstr "      --print-format <dizgi>\n                       çıktı biçiminin nasıl gösterileceğini belirle\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1118,7 +1051,7 @@ msgstr "      --cachedir <dir> farklı bir önbellek yolu ayarla\n"
 #: src/pacman/pacman.c:216
 #, c-format
 msgid "      --hookdir <dir>  set an alternate hook location\n"
-msgstr ""
+msgstr "alternatif konum bağlantısı ayarla --hookdir <dir>\n"
 
 #: src/pacman/pacman.c:217
 #, c-format
@@ -1160,9 +1093,7 @@ msgstr "      --confirm        her zaman onay iste\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Bu yazılım GNU Genel Kamu Lisansı hükümlerine\n"
-"                       uymak şartıyla özgürce dağıtılabilir.\n"
+msgstr "                       Bu yazılım GNU Genel Kamu Lisansı hükümlerine\n                       uymak şartıyla özgürce dağıtılabilir.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1207,9 +1138,7 @@ msgstr "stdin okunmak için açılamadı: (%s)\n"
 #: src/pacman/pacman.c:1184
 #, c-format
 msgid "argument '-' specified with empty stdin\n"
-msgstr ""
-"'-' parametresi stdin üzerinde boş girdi ile kullanıldı\n"
-"\n"
+msgstr "'-' parametresi stdin üzerinde boş girdi ile kullanıldı\n\n"
 
 #: src/pacman/pacman.c:1189
 #, c-format
@@ -1304,7 +1233,7 @@ msgstr "işlem hazırlığı başarısız oldu (%s)\n"
 #: src/pacman/remove.c:125 src/pacman/sync.c:724
 #, c-format
 msgid "%s: removing %s breaks dependency '%s'\n"
-msgstr ""
+msgstr "%s:  '%s' bağımlılığı sağlanamadı %s kaldırılıyor\n"
 
 #: src/pacman/remove.c:144
 #, c-format
@@ -1441,7 +1370,7 @@ msgstr "%s: %s paketini gerektiriyor\n"
 #: src/pacman/sync.c:720
 #, c-format
 msgid "%s: installing %s (%s) breaks dependency '%s'\n"
-msgstr ""
+msgstr "%s:  '%s' bağımlılığı sağlanamadı %s (%s) yükleniyor\n"
 
 #: src/pacman/sync.c:744
 #, c-format
@@ -1523,9 +1452,7 @@ msgstr "veritabanı kilitlenemiyor: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  eğer paket yöneticisinin çalışmadığından eminseniz\n"
-"  %s dosyasını silebilirsiniz.\n"
+msgstr "  eğer paket yöneticisinin çalışmadığından eminseniz\n  %s dosyasını silebilirsiniz.\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/uk.po b/src/pacman/po/uk.po
index 90c58a0c..482d7a76 100644
--- a/src/pacman/po/uk.po
+++ b/src/pacman/po/uk.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Allan McRae <allan@archlinux.org>, 2014
 # Max Lyashuk <m_lyashuk@ukr.net>, 2015-2016
@@ -15,16 +15,14 @@ msgstr ""
 "Project-Id-Version: Arch Linux Pacman package manager\n"
 "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
-"PO-Revision-Date: 2016-01-17 08:48+0000\n"
+"PO-Revision-Date: 2016-02-09 18:36+0000\n"
 "Last-Translator: Данило Коростіль <ted.korostiled@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/uk/)\n"
-"Language: uk\n"
+"Language-Team: Ukrainian (http://www.transifex.com/toofishes/archlinux-pacman/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/pacman/callback.c:182
 #, c-format
@@ -181,11 +179,10 @@ msgstr "%s та %s конфліктують (%s). Вилучити %s?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[0] ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
-msgstr[1] ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] "The following packages cannot be upgraded due to unresolvable dependencies:\n"
+msgstr[1] "The following packages cannot be upgraded due to unresolvable dependencies:\n"
 msgstr[2] "Такі пакунки неможливо оновити через нерозвʼязані залежності:\n"
 
 #: src/pacman/callback.c:442
@@ -209,9 +206,7 @@ msgstr[2] "Доступно %zu постачальників для %s:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"Файл %s пошкоджено (%s).\n"
-"Вилучити його?"
+msgstr "Файл %s пошкоджено (%s).\nВилучити його?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -404,16 +399,13 @@ msgstr "файл налаштувань %s, рядок %d: недійсне зн
 #: src/pacman/conf.c:411
 #, c-format
 msgid "config file %s, line %d: '%s' option invalid, no signature support\n"
-msgstr ""
-"файл налаштувань %s, рядок %d: недійсний параметр «%s», без підтримування "
-"підписів\n"
+msgstr "файл налаштувань %s, рядок %d: недійсний параметр «%s», без підтримування підписів\n"
 
 #: src/pacman/conf.c:504 src/pacman/conf.c:609 src/pacman/conf.c:921
 #, c-format
 msgid ""
 "config file %s, line %d: directive '%s' in section '%s' not recognized.\n"
-msgstr ""
-"файл налаштувань %s, рядок %d: каталог «%s» у секції «%s» не розпізнано.\n"
+msgstr "файл налаштувань %s, рядок %d: каталог «%s» у секції «%s» не розпізнано.\n"
 
 #: src/pacman/conf.c:632
 #, c-format
@@ -440,9 +432,7 @@ msgstr "неможливо додати дзеркало «%s» до бази д
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"не вдалося запустити бібліотеку alpm\n"
-"(%s: %s)\n"
+msgstr "не вдалося запустити бібліотеку alpm\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -767,16 +757,14 @@ msgstr "операції:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"виконайте «%s {-h --help}» з операцією, щоб взнати доступні параметри\n"
+msgstr "\nвиконайте «%s {-h --help}» з операцією, щоб взнати доступні параметри\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
-msgstr ""
-"  -c, --cascade        вилучити пакунки і всі пакунки, які залежать від них\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
+msgstr "  -c, --cascade        вилучити пакунки і всі пакунки, які залежать від них\n"
 
 #: src/pacman/pacman.c:126
 #, c-format
@@ -788,9 +776,7 @@ msgstr "  -n, --nosave         вилучити файли налаштуван
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      вилучити непотрібні залежності\n"
-"                       (-ss враховує явно встановлені залежності)\n"
+msgstr "  -s, --recursive      вилучити непотрібні залежності\n                       (-ss враховує явно встановлені залежності)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -811,15 +797,12 @@ msgstr "  -c, --changelog      показати список змін пакун
 #, c-format
 msgid ""
 "  -d, --deps           list packages installed as dependencies [filter]\n"
-msgstr ""
-"  -d, --deps           показати список пакунків, встановлених як залежності "
-"[фільтр]\n"
+msgstr "  -d, --deps           показати список пакунків, встановлених як залежності [фільтр]\n"
 
 #: src/pacman/pacman.c:139
 #, c-format
 msgid "  -e, --explicit       list packages explicitly installed [filter]\n"
-msgstr ""
-"  -e, --explicit       показати список явно встановлених пакунків [фільтр]\n"
+msgstr "  -e, --explicit       показати список явно встановлених пакунків [фільтр]\n"
 
 #: src/pacman/pacman.c:140
 #, c-format
@@ -828,20 +811,15 @@ msgstr "  -g, --groups         показати всі елемети групи
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
-msgstr ""
-"  -i, --info           показати інформацію про пакунок (-ii для резервних "
-"файлів)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
+msgstr "  -i, --info           показати інформацію про пакунок (-ii для резервних файлів)\n"
 
 #: src/pacman/pacman.c:142
 #, c-format
 msgid ""
 "  -k, --check          check that package files exist (-kk for file "
 "properties)\n"
-msgstr ""
-"  -k, --check          перевірити, чи файл пакунка існує (-kk для "
-"властивостей файла)⏎\n"
+msgstr "  -k, --check          перевірити, чи файл пакунка існує (-kk для властивостей файла)⏎\n"
 
 #: src/pacman/pacman.c:143 src/pacman/pacman.c:178
 #, c-format
@@ -853,18 +831,14 @@ msgstr " -l, --list перелічити файли, які належать з
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        показати встановлені пакунки, що не знайдені в "
-"активній базі(ах) даних [фільтр]\n"
+msgstr "  -m, --foreign        показати встановлені пакунки, що не знайдені в активній базі(ах) даних [фільтр]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         список тільки встановлених пакунків, знайдених в "
-"базі(ах) синхронізації [фільтр]\n"
+msgstr "  -n, --native         список тільки встановлених пакунків, знайдених в базі(ах) синхронізації [фільтр]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -879,27 +853,21 @@ msgstr "  -p, --file <package> використати файл пакунка з
 #: src/pacman/pacman.c:148 src/pacman/pacman.c:161 src/pacman/pacman.c:180
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
-msgstr ""
-"  -q, --quiet          показувати менше інформації в результаті запиту чи "
-"пошуку\n"
+msgstr "  -q, --quiet          показувати менше інформації в результаті запиту чи пошуку\n"
 
 #: src/pacman/pacman.c:149
 #, c-format
 msgid ""
 "  -s, --search <regex> search locally-installed packages for matching "
 "strings\n"
-msgstr ""
-"  -s, --search <regex> шукати локально встановлені пакунки, які відповідають "
-"рядку\n"
+msgstr "  -s, --search <regex> шукати локально встановлені пакунки, які відповідають рядку\n"
 
 #: src/pacman/pacman.c:150
 #, c-format
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-" -t, --unrequired перелічити пакунки, які (необов'язкові) потрібні\n"
-"жодному іншому пакунку (-tt для нехтування optdepends) [фільтер]\n"
+msgstr " -t, --unrequired перелічити пакунки, які (необов'язкові) потрібні\nжодному іншому пакунку (-tt для нехтування optdepends) [фільтр]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -918,18 +886,14 @@ msgstr "  -c, --clean          вилучити старі пакунки з к
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"-g, --groups переглянути всі елементи групи пакунка\n"
-"(-gg для переглядання всіх груп і елеметів)\n"
+msgstr "-g, --groups переглянути всі елементи групи пакунка\n(-gg для переглядання всіх груп і елементів)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
 msgid ""
 "  -i, --info           view package information (-ii for extended "
 "information)\n"
-msgstr ""
-" -i, --info переглянути відомості про пакунок (-ii для розширеної "
-"інформації)\n"
+msgstr " -i, --info переглянути відомості про пакунок (-ii для розширеної інформації)\n"
 
 #: src/pacman/pacman.c:160
 #, c-format
@@ -938,35 +902,28 @@ msgstr "  -l, --list <repo>    показати список пакунків у
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr "  -s, --search <regex> шукати задані рядки у віддалених сховищах\n"
 
 #: src/pacman/pacman.c:163
 #, c-format
 msgid ""
 "  -u, --sysupgrade     upgrade installed packages (-uu enables downgrades)\n"
-msgstr ""
-"-u, --sysupgrade оновити встановлені пакунки (-uu дозволяє пониження "
-"версій)\n"
+msgstr "-u, --sysupgrade оновити встановлені пакунки (-uu дозволяє пониження версій)\n"
 
 #: src/pacman/pacman.c:164
 #, c-format
 msgid ""
 "  -w, --downloadonly   download packages but do not install/upgrade "
 "anything\n"
-msgstr ""
-"  -w, --downloadonly   звантажити пакунки, але нічого не встановлювати чи "
-"оновлювати\n"
+msgstr "  -w, --downloadonly   звантажити пакунки, але нічого не встановлювати чи оновлювати\n"
 
 #: src/pacman/pacman.c:165 src/pacman/pacman.c:183
 #, c-format
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"-y, --refresh звантажити свіжу базу даних пакунків з сервера\n"
-"(-yy для примусового оновлення навіть коли нічого нового)\n"
+msgstr "-y, --refresh звантажити свіжу базу даних пакунків з сервера\n(-yy для примусового оновлення навіть коли нічого нового)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -983,15 +940,12 @@ msgstr "      --asexplicit     позначити пакунки як явно 
 msgid ""
 "  -k, --check          test local database for validity (-kk for sync "
 "databases)\n"
-msgstr ""
-"  -k, --check          перевірити локальну базу даних (-kk для "
-"синхронізування бази даних)\n"
+msgstr "  -k, --check          перевірити локальну базу даних (-kk для синхронізування бази даних)\n"
 
 #: src/pacman/pacman.c:181
 #, c-format
 msgid "  -s, --search <file>  search package file names for matching strings\n"
-msgstr ""
-"  -s, --search <файл>  пошук по назвах файлів, які відповідають рядку\n"
+msgstr "  -s, --search <файл>  пошук по назвах файлів, які відповідають рядку\n"
 
 #: src/pacman/pacman.c:182
 #, c-format
@@ -1003,15 +957,12 @@ msgstr "  -x, --regex          увімкнути пошук формальни
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"      --machinereadable\n"
-"                       виводити інформацію, який зрозумілий для машини\n"
+msgstr "      --machinereadable\n                       виводити інформацію, який зрозумілий для машини\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
 msgid "      --force          force install, overwrite conflicting files\n"
-msgstr ""
-"      --force          примусово встановити, перезаписавши конфліктні файли\n"
+msgstr "      --force          примусово встановити, перезаписавши конфліктні файли\n"
 
 #: src/pacman/pacman.c:192
 #, c-format
@@ -1028,53 +979,39 @@ msgstr "      --asexplicit     встановити пакунки як явно
 msgid ""
 "      --ignore <pkg>   ignore a package upgrade (can be used more than "
 "once)\n"
-msgstr ""
-"      --ignore <pkg>   ігнорувати оновлення пакунка (можна вказувати "
-"неодноразово)\n"
+msgstr "      --ignore <pkg>   ігнорувати оновлення пакунка (можна вказувати неодноразово)\n"
 
 #: src/pacman/pacman.c:195
 #, c-format
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <grp>\n"
-"                       ігнорувати оновлення групи (можна вказувати "
-"неодноразово)\n"
+msgstr "      --ignoregroup <grp>\n                       ігнорувати оновлення групи (можна вказувати неодноразово)\n"
 
 #: src/pacman/pacman.c:199
 #, c-format
 msgid ""
 "  -d, --nodeps         skip dependency version checks (-dd to skip all "
 "checks)\n"
-msgstr ""
-"  -d, --nodeps         пропустити перевірку залежностей версій (-dd для "
-"пропуску всіх перевірок)\n"
+msgstr "  -d, --nodeps         пропустити перевірку залежностей версій (-dd для пропуску всіх перевірок)\n"
 
 #: src/pacman/pacman.c:200
 #, c-format
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"--assume-installed <пакунок=версія>\n"
-"додати віртуальний пакунок, щоб задовольнити залежності\n"
+msgstr "--assume-installed <пакунок=версія>\nдодати віртуальний пакунок, щоб задовольнити залежності\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
-msgstr ""
-"      --dbonly         лише змінювати записи бази даних, а не файли "
-"пакунків\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
+msgstr "      --dbonly         лише змінювати записи бази даних, а не файли пакунків\n"
 
 #: src/pacman/pacman.c:203
 #, c-format
 msgid ""
 "      --noprogressbar  do not show a progress bar when downloading files\n"
-msgstr ""
-"      --noprogressbar  не показувати смужку поступу під час звантаження "
-"файлів\n"
+msgstr "      --noprogressbar  не показувати смужку поступу під час звантаження файлів\n"
 
 #: src/pacman/pacman.c:204
 #, c-format
@@ -1094,9 +1031,7 @@ msgstr "-p, --print показати цілі замість виконання
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <string>\n"
-"                       вказати як показувати цілі\n"
+msgstr "      --print-format <string>\n                       вказати як показувати цілі\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1106,9 +1041,7 @@ msgstr "  -b, --dbpath <path>  використати альтернативни
 #: src/pacman/pacman.c:212
 #, c-format
 msgid "  -r, --root <path>    set an alternate installation root\n"
-msgstr ""
-"  -r, --root <path>    використати альтернативний кореневий каталог "
-"встановлення\n"
+msgstr "  -r, --root <path>    використати альтернативний кореневий каталог встановлення\n"
 
 #: src/pacman/pacman.c:213
 #, c-format
@@ -1123,15 +1056,12 @@ msgstr "      --arch <arch>    встановити альтернативну 
 #: src/pacman/pacman.c:215
 #, c-format
 msgid "      --cachedir <dir> set an alternate package cache location\n"
-msgstr ""
-"      --cachedir <dir> використати альтернативний шлях до кеша пакунків\n"
+msgstr "      --cachedir <dir> використати альтернативний шлях до кешу пакунків\n"
 
 #: src/pacman/pacman.c:216
 #, c-format
 msgid "      --hookdir <dir>  set an alternate hook location\n"
-msgstr ""
-"      --hookdir <тека>  визначити альтернативне положення для теки "
-"перехоплення\n"
+msgstr "      --hookdir <тека>  визначити альтернативне положення для теки перехоплення\n"
 
 #: src/pacman/pacman.c:217
 #, c-format
@@ -1151,8 +1081,7 @@ msgstr "      --debug          показувати повідомлення п
 #: src/pacman/pacman.c:220
 #, c-format
 msgid "      --gpgdir <path>  set an alternate home directory for GnuPG\n"
-msgstr ""
-"      --gpgdir <path>  вказати альтернативний домашній каталог для GnuPG\n"
+msgstr "      --gpgdir <path>  вказати альтернативний домашній каталог для GnuPG\n"
 
 #: src/pacman/pacman.c:221
 #, c-format
@@ -1174,9 +1103,7 @@ msgstr "--confirm завжди прохати підтвердження\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       Цю програму можна вільно розповсюджуватись на\n"
-"                       умовах загальної громадської ліцензії GNU.\n"
+msgstr "                       Цю програму можна вільно розповсюджуватись на\n                       умовах загальної громадської ліцензії GNU.\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1376,44 +1303,42 @@ msgstr "Пакунки для утримання:\n"
 #: src/pacman/sync.c:169
 #, c-format
 msgid "  All locally installed packages\n"
-msgstr ""
-"  Усі локально встановлені пакунки\n"
-"\n"
+msgstr "  Усі локально встановлені пакунки\n\n"
 
 #: src/pacman/sync.c:172
 #, c-format
 msgid "  All current sync database packages\n"
-msgstr "  Усі поточно синронізовані пакнуки\n"
+msgstr "  Усі поточно синхронізовані пакунки\n"
 
 #: src/pacman/sync.c:182
 #, c-format
 msgid "Cache directory: %s\n"
-msgstr "Каталог кеша: %s\n"
+msgstr "Каталог кешу: %s\n"
 
 #: src/pacman/sync.c:185
 #, c-format
 msgid "Do you want to remove all other packages from cache?"
-msgstr "Вилучити всі інші пакунки з кеша?"
+msgstr "Вилучити всі інші пакунки з кешу?"
 
 #: src/pacman/sync.c:189
 #, c-format
 msgid "removing old packages from cache...\n"
-msgstr "вилучення старих пакунків з кеша...\n"
+msgstr "вилучення старих пакунків з кешу...\n"
 
 #: src/pacman/sync.c:191
 #, c-format
 msgid "Do you want to remove ALL files from cache?"
-msgstr "Вилучити ВСІ файли з кеша?"
+msgstr "Вилучити ВСІ файли з кешу?"
 
 #: src/pacman/sync.c:195
 #, c-format
 msgid "removing all files from cache...\n"
-msgstr "вилучення всіх файлів з кеша...\n"
+msgstr "вилучення всіх файлів з кешу...\n"
 
 #: src/pacman/sync.c:201
 #, c-format
 msgid "could not access cache directory %s\n"
-msgstr "немає доступу до каталогу кеша %s\n"
+msgstr "немає доступу до каталогу кешу %s\n"
 
 #: src/pacman/sync.c:424
 #, c-format
@@ -1538,9 +1463,7 @@ msgstr "неможливо заблокувати базу даних: %s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  якщо ви впевнені, що менеджер пакунків не\n"
-"  запущений, ви можете вилучити %s\n"
+msgstr "  якщо ви впевнені, що менеджер пакунків не\n  запущений, ви можете вилучити %s\n"
 
 #: src/pacman/util.c:96
 #, c-format
@@ -1730,32 +1653,32 @@ msgstr "Введіть число (типово=%d)"
 #: src/pacman/util.c:1514
 #, c-format
 msgid "[Y/n]"
-msgstr "[Т/н]"
+msgstr "[Y/n]"
 
 #: src/pacman/util.c:1516
 #, c-format
 msgid "[y/N]"
-msgstr "[т/Н]"
+msgstr "[y/N]"
 
 #: src/pacman/util.c:1541
 #, c-format
 msgid "Y"
-msgstr "Т"
+msgstr "Y"
 
 #: src/pacman/util.c:1541
 #, c-format
 msgid "YES"
-msgstr "ТАК"
+msgstr "YES"
 
 #: src/pacman/util.c:1543
 #, c-format
 msgid "N"
-msgstr "Н"
+msgstr "N"
 
 #: src/pacman/util.c:1543
 #, c-format
 msgid "NO"
-msgstr "НІ"
+msgstr "NO"
 
 #: src/pacman/util.c:1610
 #, c-format
diff --git a/src/pacman/po/vi.po b/src/pacman/po/vi.po
index 0cbc462d..ef0beae7 100644
--- a/src/pacman/po/vi.po
+++ b/src/pacman/po/vi.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 msgid ""
 msgstr ""
@@ -10,12 +10,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 03:30+0000\n"
 "Last-Translator: Allan McRae <allan@archlinux.org>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/vi/)\n"
-"Language: vi\n"
+"Language-Team: Vietnamese (http://www.transifex.com/toofishes/archlinux-pacman/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/pacman/callback.c:182
@@ -173,7 +172,8 @@ msgstr ""
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
 msgstr[0] ""
 
 #: src/pacman/callback.c:442
@@ -741,7 +741,8 @@ msgstr ""
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
 msgstr ""
 
 #: src/pacman/pacman.c:126
@@ -789,8 +790,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
 msgstr ""
 
 #: src/pacman/pacman.c:142
@@ -881,8 +881,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr ""
 
 #: src/pacman/pacman.c:163
@@ -984,8 +983,7 @@ msgstr ""
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
 msgstr ""
 
 #: src/pacman/pacman.c:203
diff --git a/src/pacman/po/zh_CN.po b/src/pacman/po/zh_CN.po
index 307b5ba2..5ad71647 100644
--- a/src/pacman/po/zh_CN.po
+++ b/src/pacman/po/zh_CN.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Allan McRae <allan@archlinux.org>, 2014
 # Blask <blaskyy@gmail.com>, 2013
@@ -25,12 +25,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-17 05:25+0000\n"
 "Last-Translator: mytbk <mytbk920423@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/toofishes/archlinux-"
-"pacman/language/zh_CN/)\n"
-"Language: zh_CN\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/toofishes/archlinux-pacman/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/pacman/callback.c:182
@@ -166,8 +165,7 @@ msgstr "%s 已被保存为 %s.pacsave\n"
 #: src/pacman/callback.c:390
 #, c-format
 msgid "%s is in IgnorePkg/IgnoreGroup. Install anyway?"
-msgstr ""
-"%s 位于 IgnorePkg/IgnoreGroup (忽略软件包/忽略软件包组) 中。确定要安装吗?"
+msgstr "%s 位于 IgnorePkg/IgnoreGroup (忽略软件包/忽略软件包组) 中。确定要安装吗?"
 
 #: src/pacman/callback.c:400
 #, c-format
@@ -189,7 +187,8 @@ msgstr "%s 与 %s 有冲突 (%s)。删除 %s 吗?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
 msgstr[0] "因为无法解决依赖关系,以下软件包无法进行更新:\n"
 
 #: src/pacman/callback.c:442
@@ -209,9 +208,7 @@ msgstr[0] "有 %zu 个软件包可提供 %s :\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-"文件 %s 已损坏 (%s).\n"
-"打算删除吗?"
+msgstr "文件 %s 已损坏 (%s).\n打算删除吗?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -429,9 +426,7 @@ msgstr "无法添加 '%s' 镜像到数据库 '%s' (%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"初始化 alpm 库失败\n"
-"(%s: %s)\n"
+msgstr "初始化 alpm 库失败\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -756,14 +751,13 @@ msgstr "操作:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"使用 '%s {-h --help}' 及某个操作以查看可用选项\n"
+msgstr "\n使用 '%s {-h --help}' 及某个操作以查看可用选项\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
 msgstr "  -c, --cascade        删除软件包及所有依赖于此的软件包\n"
 
 #: src/pacman/pacman.c:126
@@ -776,9 +770,7 @@ msgstr "  -n, --nosave         删除配置文件\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      删除不需要的依赖关系\n"
-"                       (-ss 包括单独指定安装的依赖关系)\n"
+msgstr "  -s, --recursive      删除不需要的依赖关系\n                       (-ss 包括单独指定安装的依赖关系)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -813,8 +805,7 @@ msgstr "  -g, --groups         查看某软件包组所属的所有软件包\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
 msgstr "  -i, --info           查看软件包信息 (-ii 查看备份文件) \n"
 
 #: src/pacman/pacman.c:142
@@ -834,8 +825,7 @@ msgstr "-l, --list 列出被查询软件包的内容\n"
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        列出没有在同步数据库时找到的已安装软件包 [过滤器]\n"
+msgstr "  -m, --foreign        列出没有在同步数据库时找到的已安装软件包 [过滤器]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
@@ -871,9 +861,7 @@ msgstr "  -s, --search <regex> 搜寻符合指定字符串的已安装本地的
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     列出不被任何软件包(可选)要求的软件包(-tt 忽略可选依"
-"赖) [过滤器]\n"
+msgstr "  -t, --unrequired     列出不被任何软件包(可选)要求的软件包(-tt 忽略可选依赖) [过滤器]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -892,9 +880,7 @@ msgstr "  -c, --clean          从缓存目录中删除旧软件包 (-cc 清除
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"-g, --groups 查看某软件包组所属的所有软件包\n"
-"(-gg 查看所有软件包组和所属于它们的软件包)\n"
+msgstr "-g, --groups 查看某软件包组所属的所有软件包\n(-gg 查看所有软件包组和所属于它们的软件包)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
@@ -910,8 +896,7 @@ msgstr "  -l, --list <软件库>    查看在该软件库中的软件包清单\n
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr "  -s, --search <正则表达式> 按照指定字符串查询远端软件库\n"
 
 #: src/pacman/pacman.c:163
@@ -932,9 +917,7 @@ msgstr "  -w, --downloadonly   下载但不安装/升级软件包\n"
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"-y, --refresh 从服务器下载新的软件包数据库\n"
-"(-yy 强制更新软件包数据库)\n"
+msgstr "-y, --refresh 从服务器下载新的软件包数据库\n(-yy 强制更新软件包数据库)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -968,9 +951,7 @@ msgstr "-x, --regex 启用正则表达式进行搜索\n"
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"--machinereadable\n"
-"产生机器可读输出\n"
+msgstr "--machinereadable\n产生机器可读输出\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
@@ -999,9 +980,7 @@ msgstr "      --ignore <软件包>   升级时忽略某个软件包 (可多次
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <软件包组>\n"
-"                         升级时忽略某个软件包组 (可多次使用) \n"
+msgstr "      --ignoregroup <软件包组>\n                         升级时忽略某个软件包组 (可多次使用) \n"
 
 #: src/pacman/pacman.c:199
 #, c-format
@@ -1015,14 +994,11 @@ msgstr "  -d, --nodeps         跳过依赖关系的版本检查 (-dd 跳过所
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"--assume-installed <package=version>\n"
-"添加一个虚拟包用于满足依赖\n"
+msgstr "--assume-installed <package=version>\n添加一个虚拟包用于满足依赖\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
 msgstr "      --dbonly         仅修改数据库条目,而非软件包文件\n"
 
 #: src/pacman/pacman.c:203
@@ -1049,9 +1025,7 @@ msgstr "  -p, --print          打印目标而不是执行操作\n"
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <字符串>\n"
-"                       指定如何打印目标\n"
+msgstr "      --print-format <字符串>\n                       指定如何打印目标\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1123,9 +1097,7 @@ msgstr "--confirm 总是询问确认\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       本程序可以在GNU一般公众许可条款下\n"
-"                       自由分发\n"
+msgstr "                       本程序可以在GNU一般公众许可条款下\n                       自由分发\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1483,9 +1455,7 @@ msgstr "无法锁定数据库:%s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  如果你确认软件包管理器没有在运行,\n"
-"  你可以删除 %s。\n"
+msgstr "  如果你确认软件包管理器没有在运行,\n  你可以删除 %s。\n"
 
 #: src/pacman/util.c:96
 #, c-format
diff --git a/src/pacman/po/zh_TW.po b/src/pacman/po/zh_TW.po
index 5b1659e3..e1003102 100644
--- a/src/pacman/po/zh_TW.po
+++ b/src/pacman/po/zh_TW.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Pacman Development Team <pacman-dev@archlinux.org>
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # BrLi <rainman59118@gmail.com>, 2015
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2012
@@ -18,12 +18,11 @@ msgstr ""
 "POT-Creation-Date: 2016-01-17 13:21+1000\n"
 "PO-Revision-Date: 2016-01-18 03:11+0000\n"
 "Last-Translator: Jeff Huang <s8321414@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/toofishes/"
-"archlinux-pacman/language/zh_TW/)\n"
-"Language: zh_TW\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/toofishes/archlinux-pacman/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: src/pacman/callback.c:182
@@ -159,8 +158,7 @@ msgstr "%s 已存至 %s.pacsave\n"
 #: src/pacman/callback.c:390
 #, c-format
 msgid "%s is in IgnorePkg/IgnoreGroup. Install anyway?"
-msgstr ""
-"%s 位於 IgnorePkg/IgnoreGroup (忽略套件/忽略套件群組) 中。確定要安裝嗎?"
+msgstr "%s 位於 IgnorePkg/IgnoreGroup (忽略套件/忽略套件群組) 中。確定要安裝嗎?"
 
 #: src/pacman/callback.c:400
 #, c-format
@@ -182,7 +180,8 @@ msgstr "%s 與 %s 有衝突 (%s)。刪除 %s 嗎?"
 msgid ""
 "The following package cannot be upgraded due to unresolvable dependencies:\n"
 msgid_plural ""
-"The following packages cannot be upgraded due to unresolvable dependencies:\n"
+"The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
 msgstr[0] "因爲無法解決依賴關係,以下套件無法進行更新:\n"
 
 #: src/pacman/callback.c:442
@@ -202,9 +201,7 @@ msgstr[0] "有 %zu 個提供者可供 %s:\n"
 msgid ""
 "File %s is corrupted (%s).\n"
 "Do you want to delete it?"
-msgstr ""
-" %s 檔案毀損(%s)。\n"
-"你要刪除它嗎?"
+msgstr " %s 檔案毀損(%s)。\n你要刪除它嗎?"
 
 #: src/pacman/callback.c:478
 #, c-format
@@ -374,9 +371,7 @@ msgstr "正在運行 XferCommand:fork 失敗!\n"
 #: src/pacman/conf.c:277
 #, c-format
 msgid "could not rename %s to %s (%s)\n"
-msgstr ""
-"不能將 %s 重命名為 %s (%s)\n"
-"\n"
+msgstr "不能將 %s 重命名為 %s (%s)\n\n"
 
 #: src/pacman/conf.c:288
 #, c-format
@@ -424,9 +419,7 @@ msgstr "無法新增鏡像檔案「%s」到資料庫「%s」(%s)\n"
 msgid ""
 "failed to initialize alpm library\n"
 "(%s: %s)\n"
-msgstr ""
-"alpm 函式庫初始化失敗\n"
-"(%s: %s)\n"
+msgstr "alpm 函式庫初始化失敗\n(%s: %s)\n"
 
 #: src/pacman/conf.c:725
 #, c-format
@@ -751,14 +744,13 @@ msgstr "操作:\n"
 msgid ""
 "\n"
 "use '%s {-h --help}' with an operation for available options\n"
-msgstr ""
-"\n"
-"使用 '%s {-h --help}' 及某個操作以查看可用選項\n"
+msgstr "\n使用 '%s {-h --help}' 及某個操作以查看可用選項\n"
 
 #: src/pacman/pacman.c:125
 #, c-format
 msgid ""
-"  -c, --cascade        remove packages and all packages that depend on them\n"
+"  -c, --cascade        remove packages and all packages that depend on "
+"them\n"
 msgstr "  -c, --cascade        刪除套件及所有依賴於此的套件\n"
 
 #: src/pacman/pacman.c:126
@@ -771,9 +763,7 @@ msgstr "  -n, --nosave         刪除組態檔\n"
 msgid ""
 "  -s, --recursive      remove unnecessary dependencies\n"
 "                       (-ss includes explicitly installed dependencies)\n"
-msgstr ""
-"  -s, --recursive      刪除不需要的依賴關係\n"
-"                       (-ss 包括單獨指定安裝的依賴關係)\n"
+msgstr "  -s, --recursive      刪除不需要的依賴關係\n                       (-ss 包括單獨指定安裝的依賴關係)\n"
 
 #: src/pacman/pacman.c:129
 #, c-format
@@ -808,8 +798,7 @@ msgstr "  -g, --groups         查看某套件群組所屬的所有套件\n"
 
 #: src/pacman/pacman.c:141
 #, c-format
-msgid ""
-"  -i, --info           view package information (-ii for backup files)\n"
+msgid "  -i, --info           view package information (-ii for backup files)\n"
 msgstr "  -i, --info           查看套件資訊 (-ii 查看備份檔案) \n"
 
 #: src/pacman/pacman.c:142
@@ -829,16 +818,14 @@ msgstr "  -l, --list           列出被查詢套件的檔名列表\n"
 msgid ""
 "  -m, --foreign        list installed packages not found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -m, --foreign        列出沒有在同步資料庫時找到的已安裝套件 [過濾器]\n"
+msgstr "  -m, --foreign        列出沒有在同步資料庫時找到的已安裝套件 [過濾器]\n"
 
 #: src/pacman/pacman.c:145
 #, c-format
 msgid ""
 "  -n, --native         list installed packages only found in sync db(s) "
 "[filter]\n"
-msgstr ""
-"  -n, --native         列出僅可在同步資料庫中找到的已安裝套件 [過濾器]\n"
+msgstr "  -n, --native         列出僅可在同步資料庫中找到的已安裝套件 [過濾器]\n"
 
 #: src/pacman/pacman.c:146 src/pacman/pacman.c:179
 #, c-format
@@ -867,9 +854,7 @@ msgstr "  -s, --search <regex> 搜尋符合指定字符串的已安裝本地的
 msgid ""
 "  -t, --unrequired     list packages not (optionally) required by any\n"
 "                       package (-tt to ignore optdepends) [filter]\n"
-msgstr ""
-"  -t, --unrequired     列出所有不被其他套件 (包含選擇性) 需要的套件\n"
-"                       (-tt 忽略可選依賴) [過濾器]\n"
+msgstr "  -t, --unrequired     列出所有不被其他套件 (包含選擇性) 需要的套件\n                       (-tt 忽略可選依賴) [過濾器]\n"
 
 #: src/pacman/pacman.c:152
 #, c-format
@@ -888,9 +873,7 @@ msgstr "  -c, --clean          從快取目錄中刪除舊軟體套件 (-cc 清
 msgid ""
 "  -g, --groups         view all members of a package group\n"
 "                       (-gg to view all groups and members)\n"
-msgstr ""
-"  -g, --groups         查看某套件群組所屬的所有套件\n"
-"                       (-gg 顯示所有群組及成員)\n"
+msgstr "  -g, --groups         查看某套件群組所屬的所有套件\n                       (-gg 顯示所有群組及成員)\n"
 
 #: src/pacman/pacman.c:159
 #, c-format
@@ -906,8 +889,7 @@ msgstr "  -l, --list <軟體庫>    查看在該軟體庫中的套件清單\n"
 
 #: src/pacman/pacman.c:162
 #, c-format
-msgid ""
-"  -s, --search <regex> search remote repositories for matching strings\n"
+msgid "  -s, --search <regex> search remote repositories for matching strings\n"
 msgstr "  -s, --search <regex 表達式> 按照指定字符串查詢遠端軟體庫\n"
 
 #: src/pacman/pacman.c:163
@@ -928,9 +910,7 @@ msgstr "  -w, --downloadonly   下載但不安裝/升級套件\n"
 msgid ""
 "  -y, --refresh        download fresh package databases from the server\n"
 "                       (-yy to force a refresh even if up to date)\n"
-msgstr ""
-"  -y, --refresh        從伺服器下載新的套件列表資料庫\n"
-"                       (-yy 強迫再次更新)\n"
+msgstr "  -y, --refresh        從伺服器下載新的套件列表資料庫\n                       (-yy 強迫再次更新)\n"
 
 #: src/pacman/pacman.c:171
 #, c-format
@@ -964,9 +944,7 @@ msgstr "  -x, --regex          啟用使用正規表達式搜尋\n"
 msgid ""
 "      --machinereadable\n"
 "                       produce machine-readable output\n"
-msgstr ""
-"      --machinereadable\n"
-"                       產生機器可讀的輸出\n"
+msgstr "      --machinereadable\n                       產生機器可讀的輸出\n"
 
 #: src/pacman/pacman.c:191
 #, c-format
@@ -995,9 +973,7 @@ msgstr "      --ignore <套件>   升級時忽略某個套件 (可多次使用)
 msgid ""
 "      --ignoregroup <grp>\n"
 "                       ignore a group upgrade (can be used more than once)\n"
-msgstr ""
-"      --ignoregroup <套件組>\n"
-"                         升級時忽略某個套件組 (可多次使用) \n"
+msgstr "      --ignoregroup <套件組>\n                         升級時忽略某個套件組 (可多次使用) \n"
 
 #: src/pacman/pacman.c:199
 #, c-format
@@ -1011,15 +987,11 @@ msgstr "  -d, --nodeps         跳過依賴關係的版本檢查 (-dd 跳過所
 msgid ""
 "      --assume-installed <package=version>\n"
 "                       add a virtual package to satisfy dependencies\n"
-msgstr ""
-"      --assume-installed <package=version>\n"
-"                       加上虛擬套件假裝滿足相依性\n"
-"\n"
+msgstr "      --assume-installed <package=version>\n                       加上虛擬套件假裝滿足相依性\n\n"
 
 #: src/pacman/pacman.c:202
 #, c-format
-msgid ""
-"      --dbonly         only modify database entries, not package files\n"
+msgid "      --dbonly         only modify database entries, not package files\n"
 msgstr "      --dbonly         只修改資料庫項目,非套件檔案\n"
 
 #: src/pacman/pacman.c:203
@@ -1046,9 +1018,7 @@ msgstr "  -p, --print          列印目標而不是執行操作\n"
 msgid ""
 "      --print-format <string>\n"
 "                       specify how the targets should be printed\n"
-msgstr ""
-"      --print-format <字串>\n"
-"                       指定如何列印目標\n"
+msgstr "      --print-format <字串>\n                       指定如何列印目標\n"
 
 #: src/pacman/pacman.c:211
 #, c-format
@@ -1120,9 +1090,7 @@ msgstr "      --confirm        永遠詢問確認\n"
 msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
-msgstr ""
-"                       本程式可以在 GNU 通用公共授權條款 (GPL) 下\n"
-"                       自由散佈\n"
+msgstr "                       本程式可以在 GNU 通用公共授權條款 (GPL) 下\n                       自由散佈\n"
 
 #: src/pacman/pacman.c:302
 #, c-format
@@ -1480,9 +1448,7 @@ msgstr "無法鎖定資料庫:%s\n"
 msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
-msgstr ""
-"  如果你確認套件管理器沒有在運行,\n"
-"  你可以刪除 %s。\n"
+msgstr "  如果你確認套件管理器沒有在運行,\n  你可以刪除 %s。\n"
 
 #: src/pacman/util.c:96
 #, c-format
-- 
cgit v1.2.3-70-g09d2