Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-01-29 12:16:11 -0600
committerDan McGee <dan@archlinux.org>2011-01-29 12:16:11 -0600
commitba97a22ce10df2966a9e1117b48a84b93eae0538 (patch)
tree194e297ec59cbfd4193d7cd7db9befe3668b8275
parentce089e1b975e99f6a35c159f51d0dbe7c0ddcca3 (diff)
parent272f7cf25e9a12268f23a6018000625630026434 (diff)
Merge branch 'maint'
-rw-r--r--etc/pacman.conf.in2
-rw-r--r--lib/libalpm/po/de.po2
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index d1d596cb..1105db94 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -17,7 +17,7 @@ HoldPkg = pacman glibc
# If upgrades are available for these packages they will be asked for first
SyncFirst = pacman
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#XferCommand = /usr/bin/curl -C - %u > %o
+#XferCommand = /usr/bin/curl -C - -f %u > %o
#CleanMethod = KeepInstalled
Architecture = auto
diff --git a/lib/libalpm/po/de.po b/lib/libalpm/po/de.po
index c1c6a0b8..c90d52a0 100644
--- a/lib/libalpm/po/de.po
+++ b/lib/libalpm/po/de.po
@@ -205,7 +205,7 @@ msgstr "Konnte Datei '%s' nicht von %s übertragen : %s\n"
#, c-format
msgid "resuming download of %s not possible; starting over\n"
-msgstr "Kann den Download von %s wieder aufnehmen, starte neu\n"
+msgstr "Kann den Download von %s nicht wieder aufnehmen, starte neu\n"
#, c-format
msgid "error writing to file '%s': %s\n"