From f40ec8f4b78caca225b3064a608b2805517349da Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 27 Jun 2008 11:04:18 +0000 Subject: [PATCH] * Tue Jun 24 2008 Dan Walsh 2.0.49-10 - Fix spelling of enforcement --- policycoreutils-po.patch | 129179 ++++++++++++++++++------------------ policycoreutils.spec | 4 +- 2 files changed, 63865 insertions(+), 65318 deletions(-) diff --git a/policycoreutils-po.patch b/policycoreutils-po.patch index 1238a20..9448f2a 100644 --- a/policycoreutils-po.patch +++ b/policycoreutils-po.patch @@ -1,16 +1,246 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.47/po/af.po ---- nsapolicycoreutils/po/af.po 2007-07-16 14:20:42.000000000 -0400 -+++ policycoreutils-2.0.47/po/af.po 2008-05-07 11:11:19.000000000 -0400 +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.49/po/.cvsignore +--- nsapolicycoreutils/po/.cvsignore 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-2.0.49/po/.cvsignore 2008-06-23 07:03:37.000000000 -0400 +@@ -0,0 +1,16 @@ ++*.gmo ++*.mo ++*.pot ++.intltool-merge-cache ++Makefile ++Makefile.in ++Makefile.in.in ++POTFILES ++cat-id-tbl.c ++messages ++missing ++notexist ++po2tbl.sed ++po2tbl.sed.in ++stamp-cat-id ++stamp-it +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.49/po/Makefile +--- nsapolicycoreutils/po/Makefile 2008-06-12 23:25:23.000000000 -0400 ++++ policycoreutils-2.0.49/po/Makefile 2008-06-23 07:03:37.000000000 -0400 +@@ -23,20 +23,61 @@ + POFILES = $(wildcard *.po) + MOFILES = $(patsubst %.po,%.mo,$(POFILES)) + POTFILES = \ +- ../load_policy/load_policy.c \ +- ../newrole/newrole.c \ ++ ../run_init/open_init_pty.c \ + ../run_init/run_init.c \ ++ ../semodule_link/semodule_link.c \ ++ ../audit2allow/audit2allow \ ++ ../semanage/seobject.py \ ++ ../setsebool/setsebool.c \ ++ ../newrole/newrole.c \ ++ ../load_policy/load_policy.c \ ++ ../sestatus/sestatus.c \ ++ ../semodule/semodule.c \ + ../setfiles/setfiles.c \ +- ../scripts/genhomedircon \ ++ ../semodule_package/semodule_package.c \ ++ ../semodule_deps/semodule_deps.c \ ++ ../semodule_expand/semodule_expand.c \ + ../scripts/chcat \ +- ../semanage/semanage \ +- ../semanage/seobject.py \ +- ../audit2allow/audit2allow \ +- ../audit2allow/avc.py \ ++ ../scripts/fixfiles \ ++ ../restorecond/stringslist.c \ ++ ../restorecond/restorecond.h \ ++ ../restorecond/utmpwatcher.h \ ++ ../restorecond/stringslist.h \ ++ ../restorecond/restorecond.c \ ++ ../restorecond/utmpwatcher.c \ ++ ../gui/booleansPage.py \ ++ ../gui/fcontextPage.py \ ++ ../gui/loginsPage.py \ ++ ../gui/mappingsPage.py \ ++ ../gui/modulesPage.py \ ++ ../gui/polgen.glade \ ++ ../gui/polgengui.py \ ++ ../gui/polgen.py \ ++ ../gui/portsPage.py \ ++ ../gui/selinux.tbl \ ++ ../gui/semanagePage.py \ ++ ../gui/statusPage.py \ ++ ../gui/system-config-selinux.glade \ ++ ../gui/system-config-selinux.py \ ++ ../gui/translationsPage.py \ ++ ../gui/usersPage.py \ ++ ../gui/templates/executable.py \ ++ ../gui/templates/__init__.py \ ++ ../gui/templates/network.py \ ++ ../gui/templates/rw.py \ ++ ../gui/templates/script.py \ ++ ../gui/templates/semodule.py \ ++ ../gui/templates/tmp.py \ ++ ../gui/templates/user.py \ ++ ../gui/templates/var_lib.py \ ++ ../gui/templates/var_log.py \ ++ ../gui/templates/var_run.py \ ++ ../gui/templates/var_spool.py \ ++ ../secon/secon.c \ + + #default:: clean + +-all:: $(MOFILES) ++all:: update-po $(MOFILES) + + $(POTFILE): $(POTFILES) + $(XGETTEXT) --keyword=_ --keyword=N_ $(POTFILES) +@@ -64,8 +105,6 @@ + @rm -fv *mo *~ .depend + @rm -rf tmp + +-indent: +- + install: $(MOFILES) + @for n in $(MOFILES); do \ + l=`basename $$n .mo`; \ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreutils-2.0.49/po/POTFILES +--- nsapolicycoreutils/po/POTFILES 2008-06-12 23:25:24.000000000 -0400 ++++ policycoreutils-2.0.49/po/POTFILES 2008-06-23 07:03:37.000000000 -0400 +@@ -1,10 +1,54 @@ +- ../load_policy/load_policy.c \ +- ../newrole/newrole.c \ ++ ../run_init/open_init_pty.c \ + ../run_init/run_init.c \ +- ../setfiles/setfiles.c \ +- ../scripts/genhomedircon \ +- ../scripts/chcat \ +- ../semanage/semanage \ +- ../semanage/seobject.py \ ++ ../semodule_link/semodule_link.c \ + ../audit2allow/audit2allow \ +- ../audit2allow/avc.py ++ ../semanage/seobject.py \ ++ ../restorecon/restorecon.c \ ++ ../setsebool/setsebool.c \ ++ ../newrole/newrole.c \ ++ ../load_policy/load_policy.c \ ++ ../sestatus/sestatus.c \ ++ ../semodule/semodule.c \ ++ ../setfiles/setfiles.c \ ++ ../semodule_package/semodule_package.c \ ++ ../semodule_deps/semodule_deps.c \ ++ ../semodule_expand/semodule_expand.c \ ++ ../scripts/genhomedircon \ ++ ../scripts/chcat \ ++ ../scripts/fixfiles \ ++ ../restorecond/stringslist.c \ ++ ../restorecond/restorecond.h \ ++ ../restorecond/utmpwatcher.h \ ++ ../restorecond/stringslist.h \ ++ ../restorecond/restorecond.c \ ++ ../restorecond/utmpwatcher.c \ ++ ../gui/booleansPage.py \ ++ ../gui/fcontextPage.py \ ++ ../gui/loginsPage.py \ ++ ../gui/mappingsPage.py \ ++ ../gui/modulesPage.py \ ++ ../gui/polgen.glade \ ++ ../gui/polgengui.py \ ++ ../gui/polgen.py \ ++ ../gui/portsPage.py \ ++ ../gui/selinux.tbl \ ++ ../gui/semanagePage.py \ ++ ../gui/statusPage.py \ ++ ../gui/system-config-selinux.glade \ ++ ../gui/system-config-selinux.py \ ++ ../gui/translationsPage.py \ ++ ../gui/usersPage.py \ ++ ../gui/templates/executable.py \ ++ ../gui/templates/__init__.py \ ++ ../gui/templates/network.py \ ++ ../gui/templates/rw.py \ ++ ../gui/templates/script.py \ ++ ../gui/templates/semodule.py \ ++ ../gui/templates/tmp.py \ ++ ../gui/templates/user.py \ ++ ../gui/templates/var_lib.py \ ++ ../gui/templates/var_log.py \ ++ ../gui/templates/var_run.py \ ++ ../gui/templates/var_spool.py \ ++ ../secon/secon.c \ ++ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.49/po/POTFILES.in +--- nsapolicycoreutils/po/POTFILES.in 2008-06-12 23:25:23.000000000 -0400 ++++ policycoreutils-2.0.49/po/POTFILES.in 2008-06-23 07:03:37.000000000 -0400 +@@ -2,9 +2,7 @@ + run_init/run_init.c + semodule_link/semodule_link.c + audit2allow/audit2allow +-audit2allow/avc.py + semanage/seobject.py +-restorecon/restorecon.c + setsebool/setsebool.c + newrole/newrole.c + load_policy/load_policy.c +@@ -14,8 +12,6 @@ + semodule_package/semodule_package.c + semodule_deps/semodule_deps.c + semodule_expand/semodule_expand.c +-audit2why/audit2why.c +-scripts/genhomedircon + scripts/chcat + scripts/fixfiles + restorecond/stringslist.c +@@ -24,16 +20,32 @@ + restorecond/stringslist.h + restorecond/restorecond.c + restorecond/utmpwatcher.c +-gui/translationsPage.py + gui/booleansPage.py +-gui/usersPage.py ++gui/fcontextPage.py ++gui/loginsPage.py ++gui/mappingsPage.py + gui/modulesPage.py +-gui/system-config-selinux.glade ++gui/polgen.glade ++gui/polgengui.py ++gui/polgen.py + gui/portsPage.py +-gui/statusPage.py +-gui/loginsPage.py ++gui/selinux.tbl + gui/semanagePage.py +-gui/mappingsPage.py ++gui/statusPage.py ++gui/system-config-selinux.glade + gui/system-config-selinux.py +-gui/fcontextPage.py ++gui/translationsPage.py ++gui/usersPage.py ++gui/templates/executable.py ++gui/templates/__init__.py ++gui/templates/network.py ++gui/templates/rw.py ++gui/templates/script.py ++gui/templates/semodule.py ++gui/templates/tmp.py ++gui/templates/user.py ++gui/templates/var_lib.py ++gui/templates/var_log.py ++gui/templates/var_run.py ++gui/templates/var_spool.py + secon/secon.c +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.49/po/af.po +--- nsapolicycoreutils/po/af.po 2008-06-12 23:25:23.000000000 -0400 ++++ policycoreutils-2.0.49/po/af.po 2008-06-27 07:00:08.000000000 -0400 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-21 14:21-0500\n" -+"POT-Creation-Date: 2008-03-20 10:33-0400\n" ++"POT-Creation-Date: 2008-06-27 06:55-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -@@ -16,1013 +16,3244 @@ +@@ -16,1013 +16,3176 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -100,35 +330,35 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils -#: ../newrole/newrole.c:450 -#, c-format -msgid "Error setting KEEPCAPS, aborting\n" -+#: ../audit2allow/audit2allow:216 ++#: ../audit2allow/audit2allow:217 +msgid "******************** IMPORTANT ***********************\n" msgstr "" -#: ../newrole/newrole.c:458 ../newrole/newrole.c:531 -#, c-format -msgid "Error dropping capabilities, aborting\n" -+#: ../audit2allow/audit2allow:217 ++#: ../audit2allow/audit2allow:218 +msgid "To make this policy package active, execute:" msgstr "" -#: ../newrole/newrole.c:464 ../newrole/newrole.c:562 -#, c-format -msgid "Error changing uid, aborting.\n" -+#: ../semanage/seobject.py:111 ../semanage/seobject.py:115 ++#: ../semanage/seobject.py:113 ../semanage/seobject.py:117 +msgid "global" msgstr "" -#: ../newrole/newrole.c:470 ../newrole/newrole.c:525 ../newrole/newrole.c:557 -#, c-format -msgid "Error resetting KEEPCAPS, aborting\n" -+#: ../semanage/seobject.py:170 ++#: ../semanage/seobject.py:172 +msgid "translations not supported on non-MLS machines" msgstr "" -#: ../newrole/newrole.c:477 -#, c-format -msgid "Error dropping SETUID capability, aborting\n" -+#: ../semanage/seobject.py:177 ++#: ../semanage/seobject.py:179 +#, python-format +msgid "Unable to open %s: translations not supported on non-MLS machines: %s" msgstr "" @@ -136,14 +366,14 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils -#: ../newrole/newrole.c:482 ../newrole/newrole.c:536 -#, c-format -msgid "Error freeing caps\n" -+#: ../semanage/seobject.py:210 ++#: ../semanage/seobject.py:212 +msgid "Level" msgstr "" -#: ../newrole/newrole.c:580 -#, c-format -msgid "Error connecting to audit system.\n" -+#: ../semanage/seobject.py:210 ../gui/system-config-selinux.glade:651 ++#: ../semanage/seobject.py:212 ../gui/system-config-selinux.glade:651 +#: ../gui/translationsPage.py:43 ../gui/translationsPage.py:59 +msgid "Translation" msgstr "" @@ -151,7 +381,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils -#: ../newrole/newrole.c:586 -#, c-format -msgid "Error allocating memory.\n" -+#: ../semanage/seobject.py:218 ../semanage/seobject.py:232 ++#: ../semanage/seobject.py:220 ../semanage/seobject.py:234 +#, python-format +msgid "Translations can not contain spaces '%s' " msgstr "" @@ -159,7 +389,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils -#: ../newrole/newrole.c:593 -#, c-format -msgid "Error sending audit message.\n" -+#: ../semanage/seobject.py:221 ++#: ../semanage/seobject.py:223 +#, python-format +msgid "Invalid Level '%s' " msgstr "" @@ -167,7 +397,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils -#: ../newrole/newrole.c:634 ../newrole/newrole.c:978 -#, c-format -msgid "Could not determine enforcing mode.\n" -+#: ../semanage/seobject.py:224 ++#: ../semanage/seobject.py:226 +#, python-format +msgid "%s already defined in translations" msgstr "" @@ -175,7 +405,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils -#: ../newrole/newrole.c:641 -#, c-format -msgid "Error! Could not open %s.\n" -+#: ../semanage/seobject.py:236 ++#: ../semanage/seobject.py:238 +#, python-format +msgid "%s not defined in translations" msgstr "" @@ -183,280 +413,279 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils -#: ../newrole/newrole.c:646 -#, c-format -msgid "%s! Could not get current context for %s, not relabeling tty.\n" -+#: ../semanage/seobject.py:254 -+msgid "Could not create semanage handle" ++#: ../semanage/seobject.py:266 ++msgid "Permissive Types" msgstr "" -#: ../newrole/newrole.c:656 -#, c-format -msgid "%s! Could not get new context for %s, not relabeling tty.\n" -+#: ../semanage/seobject.py:263 -+msgid "SELinux policy is not managed or store cannot be accessed." ++#: ../semanage/seobject.py:316 ++msgid "Could not create semanage handle" msgstr "" -#: ../newrole/newrole.c:666 -#, c-format -msgid "%s! Could not set new context for %s\n" -+#: ../semanage/seobject.py:268 -+msgid "Cannot read policy store." ++#: ../semanage/seobject.py:325 ++msgid "SELinux policy is not managed or store cannot be accessed." msgstr "" -#: ../newrole/newrole.c:710 -#, c-format -msgid "%s changed labels.\n" -+#: ../semanage/seobject.py:273 -+msgid "Could not establish semanage connection" ++#: ../semanage/seobject.py:330 ++msgid "Cannot read policy store." msgstr "" -#: ../newrole/newrole.c:716 -#, c-format -msgid "Warning! Could not restore context for %s\n" -+#: ../semanage/seobject.py:275 -+msgid "Not yet implemented" ++#: ../semanage/seobject.py:335 ++msgid "Could not establish semanage connection" msgstr "" -#: ../newrole/newrole.c:772 -#, c-format -msgid "Error: multiple roles specified\n" -+#: ../semanage/seobject.py:295 ../semanage/seobject.py:353 -+#: ../semanage/seobject.py:400 ../semanage/seobject.py:483 -+#: ../semanage/seobject.py:554 ../semanage/seobject.py:616 -+#: ../semanage/seobject.py:834 ../semanage/seobject.py:1202 -+#: ../semanage/seobject.py:1266 ../semanage/seobject.py:1280 -+#: ../semanage/seobject.py:1358 ../semanage/seobject.py:1395 -+#: ../semanage/seobject.py:1435 -+#, python-format -+msgid "Could not create a key for %s" ++#: ../semanage/seobject.py:337 ++msgid "Not yet implemented" msgstr "" -#: ../newrole/newrole.c:780 -#, c-format -msgid "Error: multiple types specified\n" -+#: ../semanage/seobject.py:299 ../semanage/seobject.py:357 -+#: ../semanage/seobject.py:404 ../semanage/seobject.py:410 ++#: ../semanage/seobject.py:357 ../semanage/seobject.py:415 ++#: ../semanage/seobject.py:462 ../semanage/seobject.py:545 ++#: ../semanage/seobject.py:614 ../semanage/seobject.py:674 ++#: ../semanage/seobject.py:892 ../semanage/seobject.py:1260 ++#: ../semanage/seobject.py:1324 ../semanage/seobject.py:1338 ++#: ../semanage/seobject.py:1416 ../semanage/seobject.py:1455 ++#: ../semanage/seobject.py:1495 +#, python-format -+msgid "Could not check if login mapping for %s is defined" ++msgid "Could not create a key for %s" msgstr "" -#: ../newrole/newrole.c:787 -#, c-format -msgid "Sorry, -l may be used with SELinux MLS support.\n" -+#: ../semanage/seobject.py:301 ++#: ../semanage/seobject.py:361 ../semanage/seobject.py:419 ++#: ../semanage/seobject.py:466 ../semanage/seobject.py:472 +#, python-format -+msgid "Login mapping for %s is already defined" ++msgid "Could not check if login mapping for %s is defined" msgstr "" -#: ../newrole/newrole.c:792 -#, c-format -msgid "Error: multiple levels specified\n" -+#: ../semanage/seobject.py:305 ++#: ../semanage/seobject.py:363 +#, python-format -+msgid "Linux User %s does not exist" ++msgid "Login mapping for %s is already defined" msgstr "" -#: ../newrole/newrole.c:814 -#, c-format -msgid "Couldn't get default type.\n" -+#: ../semanage/seobject.py:309 ++#: ../semanage/seobject.py:367 +#, python-format -+msgid "Could not create login mapping for %s" ++msgid "Linux User %s does not exist" msgstr "" -#: ../newrole/newrole.c:824 -#, c-format -msgid "failed to get new context.\n" -+#: ../semanage/seobject.py:313 ../semanage/seobject.py:497 ++#: ../semanage/seobject.py:371 +#, python-format -+msgid "Could not set name for %s" ++msgid "Could not create login mapping for %s" msgstr "" -#: ../newrole/newrole.c:831 -#, c-format -msgid "failed to set new role %s\n" -+#: ../semanage/seobject.py:318 ../semanage/seobject.py:507 ++#: ../semanage/seobject.py:375 ../semanage/seobject.py:559 +#, python-format -+msgid "Could not set MLS range for %s" ++msgid "Could not set name for %s" msgstr "" -#: ../newrole/newrole.c:838 -#, c-format -msgid "failed to set new type %s\n" -+#: ../semanage/seobject.py:322 ++#: ../semanage/seobject.py:380 ../semanage/seobject.py:569 +#, python-format -+msgid "Could not set SELinux user for %s" ++msgid "Could not set MLS range for %s" msgstr "" -#: ../newrole/newrole.c:847 -#, c-format -msgid "failed to build new range with level %s\n" -+#: ../semanage/seobject.py:326 ../semanage/seobject.py:378 -+#: ../semanage/seobject.py:416 ../semanage/seobject.py:523 -+#: ../semanage/seobject.py:593 ../semanage/seobject.py:632 -+#: ../semanage/seobject.py:762 ../semanage/seobject.py:804 -+#: ../semanage/seobject.py:824 ../semanage/seobject.py:861 -+#: ../semanage/seobject.py:994 ../semanage/seobject.py:1035 -+#: ../semanage/seobject.py:1067 ../semanage/seobject.py:1180 -+#: ../semanage/seobject.py:1238 ../semanage/seobject.py:1258 -+#: ../semanage/seobject.py:1296 ../semanage/seobject.py:1378 -+#: ../semanage/seobject.py:1411 ../semanage/seobject.py:1429 -+msgid "Could not start semanage transaction" ++#: ../semanage/seobject.py:384 ++#, python-format ++msgid "Could not set SELinux user for %s" msgstr "" -#: ../newrole/newrole.c:852 -#, c-format -msgid "failed to set new range %s\n" -+#: ../semanage/seobject.py:330 ../semanage/seobject.py:334 -+#, python-format -+msgid "Could not add login mapping for %s" ++#: ../semanage/seobject.py:388 ../semanage/seobject.py:440 ++#: ../semanage/seobject.py:478 ../semanage/seobject.py:583 ++#: ../semanage/seobject.py:651 ../semanage/seobject.py:690 ++#: ../semanage/seobject.py:820 ../semanage/seobject.py:862 ++#: ../semanage/seobject.py:882 ../semanage/seobject.py:919 ++#: ../semanage/seobject.py:1052 ../semanage/seobject.py:1093 ++#: ../semanage/seobject.py:1125 ../semanage/seobject.py:1238 ++#: ../semanage/seobject.py:1296 ../semanage/seobject.py:1316 ++#: ../semanage/seobject.py:1354 ../semanage/seobject.py:1436 ++#: ../semanage/seobject.py:1471 ../semanage/seobject.py:1489 ++msgid "Could not start semanage transaction" msgstr "" -#: ../newrole/newrole.c:860 -#, c-format -msgid "failed to convert new context to string\n" -+#: ../semanage/seobject.py:337 ../semanage/seobject.py:340 -+msgid "add SELinux user mapping" ++#: ../semanage/seobject.py:392 ../semanage/seobject.py:396 ++#, python-format ++msgid "Could not add login mapping for %s" msgstr "" -#: ../newrole/newrole.c:865 -#, c-format -msgid "%s is not a valid context\n" -+#: ../semanage/seobject.py:349 -+msgid "Requires seuser or serange" ++#: ../semanage/seobject.py:399 ../semanage/seobject.py:402 ++msgid "add SELinux user mapping" msgstr "" -#: ../newrole/newrole.c:872 -#, c-format -msgid "Unable to allocate memory for new_context" -+#: ../semanage/seobject.py:359 ../semanage/seobject.py:406 -+#, python-format -+msgid "Login mapping for %s is not defined" ++#: ../semanage/seobject.py:411 ++msgid "Requires seuser or serange" msgstr "" -#: ../newrole/newrole.c:898 -#, c-format -msgid "Unable to obtain empty signal set\n" -+#: ../semanage/seobject.py:363 ++#: ../semanage/seobject.py:421 ../semanage/seobject.py:468 +#, python-format -+msgid "Could not query seuser for %s" ++msgid "Login mapping for %s is not defined" msgstr "" -#: ../newrole/newrole.c:906 -#, c-format -msgid "Unable to set SIGHUP handler\n" -+#: ../semanage/seobject.py:382 ../semanage/seobject.py:386 ++#: ../semanage/seobject.py:425 +#, python-format -+msgid "Could not modify login mapping for %s" ++msgid "Could not query seuser for %s" msgstr "" -#: ../newrole/newrole.c:972 -#, c-format -msgid "Sorry, newrole may be used only on a SELinux kernel.\n" -+#: ../semanage/seobject.py:412 ++#: ../semanage/seobject.py:444 ../semanage/seobject.py:448 +#, python-format -+msgid "Login mapping for %s is defined in policy, cannot be deleted" ++msgid "Could not modify login mapping for %s" msgstr "" -#: ../newrole/newrole.c:989 -#, c-format -msgid "failed to get old_context.\n" -+#: ../semanage/seobject.py:421 ../semanage/seobject.py:425 ++#: ../semanage/seobject.py:474 +#, python-format -+msgid "Could not delete login mapping for %s" ++msgid "Login mapping for %s is defined in policy, cannot be deleted" msgstr "" -#: ../newrole/newrole.c:996 -#, c-format -msgid "Error! Could not retrieve tty information.\n" -+#: ../semanage/seobject.py:441 -+msgid "Could not list login mappings" ++#: ../semanage/seobject.py:483 ../semanage/seobject.py:487 ++#, python-format ++msgid "Could not delete login mapping for %s" msgstr "" -#: ../newrole/newrole.c:1015 -#, c-format -msgid "Authenticating %s.\n" -+#: ../semanage/seobject.py:454 ../semanage/seobject.py:459 -+#: ../gui/system-config-selinux.glade:100 -+msgid "Login Name" ++#: ../semanage/seobject.py:503 ++msgid "Could not list login mappings" msgstr "" -#: ../newrole/newrole.c:1020 ../run_init/run_init.c:126 -#, c-format -msgid "failed to initialize PAM\n" -+#: ../semanage/seobject.py:454 ../semanage/seobject.py:459 -+#: ../semanage/seobject.py:675 ../semanage/seobject.py:680 -+#: ../gui/system-config-selinux.glade:128 -+#: ../gui/system-config-selinux.glade:1107 -+msgid "SELinux User" ++#: ../semanage/seobject.py:516 ../semanage/seobject.py:521 ++#: ../gui/system-config-selinux.glade:100 ++msgid "Login Name" msgstr "" -#: ../newrole/newrole.c:1029 -#, c-format -msgid "newrole: incorrect password for %s\n" -+#: ../semanage/seobject.py:454 ../gui/system-config-selinux.glade:156 -+#: ../gui/system-config-selinux.glade:1135 -+msgid "MLS/MCS Range" ++#: ../semanage/seobject.py:516 ../semanage/seobject.py:521 ++#: ../semanage/seobject.py:733 ../semanage/seobject.py:738 ++#: ../gui/system-config-selinux.glade:128 ++#: ../gui/system-config-selinux.glade:1107 ++msgid "SELinux User" msgstr "" -#: ../newrole/newrole.c:1056 -#, c-format -msgid "newrole: failure forking: %s" -+#: ../semanage/seobject.py:487 ../semanage/seobject.py:558 -+#: ../semanage/seobject.py:620 ../semanage/seobject.py:626 -+#, python-format -+msgid "Could not check if SELinux user %s is defined" ++#: ../semanage/seobject.py:516 ../gui/system-config-selinux.glade:156 ++#: ../gui/system-config-selinux.glade:1135 ++msgid "MLS/MCS Range" msgstr "" -#: ../newrole/newrole.c:1059 ../newrole/newrole.c:1082 -#, c-format -msgid "Unable to restore tty label...\n" -+#: ../semanage/seobject.py:489 ++#: ../semanage/seobject.py:549 ../semanage/seobject.py:618 ++#: ../semanage/seobject.py:678 ../semanage/seobject.py:684 +#, python-format -+msgid "SELinux user %s is already defined" ++msgid "Could not check if SELinux user %s is defined" msgstr "" -#: ../newrole/newrole.c:1061 ../newrole/newrole.c:1088 -#, c-format -msgid "Failed to close tty properly\n" -+#: ../semanage/seobject.py:493 ++#: ../semanage/seobject.py:551 +#, python-format -+msgid "Could not create SELinux user for %s" ++msgid "SELinux user %s is already defined" msgstr "" -#: ../newrole/newrole.c:1117 -#, c-format -msgid "Could not close descriptors.\n" -+#: ../semanage/seobject.py:502 ++#: ../semanage/seobject.py:555 +#, python-format -+msgid "Could not add role %s for %s" ++msgid "Could not create SELinux user for %s" msgstr "" -#: ../newrole/newrole.c:1140 -#, c-format -msgid "Error allocating shell's argv0.\n" -+#: ../semanage/seobject.py:511 ++#: ../semanage/seobject.py:564 +#, python-format -+msgid "Could not set MLS level for %s" ++msgid "Could not add role %s for %s" msgstr "" -#: ../newrole/newrole.c:1147 ../run_init/run_init.c:405 -#, c-format -msgid "Could not set exec context to %s.\n" -+#: ../semanage/seobject.py:513 ../semanage/seobject.py:580 ++#: ../semanage/seobject.py:573 +#, python-format -+msgid "Invalid prefix %s" ++msgid "Could not set MLS level for %s" msgstr "" -#: ../newrole/newrole.c:1173 -#, c-format -msgid "Unable to restore the environment, aborting\n" -+#: ../semanage/seobject.py:516 ++#: ../semanage/seobject.py:576 +#, python-format +msgid "Could not add prefix %s for %s" msgstr "" -#: ../newrole/newrole.c:1184 -msgid "failed to exec shell\n" -+#: ../semanage/seobject.py:519 ++#: ../semanage/seobject.py:579 +#, python-format +msgid "Could not extract key for %s" msgstr "" @@ -466,7 +695,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils -"USAGE: run_init