summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-03 11:10:09 -0600
committerDan McGee <dan@archlinux.org>2011-03-03 11:10:14 -0600
commit0b6aa428cf06e9e23ac4d912f8f6eba2330af226 (patch)
treecf622407d04b57e1e74a22bf806cadbee944b8b4
parent79f8cfb529f8bc13a239548cf513db100739555b (diff)
Fix gettext plural detection
Our keywords were all screwed up in this regard. Fix it so our ngettext() shortcut calls are actually recognized and respected. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/po/Makevars2
-rw-r--r--po/Makevars2
-rw-r--r--po/pacman.pot31
3 files changed, 32 insertions, 3 deletions
diff --git a/lib/libalpm/po/Makevars b/lib/libalpm/po/Makevars
index 6430515f..688553d1 100644
--- a/lib/libalpm/po/Makevars
+++ b/lib/libalpm/po/Makevars
@@ -10,7 +10,7 @@ top_builddir = ../../../
# These options get passed to xgettext.
XGETTEXT_OPTIONS = --no-location \
--keyword=_ --flag=_:1:c-format \
- --keyword=N_ --flag=N_:1:c-format
+ --keyword=_n:1,2 --flag=_n:1:c-format --flag=_n:2:c-format
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
diff --git a/po/Makevars b/po/Makevars
index c6895b3d..2de7ddd8 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -10,7 +10,7 @@ top_builddir = ../
# These options get passed to xgettext.
XGETTEXT_OPTIONS = --no-location \
--keyword=_ --flag=_:1:c-format \
- --keyword=N_ --flag=N_:1:c-format
+ --keyword=_n:1,2 --flag=_n:1:c-format --flag=_n:2:c-format
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
diff --git a/po/pacman.pot b/po/pacman.pot
index 19f4e07c..279bb84f 100644
--- a/po/pacman.pot
+++ b/po/pacman.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pacman 3.4.3\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
-"POT-Creation-Date: 2011-02-28 17:48-0600\n"
+"POT-Creation-Date: 2011-03-03 11:09-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"
@@ -16,6 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#, c-format
msgid "checking dependencies...\n"
@@ -94,6 +95,22 @@ msgid ":: %s and %s are in conflict (%s). Remove %s?"
msgstr ""
#, c-format
+msgid ""
+":: The following package cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgid_plural ""
+":: The following packages cannot be upgraded due to unresolvable "
+"dependencies:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "Do you want to skip the above package for this upgrade?"
+msgid_plural "Do you want to skip the above packages for this upgrade?"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
msgid ":: There are %d providers available for %s:\n"
msgstr ""
@@ -701,6 +718,18 @@ msgid "group \"%s\" was not found\n"
msgstr ""
#, c-format
+msgid "%s: %d total file, "
+msgid_plural "%s: %d total files, "
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%d missing file\n"
+msgid_plural "%d missing files\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
msgid "no usable package repositories configured.\n"
msgstr ""