diff options
author | Dan McGee <dan@archlinux.org> | 2011-08-08 17:05:25 -0500 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2011-08-08 17:05:25 -0500 |
commit | 8fa330335f9eb465724ed778464502f844e930ae (patch) | |
tree | 2161500fbdc1ca52f0e1bf15c9f0ab90737d5d01 /lib/libalpm/po/libalpm.pot | |
parent | ef4757afa5d31ff6a6c09e3410c889f152826f4f (diff) | |
parent | 67445334e71eaf6138561eee8e5561733a59fc69 (diff) |
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 'lib/libalpm/po/libalpm.pot')
-rw-r--r-- | lib/libalpm/po/libalpm.pot | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot index 3e41eac2..1f7d25a7 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.3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" -"POT-Creation-Date: 2011-06-23 21:48-0500\n" +"POT-Creation-Date: 2011-08-08 16:37-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" |