bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint'

Browse source
This commit is contained in:
Dan McGee 2011-01-29 12:16:11 -06:00
commit ba97a22ce1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/pacman.conf.in
View file

@ -17,7 +17,7 @@ HoldPkg = pacman glibc
# If upgrades are available for these packages they will be asked for first # If upgrades are available for these packages they will be asked for first
SyncFirst = pacman SyncFirst = pacman
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #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 #CleanMethod = KeepInstalled
Architecture = auto Architecture = auto

2
lib/libalpm/po/de.po
View file

@ -205,7 +205,7 @@ msgstr "Konnte Datei '%s' nicht von %s übertragen : %s\n"
#, c-format #, c-format
msgid "resuming download of %s not possible; starting over\n" 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 #, c-format
msgid "error writing to file '%s': %s\n" msgid "error writing to file '%s': %s\n"