diff options
| author | Dan McGee <dan@archlinux.org> | 2011-08-09 00:05:25 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-08-09 00:05:25 +0200 |
| commit | 8fa330335f9eb465724ed778464502f844e930ae (patch) | |
| tree | 2161500fbdc1ca52f0e1bf15c9f0ab90737d5d01 /scripts | |
| parent | ef4757afa5d31ff6a6c09e3410c889f152826f4f (diff) | |
| parent | 67445334e71eaf6138561eee8e5561733a59fc69 (diff) | |
| download | pacman-8fa330335f9eb465724ed778464502f844e930ae.tar.gz pacman-8fa330335f9eb465724ed778464502f844e930ae.tar.xz | |
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
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/po/de.po | 2 |
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 " |