From 52ca88141a15912e609745c65dc76fc66a08e81a Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Tue, 22 Feb 2011 11:36:14 -0800
Subject: [PATCH] Fix previously committed translation patch that didn't
 correctly add the new apparmor-parser.pot file

---
 common/Make-po.rules          |   2 +-
 parser/po/apparmor-parser.pot | 540 ++++++++++++++++++++++++++++++++++
 2 files changed, 541 insertions(+), 1 deletion(-)
 create mode 100644 parser/po/apparmor-parser.pot

diff --git a/common/Make-po.rules b/common/Make-po.rules
index c2a963156..b668cc3c2 100644
--- a/common/Make-po.rules
+++ b/common/Make-po.rules
@@ -21,7 +21,7 @@
 # exist
 LOCALEDIR=/usr/share/locale
 
-XGETTEXT_ARGS=--copyright-holder="NOVELL, Inc." --msgid-bugs-address=pparmor@lists.ubuntu.com -d ${NAME}
+XGETTEXT_ARGS=--copyright-holder="NOVELL, Inc." --msgid-bugs-address=apparmor@lists.ubuntu.com -d ${NAME}
 
 # When making the .pot file, it's expected that the parent Makefile will
 # pass in the list of sources in the SOURCES variable
diff --git a/parser/po/apparmor-parser.pot b/parser/po/apparmor-parser.pot
new file mode 100644
index 000000000..a48fc1aa5
--- /dev/null
+++ b/parser/po/apparmor-parser.pot
@@ -0,0 +1,540 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR NOVELL, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: pparmor@lists.ubuntu.com\n"
+"POT-Creation-Date: 2011-02-22 03:25-0800\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../parser_include.c:113
+msgid "Error: Out of memory.\n"
+msgstr ""
+
+#: ../parser_include.c:123
+#, c-format
+msgid "Error: basedir %s is not a directory, skipping.\n"
+msgstr ""
+
+#: ../parser_include.c:137
+#, c-format
+msgid "Error: Could not add directory %s to search path.\n"
+msgstr ""
+
+#: ../parser_include.c:147
+msgid "Error: Could not allocate memory.\n"
+msgstr ""
+
+#: ../parser_interface.c:69
+msgid "Bad write position\n"
+msgstr ""
+
+#: ../parser_interface.c:72
+msgid "Permission denied\n"
+msgstr ""
+
+#: ../parser_interface.c:75
+msgid "Out of memory\n"
+msgstr ""
+
+#: ../parser_interface.c:78
+msgid "Couldn't copy profile: Bad memory address\n"
+msgstr ""
+
+#: ../parser_interface.c:81
+msgid "Profile doesn't conform to protocol\n"
+msgstr ""
+
+#: ../parser_interface.c:84
+msgid "Profile does not match signature\n"
+msgstr ""
+
+#: ../parser_interface.c:87
+msgid "Profile version not supported by Apparmor module\n"
+msgstr ""
+
+#: ../parser_interface.c:90
+msgid "Profile already exists\n"
+msgstr ""
+
+#: ../parser_interface.c:93
+msgid "Profile doesn't exist\n"
+msgstr ""
+
+#: ../parser_interface.c:96
+msgid "Permission denied; attempted to load a profile while confined?\n"
+msgstr ""
+
+#: ../parser_interface.c:99
+#, c-format
+msgid "Unknown error (%d): %s\n"
+msgstr ""
+
+#: ../parser_interface.c:116
+#, c-format
+msgid "%s: Unable to add \"%s\".  "
+msgstr ""
+
+#: ../parser_interface.c:121
+#, c-format
+msgid "%s: Unable to replace \"%s\".  "
+msgstr ""
+
+#: ../parser_interface.c:126
+#, c-format
+msgid "%s: Unable to remove \"%s\".  "
+msgstr ""
+
+#: ../parser_interface.c:131
+#, c-format
+msgid "%s: Unable to write to stdout\n"
+msgstr ""
+
+#: ../parser_interface.c:135
+#, c-format
+msgid "%s: Unable to write to output file\n"
+msgstr ""
+
+#: ../parser_interface.c:138 ../parser_interface.c:162
+#, c-format
+msgid "%s: ASSERT: Invalid option: %d\n"
+msgstr ""
+
+#: ../parser_interface.c:147
+#, c-format
+msgid "Addition succeeded for \"%s\".\n"
+msgstr ""
+
+#: ../parser_interface.c:151
+#, c-format
+msgid "Replacement succeeded for \"%s\".\n"
+msgstr ""
+
+#: ../parser_interface.c:155
+#, c-format
+msgid "Removal succeeded for \"%s\".\n"
+msgstr ""
+
+#: ../parser_interface.c:251
+#, c-format
+msgid "PANIC bad increment buffer %p pos %p ext %p size %d res %p\n"
+msgstr ""
+
+#: ../parser_interface.c:656
+#, c-format
+msgid "profile %s network rules not enforced\n"
+msgstr ""
+
+#: ../parser_interface.c:666
+msgid "Unknown pattern type\n"
+msgstr ""
+
+#: ../parser_interface.c:750 ../parser_interface.c:902
+#, c-format
+msgid "Unable to open %s - %s\n"
+msgstr ""
+
+#: ../parser_interface.c:776
+#, c-format
+msgid "Memory Allocation Error: Unable to remove ^%s\n"
+msgstr ""
+
+#: ../parser_interface.c:789
+#, c-format
+msgid "Memory Allocation Error: Unable to remove %s:%s."
+msgstr ""
+
+#: ../parser_interface.c:810
+msgid "unable to create work area\n"
+msgstr ""
+
+#: ../parser_interface.c:818
+#, c-format
+msgid "unable to serialize profile %s\n"
+msgstr ""
+
+#: ../parser_interface.c:829 ../parser_interface.c:916
+#, c-format
+msgid "%s: Unable to write entire profile entry\n"
+msgstr ""
+
+#: ../parser_interface.c:839
+#, c-format
+msgid "%s: Unable to write entire profile entry to cache\n"
+msgstr ""
+
+#: parser_lex.l:100
+#, c-format
+msgid "Could not open '%s'"
+msgstr ""
+
+#: parser_lex.l:104
+#, c-format
+msgid "fstat failed for '%s'"
+msgstr ""
+
+#: parser_lex.l:121
+#, c-format
+msgid "opendir failed '%s'"
+msgstr ""
+
+#: parser_lex.l:152
+#, c-format
+msgid "stat failed for '%s'"
+msgstr ""
+
+#: parser_lex.l:155
+#, c-format
+msgid "Could not open '%s' in '%s'"
+msgstr ""
+
+#: parser_lex.l:284 parser_lex.l:322 parser_lex.l:362 parser_lex.l:399
+#: parser_lex.l:469 parser_lex.l:655
+#, c-format
+msgid "Found unexpected character: '%s'"
+msgstr ""
+
+#: parser_lex.l:386
+msgid "Variable declarations do not accept trailing commas"
+msgstr ""
+
+#: parser_lex.l:420
+#, c-format
+msgid "(network_mode) Found unexpected character: '%s'"
+msgstr ""
+
+#: ../parser_main.c:333
+#, c-format
+msgid "Warning from %s (%s%sline %d): %s"
+msgstr ""
+
+#: ../parser_main.c:531
+#, c-format
+msgid "%s: Could not allocate memory for subdomainbase mount point\n"
+msgstr ""
+
+#: ../parser_main.c:577
+#, c-format
+msgid ""
+"Warning: unable to find a suitable fs in %s, is it mounted?\n"
+"Use --subdomainfs to override.\n"
+msgstr ""
+
+#: ../parser_main.c:597
+#, c-format
+msgid ""
+"%s: Sorry. You need root privileges to run this program.\n"
+"\n"
+msgstr ""
+
+#: ../parser_main.c:604
+#, c-format
+msgid ""
+"%s: Warning! You've set this program setuid root.\n"
+"Anybody who can run this program can update your AppArmor profiles.\n"
+"\n"
+msgstr ""
+
+#: ../parser_main.c:704 ../parser_main.c:813
+#, c-format
+msgid "Error: Could not read profile %s: %s.\n"
+msgstr ""
+
+#: ../parser_main.c:718 ../parser_misc.c:270 parser_yacc.y:227
+#: parser_yacc.y:374 parser_yacc.y:386 parser_yacc.y:484 parser_yacc.y:586
+#: parser_yacc.y:624 parser_yacc.y:939 parser_yacc.y:948 parser_yacc.y:960
+#: parser_yacc.y:1008 parser_yacc.y:1019 parser_yacc.y:1101 parser_yacc.y:1119
+#: parser_yacc.y:1126
+msgid "Memory allocation error."
+msgstr ""
+
+#: ../parser_main.c:740
+#, c-format
+msgid "Cached load succeeded for \"%s\".\n"
+msgstr ""
+
+#: ../parser_main.c:744
+#, c-format
+msgid "Cached reload succeeded for \"%s\".\n"
+msgstr ""
+
+#: ../parser_main.c:910
+#, c-format
+msgid "%s: Errors found in file. Aborting.\n"
+msgstr ""
+
+#: ../parser_misc.c:426
+msgid ""
+"Uppercase qualifiers \"RWLIMX\" are deprecated, please convert to lowercase\n"
+"See the apparmor.d(5) manpage for details.\n"
+msgstr ""
+
+#: ../parser_misc.c:467 ../parser_misc.c:474
+msgid "Conflict 'a' and 'w' perms are mutually exclusive."
+msgstr ""
+
+#: ../parser_misc.c:491
+msgid "Exec qualifier 'i' invalid, conflicting qualifier already specified"
+msgstr ""
+
+#: ../parser_misc.c:502
+#, c-format
+msgid ""
+"Unconfined exec qualifier (%c%c) allows some dangerous environment variables "
+"to be passed to the unconfined process; 'man 5 apparmor.d' for details.\n"
+msgstr ""
+
+#: ../parser_misc.c:510 ../parser_misc.c:551
+#, c-format
+msgid "Exec qualifier '%c' invalid, conflicting qualifier already specified"
+msgstr ""
+
+#: ../parser_misc.c:537 ../parser_misc.c:545
+#, c-format
+msgid "Exec qualifier '%c%c' invalid, conflicting qualifier already specified"
+msgstr ""
+
+#: ../parser_misc.c:593
+#, c-format
+msgid "Internal: unexpected mode character '%c' in input"
+msgstr ""
+
+#: ../parser_misc.c:615
+#, c-format
+msgid "Internal error generated invalid perm 0x%llx\n"
+msgstr ""
+
+#: ../parser_misc.c:865 ../parser_symtab.c:561 ../parser_regex.c:626
+#: ../parser_variable.c:229
+#, c-format
+msgid "AppArmor parser error: %s\n"
+msgstr ""
+
+#: ../parser_merge.c:92
+msgid "Couldn't merge entries. Out of Memory\n"
+msgstr ""
+
+#: ../parser_merge.c:111
+#, c-format
+msgid "profile %s: has merged rule %s with conflicting x modifiers\n"
+msgstr ""
+
+#: parser_yacc.y:236
+msgid "Profile attachment must begin with a '/'."
+msgstr ""
+
+#: parser_yacc.y:260
+msgid ""
+"Profile names must begin with a '/', namespace or keyword 'profile' or 'hat'."
+msgstr ""
+
+#: parser_yacc.y:296
+#, c-format
+msgid "Failed to create alias %s -> %s\n"
+msgstr ""
+
+#: parser_yacc.y:417
+msgid "Profile flag chroot_relative conflicts with namespace_relative"
+msgstr ""
+
+#: parser_yacc.y:421
+msgid "Profile flag mediate_deleted conflicts with delegate_deleted"
+msgstr ""
+
+#: parser_yacc.y:424
+msgid "Profile flag attach_disconnected conflicts with no_attach_disconnected"
+msgstr ""
+
+#: parser_yacc.y:427
+msgid "Profile flag chroot_attach conflicts with chroot_no_attach"
+msgstr ""
+
+#: parser_yacc.y:441
+msgid "Profile flag 'debug' is no longer valid."
+msgstr ""
+
+#: parser_yacc.y:463
+#, c-format
+msgid "Invalid profile flag: %s."
+msgstr ""
+
+#: parser_yacc.y:498 parser_yacc.y:520
+msgid "Assert: `rule' returned NULL."
+msgstr ""
+
+#: parser_yacc.y:501 parser_yacc.y:546
+msgid ""
+"Invalid mode, in deny rules 'x' must not be preceded by exec qualifier 'i', "
+"'p', or 'u'"
+msgstr ""
+
+#: parser_yacc.y:524
+msgid ""
+"Invalid mode, 'x' must be preceded by exec qualifier 'i', 'p', 'c', or 'u'"
+msgstr ""
+
+#: parser_yacc.y:549
+msgid "Invalid mode, 'x' must be preceded by exec qualifier 'i', 'p', or 'u'"
+msgstr ""
+
+#: parser_yacc.y:574 parser_yacc.y:612
+msgid "Assert: `network_rule' return invalid protocol."
+msgstr ""
+
+#: parser_yacc.y:649
+msgid "Assert: `change_profile' returned NULL."
+msgstr ""
+
+#: parser_yacc.y:680
+msgid "Assert: 'hat rule' returned NULL."
+msgstr ""
+
+#: parser_yacc.y:689
+msgid "Assert: 'local_profile rule' returned NULL."
+msgstr ""
+
+#: parser_yacc.y:824
+#, c-format
+msgid "Unset boolean variable %s used in if-expression"
+msgstr ""
+
+#: parser_yacc.y:882
+msgid "unsafe rule missing exec permissions"
+msgstr ""
+
+#: parser_yacc.y:901
+msgid "subset can only be used with link rules."
+msgstr ""
+
+#: parser_yacc.y:903
+msgid "link and exec perms conflict on a file rule using ->"
+msgstr ""
+
+#: parser_yacc.y:905
+msgid "link perms are not allowed on a named profile transition.\n"
+msgstr ""
+
+#: parser_yacc.y:921
+#, c-format
+msgid "missing an end of line character? (entry: %s)"
+msgstr ""
+
+#: parser_yacc.y:975 parser_yacc.y:985
+msgid "Invalid network entry."
+msgstr ""
+
+#: parser_yacc.y:1039 parser_yacc.y:1048
+#, c-format
+msgid "Invalid capability %s."
+msgstr ""
+
+#: parser_yacc.y:1066
+#, c-format
+msgid "AppArmor parser error for %s%s%s at line %d: %s\n"
+msgstr ""
+
+#: parser_yacc.y:1072
+#, c-format
+msgid "AppArmor parser error,%s%s line %d: %s\n"
+msgstr ""
+
+#: ../parser_regex.c:244
+#, c-format
+msgid "%s: Illegal open {, nesting groupings not allowed\n"
+msgstr ""
+
+#: ../parser_regex.c:265
+#, c-format
+msgid "%s: Regex grouping error: Invalid number of items between {}\n"
+msgstr ""
+
+#: ../parser_regex.c:271
+#, c-format
+msgid ""
+"%s: Regex grouping error: Invalid close }, no matching open { detected\n"
+msgstr ""
+
+#: ../parser_regex.c:337
+#, c-format
+msgid ""
+"%s: Regex grouping error: Unclosed grouping or character class, expecting "
+"close }\n"
+msgstr ""
+
+#: ../parser_regex.c:351
+#, c-format
+msgid "%s: Internal buffer overflow detected, %d characters exceeded\n"
+msgstr ""
+
+#: ../parser_regex.c:355
+#, c-format
+msgid "%s: Unable to parse input line '%s'\n"
+msgstr ""
+
+#: ../parser_regex.c:397
+#, c-format
+msgid "%s: Invalid profile name '%s' - bad regular expression\n"
+msgstr ""
+
+#: ../parser_policy.c:202
+#, c-format
+msgid "ERROR merging rules for profile %s, failed to load\n"
+msgstr ""
+
+#: ../parser_policy.c:234
+#, c-format
+msgid ""
+"ERROR profile %s contains policy elements not usable with this kernel:\n"
+"\t'*', '?', character ranges, and alternations are not allowed.\n"
+"\t'**' may only be used at the end of a rule.\n"
+msgstr ""
+
+#: ../parser_policy.c:279
+#, c-format
+msgid "ERROR processing regexs for profile %s, failed to load\n"
+msgstr ""
+
+#: ../parser_policy.c:306
+#, c-format
+msgid "ERROR expanding variables for profile %s, failed to load\n"
+msgstr ""
+
+#: ../parser_policy.c:390
+#, c-format
+msgid "ERROR adding hat access rule for profile %s\n"
+msgstr ""
+
+#: ../parser_policy.c:490
+#, c-format
+msgid "ERROR in profile %s, failed to load\n"
+msgstr ""
+
+#: ../parser_policy.c:675
+#, c-format
+msgid "%s: Errors found during postprocessing.  Aborting.\n"
+msgstr ""
+
+#: ../parser_policy.c:682 ../parser_policy.c:704
+#, c-format
+msgid "%s: Errors found during regex postprocess.  Aborting.\n"
+msgstr ""
+
+#: ../parser_policy.c:689
+#, c-format
+msgid "%s: Errors found during postprocess.  Aborting.\n"
+msgstr ""
+
+#: ../parser_policy.c:696
+#, c-format
+msgid "%s: Errors found in combining rules postprocessing. Aborting.\n"
+msgstr ""