From 0a77d12b6f2ae32ac2a326af700e48b36c88723a Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@redhat.com>
Date: Wed, 11 Sep 2013 09:45:00 -0400
Subject: [PATCH] Random fixes for sepolicy gui

  * Do not prompt for password until you make a change
  * Add user mappings and selinux users page
  * lots of code cleanup
---
 policycoreutils-rhat.patch | 6748 +++++++++++++++++++++++-------------
 policycoreutils.spec       |   35 +-
 2 files changed, 4375 insertions(+), 2408 deletions(-)

diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 932ae14..6d211c5 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -226889,10 +226889,10 @@ index 0000000..585b33c
 +msgid "Boolean %s Allow Rules"
 +msgstr ""
 diff --git a/policycoreutils/po/ja.po b/policycoreutils/po/ja.po
-index 72ae12d..7b8f1c3 100644
+index 72ae12d..efd7f7f 100644
 --- a/policycoreutils/po/ja.po
 +++ b/policycoreutils/po/ja.po
-@@ -3,20 +3,20 @@
+@@ -3,20 +3,24 @@
  # This file is distributed under the same license as the PACKAGE package.
  # 
  # Translators:
@@ -226904,10 +226904,14 @@ index 72ae12d..7b8f1c3 100644
 -# Takuro Nagamoto <tnagamot@redhat.com>, 2006.
 -# Tomoyuki KATO <tomo@dream.daynight.jp>, 2012.
 +# hyuugabaru <hyu_gabaru@yahoo.co.jp>, 2007
++# hyuugabaru <hyu_gabaru@yahoo.co.jp>, 2007
 +# Kiyoto Hashida <khashida@redhat.com>, 2008-2010,2012
 +# makoto <makoto@fedoraproject.org>, 2008
++# makoto <makoto@fedoraproject.org>, 2008
 +# noriko <noriko@fedoraproject.org>, 2012
-+# Noriko Mizumoto <noriko@redhat.com>, 2006, 2008, 2009
++# Noriko Mizumoto <noriko@redhat.com>, 2006,2008-2009
++# noriko <noriko@fedoraproject.org>, 2012
++# tnagamot <tnagamot@redhat.com>, 2006
 +# tnagamot <tnagamot@redhat.com>, 2006
 +# Tomoyuki KATO <tomo@dream.daynight.jp>, 2012-2013
  msgid ""
@@ -226918,12 +226922,12 @@ index 72ae12d..7b8f1c3 100644
 -"PO-Revision-Date: 2013-01-04 17:02+0000\n"
 -"Last-Translator: dwalsh <dwalsh@redhat.com>\n"
 +"POT-Creation-Date: 2013-07-10 16:36-0400\n"
-+"PO-Revision-Date: 2013-07-16 03:47+0000\n"
++"PO-Revision-Date: 2013-09-03 03:26+0000\n"
 +"Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
  "Language-Team: Japanese <trans-ja@lists.fedoraproject.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
-@@ -31,7 +31,7 @@ msgid ""
+@@ -31,7 +35,7 @@ msgid ""
  "         <args ...> are the arguments to that script."
  msgstr "使い方: run_init <script> <args ...>\n  ここで、 <script> に実行する init スクリプトの名前、\n         <args ...> にそのスクリプトに対する引数を指定します。"
  
@@ -226932,7 +226936,7 @@ index 72ae12d..7b8f1c3 100644
  #, c-format
  msgid "failed to initialize PAM\n"
  msgstr "PAM の初期化に失敗しました\n"
-@@ -80,7 +80,7 @@ msgstr "残念ながら、 run_init は SELinux カーネル上でしか使用
+@@ -80,7 +84,7 @@ msgstr "残念ながら、 run_init は SELinux カーネル上でしか使用
  msgid "authentication failed.\n"
  msgstr "認証に失敗しました。\n"
  
@@ -226941,7 +226945,7 @@ index 72ae12d..7b8f1c3 100644
  #, c-format
  msgid "Could not set exec context to %s.\n"
  msgstr "exec コンテキストを %s に設定できませんでした。\n"
-@@ -133,7 +133,7 @@ msgstr "semanage トランザクションをコミットできませんでした
+@@ -133,7 +137,7 @@ msgstr "semanage トランザクションをコミットできませんでした
  msgid "Semanage transaction not in progress"
  msgstr "Semanage トランザクションは進行していません"
  
@@ -226950,7 +226954,7 @@ index 72ae12d..7b8f1c3 100644
  msgid "Could not list SELinux modules"
  msgstr "SELinux のモジュール一覧を表示できませんでした"
  
-@@ -149,815 +149,830 @@ msgstr "バージョン"
+@@ -149,815 +153,830 @@ msgstr "バージョン"
  msgid "Disabled"
  msgstr "無効"
  
@@ -227978,7 +227982,7 @@ index 72ae12d..7b8f1c3 100644
  msgid "Description"
  msgstr "説明"
  
-@@ -996,206 +1011,226 @@ msgstr "エラーが発生しました。シェルが有効ではありません
+@@ -996,206 +1015,226 @@ msgstr "エラーが発生しました。シェルが有効ではありません
  msgid "Unable to clear environment\n"
  msgstr "環境を消去できません\n"
  
@@ -228246,7 +228250,7 @@ index 72ae12d..7b8f1c3 100644
  msgid "failed to exec shell\n"
  msgstr "シェルの実行に失敗しました\n"
  
-@@ -1422,7 +1457,7 @@ msgstr "<b>制約したいアプリケーション、又はユーザーロール
+@@ -1422,7 +1461,7 @@ msgstr "<b>制約したいアプリケーション、又はユーザーロール
  msgid "<b>Applications</b>"
  msgstr "<b>アプリケーション</b>"
  
@@ -228255,7 +228259,7 @@ index 72ae12d..7b8f1c3 100644
  msgid "Standard Init Daemon"
  msgstr "標準的な Init デーモン"
  
-@@ -1432,7 +1467,7 @@ msgid ""
+@@ -1432,7 +1471,7 @@ msgid ""
  "requires a script in /etc/rc.d/init.d"
  msgstr "標準的な Init デーモンは起動時に init スクリプト経由で開始されるデーモンです。通常、/etc/rc.d/init.d にスクリプトが必要です。"
  
@@ -228264,7 +228268,7 @@ index 72ae12d..7b8f1c3 100644
  msgid "DBUS System Daemon"
  msgstr "DBUS システムデーモン"
  
-@@ -1444,7 +1479,7 @@ msgstr "インターネットサービスデーモン (inetd)"
+@@ -1444,7 +1483,7 @@ msgstr "インターネットサービスデーモン (inetd)"
  msgid "Internet Services Daemon are daemons started by xinetd"
  msgstr "インタネットサービスデーモンは、xinetd で開始されるデーモンです"
  
@@ -228273,7 +228277,7 @@ index 72ae12d..7b8f1c3 100644
  msgid "Web Application/Script (CGI)"
  msgstr "ウェブアプリケーション/スクリプト (CGI)"
  
-@@ -1453,7 +1488,7 @@ msgid ""
+@@ -1453,7 +1492,7 @@ msgid ""
  "Web Applications/Script (CGI) CGI scripts started by the web server (apache)"
  msgstr "ウェブアプリケーション/スクリプト (CGI) は、ウェブサーバー (apache) で開始される CGI スクリプトです"
  
@@ -228282,7 +228286,7 @@ index 72ae12d..7b8f1c3 100644
  msgid "User Application"
  msgstr "ユーザーアプリケーション"
  
-@@ -1463,7 +1498,7 @@ msgid ""
+@@ -1463,7 +1502,7 @@ msgid ""
  "started by a user"
  msgstr "ユーザーアプリケーションとは、ユーザーが開始して制約したいいずれかのアプリケーションです"
  
@@ -228291,7 +228295,7 @@ index 72ae12d..7b8f1c3 100644
  msgid "Sandbox"
  msgstr "Sandbox"
  
-@@ -1538,7 +1573,8 @@ msgstr "root として実行中にこのユーザーをマシン管理のため
+@@ -1538,7 +1577,8 @@ msgstr "root として実行中にこのユーザーをマシン管理のため
  msgid "<b>Enter name of application or user role:</b>"
  msgstr "<b>アプリケーションかユーザーロールの名前を記入:</b>"
  
@@ -228301,7 +228305,7 @@ index 72ae12d..7b8f1c3 100644
  msgid "Name"
  msgstr "名前"
  
-@@ -1754,75 +1790,75 @@ msgstr "<b>どのディレクトリで %s ポリシーを生成しますか?</b>
+@@ -1754,75 +1794,75 @@ msgstr "<b>どのディレクトリで %s ポリシーを生成しますか?</b>
  msgid "Policy Directory"
  msgstr "ポリシーディレクトリ"
  
@@ -228393,7 +228397,7 @@ index 72ae12d..7b8f1c3 100644
  msgid "Configue SELinux"
  msgstr "SELinux の設定"
  
-@@ -1837,6 +1873,8 @@ msgid ""
+@@ -1837,6 +1877,8 @@ msgid ""
  msgstr "SELinux ポート\nタイプ"
  
  #: ../gui/portsPage.py:91 ../gui/system-config-selinux.glade:363
@@ -228402,7 +228406,7 @@ index 72ae12d..7b8f1c3 100644
  msgid "Protocol"
  msgstr "プロトコル"
  
-@@ -1846,7 +1884,8 @@ msgid ""
+@@ -1846,7 +1888,8 @@ msgid ""
  "Level"
  msgstr "MLS/MCS\nレベル"
  
@@ -228412,7 +228416,7 @@ index 72ae12d..7b8f1c3 100644
  msgid "Port"
  msgstr "ポート"
  
-@@ -1976,6 +2015,9 @@ msgid "SELinux Administration"
+@@ -1976,6 +2019,9 @@ msgid "SELinux Administration"
  msgstr "SELinux の管理"
  
  #: ../gui/system-config-selinux.glade:1122
@@ -228422,7 +228426,7 @@ index 72ae12d..7b8f1c3 100644
  msgid "Add"
  msgstr "追加"
  
-@@ -2045,6 +2087,10 @@ msgstr "カスタム化と全てのブーリアンの間で切り替え"
+@@ -2045,6 +2091,10 @@ msgstr "カスタム化と全てのブーリアンの間で切り替え"
  #: ../gui/system-config-selinux.glade:2467
  #: ../gui/system-config-selinux.glade:2692
  #: ../gui/system-config-selinux.glade:2867
@@ -228433,7 +228437,7 @@ index 72ae12d..7b8f1c3 100644
  msgid "Filter"
  msgstr "フィルター"
  
-@@ -2168,264 +2214,6 @@ msgstr "label59"
+@@ -2168,291 +2218,33 @@ msgstr "label59"
  msgid "SELinux user '%s' is required"
  msgstr "SELinux ユーザー '%s' が必要です"
  
@@ -228698,14 +228702,20 @@ index 72ae12d..7b8f1c3 100644
  #: booleans.py:1
  msgid ""
  "Allow ABRT to modify public files used for public file transfer services."
-@@ -2437,16 +2225,16 @@ msgid ""
- msgstr "ABRT が ABRT イベントスクリプトを処理するために abrt_handle_event_t domain ドメインにおいて実行することを許可します。"
+-msgstr "ABRT がパブリックなファイル転送サービスのために使用されるパブリックなファイルを変更することを許可します。"
++msgstr "ABRT がパブリックなファイル転送サービスに使用されるパブリックなファイルを変更することを許可します。"
+ 
+ #: booleans.py:2
+ msgid ""
+ "Allow ABRT to run in abrt_handle_event_t domain to handle ABRT event scripts"
+-msgstr "ABRT が ABRT イベントスクリプトを処理するために abrt_handle_event_t domain ドメインにおいて実行することを許可します。"
++msgstr "ABRT が ABRT イベントスクリプトを処理するために abrt_handle_event_t domain ドメインで実行することを許可します。"
  
  #: booleans.py:3
 -msgid "Allow amavis to use JIT compiler"
 -msgstr "amavis に対して JIT コンパイラーの使用を許可"
 +msgid "Allow antivirus programs to read non security files on a system"
-+msgstr "ウイルス対策ソフトウェアがシステムにある非セキュリティファイルを読み込むことを許可する"
++msgstr "ウイルス対策ソフトウェアがシステムにある非セキュリティファイルを読み込むことを許可する。"
  
  #: booleans.py:4
 -msgid "Allow antivirus programs to read non security files on a system"
@@ -228716,16 +228726,23 @@ index 72ae12d..7b8f1c3 100644
  #: booleans.py:5
  msgid "Allow auditadm to exec content"
 -msgstr ""
-+msgstr "auditadm がコンテンツを実行することを許可する"
++msgstr "auditadm がコンテンツを実行することを許可します。"
  
  #: booleans.py:6
  msgid ""
-@@ -2460,54 +2248,58 @@ msgstr "ユーザーが RADIUS サーバーを使用してログインするこ
+ "Allow users to resolve user passwd entries directly from ldap rather then "
+ "using a sssd server"
+-msgstr "sssd サーバーを介さず、 ldap から直接 user passwd のエントリをユーザーが解決できるようにする"
++msgstr "ユーザーが SSSD サーバーを介さず、直接 LDAP からユーザー passwd エントリを解決することを許可します。"
+ 
+ #: booleans.py:7
+ msgid "Allow users to login using a radius server"
+@@ -2460,1029 +2252,1835 @@ msgstr "ユーザーが RADIUS サーバーを使用してログインするこ
  
  #: booleans.py:8
  msgid "Allow users to login using a yubikey  server"
 -msgstr ""
-+msgstr "ユーザーが yubikey  サーバーを使用してログインすることを許可する"
++msgstr "ユーザーが yubikey  サーバーを使用してログインすることを許可します。"
  
  #: booleans.py:9
 -msgid "Allow awstats to purge Apache logs"
@@ -228740,14 +228757,14 @@ index 72ae12d..7b8f1c3 100644
 -msgstr "各種コンテンツ (nfs、samba、脱着可能デバイス、ユーザーの一時ファイル、信頼できないコンテンツファイルなど) の読み込みを cdrecord に許可する"
 +"Determine whether cdrecord can read various content. nfs, samba, removable "
 +"devices, user temp and untrusted content files"
-+msgstr "cdrecord がさまざまな内容を読み込みできるかどうかを指定します。NFS、Samba、リムーバブルデバイス、ユーザーの一時領域および信頼できない内容のファイル。"
++msgstr "cdrecord がさまざまな内容を読み取りできるかどうかを指定します。NFS、Samba、リムーバブルデバイス、ユーザーの一時領域および信頼されていない内容のファイル。"
  
  #: booleans.py:11
 -msgid "Allow clamd to use JIT compiler"
 -msgstr "clamd が JIT コンパイラーを使用することを許可します。"
 +msgid ""
 +"Allow cluster administrative domains to connect to the network using TCP."
-+msgstr "クラスター管理ドメインが TCP を使用してネットワークに接続することを許可する。"
++msgstr "クラスター管理ドメインが TCP を使用してネットワークに接続することを許可します。"
  
  #: booleans.py:12
 -msgid "Allow clamscan to non security files on a system"
@@ -228761,7 +228778,7 @@ index 72ae12d..7b8f1c3 100644
 +msgid ""
 +"Allow cluster administrative cluster domains memcheck-amd64- to use "
 +"executable memory"
-+msgstr "クラスター管理ドメインの memcheck-amd64- が実行可能なメモリーを使用することを許可する。"
++msgstr "クラスター管理ドメインの memcheck-amd64- が実行可能なメモリーを使用することを許可します。"
  
  #: booleans.py:14
  msgid ""
@@ -228803,8 +228820,9 @@ index 72ae12d..7b8f1c3 100644
  
  #: booleans.py:20
  msgid ""
-@@ -2515,8 +2307,8 @@ msgid ""
- msgstr "ファイルのコンテキスト復元のため、 システムの cron ジョブによるファイルシステムの再ラベル付けを許可します。"
+ "Allow system cron jobs to relabel filesystem for restoring file contexts."
+-msgstr "ファイルのコンテキスト復元のため、 システムの cron ジョブによるファイルシステムの再ラベル付けを許可します。"
++msgstr "システムの cron ジョブがファイルのコンテキスト復元のため、ファイルシステムを再ラベル付けすることを許可します。"
  
  #: booleans.py:21
 -msgid "Allow cvs daemon to read shadow"
@@ -228814,8 +228832,18 @@ index 72ae12d..7b8f1c3 100644
  
  #: booleans.py:22
  msgid "Allow all daemons to write corefiles to /"
-@@ -2531,958 +2323,1760 @@ msgid "Allow all daemons the ability to read/write terminals"
- msgstr "すべてのデーモンが端末を読み書きすることを許可します"
+-msgstr "/ へのコアファイルの書き込みを全てのデーモンに許可する"
++msgstr "すべてのデーモンが / にコアファイルを書き込むことを許可します。"
+ 
+ #: booleans.py:23
+ msgid "Allow all daemons to use tcp wrappers."
+-msgstr "すべてのデーモンが tcp wrappers を使用することを許可します"
++msgstr "すべてのデーモンが tcp wrappers を使用することを許可します。"
+ 
+ #: booleans.py:24
+ msgid "Allow all daemons the ability to read/write terminals"
+-msgstr "すべてのデーモンが端末を読み書きすることを許可します"
++msgstr "すべてのデーモンが端末を読み書きすることを許可します。"
  
  #: booleans.py:25
 -msgid "Allow dan to manage user files"
@@ -228889,7 +228917,7 @@ index 72ae12d..7b8f1c3 100644
 +msgid ""
 +"Determine whether exim can create, read, write, and delete generic user "
 +"content files."
-+msgstr "exim が一般的な内容のユーザーファイルを作成、読み込み、書き込み、および削除できるかどうかを"
++msgstr "exim が一般的な内容のユーザーファイルを作成、読み取り、書き込み、および削除できるかどうかを指定します。"
  
  #: booleans.py:36
 -msgid "Allow exim to connect to databases (postgres, mysql)"
@@ -228919,7 +228947,7 @@ index 72ae12d..7b8f1c3 100644
 -msgid "Allow fenced domain to connect to the network using TCP."
 -msgstr "隔離ドメインに対して TCP を使用したネットワークへの接続を許可します。"
 +msgid "Allow all domains to execute in fips_mode"
-+msgstr "すべてのドメインが fips_mode で実行することを許可する"
++msgstr "すべてのドメインが fips_mode で実行することを許可します。"
  
  #: booleans.py:41
 -msgid "Allow fenced domain to execute ssh."
@@ -229040,7 +229068,7 @@ index 72ae12d..7b8f1c3 100644
 -msgstr "gitisis デーモンによるメールの送信を許可"
 +#: booleans.py:58
 +msgid "Determine whether Gitosis can send mail."
-+msgstr "Gitosis がメールを送信できるかどうかを"
++msgstr "Gitosis がメールを送信できるかどうかを指定します。"
  
 -#: booleans.py:60
 +#: booleans.py:59
@@ -229051,11 +229079,11 @@ index 72ae12d..7b8f1c3 100644
 +msgid ""
 +"Allow glusterfsd to modify public files used for public file transfer "
 +"services.  Files/Directories must be labeled public_content_rw_t."
-+msgstr "パブリックファイル転送サービスに使用するパブリックファイルの変更を glusterfsd に対して許可します。 ファイルおよびディレクトリのラベルは public_content_rw_t でなければなりません。"
++msgstr "glusterfsd がパブリックファイル転送サービスに使用するパブリックファイルを変更することを許可します。 ファイルおよびディレクトリのラベルは public_content_rw_t でなければなりません。"
 +
  #: booleans.py:61
 +msgid "Allow glusterfsd to share any file/directory read only."
-+msgstr "glusterfsd がすべてのファイル・ディレクトリを読み込み専用で共有することを許可します。"
++msgstr "glusterfsd がすべてのファイル・ディレクトリを読み取り専用で共有することを許可します。"
 +
 +#: booleans.py:62
 +msgid "Allow glusterfsd to share any file/directory read/write."
@@ -229065,25 +229093,28 @@ index 72ae12d..7b8f1c3 100644
  msgid ""
  "Allow usage of the gpg-agent --write-env-file option. This also allows gpg-"
  "agent to manage user files."
- msgstr "gpg-agent --write-env-file オプションの使用を許可します。 これにより、 gpg-agent によるユーザーファイルの管理も許可することになります。"
+-msgstr "gpg-agent --write-env-file オプションの使用を許可します。 これにより、 gpg-agent によるユーザーファイルの管理も許可することになります。"
++msgstr "gpg-agent --write-env-file オプションの使用を許可します。これにより、 gpg-agent によるユーザーファイルの管理も許可することになります。"
  
 -#: booleans.py:62
 +#: booleans.py:64
  msgid ""
  "Allow gpg web domain to modify public files used for public file transfer "
  "services."
- msgstr "パブリックファイル転送サービスに使用されるパブリックファイルの変更を gpg web ドメインに対して許可します。"
+-msgstr "パブリックファイル転送サービスに使用されるパブリックファイルの変更を gpg web ドメインに対して許可します。"
++msgstr "gpg web ドメインがパブリックファイル転送サービスに使用されるパブリックファイルを変更することを許可します。"
  
 -#: booleans.py:63
 +#: booleans.py:65
  msgid "Allow gssd to read temp directory.  For access to kerberos tgt."
- msgstr "kerberos tgt にアクセスできるよう、 一時ディレクトリの読み取りを gssd に許可します。 "
+-msgstr "kerberos tgt にアクセスできるよう、 一時ディレクトリの読み取りを gssd に許可します。 "
++msgstr "gssd が kerberos tgt にアクセスするために、一時ディレクトリを読み取ることを許可します。"
  
 -#: booleans.py:64
 +#: booleans.py:66
  msgid "Allow guest to exec content"
 -msgstr ""
-+msgstr "guest がコンテンツを実行することを許可する"
++msgstr "ゲストがコンテンツを実行することを許可します。"
  
 -#: booleans.py:65
 +#: booleans.py:67
@@ -229091,7 +229122,7 @@ index 72ae12d..7b8f1c3 100644
  "Allow Apache to modify public files used for public file transfer services. "
  "Directories/Files must be labeled public_content_rw_t."
 -msgstr "パブリックファイル転送さービスに使用されるパブリックファイルの変更を Apache に対して許可します。 ディレクトリおよびファイルのラベルは labeled public_content_rw_t にしなければなりません。"
-+msgstr "パブリックファイル転送サービスに使用されるパブリックファイルの変更を Apache に対して許可します。 ディレクトリおよびファイルのラベルは public_content_rw_t にしなければなりません。"
++msgstr "Apache がパブリックファイル転送サービスに使用されるパブリックファイルを変更することを許可します。ディレクトリおよびファイルのラベルは public_content_rw_t にする必要があります。"
  
 -#: booleans.py:66
 +#: booleans.py:68
@@ -229118,120 +229149,141 @@ index 72ae12d..7b8f1c3 100644
 -#: booleans.py:70
 +#: booleans.py:72
 +msgid "Allow http daemon to connect to mythtv"
-+msgstr ""
++msgstr "HTTP デーモンが mythtv に接続することを許可します。"
 +
 +#: booleans.py:73
  msgid "Allow http daemon to connect to zabbix"
- msgstr "httpd デーモンが ZABBIX に接続することを許可します。"
+-msgstr "httpd デーモンが ZABBIX に接続することを許可します。"
++msgstr "HTTP デーモンが Zabbix に接続することを許可します。"
  
 -#: booleans.py:71
 +#: booleans.py:74
  msgid "Allow HTTPD scripts and modules to connect to the network using TCP."
- msgstr "httpd スクリプトとモジュールが TCP を使用するネットワークに接続することを許可します。"
+-msgstr "httpd スクリプトとモジュールが TCP を使用するネットワークに接続することを許可します。"
++msgstr "httpd のスクリプトとモジュールが TCP を使用するネットワークに接続することを許可します。"
  
 -#: booleans.py:72
 +#: booleans.py:75
  msgid ""
  "Allow HTTPD scripts and modules to connect to cobbler over the network."
- msgstr "HTTPD のスクリプトおよびもジュールにネットワーク経由での cobbler への接続を許可します。"
+-msgstr "HTTPD のスクリプトおよびもジュールにネットワーク経由での cobbler への接続を許可します。"
++msgstr "https のスクリプトとモジュールがネットワーク経由で cobbler に接続することを許可します。"
  
 -#: booleans.py:73
 +#: booleans.py:76
  msgid ""
  "Allow HTTPD scripts and modules to connect to databases over the network."
- msgstr "HTTPD のスクリプトおよびモジュールにネットワーク経由でのデータベースへの接続を許可します。"
+-msgstr "HTTPD のスクリプトおよびモジュールにネットワーク経由でのデータベースへの接続を許可します。"
++msgstr "httpd のスクリプトとモジュールがネットワーク経由でデータベースに接続することを許可します。"
  
 -#: booleans.py:74
 +#: booleans.py:77
  msgid "Allow httpd to connect to memcache server"
- msgstr "httpd が memcache サーバーに接続することを許可します"
+-msgstr "httpd が memcache サーバーに接続することを許可します"
++msgstr "httpd が memcache サーバーに接続することを許可します。"
  
 -#: booleans.py:75
 +#: booleans.py:78
  msgid "Allow httpd to act as a relay"
- msgstr "httpd がリレーとして動作することを許可します"
+-msgstr "httpd がリレーとして動作することを許可します"
++msgstr "httpd がリレーとして動作することを許可します。"
  
 -#: booleans.py:76
 +#: booleans.py:79
  msgid "Allow http daemon to send mail"
- msgstr "http デーモンがメールを送信することを許可します"
+-msgstr "http デーモンがメールを送信することを許可します"
++msgstr "HTTP デーモンがメールを送信することを許可します。"
  
 -#: booleans.py:77
 +#: booleans.py:80
  msgid "Allow Apache to communicate with avahi service via dbus"
- msgstr "dbus を使った avahi サービスとの通信を Apache に許可"
+-msgstr "dbus を使った avahi サービスとの通信を Apache に許可"
++msgstr "Apache が dbus 経由で avahi サービスと通信することを許可します。"
  
 -#: booleans.py:78
 +#: booleans.py:81
  msgid "Allow httpd cgi support"
- msgstr "httpd cgi サポートを許可"
+-msgstr "httpd cgi サポートを許可"
++msgstr "httpd cgi のサポートを許可します"
  
 -#: booleans.py:79
 +#: booleans.py:82
  msgid "Allow httpd to act as a FTP server by listening on the ftp port."
- msgstr "httpd に ftp ポートでのリスニングをさせることで FTP サーバーとして動作できるよう許可します。"
+-msgstr "httpd に ftp ポートでのリスニングをさせることで FTP サーバーとして動作できるよう許可します。"
++msgstr "httpd が FTP ポートをリッスンして FTP サーバーとして動作することを許可します。"
  
 -#: booleans.py:80
 +#: booleans.py:83
  msgid "Allow httpd to read home directories"
- msgstr "ホームディレクトリの読み取りを httpd に許可"
+-msgstr "ホームディレクトリの読み取りを httpd に許可"
++msgstr "httpd がホームディレクトリを読み取ることを許可します。"
  
 -#: booleans.py:81
 +#: booleans.py:84
  msgid "Allow httpd scripts and modules execmem/execstack"
- msgstr "httpd のスクリプトおよびモジュールによる execmem/execstack の実行を許可"
+-msgstr "httpd のスクリプトおよびモジュールによる execmem/execstack の実行を許可"
++msgstr "httpd のスクリプトとモジュールが execmem/execstack を実行することを許可します。"
  
 -#: booleans.py:82
 +#: booleans.py:85
  msgid "Allow HTTPD to connect to port 80 for graceful shutdown"
- msgstr "正しくシャットダウンするようポート 80 への HTTPD の接続を許可"
+-msgstr "正しくシャットダウンするようポート 80 への HTTPD の接続を許可"
++msgstr "HTTPD が正しくシャットダウンするよう 80 番ポートに接続することを許可します。"
  
 -#: booleans.py:83
 +#: booleans.py:86
  msgid "Allow httpd processes to manage IPA content"
- msgstr "IPA コンテンツの管理を httpd プロセスに許可"
+-msgstr "IPA コンテンツの管理を httpd プロセスに許可"
++msgstr "httpd プロセスが IPA コンテンツを管理することを許可します。"
  
 -#: booleans.py:84
 +#: booleans.py:87
  msgid "Allow Apache to use mod_auth_ntlm_winbind"
- msgstr "Apache が mod_auth_ntlm_winbind を使用することを許可します"
+-msgstr "Apache が mod_auth_ntlm_winbind を使用することを許可します"
++msgstr "Apache が mod_auth_ntlm_winbind を使用することを許可します。"
  
 -#: booleans.py:85
 +#: booleans.py:88
  msgid "Allow Apache to use mod_auth_pam"
- msgstr "Apache が mod_auth_pam を使用することを許可します"
+-msgstr "Apache が mod_auth_pam を使用することを許可します"
++msgstr "Apache が mod_auth_pam を使用することを許可します。"
  
 -#: booleans.py:86
 +#: booleans.py:89
  msgid "Allow httpd to read user content"
- msgstr "httpd がユーザーのコンテンツを読み取ることを許可します"
+-msgstr "httpd がユーザーのコンテンツを読み取ることを許可します"
++msgstr "httpd がユーザーのコンテンツを読み取ることを許可します。"
  
 -#: booleans.py:87
 +#: booleans.py:90
  msgid "Allow Apache to run in stickshift mode, not transition to passenger"
- msgstr "パッセンジャーに移行することなく、 Apache が stickshift モードで実行できるよう許可"
+-msgstr "パッセンジャーに移行することなく、 Apache が stickshift モードで実行できるよう許可"
++msgstr "Apache がパッセンジャーに移行することなく、stickshift モードで実行することを許可します。"
  
 -#: booleans.py:88
 +#: booleans.py:91
 +msgid "Allow HTTPD scripts and modules to server cobbler files."
-+msgstr "HTTPD スクリプトおよびモジュールが cobbler ファイルを処理することを許可します。"
++msgstr "HTTPD のスクリプトとモジュールが cobbler ファイルを処理することを許可します。"
 +
 +#: booleans.py:92
  msgid "Allow httpd daemon to change its resource limits"
- msgstr "httpd デーモンによるリソースの制限の変更を許可"
+-msgstr "httpd デーモンによるリソースの制限の変更を許可"
++msgstr "httpd デーモンがリソースの制限を変更することを許可します。"
  
 -#: booleans.py:89
 +#: booleans.py:93
  msgid ""
  "Allow HTTPD to run SSI executables in the same domain as system CGI scripts."
- msgstr "HTTPD にシステム CGI スクリプトと同じドメイン内での SSI 実行ファイルの実行を許可"
+-msgstr "HTTPD にシステム CGI スクリプトと同じドメイン内での SSI 実行ファイルの実行を許可"
++msgstr "HTTPD がシステム CGI スクリプトと同じドメイン内で SSI 実行ファイルを実行することを許可します。"
  
 -#: booleans.py:90
 +#: booleans.py:94
  msgid ""
  "Allow apache scripts to write to public content, directories/files must be "
  "labeled public_rw_content_t."
- msgstr "パブリックコンテンツへの書き込みを apache スクリプトに許可します。 ディレクトリおよびファイルのラベルは public_rw_content_t にする必要があります。"
+-msgstr "パブリックコンテンツへの書き込みを apache スクリプトに許可します。 ディレクトリおよびファイルのラベルは public_rw_content_t にする必要があります。"
++msgstr "Apache スクリプトがパブリックコンテンツに書き込むことを許可します。ディレクトリとファイルのラベルは public_rw_content_t にする必要があります。"
  
 -#: booleans.py:91
 +#: booleans.py:95
@@ -229295,14 +229347,15 @@ index 72ae12d..7b8f1c3 100644
 -
  #: booleans.py:103
 -msgid "Allow confined applications to run with kerberos."
+-msgstr ""
 +msgid "Allow httpd to connect to  sasl"
- msgstr ""
++msgstr "httpd が SASL に接続することを許可します。"
  
  #: booleans.py:104
 -msgid "Allow syslogd daemon to send mail"
 -msgstr "syslogd デーモンがメールを送信することを許可します。"
 +msgid "Allow Apache to query NS records"
-+msgstr "Apache が NS レコードを問い合わせることを許可する"
++msgstr "Apache が NS レコードを問い合わせることを許可します。"
  
  #: booleans.py:105
 -msgid "Allow syslogd the ability to read/write terminals"
@@ -229331,7 +229384,7 @@ index 72ae12d..7b8f1c3 100644
 -msgid "Allow mock to read files in home directories."
 -msgstr ""
 +msgid "Allow confined applications to run with kerberos."
-+msgstr "制限されたアプリケーションが Kerberos とともに動作することを許可する"
++msgstr "制限されたアプリケーションが Kerberos とともに動作することを許可します。"
  
  #: booleans.py:109
 -msgid "Allow the mount command to mount any directory or file."
@@ -229356,13 +229409,13 @@ index 72ae12d..7b8f1c3 100644
 -msgid "Allow confined web browsers to read home directory content"
 -msgstr ""
 +msgid "Allow syslogd the ability to read/write terminals"
-+msgstr "syslogd が端末を読み書きすることを許可する"
++msgstr "syslogd が端末を読み書きすることを許可します。"
  
  #: booleans.py:113
 -msgid "Allow mplayer executable stack"
 -msgstr "mplayer の実行ファイルスタックを許可する"
 +msgid "Allow logging in and using the system from /dev/console."
-+msgstr "/dev/console からログインしてシステムを使用することを許可する"
++msgstr "/dev/console からログインしてシステムを使用することを許可します。"
  
  #: booleans.py:114
 -msgid "Allow mysqld to connect to all ports"
@@ -229409,35 +229462,37 @@ index 72ae12d..7b8f1c3 100644
 -msgid "Allow system to run with NIS"
 -msgstr ""
 +msgid "Allow mock to read files in home directories."
-+msgstr "mock がホームディレクトリにあるファイルを読み込むことを許可する。"
++msgstr "mock がホームディレクトリにあるファイルを読み込むことを許可します。"
  
  #: booleans.py:121
 -msgid "Allow confined applications to use nscd shared memory."
+-msgstr ""
 +msgid "Allow the mount commands to mount any directory or file."
- msgstr ""
++msgstr "mount コマンドがあらゆるディレクトリとファイルをマウントすることを許可します。"
  
  #: booleans.py:122
 -msgid "Allow openshift to lockdown app"
 -msgstr ""
 +msgid "Allow mozilla plugin domain to connect to the network using TCP."
-+msgstr "mozilla プラグイン・ドメインが TCP を使用してネットワークに接続することを許可する。"
++msgstr "Mozilla プラグインが TCP を使用してネットワークに接続することを許可します。"
  
  #: booleans.py:123
 -msgid "Allow openvpn to read home directories"
 -msgstr "OpenVPN がホームディレクトリーを読み込むことを許可する"
 +msgid "Allow mozilla plugin to support GPS."
-+msgstr ""
++msgstr "Mozilla プラグインが GPS をサポートすることを許可します。"
  
  #: booleans.py:124
 -msgid "Allow piranha-lvs domain to connect to the network using TCP."
+-msgstr ""
 +msgid "Allow mozilla plugin to support spice protocols."
- msgstr ""
++msgstr "Mozilla プラグインが SPICE プロトコルをサポートすることを許可します。"
  
  #: booleans.py:125
 -msgid "Allow polipo to connect to all ports > 1023"
 -msgstr "polipo がすべてのポート > 1023 に接続することを許可する"
 +msgid "Allow confined web browsers to read home directory content"
-+msgstr "制限された Web ブラウザーがホームディレクトリのコンテンツを読み取ることを許可する"
++msgstr "制限された Web ブラウザーがホームディレクトリのコンテンツを読み取ることを許可します。"
  
  #: booleans.py:126
 -msgid ""
@@ -229491,13 +229546,13 @@ index 72ae12d..7b8f1c3 100644
 -msgid "Allow transmit client label to foreign database"
 -msgstr "異種のデータベースへのクライアントラベルの移行を許可"
 +msgid "Allow any files/directories to be exported read/only via NFS."
-+msgstr "あらゆるファイル/ディレクトリが NFS 経由で読み込み専用としてエクスポートされることを許可する"
++msgstr "あらゆるファイルとディレクトリが NFS 経由で読み取り専用としてエクスポートされることを許可します。"
  
  #: booleans.py:134
 -msgid "Allow database admins to execute DML statement"
 -msgstr "データベース管理者が DML 文を実行することを許可します"
 +msgid "Allow any files/directories to be exported read/write via NFS."
-+msgstr "あらゆるファイル/ディレクトリが NFS 経由で読み書き用としてエクスポートされることを許可する"
++msgstr "あらゆるファイルとディレクトリが NFS 経由で読み書き用としてエクスポートされることを許可します。"
  
  #: booleans.py:135
 -msgid "Allow unprivileged users to execute DDL statement"
@@ -229505,26 +229560,26 @@ index 72ae12d..7b8f1c3 100644
 +msgid ""
 +"Allow nfs servers to modify public files used for public file transfer "
 +"services.  Files/Directories must be labeled public_content_rw_t."
-+msgstr "NFS サーバーがパブリックなファイル転送サービス向けに使用されるパブリックなファイルを変更することを許可する。ファイル/ディレクトリは public_content_rw_t のラベルが付けられている必要があります。"
++msgstr "NFS サーバーがパブリックなファイル転送サービスに使用されるパブリックなファイルを変更することを許可します。ファイルとディレクトリは public_content_rw_t のラベルが付けられている必要があります。"
  
  #: booleans.py:136
 -msgid "Allow pppd to load kernel modules for certain modems"
 -msgstr "特定モデム用にカーネルモジュールのロードを pppd に許可"
 +msgid "Allow system to run with NIS"
-+msgstr "システムが NIS を使用することを許可する"
++msgstr "システムが NIS を使用することを許可します。"
  
  #: booleans.py:137
 -msgid "Allow pppd to be run for a regular user"
 -msgstr "普通のユーザー用に pppd の稼働を許可する"
 +msgid "Allow confined applications to use nscd shared memory."
-+msgstr "制限されたアプリケーションが NSCD 共有メモリーを使用することを許可する。"
++msgstr "制限されたアプリケーションが NSCD 共有メモリーを使用することを許可します。"
  
  #: booleans.py:138
 -msgid ""
 -"Allow privoxy to connect to all ports, not just HTTP, FTP, and Gopher ports."
 -msgstr "HTTP、 FTP、 Gopher などのポートだけでなくすべてのポートへの接続を privoxy に許可します。"
 +msgid "Allow openshift to lockdown app"
-+msgstr "OpenShift がアプリケーションをロックダウンすることを許可する"
++msgstr "OpenShift がアプリケーションをロックダウンすることを許可します。"
  
  #: booleans.py:139
 -msgid "Allow Puppet client to manage all file types."
@@ -229536,13 +229591,13 @@ index 72ae12d..7b8f1c3 100644
 -msgid "Allow Puppet master to use connect to MySQL and PostgreSQL database"
 -msgstr "MySQL および PostgreSQL データベースへの接続を Puppet マスターに許可"
 +msgid "Allow piranha-lvs domain to connect to the network using TCP."
-+msgstr "piranha-lvs ドメインが TCP を使用してネットワークに接続することを許可する。"
++msgstr "piranha-lvs ドメインが TCP を使用してネットワークに接続することを許可します。"
  
  #: booleans.py:141
 -msgid "Allow racoon to read shadow"
 -msgstr "racoon がシャドウを読み込むことを許可します。"
 +msgid "Allow polipo to connect to all ports > 1023"
-+msgstr "polipo がすべてのポート > 1023 に接続することを許可する"
++msgstr "polipo がすべてのポート > 1023 に接続することを許可します。"
  
  #: booleans.py:142
 -msgid "Allow rgmanager domain to connect to the network using TCP."
@@ -229550,53 +229605,65 @@ index 72ae12d..7b8f1c3 100644
 +msgid ""
 +"Determine whether Polipo session daemon can bind tcp sockets to all "
 +"unreserved ports."
-+msgstr "Polipo セッションデーモンが TCP ソケットをすべての非予約ポートにバインドできるかどうかを決める。"
++msgstr "Polipo セッションデーモンが TCP ソケットをすべての非予約ポートにバインドできるかどうかを指定します。"
  
  #: booleans.py:143
  msgid ""
+-"Allow rsync to modify public files used for public file transfer services.  "
+-"Files/Directories must be labeled public_content_rw_t."
+-msgstr "パブリックファイル転送サービスに使用するパブリックファイルの変更を rsync に対して許可します。 ファイルおよびディレクトリのラベルはpublic_content_rw_t でなければなりません。"
+-
 +"Determine whether calling user domains can execute Polipo daemon in the "
 +"polipo_session_t domain."
-+msgstr "呼び出しているユーザードメインが polipo_session_t ドメインにおいて Polipo デーモンを実行できるかどうかを決める。"
++msgstr "呼び出しているユーザードメインが polipo_session_t ドメインにおいて Polipo デーモンを実行できるかどうかを指定します。"
 +
-+#: booleans.py:144
+ #: booleans.py:144
+-msgid "Allow rsync to run as a client"
+-msgstr "rsync がクライアントとして実行することを許可します。"
 +msgid "Determine whether polipo can access cifs file systems."
-+msgstr "Polipo が CIFS ファイルシステムにアクセスできるかどうかを決める。"
-+
-+#: booleans.py:145
++msgstr "Polipo が CIFS ファイルシステムにアクセスできるかどうかを指定します。"
+ 
+ #: booleans.py:145
+-msgid "Allow rsync to export any files/directories read only."
+-msgstr "rsync がすべてのファイル・ディレクトリーを読み込み専用でエクスポートすることを許可します。"
 +msgid "Determine whether Polipo can access nfs file systems."
-+msgstr "Polipo が NFS ファイルシステムにアクセスできるかどうかを決める。"
-+
-+#: booleans.py:146
++msgstr "Polipo が NFS ファイルシステムにアクセスできるかどうかを指定します。"
+ 
+ #: booleans.py:146
+-msgid "Allow rsync servers to share cifs files systems"
+-msgstr "rsync サーバーが CIFS ファイルシステムを共有することを許可します。"
 +msgid "Enable polyinstantiated directory support."
 +msgstr "polyinstantiated ディレクトリーのサポートを有効化します。"
-+
-+#: booleans.py:147
+ 
+ #: booleans.py:147
+-msgid "Allow rsync servers to share nfs files systems"
+-msgstr "rsync サーバーが NFS ファイルシステムを共有することを許可します。"
 +msgid "Allow postfix_local domain full write access to mail_spool directories"
-+msgstr "postfix_local ドメインが mail_spool ディレクトリーに完全なアクセス権を持つことを許可する"
-+
-+#: booleans.py:148
++msgstr "postfix_local ドメインが mail_spool ディレクトリーに完全なアクセス権を持つことを許可します。"
+ 
+ #: booleans.py:148
 +msgid "Allow postgresql to use ssh and rsync for point-in-time recovery"
-+msgstr "point-in-time リカバリに ssh と rsync の使用を postgresql に許可"
++msgstr "PostgreSQL がポイントインタイムリカバリに ssh と rsync を使用することを許可します。"
 +
 +#: booleans.py:149
 +msgid "Allow transmit client label to foreign database"
-+msgstr "異種のデータベースへのクライアントラベルの移行を許可"
++msgstr "異種のデータベースにクライアントラベルを移行することを許可します。"
 +
 +#: booleans.py:150
 +msgid "Allow database admins to execute DML statement"
-+msgstr "データベース管理者が DML 文を実行することを許可します"
++msgstr "データベース管理者が DML 文を実行することを許可します。"
 +
 +#: booleans.py:151
 +msgid "Allow unprivileged users to execute DDL statement"
-+msgstr "非特権ユーザーが DDL 文を実行することを許可します"
++msgstr "非特権ユーザーが DDL 文を実行することを許可します。"
 +
 +#: booleans.py:152
 +msgid "Allow pppd to load kernel modules for certain modems"
-+msgstr "特定モデム用にカーネルモジュールのロードを pppd に許可"
++msgstr "pppd が特定モデム用にカーネルモジュールのロードを許可します。"
 +
 +#: booleans.py:153
 +msgid "Allow pppd to be run for a regular user"
-+msgstr "普通のユーザー用に pppd の稼働を許可する"
++msgstr "pppd が通常のユーザー用に実行されることを許可します。"
 +
 +#: booleans.py:154
 +msgid "Determine whether privoxy can connect to all tcp ports."
@@ -229605,7 +229672,7 @@ index 72ae12d..7b8f1c3 100644
 +#: booleans.py:155
 +msgid ""
 +"Permit to prosody to bind apache port. Need to be activated to use BOSH."
-+msgstr ""
++msgstr "prosody が Apache のポートに接続することを許可します。BOSH の使用を有効化する必要があります。"
 +
 +#: booleans.py:156
 +msgid "Allow Puppet client to manage all file types."
@@ -229613,40 +229680,30 @@ index 72ae12d..7b8f1c3 100644
 +
 +#: booleans.py:157
 +msgid "Allow Puppet master to use connect to MySQL and PostgreSQL database"
-+msgstr "MySQL および PostgreSQL データベースへの接続を Puppet マスターに許可"
++msgstr "Puppet マスターが MySQL および PostgreSQL データベースに接続することを許可します。"
 +
 +#: booleans.py:158
 +msgid "Allow racoon to read shadow"
-+msgstr "racoon がシャドウを読み込むことを許可します。"
++msgstr "racoon が shadow を読み取ることを許可します。"
 +
 +#: booleans.py:159
 +msgid ""
- "Allow rsync to modify public files used for public file transfer services.  "
- "Files/Directories must be labeled public_content_rw_t."
- msgstr "パブリックファイル転送サービスに使用するパブリックファイルの変更を rsync に対して許可します。 ファイルおよびディレクトリのラベルはpublic_content_rw_t でなければなりません。"
- 
--#: booleans.py:144
++"Allow rsync to modify public files used for public file transfer services.  "
++"Files/Directories must be labeled public_content_rw_t."
++msgstr "rsync がパブリックファイル転送サービスに使用するパブリックファイルを変更することを許可します。ファイルとディレクトリのラベルは public_content_rw_t にする必要があります。"
++
 +#: booleans.py:160
- msgid "Allow rsync to run as a client"
- msgstr "rsync がクライアントとして実行することを許可します。"
- 
--#: booleans.py:145
++msgid "Allow rsync to run as a client"
++msgstr "rsync がクライアントとして動作することを許可します。"
++
 +#: booleans.py:161
- msgid "Allow rsync to export any files/directories read only."
- msgstr "rsync がすべてのファイル・ディレクトリーを読み込み専用でエクスポートすることを許可します。"
- 
--#: booleans.py:146
--msgid "Allow rsync servers to share cifs files systems"
--msgstr "rsync サーバーが CIFS ファイルシステムを共有することを許可します。"
--
--#: booleans.py:147
--msgid "Allow rsync servers to share nfs files systems"
--msgstr "rsync サーバーが NFS ファイルシステムを共有することを許可します。"
++msgid "Allow rsync to export any files/directories read only."
++msgstr "rsync がすべてのファイル・ディレクトリーを読み取り専用でエクスポートすることを許可します。"
++
 +#: booleans.py:162
 +msgid "Allow rsync server to manage all files/directories on the system."
 +msgstr "rsync サーバーがシステムにあるすべてのファイルやディレクトリを管理することを許可します。"
- 
--#: booleans.py:148
++
 +#: booleans.py:163
  msgid "Allow samba to create new home directories (e.g. via PAM)"
  msgstr "Samba が新しいホームディレクトリーを作成すること (例: PAM 経由) を許可します。"
@@ -229666,12 +229723,14 @@ index 72ae12d..7b8f1c3 100644
 -#: booleans.py:151
 +#: booleans.py:166
  msgid "Allow samba to share any file/directory read only."
- msgstr "Samba がすべてのファイル・ディレクトリーを読み込み専用で共有することを許可します。"
+-msgstr "Samba がすべてのファイル・ディレクトリーを読み込み専用で共有することを許可します。"
++msgstr "Samba がすべてのファイルとディレクトリーを読み取り専用で共有することを許可します。"
  
 -#: booleans.py:152
 +#: booleans.py:167
  msgid "Allow samba to share any file/directory read/write."
- msgstr "Samba がすべてのファイル・ディレクトリーを読み書き可能で共有することを許可します。"
+-msgstr "Samba がすべてのファイル・ディレクトリーを読み書き可能で共有することを許可します。"
++msgstr "Samba がすべてのファイルとディレクトリーを読み書き可能で共有することを許可します。"
  
 -#: booleans.py:153
 +#: booleans.py:168
@@ -229681,12 +229740,13 @@ index 72ae12d..7b8f1c3 100644
 -#: booleans.py:154
 +#: booleans.py:169
  msgid "Allow samba to run unconfined scripts"
- msgstr "制限のないスクリプトの実行を samba に許可"
- 
+-msgstr "制限のないスクリプトの実行を samba に許可"
+-
 -#: booleans.py:155
 -msgid "Allow samba to export ntfs/fusefs volumes."
 -msgstr "Samba が ntfs/fusefs ボリュームをエクスポートすることを許可します。"
--
++msgstr "Samba が制限のないスクリプトを実行することを許可します。"
+ 
 -#: booleans.py:156
 +#: booleans.py:171
  msgid "Allow samba to export NFS volumes."
@@ -229695,7 +229755,8 @@ index 72ae12d..7b8f1c3 100644
 -#: booleans.py:157
 +#: booleans.py:172
  msgid "Allow sanlock to read/write fuse files"
- msgstr "fuse ファイルの読み取りと書き込みを sanlock に許可"
+-msgstr "fuse ファイルの読み取りと書き込みを sanlock に許可"
++msgstr "sanlock が fuse ファイルを読み書きすることを許可します。"
  
 -#: booleans.py:158
 +#: booleans.py:173
@@ -229710,25 +229771,28 @@ index 72ae12d..7b8f1c3 100644
 -#: booleans.py:160
 +#: booleans.py:175
  msgid "Allow sasl to read shadow"
- msgstr "シャドーの読み取りを sasl に許可"
+-msgstr "シャドーの読み取りを sasl に許可"
++msgstr "SASL が shadow を読み取ることを許可します。"
  
 -#: booleans.py:161
 +#: booleans.py:176
  msgid "Allow secadm to exec content"
 -msgstr ""
-+msgstr "secadm がコンテンツを実行することを許可する"
++msgstr "secadm がコンテンツを実行することを許可します。"
  
 -#: booleans.py:162
 +#: booleans.py:177
  msgid ""
  "disallow programs, such as newrole, from transitioning to administrative "
  "user domains."
- msgstr "newrole などのプログラムの管理ユーザードメインへの移行を許可しない"
+-msgstr "newrole などのプログラムの管理ユーザードメインへの移行を許可しない"
++msgstr "newrole などのプログラムの管理ユーザードメインへの移行を許可しません。"
  
 -#: booleans.py:163
 +#: booleans.py:178
  msgid "Disable kernel module loading."
- msgstr "カーネルモジュールの読み込みを無効化する。"
+-msgstr "カーネルモジュールの読み込みを無効化する。"
++msgstr "カーネルモジュールの読み取りを無効化します。"
  
 -#: booleans.py:164
 +#: booleans.py:179
@@ -229741,7 +229805,8 @@ index 72ae12d..7b8f1c3 100644
 -#: booleans.py:165
 +#: booleans.py:180
  msgid "Allow regular users direct dri device access"
- msgstr "普通のユーザーによる dri デバイスへの直接アクセスを許可"
+-msgstr "普通のユーザーによる dri デバイスへの直接アクセスを許可"
++msgstr "通常のユーザーが dri デバイスに直接アクセスすることを許可します。"
  
 -#: booleans.py:166
 +#: booleans.py:181
@@ -229749,14 +229814,16 @@ index 72ae12d..7b8f1c3 100644
  "Allow unconfined executables to make their heap memory executable.  Doing "
  "this is a really bad idea. Probably indicates a badly coded executable, but "
  "could indicate an attack. This executable should be reported in bugzilla"
- msgstr "heap メモリーを実行可能にするために制限の内実行ファイルを許可します。 この設定はお奨めできません。 おそらく、 不適切にコード化された実行ファイルを示しますが、 攻撃を示す場合もあります。 この実行ファイルは Bugzilla に報告してください。"
+-msgstr "heap メモリーを実行可能にするために制限の内実行ファイルを許可します。 この設定はお奨めできません。 おそらく、 不適切にコード化された実行ファイルを示しますが、 攻撃を示す場合もあります。 この実行ファイルは Bugzilla に報告してください。"
++msgstr "heap メモリーを実行可能にするために制限されない実行ファイルを許可します。 この設定はお奨めできません。 おそらく、 不適切にコード化された実行ファイルを示しますが、 攻撃を示す場合もあります。 この実行ファイルは Bugzilla に報告してください。"
  
 -#: booleans.py:167
 +#: booleans.py:182
  msgid ""
  "Allow all unconfined executables to use libraries requiring text relocation "
  "that are not labeled textrel_shlib_t"
- msgstr "textrel_shlib_t のラベル付けがされていないテキストの移動に必要なライブラリを使用できるよう制限のない実行ファイルをすべて許可"
+-msgstr "textrel_shlib_t のラベル付けがされていないテキストの移動に必要なライブラリを使用できるよう制限のない実行ファイルをすべて許可"
++msgstr "textrel_shlib_t のラベル付けがされていないテキストの移動に必要なライブラリを使用できるよう制限のない実行ファイルをすべて許可します。"
  
 -#: booleans.py:168
 +#: booleans.py:183
@@ -229765,12 +229832,13 @@ index 72ae12d..7b8f1c3 100644
  "never, ever be necessary. Probably indicates a badly coded executable, but "
  "could indicate an attack. This executable should be reported in bugzilla"
 -msgstr ""
-+msgstr "制限された実行ファイルがこれらのスタックを実行可能にすることを許可する。これは推奨できません。おそらく、不適切にコード化された実行ファイルを意味しますが、攻撃を意味する場合もあります。この実行ファイルは Bugzilla に報告してください。"
++msgstr "制限された実行ファイルがこれらのスタックを実行可能にすることを許可します。これは推奨できません。おそらく、不適切にコード化された実行ファイルを意味しますが、攻撃を意味する場合もあります。この実行ファイルは Bugzilla に報告してください。"
  
 -#: booleans.py:169
 +#: booleans.py:184
  msgid "Allow users to connect to the local mysql server"
- msgstr "ユーザーがローカルの MySQL サーバーに接続することを許可する"
+-msgstr "ユーザーがローカルの MySQL サーバーに接続することを許可する"
++msgstr "ユーザーがローカルの MySQL サーバーに接続することを許可します。"
  
 -#: booleans.py:170
 +#: booleans.py:185
@@ -229778,12 +229846,13 @@ index 72ae12d..7b8f1c3 100644
  "Allow confined users the ability to execute the ping and traceroute "
  "commands."
 -msgstr ""
-+msgstr "制限されたユーザーが ping および traceroute コマンドを実行することを許可する。"
++msgstr "制限されたユーザーが ping および traceroute コマンドを実行することを許可します。"
  
 -#: booleans.py:171
 +#: booleans.py:186
  msgid "Allow users to connect to PostgreSQL"
- msgstr "ユーザーが PostgreSQL に接続することを許可する"
+-msgstr "ユーザーが PostgreSQL に接続することを許可する"
++msgstr "ユーザーが PostgreSQL に接続することを許可します。"
  
 -#: booleans.py:172
 +#: booleans.py:187
@@ -229791,12 +229860,12 @@ index 72ae12d..7b8f1c3 100644
  "Allow user to r/w files on filesystems that do not have extended attributes "
  "(FAT, CDROM, FLOPPY)"
 -msgstr ""
-+msgstr "ユーザーが拡張属性 (FAT, CDROM, FLOPPY) を持たないファイルシステムにおいてファイルを読み書きすることを許可する。"
++msgstr "ユーザーが拡張属性 (FAT, CDROM, FLOPPY) を持たないファイルシステムにおいてファイルを読み書きすることを許可します。"
  
 -#: booleans.py:173
 +#: booleans.py:188
 +msgid "Allow user music sharing"
-+msgstr "ユーザーがミュージックを共有することを許可する"
++msgstr "ユーザーがミュージックを共有することを許可します。"
 +
 +#: booleans.py:189
  msgid ""
@@ -229804,7 +229873,7 @@ index 72ae12d..7b8f1c3 100644
  " same domain and outside users)  disabling this forces FTP passive mode and "
  "may change other protocols."
 -msgstr ""
-+msgstr "ユーザーが TCP サーバー (ポートをバインドし、同じドメインと外部のユーザーからの接続を受け付ける) を実行することを許可する。これは強制的に FTP パッシブモードに設定し、他のプロトコルを変更する可能性があります。"
++msgstr "ユーザーが TCP サーバー (ポートをバインドし、同じドメインと外部のユーザーからの接続を受け付ける) を実行することを許可します。これは強制的に FTP パッシブモードに設定し、他のプロトコルを変更する可能性があります。"
  
 -#: booleans.py:174
 +#: booleans.py:190
@@ -229814,7 +229883,7 @@ index 72ae12d..7b8f1c3 100644
 -#: booleans.py:175
 -msgid "Allow user music sharing"
 -msgstr "ユーザーがミュージックを共有することを許可する"
-+msgstr "ユーザーが SSH chroot 環境を使用することを許可する。"
++msgstr "ユーザーが SSH chroot 環境を使用することを許可します。"
  
 -#: booleans.py:176
 +#: booleans.py:191
@@ -229857,12 +229926,13 @@ index 72ae12d..7b8f1c3 100644
 +#: booleans.py:195
  msgid "Allow sge to connect to the network using any TCP port"
 -msgstr ""
-+msgstr "sge がすべての TCP ポートを使用してネットワークに接続することを許可する"
++msgstr "sge がすべての TCP ポートを使用してネットワークに接続することを許可します。"
  
 -#: booleans.py:181
 +#: booleans.py:196
  msgid "Allow sge to access nfs file systems."
- msgstr "sge が NFS ファイルシステムにアクセスすることを許可します"
+-msgstr "sge が NFS ファイルシステムにアクセスすることを許可します"
++msgstr "sge が NFS ファイルシステムにアクセスすることを許可します。"
  
 -#: booleans.py:182
 -msgid ""
@@ -229879,7 +229949,7 @@ index 72ae12d..7b8f1c3 100644
  "Allow samba to modify public files used for public file transfer services.  "
  "Files/Directories must be labeled public_content_rw_t."
 -msgstr ""
-+msgstr "Samba がパブリックなファイル転送サービス向けに使用されるパブリックなファイルを変更することを許可する。ファイル/ディレクトリが public_content_rw_t というラベルが付けられている必要があります。"
++msgstr "Samba がパブリックなファイル転送サービス向けに使用されるパブリックなファイルを変更することを許可します。ファイル/ディレクトリが public_content_rw_t というラベルが付けられている必要があります。"
  
 -#: booleans.py:184
 +#: booleans.py:199
@@ -229889,7 +229959,8 @@ index 72ae12d..7b8f1c3 100644
 -#: booleans.py:185
 +#: booleans.py:200
  msgid "Allow spamd to read/write user home directories."
- msgstr "spamd がユーザーのホームディレクトリーを読み書きすることを許可します"
+-msgstr "spamd がユーザーのホームディレクトリーを読み書きすることを許可します"
++msgstr "spamd がユーザーのホームディレクトリーを読み書きすることを許可します。"
  
 -#: booleans.py:186
 -msgid ""
@@ -229912,65 +229983,68 @@ index 72ae12d..7b8f1c3 100644
  "Allow ssh with chroot env to read and write files in the user home "
  "directories"
 -msgstr ""
-+msgstr "chroot 環境の SSH がユーザーのホームディレクトリにあるファイルを読み書きすることを許可する。"
++msgstr "chroot 環境の SSH がユーザーのホームディレクトリにあるファイルを読み書きすることを許可します。"
  
 -#: booleans.py:189
 +#: booleans.py:204
  msgid "allow host key based authentication"
- msgstr "ホスト鍵による認証を許可する"
+-msgstr "ホスト鍵による認証を許可する"
++msgstr "ホスト鍵による認証を許可します。"
  
 -#: booleans.py:190
 +#: booleans.py:205
  msgid "Allow ssh logins as sysadm_r:sysadm_t"
- msgstr "sysadm_r:sysadm_t としての ssh ログインを許可する"
+-msgstr "sysadm_r:sysadm_t としての ssh ログインを許可する"
++msgstr "sysadm_r:sysadm_t としての ssh ログインを許可します。"
  
 -#: booleans.py:191
 +#: booleans.py:206
  msgid "Allow staff to exec content"
 -msgstr ""
-+msgstr "staff がコンテンツを実行することを許可する"
++msgstr "スタッフがコンテンツを実行することを許可します。"
  
 -#: booleans.py:192
 +#: booleans.py:207
  msgid "allow staff user to create and transition to svirt domains."
 -msgstr ""
-+msgstr "staff ユーザーが sVirt ドメインを作成、またはそれに変換することを許可する。"
++msgstr "staff ユーザーが sVirt ドメインを作成、またはそれに変換することを許可します。"
  
 -#: booleans.py:193
 +#: booleans.py:208
  msgid "Allow sysadm to exec content"
 -msgstr ""
-+msgstr "sysadm がコンテンツを実行することを許可する"
++msgstr "sysadm がコンテンツを実行することを許可します。"
  
 -#: booleans.py:194
 +#: booleans.py:209
  msgid ""
  "Allow the Telepathy connection managers to connect to any network port."
 -msgstr ""
-+msgstr "Telepathy 接続マネージャーがすべてのネットワークポートに接続することを許可する。"
++msgstr "Telepathy 接続マネージャーがすべてのネットワークポートに接続することを許可します。"
  
 -#: booleans.py:195
 +#: booleans.py:210
  msgid ""
  "Allow the Telepathy connection managers to connect to any generic TCP port."
-+msgstr "Telepathy 接続マネージャーがすべての一般的な TCP ポートに接続することを許可する。"
-+
-+#: booleans.py:211
-+msgid "Allow testpolicy to exec content"
- msgstr ""
+-msgstr ""
++msgstr "Telepathy 接続マネージャーがすべての一般的な TCP ポートに接続することを許可します。"
  
 -#: booleans.py:196
++#: booleans.py:211
++msgid "Allow testpolicy to exec content"
++msgstr "testpolicy がコンテンツを実行することを許可します。"
++
 +#: booleans.py:212
  msgid ""
  "Allow tftp to modify public files used for public file transfer services."
 -msgstr ""
-+msgstr "tftp がパブリックなファイル転送サービス向けにパブリックなファイルを変更することを許可する。"
++msgstr "tftp がパブリックなファイル転送サービス向けにパブリックなファイルを変更することを許可します。"
  
 -#: booleans.py:197
 +#: booleans.py:213
  msgid "Allow tftp to read and write files in the user home directories"
 -msgstr ""
-+msgstr "tftp がユーザーのホームディレクトリにあるファイルを読み書きすることを許可する"
++msgstr "tftp がユーザーのホームディレクトリにあるファイルを読み書きすることを許可します。"
  
 -#: booleans.py:198
 -msgid "Allow tor daemon to bind tcp sockets to all unreserved ports."
@@ -229983,7 +230057,7 @@ index 72ae12d..7b8f1c3 100644
 +#: booleans.py:215
  msgid "Allow tor to act as a relay"
 -msgstr ""
-+msgstr "Tor がリレーとして動作することを許可する"
++msgstr "Tor がリレーとして動作することを許可します。"
  
 -#: booleans.py:200
 +#: booleans.py:216
@@ -229991,13 +230065,13 @@ index 72ae12d..7b8f1c3 100644
  "allow unconfined users to transition to the chrome sandbox domains when "
  "running chrome-sandbox"
 -msgstr ""
-+msgstr "制限されていないユーザーが chrome-sandbox を実行しているとき chrome sandbox ドメインに移行することを許可する。"
++msgstr "制限されていないユーザーが chrome-sandbox を実行しているとき chrome sandbox ドメインに移行することを許可します。"
  
 -#: booleans.py:201
 +#: booleans.py:217
  msgid "Allow a user to login as an unconfined domain"
 -msgstr ""
-+msgstr "ユーザーが制限されたドメインとしてログインすることを許可する"
++msgstr "ユーザーが制限されたドメインとしてログインすることを許可します。"
  
 -#: booleans.py:202
 +#: booleans.py:218
@@ -230009,7 +230083,7 @@ index 72ae12d..7b8f1c3 100644
 -#: booleans.py:203
 -msgid "Allow video playing tools to run unconfined"
 -msgstr "ビデオ再生ツールが制限されずに実行することを許可します。"
-+msgstr "制限されたユーザーが running xulrunner plugin-container を実行するとき、Mozilla プラグインのドメインに移行することを許可する。"
++msgstr "制限されたユーザーが running xulrunner plugin-container を実行するとき、Mozilla プラグインのドメインに移行することを許可します。"
  
 -#: booleans.py:204
 +#: booleans.py:219
@@ -230019,12 +230093,14 @@ index 72ae12d..7b8f1c3 100644
 -#: booleans.py:205
 +#: booleans.py:220
  msgid "Support ecryptfs home directories"
- msgstr "ecryptfs ホームディレクトリーをサポートします"
+-msgstr "ecryptfs ホームディレクトリーをサポートします"
++msgstr "ecryptfs ホームディレクトリーをサポートします。"
  
 -#: booleans.py:206
 +#: booleans.py:221
  msgid "Support fusefs home directories"
- msgstr "fusefs ホームディレクトリーをサポートします"
+-msgstr "fusefs ホームディレクトリーをサポートします"
++msgstr "fusefs ホームディレクトリーをサポートします。"
  
 -#: booleans.py:207
 -msgid "Use lpd server instead of cups"
@@ -230036,18 +230112,20 @@ index 72ae12d..7b8f1c3 100644
 -#: booleans.py:208
 +#: booleans.py:223
  msgid "Support NFS home directories"
- msgstr "NFS ホームディレクトリーをサポートします"
+-msgstr "NFS ホームディレクトリーをサポートします"
++msgstr "NFS ホームディレクトリーをサポートします。"
  
 -#: booleans.py:209
 +#: booleans.py:224
  msgid "Support SAMBA home directories"
- msgstr "Samba ホームディレクトリーをサポートします"
+-msgstr "Samba ホームディレクトリーをサポートします"
++msgstr "Samba ホームディレクトリーをサポートします。"
  
 -#: booleans.py:210
 +#: booleans.py:225
  msgid "Allow user to exec content"
 -msgstr ""
-+msgstr "user がコンテンツを実行することを許可する"
++msgstr "ユーザーがコンテンツを実行することを許可します。"
  
 -#: booleans.py:211
 -msgid "Allow varnishd to connect to all ports, not just HTTP."
@@ -230070,103 +230148,109 @@ index 72ae12d..7b8f1c3 100644
  msgid ""
  "Allow confined virtual guests to use serial/parallel communication ports"
 -msgstr ""
-+msgstr "制限された仮想マシンがシリアル/パラレル通信ポートを使用することを許可する"
++msgstr "制限された仮想マシンがシリアル/パラレル通信ポートを使用することを許可します。"
  
 -#: booleans.py:214
 +#: booleans.py:229
  msgid ""
  "Allow confined virtual guests to use executable memory and executable stack"
 -msgstr ""
-+msgstr "制限された仮想マシンが実行可能なメモリおよび実行可能なスタックを使用することを許可する"
++msgstr "制限された仮想マシンが実行可能なメモリおよび実行可能なスタックを使用することを許可します。"
  
 -#: booleans.py:215
 +#: booleans.py:230
  msgid "Allow confined virtual guests to read fuse files"
 -msgstr ""
-+msgstr "制限された仮想マシンが FUSE ファイルを読み込むことを許可する"
++msgstr "制限された仮想マシンが FUSE ファイルを読み込むことを許可します。"
  
 -#: booleans.py:216
 +#: booleans.py:231
  msgid "Allow confined virtual guests to manage nfs files"
 -msgstr ""
-+msgstr "制限された仮想マシンが NFS ファイルを管理することを許可する"
++msgstr "制限された仮想マシンが NFS ファイルを管理することを許可します。"
  
 -#: booleans.py:217
 +#: booleans.py:232
  msgid "Allow confined virtual guests to interact with rawip sockets"
 -msgstr ""
-+msgstr "制限された仮想マシンが rawip ソケットと通信することを許可する"
++msgstr "制限された仮想マシンが rawip ソケットと通信することを許可します。"
  
 -#: booleans.py:218
 +#: booleans.py:233
  msgid "Allow confined virtual guests to manage cifs files"
 -msgstr ""
-+msgstr "制限された仮想マシンが CIFS ファイルを管理することを許可する"
++msgstr "制限された仮想マシンが CIFS ファイルを管理することを許可します。"
  
 -#: booleans.py:219
 +#: booleans.py:234
  msgid "Allow confined virtual guests to interact with the sanlock"
 -msgstr ""
-+msgstr "制限された仮想マシンが sanlock と通信することを許可する"
- 
+-
 -#: booleans.py:220
 -msgid "Allow confined virtual guests to manage device configuration, (pci)"
 -msgstr ""
--
++msgstr "制限された仮想マシンが sanlock と通信することを許可します。"
+ 
 -#: booleans.py:221
 +#: booleans.py:235
  msgid "Allow confined virtual guests to use usb devices"
- msgstr "仮想マシンが USB デバイスを使用することを許可する"
+-msgstr "仮想マシンが USB デバイスを使用することを許可する"
++msgstr "仮想マシンが USB デバイスを使用することを許可します。"
  
 -#: booleans.py:222
 +#: booleans.py:236
  msgid "Allow confined virtual guests to interact with the xserver"
- msgstr "仮想マシンが X サーバーと通信することを許可する"
- 
+-msgstr "仮想マシンが X サーバーと通信することを許可する"
+-
 -#: booleans.py:223
 -msgid "Allow webadm to manage files in users home directories"
 -msgstr "Web 管理者がユーザーのホームディレクトリーにあるファイルを管理することを許可する"
-+#: booleans.py:237
-+msgid "Determine whether webadm can manage generic user files."
-+msgstr "webadm が一般的なユーザーファイルを管理できるかどうかを指定します。"
++msgstr "仮想マシンが X サーバーと通信することを許可します。"
  
 -#: booleans.py:224
 -msgid "Allow webadm to read files in users home directories"
 -msgstr "Web 管理者がユーザーのホームディレクトリーにあるファイルを読み取るすることを許可する"
-+#: booleans.py:238
-+msgid "Determine whether webadm can read generic user files."
-+msgstr "webadm が一般的なユーザーファイルを読み込めるかどうかを指定します。"
++#: booleans.py:237
++msgid "Determine whether webadm can manage generic user files."
++msgstr "webadm が一般的なユーザーファイルを管理できるかどうかを指定します。"
  
 -#: booleans.py:225
 -msgid "Ignore wine mmap_zero errors."
 -msgstr "Wine の mmap_zero エラーを無視する。"
++#: booleans.py:238
++msgid "Determine whether webadm can read generic user files."
++msgstr "webadm が一般的なユーザーファイルを読み込めるかどうかを指定します。"
+ 
+-#: booleans.py:226
 +#: booleans.py:239
 +msgid ""
 +"Determine whether attempts by wine to mmap low regions should be silently "
 +"blocked."
 +msgstr "wine が低リージョンを mmap する試行が静かにブロックされるかどうかを指定します。"
- 
--#: booleans.py:226
++
 +#: booleans.py:240
  msgid "Allow the graphical login program to execute bootloader"
- msgstr "グラフィカルログインプログラムがブートローダーを実行することを許可する"
+-msgstr "グラフィカルログインプログラムがブートローダーを実行することを許可する"
++msgstr "グラフィカルログインプログラムがブートローダーを実行することを許可します。"
  
 -#: booleans.py:227
 +#: booleans.py:241
  msgid ""
  "Allow the graphical login program to login directly as sysadm_r:sysadm_t"
- msgstr "グラフィカルログインプログラムが sysadm_r:sysadm_t として直接ログインすることを許可する"
+-msgstr "グラフィカルログインプログラムが sysadm_r:sysadm_t として直接ログインすることを許可する"
++msgstr "グラフィカルログインプログラムが sysadm_r:sysadm_t として直接ログインすることを許可します。"
  
 -#: booleans.py:228
 +#: booleans.py:242
 +msgid ""
 +"Allow the graphical login program to create files in HOME dirs as "
 +"xdm_home_t."
-+msgstr ""
++msgstr "グラフィカルログインプログラムが xdm_home_t として HOME ディレクトリにファイルを作成することを許可します。"
 +
 +#: booleans.py:243
  msgid "Allow xen to manage nfs files"
- msgstr "Xen が NFS ファイルを管理することを許可する"
+-msgstr "Xen が NFS ファイルを管理することを許可する"
++msgstr "Xen が NFS ファイルを管理することを許可します。"
  
 -#: booleans.py:229
 +#: booleans.py:244
@@ -230174,79 +230258,80 @@ index 72ae12d..7b8f1c3 100644
  "Allow xend to run blktapctrl/tapdisk. Not required if using dedicated "
  "logical volumes for disk images."
 -msgstr ""
-+msgstr "xend が blktapctrl/tapdisk を実行することを許可する。ディスクイメージ用の専用論理ボリュームを使用していなければ、必要ありません。"
++msgstr "xend が blktapctrl/tapdisk を実行することを許可します。ディスクイメージ用の専用論理ボリュームを使用していなければ、必要ありません。"
  
 -#: booleans.py:230
 +#: booleans.py:245
  msgid "Allow xend to run qemu-dm. Not required if using paravirt and no vfb."
 -msgstr ""
-+msgstr "xend が qemu-dm を実行することを許可する。準仮想化を使用していて、vfb がなければ、必要ありません。"
++msgstr "xend が qemu-dm を実行することを許可します。準仮想化を使用していて、vfb がなければ、必要ありません。"
  
 -#: booleans.py:231
 +#: booleans.py:246
  msgid ""
  "Allow xguest users to configure Network Manager and connect to apache ports"
 -msgstr ""
-+msgstr "xguest ユーザーが Network Manager を設定し、Apache ポートに接続することを許可する。"
++msgstr "xguest ユーザーが Network Manager を設定し、Apache ポートに接続することを許可します。"
  
 -#: booleans.py:232
 +#: booleans.py:247
  msgid "Allow xguest to exec content"
 -msgstr ""
-+msgstr "xguest がコンテンツを実行することを許可する"
++msgstr "xguest がコンテンツを実行することを許可します。"
  
 -#: booleans.py:233
 +#: booleans.py:248
  msgid "Allow xguest users to mount removable media"
 -msgstr ""
-+msgstr "xguest ユーザーがリムーバブルメディアをマウントすることを許可する"
++msgstr "xguest ユーザーがリムーバブルメディアをマウントすることを許可します。"
  
 -#: booleans.py:234
 +#: booleans.py:249
  msgid "Allow xguest to use blue tooth devices"
 -msgstr ""
-+msgstr "xguest が Bluetooth デバイスを使用することを許可する"
++msgstr "xguest が Bluetooth デバイスを使用することを許可します。"
  
 -#: booleans.py:235
 +#: booleans.py:250
  msgid "Allows clients to write to the X server shared memory segments."
 -msgstr ""
-+msgstr "クライアントが X サーバー共有メモリーセグメントに書き込むことを許可する。"
++msgstr "クライアントが X サーバー共有メモリーセグメントに書き込むことを許可します。"
  
 -#: booleans.py:236
 +#: booleans.py:251
  msgid "Allows XServer to execute writable memory"
 -msgstr ""
-+msgstr "XServer が書き込み可能メモリーを実行することを許可する"
++msgstr "XServer が書き込み可能メモリーを実行することを許可します。"
  
 -#: booleans.py:237
 +#: booleans.py:252
  msgid "Support X userspace object manager"
 -msgstr ""
-+msgstr "X userspace object manager をサポートする"
++msgstr "X userspace object manager をサポートします。"
  
 -#: booleans.py:238
 -msgid "Allow zabbix to connect to unreserved ports"
 -msgstr "Zabbix が予約されていないポートに接続することを許可する"
 +#: booleans.py:253
 +msgid "Determine whether zabbix can connect to all TCP ports"
-+msgstr "zabbix がすべての TCP ポートに接続できるかどうかを指定します。"
++msgstr "Zabbix がすべての TCP ポートに接続できるかどうかを指定します。"
  
 -#: booleans.py:239
 +#: booleans.py:254
  msgid "Allow zebra daemon to write it configuration files"
- msgstr "zebra デーモンが設定ファイルに書き込むことを許可する"
+-msgstr "zebra デーモンが設定ファイルに書き込むことを許可する"
++msgstr "zebra デーモンが設定ファイルに書き込むことを許可します。"
  
 -#: booleans.py:240
 +#: booleans.py:255
  msgid ""
  "Allow ZoneMinder to modify public files used for public file transfer "
  "services."
-+msgstr "ZoneMinder がパブリックなファイル転送サービス向けに使用されるパブリックなファイルを変更することを許可する。"
++msgstr "ZoneMinder がパブリックなファイル転送サービスに使用されるパブリックなファイルを変更することを許可します。"
 +
 +#: booleans.py:256
 +msgid "Allow ZoneMinder to run su/sudo."
-+msgstr ""
++msgstr "ZoneMinder が su/sudo を実行することを許可します。"
 +
 +#: ../sepolicy/sepolicy.py:194
 +#, python-format
@@ -230255,7 +230340,7 @@ index 72ae12d..7b8f1c3 100644
 +
 +#: ../sepolicy/sepolicy.py:281
 +msgid "Graphical User Interface for SELinux Policy"
-+msgstr ""
++msgstr "SELinux ポリシーのグラフィカルユーザーインターフェース"
 +
 +#: ../sepolicy/sepolicy.py:305
 +msgid "Generate SELinux man pages"
@@ -230444,7 +230529,7 @@ index 72ae12d..7b8f1c3 100644
 +
 +#: ../sepolicy/sepolicy/__init__.py:168
 +msgid "regular file"
-+msgstr ""
++msgstr "通常ファイル"
 +
 +#: ../sepolicy/sepolicy/__init__.py:169
 +msgid "directory"
@@ -230452,23 +230537,23 @@ index 72ae12d..7b8f1c3 100644
 +
 +#: ../sepolicy/sepolicy/__init__.py:170
 +msgid "character device"
-+msgstr ""
++msgstr "キャラクターデバイス"
 +
 +#: ../sepolicy/sepolicy/__init__.py:171
 +msgid "block device"
-+msgstr ""
++msgstr "ブロックデバイス"
 +
 +#: ../sepolicy/sepolicy/__init__.py:172
 +msgid "socket file"
-+msgstr ""
++msgstr "ソケットファイル"
 +
 +#: ../sepolicy/sepolicy/__init__.py:173
 +msgid "symbolic link"
-+msgstr ""
++msgstr "シンボリックリンク"
 +
 +#: ../sepolicy/sepolicy/__init__.py:174
 +msgid "named pipe"
-+msgstr ""
++msgstr "名前付きパイプ"
 +
 +#: ../sepolicy/sepolicy/__init__.py:306
 +msgid "No SELinux Policy installed"
@@ -230476,7 +230561,7 @@ index 72ae12d..7b8f1c3 100644
 +
 +#: ../sepolicy/sepolicy/__init__.py:386
 +msgid "You must regenerate interface info by running /usr/bin/sepolgen-ifgen"
-+msgstr ""
++msgstr "/usr/bin/sepolgen-ifgen を実行し、インターフェース情報を再生成する必要があります"
 +
 +#: ../sepolicy/sepolicy/__init__.py:591
 +#, python-format
@@ -230613,7 +230698,7 @@ index 72ae12d..7b8f1c3 100644
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:7
 +msgid "SELinux Gui"
-+msgstr ""
++msgstr "SELinux GUI"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:33
 +msgid "Type to search for a process"
@@ -230621,12 +230706,12 @@ index 72ae12d..7b8f1c3 100644
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:35
 +msgid "Select domain"
-+msgstr ""
++msgstr "ドメインの選択"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:70
 +#: ../sepolicy/sepolicy/sepolicy.glade:308
 +msgid "Booleans"
-+msgstr ""
++msgstr "ブーリアン"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:74
 +msgid ""
@@ -230637,7 +230722,7 @@ index 72ae12d..7b8f1c3 100644
 +#: ../sepolicy/sepolicy/sepolicy.glade:85
 +#: ../sepolicy/sepolicy/sepolicy.glade:710
 +msgid "Files"
-+msgstr ""
++msgstr "ファイル"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:89
 +msgid ""
@@ -230647,7 +230732,7 @@ index 72ae12d..7b8f1c3 100644
 +#: ../sepolicy/sepolicy/sepolicy.glade:100
 +#: ../sepolicy/sepolicy/sepolicy.glade:1062
 +msgid "Network"
-+msgstr ""
++msgstr "ネットワーク"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:104
 +msgid ""
@@ -230683,28 +230768,28 @@ index 72ae12d..7b8f1c3 100644
 +#: ../sepolicy/sepolicy/sepolicy.glade:787
 +#: ../sepolicy/sepolicy/sepolicy.glade:1128
 +msgid "Modify"
-+msgstr ""
++msgstr "修正"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:377
 +#: ../sepolicy/sepolicy/sepolicy.glade:791
 +msgid "Modify an existing item"
-+msgstr ""
++msgstr "既存の項目の修正"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:389
 +#: ../sepolicy/sepolicy/sepolicy.glade:803
 +#: ../sepolicy/sepolicy/sepolicy.glade:1142
 +msgid "Delete"
-+msgstr ""
++msgstr "削除"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:393
 +#: ../sepolicy/sepolicy/sepolicy.glade:807
 +msgid "Delete an existing item"
-+msgstr ""
++msgstr "既存の項目の削除"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:409
 +#: ../sepolicy/sepolicy/sepolicy.glade:823
 +msgid "Add a new item"
-+msgstr ""
++msgstr "新規項目の追加"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:442
 +msgid "File path used to enter the above selected process domain."
@@ -230854,19 +230939,19 @@ index 72ae12d..7b8f1c3 100644
 +#: ../sepolicy/sepolicy/sepolicy.glade:1541
 +#: ../sepolicy/sepolicy/sepolicy.glade:1629
 +msgid "Add a File"
-+msgstr ""
++msgstr "ファイルの追加"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1504
 +#: ../sepolicy/sepolicy/sepolicy.glade:1592
 +#: ../sepolicy/sepolicy/sepolicy.glade:1680
 +msgid "Save changes"
-+msgstr ""
++msgstr "変更の保存"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1518
 +#: ../sepolicy/sepolicy/sepolicy.glade:1606
 +#: ../sepolicy/sepolicy/sepolicy.glade:1694
 +msgid "Reset Changes"
-+msgstr ""
++msgstr "変更のリセット"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1780
 +msgid "Applicaiton more detailed view"
@@ -230874,31 +230959,31 @@ index 72ae12d..7b8f1c3 100644
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1874
 +msgid "Analyzing Policy..."
-+msgstr ""
++msgstr "ポリシーの分析中..."
 +
 +#: ../sepolicy/sepolicy/gui.py:49
 +msgid "No"
-+msgstr ""
++msgstr "いいえ"
 +
 +#: ../sepolicy/sepolicy/gui.py:49
 +msgid "Yes"
-+msgstr ""
++msgstr "はい"
 +
 +#: ../sepolicy/sepolicy/gui.py:61
 +msgid "GTK Not Available"
-+msgstr ""
++msgstr "GTK が利用できません"
 +
 +#: ../sepolicy/sepolicy/gui.py:195
 +msgid "System Status: Enforcing"
-+msgstr ""
++msgstr "システム状態: 強制 (Enforcing)"
 +
 +#: ../sepolicy/sepolicy/gui.py:197
 +msgid "System Status: Permissive"
-+msgstr ""
++msgstr "システム状態: 許容 (Permissive)"
 +
 +#: ../sepolicy/sepolicy/gui.py:199
 +msgid "System Status: Disabled"
-+msgstr ""
++msgstr "システム状態: 無効 (Disabled)"
 +
 +#: ../sepolicy/sepolicy/gui.py:413
 +#, python-format
@@ -304689,10 +304774,10 @@ index b24322e..d6c8880 100644
 +msgid "Boolean %s Allow Rules"
  msgstr ""
 diff --git a/policycoreutils/po/ml.po b/policycoreutils/po/ml.po
-index e7b146f..b45469a 100644
+index e7b146f..5b7e2da 100644
 --- a/policycoreutils/po/ml.po
 +++ b/policycoreutils/po/ml.po
-@@ -3,13 +3,14 @@
+@@ -3,14 +3,15 @@
  # This file is distributed under the same license as the PACKAGE package.
  # 
  # Translators:
@@ -304705,11 +304790,13 @@ index e7b146f..b45469a 100644
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2013-01-04 12:01-0500\n"
 -"PO-Revision-Date: 2013-01-04 17:02+0000\n"
+-"Last-Translator: dwalsh <dwalsh@redhat.com>\n"
 +"POT-Creation-Date: 2013-07-10 16:36-0400\n"
-+"PO-Revision-Date: 2013-07-10 20:43+0000\n"
- "Last-Translator: dwalsh <dwalsh@redhat.com>\n"
++"PO-Revision-Date: 2013-08-22 10:03+0000\n"
++"Last-Translator: Ani Peter <apeter@redhat.com>\n"
  "Language-Team: Malayalam <discuss@lists.smc.org.in>\n"
  "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
 @@ -25,7 +26,7 @@ msgid ""
  "         <args ...> are the arguments to that script."
  msgstr "USAGE: run_init <script> <args ...>\n  where: <script> പ്രവര്‍ത്തിപ്പിക്കുവാനുളള init scriptന്‍റെ പേര്,\n         <args ...> സ്ക്രിപ്പ്റ്റിനുളള arguments."
@@ -304745,7 +304832,7 @@ index e7b146f..b45469a 100644
 +#: ../semanage/seobject.py:288
 +#, python-format
 +msgid "Module does not exists %s "
-+msgstr ""
++msgstr "ഘടകത്തില്‍ %s നിലവിലില്ല"
 +
 +#: ../semanage/seobject.py:298
  #, python-format
@@ -304786,7 +304873,7 @@ index e7b146f..b45469a 100644
 +"In some distributions it is included in the policycoreutils-devel patckage.\n"
 +"# yum install policycoreutils-devel\n"
 +"Or similar for your distro."
-+msgstr ""
++msgstr "പെര്‍മ്മിസ്സീവ് ഡൊമെയിനുകള്‍ സജ്ജമാക്കുന്നതിനു് sepolgen പൈഥണ്‍ ഘടകം ആവശ്യമുണ്ടു്.\nചില വിതരണങ്ങളില്‍, ഇതു് policycoreutils-devel പാക്കേജില്‍ ഉള്‍പ്പെടുത്തിയിരിയ്ക്കുന്നു.\n# yum install policycoreutils-devel\nഅല്ലെങ്കില്‍ നിങ്ങളുടെ വിതരണത്തിനുള്ളതു്."
 +
 +#: ../semanage/seobject.py:418
  #, python-format
@@ -306904,7 +306991,7 @@ index e7b146f..b45469a 100644
 -#: booleans.py:70
 +#: booleans.py:72
 +msgid "Allow http daemon to connect to mythtv"
-+msgstr ""
++msgstr "mythtv-ലേക്കു് കണക്ട് ചെയ്യുന്നതിനു് http ഡെമണിനെ അനുവദിയ്ക്കുക"
 +
 +#: booleans.py:73
  msgid "Allow http daemon to connect to zabbix"
@@ -307066,23 +307153,23 @@ index e7b146f..b45469a 100644
  msgstr "ഓപ്പണ്‍സ്റ്റാക്ക് പോര്‍ട്ടുകള്‍ ലഭ്യമാക്കുന്നതിനായി httpd-യെ അനുവദിയ്ക്കുക"
  
 -#: booleans.py:100
--msgid "Allow Apache to query NS records"
 +#: booleans.py:103
 +msgid "Allow httpd to connect to  sasl"
- msgstr ""
++msgstr "sasl-ലേക്കു് കണക്ട് ചെയ്യുന്നതിനു് httpd അനുവദിയ്ക്കുക"
++
++#: booleans.py:104
+ msgid "Allow Apache to query NS records"
+-msgstr ""
++msgstr "എന്‍എസ് റിക്കോര്‍ഡുകള്‍ ചോദ്യം ചെയ്യുന്നതിനായി അപ്പാച്ചയെ അനുവദിയ്ക്കുക"
  
 -#: booleans.py:101
 -msgid "Allow icecast to connect to all ports, not just sound ports."
 -msgstr "എല്ലാ പോര്‍ട്ടുകളിലേക്കു് കണക്ട് ചെയ്യുന്നതിനായി icecast-നെ അനുവദിയ്ക്കുക."
-+#: booleans.py:104
-+msgid "Allow Apache to query NS records"
-+msgstr "എന്‍എസ് റിക്കോര്‍ഡുകള്‍ ചോദ്യം ചെയ്യുന്നതിനായി അപ്പാച്ചയെ അനുവദിയ്ക്കുക"
- 
--#: booleans.py:102
 +#: booleans.py:105
 +msgid "Determine whether icecast can listen on and connect to any TCP port."
 +msgstr "icecast-നു് ശ്രദ്ധിച്ചു്, ഏതെങ്കിലും ടിസിപി പോര്‍ട്ടിലേക്കു് കണക്ട് ചെയ്യുവാന്‍ സാധ്യമോ എന്നു് കണ്ടുപിടിയ്ക്കുക."
-+
+ 
+-#: booleans.py:102
 +#: booleans.py:106
 +msgid ""
 +"Determine whether irc clients can listen on and connect to any unreserved "
@@ -307160,7 +307247,7 @@ index e7b146f..b45469a 100644
 -msgstr "ഏതു് ഡയറക്ടറിയും ഫയലും മൌണ്ട് ചെയ്യുവാന്‍ mount കമാന്‍ഡിനെ അനുവദിയ്ക്കുക."
 +#: booleans.py:121
 +msgid "Allow the mount commands to mount any directory or file."
-+msgstr ""
++msgstr "ഏതെങ്കിലും ഡയറക്ടറി അല്ലെങ്കില്‍ ഫയല്‍ മൌണ്ട് ചെയ്യുന്നതിനായി മൌണ്ട് കമാന്‍ഡുകളെ അനുവദിയ്ക്കുക."
  
 -#: booleans.py:110
 +#: booleans.py:122
@@ -307173,12 +307260,12 @@ index e7b146f..b45469a 100644
 -msgstr "ഉപയോക്താക്കള്‍ക്കുള്ള ആസ്ഥാന ഡയറക്ടറിയില്‍ പെട്ടെന്നുള്ള വിവരങ്ങള്‍ തയ്യാറാക്കുവാന്‍ mozilla_plugin-കളെ അനുവദിയ്ക്കുക"
 +#: booleans.py:123
 +msgid "Allow mozilla plugin to support GPS."
-+msgstr ""
++msgstr "ജിപിഎസ് പിന്തുണയ്ക്കുന്നിനു് മോസിലാ പ്ലഗിനെ അനുവദിയ്ക്കുക."
  
 -#: booleans.py:112
 +#: booleans.py:124
 +msgid "Allow mozilla plugin to support spice protocols."
-+msgstr ""
++msgstr "സ്പയിസ് സമ്പ്രദായങ്ങള്‍ പിന്തുണയ്ക്കുന്നതിനായി മോസിലാ പ്ലഗിനെ അനുവദിയ്ക്കുക."
 +
 +#: booleans.py:125
  msgid "Allow confined web browsers to read home directory content"
@@ -307349,7 +307436,7 @@ index e7b146f..b45469a 100644
 -"Allow privoxy to connect to all ports, not just HTTP, FTP, and Gopher ports."
 -msgstr "HTTP, FTP, ഗോഫര്‍ പോര്‍ട്ടുകള്‍ മാത്രമല്ല, എല്ലാ പോര്‍ട്ടുകളിലേക്കും കണക്ട് ചെയ്യുവാന്‍ privoxy-നെ അനുവദിയ്ക്കുക."
 +"Permit to prosody to bind apache port. Need to be activated to use BOSH."
-+msgstr ""
++msgstr "അപ്പാച്ചെ പോര്‍ട്ട് ബൈന്‍ഡ് ചെയ്യുന്നതിനു് prosody-യെ അനുവദിയ്ക്കുക. ബിഒഎസ്എച് ഉപയോഗിയ്ക്കുന്നതിനു് സജീവമാക്കേണ്ടതുണ്ടു്."
  
 -#: booleans.py:139
 +#: booleans.py:156
@@ -307558,12 +307645,12 @@ index e7b146f..b45469a 100644
 +#: booleans.py:190
  msgid "Allow user  to use ssh chroot environment."
 -msgstr ""
--
++msgstr "ssh chroot എന്‍വയണ്മെന്റ് ഉപയോഗിയ്ക്കുന്നതിനായി ഉപയോക്താവിനെ അനുവദിയ്ക്കുക."
+ 
 -#: booleans.py:175
 -msgid "Allow user music sharing"
 -msgstr "ഉപയോക്താവിനെ സംഗീതം പങ്കിടുന്നതിനായി അനുവദിയ്ക്കുക"
-+msgstr "ssh chroot എന്‍വയണ്മെന്റ് ഉപയോഗിയ്ക്കുന്നതിനായി ഉപയോക്താവിനെ അനുവദിയ്ക്കുക."
- 
+-
 -#: booleans.py:176
 +#: booleans.py:191
  msgid ""
@@ -307701,7 +307788,7 @@ index e7b146f..b45469a 100644
 -#: booleans.py:196
 +#: booleans.py:211
 +msgid "Allow testpolicy to exec content"
-+msgstr ""
++msgstr "ഉള്ളടക്കം നടപ്പിലാക്കുന്നതിനായി testpolicy-യെ അനുവദിയ്ക്കുക"
 +
 +#: booleans.py:212
  msgid ""
@@ -307895,7 +307982,7 @@ index e7b146f..b45469a 100644
 +msgid ""
 +"Allow the graphical login program to create files in HOME dirs as "
 +"xdm_home_t."
-+msgstr ""
++msgstr "ആസ്ഥാന ഡയറക്ടറികളിലുള്ള ഫയലുകളെ xdm_home_t ആയി തയ്യാറാക്കുന്നതിനു് ഗ്രാഫിക്കല്‍ പ്രവേശന പ്രോഗ്രാമിനെ അനുവദിയ്ക്കുക."
 +
 +#: booleans.py:243
  msgid "Allow xen to manage nfs files"
@@ -307971,7 +308058,7 @@ index e7b146f..b45469a 100644
 +
 +#: booleans.py:256
 +msgid "Allow ZoneMinder to run su/sudo."
-+msgstr ""
++msgstr "su/sudo നടപ്പിലാക്കുന്നതിനായി ZoneMinder-നെ അനുവദിയ്ക്കുക."
 +
 +#: ../sepolicy/sepolicy.py:194
 +#, python-format
@@ -307980,7 +308067,7 @@ index e7b146f..b45469a 100644
 +
 +#: ../sepolicy/sepolicy.py:281
 +msgid "Graphical User Interface for SELinux Policy"
-+msgstr ""
++msgstr "SELinux പോളിസിയ്ക്കുള്ള ഗ്രാഫിക്കല്‍ യൂസര്‍ ഇന്റര്‍ഫെയിസ്"
 +
 +#: ../sepolicy/sepolicy.py:305
 +msgid "Generate SELinux man pages"
@@ -308114,11 +308201,11 @@ index e7b146f..b45469a 100644
 +
 +#: ../sepolicy/sepolicy.py:528
 +msgid "Enter SELinux role(s) to which the administror domain will transition"
-+msgstr ""
++msgstr "അഡ്മിനിസ്ട്രേറ്റര്‍ ഡൊമെയിന്‍ മാറ്റുന്നതിനുള്ള SELinux നിയമനം നല്‍കുക"
 +
 +#: ../sepolicy/sepolicy.py:531
 +msgid "Enter domain(s) which this confined admin will administrate"
-+msgstr ""
++msgstr "ഈ അഡ്മിന്‍ നിരീക്ഷിയ്ക്കുന്ന ഡൊമെയിന്‍ നല്‍കുക"
 +
 +#: ../sepolicy/sepolicy.py:534
 +msgid "name of policy to generate"
@@ -308165,35 +308252,35 @@ index e7b146f..b45469a 100644
 +
 +#: ../sepolicy/sepolicy/__init__.py:167 ../sepolicy/sepolicy/gui.py:479
 +msgid "all files"
-+msgstr ""
++msgstr "എല്ലാ ഫയലുകളും"
 +
 +#: ../sepolicy/sepolicy/__init__.py:168
 +msgid "regular file"
-+msgstr ""
++msgstr "സാധാരണ ഫയല്‍"
 +
 +#: ../sepolicy/sepolicy/__init__.py:169
 +msgid "directory"
-+msgstr ""
++msgstr "ഡയറക്ടറി"
 +
 +#: ../sepolicy/sepolicy/__init__.py:170
 +msgid "character device"
-+msgstr ""
++msgstr "ക്യാരക്ടര്‍ ഡിവൈസ്"
 +
 +#: ../sepolicy/sepolicy/__init__.py:171
 +msgid "block device"
-+msgstr ""
++msgstr "ബ്ലോക്ക് ഡിവൈസ്"
 +
 +#: ../sepolicy/sepolicy/__init__.py:172
 +msgid "socket file"
-+msgstr ""
++msgstr "സോക്കറ്റ് ഫയല്‍"
 +
 +#: ../sepolicy/sepolicy/__init__.py:173
 +msgid "symbolic link"
-+msgstr ""
++msgstr "സിംബോളിക്ക് ലിങ്ക്"
 +
 +#: ../sepolicy/sepolicy/__init__.py:174
 +msgid "named pipe"
-+msgstr ""
++msgstr "നെയിമ്ഡ് പൈപ്പ്"
 +
 +#: ../sepolicy/sepolicy/__init__.py:306
 +msgid "No SELinux Policy installed"
@@ -308201,7 +308288,7 @@ index e7b146f..b45469a 100644
 +
 +#: ../sepolicy/sepolicy/__init__.py:386
 +msgid "You must regenerate interface info by running /usr/bin/sepolgen-ifgen"
-+msgstr ""
++msgstr "/usr/bin/sepolgen-ifgen നടപ്പിലാക്കി ഇന്റര്‍ഫെയിസ് വിവരം വീണ്ടും ലഭ്യമാക്കണം"
 +
 +#: ../sepolicy/sepolicy/__init__.py:591
 +#, python-format
@@ -308338,368 +308425,368 @@ index e7b146f..b45469a 100644
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:7
 +msgid "SELinux Gui"
-+msgstr ""
++msgstr "SELinux ജിയുഐ"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:33
 +msgid "Type to search for a process"
-+msgstr ""
++msgstr "ഒരു പ്രക്രിയ തെരയുന്നതിനായി ടൈപ്പ് ചെയ്യുക"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:35
 +msgid "Select domain"
-+msgstr ""
++msgstr "ഡൊമെയിന്‍ തെരഞ്ഞെടുക്കുക"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:70
 +#: ../sepolicy/sepolicy/sepolicy.glade:308
 +msgid "Booleans"
-+msgstr ""
++msgstr "ബൂളിയനുകള്‍"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:74
 +msgid ""
 +"Display boolean information that can be used to modify the policy for the "
 +"'selected domain'."
-+msgstr ""
++msgstr "'തെരഞ്ഞെടുത്ത ഡൊമെയിനുള്ള' പോളിസിയില്‍ മാറ്റം വരുത്തുന്നതിനുള്ള ബൂളിയന്‍ വിവരം കാണിയ്ക്കുക."
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:85
 +#: ../sepolicy/sepolicy/sepolicy.glade:710
 +msgid "Files"
-+msgstr ""
++msgstr "ഫയലുകള്‍"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:89
 +msgid ""
 +"Display file type information that can be used by the 'selected domain'."
-+msgstr ""
++msgstr "'തെരഞ്ഞെടുത്ത ഡൊമെയിന്‍' ഉപയോഗിയ്ക്കുവാന്‍ സാധ്യമാകുന്ന ഫയല്‍ തരത്തിലുള്ള വിവരം കാണിയ്ക്കുക."
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:100
 +#: ../sepolicy/sepolicy/sepolicy.glade:1062
 +msgid "Network"
-+msgstr ""
++msgstr "നെറ്റ്‌വര്‍ക്ക്"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:104
 +msgid ""
 +"Display network ports to which the 'selected domain' can connect or listen "
 +"to."
-+msgstr ""
++msgstr "'തെരഞ്ഞെടുത്ത ഡൊമെയിനു്' കണക്ട് ചെയ്യുവാന്‍ സാധിയ്ക്കുന്ന അല്ലെങ്കില്‍ ശ്രദ്ധിയ്ക്കുവാന്‍ സാധിയ്ക്കുന്ന നെറ്റ്‌വര്‍ക്ക് പോര്‍ട്ടുകള്‍ കാണിയ്ക്കുക."
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:115
 +#: ../sepolicy/sepolicy/sepolicy.glade:1361
 +msgid "Transitions"
-+msgstr ""
++msgstr "മാറ്റങ്ങള്‍"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:119
 +msgid ""
 +"Display applications that can transition into or out of the 'selected "
 +"domain'."
-+msgstr ""
++msgstr "'തെരഞ്ഞെടുത്ത ഡൊമെയിനിലേക്കുള്ള' അല്ലെങ്കില്‍ പുറത്തേക്കുള്ള മാറ്റങ്ങള്‍ക്കുള്ള പ്രയോഗങ്ങള്‍ പ്രദര്‍ശിപ്പിയ്ക്കുക."
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:188
 +#: ../sepolicy/sepolicy/sepolicy.glade:358
 +#: ../sepolicy/sepolicy/sepolicy.glade:765
 +#: ../sepolicy/sepolicy/sepolicy.glade:1113
 +msgid "Show Modified Only"
-+msgstr ""
++msgstr "മാറ്റം വരുത്തിയവ മാത്രം കാണിയ്ക്കുക"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:219
 +msgid ""
 +"If-Then-Else rules written in policy that can \n"
 +"allow alternative access control."
-+msgstr ""
++msgstr "മറ്റൊരു രീതിയിലുള്ള പ്രവേശന നിയന്ത്രണം അനുവദിയ്ക്കുന്നതിനുള്ള\nIf-Then-Else നിയമങ്ങള്‍ പോളിസിയില്‍ സൂക്ഷിച്ചിരിയ്ക്കുന്നു."
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:373
 +#: ../sepolicy/sepolicy/sepolicy.glade:787
 +#: ../sepolicy/sepolicy/sepolicy.glade:1128
 +msgid "Modify"
-+msgstr ""
++msgstr "മാറ്റം വരുത്തുക"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:377
 +#: ../sepolicy/sepolicy/sepolicy.glade:791
 +msgid "Modify an existing item"
-+msgstr ""
++msgstr "നിലവിലുള്ളൊരു വസ്തുവില്‍ മാറ്റം വരുത്തുക"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:389
 +#: ../sepolicy/sepolicy/sepolicy.glade:803
 +#: ../sepolicy/sepolicy/sepolicy.glade:1142
 +msgid "Delete"
-+msgstr ""
++msgstr "വെട്ടി നീക്കുക"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:393
 +#: ../sepolicy/sepolicy/sepolicy.glade:807
 +msgid "Delete an existing item"
-+msgstr ""
++msgstr "നിലവിലുള്ളൊരു വസ്തു വെട്ടി നീക്കുക"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:409
 +#: ../sepolicy/sepolicy/sepolicy.glade:823
 +msgid "Add a new item"
-+msgstr ""
++msgstr "പുതിയൊരു വസ്തു ചേര്‍ക്കുക"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:442
 +msgid "File path used to enter the above selected process domain."
-+msgstr ""
++msgstr "മുകളില്‍ തെരഞ്ഞെടുത്ത ഡൊമെയിന്‍ നല്‍കുവാനുള്ള ഫയല്‍ പാഥ്."
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:450
 +#: ../sepolicy/sepolicy/sepolicy.glade:531
 +msgid "File Path"
-+msgstr ""
++msgstr "ഫയല്‍ പാഥ്"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:468
 +#: ../sepolicy/sepolicy/sepolicy.glade:549
 +msgid "SELinux File Label"
-+msgstr ""
++msgstr "SELinux ഫയല്‍ ലേബല്‍"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:485
 +#: ../sepolicy/sepolicy/sepolicy.glade:567
 +#: ../sepolicy/sepolicy/sepolicy.glade:660
 +msgid "Class"
-+msgstr ""
++msgstr "ക്ലാസ്സ്"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:505
 +msgid "File path used to enter the 'selected domain'."
-+msgstr ""
++msgstr "'തെരഞ്ഞെടുത്ത ഡൊമെയിന്‍' നല്‍കുവാനുള്ള ഫയല്‍ പാഥ്."
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:506
 +msgid "Executable Files"
-+msgstr ""
++msgstr "നടപ്പിലാക്കുവാന്‍ സാധ്യമാകുന്ന ഫയലുകള്‍"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:523
 +msgid "Files to which the above selected process domain can write."
-+msgstr ""
++msgstr "മുകളില്‍ തെരഞ്ഞെടുത്ത പ്രക്രിയകളിലേക്കു് സൂക്ഷിയ്ക്കുവാന്‍ സാധ്യമാകുന്ന ഫയലുകള്‍."
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:591
 +msgid "Files to which the 'selected domain' can write."
-+msgstr ""
++msgstr "'തെരഞ്ഞെടുത്ത ഡൊമെയിനിലേക്കു്' സൂക്ഷിയ്ക്കുവാന്‍ സാധ്യമായ ഫയലുകള്‍."
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:592
 +msgid "Writable Files"
-+msgstr ""
++msgstr "എഴുതുവാന്‍ സാധ്യമാകുന്ന ഫയലുകള്‍"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:610
 +msgid "File Types defined for the selected domain"
-+msgstr ""
++msgstr "തെരഞ്ഞെടുത്ത ഡൊമെയിനുള്ള ഫയല്‍ തരങ്ങള്‍"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:618
 +msgid "File path"
-+msgstr ""
++msgstr "ഫയല്‍ പാഥ്"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:686
 +msgid "File Types defined for the 'selected domain'."
-+msgstr ""
++msgstr "'തെരഞ്ഞെടുത്ത ഡൊമെയിനുള്ള' ഫയല്‍ തരങ്ങള്‍."
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:687
 +msgid "Application File Types"
-+msgstr ""
++msgstr "പ്രയോഗത്തിനുള്ള ഫയല്‍ തരങ്ങള്‍"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:856
 +msgid "Network Ports to which the selected domain is allowed to connect."
-+msgstr ""
++msgstr "കണക്ട് ചെയ്യുവാന്‍ അനുവദിയ്ക്കുന്ന തെരഞ്ഞെടുത്ത ഡൊമെയിനിലേക്കുള്ള നെറ്റ്‌വര്‍ക്ക് പോര്‍ട്ടുകള്‍"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:898
 +#: ../sepolicy/sepolicy/sepolicy.glade:997
 +msgid "Modified"
-+msgstr ""
++msgstr "മാറ്റം വരുത്തിയവ"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:937
 +msgid "Network Ports to which the 'selected domain' is allowed to connect."
-+msgstr ""
++msgstr "കണക്ട് ചെയ്യുവാന്‍ അനുവദിയ്ക്കുന്ന 'തെരഞ്ഞെടുത്ത ഡൊമെയിനിലേക്കുള്ള' നെറ്റ്‌വര്‍ക്ക് പോര്‍ട്ടുകള്‍"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:938
 +msgid "Outbound"
-+msgstr ""
++msgstr "ഔട്ട്ബൌണ്ട്"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:955
 +msgid "Network Ports to which the selected domain is allowed to listen."
-+msgstr ""
++msgstr "ശ്രദ്ധിയ്ക്കുവാന്‍ അനുവദിയ്ക്കുന്ന തെരഞ്ഞെടുത്ത ഡൊമെയിനിലേക്കുള്ള നെറ്റ്‌വര്‍ക്ക് പോര്‍ട്ടുകള്‍"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1038
 +msgid "Network Ports to which the 'selected domain' is allowed to listen."
-+msgstr ""
++msgstr "ശ്രദ്ധിയ്ക്കുവാന്‍ അനുവദിയ്ക്കുന്ന 'തെരഞ്ഞെടുത്ത ഡൊമെയിനിലേക്കുള്ള' നെറ്റ്‌വര്‍ക്ക് പോര്‍ട്ടുകള്‍"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1039
 +msgid "Inbound"
-+msgstr ""
++msgstr "ഇന്‍ബൌണ്ട്"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1189
 +#: ../sepolicy/sepolicy/sepolicy.glade:1260
 +msgid ""
 +"Executables which will transition to a different domain, when the 'selected "
 +"domain' executes them."
-+msgstr ""
++msgstr "'തെരഞ്ഞെടുത്ത ഡൊമെയിന്‍' എക്സിക്യൂട്ടബിളുകളെ നടപ്പിലാക്കുമ്പോള്‍, അവ മറ്റൊരു ഡൊമെയിനിലേക്കു് മാറുന്നു."
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1194
 +#: ../sepolicy/sepolicy/sepolicy.glade:1285
 +msgid "Enabled"
-+msgstr ""
++msgstr "പ്രവര്‍ത്തന സജ്ജം"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1223
 +msgid "Executable File Type"
-+msgstr ""
++msgstr "നടപ്പിലാക്കുവാന്‍ സാധിയ്ക്കുന്ന ഫയല്‍ തരം"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1239
 +msgid "Transtype"
-+msgstr ""
++msgstr "ട്രാന്‍സ്‌ടൈപ്പ്"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1263
 +msgid "Transitions From 'select domain'"
-+msgstr ""
++msgstr "'തെരഞ്ഞെടുത്ത ഡൊമെയിനിലേക്കു്' മാറുന്നു"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1280
 +#: ../sepolicy/sepolicy/sepolicy.glade:1337
 +msgid ""
 +"Executables which will transition to the 'selected domain', when executing a"
 +" selected domains entrypoint."
-+msgstr ""
++msgstr "തെരഞ്ഞെടുത്ത ഡൊമെയിന്‍ എന്‍ട്രിപോയിന്റ് നടപ്പിലാക്കുമ്പോള്‍, നടപ്പിലാക്കുന്നവ 'തെരഞ്ഞെടുത്ത ഡൊമെയിനിലേക്കു്' മാറുന്നു."
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1299
 +msgid "Calling Process Domain"
-+msgstr ""
++msgstr "പ്രക്രിയ ഡൊമെയിന്‍ ലഭ്യമാക്കുന്നു"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1313
 +msgid "Executable File"
-+msgstr ""
++msgstr "നടപ്പിലാക്കുവാന്‍ സാധ്യമാകുന്ന ഫയല്‍"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1338
 +msgid "Transitions Into 'select domain'"
-+msgstr ""
++msgstr "'തെരഞ്ഞെടുത്ത ഡൊമെയിനിലേക്കു്' മാറ്റുന്നു"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1388
 +msgid "Reset"
-+msgstr ""
++msgstr "വീണ്ടും സജ്ജമാക്കുക"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1392
 +msgid "Reset to system default"
-+msgstr ""
++msgstr "സിസ്റ്റത്തിന്റെ സഹജമായതിലേക്കു് വീണ്ടും സജ്ജമാക്കുക"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1403
 +msgid "Update"
-+msgstr ""
++msgstr "പരിഷ്കരിയ്ക്കുക"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1407
 +msgid "Save your changes"
-+msgstr ""
++msgstr "നിങ്ങളുടെ മാറ്റങ്ങള്‍ സൂക്ഷിയ്ക്കുക"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1454
 +#: ../sepolicy/sepolicy/sepolicy.glade:1541
 +#: ../sepolicy/sepolicy/sepolicy.glade:1629
 +msgid "Add a File"
-+msgstr ""
++msgstr "ഒരു ഫയല്‍ ചേര്‍ക്കുക"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1504
 +#: ../sepolicy/sepolicy/sepolicy.glade:1592
 +#: ../sepolicy/sepolicy/sepolicy.glade:1680
 +msgid "Save changes"
-+msgstr ""
++msgstr "മാറ്റങ്ങള്‍ സൂക്ഷിയ്ക്കുക"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1518
 +#: ../sepolicy/sepolicy/sepolicy.glade:1606
 +#: ../sepolicy/sepolicy/sepolicy.glade:1694
 +msgid "Reset Changes"
-+msgstr ""
++msgstr "മാറ്റങ്ങള്‍ വീണ്ടും സജ്ജമാക്കുക"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1780
 +msgid "Applicaiton more detailed view"
-+msgstr ""
++msgstr "പ്രയോഗത്തിന്റെ കൂടുതല്‍ വിശദമായ കാഴ്ച"
 +
 +#: ../sepolicy/sepolicy/sepolicy.glade:1874
 +msgid "Analyzing Policy..."
-+msgstr ""
++msgstr "പോളിസി നിരീക്ഷിയ്ക്കുന്നു..."
 +
 +#: ../sepolicy/sepolicy/gui.py:49
 +msgid "No"
-+msgstr ""
++msgstr "ഇല്ല"
 +
 +#: ../sepolicy/sepolicy/gui.py:49
 +msgid "Yes"
-+msgstr ""
++msgstr "ഉവ്വു്"
 +
 +#: ../sepolicy/sepolicy/gui.py:61
 +msgid "GTK Not Available"
-+msgstr ""
++msgstr "ജിറ്റികെ ലഭ്യമല്ല"
 +
 +#: ../sepolicy/sepolicy/gui.py:195
 +msgid "System Status: Enforcing"
-+msgstr ""
++msgstr "സിസ്റ്റം അവസ്ഥ: എന്‍ഫോഴ്സിങ്"
 +
 +#: ../sepolicy/sepolicy/gui.py:197
 +msgid "System Status: Permissive"
-+msgstr ""
++msgstr "സിസ്റ്റം അവസ്ഥ: പെര്‍മ്മിസ്സീവ്"
 +
 +#: ../sepolicy/sepolicy/gui.py:199
 +msgid "System Status: Disabled"
-+msgstr ""
++msgstr "സിസ്റ്റം അവസ്ഥ: പ്രവര്‍ത്തന രഹിതം"
 +
 +#: ../sepolicy/sepolicy/gui.py:413
 +#, python-format
 +msgid "File path used to enter the '%s' domain."
-+msgstr ""
++msgstr "'%s' ഡൊമെയിന്‍ നല്‍കുന്നതിനുള്ള ഫയല്‍ പാഥ്."
 +
 +#: ../sepolicy/sepolicy/gui.py:414
 +#, python-format
 +msgid "Files to which the '%s' domain can write."
-+msgstr ""
++msgstr "'%s' ഡൊമെയിന്‍ സൂക്ഷിയ്ക്കുവാന്‍ സാധ്യമായ ഫയലുകള്‍."
 +
 +#: ../sepolicy/sepolicy/gui.py:415
 +#, python-format
 +msgid "Network Ports to which the '%s' is allowed to connect."
-+msgstr ""
++msgstr "കണക്ട് ചെയ്യുവാന്‍ അനുവദിയ്ക്കുന്ന '%s'-നുള്ള നെറ്റ്‌വര്‍ക്ക് പോര്‍ട്ടുകള്‍."
 +
 +#: ../sepolicy/sepolicy/gui.py:416
 +#, python-format
 +msgid "Network Ports to which the '%s' is allowed to listen."
-+msgstr ""
++msgstr "ശ്രദ്ധിയ്ക്കുവാന്‍ അനുവദിയ്ക്കുന്ന '%s'-നുള്ള നെറ്റ്‌വര്‍ക്ക് പോര്‍ട്ടുകള്‍."
 +
 +#: ../sepolicy/sepolicy/gui.py:417
 +#, python-format
 +msgid "File Types defined for the '%s'."
-+msgstr ""
++msgstr "'%s'-നു് നിഷ്കര്‍ഷിച്ചിട്ടുള്ള ഫയല്‍ തരങ്ങള്‍."
 +
 +#: ../sepolicy/sepolicy/gui.py:418
 +#, python-format
 +msgid ""
 +"Display boolean information that can be used to modify the policy for the "
 +"'%s'."
-+msgstr ""
++msgstr "'%s'-നുള്ള പോളിസി മാറ്റുന്നതിനുള്ള ബൂളിയന്‍ വിവരം കാണിയ്ക്കുക."
 +
 +#: ../sepolicy/sepolicy/gui.py:419
 +#, python-format
 +msgid "Display file type information that can be used by the '%s'."
-+msgstr ""
++msgstr "'%s'-നു് ഉപയോഗിയ്ക്കുവാന്‍ സാധ്യമായ ഫയല്‍ രിതിയിലുള്ള വിവരങ്ങള്‍ കാണിയ്ക്കുക."
 +
 +#: ../sepolicy/sepolicy/gui.py:420
 +#, python-format
 +msgid "Display network ports to which the '%s' can connect or listen to."
-+msgstr ""
++msgstr "'%s'-നു് കണക്ട് ചെയ്യുവാന്‍ അല്ലെങ്കില്‍ ശ്രദ്ധിയ്ക്കുവാനുള്ള നെറ്റ്‌വര്‍ക്ക് പോര്‍ട്ടുകള്‍ കാണിയ്ക്കുക."
 +
 +#: ../sepolicy/sepolicy/gui.py:421
 +#, python-format
 +msgid "Transitions Into '%s'"
-+msgstr ""
++msgstr "'%s'-ലേക്കുള്ള മാറ്റങ്ങള്‍"
 +
 +#: ../sepolicy/sepolicy/gui.py:422
 +#, python-format
 +msgid "Transitions From '%s'"
-+msgstr ""
++msgstr "'%s'-ല്‍ നിന്നുമുള്ള മാറ്റങ്ങള്‍"
 +
 +#: ../sepolicy/sepolicy/gui.py:423
 +#, python-format
 +msgid ""
 +"Executables which will transition to the '%s', when executing a selected "
 +"domains entrypoint."
-+msgstr ""
++msgstr "'%s'-ലേക്കു് മാറുന്ന എക്സിക്യൂട്ടബിളുകള്‍, തെരഞ്ഞെടുത്തൊരു ഡൊമെയിന്‍ എന്‍ട്രിപോയിന്റ് നടപ്പിലാക്കുമ്പോള്‍ മാത്രം."
 +
 +#: ../sepolicy/sepolicy/gui.py:424
 +#, python-format
 +msgid ""
 +"Executables which will transition to a different domain, when the '%s' "
 +"executes them."
-+msgstr ""
++msgstr "മറ്റൊരു ഡൊമെയിനിലേക്കു് മാറുന്ന എക്സിക്യൂട്ടബിളുകള്‍, ഇവിടെ '%s' അവയെ നടപ്പിലാക്കുന്നു."
 +
 +#: ../sepolicy/sepolicy/gui.py:425
 +#, python-format
 +msgid "Display applications that can transition into or out of the '%s'."
-+msgstr ""
++msgstr "'%s'-ല്‍ നിന്നോ അല്ലെങ്കില്‍ അതിലേക്കുള്ള പ്രയോഗങ്ങള്‍ കാണിയ്ക്കുക"
 +
 +#: ../sepolicy/sepolicy/gui.py:604
 +#, python-format
 +msgid "Boolean %s Allow Rules"
-+msgstr ""
++msgstr "ബൂളിയന്‍ %s നിയമങ്ങള്‍ അനുവദിയ്ക്കുന്നു"
 diff --git a/policycoreutils/po/mn.po b/policycoreutils/po/mn.po
 new file mode 100644
 index 0000000..b0d96a4
@@ -509292,7 +509379,7 @@ index 23de6f6..eaa500d 100644
      cat > ~/seremote << __EOF
  #!/bin/sh
 diff --git a/policycoreutils/sandbox/seunshare.c b/policycoreutils/sandbox/seunshare.c
-index dbd5977..b3f1275 100644
+index dbd5977..f39f039 100644
 --- a/policycoreutils/sandbox/seunshare.c
 +++ b/policycoreutils/sandbox/seunshare.c
 @@ -617,8 +617,8 @@ static int cleanup_tmpdir(const char *tmpdir, const char *src,
@@ -509306,7 +509393,15 @@ index dbd5977..b3f1275 100644
  		rc++;
  	}
  
-@@ -961,6 +961,7 @@ int main(int argc, char **argv) {
+@@ -833,6 +833,7 @@ int main(int argc, char **argv) {
+ 	char *tmpdir_s = NULL;	/* tmpdir spec'd by user in argv[] */
+ 	char *tmpdir_r = NULL;	/* tmpdir created by seunshare */
+ 
++	struct stat st_curhomedir;
+ 	struct stat st_homedir;
+ 	struct stat st_tmpdir_s;
+ 	struct stat st_tmpdir_r;
+@@ -961,6 +962,7 @@ int main(int argc, char **argv) {
  		char *display = NULL;
  		char *LANG = NULL;
  		int rc = -1;
@@ -509314,19 +509409,25 @@ index dbd5977..b3f1275 100644
  
  		if (unshare(CLONE_NEWNS) < 0) {
  			perror(_("Failed to unshare"));
-@@ -977,8 +978,10 @@ int main(int argc, char **argv) {
+@@ -977,8 +979,16 @@ int main(int argc, char **argv) {
  		/* assume fsuid==ruid after this point */
  		if ((uid_t)setfsuid(uid) != 0) goto childerr;
  
 +		resolved_path = realpath(pwd->pw_dir,NULL);
 +		if (! resolved_path) goto childerr;
++
++		if (verify_directory(resolved_path, NULL, &st_curhomedir) < 0)
++			goto childerr;
++		if (check_owner_uid(uid, resolved_path, &st_curhomedir) < 0)
++			goto childerr;
++
  		/* mount homedir and tmpdir, in this order */
 -		if (homedir_s && seunshare_mount(homedir_s, pwd->pw_dir,
 +		if (homedir_s && seunshare_mount(homedir_s, resolved_path,
  			&st_homedir) != 0) goto childerr;
  		if (tmpdir_s &&	seunshare_mount(tmpdir_r, "/tmp",
  			&st_tmpdir_r) != 0) goto childerr;
-@@ -1033,6 +1036,7 @@ int main(int argc, char **argv) {
+@@ -1033,6 +1043,7 @@ int main(int argc, char **argv) {
  		execv(argv[optind], argv + optind);
  		fprintf(stderr, _("Failed to execute command %s: %s\n"), argv[optind], strerror(errno));
  childerr:
@@ -509385,7 +509486,7 @@ index 7c6d75a..d095a25 100644
  .TP
  \fB\-d\fR
 diff --git a/policycoreutils/scripts/fixfiles b/policycoreutils/scripts/fixfiles
-index 6901e4d..9cfe355 100755
+index 6901e4d..8899c02 100755
 --- a/policycoreutils/scripts/fixfiles
 +++ b/policycoreutils/scripts/fixfiles
 @@ -3,7 +3,7 @@
@@ -509548,7 +509649,7 @@ index 6901e4d..9cfe355 100755
  #
  LogReadOnly() {
  if [ ! -z "$FILESYSTEMSRO" ]; then
-@@ -209,7 +209,7 @@ rpm -q --qf '[%{FILESTATES} %{FILENAMES}\n]' "$1" | grep '^0 ' | cut -f2- -d ' '
+@@ -209,11 +209,14 @@ rpm -q --qf '[%{FILESTATES} %{FILENAMES}\n]' "$1" | grep '^0 ' | cut -f2- -d ' '
  [ ${PIPESTATUS[0]} != 0 ] && echo "$1 not found" >/dev/stderr
  }
  
@@ -509557,7 +509658,14 @@ index 6901e4d..9cfe355 100755
  # restore
  # if called with -n will only check file context
  #
-@@ -241,8 +241,8 @@ then
+ restore () {
++OPTION=$1
++shift
++
+ if [ ! -z "$PREFC" ]; then
+     diff_filecontext $*
+     exit $?
+@@ -241,8 +244,8 @@ then
  	TEMPFCFILE=`mktemp ${FC}.XXXXXXXXXX`
  	test -z "$TEMPFCFILE" && exit
  	/bin/cp -p ${FC} ${TEMPFCFILE} &>/dev/null || exit
@@ -509568,16 +509676,25 @@ index 6901e4d..9cfe355 100755
  	do
  		p="${p%/}"
  		p1="${p}(/.*)? -- <<none>>"
-@@ -253,7 +253,7 @@ FC=$TEMPFCFILE
+@@ -252,11 +255,15 @@ then
+ FC=$TEMPFCFILE
  fi
  if [  -n "${FILESYSTEMSRW}" ]; then
-     echo "Relabeling `echo ${FILESYSTEMSRW}`"
+-    echo "Relabeling `echo ${FILESYSTEMSRW}`"
 -    ${SETFILES} ${VERBOSE} -q ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 | cat >> $LOGFILE
++    echo "${OPTION}ing `echo ${FILESYSTEMSRW}`"
 +    ${SETFILES} ${VERBOSE} $exclude_dirs -q ${FORCEFLAG} $* ${FC} ${FILESYSTEMSRW} 2>&1 | cat >> $LOGFILE
  else
      echo >&2 "fixfiles: No suitable file systems found"
  fi
-@@ -265,7 +265,7 @@ find /tmp \( -context "*:${UNLABELED}*" -o -context "*:${UNDEFINED}*" \) \( -typ
++if [ ${OPTION} != "Relabel" ]; then
++    return
++fi
++echo "Cleaning up labels on /tmp"
+ rm -rf /tmp/gconfd-* /tmp/pulse-* /tmp/orbit-* $TEMPFCFILE
+ 
+ UNDEFINED=`get_undefined_type` || exit $?
+@@ -265,7 +272,7 @@ find /tmp \( -context "*:${UNLABELED}*" -o -context "*:${UNDEFINED}*" \) \( -typ
  find /tmp \( -context "*:${UNLABELED}*" -o -context "*:${UNDEFINED}*" \) -exec chcon --reference /tmp {} \;
  find /var/tmp \( -context "*:${UNLABELED}*" -o -context "*:${UNDEFINED}*" \) -exec chcon --reference /var/tmp {} \;
  find /var/run \( -context "*:${UNLABELED}*" -o -context "*:${UNDEFINED}*" \) -exec chcon --reference /var/run {} \;
@@ -509586,16 +509703,22 @@ index 6901e4d..9cfe355 100755
  exit $?
  }
  
-@@ -278,7 +278,7 @@ fullrelabel() {
+@@ -273,12 +280,12 @@ fullrelabel() {
+     logit "Cleaning out /tmp"
+     find /tmp/ -mindepth 1 -delete
+     LogReadOnly
+-    restore
++    restore Relabel
+ }
  
  relabel() {
      if [ ! -z "$RPMFILES" ]; then
 -	restore 
-+	restore
++	restore Relabel
      fi
  
      if [ $fullFlag == 1  ]; then
-@@ -286,13 +286,13 @@ relabel() {
+@@ -286,16 +293,16 @@ relabel() {
      fi
  
      echo -n "
@@ -509612,8 +509735,25 @@ index 6901e4d..9cfe355 100755
 +    if [ "$answer" = y -o  "$answer" = Y ]; then
  	fullrelabel
      else
- 	restore
-@@ -322,14 +322,14 @@ case "$1" in
+-	restore
++	restore Relabel
+     fi
+ }
+ 
+@@ -304,9 +311,9 @@ process() {
+ # Make sure they specified one of the three valid commands
+ #
+ case "$1" in
+-    restore) restore;;
+-    check) restore -n -v;;
+-    verify) restore -n -o -;;
++    restore) restore Relabel;;
++    check) restore Check -n -v;;
++    verify) restore Verify -n -o -;;
+     relabel) relabel;;
+     onboot)
+ 	> /.autorelabel
+@@ -322,14 +329,14 @@ case "$1" in
  esac
  }
  usage() {
@@ -509633,7 +509773,7 @@ index 6901e4d..9cfe355 100755
  """
  }
  
-@@ -343,7 +343,6 @@ while getopts "N:BC:FfR:l:v" i; do
+@@ -343,7 +350,6 @@ while getopts "N:BC:FfR:l:v" i; do
      case "$i" in
  	B)
  		BOOTTIME=`/bin/who -b | awk '{print $3}'`
@@ -509641,7 +509781,7 @@ index 6901e4d..9cfe355 100755
  		;;
  	f)
  		fullFlag=1
-@@ -351,13 +350,13 @@ while getopts "N:BC:FfR:l:v" i; do
+@@ -351,13 +357,13 @@ while getopts "N:BC:FfR:l:v" i; do
  	v)
  		VERBOSE="-v"
  		;;
@@ -509658,7 +509798,7 @@ index 6901e4d..9cfe355 100755
  		PREFC=$OPTARG
  		;;
  	F)
-@@ -397,11 +396,11 @@ else
+@@ -397,11 +403,11 @@ else
      if [ -z "$1" ]; then
  	process $command
      else
@@ -509801,7 +509941,7 @@ index 6c30734..f6b4b9a 100644
  will try reading a context from stdin, if that is not a tty, otherwise 
  .B secon
 diff --git a/policycoreutils/semanage/Makefile b/policycoreutils/semanage/Makefile
-index 24d6a21..d3aff45 100644
+index 24d6a21..8fc8e0b 100644
 --- a/policycoreutils/semanage/Makefile
 +++ b/policycoreutils/semanage/Makefile
 @@ -5,7 +5,7 @@ SBINDIR ?= $(PREFIX)/sbin
@@ -509826,7 +509966,7 @@ index 24d6a21..d3aff45 100644
 +	install -m 644 $(BASHCOMPLETIONS) $(BASHCOMPLETIONDIR)/semanage
  
 +test:
-+	@python test-semanage.py -v
++	@python test-semanage.py -a
  clean:
  
  indent:
@@ -509975,7 +510115,7 @@ index 0000000..e2befdb
 +      packages=["policycoreutils"],
 +)
 diff --git a/policycoreutils/semanage/semanage b/policycoreutils/semanage/semanage
-index 6e33c85..2c1c855 100644
+index 6e33c85..e4ecada 100644
 --- a/policycoreutils/semanage/semanage
 +++ b/policycoreutils/semanage/semanage
 @@ -1,5 +1,7 @@
@@ -509987,7 +510127,7 @@ index 6e33c85..2c1c855 100644
  # see file 'COPYING' for use and warranty information
  #
  # semanage is a tool for managing SELinux configuration files
-@@ -19,564 +21,795 @@
+@@ -19,564 +21,821 @@
  #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA     
  #                                        02111-1307  USA
  #
@@ -510481,23 +510621,31 @@ index 6e33c85..2c1c855 100644
 +        OBJECT.enable(args.module_name)
 +    if args.action == "disable":
 +        OBJECT.disable(args.module_name)
-+    if args.action == "delete":
++    if args.action == "remove":
 +        OBJECT.delete(args.module_name)
++    if args.action is "deleteall":
++        OBJECT.deleteall()
 +    if args.action == "list":
-+        OBJECT.list(args.noheading)
++        OBJECT.list(args.noheading, args.locallist)
++    if args.action is "extract":
++        for i in OBJECT.customized():
++            print "module %s" % str(i)
 +
 +def setupModuleParser(subparsers):
 +    moduleParser = subparsers.add_parser('module', help=_('Manage SELinux policy modules'))
 +    parser_add_noheading(moduleParser, "module")
 +    parser_add_noreload(moduleParser, "module")
 +    parser_add_store(moduleParser, "module")
++    parser_add_locallist(moduleParser, "module")
 +
 +    mgroup = moduleParser.add_mutually_exclusive_group(required=True)
 +    parser_add_add(mgroup, "module")
-+    parser_add_delete(mgroup, "module")
-+    parser_add_modify(mgroup, "module")
 +    parser_add_list(mgroup, "module")
-+
++    parser_add_extract(mgroup, "module")
++    parser_add_deleteall(mgroup, "module")
++    mgroup.add_argument('-r', '--remove', dest='action', action='store_const', const='remove', help=_("Remove a module"))
++    mgroup.add_argument('-d', '--disable', dest='action', action='store_const', const='disable', help=_("Disable a module"))
++    mgroup.add_argument('-e', '--enable', dest='action', action='store_const', const='enable', help=_("Enable a module"))
 +    moduleParser.add_argument('module_name', nargs='?', default=None, help=_('Name of the module to act on'))
 +    moduleParser.set_defaults(func=handleModule)
 +    
@@ -510636,7 +510784,7 @@ index 6e33c85..2c1c855 100644
 +    dontauditParser.set_defaults(func=handleDontaudit)
 +
 +def handleExport(args):
-+    manageditems=[ "boolean", "login", "interface", "user", "port", "node", "fcontext"]
++    manageditems=[ "boolean", "login", "interface", "user", "port", "node", "fcontext", "module"]
 +    for i in manageditems:
 +        OBJECT = object_dict[i]()
 +        print "%s -D" % i
@@ -510753,16 +510901,34 @@ index 6e33c85..2c1c855 100644
 +
 +    return commandParser
 +
++def make_io_args(args):
++    # import/export backward compability
++    args_origin = ["-S", "-o", "-i", "targeted", "minumum", "mls"]
++    args_file = []
++    args_ie = []
++    args_subcommand = []
++
++    for i in args:
++        if i == "-o":
++            args_subcommand = ["export"]
++            continue
++        if i == "-i":
++            args_subcommand = ["import"]
++            continue
++        if i not in args_origin:
++            args_file = ["-f", i]
++            continue
++        args_ie.append(i)
++
++    return args_subcommand+args_ie+args_file
++
 +def make_args(sys_args):
 +    args = []
-+    for i in sys_args[1:]:
-+        if i == '-o':
-+            args += [ "export", "-f" ]
-+            continue
-+        if i == '-i':
-+            args += [ "import", "-f" ]
-+            continue
-+        args.append(i)
++    if "-o" in sys_args[1:] or "-i" in sys_args[1:]:
++        args=make_io_args(sys_args[1:])
++    else:
++        args=sys_args[1:]
++
 +    return args
 +
 +def do_parser():
@@ -511431,7 +511597,7 @@ index edefd9a..ed31356 100644
          return 0
 diff --git a/policycoreutils/semanage/semanage-boolean.8 b/policycoreutils/semanage/semanage-boolean.8
 new file mode 100644
-index 0000000..0a59e07
+index 0000000..361a8d3
 --- /dev/null
 +++ b/policycoreutils/semanage/semanage-boolean.8
 @@ -0,0 +1,61 @@
@@ -511439,7 +511605,7 @@ index 0000000..0a59e07
 +.SH "NAME"
 +semanage boolean\- SELinux Policy Management boolean tool
 +.SH "SYNOPSIS"
-+.B semanage boolean [\-h] [\-n] [\-N] [\-s STORE] [  \-\-extract  | \-\-deleteall  | \-\-list \-C | \-\-modify ( \-\-on | \-\-off ) boolean  ]
++.B semanage boolean [\-h] [\-n] [\-N] [\-s STORE] [  \-\-extract  | \-\-deleteall  | \-\-list [\-C] | \-\-modify ( \-\-on | \-\-off ) boolean  ]
 +
 +.SH "DESCRIPTION"
 +semanage is used to configure certain elements of
@@ -511460,7 +511626,7 @@ index 0000000..0a59e07
 +Select an alternate SELinux Policy Store to manage
 +.TP
 +.I  \-C, \-\-locallist
-+List OBJECTS local customizations
++List local customizations
 +.TP
 +.I  \-m, \-\-modify
 +Modify a record of the specified object type
@@ -511472,7 +511638,7 @@ index 0000000..0a59e07
 +Extract customizable commands, for use within a transaction
 +.TP
 +.I  \-D, \-\-deleteall
-+Remove all OBJECTS local customizations
++Remove all local customizations
 +.TP
 +.I  \-1, \-\-on
 +Enable the boolean
@@ -511581,7 +511747,7 @@ index 0000000..1b20c82
 +This man page was written by Daniel Walsh <dwalsh@redhat.com>
 diff --git a/policycoreutils/semanage/semanage-fcontext.8 b/policycoreutils/semanage/semanage-fcontext.8
 new file mode 100644
-index 0000000..ba2355a
+index 0000000..3fdd937
 --- /dev/null
 +++ b/policycoreutils/semanage/semanage-fcontext.8
 @@ -0,0 +1,87 @@
@@ -511590,7 +511756,7 @@ index 0000000..ba2355a
 +semanage fcontext\- SELinux Policy Management file context tool
 +
 +.SH "SYNOPSIS"
-+.B semanage fcontext [\-h] [\-n] [\-N] [\-s STORE] [ \-\-add ( \-t TYPE \-f FTYPE \-r RANGE \-s SEUSER | \-e EQUAL ) FILE_SPEC ) | \-\-delete ( \-t TYPE \-f FTYPE | \-e EQUAL ) FILE_SPEC ) | \-\-deleteall  | \-\-extract  | \-\-list \-C | \-\-modify ( \-t TYPE \-f FTYPE \-r RANGE \-s SEUSER | \-e EQUAL ) FILE_SPEC ) ]
++.B semanage fcontext [\-h] [\-n] [\-N] [\-s STORE] [ \-\-add ( \-t TYPE \-f FTYPE \-r RANGE \-s SEUSER | \-e EQUAL ) FILE_SPEC ) | \-\-delete ( \-t TYPE \-f FTYPE | \-e EQUAL ) FILE_SPEC ) | \-\-deleteall  | \-\-extract  | \-\-list [\-C] | \-\-modify ( \-t TYPE \-f FTYPE \-r RANGE \-s SEUSER | \-e EQUAL ) FILE_SPEC ) ]
 +
 +.SH "DESCRIPTION"
 +semanage is used to configure certain elements of
@@ -511610,7 +511776,7 @@ index 0000000..ba2355a
 +Do not reload policy after commit
 +.TP
 +.I   \-C, \-\-locallist
-+List OBJECTS local customizations
++List local customizations
 +.TP
 +.I   \-S STORE, \-\-store STORE
 +Select an alternate SELinux Policy Store to manage
@@ -511631,7 +511797,7 @@ index 0000000..ba2355a
 +Extract customizable commands, for use within a transaction
 +.TP
 +.I   \-D, \-\-deleteall
-+Remove all OBJECTS local customizations
++Remove all local customizations
 +.TP
 +.I   \-e EQUAL, \-\-equal EQUAL
 +Substitute target path with sourcepath when generating default label. This is used with fcontext. Requires source and target path arguments. The context labeling for the target subtree is made equivalent to that defined for the source.
@@ -511716,7 +511882,7 @@ index 0000000..fb95a04
 +This man page was written by Daniel Walsh <dwalsh@redhat.com>
 diff --git a/policycoreutils/semanage/semanage-interface.8 b/policycoreutils/semanage/semanage-interface.8
 new file mode 100644
-index 0000000..7c67718
+index 0000000..c9dd59c
 --- /dev/null
 +++ b/policycoreutils/semanage/semanage-interface.8
 @@ -0,0 +1,63 @@
@@ -511724,7 +511890,7 @@ index 0000000..7c67718
 +.SH "NAME"
 +.B semanage interface\- SELinux Policy Management network interface tool
 +.SH "SYNOPSIS"
-+.B semanage interface [-h] [-n] [-N] [-s STORE] [ --add -t TYPE -r RANGE interface | --delete interface | --deleteall  | --extract  | --list -C | --modify -t TYPE -r RANGE interface ]
++.B semanage interface [\-h] [\-n] [\-N] [\-s STORE] [ \-\-add \-t TYPE \-r RANGE interface | \-\-delete interface | \-\-deleteall  | \-\-extract  | \-\-list [\-C] | \-\-modify \-t TYPE \-r RANGE interface ]
 +
 +.SH "DESCRIPTION"
 +semanage is used to configure certain elements of
@@ -511746,7 +511912,7 @@ index 0000000..7c67718
 +Select an alternate SELinux Policy Store to manage
 +.TP
 +.I  \-C, \-\-locallist
-+List OBJECTS local customizations
++List local customizations
 +.TP
 +.I  \-a, \-\-add
 +Add a record of the specified object type
@@ -511764,7 +511930,7 @@ index 0000000..7c67718
 +Extract customizable commands, for use within a transaction
 +.TP
 +.I  \-D, \-\-deleteall
-+Remove all OBJECTS local customizations
++Remove all local customizations
 +.TP
 +.I  \-t TYPE, \-\-type TYPE
 +SELinux type for the object
@@ -511785,7 +511951,7 @@ index 0000000..7c67718
 +This man page was written by Daniel Walsh <dwalsh@redhat.com>
 diff --git a/policycoreutils/semanage/semanage-login.8 b/policycoreutils/semanage/semanage-login.8
 new file mode 100644
-index 0000000..84f106d
+index 0000000..78a0ecb
 --- /dev/null
 +++ b/policycoreutils/semanage/semanage-login.8
 @@ -0,0 +1,68 @@
@@ -511793,7 +511959,7 @@ index 0000000..84f106d
 +.SH "NAME"
 +.B semanage login\- SELinux Policy Management linux user to SELinux User mapping tool
 +.SH "SYNOPSIS"
-+.B semanage login [\-h] [\-n] [\-N] [\-s STORE] [ \-\-add \-s SEUSER \-r RANGE LOGIN | \-\-delete LOGIN | \-\-deleteall  | \-\-extract  | \-\-list \-C | \-\-modify \-s SEUSER \-r RANGE LOGIN ]
++.B semanage login [\-h] [\-n] [\-N] [\-s STORE] [ \-\-add \-s SEUSER \-r RANGE LOGIN | \-\-delete LOGIN | \-\-deleteall  | \-\-extract  | \-\-list [\-C] | \-\-modify \-s SEUSER \-r RANGE LOGIN ]
 +
 +.SH "DESCRIPTION"
 +semanage is used to configure certain elements of
@@ -511812,7 +511978,7 @@ index 0000000..84f106d
 +Do not reload policy after commit
 +.TP
 +.I  \-C, \-\-locallist
-+List OBJECTS local customizations
++List local customizations
 +.TP
 +.I  \-S STORE, \-\-store STORE
 +Select an alternate SELinux Policy Store to manage
@@ -511833,7 +511999,7 @@ index 0000000..84f106d
 +Extract customizable commands, for use within a transaction
 +.TP
 +.I  \-D, \-\-deleteall
-+Remove all OBJECTS local customizations
++Remove all local customizations
 +.TP
 +.I  \-s SEUSER, \-\-seuser SEUSER
 +SELinux user name
@@ -511859,17 +512025,15 @@ index 0000000..84f106d
 +This man page was written by Daniel Walsh <dwalsh@redhat.com>
 diff --git a/policycoreutils/semanage/semanage-module.8 b/policycoreutils/semanage/semanage-module.8
 new file mode 100644
-index 0000000..12897dc
+index 0000000..3f82535
 --- /dev/null
 +++ b/policycoreutils/semanage/semanage-module.8
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,60 @@
 +.TH "semanage-module" "8" "20130617" "" ""
 +.SH "NAME"
 +.B semanage module\\- SELinux Policy Management module mapping tool
 +.SH "SYNOPSIS"
-+.B semanage module [\-h] [\-n] [\-N] [\-S STORE]
-+		       (\-a | \-d | \-m {enable,disable} | \-l)
-+		       [module_name]
++.B semanage module [\-h] [\-n] [\-N] [\-S STORE] (\-a | \-r | \-e | \-d | \-\-extract | \-\-list [\-C] | \-\-deleteall) [module_name]
 +
 +.SH "DESCRIPTION"
 +semanage is used to configure certain elements of SELinux policy without requiring modification to or recompilation from policy sources.  semanage module installs, removes, disables SELinux Policy modules.
@@ -511889,16 +512053,25 @@ index 0000000..12897dc
 +Select an alternate SELinux Policy Store to manage
 +.TP
 +.I   \-a, \-\-add
-+Add a record of the specified object type
++Install specified module
 +.TP
-+.I   \-d, \-\-delete
-+Delete a record of the specified object type
++.I   \-r, \-\-remove
++Remove specified module
 +.TP
-+.I   \-m {enable,disable}, \-\-modify {enable,disable}
-+Enable or Disable specified module
++.I   \-d \-\-disable
++Disable specified module
++.TP
++.I   \-e \-\-enable
++Enable specified module
++.TP
++.I   \-E, \-\-extract         
++Extract customizable commands, for use within a transaction
 +.TP
 +.I   \-l, \-\-list
 +List records of the specified object type
++.TP
++.I   \-C, \-\-locallist       
++List local customizations
 +
 +.SH EXAMPLE
 +.nf
@@ -511918,7 +512091,7 @@ index 0000000..12897dc
 +This man page was written by Daniel Walsh <dwalsh@redhat.com>
 diff --git a/policycoreutils/semanage/semanage-node.8 b/policycoreutils/semanage/semanage-node.8
 new file mode 100644
-index 0000000..dd54a94
+index 0000000..75c2d30
 --- /dev/null
 +++ b/policycoreutils/semanage/semanage-node.8
 @@ -0,0 +1,58 @@
@@ -511926,7 +512099,7 @@ index 0000000..dd54a94
 +.SH "NAME"
 +.B semanage node\- SELinux Policy Management node mapping tool
 +.SH "SYNOPSIS"
-+.B semanage node [-h] [-n] [-N] [-s STORE] [ --add -M NETMASK -p PROTOCOL -t TYPE -r RANGE node | --delete -M NETMASK -p PROTOCOL node | --deleteall  | --extract  | --list -C | --modify -M NETMASK -p PROTOCOL -t TYPE -r RANGE node ]
++.B semanage node [\-h] [\-n] [\-N] [\-s STORE] [ \-\-add \-M NETMASK \-p PROTOCOL \-t TYPE \-r RANGE node | \-\-delete \-M NETMASK \-p PROTOCOL node | \-\-deleteall  | \-\-extract  | \-\-list [\-C] | \-\-modify \-M NETMASK \-p PROTOCOL \-t TYPE \-r RANGE node ]
 +
 +.SH "DESCRIPTION"
 +semanage is used to configure certain elements of
@@ -511948,7 +512121,7 @@ index 0000000..dd54a94
 +Select an alternate SELinux Policy Store to manage
 +.TP
 +.I   \-C, \-\-locallist
-+List OBJECTS local customizations
++List local customizations
 +.TP
 +.I   \-a, \-\-add
 +Add a record of the specified object type
@@ -511966,7 +512139,7 @@ index 0000000..dd54a94
 +Extract customizable commands, for use within a transaction
 +.TP
 +.I   \-D, \-\-deleteall
-+Remove all OBJECTS local customizations
++Remove all local customizations
 +.TP
 +.I   \-M NETMASK, \-\-netmask NETMASK
 +Network Mask
@@ -512033,7 +512206,7 @@ index 0000000..9a143df
 +This man page was written by Daniel Walsh <dwalsh@redhat.com>
 diff --git a/policycoreutils/semanage/semanage-port.8 b/policycoreutils/semanage/semanage-port.8
 new file mode 100644
-index 0000000..d460cfc
+index 0000000..cd0a1b4
 --- /dev/null
 +++ b/policycoreutils/semanage/semanage-port.8
 @@ -0,0 +1,68 @@
@@ -512041,7 +512214,7 @@ index 0000000..d460cfc
 +.SH "NAME"
 +.B semanage port\- SELinux Policy Management port mapping tool
 +.SH "SYNOPSIS"
-+.B semanage port [\-h] [\-n] [\-N] [\-s STORE] [ \-\-add \-t TYPE \-p PROTOCOL \-r RANGE port_name | port_range | \-\-delete \-p PROTOCOL port_name | port_range | \-\-deleteall  | \-\-extract  | \-\-list \-C | \-\-modify \-t TYPE \-p PROTOCOL \-r RANGE port_name | port_range ]
++.B semanage port [\-h] [\-n] [\-N] [\-s STORE] [ \-\-add \-t TYPE \-p PROTOCOL \-r RANGE port_name | port_range | \-\-delete \-p PROTOCOL port_name | port_range | \-\-deleteall  | \-\-extract  | \-\-list [\-C] | \-\-modify \-t TYPE \-p PROTOCOL \-r RANGE port_name | port_range ]
 +
 +.SH "DESCRIPTION"
 +semanage is used to configure certain elements of SELinux policy without requiring modification to or recompilation from policy sources.  semanage port controls the port number to port type defitions.
@@ -512061,7 +512234,7 @@ index 0000000..d460cfc
 +Select an alternate SELinux Policy Store to manage
 +.TP
 +.I   \-C, \-\-locallist
-+List OBJECTS local customizations
++List local customizations
 +.TP
 +.I   \-a, \-\-add
 +Add a record of the specified object type
@@ -512079,7 +512252,7 @@ index 0000000..d460cfc
 +Extract customizable commands, for use within a transaction
 +.TP
 +.I   \-D, \-\-deleteall
-+Remove all OBJECTS local customizations
++Remove all local customizations
 +.TP
 +.I   \-t TYPE, \-\-type TYPE
 +SELinux type for the object
@@ -512107,7 +512280,7 @@ index 0000000..d460cfc
 +This man page was written by Daniel Walsh <dwalsh@redhat.com>
 diff --git a/policycoreutils/semanage/semanage-user.8 b/policycoreutils/semanage/semanage-user.8
 new file mode 100644
-index 0000000..d811d24
+index 0000000..6d8c0cb
 --- /dev/null
 +++ b/policycoreutils/semanage/semanage-user.8
 @@ -0,0 +1,71 @@
@@ -512115,7 +512288,7 @@ index 0000000..d811d24
 +.SH "NAME"
 +.B semanage user\- SELinux Policy Management SELinux User mapping tool
 +.SH "SYNOPSIS"
-+.B  semanage user [\-h] [\-n] [\-N] [\-s STORE] [ \-\-add ( \-L LEVEL \-R ROLES \-r RANGE \-s SEUSER selinux_name) | \-\-delete selinux_name | \-\-deleteall  | \-\-extract  | \-\-list \-C | \-\-modify ( \-L LEVEL \-R ROLES \-r RANGE \-s SEUSER selinux_name ) ]
++.B  semanage user [\-h] [\-n] [\-N] [\-s STORE] [ \-\-add ( \-L LEVEL \-R ROLES \-r RANGE \-s SEUSER selinux_name) | \-\-delete selinux_name | \-\-deleteall  | \-\-extract  | \-\-list [\-C] | \-\-modify ( \-L LEVEL \-R ROLES \-r RANGE \-s SEUSER selinux_name ) ]
 +
 +.SH "DESCRIPTION"
 +semanage is used to configure certain elements of
@@ -512137,7 +512310,7 @@ index 0000000..d811d24
 +Select an alternate SELinux Policy Store to manage
 +.TP
 +.I   \-C, \-\-locallist       
-+List OBJECTS local customizations
++List local customizations
 +.TP
 +.I   \-a, \-\-add             
 +Add a record of the specified object type
@@ -512155,7 +512328,7 @@ index 0000000..d811d24
 +Extract customizable commands, for use within a transaction
 +.TP
 +.I   \-D, \-\-deleteall       
-+Remove all OBJECTS local customizations
++Remove all local customizations
 +.TP
 +.I   \-L LEVEL, \-\-level LEVEL
 +Default SELinux Level for SELinux user, s0 Default. (MLS/MCS Systems only)
@@ -512452,7 +512625,7 @@ index 28a9022..90b142e 100644
 +usage: semanage [-h]
 +                
 diff --git a/policycoreutils/semanage/seobject.py b/policycoreutils/semanage/seobject.py
-index 85bc37f..f2981c0 100644
+index 85bc37f..2c861ec 100644
 --- a/policycoreutils/semanage/seobject.py
 +++ b/policycoreutils/semanage/seobject.py
 @@ -32,32 +32,47 @@ from IPy import IP
@@ -512518,7 +512691,26 @@ index 85bc37f..f2981c0 100644
  			if sename != "":
  				message += " sename=" + sename
  			if oldsename != "":
-@@ -285,6 +300,8 @@ class moduleRecords(semanageRecords):
+@@ -270,6 +285,12 @@ class moduleRecords(semanageRecords):
+                       l.append((semanage_module_get_name(mod), semanage_module_get_version(mod), semanage_module_get_enabled(mod)))
+                return l
+ 
++        def customized(self):
++		all = self.get_all()
++		if len(all) == 0:
++			return 
++                return map(lambda x: "-d %s" % x[0], filter(lambda t: t[2] == 0, all))
++
+ 	def list(self, heading = 1, locallist = 0):
+ 		all = self.get_all()
+ 		if len(all) == 0:
+@@ -281,10 +302,14 @@ class moduleRecords(semanageRecords):
+                        if t[2] == 0:
+                               disabled = _("Disabled")
+                        else:
++                              if locallist:
++                                      continue
+                               disabled = ""
                         print "%-25s%-10s%s" % (t[0], t[1], disabled)
  
  	def add(self, file):
@@ -512527,7 +512719,19 @@ index 85bc37f..f2981c0 100644
                 rc = semanage_module_install_file(self.sh, file);
                 if rc >= 0:
                        self.commit()
-@@ -461,7 +478,9 @@ class loginRecords(semanageRecords):
+@@ -324,6 +349,11 @@ class moduleRecords(semanageRecords):
+ 
+                self.commit()
+ 
++	def deleteall(self):
++                l = map(lambda x: x[0], filter(lambda t: t[2] == 0, self.get_all()))
++                for m in l:
++                        self.enable(m)
++
+ class dontauditClass(semanageRecords):
+ 	def __init__(self, store):
+                semanageRecords.__init__(self, store)
+@@ -461,7 +491,9 @@ class loginRecords(semanageRecords):
  		if rc < 0:
  			raise ValueError(_("Could not check if login mapping for %s is defined") % name)
  		if exists:
@@ -512538,7 +512742,7 @@ index 85bc37f..f2981c0 100644
                  if name[0] == '%':
                         try:
                                grp.getgrnam(name[1:])
-@@ -731,7 +750,8 @@ class seluserRecords(semanageRecords):
+@@ -731,7 +763,8 @@ class seluserRecords(semanageRecords):
                  if rc < 0:
                         raise ValueError(_("Could not check if SELinux user %s is defined") % name)
                  if exists:
@@ -512548,7 +512752,7 @@ index 85bc37f..f2981c0 100644
  
                  (rc, u) = semanage_user_create(self.sh)
                  if rc < 0:
-@@ -999,8 +1019,10 @@ class portRecords(semanageRecords):
+@@ -999,8 +1032,10 @@ class portRecords(semanageRecords):
  			raise ValueError(_("Type %s is invalid, must be a port type") % type)
  
  		( k, proto_d, low, high ) = self.__genkey(port, proto)			
@@ -512561,7 +512765,7 @@ index 85bc37f..f2981c0 100644
  		if rc < 0:
  			raise ValueError(_("Could not check if port %s/%s is defined") % (proto, port))
  		if exists:
-@@ -1274,7 +1296,8 @@ class nodeRecords(semanageRecords):
+@@ -1274,7 +1309,8 @@ class nodeRecords(semanageRecords):
  
                 (rc, exists) = semanage_node_exists(self.sh, k)
                 if exists:
@@ -512571,7 +512775,7 @@ index 85bc37f..f2981c0 100644
  
                 (rc, node) = semanage_node_create(self.sh)
                 if rc < 0:
-@@ -1475,7 +1498,8 @@ class interfaceRecords(semanageRecords):
+@@ -1475,7 +1511,8 @@ class interfaceRecords(semanageRecords):
  		if rc < 0:
  			raise ValueError(_("Could not check if interface %s is defined") % interface)
  		if exists:
@@ -512581,7 +512785,7 @@ index 85bc37f..f2981c0 100644
  
  		(rc, iface) = semanage_iface_create(self.sh)
  		if rc < 0:
-@@ -1643,6 +1667,7 @@ class fcontextRecords(semanageRecords):
+@@ -1643,6 +1680,7 @@ class fcontextRecords(semanageRecords):
  	try:
  		valid_types =  sepolicy.info(sepolicy.ATTRIBUTE,"file_type")[0]["types"]
  		valid_types +=  sepolicy.info(sepolicy.ATTRIBUTE,"device_node")[0]["types"]
@@ -512589,7 +512793,20 @@ index 85bc37f..f2981c0 100644
  	except RuntimeError:
  		valid_types = []
  
-@@ -1751,9 +1776,15 @@ class fcontextRecords(semanageRecords):
+@@ -1696,6 +1734,12 @@ class fcontextRecords(semanageRecords):
+ 
+         def add_equal(self, target, substitute):
+                 self.begin()
++                if target != "/" and target[-1] == "/":
++                        raise ValueError(_("Target %s is not valid. Target is not allowed to end with '/'") % target )
++
++                if substitute != "/" and substitute[-1] == "/":
++                       raise ValueError(_("Substiture %s is not valid. Substitute is not allowed to end with '/'") % substitute )
++
+                 if target in self.equiv.keys():
+                        raise ValueError(_("Equivalence class for %s already exists") % target)
+                 self.validate(target)
+@@ -1751,9 +1795,15 @@ class fcontextRecords(semanageRecords):
  				       raise ValueError(_("File spec %s conflicts with equivalency rule '%s %s'; Try adding '%s' instead") % (target, i, fdict[i], t))
  
  
@@ -512606,7 +512823,7 @@ index 85bc37f..f2981c0 100644
  		if is_mls_enabled == 1:
                         serange = untranslate(serange)
  			
-@@ -1777,7 +1808,8 @@ class fcontextRecords(semanageRecords):
+@@ -1777,7 +1827,8 @@ class fcontextRecords(semanageRecords):
                                raise ValueError(_("Could not check if file context for %s is defined") % target)
  
                  if exists:
@@ -512616,7 +512833,7 @@ index 85bc37f..f2981c0 100644
  
  		(rc, fcontext) = semanage_fcontext_create(self.sh)
  		if rc < 0:
-@@ -1966,11 +1998,11 @@ class fcontextRecords(semanageRecords):
+@@ -1966,11 +2017,11 @@ class fcontextRecords(semanageRecords):
                 keys.sort()
                 for k in keys:
                        if fcon_dict[k]:
@@ -512630,7 +512847,7 @@ index 85bc37f..f2981c0 100644
                 return l
  
  	def list(self, heading = 1, locallist = 0 ):
-@@ -2156,7 +2188,7 @@ class booleanRecords(semanageRecords):
+@@ -2156,7 +2207,7 @@ class booleanRecords(semanageRecords):
                 keys.sort()
                 for k in keys:
                        if ddict[k]:
@@ -512641,14 +512858,16 @@ index 85bc37f..f2981c0 100644
  	def list(self, heading = True, locallist = False, use_file = False):
 diff --git a/policycoreutils/semanage/test-semanage.py b/policycoreutils/semanage/test-semanage.py
 new file mode 100644
-index 0000000..2aeffba
+index 0000000..6363398
 --- /dev/null
 +++ b/policycoreutils/semanage/test-semanage.py
-@@ -0,0 +1,189 @@
-+import unittest, os, shutil 
+@@ -0,0 +1,285 @@
++import unittest, os, shutil, sys
 +from tempfile import mkdtemp
 +from subprocess import Popen, PIPE
 +
++import argparse
++
 +object_list = [ 'login', 'user', 'port', 'module', 'interface', 'node', 'fcontext', 'boolean','permissive', "dontaudit"]
 +
 +class SemanageTests(unittest.TestCase):
@@ -512681,10 +512900,26 @@ index 0000000..2aeffba
 +        p = Popen(['semanage', "export", '-f', '/tmp/out'], stdout = PIPE)
 +        out, err = p.communicate()
 +        self.assertSuccess(p.returncode, err)
++        print("Verify semanage export -S targeted -f -")
++        p = Popen(["semanage","export","-S","targeted","-f","-"], stdout = PIPE)
++        out, err = p.communicate()
++        self.assertSuccess(p.returncode, err)
++        print("Verify semanage -S targeted -o -")
++        p = Popen(["semanage","-S","targeted","-o","-"], stdout = PIPE)
++        out, err = p.communicate()
++        self.assertSuccess(p.returncode, err)
 +        print("Verify semanage import -f /tmp/out")
 +        p = Popen(['semanage', "import", '-f', '/tmp/out'], stdout = PIPE)
 +        out, err = p.communicate()
 +        self.assertSuccess(p.returncode, err)
++        print("Verify semanage import -S targeted -f /tmp/out")
++        p = Popen(["semanage","import","-S","targeted","-f", "/tmp/out"], stdout = PIPE)
++        out, err = p.communicate()
++        self.assertSuccess(p.returncode, err)
++        print("Verify semanage -S targeted -i /tmp/out")
++        p = Popen(["semanage", "-S","targeted","-i", "/tmp/out"], stdout = PIPE)
++        out, err = p.communicate()
++        self.assertSuccess(p.returncode, err)
 +
 +    def test_list(self):
 +        for object in object_list:
@@ -512827,11 +513062,89 @@ index 0000000..2aeffba
 +            p = Popen(["semanage", "user", "-d", "testuser_u" ], stdout = PIPE)
 +            out, err = p.communicate()
 +            self.assertSuccess(p.returncode, err)
++   
++    def test_boolean(self):
++        import selinux
++        boolean_status={0:"--off",1:"--on"}
++        boolean_state=selinux.security_get_boolean_active("httpd_anon_write")
++        # Test
++        print("Verify semanage boolean -m %s httpd_anon_write" % boolean_status[not boolean_state])
++        p = Popen(["semanage","boolean","-m",boolean_status[(not boolean_state)],"httpd_anon_write"], stdout = PIPE)
++        out, err = p.communicate()
++        self.assertSuccess(p.returncode, err)
++        print("Verify semanage boolean -m %s httpd_anon_write" % boolean_status[boolean_state])
++        p = Popen(["semanage","boolean","-m",boolean_status[boolean_state],"httpd_anon_write"], stdout = PIPE)
++        out, err = p.communicate()
++        self.assertSuccess(p.returncode, err)
++
++def semanage_suite():
++    semanage_suite = unittest.TestSuite()
++    semanage_suite.addTest(unittest.makeSuite(SemanageTests))
++
++    return semanage_suite
++
++def semanage_custom_suite(test_list):
++    suiteSemanage=unittest.TestSuite()
++    for t in test_list:
++        suiteSemanage.addTest(SemanageTests(t))
++
++    return suiteSemanage
++
++def semanage_run_test(suite):
++    unittest.TextTestRunner(verbosity=2).run(suite)
++
++class CheckTest(argparse.Action):
++    def __call__(self, parser, namespace, values, option_string=None):
++        newval = getattr(namespace, self.dest)
++        if not newval:
++            newval = []
++        for v in values:
++            if v not in semanage_test_list:
++                raise ValueError("%s must be an unit test.\nValid tests: %s" % (v, ", ".join(semanage_test_list)))
++            newval.append(v)
++        setattr(namespace, self.dest, newval)
++
++def semanage_args(args):
++    if args.list:
++        print("You can run the following tests:")
++        for i in semanage_test_list:
++            print(i)
++    if args.all:
++        semanage_run_test(semanage_suite())
++    if args.test:
++        semanage_run_test(semanage_custom_suite(args.test))
++
++def gen_semanage_test_args(parser):
++    group = parser.add_mutually_exclusive_group(required=True)
++    group.add_argument('-a', "--all", dest="all", default=False,
++                        action="store_true",
++                        help=("Run all semanage unit tests"))
++    group.add_argument('-l', "--list", dest="list", default=False,
++                        action="store_true",
++                        help=("List all semanage unit tests"))
++    group.add_argument('-t', "--test", dest="test", default=[],
++                        action=CheckTest, nargs="*",
++                        help=("Run selected semanage unit test(s)"))
++    group.set_defaults(func=semanage_args)
 +
 +if __name__ == "__main__":
 +    import selinux
++    semanage_test_list=filter(lambda x: x.startswith("test_"), dir(SemanageTests))
 +    if selinux.security_getenforce() == 1:
-+        unittest.main()
++        parser = argparse.ArgumentParser(description='Semanage unit test script')
++        gen_semanage_test_args(parser)
++        try:
++            args = parser.parse_args()
++            args.func(args)
++            sys.exit(0)
++        except ValueError,e:
++            sys.stderr.write("%s: %s\n" % (e.__class__.__name__, str(e)))
++            sys.exit(1)
++        except IOError,e:
++            sys.stderr.write("%s: %s\n" % (e.__class__.__name__, str(e)))
++            sys.exit(1)
++        except KeyboardInterrupt:
++            sys.exit(0)
 +    else:
 +        print("SELinux must be in enforcing mode for this test")
 diff --git a/policycoreutils/semodule/Makefile b/policycoreutils/semodule/Makefile
@@ -513213,7 +513526,7 @@ index 0000000..a350978
 +</busconfig>
 diff --git a/policycoreutils/sepolicy/org.selinux.policy b/policycoreutils/sepolicy/org.selinux.policy
 new file mode 100644
-index 0000000..0a6500f
+index 0000000..6ac6212
 --- /dev/null
 +++ b/policycoreutils/sepolicy/org.selinux.policy
 @@ -0,0 +1,71 @@
@@ -513257,9 +513570,9 @@ index 0000000..0a6500f
 +        <description>SELinux write access</description>
 +        <message>System policy prevents customized access to SELinux</message>
 +        <defaults>
-+            <allow_any>auth_admin_keep</allow_any>
-+            <allow_inactive>auth_admin_keep</allow_inactive>
-+            <allow_active>auth_admin_keep</allow_active>
++	  <allow_any>yes</allow_any>
++	  <allow_inactive>yes</allow_inactive>
++	  <allow_active>yes</allow_active>
 +        </defaults>
 +    </action>
 +    <action id="org.selinux.relabel_on_boot">
@@ -513319,12 +513632,28 @@ index 4eca22d..2a9e1c7 100644
  PyObject *m;
  m = Py_InitModule("_policy", methods);
  init_info(m);
+diff --git a/policycoreutils/sepolicy/selinux_client.py b/policycoreutils/sepolicy/selinux_client.py
+new file mode 100644
+index 0000000..afd3f31
+--- /dev/null
++++ b/policycoreutils/sepolicy/selinux_client.py
+@@ -0,0 +1,10 @@
++import dbus
++import dbus.service
++from sepolicy.sedbus import SELinuxDBus
++if __name__ == "__main__": 
++    try:
++        dbus_proxy = SELinuxDBus()
++        resp = dbus_proxy.customized()
++        print (resp)
++    except dbus.DBusException, e:
++        print e
 diff --git a/policycoreutils/sepolicy/selinux_server.py b/policycoreutils/sepolicy/selinux_server.py
 new file mode 100644
-index 0000000..2870634
+index 0000000..ee931a4
 --- /dev/null
 +++ b/policycoreutils/sepolicy/selinux_server.py
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,116 @@
 +#!/usr/bin/python
 +
 +import dbus
@@ -513359,6 +513688,7 @@ index 0000000..2870634
 +    # on the server.  This output can be used with the semanage method on 
 +    # another server to make the two systems have duplicate policy.
 +    #
++    @slip.dbus.polkit.require_auth("org.selinux.customized")
 +    @dbus.service.method("org.selinux", in_signature='', out_signature='s')
 +    def customized(self):
 +        p = Popen(["/usr/sbin/semanage", "export"],stdout=PIPE, stderr=PIPE)
@@ -513382,6 +513712,56 @@ index 0000000..2870634
 +    def setenforce(self, value):
 +        selinux.security_setenforce(value)
 +
++    #
++    # The setenforce method turns off the current enforcement of SELinux
++    #
++    @dbus.service.method("org.selinux", in_signature='i')
++    def relabel_on_boot(self, value):
++        if value == 1:
++            fd = open("/.autorelabel","w")
++            fd.close()
++        else:
++            os.unlink("/.autorelabel")
++
++    def write_selinux_config(self, enforcing=None, policy=None):
++        path = selinux.selinux_path() + "config" 
++        backup_path = path + ".bck"
++        fd = open(path)
++        lines = fd.readlines()
++        fd.close()
++        fd = open(backup_path, "w")
++        for l in lines:
++            if enforcing and l.startswith("SELINUX="):
++                fd.write("SELINUX=%s\n" % enforcing)
++                continue
++            if policy and l.startswith("SELINUXTYPE="):
++                fd.write("SELINUXTYPE=%s\n" % policy)
++                continue
++            fd.write(l)
++        fd.close()
++        os.rename(backup_path, path)
++
++    #
++    # The change_default_enforcement modifies the current enforcement mode 
++    #
++    @dbus.service.method("org.selinux", in_signature='s')
++    def change_default_mode(self, value):
++        values = [ "enforcing", "permissive", "disabled" ]
++        if value not in values:
++            raise ValueError("Enforcement mode must be %s" % ", ".join(values))
++        self.write_selinux_config(enforcing=value)
++        
++
++    #
++    # The change_default_policy method modifies the policy type
++    #
++    @dbus.service.method("org.selinux", in_signature='s')
++    def change_default_policy(self, value):
++        path = selinux.selinux_path() + value
++        if os.path.isdir(path):
++            return self.write_selinux_config(policy=value)
++        raise ValueError("%s does not exist" % path)
++        
 +if __name__ == "__main__":
 +        mainloop = gobject.MainLoop()
 +        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ -513602,10 +513982,10 @@ index fb84af6..9408c5e 100644
  .br
 diff --git a/policycoreutils/sepolicy/sepolicy-gui.8 b/policycoreutils/sepolicy/sepolicy-gui.8
 new file mode 100644
-index 0000000..49ea4b4
+index 0000000..6f4bee0
 --- /dev/null
 +++ b/policycoreutils/sepolicy/sepolicy-gui.8
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,29 @@
 +.TH "sepolicy-gui" "8" "20121005" "" ""
 +.SH "NAME"
 +sepolicy-gui \- Graphical User Interface for SELinux policy.
@@ -513614,7 +513994,7 @@ index 0000000..49ea4b4
 +
 +Common options
 +
-+.B sepolicy gui [\-h ] 
++.B sepolicy gui [\-h ] [ \-d DOMAIN ]
 +
 +.br
 +
@@ -513626,6 +514006,9 @@ index 0000000..49ea4b4
 +.TP
 +.I                \-h, \-\-help
 +Display help message
++.TP
++.I                \-d, \-\-domain     
++Initialize gui to the selected domain.
 +
 +.SH "AUTHOR"
 +This man page was written by Daniel Walsh <dwalsh@redhat.com>
@@ -513796,7 +514179,7 @@ index 0748ca9..6348287 100644
 -selinux(8), sepolicy-booleans(8), sepolicy-communicate(8), sepolicy-generate(8), sepolicy-interface(8),  sepolicy-network(8), sepolicy-manpage(8), sepolicy-transition(8)
 +selinux(8), sepolicy-booleans(8), sepolicy-communicate(8), sepolicy-generate(8),sepolicy-gui(8), sepolicy-interface(8),  sepolicy-network(8), sepolicy-manpage(8), sepolicy-transition(8)
 diff --git a/policycoreutils/sepolicy/sepolicy.py b/policycoreutils/sepolicy/sepolicy.py
-index b25d3b2..9afb149 100755
+index b25d3b2..43b3666 100755
 --- a/policycoreutils/sepolicy/sepolicy.py
 +++ b/policycoreutils/sepolicy/sepolicy.py
 @@ -22,6 +22,8 @@
@@ -513876,7 +514259,7 @@ index b25d3b2..9afb149 100755
          newval = getattr(namespace, self.dest)
          if not newval:
              newval = []
-@@ -140,102 +165,168 @@ class CheckPolicyType(argparse.Action):
+@@ -140,102 +165,173 @@ class CheckPolicyType(argparse.Action):
  
  class CheckUser(argparse.Action):
      def __call__(self, parser, namespace, value, option_string=None):
@@ -514027,7 +514410,7 @@ index b25d3b2..9afb149 100755
 +def gui_run(args):
 +    try:
 +        import sepolicy.gui
-+        sepolicy.gui.SELinuxGui()
++        sepolicy.gui.SELinuxGui(args.domain, args.test)
 +        pass 
 +    except ImportError:
 +        raise ValueError(_("You need to install policycoreutils-gui package to use the gui option"))
@@ -514035,6 +514418,11 @@ index b25d3b2..9afb149 100755
 +def gen_gui_args(parser):
 +    gui = parser.add_parser("gui",
 +                            help=_('Graphical User Interface for SELinux Policy'))
++    gui.add_argument("-d", "--domain", default=None,
++                       action=CheckDomain,
++                       help=_("Domain name(s) of man pages to be created"))
++    gui.add_argument("-t", "--test", default=False, action="store_true", 
++                       help=argparse.SUPPRESS)
 +    gui.set_defaults(func=gui_run)
  
  def manpage(args):
@@ -514102,7 +514490,7 @@ index b25d3b2..9afb149 100755
  
  def gen_network_args(parser):
          net = parser.add_parser("network",
-@@ -245,15 +336,18 @@ def gen_network_args(parser):
+@@ -245,15 +341,18 @@ def gen_network_args(parser):
          group.add_argument("-l", "--list", dest="list_ports",
                             action="store_true",
                              help=_("list all SELinux port types"))
@@ -514124,7 +514512,7 @@ index b25d3b2..9afb149 100755
          net.set_defaults(func=network)
  
  def communicate(args):
-@@ -283,7 +377,6 @@ def gen_communicate_args(parser):
+@@ -283,7 +382,6 @@ def gen_communicate_args(parser):
      comm.set_defaults(func=communicate)
  
  def booleans(args):
@@ -514132,7 +514520,7 @@ index b25d3b2..9afb149 100755
      from sepolicy import boolean_desc
      if args.all:
          rc, args.booleans = selinux.security_get_boolean_names()
-@@ -300,6 +393,7 @@ def gen_booleans_args(parser):
+@@ -300,6 +398,7 @@ def gen_booleans_args(parser):
                         action="store_true",
                         help=_("get all booleans descriptions"))
      group.add_argument("-b", "--boolean", dest="booleans", nargs="+",
@@ -514140,7 +514528,7 @@ index b25d3b2..9afb149 100755
                         help=_("boolean to get description"))
      bools.set_defaults(func=booleans)
  
-@@ -319,22 +413,49 @@ def gen_transition_args(parser):
+@@ -319,22 +418,49 @@ def gen_transition_args(parser):
                         help=_("target process domain"))
      trans.set_defaults(func=transition)
  
@@ -514199,7 +514587,7 @@ index b25d3b2..9afb149 100755
          if not args.command:
              raise ValueError(_("Command required for this type of policy"))
          cmd = os.path.realpath(args.command)
-@@ -346,8 +467,22 @@ def generate(args):
+@@ -346,8 +472,22 @@ def generate(args):
          mypolicy.set_program(cmd)
  
      if args.types:
@@ -514222,7 +514610,7 @@ index b25d3b2..9afb149 100755
      for p in args.writepaths:
          if os.path.isdir(p):
              mypolicy.add_dir(p)
-@@ -355,6 +490,7 @@ def generate(args):
+@@ -355,6 +495,7 @@ def generate(args):
              mypolicy.add_file(p)
  
      mypolicy.set_transition_users(args.user)
@@ -514230,7 +514618,7 @@ index b25d3b2..9afb149 100755
      mypolicy.set_admin_domains(args.admin_domain)
      mypolicy.set_existing_domains(args.domain)
  
-@@ -366,20 +502,34 @@ def generate(args):
+@@ -366,20 +507,34 @@ def generate(args):
  def gen_interface_args(parser):
      itf = parser.add_parser("interface",
                              help=_('List SELinux Policy interfaces'))
@@ -514268,7 +514656,7 @@ index b25d3b2..9afb149 100755
                              help=_('Generate SELinux Policy module template'))
      pol.add_argument("-d", "--domain", dest="domain", default=[],
                       action=CheckDomain, nargs="*",
-@@ -387,9 +537,12 @@ def gen_generate_args(parser):
+@@ -387,9 +542,12 @@ def gen_generate_args(parser):
      pol.add_argument("-u", "--user", dest="user", default=[],
                       action=CheckUser, 
                       help=_("Enter SELinux user(s) which will transition to this domain"))
@@ -514282,7 +514670,7 @@ index b25d3b2..9afb149 100755
      pol.add_argument("-n", "--name", dest="name",
                       default=None,
                       help=_("name of policy to generate"))
-@@ -397,53 +550,57 @@ def gen_generate_args(parser):
+@@ -397,53 +555,57 @@ def gen_generate_args(parser):
                       help=argparse.SUPPRESS)
      pol.add_argument("-t", "--type", dest="types", default=[], nargs="*",
                       action=CheckType, 
@@ -514366,7 +514754,7 @@ index b25d3b2..9afb149 100755
      pol.set_defaults(func=generate)
  
  if __name__ == '__main__':
-@@ -455,17 +612,25 @@ if __name__ == '__main__':
+@@ -455,17 +617,25 @@ if __name__ == '__main__':
      gen_booleans_args(subparsers)
      gen_communicate_args(subparsers)
      gen_generate_args(subparsers)
@@ -514394,7 +514782,7 @@ index b25d3b2..9afb149 100755
          sys.exit(0)
 +
 diff --git a/policycoreutils/sepolicy/sepolicy/__init__.py b/policycoreutils/sepolicy/sepolicy/__init__.py
-index 5e7415c..74d2220 100644
+index 5e7415c..79cd732 100644
 --- a/policycoreutils/sepolicy/sepolicy/__init__.py
 +++ b/policycoreutils/sepolicy/sepolicy/__init__.py
 @@ -1,12 +1,15 @@
@@ -514771,7 +515159,7 @@ index 5e7415c..74d2220 100644
      all_domains = []
      types=get_all_types()
      types.sort()
-@@ -81,18 +384,61 @@ def get_all_entrypoint_domains():
+@@ -81,138 +384,364 @@ def get_all_entrypoint_domains():
                  all_domains.append(m[0])
      return all_domains
  
@@ -514840,11 +515228,42 @@ index 5e7415c..74d2220 100644
          roles = map(lambda x: x['name'], info(ROLE))
          roles.remove("object_r")
          roles.sort()
-@@ -104,115 +450,259 @@ def get_all_users():
-     if users:
-         return users
-     users = map(lambda x: x['name'], info(USER))
+         return roles
+ 
+-users = None
++selinux_user_list = None
++def get_selinux_users():
++    global selinux_user_list
++    if not selinux_user_list:
++        selinux_user_list = info(USER)
++    return selinux_user_list
++
++login_mappings = None
++def get_login_mappings():
++    global login_mappings
++    if login_mappings:
++        return login_mappings
++
++    fd = open(selinux.selinux_usersconf_path(), "r")
++    buf=fd.read()
++    fd.close()
++    login_mappings = []
++    for b in  buf.split("\n"):
++        b = b.strip()
++        if len(b) == 0 or b.startswith("#"):
++            continue
++        x = b.split(":")
++        login_mappings.append({ "name": x[0], "seuser": x[1], "mls":":".join(x[2:])})
++    return login_mappings
++
+ def get_all_users():
+-    global users
+-    if users:
+-        return users
+-    users = map(lambda x: x['name'], info(USER))
 -    return users 
++    users = map(lambda x: x['name'], get_selinux_users())
++    users.sort()
 +    return users
  
  file_types = None
@@ -514894,6 +515313,23 @@ index 5e7415c..74d2220 100644
 +def markup(f):
 +    return f
 +
++# Autofill for adding files *************************
++DEFAULT_DIRS = {}
++DEFAULT_DIRS["/etc"] = "etc_t"
++DEFAULT_DIRS["/tmp"] = "tmp_t"
++DEFAULT_DIRS["/usr/lib/systemd/system"] = "unit_file_t"
++DEFAULT_DIRS["/lib/systemd/system"] = "unit_file_t"
++DEFAULT_DIRS["/etc/systemd/system"] = "unit_file_t"
++DEFAULT_DIRS["/var/cache"] = "var_cache_t"
++DEFAULT_DIRS["/var/lib"] = "var_lib_t"
++DEFAULT_DIRS["/var/log"] = "log_t"
++DEFAULT_DIRS["/var/run"] = "var_run_t"
++DEFAULT_DIRS["/run"] = "var_run_t"
++DEFAULT_DIRS["/run/lock"] = "var_lock_t"
++DEFAULT_DIRS["/var/run/lock"] = "var_lock_t"
++DEFAULT_DIRS["/var/spool"] = "var_spool_t"
++DEFAULT_DIRS["/var/www"] = "content_t"
++
 +def get_description(f, markup=markup):
 +
 +    txt = "Set files with the %s type, if you want to " % markup(f)
@@ -515172,7 +515608,7 @@ index 5e7415c..74d2220 100644
  
  def boolean_category(boolean):
      booleans_dict = gen_bool_dict()
-@@ -233,18 +723,54 @@ def get_os_version():
+@@ -233,18 +762,56 @@ def get_os_version():
      os_version = ""
      pkg_name = "selinux-policy"
      try:
@@ -515216,7 +515652,8 @@ index 5e7415c..74d2220 100644
 +    global port_types
 +    global role_allows
 +    global roles
-+    global users
++    global login_mappings
++    global selinux_user_list
 +    global user_types
 +    all_attributes = None
 +    all_domains = None
@@ -515233,8 +515670,9 @@ index 5e7415c..74d2220 100644
 +    port_types = None
 +    role_allows = None
 +    roles = None
-+    users = None
 +    user_types = None
++    login_mappings = None
++    selinux_user_list = None
 diff --git a/policycoreutils/sepolicy/sepolicy/communicate.py b/policycoreutils/sepolicy/sepolicy/communicate.py
 index a179d95..9b9a09a 100755
 --- a/policycoreutils/sepolicy/sepolicy/communicate.py
@@ -515527,10 +515965,10 @@ index 26f8390..ba959ae 100644
              return out
 diff --git a/policycoreutils/sepolicy/sepolicy/gui.py b/policycoreutils/sepolicy/sepolicy/gui.py
 new file mode 100644
-index 0000000..cbdf9aa
+index 0000000..c6d4588
 --- /dev/null
 +++ b/policycoreutils/sepolicy/sepolicy/gui.py
-@@ -0,0 +1,2526 @@
+@@ -0,0 +1,2932 @@
 +#!/usr/bin/python -Es
 +#
 +# Copyright (C) 2013 Red Hat
@@ -515554,15 +515992,18 @@ index 0000000..cbdf9aa
 +#                                        02111-1307  USA
 +#
 +#    author: Ryan Hallisey rhallisey@redhat.com
++#    author: Dan Walsh dwalsh@redhat.com
 +#
 +#
 +
++from gi.repository import Gtk
++from gi.repository import Gdk
++from gi.repository import GLib
 +from sepolicy.sedbus import SELinuxDBus
 +import sys
-+import gobject
 +import sepolicy
 +import selinux
-+import pygtk
++from selinux import DISABLED, PERMISSIVE, ENFORCING
 +import sepolicy.network
 +import sepolicy.manpage
 +import dbus
@@ -515592,50 +516033,70 @@ index 0000000..cbdf9aa
 +def compare(a, b):
 +    return cmp(a.lower(),b.lower())
 +
-+try:
-+    import pygtk
-+    pygtk.require("2.0")
-+except:
-+    pass
-+try:
-+    import gtk
-+except:
-+    print(_("GTK Not Available"))
-+    sys.exit(1)
-+
 +import distutils.sysconfig
++ADVANCED_LABEL = ( _("Advanced >>"), _("Advanced <<") )
++OUTBOUND = 0
++INBOUND = 1
++
++BOOLEANS_PAGE=0
++FILES_PAGE=1
++NETWORK_PAGE=2
++TRANSITIONS_PAGE=3
++LOGIN_PAGE=4
++USER_PAGE=5
++SYSTEM_PAGE=7
++LOCKDOWN_PAGE=6
++START_PAGE=8
++
++DISABLED_TEXT = _("""<small>
++To change from Disabled to Enforcing mode
++- Change the system mode from Disabled to Permissive
++- Reboot, so that the system can relabel
++- Once the system is working as planned
++  * Change the system mode to Enforcing</small>
++""")
 +
 +class SELinuxGui():
 +    EXE_PAGE = 0
 +    WRITABLE_PAGE = 1
 +    APP_PAGE = 2
-+    OUTBOUND = 0
-+    INBOUND = 1
-+
-+    def __init__( self, applicaton=None):
 +
++    def __init__( self , app = None, test = False):
++        self.finish_init = False
 +        self.dbus = SELinuxDBus()
-+        self.customized = self.dbus.customized()
++        try:
++            customized = self.dbus.customized()
++        except dbus.exceptions.DBusException, e:
++            print e
++            self.quit()
++
++        sepolicy_domains = sepolicy.get_all_domains()
++        sepolicy_domains.sort(compare)
++        if app and app not in sepolicy_domains:
++            self.error(_("%s is not a valid domain" % app))
++            self.quit()
++
++        self.application = app
 +        self.filter_txt = ""
-+        self.builder = gtk.Builder()                                        # BUILDER OBJ
-+        #glade_file = "/home/rhallisey/Desktop/sepolicy.glade"
-+        glade_file = distutils.sysconfig.get_python_lib(plat_specific = True) + "/sepolicy/sepolicy.glade"
-+        self.builder.add_from_file(glade_file)
-+        self.outer_notebook = self.builder.get_object("outer_notebook")       # The notebook obj
-+        self.window = self.builder.get_object("SELinux_window")             # Get window so we can show the window
-+        self.main_selection_window = self.builder.get_object("Main_selection_menu")
-+        self.main_advanced_label = self.builder.get_object("main_advanced_label")
++        builder = Gtk.Builder() # BUILDER OBJ
++        self.code_path = distutils.sysconfig.get_python_lib(plat_specific = True) + "/sepolicy/"
++        glade_file = self.code_path + "sepolicy.glade"
++        builder.add_from_file(glade_file)
++        self.outer_notebook = builder.get_object("outer_notebook")
++        self.window = builder.get_object("SELinux_window")
++        self.main_selection_window = builder.get_object("Main_selection_menu")
++        self.main_advanced_label = builder.get_object("main_advanced_label")
 +        self.popup = 0
-+        self.applications_button_selection = self.builder.get_object("applications_selection_button")
-+        self.revert_button = self.builder.get_object("Revert_button")
-+        self.application = None
-+        self.file_dialog = self.builder.get_object("add_path_dialog")
-+        self.busy_cursor = gtk.gdk.Cursor(gtk.gdk.WATCH)
-+        self.ready_cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR)
++        self.applications_selection_button = builder.get_object("applications_selection_button")
++        self.revert_button = builder.get_object("Revert_button")
++        self.busy_cursor = Gdk.Cursor(Gdk.CursorType.WATCH)
++        self.ready_cursor = Gdk.Cursor(Gdk.CursorType.LEFT_PTR)
++        self.initialtype = selinux.selinux_getpolicytype()[1]
 +        self.current_popup = None
 +        self.import_export = None
 +        self.clear_entry = True
-+        self.confirmation_dialog_close = self.builder.get_object("confirmation_dialog_close")
++        self.files_add = False
++        self.network_add = False
 +
 +        # Data store dictionaries
 +        self.booldict = {}
@@ -515644,320 +516105,300 @@ index 0000000..cbdf9aa
 +        self.all_list = []
 +        self.installed_list = []
 +        self.previously_modified = {}
-+        # Data store dictionaries
 +
++        # file dialog
++        self.file_dialog = builder.get_object("add_path_dialog")
 +        # Error check ***************************************
-+        self.error_check_window = self.builder.get_object("error_check_window")
-+        self.error_check_label = self.builder.get_object("error_check_label")
++        self.error_check_window = builder.get_object("error_check_window")
++        self.error_check_label = builder.get_object("error_check_label")
 +        self.invalid_entry = False
-+        # Error check ***************************************
-+
-+        # Autofill for adding files *************************
-+        self.DEFAULT_DIRS = {}
-+        self.DEFAULT_DIRS["/etc"] = "etc_t"
-+        self.DEFAULT_DIRS["/tmp"] = "tmp_t"
-+        self.DEFAULT_DIRS["/usr/lib/systemd/system"] = "unit_file_t"
-+        self.DEFAULT_DIRS["/lib/systemd/system"] = "unit_file_t"
-+        self.DEFAULT_DIRS["/etc/systemd/system"] = "unit_file_t"
-+        self.DEFAULT_DIRS["/var/cache"] = "var_cache_t"
-+        self.DEFAULT_DIRS["/var/lib"] = "var_lib_t"
-+        self.DEFAULT_DIRS["/var/log"] = "log_t"
-+        self.DEFAULT_DIRS["/var/run"] = "var_run_t"
-+        self.DEFAULT_DIRS["/run"] = "var_run_t"
-+        self.DEFAULT_DIRS["/run/lock"] = "var_lock_t"
-+        self.DEFAULT_DIRS["/var/run/lock"] = "var_lock_t"
-+        self.DEFAULT_DIRS["/var/spool"] = "var_spool_t"
-+        self.DEFAULT_DIRS["/var/www"] = "content_t"
-+        # Autofilee for adding file *************************
-+
 +        # Advanced search window ****************************
-+        self.advanced_search_window = self.builder.get_object("advanced_search_window")
-+        self.advanced_search_liststore = self.builder.get_object("Advanced_search_liststore")
-+        self.advanced_search_treemodel_filter = self.builder.get_object("advanced_treemodel_filter")
-+        self.advanced_search_treemodel_sort = self.builder.get_object("advanced_treemodel_sort")
-+        self.advanced_filter_entry = self.builder.get_object("advanced_filter_entry")
-+        self.advanced_search_treeview = self.builder.get_object("advanced_search_treeview")
++        self.advanced_search_window = builder.get_object("advanced_search_window")
++        self.advanced_search_liststore = builder.get_object("Advanced_search_liststore")
++        self.advanced_search_treemodel_filter = builder.get_object("advanced_treemodel_filter")
++        self.advanced_search_treemodel_sort = builder.get_object("advanced_treemodel_sort")
++        self.advanced_filter_entry = builder.get_object("advanced_filter_entry")
++        self.advanced_search_treeview = builder.get_object("advanced_search_treeview")
 +        self.advanced_search = False
-+        # Advanced search window ****************************
++
++        # Login Items **************************************
++        self.login_label = builder.get_object("Login_label")
++        self.login_seuser_combobox = builder.get_object("login_seuser_combobox")
++        self.login_seuser_liststore = builder.get_object("login_seuser_liststore")
++        self.login_name_entry = builder.get_object("login_name_entry")
++        self.login_mls_label = builder.get_object("login_mls_label")
++        self.login_mls_entry = builder.get_object("login_mls_entry")
++        self.login_radio_button = builder.get_object("Login_button")
++        self.login_liststore = builder.get_object("login_liststore")
++        self.login_popup_window = builder.get_object("popup_window_login")
++
++        # Users Items **************************************
++        self.user_popup_window = builder.get_object("popup_window_user")
++        self.user_radio_button = builder.get_object("User_button")
++        self.user_liststore = builder.get_object("user_liststore")
++        self.user_roles_liststore = builder.get_object("user_roles_liststore")
++        self.user_label = builder.get_object("User_label")
++        self.user_name_entry = builder.get_object("user_name_entry")
++        self.user_mls_label = builder.get_object("user_mls_label")
++        self.user_mls_entry = builder.get_object("user_mls_entry")
++        self.selinux_user_combobox = builder.get_object("selinux_user_combobox")
 +
 +        # System Items **************************************
-+        self.app_system_button = self.builder.get_object("app_system_button")
-+        self.system_button = self.builder.get_object("System_button")
-+        self.systems_box = self.builder.get_object("Systems_box")
-+        self.relabel_button = self.builder.get_object("Relabel_button")
-+        self.relabel_button.set_active(os.path.exists('/.autorelabel'))
-+        self.advanced_system = self.builder.get_object("advanced_system")
-+        self.outer_notebook_frame = self.builder.get_object("outer_notebook_frame")
-+        self.system_policy_label = self.builder.get_object("system_policy_type_label")
-+        # System Items **************************************
-+
++        self.app_system_button = builder.get_object("app_system_button")
++        self.system_radio_button = builder.get_object("System_button")
++        self.lockdown_radio_button = builder.get_object("Lockdown_button")
++        self.systems_box = builder.get_object("Systems_box")
++        self.relabel_button = builder.get_object("Relabel_button")
++        self.relabel_button_no = builder.get_object("Relabel_button_no")
++        self.advanced_system = builder.get_object("advanced_system")
++        self.outer_notebook_frame = builder.get_object("outer_notebook_frame")
++        self.system_policy_label = builder.get_object("system_policy_type_label")
 +        # Browse Items **************************************
-+        self.select_button_browse = self.builder.get_object("select_button_browse")
-+        self.cancel_button_browse = self.builder.get_object("cancel_button_browse")
-+        # Browse Items **************************************
-+
++        self.select_button_browse = builder.get_object("select_button_browse")
++        self.cancel_button_browse = builder.get_object("cancel_button_browse")
 +        # More types window items ***************************
-+        self.moreTypes_window_files = self.builder.get_object("moreTypes_window_files")
-+        self.more_types_files_liststore = self.builder.get_object("more_types_file_liststore")
-+        self.moreTypes_treeview = self.builder.get_object("moreTypes_treeview_files")
-+        # More types window items ***************************
-+
++        self.moreTypes_window_files = builder.get_object("moreTypes_window_files")
++        self.more_types_files_liststore = builder.get_object("more_types_file_liststore")
++        self.moreTypes_treeview = builder.get_object("moreTypes_treeview_files")
 +        # System policy type ********************************
-+        self.system_policy_type_liststore = self.builder.get_object("system_policy_type_liststore")
-+        self.system_policy_type_combobox = self.builder.get_object("system_policy_type_combobox")
++        self.system_policy_type_liststore = builder.get_object("system_policy_type_liststore")
++        self.system_policy_type_combobox = builder.get_object("system_policy_type_combobox")
 +        self.policy_list = []
 +        self.populate_system_policy()
-+        self.enforcing_button_default = self.builder.get_object("Enforcing_button_default")
-+        self.permissive_button_default = self.builder.get_object("Permissive_button_default")
-+        self.disabled_button_default = self.builder.get_object("Disabled_button_default")
++        self.enforcing_button_default = builder.get_object("Enforcing_button_default")
++        self.permissive_button_default = builder.get_object("Permissive_button_default")
++        self.disabled_button_default = builder.get_object("Disabled_button_default")
 +        self.initialize_system_default_mode()
-+        # System policy type ********************************
 +
++        self.enable_unconfined_button = builder.get_object("enable_unconfined")
++        self.disable_unconfined_button = builder.get_object("disable_unconfined")
++        self.enable_permissive_button = builder.get_object("enable_permissive")
++        self.disable_permissive_button = builder.get_object("disable_permissive")
++        # Help Window *********************************
++        self.help_window = builder.get_object("help_window")
++        self.help_text = builder.get_object("help_text")
++        self.info_text = builder.get_object("info_text")
++        self.help_image = builder.get_object("help_image")
++        self.forward_button = builder.get_object("forward_button")
++        self.back_button = builder.get_object("back_button")
 +        # Update menu items *********************************
-+        self.update_window = self.builder.get_object("update_window")
-+        self.update_treeview = self.builder.get_object("update_treeview")
-+        self.update_treestore = self.builder.get_object("Update_treestore")
-+        self.apply_button = self.builder.get_object("apply_button")
-+        self.update_button = self.builder.get_object("Update_button")
-+        # Update menu items *********************************
-+
++        self.update_window = builder.get_object("update_window")
++        self.update_treeview = builder.get_object("update_treeview")
++        self.update_treestore = builder.get_object("Update_treestore")
++        self.apply_button = builder.get_object("apply_button")
++        self.update_button = builder.get_object("Update_button")
 +        # Add button objects ********************************
-+        self.add_button_files = self.builder.get_object("Add_button_files")
-+        self.delete_button_files = self.builder.get_object("Delete_button_files")
-+        self.add_button_network = self.builder.get_object("Add_button_network")
-+        self.delete_button_network = self.builder.get_object("Delete_button_network")
++        self.add_button = builder.get_object("Add_button")
++        self.delete_button = builder.get_object("Delete_button")
 +
-+        self.files_add = False
-+        self.network_add = False
-+        self.files_path_entry = self.builder.get_object("files_path_entry")
-+        self.network_ports_entry = self.builder.get_object("network_ports_entry")
-+        self.popup_window_files = self.builder.get_object("popup_window_files")
-+        self.popup_window_network = self.builder.get_object("popup_window_network")
++        self.files_path_entry = builder.get_object("files_path_entry")
++        self.network_ports_entry = builder.get_object("network_ports_entry")
++        self.popup_window_files = builder.get_object("popup_window_files")
++        self.popup_window_network = builder.get_object("popup_window_network")
 +
-+        self.popup_network_label = self.builder.get_object("Network_label")
-+        self.popup_files_label = self.builder.get_object("Files_label")
++        self.popup_network_label = builder.get_object("Network_label")
++        self.popup_files_label = builder.get_object("Files_label")
 +
-+        self.recursive_path_toggle = self.builder.get_object("make_path_recursive")
-+        self.files_type_combolist = self.builder.get_object("files_type_combo_store")
-+        self.files_class_combolist = self.builder.get_object("files_class_combo_store")
-+        self.files_mls_combolist = self.builder.get_object("files_mls_combo_store")
-+        self.files_type_combobox = self.builder.get_object("files_type_combobox")
-+        self.files_class_combobox = self.builder.get_object("files_class_combobox")
-+        self.mls_label_files = self.builder.get_object("mls_label_files")
-+        self.files_mls_combobox = self.builder.get_object("files_mls_combobox")
-+        self.advanced_text_files = self.builder.get_object("Advanced_text_files")
-+        self.files_cancel_button = self.builder.get_object("cancel_delete_files")
++        self.recursive_path_toggle = builder.get_object("make_path_recursive")
++        self.files_type_combolist = builder.get_object("files_type_combo_store")
++        self.files_class_combolist = builder.get_object("files_class_combo_store")
++        self.files_mls_combolist = builder.get_object("files_mls_combo_store")
++        self.files_type_combobox = builder.get_object("files_type_combobox")
++        self.files_class_combobox = builder.get_object("files_class_combobox")
++        self.mls_label_files = builder.get_object("mls_label_files")
++        self.files_mls_combobox = builder.get_object("files_mls_combobox")
++        self.advanced_text_files = builder.get_object("Advanced_text_files")
++        self.files_cancel_button = builder.get_object("cancel_delete_files")
 +
-+        self.network_protocol_combolist = self.builder.get_object("network_protocol_combo_store")
-+        self.network_tcp_button = self.builder.get_object("tcp_button")
-+        self.network_udp_button = self.builder.get_object("udp_button")
-+        self.network_port_type_combolist = self.builder.get_object("network_type_combo_store")
-+        self.network_port_type_combobox = self.builder.get_object("network_type_combobox")
-+        self.network_mls_combolist = self.builder.get_object("network_mls_combo_store")
-+        self.network_mls_combobox = self.builder.get_object("network_mls_combobox")
-+        self.mls_label_network = self.builder.get_object("mls_label_network")
-+        self.advanced_text_network = self.builder.get_object("Advanced_text_network")
-+        self.network_cancel_button = self.builder.get_object("cancel_delete_network")
++        self.network_protocol_combolist = builder.get_object("network_protocol_combo_store")
++        self.network_tcp_button = builder.get_object("tcp_button")
++        self.network_udp_button = builder.get_object("udp_button")
++        self.network_port_type_combolist = builder.get_object("network_type_combo_store")
++        self.network_port_type_combobox = builder.get_object("network_type_combobox")
++        self.network_mls_combolist = builder.get_object("network_mls_combo_store")
++        self.network_mls_combobox = builder.get_object("network_mls_combobox")
++        self.mls_label_network = builder.get_object("mls_label_network")
++        self.advanced_text_network = builder.get_object("Advanced_text_network")
++        self.network_cancel_button = builder.get_object("cancel_delete_network")
 +
 +        for mls in range(1,11):
 +            iter = self.files_mls_combolist.append()
-+            self.files_mls_combolist.set_value(iter, 0, mls)
++            self.files_mls_combolist.set_value(iter, 0, str(mls))
 +            iter = self.network_mls_combolist.append()
-+            self.network_mls_combolist.set_value(iter, 0, mls)
++            self.network_mls_combolist.set_value(iter, 0, str(mls))
 +        # Add button objects ********************************
 +
 +        # Modify items **************************************
 +        self.modify_mode = False
-+        self.show_mislabeled_files_only = self.builder.get_object("Show_mislabeled_files")
-+        self.mislabeled_files_label = self.builder.get_object("mislabeled_files_label")
-+        self.warning_files = self.builder.get_object("warning_files")
-+        self.modify_button_file = self.builder.get_object("Modify_button_files")
-+        self.modify_button_file.set_sensitive(False)
-+        self.modify_button_network = self.builder.get_object("Modify_button_network")
-+        self.modify_button_network.set_sensitive(False)
++        self.show_mislabeled_files_only = builder.get_object("Show_mislabeled_files")
++        self.mislabeled_files_label = builder.get_object("mislabeled_files_label")
++        self.warning_files = builder.get_object("warning_files")
++        self.modify_button = builder.get_object("Modify_button")
++        self.modify_button.set_sensitive(False)
 +        # Modify items **************************************
 +
 +        # Fix label *****************************************
-+        self.fix_label_window = self.builder.get_object("Fix_label_window")
-+        self.fixlabel_label = self.builder.get_object("Fixlabel_label")
-+        self.fix_label_cancel = self.builder.get_object("Fix_label_cancel")
++        self.fix_label_window = builder.get_object("Fix_label_window")
++        self.fixlabel_label = builder.get_object("Fixlabel_label")
++        self.fix_label_cancel = builder.get_object("Fix_label_cancel")
 +        # Fix label *****************************************
 +
 +        # Delete items **************************************
-+        self.delete_window_files = self.builder.get_object("delete_window_files")
-+        self.delete_files_treeview = self.builder.get_object("delete_files_treeview")
-+        self.delete_files_liststore = self.builder.get_object("delete_files_liststore")
-+        self.delete_window_network = self.builder.get_object("delete_window_network")
-+        self.delete_network_treeview = self.builder.get_object("delete_network_treeview")
-+        self.delete_network_liststore =self.builder.get_object("delete_network_liststore")
++        self.delete_window_files = builder.get_object("delete_window_files")
++        self.delete_files_treeview = builder.get_object("delete_files_treeview")
++        self.delete_files_liststore = builder.get_object("delete_files_liststore")
++        self.delete_window_network = builder.get_object("delete_window_network")
++        self.delete_network_treeview = builder.get_object("delete_network_treeview")
++        self.delete_network_liststore =builder.get_object("delete_network_liststore")
 +        # Delete items **************************************
 +
 +        # Progress bar **************************************
-+        self.progress_bar = self.builder.get_object("progress_bar")
++        self.progress_bar = builder.get_object("progress_bar")
 +        # Progress bar **************************************
 +
 +        # executable_files items ****************************
-+        self.executable_files_treeview = self.builder.get_object("Executable_files_treeview")                  # Get the executable files tree view
-+        self.executable_files_filter_model = self.builder.get_object("executable_files_treemodelfilter")       # Contains the tree with File Path, SELinux File Label, Class
-+        self.executable_files_tab = self.builder.get_object("Executable_files_tab")
++        self.executable_files_treeview = builder.get_object("Executable_files_treeview")                  # Get the executable files tree view
++        self.executable_files_filter_model = builder.get_object("executable_files_treemodelfilter")       # Contains the tree with File Path, SELinux File Label, Class
++        self.executable_files_tab = builder.get_object("Executable_files_tab")
 +        self.executable_files_tab_tooltip_txt = self.executable_files_tab.get_tooltip_text()
-+        self.executable_files_treestore = self.builder.get_object("executable_files_treestore")
-+        self.files_radio_button = self.builder.get_object("Files_button")
++        self.executable_files_treestore = builder.get_object("executable_files_treestore")
++        self.files_radio_button = builder.get_object("Files_button")
 +        self.files_button_tooltip_txt = self.files_radio_button.get_tooltip_text()
-+        self.executable_files_treemodel_sort = self.builder.get_object("executable_files_treemodelsort")
-+        self.executable_files_treestore.set_sort_column_id(0, gtk.SORT_ASCENDING)
++        self.executable_files_treemodel_sort = builder.get_object("executable_files_treemodelsort")
++        self.executable_files_treestore.set_sort_column_id(0, Gtk.SortType.ASCENDING)
 +        # executable_files items ****************************
 +
 +        # writable files items ******************************
-+        self.writable_files_treeview = self.builder.get_object("Writable_files_treeview")           # Get the Writable files tree view
-+        self.writable_files_treestore = self.builder.get_object("writable_files_treestore")         # Contains the tree with File Path, SELinux File Label, Class
-+        self.writable_files__filter_model = self.builder.get_object("writable_files_treemodelfilter")
-+        self.writable_files_tab = self.builder.get_object("Writable_files_tab")
++        self.writable_files_treeview = builder.get_object("Writable_files_treeview")           # Get the Writable files tree view
++        self.writable_files_treestore = builder.get_object("writable_files_treestore")         # Contains the tree with File Path, SELinux File Label, Class
++        self.writable_files__filter_model = builder.get_object("writable_files_treemodelfilter")
++        self.writable_files_tab = builder.get_object("Writable_files_tab")
 +        self.writable_files_tab_tooltip_txt = self.writable_files_tab.get_tooltip_text()
-+        self.writable_files_treemodel_sort = self.builder.get_object("writable_files_treemodelsort")
-+        #self.writable_files_tree_data_set = self.builder.get_object("writable_files_liststore")
-+        #self.writable_files_tree_data_set.set_sort_column_id(0, gtk.SORT_ASCENDING)
++        self.writable_files_treemodel_sort = builder.get_object("writable_files_treemodelsort")
++        #self.writable_files_tree_data_set = builder.get_object("writable_files_liststore")
++        #self.writable_files_tree_data_set.set_sort_column_id(0, Gtk.SortType.ASCENDING)
 +        # writable files items ******************************
 +
 +        # Application File Types ****************************
-+        self.application_files_treeview = self.builder.get_object("Application_file_types_treeview")                    # Get the Application files tree view
-+        self.application_files_filter_model = self.builder.get_object("application_filetypes_treemodelfilter")         # Contains the tree with File Path, Description, Class
-+        self.application_files_tab = self.builder.get_object("Application_file_types_tab")
++        self.application_files_treeview = builder.get_object("Application_file_types_treeview")                    # Get the Application files tree view
++        self.application_files_filter_model = builder.get_object("application_filetypes_treemodelfilter")         # Contains the tree with File Path, Description, Class
++        self.application_files_tab = builder.get_object("Application_file_types_tab")
 +        self.application_files_tab_tooltip_txt = self.writable_files_tab.get_tooltip_text()
-+        self.application_files_treestore = self.builder.get_object("application_filetypes_treestore")
-+        self.application_files_tab = self.builder.get_object("Application_file_types_tab")
++        self.application_files_treestore = builder.get_object("application_filetypes_treestore")
++        self.application_files_tab = builder.get_object("Application_file_types_tab")
 +        self.application_files_tab_tooltip_txt = self.application_files_tab.get_tooltip_text()
-+        self.application_files_treemodel_sort = self.builder.get_object("application_filetypes_treemodelsort")
-+        #self.application_files_tree_data_set = self.builder.get_object("application_filetypes_liststore")
-+        self.application_files_treestore.set_sort_column_id(0, gtk.SORT_ASCENDING)
++        self.application_files_treemodel_sort = builder.get_object("application_filetypes_treemodelsort")
++        #self.application_files_tree_data_set = builder.get_object("application_filetypes_liststore")
++        self.application_files_treestore.set_sort_column_id(0, Gtk.SortType.ASCENDING)
 +        # Application File Type *****************************
 +
 +        # network items *************************************
-+        self.out_network_treeview = self.builder.get_object("outbound_treeview")
-+        self.out_network_tree_data_set = self.builder.get_object("out_network_liststore")       # Contains the tree with Ports, Protocol, Modified, SELinux Port Type
-+        self.out_network_filter_model =  self.builder.get_object("out_network_treemodelfilter")
-+        self.out_network_tree_data_set.set_sort_column_id(0, gtk.SORT_ASCENDING)
-+        self.out_network_tab = self.builder.get_object("Outbound_tab")
++        self.out_network_treeview = builder.get_object("outbound_treeview")
++        self.out_network_tree_data_set = builder.get_object("out_network_liststore")       # Contains the tree with Ports, Protocol, Modified, SELinux Port Type
++        self.out_network_filter_model =  builder.get_object("out_network_treemodelfilter")
++        self.out_network_tree_data_set.set_sort_column_id(0, Gtk.SortType.ASCENDING)
++        self.out_network_tab = builder.get_object("Outbound_tab")
 +        self.out_network_tab_tooltip_txt = self.out_network_tab.get_tooltip_text()
-+        self.out_network_treemodel_sort = self.builder.get_object("out_network_treemodelsort")
++        self.out_network_treemodel_sort = builder.get_object("out_network_treemodelsort")
 +
-+        self.network_radio_button = self.builder.get_object("Network_button")
++        self.network_radio_button = builder.get_object("Network_button")
 +        self.network_button_tooltip_txt = self.network_radio_button.get_tooltip_text()
 +
-+        self.in_network_treemodel_sort = self.builder.get_object("in_network_treemodelsort")
-+        self.in_network_tab = self.builder.get_object("Inbound_tab")
++        self.in_network_treemodel_sort = builder.get_object("in_network_treemodelsort")
++        self.in_network_tab = builder.get_object("Inbound_tab")
 +        self.in_network_tab_tooltip_txt = self.in_network_tab.get_tooltip_text()
-+        self.in_network_treeview = self.builder.get_object("inbound_treeview")
-+        self.in_network_tree_data_set = self.builder.get_object("in_network_liststore")     # Contains the tree with Ports, Protocol, Modified, SELinux Port Type
-+        self.in_network_filter_model =  self.builder.get_object("in_network_treemodelfilter")
-+        self.in_network_tree_data_set.set_sort_column_id(0, gtk.SORT_ASCENDING)
++        self.in_network_treeview = builder.get_object("inbound_treeview")
++        self.in_network_tree_data_set = builder.get_object("in_network_liststore")     # Contains the tree with Ports, Protocol, Modified, SELinux Port Type
++        self.in_network_filter_model =  builder.get_object("in_network_treemodelfilter")
++        self.in_network_tree_data_set.set_sort_column_id(0, Gtk.SortType.ASCENDING)
 +        # network items *************************************
 +
 +        # boolean items ************************************
-+        self.booleans_tab = self.builder.get_object("Booleans_tab")
-+        self.boolean_treeview = self.builder.get_object("Boolean_treeview")                 # Get the booleans tree list
-+        self.boolean_tree_data_set = self.builder.get_object("boolean_liststore")           # Contains the tree with process type + desc (child of filter_data_set)
-+        self.boolean_model = self.builder.get_object("boolean_treemodelfilter")                         # Get_model() attaches the list to the boolean model
-+        self.boolean_tree_data_set.set_sort_column_id(2, gtk.SORT_ASCENDING)
-+        self.booleans_more_detail_window = self.builder.get_object("booleans_more_detail_window")
-+        self.booleans_more_detail_treeview = self.builder.get_object("booleans_more_detail_treeview")
-+        self.booleans_more_detail_tree_data_set = self.builder.get_object("booleans_more_detail_liststore")
-+        self.booleans_radio_button = self.builder.get_object("Booleans_button")
++        self.booleans_tab = builder.get_object("Booleans_tab")
++        self.boolean_treeview = builder.get_object("Boolean_treeview")                 # Get the booleans tree list
++        self.boolean_tree_data_set = builder.get_object("boolean_liststore")           # Contains the tree with process type + desc (child of filter_data_set)
++        self.boolean_model = builder.get_object("boolean_treemodelfilter")                         # Get_model() attaches the list to the boolean model
++        self.boolean_tree_data_set.set_sort_column_id(2, Gtk.SortType.ASCENDING)
++        self.booleans_more_detail_window = builder.get_object("booleans_more_detail_window")
++        self.booleans_more_detail_treeview = builder.get_object("booleans_more_detail_treeview")
++        self.booleans_more_detail_tree_data_set = builder.get_object("booleans_more_detail_liststore")
++        self.booleans_radio_button = builder.get_object("Booleans_button")
++        self.active_button = self.booleans_radio_button
 +        self.booleans_button_tooltip_txt = self.booleans_radio_button.get_tooltip_text()
-+        self.booleans_treemodel_sort = self.builder.get_object("boolean_treemodelsort")
++        self.booleans_treemodel_sort = builder.get_object("boolean_treemodelsort")
 +        # boolean items ************************************
 +
 +        # transitions items ************************************
-+        self.transitions_into_x_treeview = self.builder.get_object("transitions_into_x_treeview")         # Get the transitions tree list Enabled, source, Executable File
-+        self.transitions_into_x_tree_data_set = self.builder.get_object("transitions_into_x_liststore")   # Contains the tree with
-+        self.transitions_into_x_filter_model = self.builder.get_object("transitions_into_x_treemodelfilter")
-+        self.transitions_into_x_tab = self.builder.get_object("Transitions_into_x_tab")
++        self.transitions_into_x_treeview = builder.get_object("transitions_into_x_treeview")         # Get the transitions tree list Enabled, source, Executable File
++        self.transitions_into_x_tree_data_set = builder.get_object("transitions_into_x_liststore")   # Contains the tree with
++        self.transitions_into_x_filter_model = builder.get_object("transitions_into_x_treemodelfilter")
++        self.transitions_into_x_tab = builder.get_object("Transitions_into_x_tab")
 +        self.transitions_into_x_tab_tooltip_txt = self.transitions_into_x_tab.get_tooltip_text()
-+        self.transitions_into_x_tree_data_set.set_sort_column_id(1, gtk.SORT_ASCENDING)
++        self.transitions_into_x_tree_data_set.set_sort_column_id(1, Gtk.SortType.ASCENDING)
 +
-+        self.transitions_radio_button = self.builder.get_object("Transitions_button")
++        self.transitions_radio_button = builder.get_object("Transitions_button")
 +        self.transitions_button_tooltip_txt = self.transitions_radio_button.get_tooltip_text()
 +
-+        self.transitions_from_x_treemodelsort = self.builder.get_object("transitions_from_x_treemodelsort")
-+        self.transitions_from_x_treeview = self.builder.get_object("transitions_from_x_treeview")         # Get the transitions tree list
-+        self.transitions_from_x_treestore = self.builder.get_object("transitions_from_x_treestore")       # Contains the tree with Enabled, Executable File Type, Transtype
-+        self.transitions_from_x_filter_model = self.builder.get_object("transitions_from_x_treemodelfilter")
-+        self.transitions_from_x_tab = self.builder.get_object("Transitions_from_x_tab")
++        self.transitions_from_x_treemodelsort = builder.get_object("transitions_from_x_treemodelsort")
++        self.transitions_from_x_treeview = builder.get_object("transitions_from_x_treeview")         # Get the transitions tree list
++        self.transitions_from_x_treestore = builder.get_object("transitions_from_x_treestore")       # Contains the tree with Enabled, Executable File Type, Transtype
++        self.transitions_from_x_filter_model = builder.get_object("transitions_from_x_treemodelfilter")
++        self.transitions_from_x_tab = builder.get_object("Transitions_from_x_tab")
 +        self.transitions_from_x_tab_tooltip_txt = self.transitions_from_x_tab.get_tooltip_text()
-+        self.transitions_from_x_treestore.set_sort_column_id(2, gtk.SORT_ASCENDING)
++        self.transitions_from_x_treestore.set_sort_column_id(2, Gtk.SortType.ASCENDING)
 +
-+        self.transitions_file_treemodelsort = self.builder.get_object("File_transitions_treemodel_sort")
-+        self.transitions_file_treeview = self.builder.get_object("file_transitions_treeview")         # Get the transitions tree list
-+        self.transitions_file_liststore = self.builder.get_object("File_transitions_liststore")       # Contains the tree with Enabled, Executable File Type, Transtype
-+        self.transitions_file_filter_model = self.builder.get_object("File_transitions_treemodel_filter")
-+        self.transitions_file_tab = self.builder.get_object("file_transitions")
++        self.transitions_file_treemodelsort = builder.get_object("File_transitions_treemodel_sort")
++        self.transitions_file_treeview = builder.get_object("file_transitions_treeview")         # Get the transitions tree list
++        self.transitions_file_liststore = builder.get_object("File_transitions_liststore")       # Contains the tree with Enabled, Executable File Type, Transtype
++        self.transitions_file_filter_model = builder.get_object("File_transitions_treemodel_filter")
++        self.transitions_file_tab = builder.get_object("file_transitions")
 +        self.transitions_file_tab_tooltip_txt = self.transitions_from_x_tab.get_tooltip_text()
-+        self.transitions_file_liststore.set_sort_column_id(0, gtk.SORT_ASCENDING)
++        self.transitions_file_liststore.set_sort_column_id(0, Gtk.SortType.ASCENDING)
 +        # transitions items ************************************
 +
 +        # Combobox and Entry items **************************
-+        self.combobox_menu = self.builder.get_object("combobox_org")                    # This is the combobox box object, aka the arrow next to the entry text bar
-+        self.combobox_menu_model = self.builder.get_object("application_liststore")
-+        self.completion_entry = self.builder.get_object("completion_entry")        #self.combobox_menu.get_child()
-+        self.completion_entry_model = self.builder.get_object("application_liststore")
-+        self.entrycompletion_obj = self.builder.get_object("entrycompletion_obj")
-+        #self.entrycompletion_obj = gtk.EntryCompletion()
++        self.combobox_menu = builder.get_object("combobox_org")                    # This is the combobox box object, aka the arrow next to the entry text bar
++        self.combobox_menu_model = builder.get_object("application_liststore")
++        self.completion_entry = builder.get_object("completion_entry")        #self.combobox_menu.get_child()
++        self.completion_entry_model = builder.get_object("application_liststore")
++        self.entrycompletion_obj = builder.get_object("entrycompletion_obj")
++        #self.entrycompletion_obj = Gtk.EntryCompletion()
 +        self.entrycompletion_obj.set_model(self.completion_entry_model)
 +        self.entrycompletion_obj.set_minimum_key_length(0)
 +        self.entrycompletion_obj.set_text_column(0)
 +        self.entrycompletion_obj.set_match_func(self.match_func, None)
 +        self.completion_entry.set_completion(self.entrycompletion_obj)
-+        self.completion_entry.set_icon_from_stock(0, gtk.STOCK_FIND)
++        self.completion_entry.set_icon_from_stock(0, Gtk.STOCK_FIND)
 +        # Combobox and Entry items **************************
 +
 +        # Modify buttons ************************************
-+        self.show_modified_only_booleans = self.builder.get_object("Show_modified_only_toggle_booleans")
-+        self.show_modified_only_files = self.builder.get_object("Show_modified_only_toggle_files")
-+        self.show_modified_only_network = self.builder.get_object("Show_modified_only_toggle_network")
-+        self.show_modified_only_transitions = self.builder.get_object("Show_modified_only_toggle_transitions")
++        self.show_modified_only = builder.get_object("Show_modified_only_toggle")
 +        # Modify button *************************************
 +
 +        # status bar *****************************************
-+        self.current_status_enforcing = self.builder.get_object("Enforcing_button")
-+        self.current_status_permissive = self.builder.get_object("Permissive_button")
-+        self.status_bar = self.builder.get_object("status_bar")
-+        status = selinux.security_getenforce()
++        self.current_status_label = builder.get_object("Enforcing_label")
++        self.current_status_enforcing = builder.get_object("Enforcing_button")
++        self.current_status_permissive = builder.get_object("Permissive_button")
++        self.status_bar = builder.get_object("status_bar")
 +        self.context_id = self.status_bar.get_context_id("SELinux status")
 +
-+        if status == -1 :
-+            self.current_status_enforcing.set_sensitive(False)
-+            self.current_status_permissive.set_sensitive(False)
-+            self.status_bar.push(self.context_id,  _("System Status: Disabled"))
-+        else:
-+            self.set_enforce_text(status)
-+        fd = open('/etc/selinux/config', 'r')
-+        for l in fd.readlines():
-+            if l.startswith('SELINUXTYPE='):
-+                l = l.split("SELINUXTYPE=")[1]
-+        fd.close()
-+        if l == 'disabled':
-+            self.system_interface(self.app_system_button)
-+            self.enforcing_button.set_sensitive(False)
-+            self.permissive_button.set_sensitive(False)
-+        # status bar  *****************************************
-+
 +        # filters *********************************************
-+        self.booleans_filter = self.builder.get_object("booleans_filter")           # Get filter text bar (Filter is specific to which either Booleans, Files, or Network tab you are in)
 +        self.booleans_filter_data_set = self.boolean_model                          # Get_model() sets the tree model filter to be the parent of the tree model (tree model has all the data in it)
 +        self.booleans_filter_data_set.set_visible_func(self.filter_the_data)        # Set only some of the data to be visible based on what returns from the filter
-+        self.files_filter = self.builder.get_object("files_filter")
-+        self.exe_files_filter_data_set = self.executable_files_filter_model                         # Get_model() sets the tree model filter to be the parent of the tree model (tree model has all the data in it)
++        self.filter_entry = builder.get_object("filter_entry")
++        self.filter_box = builder.get_object("filter_box")
++        self.add_modify_delete_box = builder.get_object("add_modify_delete_box")
++        # Get_model() sets the tree model filter to be the parent of the tree model (tree model has all the data in it)
++        self.exe_files_filter_data_set = self.executable_files_filter_model
 +        self.exe_files_filter_data_set.set_visible_func(self.filter_the_data)           # Set only some of the data to be visible based on what returns from the filter
 +        self.writable_files_filter_data_set = self.writable_files__filter_model
 +        self.writable_files_filter_data_set.set_visible_func(self.filter_the_data)               # Get_model() sets the tree model filter to be the parent of the tree model (tree model has all the data in it)
 +        self.application_files_filter_data_set = self.application_files_filter_model
 +        self.application_files_filter_data_set.set_visible_func(self.filter_the_data)
-+        self.network_filter = self.builder.get_object("network_filter")
 +        self.out_network_filter_data_set = self.out_network_filter_model
 +        self.out_network_filter_data_set.set_visible_func(self.filter_the_data)
 +        self.in_network_filter_data_set = self.in_network_filter_model
 +        self.in_network_filter_data_set.set_visible_func(self.filter_the_data)
-+        self.transitions_filter = self.builder.get_object("transitions_filter")
 +        self.transitions_from_x_filter_data_set = self.transitions_from_x_filter_model
 +        self.transitions_from_x_filter_data_set.set_visible_func(self.filter_the_data)
 +        self.transitions_into_x_filter_data_set = self.transitions_into_x_filter_model
@@ -515970,36 +516411,42 @@ index 0000000..cbdf9aa
 +        # filters **********************************************
 +
 +        # Toggle button ****************************************
-+        self.cell = self.builder.get_object("activate")
-+        self.cell.connect("toggled", self.on_toggle, self.boolean_tree_data_set)    # Need to connect button on code because the tree view model is a treeviewsort
-+        self.del_cell_files = self.builder.get_object("toggle_delete_files")
++        self.cell = builder.get_object("activate")
++        self.del_cell_files = builder.get_object("toggle_delete_files")
 +        self.del_cell_files.connect("toggled", self.on_toggle_update, self.delete_files_liststore)
-+        self.del_cell_network = self.builder.get_object("toggle_delete_network")
++        self.del_cell_network = builder.get_object("toggle_delete_network")
 +        self.del_cell_network.connect("toggled", self.on_toggle_update, self.delete_network_liststore)
-+        self.update_cell = self.builder.get_object("toggle_update")
++        self.update_cell = builder.get_object("toggle_update")
++        # Notebook items ***************************************
++        self.outer_notebook = builder.get_object("outer_notebook")
++        self.inner_notebook_files = builder.get_object("files_inner_notebook")
++        self.inner_notebook_network = builder.get_object("network_inner_notebook")
++        self.inner_notebook_transitions = builder.get_object("transitions_inner_notebook")
++        # logind gui ***************************************
++        loading_gui = builder.get_object("loading_gui")
++
 +        self.update_cell.connect("toggled", self.on_toggle_update, self.update_treestore)
-+        # Toggle button ****************************************
-+
-+        # Notebook items ***************************************
-+        self.outer_notebook = self.builder.get_object("outer_notebook")
-+        self.inner_notebook_files = self.builder.get_object("files_inner_notebook")
-+        self.inner_notebook_network = self.builder.get_object("network_inner_notebook")
-+        self.inner_notebook_transitions = self.builder.get_object("transitions_inner_notebook")
-+        # Notebook items ***************************************
-+
 +        self.all_entries = []
-+        sepolicy_domains = sepolicy.get_all_domains()                                  # Items will be read in from the given data set
-+        sepolicy_domains.sort(compare)                                                 # Fix abc order with the compare call
-+        self.list_length = len(sepolicy_domains)
++
++        # Need to connect button on code because the tree view model is a treeviewsort
++        self.cell.connect("toggled", self.on_toggle, self.boolean_tree_data_set)
++
 +        self.loading = 1
-+        self.loading_gui = self.builder.get_object("loading_gui")
-+        self.loading_gui.show()
 +        path = None
-+        for domain in sepolicy_domains:
-+            self.combo_box_initialize(domain, None)                                  # After the user selects a path in the drop down menu call get_init_entrypoint_target(entrypoint) to get the transtype which will give you the application
++        if test:
++            domains = [ "httpd_t", "abrt_t" ]
++        else:
++            domains = sepolicy_domains
++            loading_gui.show()
++        length = len(domains)
++        for domain in domains:
++            # After the user selects a path in the drop down menu call
++            # get_init_entrypoint_target(entrypoint) to get the transtype
++            # which will give you the application
++            self.combo_box_initialize(domain, None)
 +            self.advanced_search_initialize(domain)
 +            self.all_list.append(domain)
-+            self.percentage = float(float(self.loading)/float(self.list_length))
++            self.percentage = float(float(self.loading)/float(length))
 +            self.progress_bar.set_fraction(self.percentage)
 +            self.progress_bar.set_pulse_step(self.percentage)
 +            self.idle_func()
@@ -516008,25 +516455,25 @@ index 0000000..cbdf9aa
 +            if entrypoint:
 +                path = sepolicy.find_entrypoint_path(entrypoint)
 +                if path:
-+                    self.combo_box_initialize(path, None)        # Adds all files entrypoint paths that exists on disc into the combobox
++                    self.combo_box_initialize(path, None)
++                    # Adds all files entrypoint paths that exists on disc
++                    # into the combobox
 +                    self.advanced_search_initialize(path)
 +                    self.installed_list.append(path)
 +
 +            self.loading += 1
-+#        self.customized = self.dbus.customized()
++        loading_gui.hide()
++
 +        dic = {
 +               "on_combo_button_clicked" : self.open_combo_menu,
 +               "on_SELinux_window_configure_event" : self.hide_combo_menu,
 +               "on_entrycompletion_obj_match_selected" : self.set_application_label,
-+               "on_booleans_filter_changed" : self.get_boolean_filter_data,                  # Get the data inputed by the user into the filter
-+               "on_files_filter_changed" : self.get_file_filter_data,
-+               "on_network_filter_changed" : self.get_network_filter_data,
-+               "on_transitions_filter_changed" : self.get_transitions_filter_data,
++               "on_filter_changed" : self.get_filter_data,
++               "on_save_changes_login_clicked" : self.update_to_login,
 +               "on_save_changes_files_clicked" : self.update_to_files,
 +               "on_save_changes_network_clicked" : self.update_to_network,
 +               "on_Advanced_text_files_button_press_event" : self.reveal_advanced,
-+               "on_Modify_button_files_clicked" : self.modify_button_files_clicked,
-+               "on_Modify_button_network_clicked" : self.modify_button_network_clicked,
++               "item_in_tree_selected" : self.fuzzin_modify,
 +               "on_Application_file_types_treeview_configure_event" : self.resize_wrap,
 +               "on_save_delete_files_clicked" : self.delete_items_from_list_files,
 +               "on_save_delete_network_clicked" : self.delete_network_from_list_files,
@@ -516037,23 +516484,31 @@ index 0000000..cbdf9aa
 +               "on_files_path_entry_button_press_event" : self.highlight_entry_text,
 +               "on_files_path_entry_changed" : self.autofill_add_files_entry,
 +               "on_select_type_files_clicked" : self.select_type_more,
-+               "on_select_button_browse_clicked" : self.on_browse_select,
++               "on_choose_file" : self.on_browse_select,
 +               "on_Enforcing_button_toggled" : self.set_enforce,
 +               "on_confirmation_close" : self.confirmation_close,
++               "on_column_clicked" : self.column_clicked,
++               "on_tab_switch" : self.clear_filters,
 +
 +               "on_app/system_button_clicked" : self.system_interface,
++               "on_app/users_button_clicked" : self.users_interface,
 +               "on_main_advanced_label_button_press_event": self.advanced_label_main,
-+               "on_fix_label_exe_toggled" : self.fix_mislabeled,
++
 +               "on_Show_mislabeled_files_toggled" : self.show_mislabeled_files,
 +               "on_Browse_button_files_clicked" : self.browse_for_files,
-+               "item_in_tree_selected" : self.fuzzin_modify,
 +               "on_cancel_delete_network_clicked" : self.close_network_popup,
++               "on_cancel_user_clicked" : self.user_close_popup,
++               "on_cancel_login_clicked" : self.login_close_popup,
++               "on_user_treeview_row_activated" : self.user_row_activated,
++               "on_login_treeview_row_activated" : self.login_row_activated,
++               "on_login_advanced_button_press_event" : self.login_advanced_button,
++               "on_user_advanced_button_press_event" : self.user_advanced_button,
 +               "on_cancel_network_clicked" : self.close_add_network_popup,
 +               "on_cancel_files_clicked" : self.close_add_files_popup,
 +               "on_cancel_delete_files_clicked" : self.close_files_popup,
 +               "on_cancel_update_clicked" : self.close_update_popup,
 +               "on_Fix_label_cancel_clicked" : self.close_fix_label_popup,
-+               "on_cancel_button_browse_clicked" : self.close_browse_popup,
++               "on_cancel_button_browse_clicked" : self.close_config_window,
 +               "on_apply_button_clicked" : self.apply_changes_button_press,
 +               "on_Revert_button_clicked" : self.update_or_revert_changes,
 +               "on_Update_button_clicked" : self.update_or_revert_changes,
@@ -516063,50 +516518,120 @@ index 0000000..cbdf9aa
 +               "on_Select_advanced_search_clicked" : self.advanced_item_button_push,
 +               "on_All_advanced_button_toggled" : self.advanced_radio_select,
 +               "on_Installed_advanced_button_toggled" : self.advanced_radio_select,
-+
++               "on_info_button_button_press_event" : self.on_help_button,
++               "on_back_button_clicked" : self.on_help_back_clicked,
++               "on_forward_button_clicked" : self.on_help_forward_clicked,
 +               "on_Boolean_treeview_columns_changed" : self.resize_columns,
-+               "on_completion_entry_activate" : self.clear_completion_entry,
-+               "on_completion_entry_changed" : self.completion_entry_selected,
-+               "on_combobox_org_changed" : self.combo_box_item_clicked,
-+               "on_Add_button_files_clicked" : self.add_button_files_clicked,
-+               "on_Add_button_network_clicked" : self.add_button_network_clicked,
-+               "on_Delete_button_files_clicked" : self.delete_from_files,
-+               "on_Delete_button_network_clicked" : self.delete_from_network,
-+               "on_Show_modified_only_toggle_booleans_toggled" : self.bools_show_modified_only,
-+               "on_Show_modified_only_toggle_files_toggled" : self.files_show_modified_only,
-+               "on_Show_modified_only_toggle_network_toggled" : self.network_show_modified_only,
++               "on_completion_entry_changed" : self.application_selected,
++               "on_Add_button_clicked" : self.add_button_clicked,
++               "on_Delete_button_clicked" : self.delete_button_clicked,
++               "on_Modify_button_clicked" : self.modify_button_clicked,
++               "on_Show_modified_only_toggled" : self.show_modified,
 +               "on_cancel_button_config_clicked" : self.close_config_window,
-+               "on_select_button_config_clicked" : self.import_or_export,
 +               "on_Import_button_clicked" : self.import_config_show,
 +               "on_Export_button_clicked" : self.export_config_show,
-+               "on_system_policy_type_combobox_changed" : self.change_system_policy,
++               "on_enable_unconfined_toggled": self.unconfined_toggle,
++               "on_enable_permissive_toggled": self.permissive_toggle,
++               "on_system_policy_type_combobox_changed" : self.change_default_policy,
 +               "on_Enforcing_button_default_toggled" : self.change_default_mode,
 +               "on_Permissive_button_default_toggled" : self.change_default_mode,
 +               "on_Disabled_button_default_toggled" : self.change_default_mode,
-+               "on_Relabel_button_toggled" : self.relabel_on_reboot,
-+               "on_advanced_system_button_press_event" : self.reveal_advanced_system,
 +
++               "on_Relabel_button_toggled_cb": self.relabel_on_reboot,
++               "on_advanced_system_button_press_event" : self.reveal_advanced_system,
 +               "on_files_type_combobox_changed" : self.show_more_types,
-+               "on_treemodelfilter_row_changed" : self.filter_the_data,                             # When a row is changed in the tree model filter
-+               "on_Booleans_button_toggled" : self.booleans_tab_change,
-+               "on_Files_button_toggled" : self.files_tab_change,
-+               "on_Network_button_toggled" : self.network_tab_change,
-+               "on_Transitions_button_toggled" : self.transitions_tab_change,
-+               "on_return_to_booleans_toggled" : self.return_to_booleans_clicked,
-+               "on_more_detail_toggled" : self.display_more_detail,
++               "on_treemodelfilter_row_changed" : self.filter_the_data,
++               "on_button_toggled" : self.tab_change,
 +               "on_booleans_popup_window_delete_event" : self.closewindow,
 +               "gtk_widget_hide": self.closewindow,
 +               "gtk_main_quit": self.closewindow
 +               }
 +
-+        self.loading_gui.hide()
-+        self.builder.connect_signals(dic)
-+        self.window.show()   # Show the gui to the screen
-+        gtk.main()
++        self.previously_modified_initialize(customized)
++        builder.connect_signals(dic)
++        self.window.show()                # Show the gui to the screen
++        GLib.timeout_add_seconds(5,self.selinux_status)
++        self.selinux_status()
++        if self.status == DISABLED:
++            self.show_system_page()
++        else:
++            if self.application:
++                self.completion_entry.set_text(self.application)
++                self.applications_selection_button.set_label(self.application)
++                self.show_applications_page()
++            else:
++                self.clearbuttons()            
++                self.outer_notebook.set_current_page(START_PAGE)
++
++        self.finish_init = True
++        Gtk.main()
++        
++    def selinux_status(self):
++        try:
++            self.status = selinux.security_getenforce()
++        except OSError:
++            self.status = DISABLED
++        if self.status == DISABLED:
++            self.current_status_label.set_sensitive(False)
++            self.current_status_enforcing.set_sensitive(False)
++            self.current_status_permissive.set_sensitive(False)
++            self.enforcing_button_default.set_sensitive(False)
++            self.status_bar.push(self.context_id,  _("System Status: Disabled"))
++            self.info_text.set_label(DISABLED_TEXT)
++        else:
++            self.set_enforce_text(self.status)
++        if os.path.exists('/.autorelabel'):
++            self.relabel_button.set_active(True)
++        else:
++            self.relabel_button_no.set_active(True)
++
++        policytype = selinux.selinux_getpolicytype()[1]
++
++        mode = selinux.selinux_getenforcemode()[1]
++        if mode == ENFORCING:
++            self.enforcing_button_default.set_active(True)
++        if mode == PERMISSIVE:
++            self.permissive_button_default.set_active(True)
++        if mode == DISABLED:
++            self.disabled_button_default.set_active(True)
++
++        return True
++
++    def column_clicked(self, treeview, treepath, treecol, *args):
++        self.fuzzin_modify(treeview)
++        if treeview.get_model() == self.booleans_treemodel_sort:
++            if treecol.get_title() == '':
++                self.display_more_detail(self.window, treepath)
++
++        if treeview.get_model() == self.executable_files_treemodel_sort or treeview.get_model() == self.writable_files_treemodel_sort or treeview.get_model() == self.application_files_treemodel_sort:
++            ipage = self.inner_notebook_files.get_current_page()
++            if ipage == self.EXE_PAGE:
++                p = self.executable_files_treemodel_sort.convert_path_to_child_path(treepath)
++                iter = self.exe_files_filter_data_set.get_iter(p)
++                iter = self.exe_files_filter_data_set.convert_iter_to_child_iter(iter)
++                visible = self.executable_files_treestore.get_value(iter, 3)
++            elif ipage == self.WRITABLE_PAGE:
++                p = self.writable_files_treemodel_sort.convert_path_to_child_path(treepath)
++                iter = self.writable_files_filter_data_set.get_iter(p)
++                iter = self.writable_files_filter_data_set.convert_iter_to_child_iter(iter)
++                visible = self.writable_files_treestore.get_value(iter, 3)
++
++            elif ipage == self.APP_PAGE:
++                p = self.application_files_treemodel_sort.convert_path_to_child_path(treepath)
++                iter = self.application_files_filter_data_set.get_iter(p)
++                iter = self.application_files_filter_data_set.convert_iter_to_child_iter(iter)
++                visible = self.application_files_treestore.get_value(iter, 3)
++
++            # If visible is true then fix mislabeled will be visible
++            if treecol.get_title() == '' and visible:
++                self.fix_mislabeled(None, treepath)
++
++        if treeview.get_model() == self.transitions_from_x_treemodelsort:
++            self.return_to_booleans_clicked(treeview.get_model(), treepath)
 +
 +    def idle_func(self):
-+        while gtk.events_pending():
-+            gtk.main_iteration()
++        while Gtk.events_pending():
++            Gtk.main_iteration()
 +
 +    def match_func(self, completion, key_string, iter, func_data):
 +        try:
@@ -516116,6 +516641,85 @@ index 0000000..cbdf9aa
 +        except AttributeError:
 +            pass
 +
++    def help_show_page(self):
++        self.back_button.set_sensitive(self.help_page != 0)
++        self.forward_button.set_sensitive(self.help_page < (len(self.help_list) - 1))
++        try:
++            fd = open("%shelp/%s.txt" % (self.code_path, self.help_list[self.help_page]), "r")
++            buf = fd.read()
++            fd.close()
++        except IOError:
++            buf = ""
++        self.help_text.set_label(buf % { "APP": self.application } )
++        self.help_image.set_from_file("%shelp/%s.png" % (self.code_path, self.help_list[self.help_page]))
++        self.help_window.show()
++
++    def on_help_back_clicked(self, *args):
++        self.help_page -= 1
++        self.help_show_page()
++
++    def on_help_forward_clicked(self, *args):
++        self.help_page += 1
++        self.help_show_page()
++
++    def on_help_button(self, *args):
++        self.help_page = 0
++        self.help_list = []
++        opage = self.outer_notebook.get_current_page()
++        if opage == BOOLEANS_PAGE:
++            self.help_window.set_title(_("Help: Booleans Page"))
++            self.help_list = [ "booleans", "booleans_toggled", "booleans_more", "booleans_more_show"]
++            return self.help_show_page()
++
++        if opage == FILES_PAGE:
++            ipage = self.inner_notebook_files.get_current_page()
++            if ipage == 0:
++                self.help_window.set_title(_("Help: Executable Files Page"))
++                self.help_list = [ "files_exec" ]
++                return self.help_show_page()
++            if ipage == 1:
++                self.help_window.set_title(_("Help: Writable Files Page"))
++                self.help_list = [ "files_write" ]
++                return self.help_show_page()
++            if ipage == 2:
++                self.help_window.set_title(_("Help: Application Types Page"))
++                self.help_list = [ "files_app" ]
++                return self.help_show_page()
++        if opage == NETWORK_PAGE:
++            ipage = self.inner_notebook_network.get_current_page()
++            if ipage == 0:
++                self.help_window.set_title(_("Help: Outbound Network Connections Page"))
++                self.help_list = [ "ports_outbound" ]
++                return self.help_show_page()
++            if ipage == 1:
++                self.help_window.set_title(_("Help: Inbound Network Connections Page"))
++                self.help_list = [ "ports_inbound" ]
++                return self.help_show_page()
++
++        if opage == TRANSITIONS_PAGE:
++            ipage = self.inner_notebook_transitions.get_current_page()
++            if ipage == 0:
++                self.help_window.set_title(_("Help: Transition from application Page"))
++                self.help_list = [ "transition_from", "transition_from_boolean", "transition_from_boolean_1", "transition_from_boolean_2"]
++                return self.help_show_page()
++            if ipage == 1:
++                self.help_window.set_title(_("Help: Transition into application Page"))
++                self.help_list = [ "transition_to" ]
++                return self.help_show_page()
++            if ipage == 2:
++                self.help_window.set_title(_("Help: Transition application file Page"))
++                self.help_list = [ "transition_file" ]
++                return self.help_show_page()
++
++        if opage == SYSTEM_PAGE:
++                self.help_window.set_title(_("Help: Systems Page"))
++                self.help_list = [ "system"]
++                return self.help_show_page()
++        if opage == LOCKDOWN_PAGE:
++                self.help_window.set_title(_("Help: Lockdown Page"))
++                self.help_list = [ "lockdown"]
++                return self.help_show_page()
++
 +    def open_combo_menu(self, *args):
 +        if self.popup == 0:
 +            self.popup = 1
@@ -516127,7 +516731,6 @@ index 0000000..cbdf9aa
 +            self.popup = 0
 +
 +    def hide_combo_menu(self, *args):
-+        #print args
 +        self.main_selection_window.hide()
 +        self.popup = 0
 +
@@ -516138,147 +516741,112 @@ index 0000000..cbdf9aa
 +        print args
 +
 +    def initialize_system_default_mode(self):
-+        fd = open('/etc/selinux/config', 'r')
-+        for l in fd.readlines():
-+            if l.startswith('SELINUX='):
-+                l = l.split('SELINUX=')[1]
-+                break
-+        fd.close()
-+        if l.startswith('enforcing'):
-+            self.enforcing_button_default.set_active(True)
-+        elif l.startswith('permissive'):
-+            self.permissive_button_default.set_active(True)
-+        else:
-+            self.disabled_button_default.set_active(True)
-+
-+
-+    def read_directory(self, a, dir, files):
-+        try:
-+            dir = dir.split("/etc/selinux/")[1]
-+        except IndexError:
-+            pass
-+        if not '/' in dir and dir != None:
-+            self.policy_list.append(dir)
++        self.enforce_mode = selinux.selinux_getenforcemode()[1]
++        if self.enforce_mode == ENFORCING:
++            self.enforce_button = self.enforcing_button_default
++        if self.enforce_mode == PERMISSIVE:
++            self.enforce_button = self.permissive_button_default
++        if self.enforce_mode == DISABLED:
++            self.enforce_button = self.disabled_button_default
 +
 +    def populate_system_policy(self):
-+        os.path.walk('/etc/selinux', self.read_directory, None)
-+        for items in self.policy_list:
++        types = map(lambda x: x[1], filter(lambda x: x[0]=="/etc/selinux", os.walk("/etc/selinux")))[0]
++        types.sort()
++        ctr = 0
++        for item in types:
 +            iter = self.system_policy_type_liststore.append()
-+            self.system_policy_type_liststore.set_value(iter, 0, items)
-+        fd = open('/etc/selinux/config', 'r')
-+        for l in fd.readlines():
-+            if l.startswith('SELINUXTYPE='):
-+                l = l.split("SELINUXTYPE=")[1]
-+        fd.close()
-+        self.system_policy_type_combobox.set_active(self.map_selected_items_into_combobox(self.system_policy_type_liststore, l))
++            self.system_policy_type_liststore.set_value(iter, 0, item)
++            if item == self.initialtype:
++                self.system_policy_type_combobox.set_active(ctr)
++                self.typeHistory = ctr
++            ctr += 1
 +
-+    def filter_the_data(self, list, iter):
-+        if self.filter_txt == "":                                       # When there is no txt in the box show all items in the tree
++    def filter_the_data(self, list, iter, *args):
++        # When there is no txt in the box show all items in the tree
++        if self.filter_txt == "":
 +            return True
-+        if isinstance(list, gtk.TreeStore) and list.iter_depth(iter) > 0:
++        if isinstance(list, Gtk.TreeStore) and list.iter_depth(iter) > 0:
 +            return True
 +        try:
 +            val = list.get_value(iter, 0)
-+            if val == True or val == False or val == None:                             # In the boolean tab in col 0 the val will return as a bool which will break the search
++            # In the boolean tab in col 0 the val will return as a bool which will break the search
++            if val == True or val == False or val == None:
 +                pass
-+            elif(val.find(self.filter_txt) != -1 or val.find(self.filter_txt.upper()) != -1) :                   # Returns true if filter_txt exists within the val
++            # Returns true if filter_txt exists within the val
++            elif(val.find(self.filter_txt) != -1 or val.find(self.filter_txt.upper()) != -1) :
 +                return True
 +            for x in range(1,10):
-+                try:                        # Remove first item in list and place it into val
++                try:
 +                    val = list.get_value(iter, x)
-+                    if(val.find(self.filter_txt) != -1 or val.find(self.filter_txt.upper()) != -1) :                   # Returns true if filter_txt exists within the val
++                    # Returns true if filter_txt exists within the val
++                    if(val.find(self.filter_txt) != -1 or val.find(self.filter_txt.upper()) != -1) :
 +                        return True
-+                except AttributeError:
++                except AttributeError, TypeError:
 +                    pass
-+        except ValueError:
++        except: #ValueError:
 +            pass
 +        return False
 +
-+    def network_initialize(self, application):
++    def net_update(self, app, netd, protocol, direction):
++        for k in netd.keys():
++            for t,ports in netd[k]:
++                try:
++                    if self.portdict[(app, direction, "Modify")][(", ".join(ports), protocol)]["type"] == t:
++                        pass
++                    else:
++                        self.network_initial_data_insert(direction, ", ".join(ports), t, protocol)
++                except KeyError:
++                    self.network_initial_data_insert(direction, ", ".join(ports), t, protocol)
++        try:
++            for action in ("Add", "Modify"):
++                for port, protocol in self.portdict[app, direction, action]:
++                    type = self.portdict[app, direction, action][port, protocol]["type"]
++                    if not  self.portdict[app, direction, action][port, protocol]["old"]:
++                        self.network_initial_data_insert(direction, port, type, protocol)
++        except KeyError:
++            pass
++
++        
++    def user_initialize(self):
++        self.wait_mouse()
++        for u in sepolicy.get_selinux_users():
++            iter = self.user_liststore.append()
++            self.user_liststore.set_value(iter, 0, str(u["name"]))
++            roles = u["roles"]
++            roles.remove("object_r")
++            self.user_liststore.set_value(iter, 1, ", ".join(roles))
++
++        for u in sepolicy.get_login_mappings():
++            iter = self.login_liststore.append()
++            self.login_liststore.set_value(iter, 0, u["name"])
++            self.login_liststore.set_value(iter, 1, u["seuser"])
++        self.ready_mouse()
++
++    def network_initialize(self, app):
 +        sepolicy.reinit()
-+        netd = sepolicy.network.get_network_connect(application, "tcp", "name_connect")
-+        for k in netd.keys():
-+            for t,ports in netd[k]:
-+                try:
-+                    if self.portdict[(application, 0, "Modify")][(", ".join(ports), "tcp")]["type"] == t:
-+                        pass
-+                    else:
-+                        self.network_initial_data_insert(0,", ".join(ports), t, "tcp")
-+                except KeyError:
-+                    self.network_initial_data_insert(0,", ".join(ports), t, "tcp")
-+        netd = sepolicy.network.get_network_connect(application, "tcp", "name_bind")
-+        for k in netd.keys():
-+            for t,ports in netd[k]:
-+                try:
-+                    if self.portdict[(application, 1, "Modify")][(", ".join(ports), "tcp")]["type"] == t:
-+                        pass
-+                    else:
-+                        self.network_initial_data_insert(1,", ".join(ports), t, "tcp")
-+                except KeyError:
-+                    self.network_initial_data_insert(1,", ".join(ports), t, "tcp")
-+        netd = sepolicy.network.get_network_connect(application, "udp", "name_bind")
-+        for k in netd.keys():
-+            for t,ports in netd[k]:
-+                try:
-+                    if self.portdict[(application, 1, "Modify")][(", ".join(ports), "udp")]["type"] == t:
-+                        pass
-+                    else:
-+                        self.network_initial_data_insert(1,", ".join(ports), t, "udp")
-+                except KeyError:
-+                    self.network_initial_data_insert(1,", ".join(ports), t, "udp")                   # 0 is outbound 1 is inbound
-+        try:
-+            for port, protocol in self.portdict[application, 0, "Add"]:
-+                type = self.portdict[application, 0, "Add"][port, protocol]["type"]
-+                self.network_initial_data_insert(0, port, type, protocol)
-+        except KeyError:
-+            pass
-+        try:
-+            for port, protocol in self.portdict[application, 1, "Add"]:
-+                type = self.portdict[application, 1, "Add"][port, protocol]["type"]
-+                self.network_initial_data_insert(1, port, type, protocol)
-+        except KeyError:
-+            pass
-+        try:
-+            for port, protocol in self.portdict[application, 0, "Modify"]:
-+                if not self.portdict[application, 0, "Modify"][port, protocol]["changed"]:
-+                    type = self.portdict[application, 0, "Modify"][port, protocol]["type"]
-+                    self.network_initial_data_insert(0, port, type, protocol)
-+        except KeyError:
-+            pass
-+        try:
-+            for port, protocol in self.portdict[application, 1, "Modify"]:
-+                if not self.portdict[application, 1, "Modify"][port, protocol]["changed"]:
-+                    type = self.portdict[application, 1, "Modify"][port, protocol]["type"]
-+                    self.network_initial_data_insert(1, port, type, protocol)
-+        except KeyError:
-+            pass
++        netd = sepolicy.network.get_network_connect(app, "tcp", "name_connect")
++        self.net_update(app, netd, "tcp", OUTBOUND)
++        netd = sepolicy.network.get_network_connect(app, "tcp", "name_bind")
++        self.net_update(app, netd, "tcp", INBOUND)
++        netd = sepolicy.network.get_network_connect(app, "udp", "name_bind")
++        self.net_update(app, netd, "udp", INBOUND)
 +
 +    def network_initial_data_insert(self, bound, ports, portType, protocol):
-+        if bound == 0:                                                                  # 0 is outbound
-+            out_iter = self.out_network_tree_data_set.append()
-+            self.out_network_tree_data_set.set_value(out_iter, 0, ports)
-+            self.out_network_tree_data_set.set_value(out_iter, 1, protocol)
-+            self.out_network_tree_data_set.set_value(out_iter, 2, portType)
++        if bound == OUTBOUND:                                                                  
++            model = self.out_network_tree_data_set
++        else:
++            model = self.in_network_tree_data_set
 +
-+        elif bound == 1:                                                                # 1 is inbound
-+            in_iter = self.in_network_tree_data_set.append()
-+            self.in_network_tree_data_set.set_value(in_iter, 0, ports)
-+            self.in_network_tree_data_set.set_value(in_iter, 1, protocol)
-+            self.in_network_tree_data_set.set_value(in_iter, 2, portType)
++        iter = model.append()
++        model.set_value(iter, 0, ports)
++        model.set_value(iter, 1, protocol)
++        model.set_value(iter, 2, portType)
 +
-+    def combo_box_item_clicked(self, widget):
-+        self.executable_files_treestore.clear()
-+        self.in_network_tree_data_set.clear()
-+        self.out_network_tree_data_set.clear()
-+        self.boolean_tree_data_set.clear()
-+        self.transitions_into_x_tree_data_set.clear()
-+        self.transitions_from_x_treestore.clear()
-+        self.writable_files_treestore.clear()
-+        self.application_files_treestore.clear()
-+        application = self.combobox_menu.get_active_text()
-+        self.completion_entry.set_text(application)
-+        self.idle_func()
-+        # Setting the text will cause the on_completion_test_changed signal to trigger calling completion_entry_selected
++    def combo_get_active_text(self, combobox):
++        liststore = combobox.get_model()
++        index = combobox.get_active()
++        iter = liststore.get_iter(index)
++        return liststore.get_value(iter, 0)
 +
 +    def combo_box_initialize(self, val, desc):
 +        if val == None:
@@ -516287,10 +516855,6 @@ index 0000000..cbdf9aa
 +        for f in val:
 +            self.combobox_menu_model.set_value(iter, 0, val)
 +
-+    def clear_completion_entry(self):
-+        self.completion_entry.set_text("")
-+        #print "clear..."
-+
 +    def select_type_more(self, *args):
 +        app = self.moreTypes_treeview.get_selection()
 +        iter = app.get_selected()
@@ -516303,8 +516867,8 @@ index 0000000..cbdf9aa
 +
 +    def advanced_item_button_push(self, *args):
 +        app = self.advanced_search_treeview.get_selection()
-+        iter = app.get_selected()
-+        iter = self.advanced_search_treemodel_sort.convert_iter_to_child_iter(None, iter[1])
++        model, iter = app.get_selected()
++        iter = self.advanced_search_treemodel_sort.convert_iter_to_child_iter(iter)
 +        iter = self.advanced_search_filter_data_set.convert_iter_to_child_iter(iter)
 +        app = self.advanced_search_liststore.get_value(iter, 1)
 +        if app == None:
@@ -516313,47 +516877,43 @@ index 0000000..cbdf9aa
 +        self.advanced_search_window.hide()
 +        self.reveal_advanced(self.main_advanced_label)
 +        self.completion_entry.set_text(app)
-+        self.completion_entry_selected()
++        self.application_selected()
 +
 +    def advanced_item_selected(self, treeview, path, *args):
-+        path = self.advanced_search_treemodel_sort.convert_path_to_child_path(path[0])
-+        iter = self.advanced_search_filter_data_set.get_iter(path[0])
++        path = self.advanced_search_treemodel_sort.convert_path_to_child_path(path)
++        iter = self.advanced_search_filter_data_set.get_iter(path)
 +        iter = self.advanced_search_filter_data_set.convert_iter_to_child_iter(iter)
 +        app = self.advanced_search_liststore.get_value(iter, 1)
 +        self.advanced_filter_entry.set_text('')
 +        self.advanced_search_window.hide()
 +        self.reveal_advanced(self.main_advanced_label)
 +        self.completion_entry.set_text(app)
-+        self.completion_entry_selected()
++        self.application_selected()
 +
 +    def find_application(self, app):
-+        for items in self.combobox_menu_model:
-+           if app == items[0]:
-+                return True
++        if app and len(app) > 0:
++            for items in self.combobox_menu_model:
++                if app == items[0]:
++                    return True
 +        return False
 +
-+    def completion_entry_selected(self, *args):
++    def application_selected(self, *args):
 +        self.show_mislabeled_files_only.set_visible(False)
 +        self.mislabeled_files_label.set_visible(False)
 +        self.warning_files.set_visible(False)
++        self.filter_entry.set_text('')
 +
-+        self.booleans_filter.set_text('')
-+        self.files_filter.set_text('')
-+        self.network_filter.set_text('')
-+        self.transitions_filter.set_text('')
-+
-+        application = self.completion_entry.get_text()
-+        if not self.find_application(application):
++        app = self.completion_entry.get_text()
++        if not self.find_application(app):
 +            return
-+        self.application = self.completion_entry.get_text()
++        self.show_applications_page()
 +
-+        self.add_button_files.set_sensitive(True)
-+        self.delete_button_files.set_sensitive(True)
-+        self.add_button_network.set_sensitive(True)
-+        self.delete_button_network.set_sensitive(True)
-+
-+        self.executable_files_treestore.clear()                      # Clear the tree to prepare for a new selection otherwise
-+        self.in_network_tree_data_set.clear()                       # data will pile up everytime the user selects a new item from the drop down menu
++        self.add_button.set_sensitive(True)
++        self.delete_button.set_sensitive(True)
++        # Clear the tree to prepare for a new selection otherwise
++        self.executable_files_treestore.clear()
++        # data will pile up everytime the user selects a new item from the drop down menu
++        self.in_network_tree_data_set.clear()
 +        self.out_network_tree_data_set.clear()
 +        self.boolean_tree_data_set.clear()
 +        self.transitions_into_x_tree_data_set.clear()
@@ -516363,113 +516923,82 @@ index 0000000..cbdf9aa
 +        self.transitions_file_liststore.clear()
 +
 +        try:
-+            if application[0] == '/':
-+                application = sepolicy.get_init_transtype(application)
-+                if not application:
++            if app[0] == '/':
++                app = sepolicy.get_init_transtype(app)
++                if not app:
 +                    return
-+                self.application = application
++                self.application = app
 +        except IndexError:
 +            pass
 +
 +        self.wait_mouse()
-+        if application != "":
-+            self.executable_files_tab.set_tooltip_text(_("File path used to enter the '%s' domain." % application))
-+            self.writable_files_tab.set_tooltip_text(_("Files to which the '%s' domain can write." % application))
-+            self.out_network_tab.set_tooltip_text(_("Network Ports to which the '%s' is allowed to connect." % application))
-+            self.in_network_tab.set_tooltip_text(_("Network Ports to which the '%s' is allowed to listen." % application))
-+            self.application_files_tab.set_tooltip_text(_("File Types defined for the '%s'." % application))
-+            self.booleans_radio_button.set_tooltip_text(_("Display boolean information that can be used to modify the policy for the '%s'." % application))
-+            self.files_radio_button.set_tooltip_text(_("Display file type information that can be used by the '%s'." % application))
-+            self.network_radio_button.set_tooltip_text(_("Display network ports to which the '%s' can connect or listen to." % application))
-+            self.transitions_into_x_tab.set_label(_("Application Transitions Into '%s'" % application))
-+            self.transitions_from_x_tab.set_label(_("Application Transitions From '%s'" % application))
-+            self.transitions_file_tab.set_label(_("File Transitions From '%s'" % application))
-+            self.transitions_into_x_tab.set_tooltip_text(_("Executables which will transition to the '%s', when executing a selected domains entrypoint." % application))
-+            self.transitions_from_x_tab.set_tooltip_text(_("Executables which will transition to a different domain, when the '%s' executes them." % application))
-+            self.transitions_file_tab.set_tooltip_text(_("Files by '%s' will transitions to a different label." % application))
-+            self.transitions_radio_button.set_tooltip_text(_("Display applications that can transition into or out of the '%s'." % application))
-+        else:
-+            self.executable_files_tab.set_tooltip_text(self.executable_files_tab_tooltip_txt)
-+            self.writable_files_tab.set_tooltip_text(self.writable_files_tab_tooltip_txt)
-+            self.out_network_tab.set_tooltip_text(self.out_network_tab_tooltip_txt)
-+            self.in_network_tab.set_tooltip_text(self.in_network_tab_tooltip_txt)
-+            self.application_files_tab.set_tooltip_text(self.application_files_tab_tooltip_txt)
-+            self.booleans_radio_button.set_tooltip_text(self.booleans_radio_button_tooltip_txt)
-+            self.files__radio_button.set_tooltip_text(self.files_radio_button_tooltip_txt)
-+            self.network_radio_button.set_tooltip_text(self.network_radio_button_tooltip_txt)
-+            self.transitions_into_x_tab.set_label(self.transitions_into_x_tab.get_label())
-+            self.transitions_from_x_tab.set_label(self.transitions_from_x_tab.get_label())
-+            self.transitions_file_tab.set_label(self.transitions_file_tab.get_label())
-+            self.transitions_into_x_tab.set_tooltip_text(self.transitions_into_x_tab_tooltip_txt)
-+            self.transitions_from_x_tab.set_tooltip_text(self.transitions_from_x_tab_tooltip_txt)
-+            self.transitions_file_tab.set_tooltip_text(self.transitions_file_tab_tooltip_txt)
-+            self.transitions_radio_button.set_tooltip_text(self.transitions_radio_button_tooltip_txt)
-+
++        self.previously_modified_initialize(self.dbus.customized())
 +        try:
-+            if self.set_application_label:
-+                self.applications_button_selection.set_label(self.application)
-+            self.bool_initialize(application)
++            self.bool_initialize(app)
 +            self.idle_func()
-+            self.executable_files_initialize(application)
++            self.executable_files_initialize(app)
 +            self.idle_func()
-+            self.network_initialize(application)
++            self.network_initialize(app)
 +            self.idle_func()
-+            self.writable_files_initialize(application)
++            self.writable_files_initialize(app)
 +            self.idle_func()
-+            self.transitions_into_x_initialize(application)
++            self.transitions_into_x_initialize(app)
 +            self.idle_func()
-+            self.transitions_from_x_initialize(application)
++            self.transitions_from_x_initialize(app)
 +            self.idle_func()
-+            self.application_file_types_initialize(application)
++            self.application_file_types_initialize(app)
 +            self.idle_func()
-+            self.transitions_files_initialize(application)
++            self.transitions_files_initialize(app)
 +            self.idle_func()
 +        except ValueError:
 +            pass
 +        except TypeError:
 +            pass
-+        self.previously_modified_initialize()
++
++        self.executable_files_tab.set_tooltip_text(_("File path used to enter the '%s' domain." % app))
++        self.writable_files_tab.set_tooltip_text(_("Files to which the '%s' domain can write." % app))
++        self.out_network_tab.set_tooltip_text(_("Network Ports to which the '%s' is allowed to connect." % app))
++        self.in_network_tab.set_tooltip_text(_("Network Ports to which the '%s' is allowed to listen." % app))
++        self.application_files_tab.set_tooltip_text(_("File Types defined for the '%s'." % app))
++        self.booleans_radio_button.set_tooltip_text(_("Display boolean information that can be used to modify the policy for the '%s'." % app))
++        self.files_radio_button.set_tooltip_text(_("Display file type information that can be used by the '%s'." % app))
++        self.network_radio_button.set_tooltip_text(_("Display network ports to which the '%s' can connect or listen to." % app))
++        self.transitions_into_x_tab.set_label(_("Application Transitions Into '%s'" % app))
++        self.transitions_from_x_tab.set_label(_("Application Transitions From '%s'" % app))
++        self.transitions_file_tab.set_label(_("File Transitions From '%s'" % app))
++        self.transitions_into_x_tab.set_tooltip_text(_("Executables which will transition to the '%s', when executing a selected domains entrypoint." % app))
++        self.transitions_from_x_tab.set_tooltip_text(_("Executables which will transition to a different domain, when the '%s' executes them." % app))
++        self.transitions_file_tab.set_tooltip_text(_("Files by '%s' will transitions to a different label." % app))
++        self.transitions_radio_button.set_tooltip_text(_("Display applications that can transition into or out of the '%s'." % app))
++
++        self.application = app
++        self.applications_selection_button.set_label(self.application)
 +        self.ready_mouse()
 +
-+    def previously_modified_initialize(self):
-+        items = ""
-+        ctr = 0
-+        for char in self.customized:
-+            if char == '\n':
-+                try:
-+                    #items = items.split()[1]
-+                    self.organize_dict(items.split('\n')[1])
-+                except IndexError:
-+                    self.organize_dict(items)
-+                items = ""
-+            items += char
++    def previously_modified_initialize(self, customized):
++        for items in customized.split("\n"):
++            self.organize_dict(items.encode('ascii'))
 +
-+    def executable_files_initialize(self, application):                         #KeyError with abrt_watch_log_t
++    def executable_files_initialize(self, application):
 +        sepolicy.reinit()
 +        self.entrypoints = sepolicy.get_entrypoints(application)
-+        for exe in self.entrypoints.keys():                                       # From entry_point = 0 to the number of keys in the dic
-+            if len(self.entrypoints[exe]):
-+                file_class = self.entrypoints[exe][1]
-+                for path in self.entrypoints[exe][0]:
-+                    try:
-+                        if self.filedict[(application, 0, "Modify")][(path, file_class)]["type"] == exe:
-+                            pass
-+                        else:
-+                            self.executable_files_initial_data_insert(path, exe, file_class)
-+                    except KeyError:
-+                        self.executable_files_initial_data_insert(path, exe, file_class)   # file_path, seLinux_label, status
-+        try:
-+
-+            for path, file_class in self.filedict[application, 0, "Add"]:
-+                exe = self.filedict[application, 0, "Add"][path, file_class]["type"]
++        for exe in self.entrypoints.keys():
++            if len(self.entrypoints[exe]) == 0:
++                continue
++            file_class = self.entrypoints[exe][1]
++            for path in self.entrypoints[exe][0]:
++                try:
++                    if self.filedict[(application, 0, "Modify")][(path, file_class)]["type"] == exe:
++                        continue
++                except KeyError:
++                    pass
 +                self.executable_files_initial_data_insert(path, exe, file_class)
-+        except KeyError:
-+            pass
 +        try:
-+            for path, file_class in self.filedict[application, 0, "Modify"]:
-+                if not self.filedict[application, 0, "Modify"][path, file_class]["changed"]:
-+                    exe = self.filedict[application, 0, "Modify"][path, file_class]["type"]
-+                    self.executable_files_initial_data_insert(path, exe, file_class)
++            for action, key in (("Add", "old"), ("Modify", "changed")):
++                for path, file_class in self.filedict[application, 0, action]:
++                    if not self.filedict[(application, 0, action)][(path, file_class)][key]:
++                        exe = self.filedict[application, 0, action][path, file_class]["type"]
++                        self.executable_files_initial_data_insert(path, exe, file_class)
 +        except KeyError:
 +            pass
 +
@@ -516489,8 +517018,10 @@ index 0000000..cbdf9aa
 +        self.show_mislabeled_files_only.set_visible(True)
 +        self.mislabeled_files_label.set_visible(True)
 +        self.warning_files.set_visible(True)
-+        tree.set_value(niter, 3, True)           # Set visibility of label
-+        tree.set_value(iter, 4, True)            # Has a mislabel
++        # Set visibility of label
++        tree.set_value(niter, 3, True)
++        # Has a mislabel
++        tree.set_value(iter, 4, True)
 +        tree.set_value(niter, 4, True)
 +        tree.set_value(iter, 5, con.split(":")[2])
 +        tree.set_value(iter, 6, cur.split(":")[2])
@@ -516507,32 +517038,27 @@ index 0000000..cbdf9aa
 +
 +    def writable_files_initialize(self, application):
 +        sepolicy.reinit()
-+        self.writable_files = sepolicy.get_writable_files(application)                # Traversing the dictionary data struct
++        # Traversing the dictionary data struct
++        self.writable_files = sepolicy.get_writable_files(application)
 +        for write in self.writable_files.keys():
-+            if len(self.writable_files[write]):
-+                file_class = self.writable_files[write][1]
-+                for path in self.writable_files[write][0]:
-+                    try:
-+                        if self.filedict[(application, 1, "Modify")][(path, file_class)]["type"] == write:
-+                            pass
-+                        else:
-+                            self.writable_files_initial_data_insert(path, write, file_class)
-+                    except KeyError:
-+                        self.writable_files_initial_data_insert(path, write, file_class)
-+            else:
++            if len(self.writable_files[write]) < 2:
 +                self.writable_files_initial_data_insert(None, write, _("all files"))
++                continue
++            file_class = self.writable_files[write][1]
++            for path in self.writable_files[write][0]:
++                try:
++                    if self.filedict[(application, 1, "Modify")][(path, file_class)]["type"] == write:
++                        continue
++                except KeyError:
++                    pass
++                self.writable_files_initial_data_insert(path, write, file_class)
 +
 +        try:
-+            for path, file_class in self.filedict[application, 1, "Add"]:
-+                write = self.filedict[application, 1, "Add"][path, file_class]["type"]
-+                self.writable_files_initial_data_insert(path, write, file_class)
-+        except KeyError:
-+            pass
-+        try:
-+            for path, file_class in self.filedict[application, 1, "Modify"]:
-+                if not self.filedict[application, 1, "Modify"][path, file_class]["changed"]:
-+                    exe = self.filedict[application, 1, "Modify"][path, file_class]["type"]
-+                    self.writable_files_initial_data_insert(path, write, file_class)
++            for action, key in (("Add", "old"), ("Modify", "changed")):
++                for path, file_class in self.filedict[application, 1, action]:
++                    if not self.filedict[(application, 1, action)][(path, file_class)]["old"]:
++                        write = self.filedict[application, 1, action][path, file_class][key]
++                        self.writable_files_initial_data_insert(path, write, file_class)
 +        except KeyError:
 +            pass
 +
@@ -516557,29 +517083,23 @@ index 0000000..cbdf9aa
 +        sepolicy.reinit()
 +        self.file_types = sepolicy.get_file_types(application)
 +        for app in self.file_types.keys():
-+            if len(self.file_types[app]):
-+                file_class = self.file_types[app][1]
-+                for path in self.file_types[app][0]:
-+                    desc = sepolicy.get_description(app, markup = self.markup)
-+                    try:
-+                        if self.filedict[(application, 2, "Modify")][(path, file_class)]["type"] == app:
-+                            pass
-+                        else:
-+                            self.application_file_types_initial_data_insert(path, desc, file_class)
-+                    except KeyError:
-+                        self.application_file_types_initial_data_insert(path, desc, file_class)     # file_path, seLinux_label, status
-+
++            if len(self.file_types[app]) == 0:
++                continue
++            file_class = self.file_types[app][1]
++            for path in self.file_types[app][0]:
++                desc = sepolicy.get_description(app, markup = self.markup)
++                try:
++                    if self.filedict[(application, 2, "Modify")][(path, file_class)]["type"] == app:
++                        continue
++                except KeyError:
++                    pass
++                self.application_file_types_initial_data_insert(path, desc, file_class)     
 +        try:
-+            for path, file_class in self.filedict[application, 2, "Add"]:
-+                exe = self.filedict[application, 2, "Add"][path, file_class]["type"]
-+                self.application_file_types_initial_data_insert(path, exe, file_class)
-+        except KeyError:
-+            pass
-+        try:
-+            for path, file_class in self.filedict[application, 2, "Modify"]:
-+                if not self.filedict[application, 2, "Modify"][path, file_class]["changed"]:
-+                    exe = self.filedict[application, 2, "Modify"][path, file_class]["type"]
-+                    self.application_file_types_initial_data_insert(path, exe, file_class)
++            for action, key in (("Add", "old"), ("Modify", "changed")):
++                for path, file_class in self.filedict[application, 2, action]:
++                    if not self.filedict[(application, 2, action)][(path, file_class)][key]:
++                        ftype = self.filedict[application, 2, action][path, file_class]["type"]
++                        self.application_file_types_initial_data_insert(path, ftype, file_class)
 +        except KeyError:
 +            pass
 +
@@ -516602,11 +517122,13 @@ index 0000000..cbdf9aa
 +                desc = sepolicy.boolean_desc(b)
 +                self.boolean_initial_data_insert(b, desc , active)
 +
-+    def boolean_initial_data_insert(self, val, desc, active):              # Insert data from data source into tree
++    def boolean_initial_data_insert(self, val, desc, active):              
++        # Insert data from data source into tree
 +        iter = self.boolean_tree_data_set.append()
 +        self.boolean_tree_data_set.set_value(iter, 0, active)
-+        self.boolean_tree_data_set.set_value(iter, 1, desc)                # Inserts into application list (list is on left side of gui)
++        self.boolean_tree_data_set.set_value(iter, 1, desc)                
 +        self.boolean_tree_data_set.set_value(iter, 2, val)
++        self.boolean_tree_data_set.set_value(iter, 3, 'More...')
 +
 +    def transitions_into_x_initialize(self, application):
 +        for x in sepolicy.get_transitions_into(application):
@@ -516656,14 +517178,16 @@ index 0000000..cbdf9aa
 +            self.transitions_from_x_treestore.set_value(iter, 5, False)
 +        else:
 +            niter = self.transitions_from_x_treestore.append(iter)
-+            self.transitions_from_x_treestore.set_value(iter, 0, enabled[active[0][1]])             # active[0][1] is either T or F (enabled is all the way at the top)
++            # active[0][1] is either T or F (enabled is all the way at the top)
++            self.transitions_from_x_treestore.set_value(iter, 0, enabled[active[0][1]])             
 +            markup = '<span foreground="blue"><u>%s</u></span>'
 +            if active[0][1]:
 +                self.transitions_from_x_treestore.set_value(niter, 2, (_("To disable this transition, go to the " + markup % _("Boolean section."))))
 +            else:
 +                self.transitions_from_x_treestore.set_value(niter, 2, (_("To enable this transition, go to the " + markup % _("Boolean section."))))
 +
-+            self.transitions_from_x_treestore.set_value(niter, 1, active[0][0])                      # active[0][0] is the Bool Name
++            # active[0][0] is the Bool Name
++            self.transitions_from_x_treestore.set_value(niter, 1, active[0][0])                      
 +            self.transitions_from_x_treestore.set_value(niter, 5, True)
 +
 +        self.transitions_from_x_treestore.set_value(iter, 2, executable)
@@ -516686,28 +517210,57 @@ index 0000000..cbdf9aa
 +            name = '*'
 +        self.transitions_file_liststore.set_value(iter, 3, name)
 +
-+    def booleans_tab_change(self, *args):
-+        self.outer_notebook.set_current_page(0)
++    def tab_change(self, *args):
++        self.clear_filters()
++        self.modify_button.set_sensitive(False)
++        self.add_modify_delete_box.hide()
++        if self.booleans_radio_button.get_active():
++            self.outer_notebook.set_current_page(BOOLEANS_PAGE)
++            self.fuzzin_modify(self.boolean_treeview)
 +
-+    def files_tab_change(self, *args):
-+        self.outer_notebook.set_current_page(1)
++        if self.files_radio_button.get_active():
++            self.add_modify_delete_box.show()
++            self.outer_notebook.set_current_page(FILES_PAGE)
++            ipage = self.inner_notebook_files.get_current_page()
++            if ipage == 0:
++                self.fuzzin_modify(self.executable_files_treeview)
++            elif ipage == 1:
++                self.fuzzin_modify(self.writable_files_treeview)
++            elif ipage == 2:
++                self.fuzzin_modify(self.application_files_treeview)
 +
-+    def network_tab_change(self, *args):
-+        self.outer_notebook.set_current_page(2)
++        if self.network_radio_button.get_active():
++            self.add_modify_delete_box.show()
++            self.outer_notebook.set_current_page(NETWORK_PAGE)
++            ipage = self.inner_notebook_network.get_current_page()
++            if ipage == 0:
++                self.fuzzin_modify(self.out_network_treeview)
++            if ipage == 1:
++                self.fuzzin_modify(self.in_network_treeview)
 +
-+    def transitions_tab_change(self, *args):
-+        self.outer_notebook.set_current_page(3)
++        if self.transitions_radio_button.get_active():
++            self.outer_notebook.set_current_page(TRANSITIONS_PAGE)
++
++        if self.system_radio_button.get_active():
++            self.outer_notebook.set_current_page(SYSTEM_PAGE)
++
++        if self.lockdown_radio_button.get_active():
++            self.outer_notebook.set_current_page(LOCKDOWN_PAGE)
++
++        if self.user_radio_button.get_active():
++            self.outer_notebook.set_current_page(USER_PAGE)
++            self.add_modify_delete_box.show()
++
++        if self.login_radio_button.get_active():
++            self.outer_notebook.set_current_page(LOGIN_PAGE)
++            self.add_modify_delete_box.show()
 +
 +    def return_to_booleans_clicked(self, model, path):
-+        #event = gtk.gdk.Event(gtk.gdk.on_Transitions_button_toggled)
-+        #event.window = entry.get_window()  # the gtk.gdk.Window of the widget
-+        #event.send_event = True  # this means you sent the event explicitly
-+        self.booleans_tab_change()
-+
++        self.booleans_radio_button.clicked()
 +        path =  self.transitions_from_x_treemodelsort.convert_path_to_child_path(path)
 +        it = self.transitions_from_x_filter_data_set.get_iter(path)
 +        it = self.transitions_from_x_filter_data_set.convert_iter_to_child_iter(it)
-+        self.booleans_filter.set_text(self.transitions_from_x_treestore.get_value(it, 1))
++        self.filter.set_text(self.transitions_from_x_treestore.get_value(it, 1))
 +
 +    def display_more_detail(self, windows, position):
 +        path =  self.booleans_treemodel_sort.convert_path_to_child_path(position)
@@ -516725,98 +517278,131 @@ index 0000000..cbdf9aa
 +        iter = self.booleans_more_detail_tree_data_set.append()
 +        self.booleans_more_detail_tree_data_set.set_value(iter, 0, "allow %s %s:%s { %s };" % (source, target, class_type, " ".join(permission)))
 +
-+    def add_button_files_clicked(self, *args):
-+        if self.application != None:
++    def add_button_clicked(self, *args):
++        opage = self.outer_notebook.get_current_page()
++        self.modify_mode=False
++        if opage == NETWORK_PAGE:
++            self.popup_network_label.set_text((_("Add Network Port for %s.  Ports will be created when update is applied."))% self.application)
++            self.popup_window_network.set_title((_("Add Network Port for %s"))% self.application)
++            self.init_network_dialog(args)
++            return
++
++        if opage == FILES_PAGE:
 +            self.popup_files_label.set_text((_("Add File Labeling for %s. File labels will be created when update is applied."))% self.application)
 +            self.popup_window_files.set_title((_("Add File Labeling for %s"))% self.application)
-+        self.init_button_files(args)
-+        self.modify_mode=False
-+        ipage = self.inner_notebook_files.get_current_page()
-+        if ipage == 0:
-+            self.files_path_entry.set_text("ex: /usr/sbin/Foobar")
-+        else:
-+            self.files_path_entry.set_text("ex: /var/lib/Foobar")
-+        self.files_path_entry.select_region(0, -1)
-+        self.clear_entry = True
++            self.init_files_dialog(args)
++            ipage = self.inner_notebook_files.get_current_page()
++            if ipage == 0:
++                self.files_path_entry.set_text("ex: /usr/sbin/Foobar")
++            else:
++                self.files_path_entry.set_text("ex: /var/lib/Foobar")
++            self.files_path_entry.select_region(0, -1)
++            self.clear_entry = True
++
++        if opage == LOGIN_PAGE:
++            self.login_label.set_text((_("Add User Mapping. User Mapping will be created when Update is applied.")))
++            self.login_popup_window.set_title(_("Add User Mapping"))
++            self.login_init_dialog(args)
++            self.clear_entry = True
++
++        if opage == USER_PAGE:
++            self.user_label.set_text((_("Add SELinux User Role. SELinux user roles will be created when update is applied.")))
++            self.user_popup_window.set_title(_("Add SELinux Users"))
++            self.user_init_dialog(args)
++            self.clear_entry = True
 +
 +    def error_check_iter(self, iter):
 +        if iter == None:
-+            self.modify_button_file.set_sensitive(False)
-+            self.modify_button_network.set_sensitive(False)
++            self.modify_button.set_sensitive(False)
 +            return True
 +        return False
 +
-+    def modify_button_files_clicked(self, *args):
-+        if self.application != None:
++    def modify_button_clicked(self, *args):
++        opage = self.outer_notebook.get_current_page()
++        if opage == NETWORK_PAGE:
++            self.modify_button_network_clicked(args)
++
++        if opage == FILES_PAGE:
 +            self.popup_files_label.set_text((_("Modify File Labeling for %s. File labels will be created when update is applied."))% self.application)
 +            self.popup_window_files.set_title((_("Add File Labeling for %s"))% self.application)
-+        self.delete_old_item = None
-+        self.init_button_files(args)
-+        self.modify_mode=True
-+        operation = "Modify"
-+        mls = 1
-+        ipage = self.inner_notebook_files.get_current_page()
-+        if (self.application, ipage, operation) not in self.filedict:
-+            self.filedict[(self.application, ipage, operation)] = {}
-+        if ipage == self.EXE_PAGE:
-+            row = self.executable_files_treeview.get_selection()
-+            iter = row.get_selected()                                   # iter[0] is tree model iter[1] is the iter
-+            if self.error_check_iter(iter[1]):
-+                return
-+            iter = self.executable_files_treemodel_sort.convert_iter_to_child_iter(None, iter[1])
-+            iter = self.exe_files_filter_data_set.convert_iter_to_child_iter(iter)
-+            self.delete_old_item = iter
-+            path = self.executable_files_treestore.get_value(iter, 0)
-+            self.files_path_entry.set_text(path)
-+            type = self.executable_files_treestore.get_value(iter, 2)
-+            if type != None:
-+                self.files_class_combobox.set_active(self.map_selected_items_into_combobox(self.files_class_combolist, type))
-+            tclass = self.executable_files_treestore.get_value(iter, 1)
-+            if tclass != None:
-+                self.check_if_type_is_in_combo(self.files_type_combolist, tclass)
-+                self.files_type_combobox.set_active(self.map_selected_items_into_combobox(self.files_type_combolist, tclass))
++            self.delete_old_item = None
++            self.init_files_dialog(args)
++            self.modify_mode=True
++            operation = "Modify"
++            mls = 1
++            ipage = self.inner_notebook_files.get_current_page()
++            if (self.application, ipage, operation) not in self.filedict:
++                self.filedict[(self.application, ipage, operation)] = {}
++            if ipage == self.EXE_PAGE:
++                row = self.executable_files_treeview.get_selection()
++                # iter[0] is tree model iter[1] is the iter
++                iter = row.get_selected()                                   
++                if self.error_check_iter(iter[1]):
++                    return
++                iter = self.executable_files_treemodel_sort.convert_iter_to_child_iter(iter[1])
++                iter = self.exe_files_filter_data_set.convert_iter_to_child_iter(iter)
++                self.delete_old_item = iter
++                path = self.executable_files_treestore.get_value(iter, 0)
++                self.files_path_entry.set_text(path)
++                type = self.executable_files_treestore.get_value(iter, 2)
++                if type != None:
++                    self.files_class_combobox.set_active(self.map_selected_items_into_combobox(self.files_class_combolist, type))
++                tclass = self.executable_files_treestore.get_value(iter, 1)
++                if tclass != None:
++                    self.check_if_type_is_in_combo(self.files_type_combolist, tclass)
++                    self.files_type_combobox.set_active(self.map_selected_items_into_combobox(self.files_type_combolist, tclass))
 +
-+        elif ipage == self.WRITABLE_PAGE:
-+            row = self.writable_files_treeview.get_selection()
-+            iter = row.get_selected()                 # iter[0] is tree model iter[1] is the iter
-+            if self.error_check_iter(iter[1]):
-+                return
-+            iter = self.writable_files_treemodel_sort.convert_iter_to_child_iter(None, iter[1])
-+            iter = self.writable_files_filter_data_set.convert_iter_to_child_iter(iter)
-+            self.delete_old_item = iter
-+            path = self.writable_files_treestore.get_value(iter, 0)
-+            self.files_path_entry.set_text(path)
-+            type = self.writable_files_treestore.get_value(iter, 2)
-+            if type != None:
-+                self.files_class_combobox.set_active(self.map_selected_items_into_combobox(self.files_class_combolist, type))
-+            tclass = self.writable_files_treestore.get_value(iter, 1)
-+            if tclass != None:
-+                self.check_if_type_is_in_combo(self.files_type_combolist, tclass)
-+                self.files_type_combobox.set_active(self.map_selected_items_into_combobox(self.files_type_combolist, tclass))
++            if ipage == self.WRITABLE_PAGE:
++                row = self.writable_files_treeview.get_selection()
++                # iter[0] is tree model iter[1] is the iter
++                iter = row.get_selected()                 
++                if self.error_check_iter(iter[1]):
++                    return
++                iter = self.writable_files_treemodel_sort.convert_iter_to_child_iter(iter[1])
++                iter = self.writable_files_filter_data_set.convert_iter_to_child_iter(iter)
++                self.delete_old_item = iter
++                path = self.writable_files_treestore.get_value(iter, 0)
++                self.files_path_entry.set_text(path)
++                type = self.writable_files_treestore.get_value(iter, 2)
++                if type != None:
++                    self.files_class_combobox.set_active(self.map_selected_items_into_combobox(self.files_class_combolist, type))
++                tclass = self.writable_files_treestore.get_value(iter, 1)
++                if tclass != None:
++                    self.check_if_type_is_in_combo(self.files_type_combolist, tclass)
++                    self.files_type_combobox.set_active(self.map_selected_items_into_combobox(self.files_type_combolist, tclass))
 +
-+        elif ipage == self.APP_PAGE:
-+            row = self.application_files_treeview.get_selection()
-+            iter = row.get_selected()                                   # iter[0] is tree model iter[1] is the iter
-+            if self.error_check_iter(iter[1]):
-+                return
-+            iter = self.application_files_treemodel_sort.convert_iter_to_child_iter(None, iter[1])
-+            iter = self.application_files_filter_data_set.convert_iter_to_child_iter(iter)
-+            self.delete_old_item = iter
-+            path = self.application_files_treestore.get_value(iter, 0)
-+            self.files_path_entry.set_text(path)
-+            try:
-+                get_type = self.application_files_treestore.get_value(iter, 1)
-+                get_type = get_type.split("<b>")[1].split("</b>")
-+            except AttributeError:
-+                pass
-+            type = self.application_files_treestore.get_value(iter, 2)
-+            if type != None:
-+                self.files_class_combobox.set_active(self.map_selected_items_into_combobox(self.files_class_combolist, type))
-+            tclass = get_type[0]
-+            if tclass != None:
-+                self.check_if_type_is_in_combo(self.files_type_combolist, tclass)
++            if ipage == self.APP_PAGE:
++                row = self.application_files_treeview.get_selection()
++                # iter[0] is tree model iter[1] is the iter
++                iter = row.get_selected()                                   
++                if self.error_check_iter(iter[1]):
++                    return
++                iter = self.application_files_treemodel_sort.convert_iter_to_child_iter(iter[1])
++                iter = self.application_files_filter_data_set.convert_iter_to_child_iter(iter)
++                self.delete_old_item = iter
++                path = self.application_files_treestore.get_value(iter, 0)
++                self.files_path_entry.set_text(path)
++                try:
++                    get_type = self.application_files_treestore.get_value(iter, 1)
++                    get_type = get_type.split("<b>")[1].split("</b>")
++                except AttributeError:
++                    pass
++                type = self.application_files_treestore.get_value(iter, 2)
++                if type != None:
++                    self.files_class_combobox.set_active(self.map_selected_items_into_combobox(self.files_class_combolist, type))
++                tclass = get_type[0]
++                if tclass != None:
++                    self.check_if_type_is_in_combo(self.files_type_combolist, tclass)
 +                self.files_type_combobox.set_active(self.map_selected_items_into_combobox(self.files_type_combolist, tclass))
-+        self.filedict[(self.application, ipage, operation)][(path, type)] = {"type": tclass, "mls": mls, "changed": True, "old": False}
++                self.filedict[(self.application, ipage, operation)][(path, type)] = {"type": tclass, "mls": mls, "changed": True, "old": False}
++        if opage == USER_PAGE:
++            row = self.user_treeview.get_selection()
++            print row
++
++        if opage == LOGIN_PAGE:
++            row = self.login_treeview.get_selection()
++            print row
++
 +
 +    def check_if_type_is_in_combo(self, combolist, ftype):
 +        match = False
@@ -516855,7 +517441,7 @@ index 0000000..cbdf9aa
 +                return True
 +        return False
 +
-+    def init_button_files(self, *args):
++    def init_files_dialog(self, *args):
 +        exclude_list = []
 +        self.files_class_combobox.set_sensitive(True)
 +        self.popup_window_files.show()
@@ -516907,32 +517493,27 @@ index 0000000..cbdf9aa
 +        self.files_type_combobox.set_active(0)
 +        self.files_mls_combobox.set_active(0)
 +        iter = self.files_type_combolist.append()
-+        self.files_type_combolist.set_value(iter, 0, 'More..')
-+    def add_button_network_clicked(self, *args):
-+        if self.application != None:
-+            self.popup_network_label.set_text((_("Add Network Port for %s.  Ports will be created when update is applied."))% self.application)
-+            self.popup_window_network.set_title((_("Add Network Port for %s"))% self.application)
-+        self.init_button_network(args)
-+        self.modify_mode=False
++        self.files_type_combolist.set_value(iter, 0, 'More...')
 +
 +    def modify_button_network_clicked(self, *args):
 +        if self.application != None:
 +            self.popup_network_label.set_text((_("Modify Network Port for %s.  Ports will be created when update is applied."))% self.application)
 +            self.popup_window_network.set_title((_("Modify Network Port for %s"))% self.application)
 +        self.delete_old_item = None
-+        self.init_button_network(args)
++        self.init_network_dialog(args)
 +        operation = "Modify"
 +        mls = 1
 +        self.modify_mode=True
 +        ipage = self.inner_notebook_network.get_current_page()
 +        if (self.application, ipage, operation) not in self.portdict:
 +            self.portdict[(self.application, ipage, operation)] = {}
-+        if ipage == self.OUTBOUND:
++        if ipage == OUTBOUND:
 +            row = self.out_network_treeview.get_selection()
-+            iter = row.get_selected()                                   # iter[0] is tree model iter[1] is the iter
++            # iter[0] is tree model iter[1] is the iter
++            iter = row.get_selected()                                   
 +            if self.error_check_iter(iter[1]):
 +                return
-+            iter = self.out_network_treemodel_sort.convert_iter_to_child_iter(None, iter[1])
++            iter = self.out_network_treemodel_sort.convert_iter_to_child_iter(iter[1])
 +            iter = self.out_network_filter_data_set.convert_iter_to_child_iter(iter)
 +            self.delete_old_item = iter
 +            port = self.out_network_tree_data_set.get_value(iter, 0)
@@ -516943,16 +517524,15 @@ index 0000000..cbdf9aa
 +            protocol = self.out_network_tree_data_set.get_value(iter, 1)
 +            if protocol == "tcp":
 +                self.network_tcp_button.set_active(True)
-+                #self.network_protocol_combobox.set_active(self.map_selected_items_into_combobox(self.network_protocol_combolist, protocol))
 +            elif protocol == "udp":
 +                self.network_udp_button.set_active(True)
 +
-+        elif ipage == self.INBOUND:
++        elif ipage == INBOUND:
 +            row = self.in_network_treeview.get_selection()
-+            iter = row.get_selected()                                   # iter[0] is tree model iter[1] is the iter
-+            if self.error_check_iter(iter[1]):
++            model, iter = row.get_selected()                                   
++            if self.error_check_iter(iter):
 +                return
-+            iter = self.in_network_treemodel_sort.convert_iter_to_child_iter(None, iter[1])
++            iter = self.in_network_treemodel_sort.convert_iter_to_child_iter(iter)
 +            iter = self.in_network_filter_data_set.convert_iter_to_child_iter(iter)
 +            self.delete_old_item = iter
 +            port = self.in_network_tree_data_set.get_value(iter, 0)
@@ -516977,7 +517557,7 @@ index 0000000..cbdf9aa
 +            ctr += 1
 +        return ctr
 +
-+    def init_button_network(self, *args):
++    def init_network_dialog(self, *args):
 +        self.popup_window_network.show()
 +        self.window.set_sensitive(False)
 +        ipage = self.inner_notebook_network.get_current_page()
@@ -516986,7 +517566,7 @@ index 0000000..cbdf9aa
 +        self.network_ports_entry.set_text("")
 +
 +        try:
-+            if ipage == self.OUTBOUND:
++            if ipage == OUTBOUND:
 +                netd = sepolicy.network.get_network_connect(self.application, "tcp", "name_connect")
 +                iter = self.network_protocol_combolist.append()
 +                self.network_protocol_combolist.set_value(iter, 0, "tcp")
@@ -516994,7 +517574,7 @@ index 0000000..cbdf9aa
 +                    for t,ports in netd[k]:
 +                        iter = self.network_port_type_combolist.append()
 +                        self.network_port_type_combolist.set_value(iter, 0, t)
-+            elif ipage == self.INBOUND:
++            elif ipage == INBOUND:
 +                netd = sepolicy.network.get_network_connect(self.application, "tcp", "name_bind")
 +                iter = self.network_protocol_combolist.append()
 +                self.network_protocol_combolist.set_value(iter, 0, "tcp")
@@ -517013,12 +517593,75 @@ index 0000000..cbdf9aa
 +            pass
 +
 +        self.network_port_type_combobox.set_active(0)
-+        #self.network_protocol_combobox.set_active(0)
 +        self.network_tcp_button.set_active(True)
 +        self.network_mls_combobox.set_active(0)
-+        #self.portdict[self.application] = []
 +
-+    def bools_show_modified_only(self, checkbutton):
++    def user_close_popup(self, *args):
++        self.user_popup_window.hide()
++        self.window.set_sensitive(True)
++
++    def user_advanced_button(self, label, *args):
++        advanced = (label.get_text() == ADVANCED_LABEL[0])
++        self.user_mls_label.set_visible(advanced)
++        self.user_mls_entry.set_visible(advanced)
++        if advanced:
++            label.set_text(ADVANCED_LABEL[1])
++        else:
++            label.set_text(ADVANCED_LABEL[0])
++
++    def login_close_popup(self, *args):
++        self.login_popup_window.hide()
++        self.window.set_sensitive(True)
++
++    def login_advanced_button(self, label, *args):
++        advanced = (label.get_text() == ADVANCED_LABEL[0])
++        self.login_mls_label.set_visible(advanced)
++        self.login_mls_entry.set_visible(advanced)
++        if advanced:
++            label.set_text(ADVANCED_LABEL[1])
++        else:
++            label.set_text(ADVANCED_LABEL[0])
++
++    def login_row_activated(self, treeview, path, *args):
++        self.modify_button.set_sensitive(True)
++        print treeview, path, args
++
++    def login_init_dialog(self, *args):
++        self.login_popup_window.show()
++        self.login_seuser_liststore.clear()
++        users = sepolicy.get_all_users()
++        users.sort()
++        for u in users: 
++            iter = self.login_seuser_liststore.append()
++            self.login_seuser_liststore.set_value(iter, 0, str(u))
++        self.login_name_entry.set_text("")
++        self.login_mls_entry.set_text("")
++
++    def user_row_activated(self, treeview, path, *args):
++        self.modify_button.set_sensitive(True)
++        print treeview, path, args
++
++    def user_init_dialog(self, *args):
++        self.user_popup_window.show()
++        self.user_liststore.clear()
++        roles = sepolicy.get_all_roles()
++        roles.sort()
++        for r in roles: 
++            iter = self.user_roles_liststore.append()
++            self.user_roles_liststore.set_value(iter, 0, str(r))
++        self.user_name_entry.set_text("")
++        self.user_mls_entry.set_text("")
++
++    def show_modified(self, checkbutton):
++        opage = self.outer_notebook.get_current_page()
++        if opage == BOOLEANS_PAGE:
++            self.bools_show_modified(checkbutton)
++        if opage == FILES_PAGE:
++            self.files_show_modified(checkbutton)
++        if opage == NETWORK_PAGE:
++            self.network_show_modified(checkbutton)
++        
++    def bools_show_modified(self, checkbutton):
 +        append_list = []
 +        if checkbutton.get_active() == True:
 +            for bools in self.booldict:
@@ -517031,70 +517674,131 @@ index 0000000..cbdf9aa
 +                self.boolean_tree_data_set.set_value(iter, 0, self.booldict[i]['active'])
 +                self.boolean_tree_data_set.set_value(iter, 1, sepolicy.boolean_desc(i))
 +                self.boolean_tree_data_set.set_value(iter, 2, i)
++                self.boolean_tree_data_set.set_value(iter, 3, 'More...')
 +        elif self.application != None:
 +            self.boolean_tree_data_set.clear()
 +            self.bool_initialize(self.application)
 +
-+    def files_show_modified_only(self, checkbutton):
++    def init_modified_files_treestore(self, tree, app, ipage, operation, path, fclass, ftype):
++        iter = tree.append(None)
++        tree.set_value(iter, 0, path)
++        tree.set_value(iter, 1, ftype)
++        tree.set_value(iter, 2, fclass)
++
++    def files_show_modified(self, checkbutton):
 +        ipage = self.inner_notebook_files.get_current_page()
 +        if checkbutton.get_active() == True:
++            modlist = {}
 +            if ipage == self.EXE_PAGE:
++                removedict = {}
++                for i in self.executable_files_treestore:
++                    modlist[i] = {'path': i[0], 'type': i[1], 'class': i[2]}
 +                self.executable_files_treestore.clear()
 +                try:
-+                    for exe, tclass in self.filedict[self.application, ipage, "Add"]:
-+                        iter = self.executable_files_treestore.append(None)
-+                        self.executable_files_treestore.set_value(iter, 0, exe)
-+                        self.executable_files_treestore.set_value(iter, 1, self.filedict[(self.application, ipage, "Add")][(exe, tclass)]["type"])
-+                        self.executable_files_treestore.set_value(iter, 2, tclass)
++                    for exe, fclass in self.filedict[self.application, ipage, "Add"]:
++                        ftype = self.filedict[self.application, ipage, "Add"][exe, fclass]["type"]
++                        if self.filedict[(self.application, ipage, "Add")][(exe, fclass)]["old"]:
++                            miss = True
++                            for i in modlist:
++                                if exe == modlist[i]['path'] and fclass == modlist[i]['class'] and ftype == modlist[i]['type']:
++
++                                    self.init_modified_files_treestore(self.executable_files_treestore, self.application, ipage, "Add", exe, fclass, ftype)
++                                    miss = False
++                            if miss:
++                                if (self.application, ipage, "Add") not in removedict:
++                                    removedict[self.application, ipage, "Add"] = {}
++                                removedict[self.application, ipage, "Add"][exe, fclass] = {"type": ftype}
++
++                        else:
++                            self.init_modified_files_treestore(self.executable_files_treestore, self.application, ipage, "Add", exe, fclass, ftype)
++
++                    for r in removedict:
++                        for b in removedict[r]:
++                            self.filedict[r].pop(b)
++
 +                except KeyError:
 +                    pass
 +                try:
-+                    for exe, tclass in self.filedict[self.application, ipage, "Modify"]:
++                    for exe, fclass in self.filedict[self.application, ipage, "Modify"]:
 +                        iter = self.executable_files_treestore.append(None)
-+                        if not self.filedict[(self.application, ipage, "Modify")][(exe, tclass)]["changed"]:
++                        if not self.filedict[(self.application, ipage, "Modify")][(exe, fclass)]["changed"]:
 +                            self.executable_files_treestore.set_value(iter, 0, exe)
-+                            self.executable_files_treestore.set_value(iter, 1, self.filedict[(self.application, ipage, "Modify")][(exe, tclass)]["type"])
-+                            self.executable_files_treestore.set_value(iter, 2, tclass)
++                            self.executable_files_treestore.set_value(iter, 1, self.filedict[(self.application, ipage, "Modify")][(exe, fclass)]["type"])
++                            self.executable_files_treestore.set_value(iter, 2, fclass)
 +                except KeyError:
 +                    pass
 +            elif ipage == self.WRITABLE_PAGE:
++                removedict = {}
++                for i in self.writable_files_treestore:
++                    modlist[i] = {'path': i[0], 'type': i[1], 'class': i[2]}
 +                self.writable_files_treestore.clear()
 +                try:
-+                    for write, tclass in self.filedict[self.application, ipage, "Add"]:
-+                        iter = self.writable_files_treestore.append(None)
-+                        self.writable_files_treestore.set_value(iter, 0, write)
-+                        self.writable_files_treestore.set_value(iter, 1, self.filedict[(self.application, ipage, "Add")][(write, tclass)]["type"])
-+                        self.writable_files_treestore.set_value(iter, 2, tclass)
++                    for write, fclass in self.filedict[self.application, ipage, "Add"]:
++                        ftype = self.filedict[self.application, ipage, "Add"][write, fclass]["type"]
++                        if self.filedict[(self.application, ipage, "Add")][(write, fclass)]["old"]:
++                            miss = True
++                            for i in modlist:
++                                if write == modlist[i]['path'] and fclass == modlist[i]['class'] and ftype == modlist[i]['type']:
++                                    self.init_modified_files_treestore(self.writable_files_treestore, self.application, ipage, "Add", write, fclass, ftype)
++                                    miss = False
++                            if miss:
++                                if (self.application, ipage, "Add") not in removedict:
++                                    removedict[self.application, ipage, "Add"] = {}
++                                removedict[self.application, ipage, "Add"][write, fclass] = {"type": ftype}
++                        else:
++                            self.init_modified_files_treestore(self.writable_files_treestore, self.application, ipage, "Add", write, fclass, ftype)
++
++                    for r in removedict:
++                        for b in removedict[r]:
++                            self.filedict[r].pop(b)
++
 +                except KeyError:
 +                    pass
 +                try:
-+                    for write, tclass in self.filedict[self.application, ipage, "Modify"]:
++                    for write, fclass in self.filedict[self.application, ipage, "Modify"]:
 +                        iter = self.writable_files_treestore.append(None)
-+                        if not self.filedict[(self.application, ipage, "Modify")][(write, tclass)]["changed"]:
++                        if not self.filedict[(self.application, ipage, "Modify")][(write, fclass)]["changed"]:
 +                            self.writable_files_treestore.set_value(iter, 0, write)
-+                            self.writable_files_treestore.set_value(iter, 1, self.filedict[(self.application, ipage, "Modify")][(write, tclass)]["type"])
-+                            self.writable_files_treestore.set_value(iter, 2, tclass)
++                            self.writable_files_treestore.set_value(iter, 1, self.filedict[(self.application, ipage, "Modify")][(write, fclass)]["type"])
++                            self.writable_files_treestore.set_value(iter, 2, fclass)
 +                except KeyError:
 +                    pass
 +            elif ipage == self.APP_PAGE:
++                removedict = {}
++                for i in self.application_files_treestore:
++                    modlist[i] = {'path': i[0], 'type': i[1], 'class': i[2]}
 +                self.application_files_treestore.clear()
 +                try:
-+                    for app, tclass in self.filedict[self.application, ipage, "Add"]:
-+                        markup = self.markup(self.filedict[(self.application, ipage, "Add")][(app, tclass)]["type"])
-+                        iter = self.application_files_treestore.append(None)
-+                        self.application_files_treestore.set_value(iter, 0, app)
-+                        self.application_files_treestore.set_value(iter, 1, markup)
-+                        self.application_files_treestore.set_value(iter, 2, tclass)
++                    for app, fclass in self.filedict[self.application, ipage, "Add"]:
++                        ftype = self.filedict[self.application, ipage, "Add"][app, fclass]["type"]
++                        if self.filedict[(self.application, ipage, "Add")][(app, fclass)]["old"]:
++                            miss = True
++                            for i in modlist:
++                                if app == modlist[i]['path'] and fclass == modlist[i]['class'] and ftype == modlist[i]['type']:
++                                    self.init_modified_files_treestore(self.application_files_treestore, self.application, ipage, "Add", app, fclass, ftype)
++                                    miss = False
++                            if miss:
++                                if (self.application, ipage, "Add") not in removedict:
++                                    removedict[self.application, ipage, "Add"] = {}
++                                removedict[self.application, ipage, "Add"][app, fclass] = {"type": ftype}
++                        else:
++                            markup = self.markup(ftype)
++                            self.init_modified_files_treestore(self.application_files_treestore, self.application, ipage, "Add", app, fclass, markup)
++
++                    for r in removedict:
++                        for b in removedict[r]:
++                            self.filedict[r].pop(b)
++
 +                except KeyError:
 +                    pass
 +                try:
-+                    for app, tclass in self.filedict[self.application, ipage, "Modify"]:
-+                        markup = self.markup(self.filedict[(self.application, ipage, "Modify")][(app, tclass)]["type"])
++                    for app, fclass in self.filedict[self.application, ipage, "Modify"]:
++                        markup = self.markup(self.filedict[(self.application, ipage, "Modify")][(app, fclass)]["type"])
 +                        iter = self.application_files_treestore.append(None)
-+                        if not self.filedict[(self.application, ipage, "Modify")][(app, tclass)]["changed"]:
++                        if not self.filedict[(self.application, ipage, "Modify")][(app, fclass)]["changed"]:
 +                            self.application_files_treestore.set_value(iter, 0, app)
 +                            self.application_files_treestore.set_value(iter, 1, markup)
-+                            self.application_files_treestore.set_value(iter, 2, tclass)
++                            self.application_files_treestore.set_value(iter, 2, fclass)
 +                except KeyError:
 +                    pass
 +
@@ -517109,18 +517813,33 @@ index 0000000..cbdf9aa
 +                self.application_files_treestore.clear()
 +                self.application_file_types_initialize(self.application)
 +
-+    def network_show_modified_only(self, checkbutton):
++    def network_show_modified(self, checkbutton):
 +        ipage = self.inner_notebook_network.get_current_page()
 +        if checkbutton.get_active() == True:
-+            if ipage == self.OUTBOUND:
-+                self.out_network_tree_data_set.clear()
++            outlist = {}
++            inlist = {}
++            for i in self.out_network_tree_data_set:
++                outlist[i] = {'port': i[0], 'protocol': i[1], 'type': i[2]}
++            for j in self.in_network_tree_data_set:
++                inlist[j] = {'port': j[0], 'protocol': j[1], 'type': j[2]}
++            self.out_network_tree_data_set.clear()
++            self.in_network_tree_data_set.clear()
++            if ipage == OUTBOUND:
 +                try:
 +                    for port, protocol in self.portdict[self.application, ipage, "Add"]:
-+                        iter = self.out_network_tree_data_set.append()
 +                        type = self.portdict[(self.application, ipage, "Add")][(port, protocol)]["type"]
-+                        self.out_network_tree_data_set.set_value(iter, 0, port)
-+                        self.out_network_tree_data_set.set_value(iter, 1, protocol)
-+                        self.out_network_tree_data_set.set_value(iter, 2, type)
++                        if self.portdict[(self.application, ipage, "Add")][(port, protocol)]["old"]:
++                            for i in outlist:
++                                if port in outlist[i]['port'].split(',') and protocol == outlist[i]['protocol'] and type == outlist[i]['type']:
++                                    iter = self.out_network_tree_data_set.append()
++                                    self.out_network_tree_data_set.set_value(iter, 0, port)
++                                    self.out_network_tree_data_set.set_value(iter, 1, protocol)
++                                    self.out_network_tree_data_set.set_value(iter, 2, type)
++                        else:
++                            iter = self.out_network_tree_data_set.append()
++                            self.out_network_tree_data_set.set_value(iter, 0, port)
++                            self.out_network_tree_data_set.set_value(iter, 1, protocol)
++                            self.out_network_tree_data_set.set_value(iter, 2, type)
 +                except KeyError:
 +                    pass
 +                try:
@@ -517133,16 +517852,23 @@ index 0000000..cbdf9aa
 +                            self.out_network_tree_data_set.set_value(iter, 2, type)
 +                except KeyError:
 +                    pass
-+            elif ipage == self.INBOUND:
-+                self.in_network_tree_data_set.clear()
++            elif ipage == INBOUND:
 +                try:
 +                    for port, protocol in self.portdict[self.application, ipage, "Add"]:
-+                        iter = self.in_network_tree_data_set.append()
 +                        type = self.portdict[(self.application, ipage, "Add")][(port, protocol)]["type"]
-+                        self.in_network_tree_data_set.set_value(iter, 0, port)
-+                        self.in_network_tree_data_set.set_value(iter, 1, protocol)
-+                        self.in_network_tree_data_set.set_value(iter, 2, type)
-+                except KeyError:
++                        if self.portdict[(self.application, ipage, "Add")][(port, protocol)]["old"]:
++                            for i in inlist:
++                                if port in inlist[i]['port'] and protocol == inlist[i]['protocol'] and type == inlist[i]['type']:
++                                    iter = self.in_network_tree_data_set.append()
++                                    self.in_network_tree_data_set.set_value(iter, 0, port)
++                                    self.in_network_tree_data_set.set_value(iter, 1, protocol)
++                                    self.in_network_tree_data_set.set_value(iter, 2, type)
++                        else:
++                            iter = self.in_network_tree_data_set.append()
++                            self.in_network_tree_data_set.set_value(iter, 0, port)
++                            self.in_network_tree_data_set.set_value(iter, 1, protocol)
++                            self.in_network_tree_data_set.set_value(iter, 2, type)
++                except IndexError:
 +                    pass
 +                try:
 +                    for port, protocol in self.portdict[self.application, ipage, "Modify"]:
@@ -517155,10 +517881,10 @@ index 0000000..cbdf9aa
 +                except KeyError:
 +                    pass
 +        elif self.application != None:
-+            if ipage == self.OUTBOUND:
++            if ipage == OUTBOUND:
 +                self.out_network_tree_data_set.clear()
 +                self.network_initialize(self.application)
-+            elif ipage == self.INBOUND:
++            elif ipage == INBOUND:
 +                self.in_network_tree_data_set.clear()
 +                self.network_initialize(self.application)
 +
@@ -517193,19 +517919,25 @@ index 0000000..cbdf9aa
 +        return False
 +
 +    def show_more_types(self, *args):
-+        if self.files_type_combobox.get_active_text() == 'More..':
++        if self.combo_get_active_text(self.files_type_combobox) == 'More...':
 +            self.popup_window_files.hide()
 +            self.moreTypes_window_files.show()
 +
++    def update_to_login(self, *args):
++        type = self.combo_get_active_text(self.login_seuser_combolist)
++        print self.login_name_entry.get_text()
++        print self.login_mls_entry.get_text()
++
 +    def update_to_files(self, *args):
 +        self.files_add = True
 +        # Insert Function will be used in the future
 +        insert_txt = self.files_path_entry.get_text()
 +        if self.error_check_files(insert_txt):
 +            return
-+        type = self.files_type_combobox.get_active_text()
-+        mls = self.files_mls_combobox.get_active_text()
-+        tclass = self.files_class_combobox.get_active_text()
++        type = self.combo_get_active_text(self.files_type_combobox)
++        mls = self.combo_get_active_text(self.files_mls_combobox)
++        tclass = self.combo_get_active_text(self.files_class_combobox)
++
 +        self.files_path_entry.set_text("")
 +        if self.modify_mode:
 +            operation = "Modify"
@@ -517241,6 +517973,7 @@ index 0000000..cbdf9aa
 +        self.recursive_path_toggle.set_active(False)
 +        self.popup_window_files.hide()
 +        self.window.set_sensitive(True)
++        self.new_updates()
 +
 +    def update_to_network(self, *args):
 +        self.network_add = True
@@ -517251,9 +517984,9 @@ index 0000000..cbdf9aa
 +            protocol = "tcp"
 +        elif self.network_udp_button.get_active():
 +            protocol = "udp"
-+        #protocol = self.network_protocol_combobox.get_active_text()
-+        port_type = self.network_port_type_combobox.get_active_text()
-+        mls = self.network_mls_combobox.get_active_text()
++        protocol = self.combo_get_active_text(self.network_protocol_combobox)
++        port_type = self.combo_get_active_text(self.network_port_type_combobox)
++        mls = self.combo_get_active_text(self.network_mls_combobox)
 +        self.network_ports_entry.set_text("")
 +        if self.modify_mode:
 +            operation = "Modify"
@@ -517262,14 +517995,14 @@ index 0000000..cbdf9aa
 +        ipage = self.inner_notebook_network.get_current_page()
 +        if (self.application, ipage, operation) not in self.portdict:
 +            self.portdict[(self.application, ipage, operation)] = {}
-+        if ipage == self.OUTBOUND:
++        if ipage == OUTBOUND:
 +            iter = self.out_network_tree_data_set.append()
 +            self.out_network_tree_data_set.set_value(iter, 0, ports)
 +            self.out_network_tree_data_set.set_value(iter, 1, protocol)
 +            self.out_network_tree_data_set.set_value(iter, 2, port_type)
 +            if operation == "Modify":
 +                self.out_network_tree_data_set.remove(self.delete_old_item)
-+        if ipage == self.INBOUND:
++        if ipage == INBOUND:
 +            iter = self.in_network_tree_data_set.append()
 +            self.in_network_tree_data_set.set_value(iter, 0, ports)
 +            self.in_network_tree_data_set.set_value(iter, 1, protocol)
@@ -517280,24 +518013,45 @@ index 0000000..cbdf9aa
 +        self.network_add = False
 +        self.popup_window_network.hide()
 +        self.window.set_sensitive(True)
++        self.new_updates()
 +
-+    def delete_from_network(self, *args):
-+        self.delete_window_network.show()
-+        self.current_popup = self.delete_window_network
-+        self.delete_network_liststore.clear()
-+        self.window.set_sensitive(False)
-+        ipage = self.inner_notebook_network.get_current_page()
++    def delete_button_clicked(self, *args):
++        opage = self.outer_notebook.get_current_page()
 +        operation = "Add"
-+        if (self.application, ipage, operation) not in self.portdict:
-+            self.portdict[(self.application, ipage, operation)] = {}
-+        for ports in self.portdict[self.application, ipage, operation]:
-+            for items in self.portdict[self.application, ipage, operation][ports]:
-+                type = self.portdict[self.application, ipage, operation][ports]["type"]
-+                mls = self.portdict[self.application, ipage, operation][ports]["mls"]
-+            iter = self.delete_network_liststore.append()
-+            self.delete_network_liststore.set_value(iter, 1, ports[0])
-+            self.delete_network_liststore.set_value(iter, 2, type)
-+            self.delete_network_liststore.set_value(iter, 3, ports[1])
++        self.window.set_sensitive(False)
++        if opage == NETWORK_PAGE:
++            self.delete_window_network.show()
++            self.current_popup = self.delete_window_network
++            self.delete_network_liststore.clear()
++            ipage = self.inner_notebook_network.get_current_page()
++            if (self.application, ipage, operation) not in self.portdict:
++                self.portdict[(self.application, ipage, operation)] = {}
++            for ports in self.portdict[self.application, ipage, operation]:
++                for items in self.portdict[self.application, ipage, operation][ports]:
++                    type = self.portdict[self.application, ipage, operation][ports]["type"]
++                    mls = self.portdict[self.application, ipage, operation][ports]["mls"]
++                iter = self.delete_network_liststore.append()
++                self.delete_network_liststore.set_value(iter, 1, ports[0])
++                self.delete_network_liststore.set_value(iter, 2, type)
++                self.delete_network_liststore.set_value(iter, 3, ports[1])
++            return
++
++        if opage == FILES_PAGE:
++            self.delete_window_files.show()
++            self.current_popup = self.delete_window_files
++            self.delete_files_liststore.clear()
++            ipage = self.inner_notebook_files.get_current_page()
++            if (self.application, ipage, operation) not in self.filedict:
++                self.filedict[(self.application, ipage, operation)] = {}
++            for items in self.filedict[(self.application, ipage, operation)]:
++                for i in self.filedict[(self.application, ipage, operation)][items]:
++                    type = self.filedict[(self.application, ipage, operation)][items]["type"]
++                    mls = self.filedict[(self.application, ipage, operation)][items]["mls"]
++
++                iter = self.delete_files_liststore.append()
++                self.delete_files_liststore.set_value(iter, 1, items[0])
++                self.delete_files_liststore.set_value(iter, 2, type)
++                self.delete_files_liststore.set_value(iter, 3, items[1])
 +
 +    def delete_network_from_list_files(self, *args):
 +        operation = "Add"
@@ -517309,42 +518063,40 @@ index 0000000..cbdf9aa
 +                    self.ipage_delete(self.out_network_tree_data_set, (delete[1], delete[2]))
 +                elif ipage == 1:
 +                    self.ipage_delete(self.in_network_tree_data_set, (delete[1], delete[2]))
++                break
 +        self.window.set_sensitive(True)
 +        self.delete_window_network.hide()
-+
-+    def delete_from_files(self, *args):
-+        self.delete_window_files.show()
-+        self.current_popup = self.delete_window_files
-+        self.delete_files_liststore.clear()
-+        self.window.set_sensitive(False)
-+        ipage = self.inner_notebook_files.get_current_page()
-+        operation = "Add"
-+        if (self.application, ipage, operation) not in self.filedict:
-+            self.filedict[(self.application, ipage, operation)] = {}
-+        for items in self.filedict[(self.application, ipage, operation)]:
-+            for i in self.filedict[(self.application, ipage, operation)][items]:
-+                type = self.filedict[(self.application, ipage, operation)][items]["type"]
-+                mls = self.filedict[(self.application, ipage, operation)][items]["mls"]
-+
-+            iter = self.delete_files_liststore.append()
-+            self.delete_files_liststore.set_value(iter, 1, items[0])
-+            self.delete_files_liststore.set_value(iter, 2, type)
-+            self.delete_files_liststore.set_value(iter, 3, items[1])
++        self.new_updates()
 +
 +    def delete_items_from_list_files(self, *args):
 +        operation = "Add"
 +        ipage = self.inner_notebook_files.get_current_page()
++        del_list = []
 +        for delete in self.delete_files_liststore:
-+            if delete[0]:
-+                self.filedict[(self.application, ipage, operation)].pop((delete[1], delete[3]))
-+                if ipage == 0:
-+                    self.ipage_delete(self.executable_files_treestore, (delete[1], delete[3]))
-+                elif ipage == 1:
-+                    self.ipage_delete(self.writable_files_treestore, (delete[1], delete[3]))
-+                elif ipage == 2:
-+                    self.ipage_delete(self.application_files_treestore, (delete[1], delete[3]))
++            print delete[0], delete[1], delete[2],
++            for path, fclass in self.filedict[self.application, ipage, operation]:
++                if delete[0] and not self.filedict[self.application, ipage, operation][path, fclass]['old']:
++                    self.filedict[(self.application, ipage, operation)].pop((delete[1], delete[3]))
++                    if ipage == 0:
++                        self.ipage_delete(self.executable_files_treestore, (delete[1], delete[3]))
++                    elif ipage == 1:
++                        self.ipage_delete(self.writable_files_treestore, (delete[1], delete[3]))
++                    elif ipage == 2:
++                        self.ipage_delete(self.application_files_treestore, (delete[1], delete[3]))
++                    break
++                elif delete[0] and self.filedict[self.application, ipage, operation][path, fclass]["old"]:
++                    print delete[0], path
++                    type = self.filedict[self.application, ipage, operation][path, fclass]["type"]
++                    mls = self.filedict[self.application, ipage, operation][path, fclass]["mls"]
++                    if (self.application, ipage, 'Delete') not in self.filedict:
++                        self.filedict[(self.application, ipage, 'Delete')] = {}
++                    if (path, fclass) not in self.filedict[(self.application, ipage, 'Delete')]:
++                        self.filedict[(self.application, ipage, 'Delete')][path, fclass] = {}
++                    self.filedict[self.application, ipage, 'Delete'][path, fclass] = {'type': type, 'mls': mls , 'changed': False , 'old': True}
++
 +        self.window.set_sensitive(True)
 +        self.delete_window_files.hide()
++        self.new_updates()
 +
 +    def on_toggle_update(self, cell, path, model):
 +        model[path][0] = not model[path][0]
@@ -517360,46 +518112,14 @@ index 0000000..cbdf9aa
 +
 +    def on_toggle(self, cell, path, model):
 +        if path is not None:
-+            path =  self.booleans_treemodel_sort.convert_path_to_child_path(path)
++            p = self.booleans_treemodel_sort.get_iter(path)
++            p = self.booleans_treemodel_sort.get_path(p)
++            path =  self.booleans_treemodel_sort.convert_path_to_child_path(p)
 +            it = self.booleans_filter_data_set.get_iter(path)
 +            it = self.booleans_filter_data_set.convert_iter_to_child_iter(it)
 +            model.set_value(it, 0, not model.get_value(it, 0))
 +        self.populate_booldict(model, it)
-+
-+    def get_boolean_filter_data(self, windows, *args):
-+        #search for desired item
-+        self.filter_txt = windows.get_text()                                 # The txt that the user inputs into the filter is stored in filter_txt
-+        self.booleans_filter_data_set.refilter()
-+
-+    def get_file_filter_data(self, windows, *args):
-+        self.filter_txt = windows.get_text()                                 # The txt that the user inputs into the filter is stored in filter_txt
-+        self.inner_notebook_tab = self.inner_notebook_files.get_current_page()
-+        if self.inner_notebook_tab == 0:
-+            self.exe_files_filter_data_set.refilter()
-+        elif self.inner_notebook_tab == 1:
-+            self.writable_files_filter_data_set.refilter()
-+        elif self.inner_notebook_tab == 2:
-+            self.application_files_filter_data_set.refilter()
-+
-+    def get_network_filter_data(self, windows, *args):
-+        self.filter_txt = windows.get_text()                                    # The txt that the user inputs into the filter is stored in filter_txt
-+        self.inner_notebook_tab = self.inner_notebook_network.get_current_page()
-+
-+        if self.inner_notebook_tab == 0:
-+            self.out_network_filter_data_set.refilter()
-+        elif self.inner_notebook_tab == 1:
-+            self.in_network_filter_data_set.refilter()
-+
-+    def get_transitions_filter_data(self, windows, *args):
-+        self.filter_txt = windows.get_text()                                 # The txt that the user inputs into the filter is stored in filter_txt
-+        self.inner_notebook_tab = self.inner_notebook_transitions.get_current_page()
-+
-+        if self.inner_notebook_tab == 0:
-+            self.transitions_from_x_filter_data_set.refilter()
-+        elif self.inner_notebook_tab == 1:
-+            self.transitions_into_x_filter_data_set.refilter()
-+        elif self.inner_notebook_tab == 2:
-+            self.transitions_file_filter_data_set.refilter()
++        self.new_updates()
 +
 +    def get_advanced_filter_data(self, entry, *args):
 +        self.filter_txt = entry.get_text()
@@ -517407,17 +518127,53 @@ index 0000000..cbdf9aa
 +
 +    def get_filter_data(self, windows, *args):
 +        #search for desired item
-+        self.filter_txt = windows.get_text()                                 # The txt that the user inputs into the filter is stored in filter_txt
-+        self.filter_data_set.refilter()
++        # The txt that the user inputs into the filter is stored in filter_txt
++        self.filter_txt = windows.get_text()                                 
++        opage = self.outer_notebook.get_current_page()
++        if opage == BOOLEANS_PAGE:
++            self.booleans_filter_data_set.refilter()
++        if opage == FILES_PAGE:
++            inner_notebook_tab = self.inner_notebook_files.get_current_page()
++            if inner_notebook_tab == 0:
++                self.exe_files_filter_data_set.refilter()
++            elif inner_notebook_tab == 1:
++                self.writable_files_filter_data_set.refilter()
++            elif inner_notebook_tab == 2:
++                self.application_files_filter_data_set.refilter()
++
++        if opage == NETWORK_PAGE:
++            inner_notebook_tab = self.inner_notebook_network.get_current_page()
++            if inner_notebook_tab == 0:
++                self.out_network_filter_data_set.refilter()
++            elif inner_notebook_tab == 1:
++                self.in_network_filter_data_set.refilter()
++
++        if opage == TRANSITIONS_PAGE:
++            inner_notebook_tab = self.inner_notebook_transitions.get_current_page()
++            if inner_notebook_tab == 0:
++                self.transitions_from_x_filter_data_set.refilter()
++            if inner_notebook_tab == 1:
++                self.transitions_into_x_filter_data_set.refilter()
++            if inner_notebook_tab == 2:
++                self.transitions_file_filter_data_set.refilter()
 +
 +    def populate_booldict(self, model, iter):
 +        name = model.get_value(iter, 2)
 +        enabled = model.get_value(iter, 0)
-+        if self.booldict.has_key(name) and not self.booldict[name]['old']:
-+            self.booldict.pop(name)
++        if self.booldict.has_key(name):
++            #split up if fixes keyerror
++            if not self.booldict[name]['old']:
++                # The case where an old bool is changed then changed back, keeps the old variables old
++                if not self.booldict[name]['oldvar']:
++                    self.booldict.pop(name)
++                else:
++                    self.booldict[name]['active'] = enabled
++                    self.booldict[name]['old']  = True
++            else:
++                self.booldict[name]['active'] = enabled
++                self.booldict[name]['old']  = False
 +        else:
-+            self.booldict[name]['active'] = enabled
-+            self.booldict[name]['old'] = False
++            self.booldict[name] = {'active': enabled, 'old': False, 'oldvar': False}
 +
 +    def update_gui(self, *args):
 +        self.update_or_revert = "update"
@@ -517438,7 +518194,7 @@ index 0000000..cbdf9aa
 +
 +        for app, ipage, operation in self.filedict:
 +            for path, tclass in self.filedict[app, ipage, operation]:
-+                if not self.filedict[(app, ipage, operation)][(path, tclass)]["changed"] and not self.filedict[(app, ipage, operation)][(path, tclass)]["old"]:
++                if not self.filedict[(app, ipage, operation)][(path, tclass)]["changed"] and (not self.filedict[(app, ipage, operation)][(path, tclass)]["old"] or operation == 'Delete'):
 +                    iter = self.update_treestore.append(None)
 +                    self.update_treestore.set_value(iter, 0, True)
 +                    self.update_treestore.set_value(iter, 2, filetabs[ipage])
@@ -517446,8 +518202,8 @@ index 0000000..cbdf9aa
 +                    self.update_treestore.set_value(iter, 0, True)
 +                    if operation == "Add":
 +                        self.update_treestore.set_value(iter, 1, (_("Add file labeling for %s"))% self.application)
-+                    #elif operation == "delete":
-+                        #self.update_treestore.set_value(iter, 1, (_("Delete file labeling for %s"))% self.application)
++                    elif operation == "Delete":
++                        self.update_treestore.set_value(iter, 1, (_("Delete file labeling for %s"))% self.application)
 +                    elif operation == "Modify":
 +                        self.update_treestore.set_value(iter, 1, (_("Modify file labeling for %s"))% self.application)
 +
@@ -517471,8 +518227,8 @@ index 0000000..cbdf9aa
 +                    self.update_treestore.set_value(iter, 0, True)
 +                    if operation == "Add":
 +                        self.update_treestore.set_value(iter, 1, (_("Add ports for %s"))% app)
-+                #elif operation == "delete":
-+                    #self.update_treestore.set_value(iter, 1, (_("Delete ports for %s"))% app)
++                    elif operation == "delete":
++                        self.update_treestore.set_value(iter, 1, (_("Delete ports for %s"))% app)
 +                    elif operation == "Modify":
 +                        self.update_treestore.set_value(iter, 1, (_("Modify ports for %s"))% app)
 +
@@ -517488,44 +518244,75 @@ index 0000000..cbdf9aa
 +        self.update_window.show()
 +        self.window.set_sensitive(False)
 +
-+    def system_interface(self, button, *args):
-+        if button.get_label() == "System":
-+            self.applications_button_selection.set_label("System")
-+            self.app_system_button.set_label("Applications")
-+            self.main_selection_window.hide()
-+            self.outer_notebook.set_visible(False)
-+            self.booleans_radio_button.set_visible(False)
-+            self.files_radio_button.set_visible(False)
-+            self.network_radio_button.set_visible(False)
-+            self.transitions_radio_button.set_visible(False)
-+            self.systems_box.set_visible(True)
-+            self.system_button.set_visible(True)
-+            #self.window.set_resizable(False)
-+            #resize = self.window.get_default_size()
-+            #self.window.resize(resize[0], resize[1])
-+            self.idle_func()
++    def set_active_application_button(self):
++        if self.booleans_radio_button.get_active():
++            self.active_button = self.booleans_radio_button
++        if self.files_radio_button.get_active():
++            self.active_button = self.files_radio_button
++        if self.transitions_radio_button.get_active():
++            self.active_button = self.transitions_radio_button
++        if self.network_radio_button.get_active():
++            self.active_button = self.network_radio_button
 +
-+        elif button.get_label() == "Applications":
-+            self.applications_button_selection.set_label("Applications")
-+            self.app_system_button.set_label("System")
-+            self.main_selection_window.hide()
-+            self.outer_notebook.set_visible(True)
-+            self.booleans_radio_button.set_visible(True)
-+            self.files_radio_button.set_visible(True)
-+            self.network_radio_button.set_visible(True)
-+            self.transitions_radio_button.set_visible(True)
-+            self.systems_box.set_visible(False)
-+            self.system_button.set_visible(False)
-+            self.window.set_resizable(True)
++    def clearbuttons(self):
++        self.main_selection_window.hide()
++        self.booleans_radio_button.set_visible(False)
++        self.files_radio_button.set_visible(False)
++        self.network_radio_button.set_visible(False)
++        self.transitions_radio_button.set_visible(False)
++        self.system_radio_button.set_visible(False)
++        self.lockdown_radio_button.set_visible(False)
++        self.user_radio_button.set_visible(False)
++        self.login_radio_button.set_visible(False)
++        self.completion_entry.set_text("")
++
++    def show_system_page(self):
++        self.clearbuttons()
++        self.system_radio_button.set_visible(True)
++        self.lockdown_radio_button.set_visible(True)
++        self.applications_selection_button.set_label("System")
++        self.system_radio_button.set_active(True)
++        self.tab_change()
++        self.idle_func()
++
++    def show_users_page(self):
++        self.clearbuttons()
++        self.login_radio_button.set_visible(True)
++        self.user_radio_button.set_visible(True)
++        self.applications_selection_button.set_label("Users")
++        self.login_radio_button.set_active(True)
++        self.tab_change()
++        self.user_initialize()
++        self.idle_func()
++        self.add_button.set_sensitive(True)
++        self.delete_button.set_sensitive(True)
++
++    def show_applications_page(self):
++        self.clearbuttons()
++        self.booleans_radio_button.set_visible(True)
++        self.files_radio_button.set_visible(True)
++        self.network_radio_button.set_visible(True)
++        self.transitions_radio_button.set_visible(True)
++        self.booleans_radio_button.set_active(True)
++        self.tab_change()
++        self.idle_func()
++
++    def system_interface(self, *args):
++        self.show_system_page()
++
++    def users_interface(self, *args):
++        self.show_users_page()
 +
 +    def show_mislabeled_files(self, checkbutton, *args):
-+        ctr = 0
 +        iterlist = []
++        ctr = 0
 +        ipage = self.inner_notebook_files.get_current_page()
 +        if checkbutton.get_active() == True:
 +            if ipage == 0:
 +                for items in self.executable_files_treestore:
-+                    path = self.executable_files_treemodel_sort.convert_path_to_child_path(ctr)
++                    p = self.executable_files_treemodel_sort.get_iter(ctr)
++                    p = self.executable_files_treemodel_sort.get_path(p)
++                    path = self.executable_files_treemodel_sort.convert_path_to_child_path(p)
 +                    if path != None:
 +                        iter = self.exe_files_filter_data_set.get_iter(path)
 +                        iter = self.exe_files_filter_data_set.convert_iter_to_child_iter(iter)
@@ -517534,9 +518321,12 @@ index 0000000..cbdf9aa
 +                    ctr +=1
 +                for iters in iterlist:
 +                    self.executable_files_treestore.remove(iters)
-+            elif ipage == 1:
++
++            if ipage == 1:
 +                for items in self.writable_files_treestore:
-+                    path = self.writable_files_treemodel_sort.convert_path_to_child_path(ctr)
++                    p = self.writable_files_treemodel_sort.get_iter(ctr)
++                    p = self.writable_files_treemodel_sort.get_path(p)
++                    path = self.writable_files_treemodel_sort.convert_path_to_child_path(p)
 +                    if path != None:
 +                        iter = self.writable_files_filter_data_set.get_iter(path)
 +                        iter = self.writable_files_filter_data_set.convert_iter_to_child_iter(iter)
@@ -517545,9 +518335,12 @@ index 0000000..cbdf9aa
 +                    ctr +=1
 +                for iters in iterlist:
 +                    self.writable_files_treestore.remove(iters)
-+            elif ipage == 2:
++
++            if ipage == 2:
 +                for items in self.application_files_treestore:
-+                    path = self.application_files_treemodel_sort.convert_path_to_child_path(ctr)
++                    p = self.application_files_treemodel_sort.get_iter(ctr)
++                    p = self.application_files_treemodel_sort.get_path(p)
++                    path = self.application_files_treemodel_sort.convert_path_to_child_path(p)
 +                    if path != None:
 +                        iter = self.application_files_filter_data_set.get_iter(path)
 +                        iter = self.application_files_filter_data_set.convert_iter_to_child_iter(iter)
@@ -517572,7 +518365,7 @@ index 0000000..cbdf9aa
 +        self.con = ''
 +        ipage = self.inner_notebook_files.get_current_page()
 +        if ipage == self.EXE_PAGE:
-+            loc = self.executable_files_treemodel_sort.convert_path_to_child_path(loc[0])
++            loc = self.executable_files_treemodel_sort.convert_path_to_child_path(loc)
 +            iter = self.exe_files_filter_data_set.get_iter(loc)
 +            iter = self.exe_files_filter_data_set.convert_iter_to_child_iter(iter)
 +            path = self.executable_files_treestore.get_value(iter, 0)
@@ -517580,7 +518373,7 @@ index 0000000..cbdf9aa
 +            con = self.executable_files_treestore.get_value(iter, 6)
 +
 +        elif ipage == self.WRITABLE_PAGE:
-+            loc = self.writable_files_treemodel_sort.convert_path_to_child_path(loc[0])
++            loc = self.writable_files_treemodel_sort.convert_path_to_child_path(loc)
 +            iter = self.writable_files_filter_data_set.get_iter(loc)
 +            iter = self.writable_files_filter_data_set.convert_iter_to_child_iter(iter)
 +            path = self.writable_files_treestore.get_value(iter, 0)
@@ -517588,7 +518381,7 @@ index 0000000..cbdf9aa
 +            con = self.writable_files_treestore.get_value(iter, 6)
 +
 +        elif ipage == self.APP_PAGE:
-+            loc = self.application_files_treemodel_sort.convert_path_to_child_path(loc[0])
++            loc = self.application_files_treemodel_sort.convert_path_to_child_path(loc)
 +            iter = self.application_files_filter_data_set.get_iter(loc)
 +            iter = self.application_files_filter_data_set.convert_iter_to_child_iter(iter)
 +            path = self.application_files_treestore.get_value(iter, 0)
@@ -517598,6 +518391,17 @@ index 0000000..cbdf9aa
 +        self.restorecon_path = path
 +        self.fix_label_window.show()
 +
++    def new_updates(self, *args):
++        self.update_button.clicked()
++        self.update_window.hide()
++        self.window.set_sensitive(True)
++        if len(self.update_treestore) == 0:
++            self.update_button.set_sensitive(False)
++            self.revert_button.set_sensitive(False)
++        else:
++            self.update_button.set_sensitive(True)
++            self.revert_button.set_sensitive(True)
++
 +    def update_or_revert_changes(self, button, *args):
 +        self.update_gui()
 +        if button.get_label() == "Update":
@@ -517610,17 +518414,24 @@ index 0000000..cbdf9aa
 +            self.update_the_system()
 +        elif self.update_or_revert == "Revert":
 +            self.revert_to_previous_save(False)
++            self.clear_filters()
++            self.application_selected()
++        self.new_updates()
 +
 +    def update_the_system(self, *args):
-+        self.wait_mouse()
 +        self.update_window.hide()
 +        self.window.set_sensitive(True)
++        update_buffer = self.revert_to_previous_save(True)
++        self.wait_mouse()
 +        try:
-+            print self.send_over_dbus()
++            print self.dbus.semanage(update_buffer)
 +        except dbus.exceptions.DBusException, e:
 +            print e
-+        self.completion_entry_selected()
-+        self.customized = self.dbus.customized()
++        self.finish_init = False
++        self.previously_modified_initialize(self.dbus.customized())
++        self.finish_init = True
++        self.clear_filters()
++        self.application_selected()
 +        self.ready_mouse()
 +
 +    def ipage_value_lookup(self, lookup):
@@ -517640,6 +518451,7 @@ index 0000000..cbdf9aa
 +
 +    def revert_to_previous_save(self, update):
 +        ctr = 0
++        update_buffer =  ""
 +        for items in self.update_treestore:
 +            if self.update_treestore[ctr][0]:
 +                ipage = self.ipage_value_lookup(self.update_treestore[ctr][2])
@@ -517649,13 +518461,13 @@ index 0000000..cbdf9aa
 +                    self.bool_revert = self.get_attributes_update(self.update_treestore[ctr, 0][1])
 +                    fclass_or_protocol = self.get_attributes_update(self.update_treestore[ctr,1][1])
 +                    ftype = self.get_attributes_update(self.update_treestore[ctr,2][1])
-+                except IndexError:
++                except:
 +                    pass
 +                popbools = []
 +                if ipage == "Booleans":
 +                    for bools in self.booldict:
 +                        if bools == self.bool_revert:
-+                            self.update_buffer += "boolean -m -%d %s\n" % (self.booldict[bools]['active'], bools)
++                            update_buffer += "boolean -m -%d %s\n" % (self.booldict[bools]['active'], bools)
 +                            popbools.append(self.bool_revert)
 +                    for pop in popbools:
 +                        self.booldict.pop(pop)
@@ -517663,8 +518475,7 @@ index 0000000..cbdf9aa
 +                    for ports in self.portdict:
 +                        if self.portdict[self.application, ipage, operation][path_or_port, fclass_or_protocol]["type"] == ftype:
 +                            porttype = self.portdict[self.application, ipage, operation][(path_or_port, fclass_or_protocol)]["type"]
-+                            buf_operation = self.translate_operation(operation)
-+                            self.update_buffer += "port -%s -t %s -p %s %s\n" % (buf_operation, porttype, fclass_or_protocol, path_or_port)
++                            update_buffer += "port -%s -t %s -p %s %s\n" % (operation[0].tolower(), porttype, fclass_or_protocol, path_or_port)
 +                            self.portdict[self.application, ipage, operation].pop((path_or_port, fclass_or_protocol))
 +                            break
 +                else:
@@ -517672,43 +518483,39 @@ index 0000000..cbdf9aa
 +                        if self.filedict[self.application, ipage, operation][path_or_port, fclass_or_protocol]["type"] == ftype:
 +
 +
-+                            buf_operation = self.translate_operation(operation)
-+                            self.update_buffer += "fcontext -%s -f %s -t %s %s\n" % (buf_operation, reverse_file_type_str[fclass_or_protocol], ftype, path_or_port)
-+                            print (self.update_buffer)
++                            update_buffer += "fcontext -%s -f %s -t %s %s\n" % (operation[0].tolower(), reverse_file_type_str[fclass_or_protocol], ftype, path_or_port)
 +                            self.filedict[self.application, ipage, operation].pop((path_or_port, fclass_or_protocol))
 +                            break
 +
 +            ctr += 1
 +        if update == False:
 +            self.update_window.hide()
-+            self.window.hide()
-+            self.completion_entry_selected()
 +            self.window.set_sensitive(True)
-+            self.window.show()
-+
++        else:
++            return update_buffer
 +    def reveal_advanced_system(self, label, *args):
-+        if label.get_text() == "Advanced >>":
-+            label.set_text("Advanced <<")
++        if label.get_text() == ADVANCED_LABEL[0]:
++            label.set_text(ADVANCED_LABEL[1])
 +            self.system_policy_label.set_visible(True)
 +            self.system_policy_type_combobox.set_visible(True)
-+        elif label.get_text() == "Advanced <<":
-+            label.set_text("Advanced >>")
++        elif label.get_text() == ADVANCED_LABEL[1]:
++            label.set_text(ADVANCED_LABEL[0])
 +            self.system_policy_label.set_visible(False)
 +            self.system_policy_type_combobox.set_visible(False)
 +
 +    def reveal_advanced(self, label, *args):
-+        if label.get_text() == "Advanced >>":
++        if label.get_text() == ADVANCED_LABEL[0]:
++            label.set_text(ADVANCED_LABEL[1])
 +            self.mls_label_files.set_visible(True)
 +            self.files_mls_combobox.set_visible(True)
 +            self.mls_label_network.set_visible(True)
 +            self.network_mls_combobox.set_visible(True)
-+            label.set_text("Advanced <<")
 +        else:
++            label.set_text(ADVANCED_LABEL[0])
 +            self.mls_label_files.set_visible(False)
 +            self.files_mls_combobox.set_visible(False)
 +            self.mls_label_network.set_visible(False)
 +            self.network_mls_combobox.set_visible(False)
-+            label.set_text("Advanced >>")
 +
 +    def advanced_search_initialize(self, domain):
 +        iter = self.advanced_search_liststore.append()
@@ -517726,7 +518533,8 @@ index 0000000..cbdf9aa
 +            return
 +
 +        entrypoints = sepolicy.get_entrypoints(domain)
-+        for exe in entrypoints:                                       # From entry_point = 0 to the number of keys in the dic
++        # From entry_point = 0 to the number of keys in the dic
++        for exe in entrypoints:                                       
 +            if len(entrypoints[exe]):
 +                file_class  = entrypoints[exe][1]
 +                for path in entrypoints[exe][0]:
@@ -517735,12 +518543,12 @@ index 0000000..cbdf9aa
 +                    self.advanced_search_liststore.set_value(iter, 0, path)
 +
 +    def advanced_label_main(self, label, *args):
-+        if label.get_text() == "Advanced >>":
-+            label.set_text("Advanced <<")
-+            self.advanced_search_window.show()
-+        elif label.get_text() == "Addanced <<":
-+            label.set_text("Advanced <<")
++        if label.get_text() == ADVANCED_LABEL[1]:
++            label.set_text(ADVANCED_LABEL[0])
 +            self.advanced_search_window.hide()
++        else:
++            label.set_text(ADVANCED_LABEL[1])
++            self.advanced_search_window.show()
 +
 +    def advanced_radio_select(self, button):
 +        label = ""
@@ -517780,6 +518588,10 @@ index 0000000..cbdf9aa
 +        self.clear_entry = False
 +        self.file_dialog.hide()
 +        self.files_path_entry.set_text(filename)
++        if self.import_export == 'Import':
++            self.import_config(filename)
++        elif self.import_export == 'Export':
++            self.export_config(filename)
 +
 +    def recursive_path(self, *args):
 +        path = self.files_path_entry.get_text()
@@ -517792,10 +518604,12 @@ index 0000000..cbdf9aa
 +
 +    def fuzzin_modify(self, tree, *args):
 +        row = tree.get_selection()
-+        iter = row.get_selected()                                   # iter[0] is tree model iter[1] is the iter
-+        if not self.error_check_iter(iter[1]):                         # Returns True if there is an error
-+            self.modify_button_file.set_sensitive(True)
-+            self.modify_button_network.set_sensitive(True)
++        if row == None:
++            self.modify_button.set_sensitive(True)
++        model, iter = row.get_selected()  
++        # Returns True if there is an error                                 
++        if not self.error_check_iter(iter):
++            self.modify_button.set_sensitive(True)
 +
 +    def highlight_entry_text(self, entry_obj, *args):
 +        txt = entry_obj.get_text()
@@ -517809,10 +518623,10 @@ index 0000000..cbdf9aa
 +            return
 +        if text.endswith("(/.*)?"):
 +            self.recursive_path_toggle.set_active(True)
-+        for d in self.DEFAULT_DIRS:
++        for d in sepolicy.DEFAULT_DIRS:
 +            if text.startswith(d):
 +                for t in self.files_type_combolist:
-+                    if t[0].endswith(self.DEFAULT_DIRS[d]):
++                    if t[0].endswith(sepolicy.DEFAULT_DIRS[d]):
 +                        self.files_type_combobox.set_active(self.map_selected_items_into_combobox(self.files_type_combolist, t[0]))
 +
 +    def resize_columns(self, *args):
@@ -517823,68 +518637,56 @@ index 0000000..cbdf9aa
 +    def browse_for_files(self, *args):
 +        self.file_dialog.show()
 +
-+    def close_browse_popup(self, *args):
-+        self.file_dialog.hide()
-+
 +    def close_config_window(self, *args):
 +        self.file_dialog.hide()
 +
-+    def change_system_policy(self, *args):
-+        self.dbus.change_policy_type(self.system_policy_type_combobox.get_active_text())
++    def change_default_policy(self, *args):
++        if self.typeHistory == self.system_policy_type_combobox.get_active():
++            return
++
++        if self.verify(_("Changing the policy type will cause a relabel of the entire file system on the next boot. Relabeling takes a long time depending on the size of the file system.  Do you wish to continue?")) == Gtk.ResponseType.NO:
++            self.system_policy_type_combobox.set_active(self.typeHistory)
++            return None
++
++        self.dbus.change_default_policy(self.combo_get_active_text(self.system_policy_type_combobox))
++        self.dbus.relabel_on_boot(True)
++        self.typeHistory = self.system_policy_type_combobox.get_active()
 +
 +    def change_default_mode(self, button):
++        if not self.finish_init:
++            return
 +        self.enabled_changed(button)
 +        if button.get_active():
-+            self.dbus.change_default_policy(button.get_label().lower())
++            self.dbus.change_default_mode(button.get_label().lower())
 +
 +    def import_config_show(self, *args):
-+        self.file_dialog.set_action(gtk.FILE_CHOOSER_ACTION_OPEN)
++        self.file_dialog.set_action(Gtk.FileChooserAction.OPEN)
 +        self.file_dialog.set_title("Import Configuration")
 +        self.file_dialog.show()
 +        #self.file_dialog.set_uri('/tmp')
 +        self.import_export = 'Import'
 +
 +    def export_config_show(self, *args):
-+        self.file_dialog.set_action(gtk.FILE_CHOOSER_ACTION_SAVE)
++        self.file_dialog.set_action(Gtk.FileChooserAction.SAVE)
 +        self.file_dialog.set_title("Export Configuration")
 +        self.file_dialog.show()
-+        #self.file_dialog.set_filter('/tmp')
 +        self.import_export = 'Export'
 +
-+    def import_or_export(self, button, *args):
-+        self.file_dialog.show()
-+        if self.import_export == 'Import':
-+            self.import_config()
-+        elif self.import_export == 'Export':
-+            self.export_config()
-+
-+    def export_config(self, *args):
-+        self.file_dialog.hide()
-+        filename = self.file_dialog.get_filename()
-+        if filename == None:
-+            return
-+        if os.path.exists(filename):
-+            print "Error"
++    def export_config(self, filename):
 +        self.wait_mouse()
 +        buf = self.dbus.customized()
 +        fd = open(filename, 'w')
 +        fd.write(buf)
 +        fd.close()
 +        self.ready_mouse()
-+        #self.exportwindow.set_action
 +
-+    def import_config(self, *args):
-+        self.file_dialog.hide()
-+        filename = self.file_dialog.get_filename()
-+        if filename == None:
-+            return
-+        self.file_dialog.hide()
++    def import_config(self, filename):
 +        fd = open(filename, "r")
 +        buf = fd.read()
 +        fd.close()
 +        self.wait_mouse()
 +        try:
-+            print self.dbus.semanage(buf)
++            self.dbus.semanage(buf)
 +        except OSError:
 +            pass
 +        self.ready_mouse()
@@ -517894,31 +518696,52 @@ index 0000000..cbdf9aa
 +                    dic[app, ipage, operation] = {}
 +        if (p, q) not in dic[app, ipage, operation]:
 +                    dic[app, ipage, operation][p, q] = {'type': ftype, 'mls': mls, 'changed': changed, 'old': old}
-+    def convert_unicode(self, unicodedata):
-+        return unicodedata.encode('ascii')
-+    def organize_dict(self, d):
-+        if d.startswith('boolean') and d != 'boolean -D':
-+            boolname = self.convert_unicode(d.split()[3])
-+            value = d.split()[2]
-+            self.booldict[boolname] = {'active': self.translate_bool(value), 'old': True}
 +
-+        elif d.startswith('port') and d != 'port -D':
-+            port = self.convert_unicode(d.split()[-1])
-+            protocol = self.convert_unicode(d.split()[5])
-+            ptype = self.convert_unicode(d.split()[3])
++    def organize_dict(self, d):
++        argv = d.split()
++        if len(argv) == 0:
++            return
++        cmd = argv[0]
++        argv = argv[1:]
++
++        if "-D" in argv:
++            return
++
++        if cmd == 'boolean':
++            boolname = argv[2]
++            value = argv[1]
++            self.booldict[boolname] = {'active': self.translate_bool(value), 'old': True, 'oldvar': True}
++            return
++
++        if cmd == "port":
++            port = argv[-1]
++            protocol = argv[4]
++            ptype = argv[2]
++
 +            for ipage in [0,1]:
 +                self.init_dictionary(self.portdict, self.application, ipage, 'Add', port, protocol, ptype, 0, False, True)
-+                self.portdict[self.application, ipage, 'Add'][port, protocol] = {'type': ptype, 'mls': 0, 'changed': False, 'old': True}
++                self.portdict[self.application, ipage, 'Add'][port, protocol] = {'type': ptype, 'mls': 1, 'changed': False, 'old': True}
++            return
 +
-+        elif d.startswith('fcontext') and d != 'fcontext -D':
-+            path = self.convert_unicode(d.split()[-1]).strip("'")
-+            label = self.convert_unicode(d.split()[6])
-+            fclass = self.convert_unicode(d.split()[3])
-+            if fclass == "'all":
-+                fclass = "all files"
-+            for ipage in [0,2]:
-+                self.init_dictionary(self.filedict, self.application, ipage, 'Add', path, fclass, label, 0, False, True)
-+                self.filedict[self.application, ipage, 'Add'][path, fclass] = {'type': label, 'mls': 0, 'changed': False, 'old': True}
++        if cmd == "fcontext":
++            args = d[1:].split()
++            if "-e" in args:
++                path = argv[-1]
++                equiv = argv[1]
++            else:
++                path = argv[-1].strip("'")
++                label = argv[4]
++                fclass = argv[2]
++                fclass = sepolicy.file_type_str[fclass]
++
++                for ipage in range(0,3):
++                    self.init_dictionary(self.filedict, self.application, ipage, 'Add', path, fclass, label, 0, False, True)
++                    self.filedict[self.application, ipage, 'Add'][path, fclass] = {'type': label, 'mls': 1, 'changed': False, 'old': True}
++        if cmd == "module":
++            if argv[-1] == "unconfined":
++                self.disable_unconfined_button.set_active(True)
++            if argv[-1] == "permissivedomains":
++                self.disable_permissive_button.set_active(True)
 +
 +    def translate_bool(self, b):
 +        b = b.split('-')[1]
@@ -517927,8 +518750,18 @@ index 0000000..cbdf9aa
 +        if b == '1':
 +            return True
 +
-+    def relabel_on_reboot(self, widget, *args):
-+        self.dbus.relabel_on_boot(widget.get_active())
++    def relabel_on_reboot(self, *args):
++        active = self.relabel_button.get_active()
++        exists = os.path.exists("/.autorelabel")
++
++        if active and exists:
++            return
++        if not active and not exists:
++            return
++        try:
++            self.dbus.relabel_on_boots(active)
++        except dbus.exceptions.DBusException, e:
++            self.error(e)
 +
 +    def closewindow(self, window, *args):
 +        window.hide()
@@ -517936,7 +518769,7 @@ index 0000000..cbdf9aa
 +        self.window.set_sensitive(True)
 +        if self.moreTypes_window_files == window:
 +            self.popup_window_files.show()
-+            if self.files_type_combobox.get_active_text() == 'More...':
++            if self.combo_get_active_text(self.files_type_combobox) =='More...':
 +                self.files_type_combobox.set_active(0)
 +        if self.error_check_window == window:
 +            self.window.set_sensitive(False)
@@ -517955,8 +518788,8 @@ index 0000000..cbdf9aa
 +            self.advanced_text_network.set_visible(True)
 +            self.mls_label_network.set_visible(False)
 +            self.network_mls_combobox.set_visible(False)
-+        if self.main_advanced_label.get_text() == "Advanced <<":
-+            self.main_advanced_label.set_text("Advanced >>")
++        if self.main_advanced_label.get_text() == ADVANCED_LABEL[1]:
++            self.main_advanced_label.set_text(ADVANCED_LABEL[0])
 +        return True
 +
 +    def close_fix_label_popup(self, *args):
@@ -517976,87 +518809,250 @@ index 0000000..cbdf9aa
 +        self.popup_window_files.hide()
 +        self.window.set_sensitive(True)
 +        self.recursive_path_toggle.set_active(False)
++
 +    def close_update_popup(self,*args):
 +        self.update_window.hide()
 +        self.window.set_sensitive(True)
 +
 +    def wait_mouse(self):
-+        self.window.window.set_cursor(self.busy_cursor)
++        self.window.get_window().set_cursor(self.busy_cursor)
 +        self.idle_func()
 +
 +    def ready_mouse(self):
-+        self.window.window.set_cursor(self.ready_cursor)
++        self.window.get_window().set_cursor(self.ready_cursor)
 +        self.idle_func()
 +
++    def tab_change_init(self, *args):
++        self.show_mislabeled_files_only.set_visible(True)
++        self.mislabeled_files_label.set_visible(True)
++        self.warning_files.set_visible(True)
++        self.modify_button.set_sensitive(False)
++
 +    def verify(self, message, title="" ):
-+        dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO,
-+                                gtk.BUTTONS_YES_NO,
++        dlg = Gtk.MessageDialog(None, 0, Gtk.MessageType.INFO,
++                                Gtk.ButtonsType.YES_NO,
 +                                message)
 +        dlg.set_title(title)
-+        dlg.set_position(gtk.WIN_POS_MOUSE)
++        dlg.set_position(Gtk.WindowPosition.MOUSE)
 +        dlg.show_all()
 +        rc = dlg.run()
 +        dlg.destroy()
 +        return rc
 +
++    def error(self, message):
++        dlg = Gtk.MessageDialog(None, 0, Gtk.MessageType.ERROR,
++                                Gtk.ButtonsType.CLOSE,
++                                message)
++        dlg.set_position(Gtk.WindowPosition.MOUSE)
++        dlg.show_all()
++        dlg.run()
++        dlg.destroy()
++
 +    def enabled_changed(self, radio):
-+        disabled = None
-+        enabled = None
 +        if not radio.get_active():
-+            disabled = radio.get_label()
++            return
++        label = radio.get_label()
++        if label == 'Disabled' and self.enforce_mode != DISABLED:
++            if self.verify(_("Changing to SELinux disabled requires a reboot.  It is not recommended.  If you later decide to turn SELinux back on, the system will be required to relabel.  If you just want to see if SELinux is causing a problem on your system, you can go to permissive mode which will only log errors and not enforce SELinux policy.  Permissive mode does not require a reboot.  Do you wish to continue?")) == Gtk.ResponseType.NO:
++                self.enforce_button.set_active(True)
++
++        if label != 'Disabled' and self.enforce_mode == DISABLED:
++            if self.verify(_("Changing to SELinux enabled will cause a relabel of the entire file system on the next boot. Relabeling takes a long time depending on the size of the file system.  Do you wish to continue?")) == Gtk.ResponseType.NO:
++                self.enforce_button.set_active(True)
++        self.enforce_button = radio
++
++    def clear_filters(self, *args):
++        self.filter_entry.set_text('')
++        self.show_modified_only.set_active(False)
++
++    def unconfined_toggle(self, *args):
++        if not self.finish_init:
++            return
++        self.wait_mouse()
++        if self.enable_unconfined_button.get_active():
++            self.dbus.semanage("module -e unconfined")
 +        else:
-+            enabled = radio.get_label()
++            self.dbus.semanage("module -d unconfined")
++        self.ready_mouse()
 +
-+        if enabled == 'Disabled' and disabled != 'Disabled' :
-+            if self.verify(_("Changing to SELinux disabled requires a reboot.  It is not recommended.  If you later decide to turn SELinux back on, the system will be required to relabel.  If you just want to see if SELinux is causing a problem on your system, you can go to permissive mode which will only log errors and not enforce SELinux policy.  Permissive mode does not require a reboot    Do you wish to continue?")) == gtk.RESPONSE_NO:
-+                self.relabel_button.set_active(False)
-+                self.relabel_on_reboot(self.relabel_button)
-+                self.relabel_button.set_sensitive(True)
-+
-+        elif enabled != 'Disabled' and disabled == 'Disabled':
-+            if self.verify(_("Changing to SELinux enabled will cause a relabel of the entire file system on the next boot. Relabeling takes a long time depending on the size of the file system.  Do you wish to continue?")) == gtk.RESPONSE_NO:
-+                self.relabel_button.set_active(True)
-+                self.relabel_on_reboot(self.relabel_button)
-+                self.relabel_button.set_sensitive(False)
++    def permissive_toggle(self, *args):
++        if not self.finish_init:
++            return
++        self.wait_mouse()
++        if self.enable_permissive_button.get_active():
++            self.dbus.semanage("module -e permissivedomains")
++        else:
++            self.dbus.semanage("module -d permissivedomains")
++        self.ready_mouse()
 +
 +    def confirmation_close(self, button, *args):
 +        if len(self.update_treestore) > 0:
-+            if self.verify(_("You have not pushed your update.\n Are you sure you want to quit?"), _("Loss of data Dialog")) == gtk.RESPONSE_NO:
++            if self.verify(_("You are attempting to close the application without applying your changes.\n    *    To apply changes you have made during this session, click No and click Update.\n    *    To leave the application without applying your changes, click Yes.  All changes that you have made during this session will be lost."), _("Loss of data Dialog")) == Gtk.ResponseType.NO:
 +                return True
-+        self.quit(self.window)
++        self.quit()
 +
-+    def quit(self, widget):
++    def quit(self, *args):
 +        sys.exit(0)
 +
 +    def restorecon(self, *args):
 +        self.dbus.restorecon(self.restorecon_path)
-+        self.completion_entry_selected()
++        self.application_selected()
 +        self.fix_label_window.hide()
 +
-+    def translate_operation(self, operation):
-+        if operation == 'Add':
-+            return 'a'
-+        elif operation == 'Modify':
-+            return 'm'
-+
-+    def send_over_dbus(self, *args):
-+        self.update_buffer = ''
-+        self.revert_to_previous_save(True)
-+        return self.dbus.semanage(self.update_buffer)
-+
 +if __name__ == '__main__':
 +    start = SELinuxGui()
+diff --git a/policycoreutils/sepolicy/sepolicy/help/booleans.png b/policycoreutils/sepolicy/sepolicy/help/booleans.png
+new file mode 100644
+index 0000000..a7b4206
+Binary files /dev/null and b/policycoreutils/sepolicy/sepolicy/help/booleans.png differ
+diff --git a/policycoreutils/sepolicy/sepolicy/help/booleans.txt b/policycoreutils/sepolicy/sepolicy/help/booleans.txt
+new file mode 100644
+index 0000000..d2924f8
+--- /dev/null
++++ b/policycoreutils/sepolicy/sepolicy/help/booleans.txt
+@@ -0,0 +1,5 @@
++You are viewing the booleans page for the application domain.  
 +
-+#self.filedict[(self.application, ipage, operation)][(path, type)] = {"type": tclass, "mls": mls, "changed": True}
-+#self.portdict[(self.application, ipage, operation)][(port, protocol)] = {"type": type, "mls": mls, "changed": True}
++SELinux Policy writers have written booleans, if-than-else rules, into the policy.  This allows the adminstrator to change the way SELinux enforces policy on an application.  The administrator can tighten or loosen the SELinux policy based on his needs.
 +
-+#semanage boolean -E
-+#boolean -1 httpd_anon_write
-+#boolean -0 httpd_enable_cgi
-+#fcontext -a -t etc_t PATH
-+#fcontext fcontext -a -t etc_t PATH
-+#fcontext -a -f 'all files' -t etc_t '/dan'
-+# port -a -t ssh_port_t -p tcp 56
++You can use the "Filter Text Entry" to search for approprate booleans.  The Show Modified Only toggle, will show the booleans that your system has customized.
+diff --git a/policycoreutils/sepolicy/sepolicy/help/booleans_more.png b/policycoreutils/sepolicy/sepolicy/help/booleans_more.png
+new file mode 100644
+index 0000000..1323d1a
+Binary files /dev/null and b/policycoreutils/sepolicy/sepolicy/help/booleans_more.png differ
+diff --git a/policycoreutils/sepolicy/sepolicy/help/booleans_more.txt b/policycoreutils/sepolicy/sepolicy/help/booleans_more.txt
+new file mode 100644
+index 0000000..b58f104
+--- /dev/null
++++ b/policycoreutils/sepolicy/sepolicy/help/booleans_more.txt
+@@ -0,0 +1,4 @@
++You are viewing the booleans page for the application domain.  
++
++Selecting the "More..." button will open a dialog containing the SELinux allow rules that are turned on by the selected boolean.
++
+diff --git a/policycoreutils/sepolicy/sepolicy/help/booleans_more_show.png b/policycoreutils/sepolicy/sepolicy/help/booleans_more_show.png
+new file mode 100644
+index 0000000..885704b
+Binary files /dev/null and b/policycoreutils/sepolicy/sepolicy/help/booleans_more_show.png differ
+diff --git a/policycoreutils/sepolicy/sepolicy/help/booleans_more_show.txt b/policycoreutils/sepolicy/sepolicy/help/booleans_more_show.txt
+new file mode 100644
+index 0000000..e0804d2
+--- /dev/null
++++ b/policycoreutils/sepolicy/sepolicy/help/booleans_more_show.txt
+@@ -0,0 +1,4 @@
++You are viewing the booleans page for the application domain.  
++
++
++
+diff --git a/policycoreutils/sepolicy/sepolicy/help/booleans_toggled.png b/policycoreutils/sepolicy/sepolicy/help/booleans_toggled.png
+new file mode 100644
+index 0000000..7a36510
+Binary files /dev/null and b/policycoreutils/sepolicy/sepolicy/help/booleans_toggled.png differ
+diff --git a/policycoreutils/sepolicy/sepolicy/help/booleans_toggled.txt b/policycoreutils/sepolicy/sepolicy/help/booleans_toggled.txt
+new file mode 100644
+index 0000000..2ba4ab9
+--- /dev/null
++++ b/policycoreutils/sepolicy/sepolicy/help/booleans_toggled.txt
+@@ -0,0 +1,4 @@
++You are viewing the booleans page for the application domain.  
++
++Toggle the button to turn on or off the boolean.  This will not happen immediately.  All changes on the application screen are bundled up into a single transacton.  you need to select the update button to apply all of your changes to the system.
++
+diff --git a/policycoreutils/sepolicy/sepolicy/help/files_apps.png b/policycoreutils/sepolicy/sepolicy/help/files_apps.png
+new file mode 100644
+index 0000000..04dddf2
+Binary files /dev/null and b/policycoreutils/sepolicy/sepolicy/help/files_apps.png differ
+diff --git a/policycoreutils/sepolicy/sepolicy/help/files_exec.png b/policycoreutils/sepolicy/sepolicy/help/files_exec.png
+new file mode 100644
+index 0000000..3de19cc
+Binary files /dev/null and b/policycoreutils/sepolicy/sepolicy/help/files_exec.png differ
+diff --git a/policycoreutils/sepolicy/sepolicy/help/files_write.png b/policycoreutils/sepolicy/sepolicy/help/files_write.png
+new file mode 100644
+index 0000000..908fd81
+Binary files /dev/null and b/policycoreutils/sepolicy/sepolicy/help/files_write.png differ
+diff --git a/policycoreutils/sepolicy/sepolicy/help/ports_inbound.png b/policycoreutils/sepolicy/sepolicy/help/ports_inbound.png
+new file mode 100644
+index 0000000..af2dd9f
+Binary files /dev/null and b/policycoreutils/sepolicy/sepolicy/help/ports_inbound.png differ
+diff --git a/policycoreutils/sepolicy/sepolicy/help/ports_outbound.png b/policycoreutils/sepolicy/sepolicy/help/ports_outbound.png
+new file mode 100644
+index 0000000..da8633b
+Binary files /dev/null and b/policycoreutils/sepolicy/sepolicy/help/ports_outbound.png differ
+diff --git a/policycoreutils/sepolicy/sepolicy/help/system.png b/policycoreutils/sepolicy/sepolicy/help/system.png
+new file mode 100644
+index 0000000..6727874
+Binary files /dev/null and b/policycoreutils/sepolicy/sepolicy/help/system.png differ
+diff --git a/policycoreutils/sepolicy/sepolicy/help/transition_file.png b/policycoreutils/sepolicy/sepolicy/help/transition_file.png
+new file mode 100644
+index 0000000..1234e54
+Binary files /dev/null and b/policycoreutils/sepolicy/sepolicy/help/transition_file.png differ
+diff --git a/policycoreutils/sepolicy/sepolicy/help/transition_from.png b/policycoreutils/sepolicy/sepolicy/help/transition_from.png
+new file mode 100644
+index 0000000..26a6d43
+Binary files /dev/null and b/policycoreutils/sepolicy/sepolicy/help/transition_from.png differ
+diff --git a/policycoreutils/sepolicy/sepolicy/help/transition_from.txt b/policycoreutils/sepolicy/sepolicy/help/transition_from.txt
+new file mode 100644
+index 0000000..9547af7
+--- /dev/null
++++ b/policycoreutils/sepolicy/sepolicy/help/transition_from.txt
+@@ -0,0 +1,9 @@
++This screen shows <b>Executable File Paths</b> that will transition from processes running with the <b>%(APP)s</b> type.
++
++Under SELinux, when a process running with a "type" attempts to execute an executable, one of three things can happen.  
++
++1.  The process can be prevented from running the executable.
++2.  The executable executes with the same label as parent.
++3.  The executable <b>transitions</b> to a new "type" based on policy.
++
++This screen shows the executables that transition to another domain when <b>%(APP)s</b> executes them, and the <b>SELinux Application Type</b> of the newly created process.
+diff --git a/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean.png b/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean.png
+new file mode 100644
+index 0000000..f3d2642
+Binary files /dev/null and b/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean.png differ
+diff --git a/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean.txt b/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean.txt
+new file mode 100644
+index 0000000..bd8539a
+--- /dev/null
++++ b/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean.txt
+@@ -0,0 +1,8 @@
++Transitions can be controlled by SELinux Booleans.
++
++SELinux Booleans are If-then-else rules in policy, that allow the admistrator
++to modify the access control on a process type.
++
++Transition rules are either always allowed or can be turned on and off based on the boolean settings.   If the <b>Boolean Enabled</b> column has an arrow on it, this indicates the transition is controlled by a boolean.  
++
++Go to the next screen to see the effect of clicking on the arrow.
+diff --git a/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean_1.png b/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean_1.png
+new file mode 100644
+index 0000000..9e660f8
+Binary files /dev/null and b/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean_1.png differ
+diff --git a/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean_1.txt b/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean_1.txt
+new file mode 100644
+index 0000000..f120f5f
+--- /dev/null
++++ b/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean_1.txt
+@@ -0,0 +1,3 @@
++After selecting the arrow under Boolean Enabled column, the line will exband
++to show a link which you can click.  This will take you to the booleans page 
++and allow you to enable the boolean which will enable or disable the transition.
+diff --git a/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean_2.png b/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean_2.png
+new file mode 100644
+index 0000000..98f4f4d
+Binary files /dev/null and b/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean_2.png differ
+diff --git a/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean_2.txt b/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean_2.txt
+new file mode 100644
+index 0000000..4d3f3f1
+--- /dev/null
++++ b/policycoreutils/sepolicy/sepolicy/help/transition_from_boolean_2.txt
+@@ -0,0 +1,3 @@
++This screen shows you the boolean page with the boolean selected.
++
++Enable or disable the boolean to turn on or off the transition.
+diff --git a/policycoreutils/sepolicy/sepolicy/help/transition_to.png b/policycoreutils/sepolicy/sepolicy/help/transition_to.png
+new file mode 100644
+index 0000000..49558d9
+Binary files /dev/null and b/policycoreutils/sepolicy/sepolicy/help/transition_to.png differ
 diff --git a/policycoreutils/sepolicy/sepolicy/interface.py b/policycoreutils/sepolicy/sepolicy/interface.py
 index 8b063ca..c7dac62 100644
 --- a/policycoreutils/sepolicy/sepolicy/interface.py
@@ -518828,15 +519824,14 @@ index 66efe26..970f4c8 100755
      return d
 diff --git a/policycoreutils/sepolicy/sepolicy/sedbus.py b/policycoreutils/sepolicy/sepolicy/sedbus.py
 new file mode 100644
-index 0000000..0a30450
+index 0000000..7ad2af7
 --- /dev/null
 +++ b/policycoreutils/sepolicy/sepolicy/sedbus.py
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,55 @@
 +import sys
 +import dbus
 +import dbus.service
 +import dbus.mainloop.glib
-+import gobject
 +import slip.dbus.service
 +from slip.dbus import polkit
 +import os
@@ -518866,6 +519861,21 @@ index 0000000..0a30450
 +        ret = self.dbus_object.customized(dbus_interface = "org.selinux")
 +        return ret
 +
++    @polkit.enable_proxy
++    def relabel_on_boot(self, value):
++        ret = self.dbus_object.relabel_on_boot(value, dbus_interface = "org.selinux")
++        return ret
++
++    @polkit.enable_proxy
++    def change_default_mode(self, value):
++        ret = self.dbus_object.change_default_mode(value, dbus_interface = "org.selinux")
++        return ret
++
++    @polkit.enable_proxy
++    def change_default_policy(self, value):
++        ret = self.dbus_object.change_default_policy(value, dbus_interface = "org.selinux")
++        return ret
++
 +if __name__ == "__main__":
 +    try:
 +        dbus_proxy = SELinuxDBus()
@@ -518875,12 +519885,12 @@ index 0000000..0a30450
 +        print e
 diff --git a/policycoreutils/sepolicy/sepolicy/sepolicy.glade b/policycoreutils/sepolicy/sepolicy/sepolicy.glade
 new file mode 100644
-index 0000000..3ea562c
+index 0000000..526ad31
 --- /dev/null
 +++ b/policycoreutils/sepolicy/sepolicy/sepolicy.glade
-@@ -0,0 +1,3904 @@
+@@ -0,0 +1,4807 @@
 +<?xml version="1.0" encoding="UTF-8"?>
-+<!-- Generated with glade 3.15.2 on Wed Aug 14 16:19:58 2013 -->
++<!-- Generated with glade 3.15.3 on Mon Sep  9 22:53:49 2013 -->
 +<interface>
 +  <!-- interface-requires gtk+ 3.8 -->
 +  <object class="GtkListStore" id="Advanced_search_liststore">
@@ -518920,9 +519930,10 @@ index 0000000..3ea562c
 +    <property name="transient_for">SELinux_window</property>
 +    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
 +    <child>
-+      <object class="GtkVBox" id="vbox21">
++      <object class="GtkBox" id="vbox21">
 +        <property name="visible">True</property>
 +        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
 +        <child>
 +          <object class="GtkLabel" id="Fixlabel_label">
 +            <property name="visible">True</property>
@@ -518937,7 +519948,7 @@ index 0000000..3ea562c
 +          </packing>
 +        </child>
 +        <child>
-+          <object class="GtkHBox" id="hbox24">
++          <object class="GtkBox" id="hbox24">
 +            <property name="visible">True</property>
 +            <property name="can_focus">False</property>
 +            <child>
@@ -518986,11 +519997,12 @@ index 0000000..3ea562c
 +    <property name="default_height">100</property>
 +    <property name="decorated">False</property>
 +    <child>
-+      <object class="GtkVBox" id="vbox2">
++      <object class="GtkBox" id="vbox2">
 +        <property name="visible">True</property>
 +        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
 +        <child>
-+          <object class="GtkHBox" id="hbox10">
++          <object class="GtkBox" id="hbox10">
 +            <property name="visible">True</property>
 +            <property name="can_focus">False</property>
 +            <child>
@@ -519040,6 +520052,23 @@ index 0000000..3ea562c
 +          </packing>
 +        </child>
 +        <child>
++          <object class="GtkButton" id="app_users_button">
++            <property name="label" translatable="yes">Users</property>
++            <property name="visible">True</property>
++            <property name="can_focus">True</property>
++            <property name="receives_default">True</property>
++            <property name="relief">none</property>
++            <property name="focus_on_click">False</property>
++            <property name="xalign">0</property>
++            <signal name="clicked" handler="on_app/users_button_clicked" swapped="no"/>
++          </object>
++          <packing>
++            <property name="expand">True</property>
++            <property name="fill">True</property>
++            <property name="position">2</property>
++          </packing>
++        </child>
++        <child>
 +          <object class="GtkButton" id="app_system_button">
 +            <property name="label" translatable="yes">System</property>
 +            <property name="visible">True</property>
@@ -519053,7 +520082,7 @@ index 0000000..3ea562c
 +          <packing>
 +            <property name="expand">True</property>
 +            <property name="fill">True</property>
-+            <property name="position">2</property>
++            <property name="position">3</property>
 +          </packing>
 +        </child>
 +      </object>
@@ -519080,9 +520109,12 @@ index 0000000..3ea562c
 +    <property name="modal">True</property>
 +    <property name="type_hint">normal</property>
 +    <property name="action">save</property>
++    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
 +    <child internal-child="vbox">
 +      <object class="GtkBox" id="filechooserdialog-vbox1">
 +        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
++        <signal name="button-press-event" handler="on_choose_file" swapped="no"/>
 +        <child internal-child="action_area">
 +          <object class="GtkButtonBox" id="filechooserdialog-action_area1">
 +            <property name="can_focus">False</property>
@@ -519094,6 +520126,47 @@ index 0000000..3ea562c
 +            <property name="position">0</property>
 +          </packing>
 +        </child>
++        <child>
++          <object class="GtkBox" id="box3">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <child>
++              <object class="GtkButton" id="select_button_filechooser">
++                <property name="label" translatable="yes">Select</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <signal name="clicked" handler="on_choose_file" swapped="no"/>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="pack_type">end</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="cancel_button_filechooser">
++                <property name="label" translatable="yes">Cancel</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <signal name="clicked" handler="gtk_widget_hide" swapped="no"/>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="pack_type">end</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
++            <property name="position">2</property>
++          </packing>
++        </child>
 +      </object>
 +    </child>
 +  </object>
@@ -519150,6 +520223,8 @@ index 0000000..3ea562c
 +      <column type="gchararray"/>
 +      <!-- column-name Name -->
 +      <column type="gchararray"/>
++      <!-- column-name More.. -->
++      <column type="gchararray"/>
 +    </columns>
 +  </object>
 +  <object class="GtkTreeModelFilter" id="boolean_treemodelfilter">
@@ -519164,74 +520239,6 @@ index 0000000..3ea562c
 +      <column type="gchararray"/>
 +    </columns>
 +  </object>
-+  <object class="GtkWindow" id="confirmation_dialog_close">
-+    <property name="can_focus">False</property>
-+    <property name="type">popup</property>
-+    <property name="modal">True</property>
-+    <property name="window_position">center-on-parent</property>
-+    <property name="default_width">440</property>
-+    <property name="default_height">250</property>
-+    <property name="transient_for">SELinux_window</property>
-+    <child>
-+      <object class="GtkVBox" id="box5">
-+        <property name="visible">True</property>
-+        <property name="can_focus">False</property>
-+        <child>
-+          <object class="GtkLabel" id="label15">
-+            <property name="visible">True</property>
-+            <property name="can_focus">False</property>
-+            <property name="label" translatable="yes">All previous changes will be lost.  Save you changes to keep them.</property>
-+          </object>
-+          <packing>
-+            <property name="expand">True</property>
-+            <property name="fill">True</property>
-+            <property name="position">0</property>
-+          </packing>
-+        </child>
-+        <child>
-+          <object class="GtkHBox" id="box9">
-+            <property name="visible">True</property>
-+            <property name="can_focus">False</property>
-+            <child>
-+              <object class="GtkButton" id="ok_button_close">
-+                <property name="label" translatable="yes">OK</property>
-+                <property name="visible">True</property>
-+                <property name="can_focus">True</property>
-+                <property name="receives_default">True</property>
-+                <signal name="clicked" handler="gtk_main_quit" swapped="no"/>
-+              </object>
-+              <packing>
-+                <property name="expand">False</property>
-+                <property name="fill">True</property>
-+                <property name="pack_type">end</property>
-+                <property name="position">0</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkButton" id="cancel_button_close">
-+                <property name="label" translatable="yes">Cancel</property>
-+                <property name="visible">True</property>
-+                <property name="can_focus">True</property>
-+                <property name="receives_default">True</property>
-+                <signal name="clicked" handler="on_confirmation_close" swapped="no"/>
-+              </object>
-+              <packing>
-+                <property name="expand">False</property>
-+                <property name="fill">True</property>
-+                <property name="pack_type">end</property>
-+                <property name="position">1</property>
-+              </packing>
-+            </child>
-+          </object>
-+          <packing>
-+            <property name="expand">False</property>
-+            <property name="fill">True</property>
-+            <property name="position">1</property>
-+          </packing>
-+        </child>
-+      </object>
-+    </child>
-+  </object>
 +  <object class="GtkListStore" id="delete_files_liststore">
 +    <columns>
 +      <!-- column-name Select -->
@@ -519271,9 +520278,10 @@ index 0000000..3ea562c
 +    <property name="default_height">250</property>
 +    <property name="transient_for">SELinux_window</property>
 +    <child>
-+      <object class="GtkVBox" id="vbox27">
++      <object class="GtkBox" id="vbox27">
 +        <property name="visible">True</property>
 +        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
 +        <child>
 +          <object class="GtkLabel" id="error_check_label">
 +            <property name="visible">True</property>
@@ -519288,7 +520296,7 @@ index 0000000..3ea562c
 +          </packing>
 +        </child>
 +        <child>
-+          <object class="GtkHBox" id="hbox22">
++          <object class="GtkBox" id="hbox22">
 +            <property name="visible">True</property>
 +            <property name="can_focus">False</property>
 +            <child>
@@ -519379,6 +520387,125 @@ index 0000000..3ea562c
 +      <column type="gchararray"/>
 +    </columns>
 +  </object>
++  <object class="GtkDialog" id="help_window">
++    <property name="can_focus">False</property>
++    <property name="resizable">False</property>
++    <property name="default_width">200</property>
++    <property name="default_height">500</property>
++    <property name="type_hint">normal</property>
++    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
++    <child internal-child="vbox">
++      <object class="GtkBox" id="dialog-vbox1">
++        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
++        <property name="spacing">2</property>
++        <child internal-child="action_area">
++          <object class="GtkButtonBox" id="dialog-action_area1">
++            <property name="can_focus">False</property>
++            <property name="layout_style">end</property>
++            <child>
++              <object class="GtkButton" id="back_button">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <signal name="clicked" handler="on_back_button_clicked" swapped="no"/>
++                <child>
++                  <object class="GtkArrow" id="arrow2">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="arrow_type">left</property>
++                  </object>
++                </child>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkButton" id="forward_button">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="receives_default">True</property>
++                <signal name="clicked" handler="on_forward_button_clicked" swapped="no"/>
++                <child>
++                  <object class="GtkArrow" id="arrow3">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                  </object>
++                </child>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
++            <property name="pack_type">end</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkBox" id="box9">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="orientation">vertical</property>
++            <child>
++              <object class="GtkScrolledWindow" id="scrolledwindow14">
++                <property name="height_request">250</property>
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="shadow_type">in</property>
++               <child>
++                  <object class="GtkLabel" id="help_text">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="xalign">0</property>
++                    <property name="xpad">10</property>
++                    <property name="justify">fill</property>
++                    <property name="use_markup">True</property>
++                    <property name="wrap">True</property>
++                  </object>
++                  <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
++                    <property name="position">0</property>
++                  </packing>
++               </child>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkImage" id="help_image">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="pixbuf">images/booleans.png</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">1</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">False</property>
++            <property name="fill">True</property>
++            <property name="position">1</property>
++          </packing>
++        </child>
++      </object>
++    </child>
++  </object>
 +  <object class="GtkListStore" id="in_network_liststore">
 +    <columns>
 +      <!-- column-name Port -->
@@ -519415,6 +520542,20 @@ index 0000000..3ea562c
 +      </object>
 +    </child>
 +  </object>
++  <object class="GtkListStore" id="login_liststore">
++    <columns>
++      <!-- column-name Username -->
++      <column type="gchararray"/>
++      <!-- column-name SELinuxUser -->
++      <column type="gchararray"/>
++    </columns>
++  </object>
++  <object class="GtkListStore" id="login_seuser_liststore">
++    <columns>
++      <!-- column-name SELinuxUser -->
++      <column type="gchararray"/>
++    </columns>
++  </object>
 +  <object class="GtkListStore" id="modify_liststore_files">
 +    <columns>
 +      <!-- column-name Path -->
@@ -519472,12 +520613,14 @@ index 0000000..3ea562c
 +    <property name="title" translatable="yes">Add a File</property>
 +    <property name="resizable">False</property>
 +    <property name="modal">True</property>
-+    <property name="window_position">center-always</property>
++    <property name="window_position">center-on-parent</property>
++    <property name="transient_for">SELinux_window</property>
 +    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
 +    <child>
-+      <object class="GtkVBox" id="vbox20">
++      <object class="GtkBox" id="vbox20">
 +        <property name="visible">True</property>
 +        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
 +        <child>
 +          <object class="GtkLabel" id="Files_label">
 +            <property name="visible">True</property>
@@ -519510,7 +520653,7 @@ index 0000000..3ea562c
 +              <placeholder/>
 +            </child>
 +            <child>
-+              <object class="GtkHBox" id="hbox23">
++              <object class="GtkBox" id="hbox23">
 +                <property name="visible">True</property>
 +                <property name="can_focus">False</property>
 +                <child>
@@ -519658,11 +520801,12 @@ index 0000000..3ea562c
 +              </packing>
 +            </child>
 +            <child>
-+              <object class="GtkVBox" id="vbox22">
++              <object class="GtkBox" id="vbox22">
 +                <property name="visible">True</property>
 +                <property name="can_focus">False</property>
++                <property name="orientation">vertical</property>
 +                <child>
-+                  <object class="GtkHBox" id="hbox11">
++                  <object class="GtkBox" id="hbox11">
 +                    <property name="visible">True</property>
 +                    <property name="can_focus">False</property>
 +                    <child>
@@ -519703,7 +520847,7 @@ index 0000000..3ea562c
 +                  </packing>
 +                </child>
 +                <child>
-+                  <object class="GtkHBox" id="hbox25">
++                  <object class="GtkBox" id="hbox25">
 +                    <property name="visible">True</property>
 +                    <property name="can_focus">False</property>
 +                    <child>
@@ -519753,9 +520897,10 @@ index 0000000..3ea562c
 +              </packing>
 +            </child>
 +            <child>
-+              <object class="GtkVBox" id="vbox25">
++              <object class="GtkBox" id="vbox25">
 +                <property name="visible">True</property>
 +                <property name="can_focus">False</property>
++                <property name="orientation">vertical</property>
 +                <child>
 +                  <object class="GtkComboBox" id="files_type_combobox">
 +                    <property name="width_request">360</property>
@@ -519794,17 +520939,217 @@ index 0000000..3ea562c
 +      </object>
 +    </child>
 +  </object>
++  <object class="GtkWindow" id="popup_window_login">
++    <property name="can_focus">False</property>
++    <property name="title" translatable="yes">Network Port Definitions</property>
++    <property name="resizable">False</property>
++    <property name="modal">True</property>
++    <property name="window_position">center-on-parent</property>
++    <property name="transient_for">SELinux_window</property>
++    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
++    <child>
++      <object class="GtkBox" id="vbox10">
++        <property name="visible">True</property>
++        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
++        <child>
++          <object class="GtkLabel" id="Login_label">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="xalign">0</property>
++            <property name="xpad">10</property>
++            <property name="label" translatable="yes">Add User Mapping. User Mapping will be created when Update is applied.</property>
++            <property name="justify">fill</property>
++            <property name="wrap">True</property>
++          </object>
++          <packing>
++            <property name="expand">True</property>
++            <property name="fill">True</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkTable" id="table1">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="n_rows">5</property>
++            <property name="n_columns">2</property>
++            <child>
++              <object class="GtkLabel" id="label15">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="xalign">0</property>
++                <property name="xpad">10</property>
++                <property name="label" translatable="yes">Login Name</property>
++              </object>
++              <packing>
++                <property name="y_options"/>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkEntry" id="login_name_entry">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="invisible_char">●</property>
++                <property name="primary_icon_activatable">False</property>
++                <property name="secondary_icon_activatable">False</property>
++              </object>
++              <packing>
++                <property name="left_attach">1</property>
++                <property name="right_attach">2</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkLabel" id="label17">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="xalign">0</property>
++                <property name="xpad">10</property>
++                <property name="label" translatable="yes">SELinux User</property>
++              </object>
++              <packing>
++                <property name="top_attach">1</property>
++                <property name="bottom_attach">2</property>
++                <property name="y_options"/>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkLabel" id="login_advanced_button">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="xalign">0</property>
++                <property name="xpad">10</property>
++                <property name="label" translatable="yes">Advanced &gt;&gt;</property>
++                <property name="selectable">True</property>
++                <attributes>
++                  <attribute name="foreground" value="#00004e4e9999"/>
++                </attributes>
++                <signal name="button-press-event" handler="on_login_advanced_button_press_event" swapped="no"/>
++              </object>
++              <packing>
++                <property name="top_attach">2</property>
++                <property name="bottom_attach">3</property>
++                <property name="y_options"/>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkLabel" id="login_mls_label">
++                <property name="can_focus">False</property>
++                <property name="xalign">0</property>
++                <property name="xpad">10</property>
++                <property name="label" translatable="yes">MLS</property>
++              </object>
++              <packing>
++                <property name="top_attach">3</property>
++                <property name="bottom_attach">4</property>
++                <property name="y_options"/>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkComboBox" id="login_seuser_combobox">
++                <property name="width_request">360</property>
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="model">login_seuser_liststore</property>
++                <child>
++                  <object class="GtkCellRendererText" id="cellrenderertext51"/>
++                  <attributes>
++                    <attribute name="text">0</attribute>
++                  </attributes>
++                </child>
++              </object>
++              <packing>
++                <property name="left_attach">1</property>
++                <property name="right_attach">2</property>
++                <property name="top_attach">1</property>
++                <property name="bottom_attach">2</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkBox" id="hbox2">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <child>
++                  <object class="GtkButton" id="save_changes_login">
++                    <property name="label" translatable="yes">Save to update</property>
++                    <property name="visible">True</property>
++                    <property name="can_focus">True</property>
++                    <property name="receives_default">True</property>
++                    <signal name="clicked" handler="on_save_changes_login_clicked" swapped="no"/>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
++                    <property name="pack_type">end</property>
++                    <property name="position">0</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkButton" id="cancel_login">
++                    <property name="label" translatable="yes">Cancel</property>
++                    <property name="visible">True</property>
++                    <property name="can_focus">True</property>
++                    <property name="receives_default">True</property>
++                    <signal name="clicked" handler="on_cancel_login_clicked" swapped="no"/>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
++                    <property name="pack_type">end</property>
++                    <property name="position">1</property>
++                  </packing>
++                </child>
++              </object>
++              <packing>
++                <property name="left_attach">1</property>
++                <property name="right_attach">2</property>
++                <property name="top_attach">4</property>
++                <property name="bottom_attach">5</property>
++              </packing>
++            </child>
++            <child>
++              <placeholder/>
++            </child>
++            <child>
++              <placeholder/>
++            </child>
++            <child>
++              <object class="GtkEntry" id="login_mls_entry">
++                <property name="can_focus">True</property>
++                <property name="invisible_char">●</property>
++                <property name="primary_icon_activatable">False</property>
++                <property name="secondary_icon_activatable">False</property>
++              </object>
++              <packing>
++                <property name="left_attach">1</property>
++                <property name="right_attach">2</property>
++                <property name="top_attach">3</property>
++                <property name="bottom_attach">4</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">True</property>
++            <property name="fill">True</property>
++            <property name="position">1</property>
++          </packing>
++        </child>
++      </object>
++    </child>
++  </object>
 +  <object class="GtkWindow" id="popup_window_network">
 +    <property name="can_focus">False</property>
 +    <property name="title" translatable="yes">Network Port Definitions</property>
 +    <property name="resizable">False</property>
 +    <property name="modal">True</property>
-+    <property name="window_position">center-always</property>
++    <property name="window_position">center-on-parent</property>
++    <property name="transient_for">SELinux_window</property>
 +    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
 +    <child>
-+      <object class="GtkVBox" id="vbox23">
++      <object class="GtkBox" id="vbox23">
 +        <property name="visible">True</property>
 +        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
 +        <child>
 +          <object class="GtkLabel" id="Network_label">
 +            <property name="visible">True</property>
@@ -519958,7 +521303,7 @@ index 0000000..3ea562c
 +              </packing>
 +            </child>
 +            <child>
-+              <object class="GtkHBox" id="hbox14">
++              <object class="GtkBox" id="hbox14">
 +                <property name="visible">True</property>
 +                <property name="can_focus">False</property>
 +                <child>
@@ -520000,7 +521345,7 @@ index 0000000..3ea562c
 +              </packing>
 +            </child>
 +            <child>
-+              <object class="GtkHBox" id="hbox28">
++              <object class="GtkBox" id="hbox28">
 +                <property name="visible">True</property>
 +                <property name="can_focus">False</property>
 +                <child>
@@ -520012,7 +521357,6 @@ index 0000000..3ea562c
 +                    <property name="xalign">0.5</property>
 +                    <property name="active">True</property>
 +                    <property name="draw_indicator">True</property>
-+                    <property name="group">udp_button</property>
 +                  </object>
 +                  <packing>
 +                    <property name="expand">True</property>
@@ -520098,6 +521442,218 @@ index 0000000..3ea562c
 +  <object class="GtkTreeModelSort" id="transitions_into_x_treemodelsort">
 +    <property name="model">transitions_into_x_treemodelfilter</property>
 +  </object>
++  <object class="GtkListStore" id="user_liststore">
++    <columns>
++      <!-- column-name SELinuxUsername -->
++      <column type="gchararray"/>
++      <!-- column-name SELinuxRoles -->
++      <column type="gchararray"/>
++    </columns>
++  </object>
++  <object class="GtkListStore" id="user_roles_liststore">
++    <columns>
++      <!-- column-name SELinuxRoles -->
++      <column type="gchararray"/>
++    </columns>
++  </object>
++  <object class="GtkWindow" id="popup_window_user">
++    <property name="can_focus">False</property>
++    <property name="title" translatable="yes">Network Port Definitions</property>
++    <property name="resizable">False</property>
++    <property name="modal">True</property>
++    <property name="window_position">center-on-parent</property>
++    <property name="transient_for">SELinux_window</property>
++    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
++    <child>
++      <object class="GtkBox" id="vbox11">
++        <property name="visible">True</property>
++        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
++        <child>
++          <object class="GtkLabel" id="User_label">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="xalign">0</property>
++            <property name="xpad">10</property>
++            <property name="label" translatable="yes">Add User Roles. SELinux User Roles will be created when Update is applied.</property>
++            <property name="justify">fill</property>
++            <property name="wrap">True</property>
++          </object>
++          <packing>
++            <property name="expand">True</property>
++            <property name="fill">True</property>
++            <property name="position">0</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkTable" id="table3">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="n_rows">5</property>
++            <property name="n_columns">2</property>
++            <child>
++              <placeholder/>
++            </child>
++            <child>
++              <placeholder/>
++            </child>
++            <child>
++              <object class="GtkLabel" id="label16">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="xalign">0</property>
++                <property name="xpad">10</property>
++                <property name="label" translatable="yes">SELinux User Name</property>
++              </object>
++              <packing>
++                <property name="y_options"/>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkEntry" id="user_name_entry">
++                <property name="visible">True</property>
++                <property name="can_focus">True</property>
++                <property name="invisible_char">●</property>
++                <property name="primary_icon_activatable">False</property>
++                <property name="secondary_icon_activatable">False</property>
++              </object>
++              <packing>
++                <property name="left_attach">1</property>
++                <property name="right_attach">2</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkLabel" id="label23">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="xalign">0</property>
++                <property name="xpad">10</property>
++                <property name="label" translatable="yes">SELinux Roles</property>
++              </object>
++              <packing>
++                <property name="top_attach">1</property>
++                <property name="bottom_attach">2</property>
++                <property name="y_options"/>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkLabel" id="user_advanced_button">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="xalign">0</property>
++                <property name="xpad">10</property>
++                <property name="label" translatable="yes">Advanced &gt;&gt;</property>
++                <property name="selectable">True</property>
++                <attributes>
++                  <attribute name="foreground" value="#00004e4e9999"/>
++                </attributes>
++                <signal name="button-press-event" handler="on_user_advanced_button_press_event" swapped="no"/>
++              </object>
++              <packing>
++                <property name="top_attach">2</property>
++                <property name="bottom_attach">3</property>
++                <property name="y_options"/>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkLabel" id="user_mls_label">
++                <property name="can_focus">False</property>
++                <property name="xalign">0</property>
++                <property name="xpad">10</property>
++                <property name="label" translatable="yes">MLS</property>
++              </object>
++              <packing>
++                <property name="top_attach">3</property>
++                <property name="bottom_attach">4</property>
++                <property name="y_options"/>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkComboBox" id="user_roles_combobox">
++                <property name="width_request">360</property>
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="model">user_roles_liststore</property>
++                <child>
++                  <object class="GtkCellRendererText" id="cellrenderertext50"/>
++                  <attributes>
++                    <attribute name="text">0</attribute>
++                  </attributes>
++                </child>
++              </object>
++              <packing>
++                <property name="left_attach">1</property>
++                <property name="right_attach">2</property>
++                <property name="top_attach">1</property>
++                <property name="bottom_attach">2</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkBox" id="hbox3">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <child>
++                  <object class="GtkButton" id="save_changes_user">
++                    <property name="label" translatable="yes">Save to update</property>
++                    <property name="visible">True</property>
++                    <property name="can_focus">True</property>
++                    <property name="receives_default">True</property>
++                    <signal name="clicked" handler="on_save_changes_login_clicked" swapped="no"/>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
++                    <property name="pack_type">end</property>
++                    <property name="position">0</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkButton" id="cancel_user">
++                    <property name="label" translatable="yes">Cancel</property>
++                    <property name="visible">True</property>
++                    <property name="can_focus">True</property>
++                    <property name="receives_default">True</property>
++                    <signal name="clicked" handler="on_cancel_user_clicked" swapped="no"/>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">True</property>
++                    <property name="pack_type">end</property>
++                    <property name="position">1</property>
++                  </packing>
++                </child>
++              </object>
++              <packing>
++                <property name="left_attach">1</property>
++                <property name="right_attach">2</property>
++                <property name="top_attach">4</property>
++                <property name="bottom_attach">5</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkEntry" id="user_mls_entry">
++                <property name="can_focus">True</property>
++                <property name="invisible_char">●</property>
++                <property name="primary_icon_activatable">False</property>
++                <property name="secondary_icon_activatable">False</property>
++              </object>
++              <packing>
++                <property name="left_attach">1</property>
++                <property name="right_attach">2</property>
++                <property name="top_attach">3</property>
++                <property name="bottom_attach">4</property>
++              </packing>
++            </child>
++          </object>
++          <packing>
++            <property name="expand">True</property>
++            <property name="fill">True</property>
++            <property name="position">1</property>
++          </packing>
++        </child>
++      </object>
++    </child>
++  </object>
 +  <object class="GtkTreeStore" id="writable_files_treestore">
 +    <columns>
 +      <!-- column-name File -->
@@ -520132,19 +521688,21 @@ index 0000000..3ea562c
 +    <signal name="delete-event" handler="on_confirmation_close" swapped="no"/>
 +    <signal name="focus-in-event" handler="on_SELinux_window_configure_event" swapped="no"/>
 +    <child>
-+      <object class="GtkVBox" id="vbox1">
++      <object class="GtkBox" id="vbox1">
 +        <property name="visible">True</property>
 +        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
 +        <child>
-+          <object class="GtkHBox" id="hbox1">
++          <object class="GtkBox" id="hbox1">
 +            <property name="visible">True</property>
 +            <property name="can_focus">False</property>
 +            <child>
-+              <object class="GtkVBox" id="vbox4">
++              <object class="GtkBox" id="vbox4">
 +                <property name="visible">True</property>
 +                <property name="can_focus">False</property>
++                <property name="orientation">vertical</property>
 +                <child>
-+                  <object class="GtkHBox" id="hbox7">
++                  <object class="GtkBox" id="hbox7">
 +                    <property name="visible">True</property>
 +                    <property name="can_focus">False</property>
 +                    <child>
@@ -520153,12 +521711,12 @@ index 0000000..3ea562c
 +                        <property name="can_focus">False</property>
 +                        <property name="label_xalign">0</property>
 +                        <child>
-+                          <object class="GtkHBox" id="hbox12">
++                          <object class="GtkBox" id="hbox12">
 +                            <property name="visible">True</property>
 +                            <property name="can_focus">False</property>
 +                            <child>
 +                              <object class="GtkButton" id="applications_selection_button">
-+                                <property name="label" translatable="yes">Applications</property>
++                                <property name="label" translatable="yes">Select...</property>
 +                                <property name="width_request">240</property>
 +                                <property name="visible">True</property>
 +                                <property name="can_focus">False</property>
@@ -520177,12 +521735,18 @@ index 0000000..3ea562c
 +                            </child>
 +                            <child>
 +                              <object class="GtkButton" id="button1">
-+                                <property name="label" translatable="yes">↓</property>
 +                                <property name="visible">True</property>
 +                                <property name="can_focus">False</property>
 +                                <property name="receives_default">True</property>
 +                                <property name="relief">none</property>
 +                                <signal name="clicked" handler="on_combo_button_clicked" swapped="no"/>
++                                <child>
++                                  <object class="GtkArrow" id="arrow1">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">False</property>
++                                    <property name="arrow_type">down</property>
++                                  </object>
++                                </child>
 +                              </object>
 +                              <packing>
 +                                <property name="expand">True</property>
@@ -520209,8 +521773,7 @@ index 0000000..3ea562c
 +                        <property name="xalign">0.5</property>
 +                        <property name="active">True</property>
 +                        <property name="draw_indicator">False</property>
-+                        <property name="group">Files_button</property>
-+                        <signal name="toggled" handler="on_Booleans_button_toggled" swapped="no"/>
++                        <signal name="toggled" handler="on_button_toggled" swapped="no"/>
 +                      </object>
 +                      <packing>
 +                        <property name="expand">False</property>
@@ -520228,7 +521791,7 @@ index 0000000..3ea562c
 +                        <property name="xalign">0.5</property>
 +                        <property name="draw_indicator">False</property>
 +                        <property name="group">Booleans_button</property>
-+                        <signal name="toggled" handler="on_Files_button_toggled" swapped="no"/>
++                        <signal name="toggled" handler="on_button_toggled" swapped="no"/>
 +                      </object>
 +                      <packing>
 +                        <property name="expand">False</property>
@@ -520246,7 +521809,7 @@ index 0000000..3ea562c
 +                        <property name="xalign">0.5</property>
 +                        <property name="draw_indicator">False</property>
 +                        <property name="group">Booleans_button</property>
-+                        <signal name="toggled" handler="on_Network_button_toggled" swapped="no"/>
++                        <signal name="toggled" handler="on_button_toggled" swapped="no"/>
 +                      </object>
 +                      <packing>
 +                        <property name="expand">False</property>
@@ -520264,7 +521827,7 @@ index 0000000..3ea562c
 +                        <property name="xalign">0.5</property>
 +                        <property name="draw_indicator">False</property>
 +                        <property name="group">Booleans_button</property>
-+                        <signal name="toggled" handler="on_Transitions_button_toggled" swapped="no"/>
++                        <signal name="toggled" handler="on_button_toggled" swapped="no"/>
 +                      </object>
 +                      <packing>
 +                        <property name="expand">False</property>
@@ -520273,13 +521836,15 @@ index 0000000..3ea562c
 +                      </packing>
 +                    </child>
 +                    <child>
-+                      <object class="GtkRadioButton" id="System_button">
-+                        <property name="label" translatable="yes">System</property>
++                      <object class="GtkRadioButton" id="Login_button">
++                        <property name="label" translatable="yes">Login Mapping</property>
 +                        <property name="can_focus">True</property>
 +                        <property name="receives_default">False</property>
-+                        <property name="xalign">0.5</property>
-+                        <property name="active">True</property>
++                        <property name="tooltip_text" translatable="yes">Manage the SELinux configuration</property>
++                        <property name="xalign">0</property>
 +                        <property name="draw_indicator">False</property>
++                        <property name="group">Booleans_button</property>
++                        <signal name="toggled" handler="on_button_toggled" swapped="no"/>
 +                      </object>
 +                      <packing>
 +                        <property name="expand">False</property>
@@ -520287,6 +521852,79 @@ index 0000000..3ea562c
 +                        <property name="position">5</property>
 +                      </packing>
 +                    </child>
++                    <child>
++                      <object class="GtkRadioButton" id="User_button">
++                        <property name="label" translatable="yes">SELinux Users</property>
++                        <property name="can_focus">True</property>
++                        <property name="receives_default">False</property>
++                        <property name="tooltip_text" translatable="yes">Manage the SELinux configuration</property>
++                        <property name="xalign">0</property>
++                        <property name="draw_indicator">False</property>
++                        <property name="group">Booleans_button</property>
++                        <signal name="toggled" handler="on_button_toggled" swapped="no"/>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">True</property>
++                        <property name="position">6</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkRadioButton" id="System_button">
++                        <property name="label" translatable="yes">System</property>
++                        <property name="can_focus">True</property>
++                        <property name="receives_default">False</property>
++                        <property name="tooltip_text" translatable="yes">Manage the SELinux configuration</property>
++                        <property name="xalign">0.5</property>
++                        <property name="draw_indicator">False</property>
++                        <property name="group">Booleans_button</property>
++                        <signal name="toggled" handler="on_button_toggled" swapped="no"/>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">True</property>
++                        <property name="position">7</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkRadioButton" id="Lockdown_button">
++                        <property name="label" translatable="yes">Lockdown</property>
++                        <property name="can_focus">True</property>
++                        <property name="receives_default">False</property>
++                        <property name="tooltip_text" translatable="yes">Lockdown the SELinux System.
++This screen can be used to turn up the SELinux Protections.</property>
++                        <property name="xalign">0</property>
++                        <property name="draw_indicator">False</property>
++                        <property name="group">Booleans_button</property>
++                        <signal name="toggled" handler="on_button_toggled" swapped="no"/>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">True</property>
++                        <property name="position">8</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkEventBox" id="eventbox1">
++                        <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <signal name="button-press-event" handler="on_info_button_button_press_event" swapped="no"/>
++                        <child>
++                          <object class="GtkImage" id="info_button">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="xpad">10</property>
++                            <property name="stock">gtk-help</property>
++                          </object>
++                        </child>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="pack_type">end</property>
++                        <property name="position">10</property>
++                      </packing>
++                    </child>
 +                  </object>
 +                  <packing>
 +                    <property name="expand">False</property>
@@ -520295,69 +521933,25 @@ index 0000000..3ea562c
 +                  </packing>
 +                </child>
 +                <child>
-+                  <object class="GtkHBox" id="middle_box_applications">
++                  <object class="GtkBox" id="middle_box_applications">
 +                    <property name="visible">True</property>
 +                    <property name="can_focus">False</property>
++                    <property name="orientation">vertical</property>
 +                    <child>
-+                      <object class="GtkNotebook" id="outer_notebook">
-+                        <property name="height_request">465</property>
++                      <object class="GtkBox" id="filter_box">
 +                        <property name="visible">True</property>
-+                        <property name="can_focus">True</property>
-+                        <property name="show_tabs">False</property>
++                        <property name="can_focus">False</property>
++                        <property name="border_width">3</property>
++                        <property name="orientation">vertical</property>
 +                        <child>
-+                          <object class="GtkVBox" id="vbox3">
++                          <object class="GtkBox" id="box14">
 +                            <property name="visible">True</property>
 +                            <property name="can_focus">False</property>
 +                            <child>
-+                              <object class="GtkHBox" id="hbox2">
++                              <object class="GtkLabel" id="text2">
 +                                <property name="visible">True</property>
 +                                <property name="can_focus">False</property>
-+                                <child>
-+                                  <object class="GtkLabel" id="text1">
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">False</property>
-+                                    <property name="label" translatable="yes">Filter</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">True</property>
-+                                    <property name="position">0</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkEntry" id="booleans_filter">
-+                                    <property name="width_request">170</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="invisible_char">●</property>
-+                                    <property name="width_chars">25</property>
-+                                    <property name="shadow_type">none</property>
-+                                    <property name="primary_icon_stock">gtk-find</property>
-+                                    <property name="secondary_icon_activatable">False</property>
-+                                    <signal name="changed" handler="on_booleans_filter_changed" swapped="no"/>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">True</property>
-+                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkCheckButton" id="Show_modified_only_toggle_booleans">
-+                                    <property name="label" translatable="yes">Show Modified Only</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">False</property>
-+                                    <property name="xalign">0.5</property>
-+                                    <property name="draw_indicator">True</property>
-+                                    <signal name="toggled" handler="on_Show_modified_only_toggle_booleans_toggled" swapped="no"/>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                    <property name="position">2</property>
-+                                  </packing>
-+                                </child>
++                                <property name="label" translatable="yes">Filter</property>
 +                              </object>
 +                              <packing>
 +                                <property name="expand">False</property>
@@ -520366,6 +521960,116 @@ index 0000000..3ea562c
 +                              </packing>
 +                            </child>
 +                            <child>
++                              <object class="GtkEntry" id="filter_entry">
++                                <property name="width_request">170</property>
++                                <property name="visible">True</property>
++                                <property name="can_focus">True</property>
++                                <property name="invisible_char">●</property>
++                                <property name="width_chars">25</property>
++                                <property name="shadow_type">none</property>
++                                <property name="primary_icon_stock">gtk-find</property>
++                                <property name="secondary_icon_activatable">False</property>
++                                <signal name="changed" handler="on_filter_changed" swapped="no"/>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
++                                <property name="position">1</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkCheckButton" id="Show_modified_only_toggle">
++                                <property name="label" translatable="yes">Show Modified Only</property>
++                                <property name="visible">True</property>
++                                <property name="can_focus">True</property>
++                                <property name="receives_default">False</property>
++                                <property name="xalign">0</property>
++                                <property name="draw_indicator">True</property>
++                                <signal name="toggled" handler="on_Show_modified_only_toggled" swapped="no"/>
++                              </object>
++                              <packing>
++                                <property name="expand">True</property>
++                                <property name="fill">True</property>
++                                <property name="position">2</property>
++                              </packing>
++                            </child>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
++                            <property name="position">0</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkBox" id="box15">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <child>
++                              <object class="GtkImage" id="warning_files">
++                                <property name="can_focus">False</property>
++                                <property name="stock">gtk-dialog-warning</property>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
++                                <property name="position">0</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkLabel" id="mislabeled_files_label">
++                                <property name="can_focus">False</property>
++                                <property name="label" translatable="yes">Mislabeled files exist</property>
++                                <attributes>
++                                  <attribute name="foreground" value="#e43403050305"/>
++                                </attributes>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">True</property>
++                                <property name="position">1</property>
++                              </packing>
++                            </child>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
++                            <property name="position">1</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkCheckButton" id="Show_mislabeled_files">
++                            <property name="label" translatable="yes">Show mislabeled files only</property>
++                            <property name="can_focus">True</property>
++                            <property name="receives_default">False</property>
++                            <property name="xalign">0</property>
++                            <property name="draw_indicator">True</property>
++                            <signal name="toggled" handler="on_Show_mislabeled_files_toggled" swapped="no"/>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="position">2</property>
++                          </packing>
++                        </child>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">0</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkNotebook" id="outer_notebook">
++                        <property name="height_request">465</property>
++                        <property name="visible">True</property>
++                        <property name="can_focus">True</property>
++                        <property name="show_tabs">False</property>
++                        <child>
++                          <object class="GtkBox" id="vbox3">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="orientation">vertical</property>
++                            <child>
 +                              <object class="GtkScrolledWindow" id="scrolledwindow4">
 +                                <property name="visible">True</property>
 +                                <property name="can_focus">True</property>
@@ -520377,7 +522081,8 @@ index 0000000..3ea562c
 +                                    <property name="tooltip_text" translatable="yes">If-Then-Else rules written in policy that can 
 +allow alternative access control.</property>
 +                                    <property name="model">boolean_treemodelsort</property>
-+                                    <property name="search_column">0</property>
++                                    <property name="activate_on_single_click">True</property>
++                                    <signal name="row-activated" handler="on_column_clicked" swapped="no"/>
 +                                    <child internal-child="selection">
 +                                      <object class="GtkTreeSelection" id="treeview-selection1"/>
 +                                    </child>
@@ -520416,22 +522121,19 @@ index 0000000..3ea562c
 +                                    </child>
 +                                    <child>
 +                                      <object class="GtkTreeViewColumn" id="more_detail_col">
++                                        <property name="resizable">True</property>
 +                                        <property name="sizing">fixed</property>
-+                                        <property name="fixed_width">40</property>
 +                                        <property name="min_width">40</property>
++                                        <property name="clickable">True</property>
 +                                        <property name="sort_column_id">2</property>
 +                                        <child>
-+                                          <object class="GtkCellRendererText" id="cellrenderertext22">
++                                          <object class="GtkCellRendererText" id="More..">
 +                                            <property name="font">Italic 8</property>
 +                                            <property name="foreground_gdk">#00004e4e9999</property>
-+                                            <property name="text">More..</property>
-+                                          </object>
-+                                        </child>
-+                                        <child>
-+                                          <object class="GtkCellRendererToggle" id="more_detail">
-+                                            <property name="indicator_size">0</property>
-+                                            <signal name="toggled" handler="on_more_detail_toggled" swapped="no"/>
 +                                          </object>
++                                          <attributes>
++                                            <attribute name="text">3</attribute>
++                                          </attributes>
 +                                        </child>
 +                                      </object>
 +                                    </child>
@@ -520474,145 +522176,10 @@ index 0000000..3ea562c
 +                          </packing>
 +                        </child>
 +                        <child>
-+                          <object class="GtkVBox" id="vbox5">
++                          <object class="GtkBox" id="vbox5">
 +                            <property name="visible">True</property>
 +                            <property name="can_focus">False</property>
-+                            <child>
-+                              <object class="GtkTable" id="table1">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">False</property>
-+                                <property name="n_rows">2</property>
-+                                <child>
-+                                  <object class="GtkVBox" id="box2">
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">False</property>
-+                                    <child>
-+                                      <object class="GtkHBox" id="box3">
-+                                        <property name="visible">True</property>
-+                                        <property name="can_focus">False</property>
-+                                        <child>
-+                                          <object class="GtkImage" id="warning_files">
-+                                            <property name="can_focus">False</property>
-+                                            <property name="stock">gtk-dialog-warning</property>
-+                                          </object>
-+                                          <packing>
-+                                            <property name="expand">False</property>
-+                                            <property name="fill">True</property>
-+                                            <property name="position">0</property>
-+                                          </packing>
-+                                        </child>
-+                                        <child>
-+                                          <object class="GtkLabel" id="mislabeled_files_label">
-+                                            <property name="can_focus">False</property>
-+                                            <property name="label" translatable="yes">Mislabeled files exist</property>
-+                                            <attributes>
-+                                              <attribute name="foreground" value="#e43403050305"/>
-+                                            </attributes>
-+                                          </object>
-+                                          <packing>
-+                                            <property name="expand">False</property>
-+                                            <property name="fill">True</property>
-+                                            <property name="position">1</property>
-+                                          </packing>
-+                                        </child>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="expand">False</property>
-+                                        <property name="fill">False</property>
-+                                        <property name="position">0</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <object class="GtkCheckButton" id="Show_mislabeled_files">
-+                                        <property name="label" translatable="yes">Show mislabeled files only</property>
-+                                        <property name="can_focus">True</property>
-+                                        <property name="receives_default">False</property>
-+                                        <property name="xalign">0</property>
-+                                        <property name="draw_indicator">True</property>
-+                                        <signal name="toggled" handler="on_Show_mislabeled_files_toggled" swapped="no"/>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="expand">False</property>
-+                                        <property name="fill">False</property>
-+                                        <property name="position">1</property>
-+                                      </packing>
-+                                    </child>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="top_attach">1</property>
-+                                    <property name="bottom_attach">2</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkHBox" id="box10">
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">False</property>
-+                                    <child>
-+                                      <object class="GtkHBox" id="hbox5">
-+                                        <property name="visible">True</property>
-+                                        <property name="can_focus">False</property>
-+                                        <child>
-+                                          <object class="GtkLabel" id="text2">
-+                                            <property name="visible">True</property>
-+                                            <property name="can_focus">False</property>
-+                                            <property name="label" translatable="yes">Filter</property>
-+                                          </object>
-+                                          <packing>
-+                                            <property name="expand">False</property>
-+                                            <property name="fill">True</property>
-+                                            <property name="position">0</property>
-+                                          </packing>
-+                                        </child>
-+                                        <child>
-+                                          <object class="GtkEntry" id="files_filter">
-+                                            <property name="width_request">170</property>
-+                                            <property name="visible">True</property>
-+                                            <property name="can_focus">True</property>
-+                                            <property name="invisible_char">●</property>
-+                                            <property name="width_chars">25</property>
-+                                            <property name="shadow_type">none</property>
-+                                            <property name="primary_icon_stock">gtk-find</property>
-+                                            <property name="secondary_icon_activatable">False</property>
-+                                            <signal name="changed" handler="on_files_filter_changed" swapped="no"/>
-+                                          </object>
-+                                          <packing>
-+                                            <property name="expand">False</property>
-+                                            <property name="fill">True</property>
-+                                            <property name="position">1</property>
-+                                          </packing>
-+                                        </child>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="expand">False</property>
-+                                        <property name="fill">True</property>
-+                                        <property name="position">0</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <object class="GtkCheckButton" id="Show_modified_only_toggle_files">
-+                                        <property name="label" translatable="yes">Show Modified Only</property>
-+                                        <property name="visible">True</property>
-+                                        <property name="can_focus">True</property>
-+                                        <property name="receives_default">False</property>
-+                                        <property name="xalign">0</property>
-+                                        <property name="draw_indicator">True</property>
-+                                        <signal name="toggled" handler="on_Show_modified_only_toggle_files_toggled" swapped="no"/>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="expand">True</property>
-+                                        <property name="fill">True</property>
-+                                        <property name="position">1</property>
-+                                      </packing>
-+                                    </child>
-+                                  </object>
-+                                </child>
-+                              </object>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                                <property name="position">0</property>
-+                              </packing>
-+                            </child>
++                            <property name="orientation">vertical</property>
 +                            <child>
 +                              <object class="GtkNotebook" id="files_inner_notebook">
 +                                <property name="visible">True</property>
@@ -520628,7 +522195,9 @@ index 0000000..3ea562c
 +                                        <property name="no_show_all">True</property>
 +                                        <property name="model">executable_files_treemodelsort</property>
 +                                        <property name="search_column">0</property>
++                                        <property name="activate_on_single_click">True</property>
 +                                        <signal name="button-press-event" handler="item_in_tree_selected" swapped="no"/>
++                                        <signal name="row-activated" handler="on_column_clicked" swapped="no"/>
 +                                        <child internal-child="selection">
 +                                          <object class="GtkTreeSelection" id="treeview-selection2"/>
 +                                        </child>
@@ -520664,14 +522233,6 @@ index 0000000..3ea562c
 +                                                <attribute name="visible">3</attribute>
 +                                              </attributes>
 +                                            </child>
-+                                            <child>
-+                                              <object class="GtkCellRendererToggle" id="fix_label_exe">
-+                                                <signal name="toggled" handler="on_fix_label_exe_toggled" swapped="no"/>
-+                                              </object>
-+                                              <attributes>
-+                                                <attribute name="visible">3</attribute>
-+                                              </attributes>
-+                                            </child>
 +                                          </object>
 +                                        </child>
 +                                        <child>
@@ -520713,11 +522274,18 @@ index 0000000..3ea562c
 +                                  </object>
 +                                </child>
 +                                <child type="tab">
-+                                  <object class="GtkLabel" id="Executable_files_tab">
++                                  <object class="GtkEventBox" id="eventbox2">
 +                                    <property name="visible">True</property>
 +                                    <property name="can_focus">False</property>
-+                                    <property name="tooltip_text" translatable="yes">File path used to enter the 'selected domain'.</property>
-+                                    <property name="label" translatable="yes">Executable Files</property>
++                                    <signal name="button-press-event" handler="on_tab_switch" swapped="no"/>
++                                    <child>
++                                      <object class="GtkLabel" id="Executable_files_tab">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="tooltip_text" translatable="yes">File path used to enter the 'selected domain'.</property>
++                                        <property name="label" translatable="yes">Executable Files</property>
++                                      </object>
++                                    </child>
 +                                  </object>
 +                                  <packing>
 +                                    <property name="tab_fill">False</property>
@@ -520733,8 +522301,9 @@ index 0000000..3ea562c
 +                                        <property name="can_focus">True</property>
 +                                        <property name="no_show_all">True</property>
 +                                        <property name="model">writable_files_treemodelsort</property>
-+                                        <property name="search_column">0</property>
++                                        <property name="activate_on_single_click">True</property>
 +                                        <signal name="button-press-event" handler="item_in_tree_selected" swapped="no"/>
++                                        <signal name="row-activated" handler="on_column_clicked" swapped="no"/>
 +                                        <child internal-child="selection">
 +                                          <object class="GtkTreeSelection" id="treeview-selection3"/>
 +                                        </child>
@@ -520761,7 +522330,7 @@ index 0000000..3ea562c
 +                                            <property name="min_width">70</property>
 +                                            <property name="max_width">70</property>
 +                                            <child>
-+                                              <object class="GtkCellRendererText" id="cellrenderertext41">
++                                              <object class="GtkCellRendererText" id="fix_label">
 +                                                <property name="foreground_gdk">#00004e4e9999</property>
 +                                                <property name="text">Fix Label</property>
 +                                                <property name="underline">single</property>
@@ -520770,12 +522339,6 @@ index 0000000..3ea562c
 +                                                <attribute name="visible">3</attribute>
 +                                              </attributes>
 +                                            </child>
-+                                            <child>
-+                                              <object class="GtkCellRendererToggle" id="fix_label_write"/>
-+                                              <attributes>
-+                                                <attribute name="visible">3</attribute>
-+                                              </attributes>
-+                                            </child>
 +                                          </object>
 +                                        </child>
 +                                        <child>
@@ -520822,11 +522385,18 @@ index 0000000..3ea562c
 +                                  </packing>
 +                                </child>
 +                                <child type="tab">
-+                                  <object class="GtkLabel" id="Writable_files_tab">
++                                  <object class="GtkEventBox" id="eventbox3">
 +                                    <property name="visible">True</property>
 +                                    <property name="can_focus">False</property>
-+                                    <property name="tooltip_text" translatable="yes">Files to which the 'selected domain' can write.</property>
-+                                    <property name="label" translatable="yes">Writable Files</property>
++                                    <signal name="button-press-event" handler="on_tab_switch" swapped="no"/>
++                                    <child>
++                                      <object class="GtkLabel" id="Writable_files_tab">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="tooltip_text" translatable="yes">Files to which the 'selected domain' can write.</property>
++                                        <property name="label" translatable="yes">Writable Files</property>
++                                      </object>
++                                    </child>
 +                                  </object>
 +                                  <packing>
 +                                    <property name="position">1</property>
@@ -520844,7 +522414,9 @@ index 0000000..3ea562c
 +                                        <property name="no_show_all">True</property>
 +                                        <property name="model">application_filetypes_treemodelsort</property>
 +                                        <property name="search_column">0</property>
++                                        <property name="activate_on_single_click">True</property>
 +                                        <signal name="button-press-event" handler="item_in_tree_selected" swapped="no"/>
++                                        <signal name="row-activated" handler="on_column_clicked" swapped="no"/>
 +                                        <child internal-child="selection">
 +                                          <object class="GtkTreeSelection" id="treeview-selection4"/>
 +                                        </child>
@@ -520882,12 +522454,6 @@ index 0000000..3ea562c
 +                                                <attribute name="visible">3</attribute>
 +                                              </attributes>
 +                                            </child>
-+                                            <child>
-+                                              <object class="GtkCellRendererToggle" id="fix_label_app"/>
-+                                              <attributes>
-+                                                <attribute name="visible">3</attribute>
-+                                              </attributes>
-+                                            </child>
 +                                          </object>
 +                                        </child>
 +                                        <child>
@@ -520940,11 +522506,18 @@ index 0000000..3ea562c
 +                                  </packing>
 +                                </child>
 +                                <child type="tab">
-+                                  <object class="GtkLabel" id="Application_file_types_tab">
++                                  <object class="GtkEventBox" id="eventbox4">
 +                                    <property name="visible">True</property>
 +                                    <property name="can_focus">False</property>
-+                                    <property name="tooltip_text" translatable="yes">File Types defined for the 'selected domain'.</property>
-+                                    <property name="label" translatable="yes">Application File Types</property>
++                                    <signal name="button-press-event" handler="on_tab_switch" swapped="no"/>
++                                    <child>
++                                      <object class="GtkLabel" id="Application_file_types_tab">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="tooltip_text" translatable="yes">File Types defined for the 'selected domain'.</property>
++                                        <property name="label" translatable="yes">Application File Types</property>
++                                      </object>
++                                    </child>
 +                                  </object>
 +                                  <packing>
 +                                    <property name="position">2</property>
@@ -520955,65 +522528,6 @@ index 0000000..3ea562c
 +                              <packing>
 +                                <property name="expand">True</property>
 +                                <property name="fill">True</property>
-+                                <property name="position">1</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkHBox" id="box1">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">False</property>
-+                                <property name="border_width">0</property>
-+                                <child>
-+                                  <object class="GtkButton" id="Delete_button_files">
-+                                    <property name="label" translatable="yes">Delete</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="sensitive">False</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">True</property>
-+                                    <signal name="clicked" handler="on_Delete_button_files_clicked" swapped="no"/>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">True</property>
-+                                    <property name="pack_type">end</property>
-+                                    <property name="position">0</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkButton" id="Modify_button_files">
-+                                    <property name="label" translatable="yes">Modify</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">True</property>
-+                                    <signal name="clicked" handler="on_Modify_button_files_clicked" swapped="no"/>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">True</property>
-+                                    <property name="pack_type">end</property>
-+                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkButton" id="Add_button_files">
-+                                    <property name="label" translatable="yes">Add</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="sensitive">False</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">True</property>
-+                                    <signal name="clicked" handler="on_Add_button_files_clicked" swapped="no"/>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">True</property>
-+                                    <property name="pack_type">end</property>
-+                                    <property name="position">2</property>
-+                                  </packing>
-+                                </child>
-+                              </object>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
 +                                <property name="position">2</property>
 +                              </packing>
 +                            </child>
@@ -521034,86 +522548,10 @@ index 0000000..3ea562c
 +                          </packing>
 +                        </child>
 +                        <child>
-+                          <object class="GtkVBox" id="vbox6">
++                          <object class="GtkBox" id="vbox6">
 +                            <property name="visible">True</property>
 +                            <property name="can_focus">False</property>
-+                            <child>
-+                              <object class="GtkHBox" id="hbox6">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">False</property>
-+                                <child>
-+                                  <object class="GtkHBox" id="hbox9">
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">False</property>
-+                                    <child>
-+                                      <object class="GtkLabel" id="text3">
-+                                        <property name="visible">True</property>
-+                                        <property name="can_focus">False</property>
-+                                        <property name="label" translatable="yes">Filter</property>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="expand">False</property>
-+                                        <property name="fill">True</property>
-+                                        <property name="position">0</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <object class="GtkEntry" id="network_filter">
-+                                        <property name="width_request">170</property>
-+                                        <property name="visible">True</property>
-+                                        <property name="can_focus">True</property>
-+                                        <property name="invisible_char">●</property>
-+                                        <property name="width_chars">25</property>
-+                                        <property name="shadow_type">none</property>
-+                                        <property name="primary_icon_stock">gtk-find</property>
-+                                        <property name="secondary_icon_activatable">False</property>
-+                                        <signal name="changed" handler="on_network_filter_changed" swapped="no"/>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="expand">False</property>
-+                                        <property name="fill">True</property>
-+                                        <property name="position">1</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <object class="GtkCheckButton" id="Show_modified_only_toggle_network">
-+                                        <property name="label" translatable="yes">Show Modified Only</property>
-+                                        <property name="visible">True</property>
-+                                        <property name="can_focus">True</property>
-+                                        <property name="receives_default">False</property>
-+                                        <property name="xalign">0.5</property>
-+                                        <property name="draw_indicator">True</property>
-+                                        <signal name="toggled" handler="on_Show_modified_only_toggle_network_toggled" swapped="no"/>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="expand">False</property>
-+                                        <property name="fill">False</property>
-+                                        <property name="position">2</property>
-+                                      </packing>
-+                                    </child>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">True</property>
-+                                    <property name="fill">True</property>
-+                                    <property name="position">0</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <placeholder/>
-+                                </child>
-+                                <child>
-+                                  <placeholder/>
-+                                </child>
-+                                <child>
-+                                  <placeholder/>
-+                                </child>
-+                              </object>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
-+                                <property name="position">0</property>
-+                              </packing>
-+                            </child>
++                            <property name="orientation">vertical</property>
 +                            <child>
 +                              <object class="GtkNotebook" id="network_inner_notebook">
 +                                <property name="visible">True</property>
@@ -521130,7 +522568,9 @@ index 0000000..3ea562c
 +                                        <property name="model">out_network_treemodelsort</property>
 +                                        <property name="search_column">0</property>
 +                                        <property name="fixed_height_mode">True</property>
++                                        <property name="activate_on_single_click">True</property>
 +                                        <signal name="button-press-event" handler="item_in_tree_selected" swapped="no"/>
++                                        <signal name="row-activated" handler="on_column_clicked" swapped="no"/>
 +                                        <child internal-child="selection">
 +                                          <object class="GtkTreeSelection" id="treeview-selection5"/>
 +                                        </child>
@@ -521191,11 +522631,18 @@ index 0000000..3ea562c
 +                                  </object>
 +                                </child>
 +                                <child type="tab">
-+                                  <object class="GtkLabel" id="Outbound_tab">
++                                  <object class="GtkEventBox" id="eventbox14">
 +                                    <property name="visible">True</property>
 +                                    <property name="can_focus">False</property>
-+                                    <property name="tooltip_text" translatable="yes">Network Ports to which the 'selected domain' is allowed to connect.</property>
-+                                    <property name="label" translatable="yes">Outbound</property>
++                                    <signal name="button-press-event" handler="on_tab_switch" swapped="no"/>
++                                    <child>
++                                      <object class="GtkLabel" id="Outbound_tab">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="tooltip_text" translatable="yes">Network Ports to which the 'selected domain' is allowed to connect.</property>
++                                        <property name="label" translatable="yes">Outbound</property>
++                                      </object>
++                                    </child>
 +                                  </object>
 +                                  <packing>
 +                                    <property name="tab_fill">False</property>
@@ -521213,7 +522660,9 @@ index 0000000..3ea562c
 +                                        <property name="model">in_network_treemodelsort</property>
 +                                        <property name="search_column">0</property>
 +                                        <property name="fixed_height_mode">True</property>
++                                        <property name="activate_on_single_click">True</property>
 +                                        <signal name="button-press-event" handler="item_in_tree_selected" swapped="no"/>
++                                        <signal name="row-activated" handler="on_column_clicked" swapped="no"/>
 +                                        <child internal-child="selection">
 +                                          <object class="GtkTreeSelection" id="treeview-selection6"/>
 +                                        </child>
@@ -521276,11 +522725,18 @@ index 0000000..3ea562c
 +                                  </packing>
 +                                </child>
 +                                <child type="tab">
-+                                  <object class="GtkLabel" id="Inbound_tab">
++                                  <object class="GtkEventBox" id="eventbox44">
 +                                    <property name="visible">True</property>
 +                                    <property name="can_focus">False</property>
-+                                    <property name="tooltip_text" translatable="yes">Network Ports to which the 'selected domain' is allowed to listen.</property>
-+                                    <property name="label" translatable="yes">Inbound</property>
++                                    <signal name="button-press-event" handler="on_tab_switch" swapped="no"/>
++                                    <child>
++                                      <object class="GtkLabel" id="Inbound_tab">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="tooltip_text" translatable="yes">Network Ports to which the 'selected domain' is allowed to listen.</property>
++                                        <property name="label" translatable="yes">Inbound</property>
++                                      </object>
++                                    </child>
 +                                  </object>
 +                                  <packing>
 +                                    <property name="position">1</property>
@@ -521291,67 +522747,6 @@ index 0000000..3ea562c
 +                              <packing>
 +                                <property name="expand">True</property>
 +                                <property name="fill">True</property>
-+                                <property name="position">1</property>
-+                              </packing>
-+                            </child>
-+                            <child>
-+                              <object class="GtkHBox" id="box4">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">False</property>
-+                                <child>
-+                                  <object class="GtkButton" id="Delete_button_network">
-+                                    <property name="label" translatable="yes">Delete</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="sensitive">False</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">True</property>
-+                                    <property name="tooltip_text" translatable="yes">Delete an existing item</property>
-+                                    <signal name="clicked" handler="on_Delete_button_network_clicked" swapped="no"/>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">True</property>
-+                                    <property name="pack_type">end</property>
-+                                    <property name="position">0</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkButton" id="Modify_button_network">
-+                                    <property name="label" translatable="yes">Modify</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">True</property>
-+                                    <property name="tooltip_text" translatable="yes">Modify an existing item</property>
-+                                    <signal name="clicked" handler="on_Modify_button_network_clicked" swapped="no"/>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">True</property>
-+                                    <property name="pack_type">end</property>
-+                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkButton" id="Add_button_network">
-+                                    <property name="label" translatable="yes">Add</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="sensitive">False</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">True</property>
-+                                    <property name="tooltip_text" translatable="yes">Add a new item</property>
-+                                    <signal name="clicked" handler="on_Add_button_network_clicked" swapped="no"/>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">True</property>
-+                                    <property name="pack_type">end</property>
-+                                    <property name="position">2</property>
-+                                  </packing>
-+                                </child>
-+                              </object>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">False</property>
 +                                <property name="position">2</property>
 +                              </packing>
 +                            </child>
@@ -521372,50 +522767,10 @@ index 0000000..3ea562c
 +                          </packing>
 +                        </child>
 +                        <child>
-+                          <object class="GtkVBox" id="vbox7">
++                          <object class="GtkBox" id="vbox7">
 +                            <property name="visible">True</property>
 +                            <property name="can_focus">False</property>
-+                            <child>
-+                              <object class="GtkHBox" id="hbox8">
-+                                <property name="visible">True</property>
-+                                <property name="can_focus">False</property>
-+                                <child>
-+                                  <object class="GtkLabel" id="text4">
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">False</property>
-+                                    <property name="label" translatable="yes">Filter</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">False</property>
-+                                    <property name="position">0</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkEntry" id="transitions_filter">
-+                                    <property name="width_request">170</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="invisible_char">●</property>
-+                                    <property name="width_chars">25</property>
-+                                    <property name="shadow_type">none</property>
-+                                    <property name="primary_icon_stock">gtk-find</property>
-+                                    <property name="secondary_icon_activatable">False</property>
-+                                    <signal name="changed" handler="on_transitions_filter_changed" swapped="no"/>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="expand">False</property>
-+                                    <property name="fill">True</property>
-+                                    <property name="position">1</property>
-+                                  </packing>
-+                                </child>
-+                              </object>
-+                              <packing>
-+                                <property name="expand">False</property>
-+                                <property name="fill">True</property>
-+                                <property name="position">0</property>
-+                              </packing>
-+                            </child>
++                            <property name="orientation">vertical</property>
 +                            <child>
 +                              <object class="GtkNotebook" id="transitions_inner_notebook">
 +                                <property name="visible">True</property>
@@ -521429,6 +522784,8 @@ index 0000000..3ea562c
 +                                        <property name="visible">True</property>
 +                                        <property name="can_focus">True</property>
 +                                        <property name="model">transitions_from_x_treemodelsort</property>
++                                        <property name="activate_on_single_click">True</property>
++                                        <signal name="row-activated" handler="on_column_clicked" swapped="no"/>
 +                                        <child internal-child="selection">
 +                                          <object class="GtkTreeSelection" id="treeview-selection7"/>
 +                                        </child>
@@ -521464,15 +522821,6 @@ index 0000000..3ea562c
 +                                                <attribute name="text">2</attribute>
 +                                              </attributes>
 +                                            </child>
-+                                            <child>
-+                                              <object class="GtkCellRendererToggle" id="return_to_booleans">
-+                                                <property name="indicator_size">0</property>
-+                                                <signal name="toggled" handler="on_return_to_booleans_toggled" swapped="no"/>
-+                                              </object>
-+                                              <attributes>
-+                                                <attribute name="visible">5</attribute>
-+                                              </attributes>
-+                                            </child>
 +                                          </object>
 +                                        </child>
 +                                        <child>
@@ -521687,344 +523035,874 @@ index 0000000..3ea562c
 +                            <property name="tab_fill">False</property>
 +                          </packing>
 +                        </child>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">True</property>
-+                        <property name="fill">True</property>
-+                        <property name="position">0</property>
-+                      </packing>
-+                    </child>
-+                    <child>
-+                      <object class="GtkVBox" id="Systems_box">
-+                        <property name="can_focus">False</property>
 +                        <child>
-+                          <object class="GtkFrame" id="System_mode_frame">
++                          <object class="GtkBox" id="box18">
 +                            <property name="visible">True</property>
 +                            <property name="can_focus">False</property>
-+                            <property name="label_xalign">0</property>
-+                            <property name="shadow_type">out</property>
++                            <property name="orientation">vertical</property>
 +                            <child>
-+                              <object class="GtkTable" id="grid1">
++                              <object class="GtkTreeView" id="login_treeview">
++                                <property name="visible">True</property>
++                                <property name="can_focus">True</property>
++                                <property name="no_show_all">True</property>
++                                <property name="tooltip_text" translatable="yes">If-Then-Else rules written in policy that can 
++allow alternative access control.</property>
++                                <property name="model">login_liststore</property>
++                                <property name="search_column">0</property>
++                                <property name="activate_on_single_click">True</property>
++                                <signal name="row-activated" handler="on_login_treeview_row_activated" swapped="no"/>
++                                <child internal-child="selection">
++                                  <object class="GtkTreeSelection" id="treeview-selection22"/>
++                                </child>
++                                <child>
++                                  <object class="GtkTreeViewColumn" id="Login Name">
++                                    <property name="resizable">True</property>
++                                    <property name="sizing">fixed</property>
++                                    <property name="min_width">240</property>
++                                    <property name="title" translatable="yes">Login Name</property>
++                                    <property name="expand">True</property>
++                                    <property name="clickable">True</property>
++                                    <property name="sort_column_id">0</property>
++                                    <child>
++                                      <object class="GtkCellRendererText" id="cellrenderertext22">
++                                        <property name="wrap_mode">word</property>
++                                        <property name="wrap_width">360</property>
++                                      </object>
++                                      <attributes>
++                                        <attribute name="text">0</attribute>
++                                      </attributes>
++                                    </child>
++                                  </object>
++                                </child>
++                                <child>
++                                  <object class="GtkTreeViewColumn" id="SELinuxUser">
++                                    <property name="sizing">fixed</property>
++                                    <property name="title" translatable="yes">SELinux User</property>
++                                    <property name="expand">True</property>
++                                    <property name="clickable">True</property>
++                                    <property name="sort_indicator">True</property>
++                                    <property name="sort_column_id">1</property>
++                                    <child>
++                                      <object class="GtkCellRendererText" id="cellrenderertext41"/>
++                                      <attributes>
++                                        <attribute name="text">1</attribute>
++                                      </attributes>
++                                    </child>
++                                  </object>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">True</property>
++                                <property name="fill">True</property>
++                                <property name="position">1</property>
++                              </packing>
++                            </child>
++                          </object>
++                          <packing>
++                            <property name="position">4</property>
++                          </packing>
++                        </child>
++                        <child type="tab">
++                          <object class="GtkLabel" id="login_tab">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="label" translatable="yes">Login Mapping</property>
++                          </object>
++                          <packing>
++                            <property name="position">4</property>
++                            <property name="tab_fill">False</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkBox" id="box21">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="orientation">vertical</property>
++                            <child>
++                              <object class="GtkTreeView" id="user_treeview">
++                                <property name="visible">True</property>
++                                <property name="can_focus">True</property>
++                                <property name="no_show_all">True</property>
++                                <property name="tooltip_text" translatable="yes">If-Then-Else rules written in policy that can 
++allow alternative access control.</property>
++                                <property name="model">user_liststore</property>
++                                <property name="reorderable">True</property>
++                                <property name="search_column">0</property>
++                                <property name="activate_on_single_click">True</property>
++                                <signal name="row-activated" handler="on_user_treeview_row_activated" swapped="no"/>
++                                <child internal-child="selection">
++                                  <object class="GtkTreeSelection" id="treeview-selection21"/>
++                                </child>
++                                <child>
++                                  <object class="GtkTreeViewColumn" id="SELinuxUser Name">
++                                    <property name="resizable">True</property>
++                                    <property name="sizing">fixed</property>
++                                    <property name="min_width">240</property>
++                                    <property name="title" translatable="yes">SELinux User</property>
++                                    <property name="expand">True</property>
++                                    <property name="clickable">True</property>
++                                    <property name="sort_column_id">0</property>
++                                    <child>
++                                      <object class="GtkCellRendererText" id="cellrenderertext48">
++                                        <property name="wrap_mode">word</property>
++                                        <property name="wrap_width">360</property>
++                                      </object>
++                                      <attributes>
++                                        <attribute name="text">0</attribute>
++                                      </attributes>
++                                    </child>
++                                  </object>
++                                </child>
++                                <child>
++                                  <object class="GtkTreeViewColumn" id="SELinuxRoles1">
++                                    <property name="sizing">fixed</property>
++                                    <property name="title" translatable="yes">SELinux Roles</property>
++                                    <property name="expand">True</property>
++                                    <property name="clickable">True</property>
++                                    <property name="reorderable">True</property>
++                                    <property name="sort_indicator">True</property>
++                                    <property name="sort_column_id">1</property>
++                                    <child>
++                                      <object class="GtkCellRendererText" id="cellrenderertext49"/>
++                                      <attributes>
++                                        <attribute name="text">1</attribute>
++                                      </attributes>
++                                    </child>
++                                  </object>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="expand">True</property>
++                                <property name="fill">True</property>
++                                <property name="position">1</property>
++                              </packing>
++                            </child>
++                          </object>
++                          <packing>
++                            <property name="position">5</property>
++                          </packing>
++                        </child>
++                        <child type="tab">
++                          <object class="GtkLabel" id="users_tab">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="label" translatable="yes">SELinux Users</property>
++                          </object>
++                          <packing>
++                            <property name="position">5</property>
++                            <property name="tab_fill">False</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkBox" id="system_box">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="halign">start</property>
++                            <property name="hexpand">False</property>
++                            <property name="vexpand">False</property>
++                            <property name="orientation">vertical</property>
++                            <child>
++                              <object class="GtkFrame" id="System_mode_frame">
 +                                <property name="visible">True</property>
 +                                <property name="can_focus">False</property>
++                                <property name="valign">center</property>
++                                <property name="border_width">10</property>
++                                <property name="label_xalign">0</property>
++                                <property name="shadow_type">out</property>
 +                                <child>
-+                                  <object class="GtkLabel" id="label18">
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">False</property>
-+                                    <property name="xalign">0.05000000074505806</property>
-+                                    <property name="label" translatable="yes">Select the system mode when the system first boots up</property>
-+                                  </object>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkHBox" id="box6">
++                                  <object class="GtkBox" id="box6">
 +                                    <property name="visible">True</property>
 +                                    <property name="can_focus">False</property>
++                                    <property name="halign">start</property>
 +                                    <child>
-+                                      <object class="GtkRadioButton" id="Enforcing_button_default">
-+                                        <property name="label" translatable="yes">Enforcing</property>
++                                      <object class="GtkTable" id="grid1">
 +                                        <property name="visible">True</property>
-+                                        <property name="can_focus">True</property>
-+                                        <property name="receives_default">False</property>
-+                                        <property name="margin_left">50</property>
-+                                        <property name="xalign">0</property>
-+                                        <property name="yalign">0.50999999046325684</property>
-+                                        <property name="active">True</property>
-+                                        <property name="draw_indicator">True</property>
-+                                        <signal name="group-changed" handler="gtk_main_quit" swapped="no"/>
-+                                        <signal name="toggled" handler="on_Enforcing_button_default_toggled" swapped="no"/>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="expand">False</property>
-+                                        <property name="fill">False</property>
-+                                        <property name="position">0</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <object class="GtkRadioButton" id="Permissive_button_default">
-+                                        <property name="label" translatable="yes">Permissive</property>
-+                                        <property name="visible">True</property>
-+                                        <property name="can_focus">True</property>
-+                                        <property name="receives_default">False</property>
-+                                        <property name="xalign">0</property>
-+                                        <property name="draw_indicator">True</property>
-+                                        <property name="group">Enforcing_button_default</property>
-+                                        <signal name="toggled" handler="on_Permissive_button_default_toggled" swapped="no"/>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="expand">False</property>
-+                                        <property name="fill">False</property>
-+                                        <property name="position">1</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <object class="GtkRadioButton" id="Disabled_button_default">
-+                                        <property name="label" translatable="yes">Disabled</property>
-+                                        <property name="visible">True</property>
-+                                        <property name="can_focus">True</property>
-+                                        <property name="receives_default">False</property>
-+                                        <property name="xalign">0</property>
-+                                        <property name="draw_indicator">True</property>
-+                                        <property name="group">Enforcing_button_default</property>
-+                                        <signal name="toggled" handler="on_Disabled_button_default_toggled" swapped="no"/>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="expand">False</property>
-+                                        <property name="fill">False</property>
-+                                        <property name="position">2</property>
-+                                      </packing>
-+                                    </child>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="top_attach">1</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkLabel" id="label16">
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">False</property>
-+                                    <property name="xalign">0.05000000074505806</property>
-+                                    <property name="label" translatable="yes">Select the system mode for the current session</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="top_attach">2</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkHBox" id="box7">
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">False</property>
-+                                    <child>
-+                                      <object class="GtkRadioButton" id="Enforcing_button">
-+                                        <property name="label" translatable="yes">Enforcing</property>
-+                                        <property name="visible">True</property>
-+                                        <property name="can_focus">True</property>
-+                                        <property name="receives_default">False</property>
-+                                        <property name="margin_left">100</property>
-+                                        <property name="xalign">0</property>
-+                                        <property name="active">True</property>
-+                                        <property name="draw_indicator">True</property>
-+                                        <signal name="toggled" handler="on_Enforcing_button_toggled" swapped="no"/>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="expand">False</property>
-+                                        <property name="fill">True</property>
-+                                        <property name="position">0</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <object class="GtkRadioButton" id="Permissive_button">
-+                                        <property name="label" translatable="yes">Permissive</property>
-+                                        <property name="visible">True</property>
-+                                        <property name="can_focus">True</property>
-+                                        <property name="receives_default">False</property>
-+                                        <property name="xalign">0</property>
-+                                        <property name="draw_indicator">True</property>
-+                                        <property name="group">Enforcing_button</property>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="expand">False</property>
-+                                        <property name="fill">True</property>
-+                                        <property name="position">1</property>
-+                                      </packing>
-+                                    </child>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="top_attach">3</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkLabel" id="advanced_system">
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="xalign">0.019999999552965164</property>
-+                                    <property name="label" translatable="yes">Advanced &gt;&gt;</property>
-+                                    <property name="selectable">True</property>
-+                                    <property name="ellipsize">end</property>
-+                                    <attributes>
-+                                      <attribute name="foreground" value="#00004e4e9999"/>
-+                                    </attributes>
-+                                    <signal name="button-press-event" handler="on_advanced_system_button_press_event" swapped="no"/>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="top_attach">4</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkHBox" id="box8">
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">False</property>
-+                                    <child>
-+                                      <object class="GtkLabel" id="system_policy_type_label">
 +                                        <property name="can_focus">False</property>
-+                                        <property name="margin_left">5</property>
-+                                        <property name="xalign">0</property>
-+                                        <property name="label" translatable="yes">System Policy Type:</property>
-+                                        <property name="width_chars">15</property>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="expand">False</property>
-+                                        <property name="fill">False</property>
-+                                        <property name="position">0</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <object class="GtkComboBox" id="system_policy_type_combobox">
-+                                        <property name="width_request">200</property>
-+                                        <property name="can_focus">False</property>
-+                                        <property name="margin_left">10</property>
-+                                        <property name="model">system_policy_type_liststore</property>
-+                                        <signal name="changed" handler="on_system_policy_type_combobox_changed" swapped="no"/>
++                                        <property name="halign">center</property>
++                                        <property name="valign">center</property>
 +                                        <child>
-+                                          <object class="GtkCellRendererText" id="cellrenderertext20"/>
-+                                          <attributes>
-+                                            <attribute name="text">0</attribute>
-+                                          </attributes>
++                                          <object class="GtkLabel" id="label18">
++                                            <property name="visible">True</property>
++                                            <property name="can_focus">False</property>
++                                            <property name="xalign">0.05000000074505806</property>
++                                            <property name="label" translatable="yes">Select the system mode when the system first boots up</property>
++                                          </object>
++                                          <packing>
++                                            <property name="x_padding">15</property>
++                                          </packing>
++                                        </child>
++                                        <child>
++                                          <object class="GtkBox" id="box7">
++                                            <property name="visible">True</property>
++                                            <property name="can_focus">False</property>
++                                            <child>
++                                              <object class="GtkRadioButton" id="Enforcing_button_default">
++                                                <property name="label" translatable="yes">Enforcing</property>
++                                                <property name="visible">True</property>
++                                                <property name="can_focus">True</property>
++                                                <property name="receives_default">False</property>
++                                                <property name="margin_left">50</property>
++                                                <property name="xalign">0</property>
++                                                <property name="active">True</property>
++                                                <property name="draw_indicator">True</property>
++                                                <signal name="group-changed" handler="gtk_main_quit" swapped="no"/>
++                                                <signal name="toggled" handler="on_Enforcing_button_default_toggled" swapped="no"/>
++                                              </object>
++                                              <packing>
++                                                <property name="expand">False</property>
++                                                <property name="fill">False</property>
++                                                <property name="position">0</property>
++                                              </packing>
++                                            </child>
++                                            <child>
++                                              <object class="GtkRadioButton" id="Permissive_button_default">
++                                                <property name="label" translatable="yes">Permissive</property>
++                                                <property name="visible">True</property>
++                                                <property name="can_focus">True</property>
++                                                <property name="receives_default">False</property>
++                                                <property name="xalign">0</property>
++                                                <property name="draw_indicator">True</property>
++                                                <property name="group">Enforcing_button_default</property>
++                                                <signal name="toggled" handler="on_Permissive_button_default_toggled" swapped="no"/>
++                                              </object>
++                                              <packing>
++                                                <property name="expand">False</property>
++                                                <property name="fill">False</property>
++                                                <property name="position">1</property>
++                                              </packing>
++                                            </child>
++                                            <child>
++                                              <object class="GtkRadioButton" id="Disabled_button_default">
++                                                <property name="label" translatable="yes">Disabled</property>
++                                                <property name="visible">True</property>
++                                                <property name="can_focus">True</property>
++                                                <property name="receives_default">False</property>
++                                                <property name="xalign">0</property>
++                                                <property name="draw_indicator">True</property>
++                                                <property name="group">Enforcing_button_default</property>
++                                                <signal name="toggled" handler="on_Disabled_button_default_toggled" swapped="no"/>
++                                              </object>
++                                              <packing>
++                                                <property name="expand">False</property>
++                                                <property name="fill">False</property>
++                                                <property name="position">2</property>
++                                              </packing>
++                                            </child>
++                                          </object>
++                                          <packing>
++                                            <property name="top_attach">1</property>
++                                          </packing>
++                                        </child>
++                                        <child>
++                                          <object class="GtkLabel" id="Enforcing_label">
++                                            <property name="visible">True</property>
++                                            <property name="can_focus">False</property>
++                                            <property name="xalign">0.0099999997764825821</property>
++                                            <property name="label" translatable="yes">Select the system mode for the current session</property>
++                                          </object>
++                                          <packing>
++                                            <property name="top_attach">2</property>
++                                            <property name="x_padding">15</property>
++                                          </packing>
++                                        </child>
++                                        <child>
++                                          <object class="GtkBox" id="box8">
++                                            <property name="visible">True</property>
++                                            <property name="can_focus">False</property>
++                                            <child>
++                                              <object class="GtkRadioButton" id="Enforcing_button">
++                                                <property name="label" translatable="yes">Enforcing</property>
++                                                <property name="visible">True</property>
++                                                <property name="can_focus">True</property>
++                                                <property name="receives_default">False</property>
++                                                <property name="margin_left">50</property>
++                                                <property name="xalign">0</property>
++                                                <property name="active">True</property>
++                                                <property name="draw_indicator">True</property>
++                                                <signal name="toggled" handler="on_Enforcing_button_toggled" swapped="no"/>
++                                              </object>
++                                              <packing>
++                                                <property name="expand">False</property>
++                                                <property name="fill">True</property>
++                                                <property name="position">0</property>
++                                              </packing>
++                                            </child>
++                                            <child>
++                                              <object class="GtkRadioButton" id="Permissive_button">
++                                                <property name="label" translatable="yes">Permissive</property>
++                                                <property name="visible">True</property>
++                                                <property name="can_focus">True</property>
++                                                <property name="receives_default">False</property>
++                                                <property name="xalign">0</property>
++                                                <property name="draw_indicator">True</property>
++                                                <property name="group">Enforcing_button</property>
++                                              </object>
++                                              <packing>
++                                                <property name="expand">False</property>
++                                                <property name="fill">True</property>
++                                                <property name="position">1</property>
++                                              </packing>
++                                            </child>
++                                          </object>
++                                          <packing>
++                                            <property name="top_attach">3</property>
++                                          </packing>
++                                        </child>
++                                        <child>
++                                          <object class="GtkLabel" id="advanced_system">
++                                            <property name="visible">True</property>
++                                            <property name="can_focus">False</property>
++                                            <property name="xalign">0</property>
++                                            <property name="label" translatable="yes">Advanced &gt;&gt;</property>
++                                            <property name="selectable">True</property>
++                                            <property name="ellipsize">end</property>
++                                            <attributes>
++                                              <attribute name="foreground" value="#00004e4e9999"/>
++                                            </attributes>
++                                            <signal name="button-press-event" handler="on_advanced_system_button_press_event" swapped="no"/>
++                                          </object>
++                                          <packing>
++                                            <property name="top_attach">4</property>
++                                            <property name="x_padding">15</property>
++                                          </packing>
++                                        </child>
++                                        <child>
++                                          <object class="GtkBox" id="box10">
++                                            <property name="visible">True</property>
++                                            <property name="can_focus">False</property>
++                                            <property name="orientation">vertical</property>
++                                            <child>
++                                              <object class="GtkLabel" id="system_policy_type_label">
++                                                <property name="can_focus">False</property>
++                                                <property name="xalign">0</property>
++                                                <property name="label" translatable="yes">System Policy Type:</property>
++                                                <property name="width_chars">15</property>
++                                              </object>
++                                              <packing>
++                                                <property name="expand">False</property>
++                                                <property name="fill">False</property>
++                                                <property name="position">0</property>
++                                              </packing>
++                                            </child>
++                                            <child>
++                                              <object class="GtkComboBox" id="system_policy_type_combobox">
++                                                <property name="width_request">200</property>
++                                                <property name="can_focus">False</property>
++                                                <property name="margin_left">10</property>
++                                                <property name="model">system_policy_type_liststore</property>
++                                                <signal name="changed" handler="on_system_policy_type_combobox_changed" swapped="no"/>
++                                                <child>
++                                                  <object class="GtkCellRendererText" id="cellrenderertext20"/>
++                                                  <attributes>
++                                                    <attribute name="text">0</attribute>
++                                                  </attributes>
++                                                </child>
++                                              </object>
++                                              <packing>
++                                                <property name="expand">False</property>
++                                                <property name="fill">True</property>
++                                                <property name="position">1</property>
++                                              </packing>
++                                            </child>
++                                          </object>
++                                          <packing>
++                                            <property name="top_attach">5</property>
++                                            <property name="x_padding">15</property>
++                                          </packing>
 +                                        </child>
 +                                      </object>
 +                                      <packing>
 +                                        <property name="expand">False</property>
 +                                        <property name="fill">True</property>
++                                        <property name="position">0</property>
++                                      </packing>
++                                    </child>
++                                    <child>
++                                      <object class="GtkLabel" id="info_text">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="use_markup">True</property>
++                                        <property name="wrap">True</property>
++                                      </object>
++                                      <packing>
++                                        <property name="expand">False</property>
++                                        <property name="fill">True</property>
 +                                        <property name="position">1</property>
 +                                      </packing>
 +                                    </child>
 +                                  </object>
-+                                  <packing>
-+                                    <property name="top_attach">5</property>
-+                                  </packing>
++                                </child>
++                                <child type="label">
++                                  <object class="GtkLabel" id="label12">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">False</property>
++                                    <property name="label" translatable="yes">&lt;b&gt;System Mode&lt;/b&gt;</property>
++                                    <property name="use_markup">True</property>
++                                  </object>
 +                                </child>
 +                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="padding">10</property>
++                                <property name="position">0</property>
++                              </packing>
 +                            </child>
-+                            <child type="label">
-+                              <object class="GtkLabel" id="label12">
++                            <child>
++                              <object class="GtkFrame" id="System_configuration_frame">
 +                                <property name="visible">True</property>
 +                                <property name="can_focus">False</property>
-+                                <property name="label" translatable="yes">&lt;b&gt;System Mode&lt;/b&gt;</property>
-+                                <property name="use_markup">True</property>
++                                <property name="valign">center</property>
++                                <property name="border_width">10</property>
++                                <property name="label_xalign">0</property>
++                                <property name="shadow_type">out</property>
++                                <child>
++                                  <object class="GtkBox" id="box13">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">False</property>
++                                    <property name="halign">start</property>
++                                    <child>
++                                      <object class="GtkTable" id="grid2">
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">False</property>
++                                        <property name="halign">center</property>
++                                        <property name="valign">center</property>
++                                        <property name="n_rows">4</property>
++                                        <property name="n_columns">2</property>
++                                        <child>
++                                          <object class="GtkLabel" id="label10">
++                                            <property name="visible">True</property>
++                                            <property name="can_focus">False</property>
++                                            <property name="xalign">0</property>
++                                            <property name="label" translatable="yes">Import system settings from another machine</property>
++                                          </object>
++                                          <packing>
++                                            <property name="x_padding">15</property>
++                                          </packing>
++                                        </child>
++                                        <child>
++                                          <object class="GtkButton" id="Import_button">
++                                            <property name="label" translatable="yes">Import</property>
++                                            <property name="width_request">65</property>
++                                            <property name="visible">True</property>
++                                            <property name="can_focus">True</property>
++                                            <property name="receives_default">True</property>
++                                            <signal name="clicked" handler="on_Import_button_clicked" swapped="no"/>
++                                          </object>
++                                          <packing>
++                                            <property name="left_attach">1</property>
++                                            <property name="x_options"/>
++                                            <property name="y_options"/>
++                                            <property name="x_padding">10</property>
++                                          </packing>
++                                        </child>
++                                        <child>
++                                          <object class="GtkLabel" id="label11">
++                                            <property name="visible">True</property>
++                                            <property name="can_focus">False</property>
++                                            <property name="xalign">0</property>
++                                            <property name="label" translatable="yes">Export system settings to a file</property>
++                                            <property name="ellipsize">middle</property>
++                                          </object>
++                                          <packing>
++                                            <property name="top_attach">1</property>
++                                            <property name="x_padding">15</property>
++                                          </packing>
++                                        </child>
++                                        <child>
++                                          <object class="GtkButton" id="Export_button">
++                                            <property name="label" translatable="yes">Export</property>
++                                            <property name="width_request">65</property>
++                                            <property name="visible">True</property>
++                                            <property name="can_focus">True</property>
++                                            <property name="receives_default">True</property>
++                                            <signal name="clicked" handler="on_Export_button_clicked" swapped="no"/>
++                                          </object>
++                                          <packing>
++                                            <property name="left_attach">1</property>
++                                            <property name="top_attach">1</property>
++                                            <property name="x_options"/>
++                                            <property name="y_options"/>
++                                            <property name="x_padding">10</property>
++                                          </packing>
++                                        </child>
++                                        <child>
++                                          <object class="GtkLabel" id="label13">
++                                            <property name="visible">True</property>
++                                            <property name="can_focus">False</property>
++                                            <property name="label" translatable="yes">Relabel all files back to system defaults on reboot</property>
++                                          </object>
++                                          <packing>
++                                            <property name="top_attach">3</property>
++                                            <property name="x_padding">15</property>
++                                          </packing>
++                                        </child>
++                                        <child>
++                                          <object class="GtkSeparator" id="separator1">
++                                            <property name="visible">True</property>
++                                            <property name="can_focus">False</property>
++                                          </object>
++                                          <packing>
++                                            <property name="top_attach">2</property>
++                                            <property name="bottom_attach">3</property>
++                                            <property name="y_padding">5</property>
++                                          </packing>
++                                        </child>
++                                        <child>
++                                          <object class="GtkSeparator" id="separator2">
++                                            <property name="visible">True</property>
++                                            <property name="can_focus">False</property>
++                                          </object>
++                                          <packing>
++                                            <property name="left_attach">1</property>
++                                            <property name="right_attach">2</property>
++                                            <property name="top_attach">2</property>
++                                            <property name="bottom_attach">3</property>
++                                            <property name="y_padding">5</property>
++                                          </packing>
++                                        </child>
++                                        <child>
++                                          <object class="GtkBox" id="box5">
++                                            <property name="visible">True</property>
++                                            <property name="can_focus">False</property>
++                                            <child>
++                                              <object class="GtkRadioButton" id="Relabel_button">
++                                                <property name="label" translatable="yes">Yes</property>
++                                                <property name="visible">True</property>
++                                                <property name="can_focus">True</property>
++                                                <property name="receives_default">False</property>
++                                                <property name="xalign">0</property>
++                                                <property name="active">True</property>
++                                                <property name="draw_indicator">True</property>
++                                                <signal name="toggled" handler="on_Relabel_button_toggled_cb" swapped="no"/>
++                                              </object>
++                                              <packing>
++                                                <property name="expand">False</property>
++                                                <property name="fill">True</property>
++                                                <property name="position">0</property>
++                                              </packing>
++                                            </child>
++                                            <child>
++                                              <object class="GtkRadioButton" id="Relabel_button_no">
++                                                <property name="label" translatable="yes">No</property>
++                                                <property name="visible">True</property>
++                                                <property name="can_focus">True</property>
++                                                <property name="receives_default">False</property>
++                                                <property name="xalign">0</property>
++                                                <property name="draw_indicator">True</property>
++                                                <property name="group">Relabel_button</property>
++                                              </object>
++                                              <packing>
++                                                <property name="expand">False</property>
++                                                <property name="fill">True</property>
++                                                <property name="position">1</property>
++                                              </packing>
++                                            </child>
++                                          </object>
++                                          <packing>
++                                            <property name="left_attach">1</property>
++                                            <property name="right_attach">2</property>
++                                            <property name="top_attach">3</property>
++                                            <property name="bottom_attach">4</property>
++                                            <property name="x_options"/>
++                                            <property name="y_options"/>
++                                            <property name="x_padding">10</property>
++                                          </packing>
++                                        </child>
++                                      </object>
++                                      <packing>
++                                        <property name="expand">False</property>
++                                        <property name="fill">True</property>
++                                        <property name="position">0</property>
++                                      </packing>
++                                    </child>
++                                    <child>
++                                      <placeholder/>
++                                    </child>
++                                  </object>
++                                </child>
++                                <child type="label">
++                                  <object class="GtkLabel" id="label9">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">False</property>
++                                    <property name="label" translatable="yes">&lt;b&gt;System Configuration&lt;/b&gt;</property>
++                                    <property name="use_markup">True</property>
++                                  </object>
++                                </child>
 +                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="position">1</property>
++                              </packing>
 +                            </child>
 +                          </object>
 +                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">True</property>
-+                            <property name="padding">10</property>
-+                            <property name="position">0</property>
++                            <property name="position">6</property>
++                          </packing>
++                        </child>
++                        <child type="tab">
++                          <object class="GtkLabel" id="systems_tab">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="label" translatable="yes">System</property>
++                          </object>
++                          <packing>
++                            <property name="position">6</property>
++                            <property name="tab_fill">False</property>
 +                          </packing>
 +                        </child>
 +                        <child>
-+                          <object class="GtkFrame" id="System_configuration_frame">
++                          <object class="GtkGrid" id="grid3">
 +                            <property name="visible">True</property>
 +                            <property name="can_focus">False</property>
-+                            <property name="label_xalign">0</property>
-+                            <property name="shadow_type">out</property>
 +                            <child>
-+                              <object class="GtkTable" id="grid2">
++                              <object class="GtkFrame" id="frame1">
 +                                <property name="visible">True</property>
 +                                <property name="can_focus">False</property>
++                                <property name="label_xalign">0</property>
++                                <property name="shadow_type">none</property>
 +                                <child>
-+                                  <object class="GtkLabel" id="label10">
++                                  <object class="GtkBox" id="box16">
 +                                    <property name="visible">True</property>
 +                                    <property name="can_focus">False</property>
-+                                    <property name="label" translatable="yes">Import system settings from another machine</property>
++                                    <child>
++                                      <object class="GtkRadioButton" id="enable_unconfined">
++                                        <property name="label" translatable="yes">Enable</property>
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">True</property>
++                                        <property name="receives_default">False</property>
++                                        <property name="xalign">0</property>
++                                        <property name="active">True</property>
++                                        <property name="draw_indicator">True</property>
++                                        <signal name="toggled" handler="on_enable_unconfined_toggled" swapped="no"/>
++                                      </object>
++                                      <packing>
++                                        <property name="expand">False</property>
++                                        <property name="fill">True</property>
++                                        <property name="position">0</property>
++                                      </packing>
++                                    </child>
++                                    <child>
++                                      <object class="GtkRadioButton" id="disable_unconfined">
++                                        <property name="label" translatable="yes">Disable</property>
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">True</property>
++                                        <property name="receives_default">False</property>
++                                        <property name="xalign">0</property>
++                                        <property name="active">True</property>
++                                        <property name="draw_indicator">True</property>
++                                        <property name="group">enable_unconfined</property>
++                                      </object>
++                                      <packing>
++                                        <property name="expand">False</property>
++                                        <property name="fill">True</property>
++                                        <property name="position">1</property>
++                                      </packing>
++                                    </child>
 +                                  </object>
-+                                  <packing>
-+                                    <property name="x_options"/>
-+                                  </packing>
 +                                </child>
-+                                <child>
-+                                  <object class="GtkButton" id="Import_button">
-+                                    <property name="label" translatable="yes">Import</property>
-+                                    <property name="width_request">65</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">True</property>
-+                                    <signal name="clicked" handler="on_Import_button_clicked" swapped="no"/>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="left_attach">1</property>
-+                                    <property name="x_options"/>
-+                                    <property name="x_padding">10</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkLabel" id="label11">
++                                <child type="label">
++                                  <object class="GtkLabel" id="label19">
 +                                    <property name="visible">True</property>
 +                                    <property name="can_focus">False</property>
-+                                    <property name="label" translatable="yes">Export system settings to a file</property>
++                                    <property name="label" translatable="yes">&lt;b&gt;Unconfined Module&lt;/b&gt;</property>
++                                    <property name="use_markup">True</property>
 +                                  </object>
-+                                  <packing>
-+                                    <property name="top_attach">1</property>
-+                                    <property name="x_options"/>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkButton" id="Export_button">
-+                                    <property name="label" translatable="yes">Export</property>
-+                                    <property name="width_request">65</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">True</property>
-+                                    <signal name="clicked" handler="on_Export_button_clicked" swapped="no"/>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="left_attach">1</property>
-+                                    <property name="top_attach">1</property>
-+                                    <property name="x_options"/>
-+                                    <property name="x_padding">10</property>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkLabel" id="label13">
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">False</property>
-+                                    <property name="label" translatable="yes">Relabel all files back to system defaults on reboot</property>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="top_attach">3</property>
-+                                    <property name="x_options"/>
-+                                  </packing>
-+                                </child>
-+                                <child>
-+                                  <placeholder/>
-+                                </child>
-+                                <child>
-+                                  <placeholder/>
-+                                </child>
-+                                <child>
-+                                  <object class="GtkToggleButton" id="Relabel_button">
-+                                    <property name="label" translatable="yes">Relabel</property>
-+                                    <property name="visible">True</property>
-+                                    <property name="can_focus">True</property>
-+                                    <property name="receives_default">True</property>
-+                                    <signal name="toggled" handler="on_Relabel_button_toggled" swapped="no"/>
-+                                  </object>
-+                                  <packing>
-+                                    <property name="left_attach">1</property>
-+                                    <property name="top_attach">3</property>
-+                                    <property name="x_options"/>
-+                                    <property name="x_padding">10</property>
-+                                  </packing>
 +                                </child>
 +                              </object>
++                              <packing>
++                                <property name="left_attach">0</property>
++                                <property name="top_attach">0</property>
++                                <property name="width">1</property>
++                                <property name="height">1</property>
++                              </packing>
 +                            </child>
-+                            <child type="label">
-+                              <object class="GtkLabel" id="label9">
++                            <child>
++                              <object class="GtkTreeView" id="unconfined_treeview">
++                                <property name="visible">True</property>
++                                <property name="can_focus">True</property>
++                                <property name="hscroll_policy">natural</property>
++                                <property name="vscroll_policy">natural</property>
++                                <property name="enable_search">False</property>
++                                <property name="show_expanders">False</property>
++                                <child internal-child="selection">
++                                  <object class="GtkTreeSelection" id="treeview-selection17"/>
++                                </child>
++                              </object>
++                              <packing>
++                                <property name="left_attach">1</property>
++                                <property name="top_attach">0</property>
++                                <property name="width">1</property>
++                                <property name="height">1</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkFrame" id="frame2">
 +                                <property name="visible">True</property>
 +                                <property name="can_focus">False</property>
-+                                <property name="label" translatable="yes">&lt;b&gt;System Configuration&lt;/b&gt;</property>
-+                                <property name="use_markup">True</property>
++                                <property name="label_xalign">0</property>
++                                <property name="shadow_type">none</property>
++                                <child>
++                                  <object class="GtkBox" id="box17">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">False</property>
++                                    <child>
++                                      <object class="GtkRadioButton" id="enable_permissive">
++                                        <property name="label" translatable="yes">Enable</property>
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">True</property>
++                                        <property name="receives_default">False</property>
++                                        <property name="xalign">0</property>
++                                        <property name="active">True</property>
++                                        <property name="draw_indicator">True</property>
++                                        <signal name="toggled" handler="on_enable_permissive_toggled" swapped="no"/>
++                                      </object>
++                                      <packing>
++                                        <property name="expand">False</property>
++                                        <property name="fill">True</property>
++                                        <property name="position">0</property>
++                                      </packing>
++                                    </child>
++                                    <child>
++                                      <object class="GtkRadioButton" id="disable_permissive">
++                                        <property name="label" translatable="yes">Disable</property>
++                                        <property name="visible">True</property>
++                                        <property name="can_focus">True</property>
++                                        <property name="receives_default">False</property>
++                                        <property name="xalign">0</property>
++                                        <property name="draw_indicator">True</property>
++                                        <property name="group">enable_permissive</property>
++                                      </object>
++                                      <packing>
++                                        <property name="expand">False</property>
++                                        <property name="fill">True</property>
++                                        <property name="position">1</property>
++                                      </packing>
++                                    </child>
++                                  </object>
++                                </child>
++                                <child type="label">
++                                  <object class="GtkLabel" id="label22">
++                                    <property name="visible">True</property>
++                                    <property name="can_focus">False</property>
++                                    <property name="label" translatable="yes">&lt;b&gt;Permissive Domains&lt;/b&gt;</property>
++                                    <property name="use_markup">True</property>
++                                  </object>
++                                </child>
 +                              </object>
++                              <packing>
++                                <property name="left_attach">0</property>
++                                <property name="top_attach">1</property>
++                                <property name="width">1</property>
++                                <property name="height">1</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <placeholder/>
 +                            </child>
 +                          </object>
 +                          <packing>
-+                            <property name="expand">False</property>
-+                            <property name="fill">True</property>
-+                            <property name="position">1</property>
++                            <property name="position">6</property>
++                          </packing>
++                        </child>
++                        <child type="tab">
++                          <object class="GtkLabel" id="lockdown_tab">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="label" translatable="yes">Lockdown</property>
++                          </object>
++                          <packing>
++                            <property name="position">7</property>
++                            <property name="tab_fill">False</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkLabel" id="init_label">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="xalign">0.20999999344348907</property>
++                            <property name="yalign">0.11999999731779099</property>
++                            <property name="label" translatable="yes">&lt;b&gt;...SELECT TO VIEW DATA...&lt;/b&gt;</property>
++                            <property name="use_markup">True</property>
++                          </object>
++                          <packing>
++                            <property name="position">8</property>
++                          </packing>
++                        </child>
++                        <child type="tab">
++                          <object class="GtkLabel" id="Blank_page">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="lines">0</property>
++                          </object>
++                          <packing>
++                            <property name="position">8</property>
++                            <property name="tab_fill">False</property>
 +                          </packing>
 +                        </child>
 +                      </object>
 +                      <packing>
 +                        <property name="expand">True</property>
 +                        <property name="fill">True</property>
++                        <property name="position">1</property>
++                      </packing>
++                    </child>
++                    <child>
++                      <object class="GtkBox" id="add_modify_delete_box">
++                        <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <child>
++                          <object class="GtkButton" id="Delete_button">
++                            <property name="label" translatable="yes">Delete</property>
++                            <property name="visible">True</property>
++                            <property name="sensitive">False</property>
++                            <property name="can_focus">True</property>
++                            <property name="receives_default">True</property>
++                            <signal name="clicked" handler="on_Delete_button_clicked" swapped="no"/>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
++                            <property name="pack_type">end</property>
++                            <property name="position">0</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkButton" id="Modify_button">
++                            <property name="label" translatable="yes">Modify</property>
++                            <property name="visible">True</property>
++                            <property name="can_focus">True</property>
++                            <property name="receives_default">True</property>
++                            <signal name="clicked" handler="on_Modify_button_clicked" swapped="no"/>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
++                            <property name="pack_type">end</property>
++                            <property name="position">1</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkButton" id="Add_button">
++                            <property name="label" translatable="yes">Add</property>
++                            <property name="visible">True</property>
++                            <property name="sensitive">False</property>
++                            <property name="can_focus">True</property>
++                            <property name="receives_default">True</property>
++                            <signal name="clicked" handler="on_Add_button_clicked" swapped="no"/>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
++                            <property name="pack_type">end</property>
++                            <property name="position">2</property>
++                          </packing>
++                        </child>
++                      </object>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
 +                        <property name="position">2</property>
 +                      </packing>
 +                    </child>
@@ -522036,13 +523914,26 @@ index 0000000..3ea562c
 +                  </packing>
 +                </child>
 +                <child>
-+                  <object class="GtkHBox" id="lower_box_applications">
++                  <object class="GtkSeparator" id="separator3">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                  </object>
++                  <packing>
++                    <property name="expand">True</property>
++                    <property name="fill">True</property>
++                    <property name="padding">4</property>
++                    <property name="position">2</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkBox" id="lower_box_applications">
 +                    <property name="visible">True</property>
 +                    <property name="can_focus">False</property>
 +                    <child>
 +                      <object class="GtkButton" id="Revert_button">
 +                        <property name="label" translatable="yes">Revert</property>
 +                        <property name="visible">True</property>
++                        <property name="sensitive">False</property>
 +                        <property name="can_focus">True</property>
 +                        <property name="receives_default">True</property>
 +                        <property name="tooltip_text" translatable="yes">Reset to system default</property>
@@ -522059,6 +523950,7 @@ index 0000000..3ea562c
 +                      <object class="GtkButton" id="Update_button">
 +                        <property name="label" translatable="yes">Update</property>
 +                        <property name="visible">True</property>
++                        <property name="sensitive">False</property>
 +                        <property name="can_focus">True</property>
 +                        <property name="receives_default">True</property>
 +                        <property name="tooltip_text" translatable="yes">Save your changes</property>
@@ -522075,7 +523967,7 @@ index 0000000..3ea562c
 +                  <packing>
 +                    <property name="expand">False</property>
 +                    <property name="fill">False</property>
-+                    <property name="position">2</property>
++                    <property name="position">3</property>
 +                  </packing>
 +                </child>
 +              </object>
@@ -522115,13 +524007,16 @@ index 0000000..3ea562c
 +    <property name="transient_for">SELinux_window</property>
 +    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
 +    <child>
-+      <object class="GtkVBox" id="vbox19">
++      <object class="GtkBox" id="vbox19">
 +        <property name="visible">True</property>
 +        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
 +        <child>
-+          <object class="GtkHBox" id="hbox20">
++          <object class="GtkBox" id="hbox20">
 +            <property name="visible">True</property>
 +            <property name="can_focus">False</property>
++            <property name="border_width">0</property>
++            <property name="orientation">vertical</property>
 +            <child>
 +              <object class="GtkEntry" id="advanced_filter_entry">
 +                <property name="width_request">210</property>
@@ -522148,7 +524043,6 @@ index 0000000..3ea562c
 +                <property name="xalign">0.5</property>
 +                <property name="active">True</property>
 +                <property name="draw_indicator">True</property>
-+                <property name="group">Installed_advanced_button</property>
 +                <signal name="toggled" handler="on_All_advanced_button_toggled" swapped="no"/>
 +              </object>
 +              <packing>
@@ -522293,9 +524187,10 @@ index 0000000..3ea562c
 +    <property name="transient_for">SELinux_window</property>
 +    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
 +    <child>
-+      <object class="GtkVBox" id="vbox8">
++      <object class="GtkBox" id="vbox8">
 +        <property name="visible">True</property>
 +        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
 +        <child>
 +          <object class="GtkLabel" id="label4">
 +            <property name="visible">True</property>
@@ -522382,12 +524277,13 @@ index 0000000..3ea562c
 +          </packing>
 +        </child>
 +        <child>
-+          <object class="GtkHBox" id="hbox13">
++          <object class="GtkBox" id="hbox13">
 +            <property name="visible">True</property>
 +            <property name="can_focus">False</property>
++            <property name="orientation">vertical</property>
 +            <child>
 +              <object class="GtkButton" id="save_delete_files">
-+                <property name="label" translatable="yes">Delete</property>
++                <property name="label" translatable="yes">Save to Update</property>
 +                <property name="visible">True</property>
 +                <property name="can_focus">True</property>
 +                <property name="receives_default">True</property>
@@ -522435,9 +524331,10 @@ index 0000000..3ea562c
 +    <property name="transient_for">SELinux_window</property>
 +    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
 +    <child>
-+      <object class="GtkVBox" id="vbox9">
++      <object class="GtkBox" id="vbox9">
 +        <property name="visible">True</property>
 +        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
 +        <child>
 +          <object class="GtkLabel" id="label5">
 +            <property name="visible">True</property>
@@ -522526,12 +524423,12 @@ index 0000000..3ea562c
 +          </packing>
 +        </child>
 +        <child>
-+          <object class="GtkHBox" id="hbox15">
++          <object class="GtkBox" id="hbox15">
 +            <property name="visible">True</property>
 +            <property name="can_focus">False</property>
 +            <child>
 +              <object class="GtkButton" id="save_delete_network">
-+                <property name="label" translatable="yes">Delete</property>
++                <property name="label" translatable="yes">Save to Update</property>
 +                <property name="visible">True</property>
 +                <property name="can_focus">True</property>
 +                <property name="receives_default">True</property>
@@ -522579,9 +524476,10 @@ index 0000000..3ea562c
 +    <property name="transient_for">SELinux_window</property>
 +    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
 +    <child>
-+      <object class="GtkVBox" id="vbox26">
++      <object class="GtkBox" id="vbox26">
 +        <property name="visible">True</property>
 +        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
 +        <child>
 +          <object class="GtkScrolledWindow" id="scrolledwindow12">
 +            <property name="visible">True</property>
@@ -522636,27 +524534,40 @@ index 0000000..3ea562c
 +    <property name="can_focus">False</property>
 +    <property name="modal">True</property>
 +    <property name="window_position">center-on-parent</property>
-+    <property name="default_width">600</property>
++    <property name="default_width">650</property>
 +    <property name="default_height">450</property>
 +    <property name="transient_for">SELinux_window</property>
 +    <signal name="delete-event" handler="gtk_widget_hide" swapped="no"/>
 +    <child>
-+      <object class="GtkVBox" id="vbox16">
++      <object class="GtkBox" id="vbox16">
 +        <property name="visible">True</property>
 +        <property name="can_focus">False</property>
++        <property name="orientation">vertical</property>
 +        <child>
-+          <object class="GtkLabel" id="label8">
++          <object class="GtkBox" id="box11">
 +            <property name="visible">True</property>
 +            <property name="can_focus">False</property>
-+            <property name="xalign">0</property>
-+            <property name="xpad">10</property>
-+            <property name="label" translatable="yes">Review the updates you have made before committing them to the system.  To reset an item, uncheck the checkbox.  All items checked will be updated in the system when you select update.</property>
-+            <property name="justify">fill</property>
-+            <property name="wrap">True</property>
++            <property name="orientation">vertical</property>
++            <child>
++              <object class="GtkLabel" id="label8">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="xalign">0</property>
++                <property name="xpad">10</property>
++                <property name="label" translatable="yes">Review the updates you have made before committing them to the system.  To reset an item, uncheck the checkbox.  All items checked will be updated in the system when you select update.</property>
++                <property name="justify">fill</property>
++                <property name="wrap">True</property>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
 +          </object>
 +          <packing>
 +            <property name="expand">False</property>
-+            <property name="fill">False</property>
++            <property name="fill">True</property>
 +            <property name="position">0</property>
 +          </packing>
 +        </child>
@@ -522672,7 +524583,7 @@ index 0000000..3ea562c
 +                <property name="model">Update_treestore</property>
 +                <property name="search_column">0</property>
 +                <child internal-child="selection">
-+                  <object class="GtkTreeSelection" id="treeview-selection14"/>
++                  <object class="GtkTreeSelection" id="treeview-selection16"/>
 +                </child>
 +                <child>
 +                  <object class="GtkTreeViewColumn" id="Select2">
@@ -522694,7 +524605,9 @@ index 0000000..3ea562c
 +                    <property name="title" translatable="yes">Description</property>
 +                    <property name="clickable">True</property>
 +                    <child>
-+                      <object class="GtkCellRendererText" id="cellrenderertext62"/>
++                      <object class="GtkCellRendererText" id="cellrenderertext62">
++                        <property name="wrap_mode">word</property>
++                      </object>
 +                      <attributes>
 +                        <attribute name="text">1</attribute>
 +                      </attributes>
@@ -523094,7 +525007,7 @@ index 5850622..5e308e3 100755
          if "child" in self.sdict[name]:
              for x in self.sdict[name]["child"]:
 diff --git a/policycoreutils/sepolicy/setup.py b/policycoreutils/sepolicy/setup.py
-index 1edb4fd..1edd6b2 100644
+index 1edb4fd..d8e2d64 100644
 --- a/policycoreutils/sepolicy/setup.py
 +++ b/policycoreutils/sepolicy/setup.py
 @@ -9,4 +9,4 @@ policy = Extension("sepolicy._policy",
@@ -523102,7 +525015,7 @@ index 1edb4fd..1edd6b2 100644
  )
  
 -setup(name = "sepolicy", version="1.1", description="Python SELinux Policy Analyses bindings", author="Daniel Walsh", author_email="dwalsh@redhat.com", ext_modules=[policy], packages=["sepolicy", "sepolicy.templates"])
-+setup(name = "sepolicy", version="1.1", description="Python SELinux Policy Analyses bindings", author="Daniel Walsh", author_email="dwalsh@redhat.com", ext_modules=[policy], packages=["sepolicy", "sepolicy.templates"], package_data={'sepolicy':['*.glade']})
++setup(name = "sepolicy", version="1.1", description="Python SELinux Policy Analyses bindings", author="Daniel Walsh", author_email="dwalsh@redhat.com", ext_modules=[policy], packages=["sepolicy", "sepolicy.templates", "sepolicy.help"], package_data={'sepolicy':['*.glade'], 'sepolicy.help': ['*.txt', '*.png']})
 diff --git a/policycoreutils/sepolicy/test_sepolicy.py b/policycoreutils/sepolicy/test_sepolicy.py
 new file mode 100644
 index 0000000..3e3725d
@@ -523587,18 +525500,19 @@ index 38abeb8..916a58c 100644
 -getsebool(8), booleans(8), togglesebool(8)
 +getsebool(8), booleans(8), togglesebool(8), semanage(8)
 diff --git a/policycoreutils/setsebool/setsebool.c b/policycoreutils/setsebool/setsebool.c
-index 86578f7..219e088 100644
+index 86578f7..3ef37a0 100644
 --- a/policycoreutils/setsebool/setsebool.c
 +++ b/policycoreutils/setsebool/setsebool.c
-@@ -10,6 +10,7 @@
+@@ -10,6 +10,8 @@
  #include <pwd.h>
  #include <selinux/selinux.h>
  #include <semanage/handle.h>
 +#include <semanage/debug.h>
++#include <semanage/booleans_policy.h>
  #include <semanage/booleans_local.h>
  #include <semanage/booleans_active.h>
  #include <semanage/boolean_record.h>
-@@ -17,13 +18,14 @@
+@@ -17,13 +19,14 @@
  
  int permanent = 0;
  int reload = 1;
@@ -523614,7 +525528,7 @@ index 86578f7..219e088 100644
  	     stderr);
  	exit(1);
  }
-@@ -41,7 +43,7 @@ int main(int argc, char **argv)
+@@ -41,7 +44,7 @@ int main(int argc, char **argv)
  	}
  
  	while (1) {
@@ -523623,7 +525537,7 @@ index 86578f7..219e088 100644
  		if (clflag == -1)
  			break;
  
-@@ -52,6 +54,9 @@ int main(int argc, char **argv)
+@@ -52,6 +55,9 @@ int main(int argc, char **argv)
  		case 'N':
  		        reload = 0;
  			break;
@@ -523633,7 +525547,15 @@ index 86578f7..219e088 100644
  		default:
  			usage();
  			break;
-@@ -130,6 +135,10 @@ static int semanage_set_boolean_list(size_t boolcnt,
+@@ -123,6 +129,7 @@ static int semanage_set_boolean_list(size_t boolcnt,
+ 	semanage_bool_t *boolean = NULL;
+ 	semanage_bool_key_t *bool_key = NULL;
+ 	int managed;
++	int result;
+ 
+ 	handle = semanage_handle_create();
+ 	if (handle == NULL) {
+@@ -130,6 +137,10 @@ static int semanage_set_boolean_list(size_t boolcnt,
  		goto err;
  	}
  
@@ -523644,7 +525566,25 @@ index 86578f7..219e088 100644
  	managed = semanage_is_managed(handle);
  	if (managed < 0) {
  		fprintf(stderr,
-@@ -172,7 +181,7 @@ static int semanage_set_boolean_list(size_t boolcnt,
+@@ -166,13 +177,25 @@ static int semanage_set_boolean_list(size_t boolcnt,
+ 
+ 		if (semanage_bool_key_extract(handle, boolean, &bool_key) < 0)
+ 			goto err;
++        
++		semanage_bool_exists(handle, bool_key, &result);
++		if ( !result ) {
++			fprintf(stderr, "Boolean %s is not defined\n", boollist[j].name);
++ 			goto err;
++		}
++
++		semanage_bool_exists_local(handle, bool_key, &result);
++		if ( !result ) {
++			fprintf(stderr, "Boolean %s is not defined\n", boollist[j].name);
++ 			goto err;
++		}
+ 
+ 		if (semanage_bool_modify_local(handle, bool_key,
+ 						  boolean) < 0)
  			goto err;
  
  		if (semanage_bool_set_active(handle, bool_key, boolean) < 0) {
@@ -523653,7 +525593,7 @@ index 86578f7..219e088 100644
  				boollist[j].name);
  			goto err;
  		}
-@@ -194,7 +203,6 @@ static int semanage_set_boolean_list(size_t boolcnt,
+@@ -194,7 +217,6 @@ static int semanage_set_boolean_list(size_t boolcnt,
  	semanage_bool_key_free(bool_key);
  	semanage_bool_free(boolean);
  	semanage_handle_destroy(handle);
diff --git a/policycoreutils.spec b/policycoreutils.spec
index f66f548..1df55d9 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.1.14
-Release: 75%{?dist}
+Release: 80%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # Based on git repository with tag 20101221
@@ -120,6 +120,8 @@ an SELinux environment.
 %dir %{python_sitearch}/sepolicy
 %{python_sitearch}/sepolicy/*so
 %{python_sitearch}/sepolicy/templates
+%{python_sitearch}/sepolicy/help
+%{python_sitearch}/sepolicy/help/*
 %{python_sitearch}/sepolicy/__init__.py*
 %{python_sitearch}/sepolicy/booleans.py*
 %{python_sitearch}/sepolicy/communicate.py*
@@ -141,7 +143,7 @@ an SELinux environment.
 %{_datadir}/system-config-selinux/selinux_server.py
 %{_datadir}/dbus-1/system-services/org.selinux.service
 %{_datadir}/polkit-1/actions/org.selinux.policy
-%{_datadir}/polkit-1/actions/org.fedoraproject.config.selinux.policy 
+%{_datadir}/polkit-1/actions/org.fedoraproject.config.selinux.policy
 %{_datadir}/bash-completion/completions/semanage
 %{_datadir}/bash-completion/completions/setsebool
 
@@ -230,7 +232,6 @@ system-config-selinux is a utility for managing the SELinux environment
 %{_datadir}/applications/selinux-polgengui.desktop
 %{_datadir}/icons/hicolor/24x24/apps/system-config-selinux.png
 %{_datadir}/pixmaps/system-config-selinux.png
-%{_datadir}/polkit-1/actions/org.selinux.policy
 %dir %{_datadir}/system-config-selinux
 %{_datadir}/system-config-selinux/system-config-selinux.png
 %{_datadir}/system-config-selinux/*.py*
@@ -335,7 +336,33 @@ The policycoreutils-restorecond package contains the restorecond service.
 %systemd_postun_with_restart restorecond.service
 
 %changelog
-* Wed Aug 7 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-75
+* Wed Sep 4 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-80
+- Random fixes for sepolicy gui
+  * Do not prompt for password until you make a change
+  * Add user mappings and selinux users page
+  * lots of code cleanup
+
+- Verify homedir is owned by user before mounting over it with seunshare
+- Fix fixfiles to handle Relabel properly
+- Fix semanage fcontext -e / command to allow "/"
+
+* Wed Sep 4 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-79
+- Add Miroslav Grepl setsebool patch to give better error message on bad boolean names
+- Additional help screens for sepolicy gui
+
+* Tue Sep 3 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-78
+- Random fixes for sepolicy gui
+- Update Translations
+
+* Fri Aug 30 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-77
+- Add help screens for each page
+- Fixes for system page
+
+* Mon Aug 26 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-76
+- Add Miroslav Grepl Patch to handle semanage -i and semanage -o better
+- Update Translations
+
+* Thu Aug 15 2013 Dan Walsh <dwalsh@redhat.com> - 2.1.14-75
 - Update sepolicy gui code, cleanups and add file transition tab
 - Fix semanage fcontext -a --ftype code to work.