← Back to branch summary

~ubuntu-branches/ubuntu/trusty/util-linux/trusty-proposed

« back to all changes in this revision

Viewing changes to include/nls.h

  • Committer: Package Import Robot
  • Author(s): LaMont Jones, Roger Leigh, LaMont Jones, 김종규, Niels Thykier
  • Date: 2011-11-03 15:38:23 UTC
  • mfrom: (1.7.2)
  • mto: This revision was merged to the branch mainline in revision 85.
  • Revision ID: package-import@ubuntu.com-20111103153823-n2nt15ce74gyvnaa
Tags: 2.20.1-1
http://bugs.debian.org/632421
http://bugs.debian.org/632425
http://bugs.debian.org/648467
* New upstream

[Roger Leigh]

* Various merge fixes [with edits - lamont]
  - drop old unused patches
  - cleanup debian/rules
  - updated symbols files for lib{blkid,mount,uuid}1

[LaMont Jones]

* merge in 2.19.1-{3..5}
* deliver /etc/fstab.d

[김종규]

* add korean debconf pofile.  Closes: #632421, #632425

[Niels Thykier]

* Add build-arch and build-indep targets.  Closes: #648467

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/nls.h
22
22
# else
23
23
#  define N_(String) (String)
24
24
# endif
 
25
# define P_(Singular, Plural, n) ngettext (Singular, Plural, n)
25
26
#else
26
27
# undef bindtextdomain
27
28
# define bindtextdomain(Domain, Directory) /* empty */
29
30
# define textdomain(Domain) /* empty */
30
31
# define _(Text) (Text)
31
32
# define N_(Text) (Text)
 
33
# define P_(Singular, Plural, n) ((n) == 1 ? (Singular) : (Plural))
32
34
#endif
33
35
 
34
36
#ifdef HAVE_LANGINFO_H