Merge branch 'maint'

Conflicts:
	lib/libalpm/dload.c
	lib/libalpm/po/fi.po
	lib/libalpm/po/libalpm.pot
	po/de.po
	po/fi.po
	src/pacman/po/pacman.pot
	src/pacman/util.c

1 files changed, 1 insertions, 1 deletions

diff --git a/scripts/po/de.po b/scripts/po/de.po
index d09c4b81..f78c7e32 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -379,7 +379,7 @@ msgid ""
 "  --holdver        Prevent automatic version bumping for development %ss"
 msgstr ""
 "  --holdver        Verhindert die automatische Erhöhung der Versionsnummer "
-"für die Entwickler-Vesrion %ss"
+"für die Entwickler-Version %ss"
 
 msgid ""
 "  --key <key>      Specify a key to use for gpg signing instead of the "