diff options
| author | Dan McGee <dan@archlinux.org> | 2012-02-13 17:12:39 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-02-13 17:14:06 +0100 |
| commit | c7321a7b80aebeacb05ad5ab9d096779403b1758 (patch) | |
| tree | 8fa7f16abc7b7af0c24ba92ababfc5c145d35eed /scripts/po/pacman-scripts.pot | |
| parent | 115c0381c235100d7b05d9751767017a9ee325c4 (diff) | |
| parent | b4f5a63e7fee5d04949e290bd63e5f0e94bd211e (diff) | |
| download | pacman-c7321a7b80aebeacb05ad5ab9d096779403b1758.tar.gz pacman-c7321a7b80aebeacb05ad5ab9d096779403b1758.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/sync.c
src/util/pactree.c
Diffstat (limited to 'scripts/po/pacman-scripts.pot')
| -rw-r--r-- | scripts/po/pacman-scripts.pot | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/po/pacman-scripts.pot b/scripts/po/pacman-scripts.pot index 2c74453d..0e08bb4c 100644 --- a/scripts/po/pacman-scripts.pot +++ b/scripts/po/pacman-scripts.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: pacman 4.0.1\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" -"POT-Creation-Date: 2012-01-30 21:40-0600\n" +"POT-Creation-Date: 2012-02-02 00:05-0600\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" @@ -482,6 +482,9 @@ msgstr "" msgid "You do not have write permission to store downloads in %s." msgstr "" +msgid "You do not have write permission to store source tarballs in %s." +msgstr "" + msgid "\\0%s and %s cannot both be specified" msgstr "" |