moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Dan McGee 2011-03-03 11:10:09 -06:00
parent 79f8cfb529
commit 0b6aa428cf
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libalpm/po/Makevars
View File

@ -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

2
po/Makevars
View File

@ -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

31
po/pacman.pot
View File

@ -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"
@ -93,6 +94,22 @@ msgstr ""
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 ""
@ -700,6 +717,18 @@ msgstr ""
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 ""