diff options
| author | Dan McGee <dan@archlinux.org> | 2011-03-21 13:53:13 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-03-21 13:53:13 +0100 |
| commit | 0ff52b68452046d61c24649ec94886bd74faab45 (patch) | |
| tree | a9960a6143d17aeedeb530f2fe57c6796966e205 /lib/libalpm/po | |
| parent | c67c864ffd50ec0e071b055897c4622eaa132fc2 (diff) | |
| parent | b0bb4f9024712adcee5e2baf6cebe73c966d7d7f (diff) | |
| download | pacman-0ff52b68452046d61c24649ec94886bd74faab45.tar.gz pacman-0ff52b68452046d61c24649ec94886bd74faab45.tar.xz | |
Merge branch 'maint'
Conflicts due to change in return calling style.
Conflicts:
src/pacman/pacman.c
src/pacman/sync.c
Diffstat (limited to 'lib/libalpm/po')
| -rw-r--r-- | lib/libalpm/po/libalpm.pot | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot index ba88318b..b4a5da66 100644 --- a/lib/libalpm/po/libalpm.pot +++ b/lib/libalpm/po/libalpm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pacman 3.5.0\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" -"POT-Creation-Date: 2011-03-16 19:34-0500\n" +"POT-Creation-Date: 2011-03-20 12:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -188,7 +188,11 @@ msgid "could not determine mount point for file %s\n" msgstr "" #, c-format -msgid "could not determine filesystem mount points" +msgid "could not determine filesystem mount points\n" +msgstr "" + +#, c-format +msgid "could not determine root mount point %s\n" msgstr "" #, c-format |