← Back to branch summary

~ubuntu-core-dev/apparmor/master

« back to all changes in this revision

Viewing changes to parser/po/en_GB.po

  • Committer: Jamie Strandboge
  • Date: 2011-02-24 18:04:26 UTC
  • mfrom: (1415.3.4 apparmor-ubuntu-trunk)
  • Revision ID: jamie@canonical.com-20110224180426-q39kzcgsktwx8ixj
Released 2.6.0-0ubuntu1 to natty

[ Steve Beattie ]
* New upstream 2.6.0 release (LP: #724193)
  - Patches taken upstream and dropped:
    + 0001-ubuntu-buildd.patch
    + 0003-add-libvirt-support-to-dnsmasq.patch
    + 0004-lp698194.patch
    + 0005-aa-disable.patch
  - debian/rules: remove library path settings for mod_apparmor and
    pam_apprmor builds; upstream handles this properly now.
  - debian/apparmor-utils.install: handle upstream SubDomain.pm =>
    AppArmor.pm renaming
* debian/lib/apparmor/functions: handle profile names with embedded
  spaces (LP: #655523)
* debian/rules, debian/control, debian/python-libapparmor: build
  a python-libapparmor package.
[ Jamie Strandboge ]
* debian/control: use Section: python for python-libapparmor

Show diffs side-by-side

added added

removed removed

Lines of Context:
parser/po/en_GB.po
109
109
#, c-format
110
110
msgid ""
111
111
"%s: Warning! You've set this program setuid root.\n"
112
 
"Anybody who can run this program can update your SubDomain profiles.\n"
 
112
"Anybody who can run this program can update your AppArmor profiles.\n"
113
113
"\n"
114
114
msgstr ""
115
115
 
410
410
 
411
411
#: parser_yacc.y:1461
412
412
#, c-format
413
 
msgid "%s: Two SubDomains defined for '%s'.\n"
 
413
msgid "%s: Two profiles defined for '%s'.\n"
414
414
msgstr ""
415
415
 
416
416
#: ../parser.h:37