summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/po/libalpm.pot
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-08-24 01:28:58 +0200
committerDan McGee <dan@archlinux.org>2008-08-24 01:28:58 +0200
commita4100b384737d6b422a31eb0f6614b4f5f6070cb (patch)
tree07e1c219f553de755025ec99435b7e1626fcf1c2 /lib/libalpm/po/libalpm.pot
parent14203d77f43c02e60770dcbd4a9cb2b39b38bcd6 (diff)
parent68e59ecbaf5ab4b0ba8684ea8ce29ef90df84d7a (diff)
downloadpacman-a4100b384737d6b422a31eb0f6614b4f5f6070cb.tar.gz
pacman-a4100b384737d6b422a31eb0f6614b4f5f6070cb.tar.xz
Merge branch 'maint'
Diffstat (limited to 'lib/libalpm/po/libalpm.pot')
-rw-r--r--lib/libalpm/po/libalpm.pot18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/libalpm/po/libalpm.pot b/lib/libalpm/po/libalpm.pot
index 8a9882ea..f2360710 100644
--- a/lib/libalpm/po/libalpm.pot
+++ b/lib/libalpm/po/libalpm.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2008-07-19 17:09+0200\n"
+"POT-Creation-Date: 2008-08-23 10:54-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"
@@ -403,14 +403,6 @@ msgid "unexpected error"
msgstr ""
#, c-format
-msgid "%s: forcing upgrade to version %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: local (%s) is newer than %s (%s)\n"
-msgstr ""
-
-#, c-format
msgid "could not find %s in database -- skipping\n"
msgstr ""
@@ -431,6 +423,10 @@ msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"
msgstr ""
#, c-format
+msgid "%s: local (%s) is newer than %s (%s)\n"
+msgstr ""
+
+#, c-format
msgid "%s: ignoring package upgrade (%s => %s)\n"
msgstr ""
@@ -447,6 +443,10 @@ msgid "%s-%s is up to date -- reinstalling\n"
msgstr ""
#, c-format
+msgid "downgrading package %s (%s => %s)\n"
+msgstr ""
+
+#, c-format
msgid "unresolvable package conflicts detected\n"
msgstr ""