From 668b67124fbc5a69372bb9177f1b90cfd7c9c77e Mon Sep 17 00:00:00 2001
From: Vit Mojzis <vmojzis@redhat.com>
Date: Aug 29 2017 11:22:44 +0000
Subject: [PATCH 1/4] plugins: correct grammatical errors


compromized -> compromised
tries modify -> tries to modify
Use of commas and indefinite articles.

Fixes:
   https://bugzilla.redhat.com/show_bug.cgi?id=1331780

Signed-off-by: Vit Mojzis <vmojzis@redhat.com>

(cherry picked from commit f6731b74e9341f929ff685cfe590fa1d93556bd3)

---

diff --git a/plugins/src/connect_ports.py b/plugins/src/connect_ports.py
index ad2a2d2..d9e7a8f 100644
--- a/plugins/src/connect_ports.py
+++ b/plugins/src/connect_ports.py
@@ -32,7 +32,7 @@ class plugin(Plugin):
     SELinux has denied $SOURCE from connecting to a network port $PORT_NUMBER which does not have an SELinux type associated with it.
     If $SOURCE should be allowed to connect on $PORT_NUMBER, use the <i>semanage</i> command to assign $PORT_NUMBER to a port type that $SOURCE_TYPE can connect to (%s).
     \n\nIf $SOURCE is not supposed
-    to connect to $PORT_NUMBER, this could signal a intrusion attempt.
+    to connect to $PORT_NUMBER, this could signal an intrusion attempt.
     ''')
 
     fix_description = _('''
diff --git a/plugins/src/httpd_can_sendmail.py b/plugins/src/httpd_can_sendmail.py
index 7cb9aeb..f4c5939 100644
--- a/plugins/src/httpd_can_sendmail.py
+++ b/plugins/src/httpd_can_sendmail.py
@@ -33,7 +33,7 @@ class plugin(Plugin):
     SELinux has denied the http daemon from sending mail. An
     httpd script is trying to connect to a mail port or execute the
     sendmail command. If you did not setup httpd to sendmail, this could
-    signal a intrusion attempt.
+    signal an intrusion attempt.
     ''')
 
     fix_description = _('''
diff --git a/plugins/src/mmap_zero.py b/plugins/src/mmap_zero.py
index fe3ee29..7f306c0 100644
--- a/plugins/src/mmap_zero.py
+++ b/plugins/src/mmap_zero.py
@@ -32,11 +32,11 @@ class plugin(Plugin):
 
     problem_description = _('''
     SELinux has denied the $SOURCE the ability to mmap low area of the kernel 
-    address space.  The ability to mmap a low area of the address space, as 
+    address space.  The ability to mmap a low area of the address space is 
     configured by /proc/sys/kernel/mmap_min_addr.  Preventing such mappings 
     helps protect against exploiting null deref bugs in the kernel. All 
     applications that need this access should have already had policy written 
-    for them.  If a compromised application tries modify the kernel this AVC 
+    for them.  If a compromised application tries to modify the kernel, this AVC 
     would be generated. This is a serious issue. Your system may very well be 
     compromised.
     ''')
diff --git a/plugins/src/openvpn.py b/plugins/src/openvpn.py
index 5efa25b..73a7fb8 100644
--- a/plugins/src/openvpn.py
+++ b/plugins/src/openvpn.py
@@ -34,13 +34,14 @@ class plugin(Plugin):
 
     problem_description = _('''
     SELinux denied access requested by $SOURCE. $TARGET_PATH may
-    be a mislabeled. openvpn is allowed to read content in home directory if it
+    be mislabeled. openvpn is allowed to read content in home directory if it
     is labeled correctly.
     ''')
 
     fix_description = _('''
     You can restore the default system context to this file by executing the
-    restorecon command.  restorecon restore using restorecon -R /root/.ssh.
+    restorecon command.  
+    # restorecon -R /root/.ssh
     ''')
 
     def get_if_text(self, avc, args):
diff --git a/plugins/src/restorecon.py b/plugins/src/restorecon.py
index cdc7b8d..2c6c2a7 100644
--- a/plugins/src/restorecon.py
+++ b/plugins/src/restorecon.py
@@ -63,9 +63,9 @@ class plugin(Plugin):
     def get_problem_description(self, avc, args):
         return _('''
     SELinux denied access requested by $SOURCE. $TARGET_PATH may
-    be a mislabeled.  $TARGET_PATH default SELinux type is
+    be mislabeled.  $TARGET_PATH default SELinux type is
     <B>%s</B>, but its current type is <B>$TARGET_TYPE</B>. Changing
-    this file back to the default type, may fix your problem.
+    this file back to the default type may fix your problem.
     <p>
     File contexts can be assigned to a file in the following ways.
     <ul>
diff --git a/plugins/src/restorecon_source.py b/plugins/src/restorecon_source.py
index 3313bdb..1bc071a 100644
--- a/plugins/src/restorecon_source.py
+++ b/plugins/src/restorecon_source.py
@@ -44,9 +44,9 @@ class plugin(Plugin):
     def get_problem_description(self, avc, args):
         return _('''
     SELinux denied access requested by $SOURCE. $SOURCE_PATH may
-    be a mislabeled.  $SOURCE_PATH default SELinux type is
+    be mislabeled.  $SOURCE_PATH default SELinux type is
     <B>%s</B>, but its current type is <B>$SOURCE_TYPE</B>. Changing
-    this file back to the default type, may fix your problem.
+    this file back to the default type may fix your problem.
     <p>
     This file could have been mislabeled either by user error, or if an normally confined application
     was run under the wrong domain.
diff --git a/plugins/src/rsync_data.py b/plugins/src/rsync_data.py
index ef1f596..2679bc7 100644
--- a/plugins/src/rsync_data.py
+++ b/plugins/src/rsync_data.py
@@ -29,10 +29,10 @@ class plugin(Plugin):
     ''')
 
     problem_description = _('''
-    SELinux denied rsync access to $TARGET_PATH.
-    If this is a RSYNC repository it has to have a file context label of
-    rsync_data_t. If you did not intend to use $TARGET_PATH as a rsync repository
-    it could indicate either a bug or it could signal a intrusion attempt.
+    SELinux denied RSYNC access to $TARGET_PATH.
+    If this is an RSYNC repository, it has to have a file context label of
+    rsync_data_t. If you did not intend to use $TARGET_PATH as an RSYNC repository,
+    this message could indicate either a bug or an intrusion attempt.
     ''')
 
     fix_description = _('''
@@ -42,7 +42,7 @@ class plugin(Plugin):
 
     fix_cmd = "chcon -R -t rsync_data_t '$TARGET_PATH'"
 
-    if_text = _("$TARGET_BASE_PATH should be shared via the rsync daemon")
+    if_text = _("$TARGET_BASE_PATH should be shared via the RSYNC daemon")
     then_text = _("You need to change the label on $TARGET_BASE_PATH")
     do_text = """# semanage fcontext -a -t rsync_data_t '$FIX_TARGET_PATH'
 # restorecon -v '$FIX_TARGET_PATH'"""
diff --git a/plugins/src/samba_share.py b/plugins/src/samba_share.py
index 23ab0b1..8699fac 100644
--- a/plugins/src/samba_share.py
+++ b/plugins/src/samba_share.py
@@ -31,8 +31,8 @@ class plugin(Plugin):
     problem_description = _('''
     SELinux denied samba access to $TARGET_PATH.
     If you want to share this directory with samba it has to have a file context label of
-    samba_share_t. If you did not intend to use $TARGET_PATH as a samba repository
-    it could indicate either a bug or it could signal a intrusion attempt.
+    samba_share_t. If you did not intend to use $TARGET_PATH as a samba repository,
+    this message could indicate either a bug or an intrusion attempt.
     Please refer to 'man samba_selinux' for more information on setting up Samba and SELinux.
     ''')
 
diff --git a/plugins/src/sandbox_connect.py b/plugins/src/sandbox_connect.py
index efbe2ab..f9a7951 100644
--- a/plugins/src/sandbox_connect.py
+++ b/plugins/src/sandbox_connect.py
@@ -32,9 +32,10 @@ class plugin(Plugin):
 
     problem_description = _('''
     SELinux has denied $SOURCE from connecting to a network port $PORT_NUMBER within a sandbox.
-    If $SOURCE should be allowed to connect on $PORT_NUMBER, you need to use a different sandbox type like sandbox_web_t or sandbox_net_t.  sandbox -X -t sandbox_net_t $SOURCE.
+    If $SOURCE should be allowed to connect on $PORT_NUMBER, you need to use a different sandbox type like sandbox_web_t or sandbox_net_t.  
+    # sandbox -X -t sandbox_net_t $SOURCE
     \n\nIf $SOURCE is not supposed
-    to connect to $PORT_NUMBER, this could signal a intrusion attempt.
+    to connect to $PORT_NUMBER, this could signal an intrusion attempt.
     ''')
 
     fix_description = _('''
diff --git a/plugins/src/sshd_root.py b/plugins/src/sshd_root.py
index 326b405..96f4c7c 100644
--- a/plugins/src/sshd_root.py
+++ b/plugins/src/sshd_root.py
@@ -35,13 +35,14 @@ class plugin(Plugin):
 
     problem_description = _('''
     SELinux denied access requested by $SOURCE. $TARGET_PATH may
-    be a mislabeled. sshd is allowed to read content in /root/.ssh directory if it
+    be mislabeled. sshd is allowed to read content in /root/.ssh directory if it
     is labeled correctly.
     ''')
 
     fix_description = _('''
     You can restore the default system context to this file by executing the
-    restorecon command.  restorecon restore using restorecon -R /root/.ssh.
+    restorecon command.
+    # restorecon -R /root/.ssh
     ''')
 
     then_text = _('you must fix the labels.')
diff --git a/plugins/src/swapfile.py b/plugins/src/swapfile.py
index 0297d11..c1a4deb 100644
--- a/plugins/src/swapfile.py
+++ b/plugins/src/swapfile.py
@@ -30,10 +30,9 @@ class plugin(Plugin):
 
     problem_description = _('''
     SELinux denied $SOURCE access to $TARGET_PATH.
-    If this is a swapfile it has to have a file context label of
+    If this is a swapfile, it has to have a file context label of
     swapfile_t. If you did not intend to use
-    $TARGET_PATH as a swapfile it probably indicates a bug, however it could also
-    signal a intrusion attempt.
+    $TARGET_PATH as a swapfile, this message could indicate either a bug or an intrusion attempt.
     ''')
 
     fix_description = _('''

From 99c85e991195fd5f5927e65643c8e02d3530c8a7 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Aug 29 2017 11:46:59 +0000
Subject: [PATCH 2/4] Do not split If sentences to framework and plugins


According to
https://wiki.gnome.org/TranslationProject/DevGuidelines/Never%20split%20sentences
sentences should not be split into parts.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1177347

(cherry picked from commit 98c2ad7c16be9b79f880964b3ccfbfbc5bb4ed58)

---

diff --git a/framework/src/setroubleshoot/browser.py b/framework/src/setroubleshoot/browser.py
index 9fb4c7d..4687aae 100644
--- a/framework/src/setroubleshoot/browser.py
+++ b/framework/src/setroubleshoot/browser.py
@@ -410,7 +410,7 @@ class BrowserApplet:
 
     def add_row(self, plugin, alert, args):
         avc = alert.audit_event.records
-        if_text = _("If ") + alert.substitute(plugin.get_if_text(avc, args))
+        if_text = alert.substitute(plugin.get_if_text(avc, args))
         then_text = alert.substitute(plugin.get_then_text(avc, args))
         then_text += "\n" + alert.substitute(plugin.get_do_text(avc, args))
 
@@ -546,7 +546,7 @@ class BrowserApplet:
            for i in plugin.get_problem_description(avc, args).split("\n"):
                msg += alert.substitute(i.strip()) + "\n"
            message += html_to_text(msg) + "\n\n"
-           message += alert.substitute(_("If ") + plugin.get_if_text(avc, args)) + "\n"
+           message += alert.substitute(plugin.get_if_text(avc, args)) + "\n"
            message += alert.substitute(plugin.get_then_text(avc, args)) + "\n"
            message += alert.substitute(plugin.get_do_text(avc, args)) + "\n"
 #           message += alert.substitute(alert.format_details()) + "\n"
diff --git a/framework/src/setroubleshoot/server.py b/framework/src/setroubleshoot/server.py
index 53a9ef4..71a9f2b 100755
--- a/framework/src/setroubleshoot/server.py
+++ b/framework/src/setroubleshoot/server.py
@@ -575,7 +575,7 @@ Return an alert with summary, audit events, fix suggestions
         plugins = []
         for plugin, args in alert_plugins:
             plugins.append((
-                _("If ") + alert.substitute(plugin.get_if_text(avc, args)),
+                alert.substitute(plugin.get_if_text(avc, args)),
                 alert.substitute(plugin.get_then_text(avc, args)),
                 alert.substitute(plugin.get_do_text(avc, args)),
                 plugin.analysis_id,
diff --git a/plugins/src/allow_anon_write.py b/plugins/src/allow_anon_write.py
index 3f98ddf..142ebd2 100644
--- a/plugins/src/allow_anon_write.py
+++ b/plugins/src/allow_anon_write.py
@@ -41,7 +41,7 @@ class plugin(Plugin):
     "setsebool -P $BOOLEAN=1; chcon -t public_content_rw_t <path>"
     You must also change the default file context labeling files on the system in order to preserve public directory labeling even on a full relabel.  "semanage fcontext -a -t public_content_rw_t <path>"
     ''')
-    if_text = _("you want to allow $SOURCE_PATH to be able to write to shared public content")
+    if_text = _("If you want to allow $SOURCE_PATH to be able to write to shared public content")
     then_text = _("you need to change the label on $TARGET_PATH to public_content_rw_t, and potentially turn on the allow_httpd_sys_script_anon_write boolean.")
 
     def get_do_text(self, avc, args):
diff --git a/plugins/src/allow_execheap.py b/plugins/src/allow_execheap.py
index f6f9cf5..361f28d 100644
--- a/plugins/src/allow_execheap.py
+++ b/plugins/src/allow_execheap.py
@@ -47,7 +47,7 @@ class plugin(Plugin):
     on the system.
     ''')
 
-    if_text = _("you do not think $SOURCE_PATH should need to map heap memory that is both writable and executable.")
+    if_text = _("If you do not think $SOURCE_PATH should need to map heap memory that is both writable and executable.")
     then_text = _("you need to report a bug. This is a potentially dangerous access.")
     do_text = _("Contact your security administrator and report this issue.")
 
diff --git a/plugins/src/allow_execstack.py b/plugins/src/allow_execstack.py
index 5e8f5f9..e6175bd 100644
--- a/plugins/src/allow_execstack.py
+++ b/plugins/src/allow_execstack.py
@@ -86,7 +86,7 @@ file a bug report.
 
     fix_cmd = ""
 
-    if_text = _("you do not think $SOURCE_PATH should need to map stack memory that is both writable and executable.")
+    if_text = _("If you do not think $SOURCE_PATH should need to map stack memory that is both writable and executable.")
     then_text = _("you need to report a bug. \nThis is a potentially dangerous access.")
     do_text = _("Contact your security administrator and report this issue.")
 
@@ -96,7 +96,7 @@ file a bug report.
             if not path:
                 return self.if_text
 
-            return _("you believe that \n%s\nshould not require execstack") % path
+            return _("If you believe that \n%s\nshould not require execstack") % path
         except:
             return self.if_text
 
diff --git a/plugins/src/allow_ftpd_use_cifs.py b/plugins/src/allow_ftpd_use_cifs.py
index 488179f..0114197 100644
--- a/plugins/src/allow_ftpd_use_cifs.py
+++ b/plugins/src/allow_ftpd_use_cifs.py
@@ -59,7 +59,7 @@ class plugin(Plugin):
     files and directories on CIFS filesystems.  ''')
 
     rw_fix_cmd = 'setsebool -P $BOOLEAN=1 $WRITE_BOOLEAN=1'
-    if_text = _("you want to allow ftpd to write to cifs file systems")
+    if_text = _("If you want to allow ftpd to write to cifs file systems")
     then_text = _("you must tell SELinux about this")
     do_text = '# setsebool -P allow_ftpd_use_cifs=1 allow_ftpd_anon_write=1'
 
diff --git a/plugins/src/allow_ftpd_use_nfs.py b/plugins/src/allow_ftpd_use_nfs.py
index adb8f3f..515d040 100644
--- a/plugins/src/allow_ftpd_use_nfs.py
+++ b/plugins/src/allow_ftpd_use_nfs.py
@@ -61,7 +61,7 @@ class plugin(Plugin):
 
     rw_fix_cmd = 'setsebool -P allow_ftpd_use_nfs=1 $WRITE_BOOLEAN=1'
 
-    if_text = _("you want to allow ftpd to write to nfs file systems")
+    if_text = _("If you want to allow ftpd to write to nfs file systems")
     then_text = _("you must tell SELinux about this")
     do_text = 'setsebool -P allow_ftpd_use_nfs=1 allow_ftpd_anon_write=1'
 
diff --git a/plugins/src/associate.py b/plugins/src/associate.py
index 3138c31..95ae23a 100644
--- a/plugins/src/associate.py
+++ b/plugins/src/associate.py
@@ -41,7 +41,7 @@ seinfo -afile_type -x
 
     ''') % args[1]
 
-    if_text = _('you want to change the label of $TARGET_PATH to %s, you are not allowed to since it is not a valid file type.')
+    if_text = _("If you want to change the label of $TARGET_PATH to %s, you are not allowed to since it is not a valid file type.")
 
     def get_if_text(self, avc, args):
         return self.if_text % args[1]
diff --git a/plugins/src/bind_ports.py b/plugins/src/bind_ports.py
index 953d918..c2bb79e 100644
--- a/plugins/src/bind_ports.py
+++ b/plugins/src/bind_ports.py
@@ -44,7 +44,7 @@ class plugin(Plugin):
     ''')
 
     fix_cmd = ''
-    if_text = 'you want to allow $SOURCE_PATH to bind to network port $PORT_NUMBER'
+    if_text = _('If you want to allow $SOURCE_PATH to bind to network port $PORT_NUMBER')
     then_text = 'you need to modify the port type.'
 
     def get_do_text(self, avc, options):
diff --git a/plugins/src/catchall.py b/plugins/src/catchall.py
index 587722f..f81c4ab 100644
--- a/plugins/src/catchall.py
+++ b/plugins/src/catchall.py
@@ -47,10 +47,10 @@ class plugin(Plugin):
 
     def get_if_text(self, avc, args):
         if args[1] == "process":
-            return _('you believe that $SOURCE_BASE_PATH should be allowed $ACCESS access on processes labeled $TARGET_TYPE by default.')
+            return _('If you believe that $SOURCE_BASE_PATH should be allowed $ACCESS access on processes labeled $TARGET_TYPE by default.')
         if args[1] in ["capability", "capability2"]:
-            return _('you believe that $SOURCE_BASE_PATH should have the $ACCESS capability by default.')
-        return _('you believe that $SOURCE_BASE_PATH should be allowed $ACCESS access on the $TARGET_BASE_PATH $TARGET_CLASS by default.')
+            return _('If you believe that $SOURCE_BASE_PATH should have the $ACCESS capability by default.')
+        return _('If you believe that $SOURCE_BASE_PATH should be allowed $ACCESS access on the $TARGET_BASE_PATH $TARGET_CLASS by default.')
 
     then_text = _('You should report this as a bug.\nYou can generate a local policy module to allow this access.')
     do_text = _("""Allow this access for now by executing:
diff --git a/plugins/src/catchall_boolean.py b/plugins/src/catchall_boolean.py
index 9733f9d..193027e 100644
--- a/plugins/src/catchall_boolean.py
+++ b/plugins/src/catchall_boolean.py
@@ -59,7 +59,7 @@ class plugin(Plugin):
         txt=seobject.boolean_desc(args[0])
         if not isinstance(txt, unicode):
             txt=unicode(txt, encoding="utf8")
-        return _("you want to %s") % (txt[0].lower() + txt[1:])
+        return _("If you want to %s") % (txt[0].lower() + txt[1:])
 
     def get_do_text(self, avc, args):
         return _("setsebool -P %s %s") % (args[0], args[1])
diff --git a/plugins/src/chrome.py b/plugins/src/chrome.py
index 81b68d8..50202ea 100644
--- a/plugins/src/chrome.py
+++ b/plugins/src/chrome.py
@@ -35,7 +35,7 @@ class plugin(Plugin):
     fix_description = _('''
 Either remove the mozplugger or spice-xpi package by executing 'yum remove mozplugger spice-xpi', or turn off enforcement of SELinux over the Chrome plugins. setsebool -P unconfined_chrome_sandbox_transition 0
     ''')
-    if_text = _("you want to use the %s package")
+    if_text = _("If you want to use the %s package")
 
     def get_if_text(self, avc, args):
         return self.if_text % args[0]
diff --git a/plugins/src/connect_ports.py b/plugins/src/connect_ports.py
index d9e7a8f..bedcb21 100644
--- a/plugins/src/connect_ports.py
+++ b/plugins/src/connect_ports.py
@@ -42,7 +42,7 @@ class plugin(Plugin):
     ''')
 
     fix_cmd = ''
-    if_text = 'you want to allow $SOURCE_PATH to connect to network port $PORT_NUMBER'
+    if_text = _('If you want to allow $SOURCE_PATH to connect to network port $PORT_NUMBER')
     then_text = 'you need to modify the port type.'
 
     def get_do_text(self, avc, options):
diff --git a/plugins/src/cvs_data.py b/plugins/src/cvs_data.py
index fc58ab8..bb68a28 100644
--- a/plugins/src/cvs_data.py
+++ b/plugins/src/cvs_data.py
@@ -41,7 +41,7 @@ class plugin(Plugin):
     
     ''')
 
-    if_text = _("$TARGET_BASE_PATH should be shared via the cvs daemon")
+    if_text = _("If $TARGET_BASE_PATH should be shared via the cvs daemon")
     then_text = _("You need to change the label on $TARGET_BASE_PATH'")
     do_text = """# semanage fcontext -a -t cvs_data_t '$FIX_TARGET_PATH'
 # restorecon -v '$FIX_TARGET_PATH'"""
diff --git a/plugins/src/dac_override.py b/plugins/src/dac_override.py
index 69be191..e5aedc4 100644
--- a/plugins/src/dac_override.py
+++ b/plugins/src/dac_override.py
@@ -35,7 +35,7 @@ class plugin(Plugin):
 
     fix_description = ""
     fix_cmd = ""
-    if_text = _("you want to help identify if domain needs this access or you have a file with the wrong permissions on your system")
+    if_text = _("If you want to help identify if domain needs this access or you have a file with the wrong permissions on your system")
     then_text = _("turn on full auditing to get path information about the offending file and generate the error again.")
     do_text = _("""
 Turn on full auditing
diff --git a/plugins/src/disable_ipv6.py b/plugins/src/disable_ipv6.py
index 339d682..802bab1 100644
--- a/plugins/src/disable_ipv6.py
+++ b/plugins/src/disable_ipv6.py
@@ -37,7 +37,7 @@ Disable IPV6 properly.
 
     fix_cmd = ""
 
-    if_text = _("you want to disable IPV6 on this machine")
+    if_text = _("If you want to disable IPV6 on this machine")
     then_text = _("you need to set /proc/sys/net/ipv6/conf/all/disable_ipv6 to 1 and do not blacklist the module'")
     do_text = _("""Add 
 net.ipv6.conf.all.disable_ipv6 = 1
diff --git a/plugins/src/file.py b/plugins/src/file.py
index 558a9d6..9bcfe80 100644
--- a/plugins/src/file.py
+++ b/plugins/src/file.py
@@ -46,9 +46,9 @@ home directory from a previous installation that did not use SELinux, 'restoreco
 
     def get_if_text(self, avc, args):
         if args == (1,0):
-            return _('this is caused by a newly created file system.')
+            return _('This is caused by a newly created file system.')
         else:
-            return _('you think this is caused by a badly mislabeled machine.')
+            return _('If you think this is caused by a badly mislabeled machine.')
 
     def get_then_text(self, avc, args):
         if args == (1,0):
diff --git a/plugins/src/filesystem_associate.py b/plugins/src/filesystem_associate.py
index cfa291d..e177e9c 100644
--- a/plugins/src/filesystem_associate.py
+++ b/plugins/src/filesystem_associate.py
@@ -40,7 +40,7 @@ class plugin(Plugin):
     fix_description = _('''
     Use a command like "cp -p" to preserve all permissions except SELinux context.
     ''')
-    if_text = _("you believe $SOURCE_BASE_PATH should be allowed to create $TARGET_BASE_PATH files")
+    if_text = _("If you believe $SOURCE_BASE_PATH should be allowed to create $TARGET_BASE_PATH files")
     then_text = _("you need to use a different command. You are not allowed to preserve the SELinux context on the target file system.")
 
     do_text = _('use a command like "cp -p" to preserve all permissions except SELinux context.')
diff --git a/plugins/src/httpd_can_sendmail.py b/plugins/src/httpd_can_sendmail.py
index f4c5939..5b8852f 100644
--- a/plugins/src/httpd_can_sendmail.py
+++ b/plugins/src/httpd_can_sendmail.py
@@ -44,7 +44,7 @@ class plugin(Plugin):
 
     fix_cmd = 'setsebool -P $BOOLEAN=1'
 
-    if_text = _("you want to allow httpd to send mail")
+    if_text = _("If you want to allow httpd to send mail")
     then_text = _("you must setup SELinux to allow this")
     do_text = 'setsebool -P httpd_can_sendmail=1'
 
diff --git a/plugins/src/httpd_unified.py b/plugins/src/httpd_unified.py
index e2eca88..7a3dc72 100644
--- a/plugins/src/httpd_unified.py
+++ b/plugins/src/httpd_unified.py
@@ -54,7 +54,7 @@ class plugin(Plugin):
 
     fix_cmd = 'setsebool -P $BOOLEAN=1'
 
-    if_text = _("you want to allow httpd to execute cgi scripts and to unify HTTPD handling of all content files.")
+    if_text = _("If you want to allow httpd to execute cgi scripts and to unify HTTPD handling of all content files.")
     then_text = _("you must tell SELinux about this by enabling the 'httpd_unified' and 'http_enable_cgi' booleans")
     do_text = "# setsebool -P httpd_unified=1 httpd_enable_cgi=1"
 
diff --git a/plugins/src/kernel_modules.py b/plugins/src/kernel_modules.py
index 78661a4..17816d3 100644
--- a/plugins/src/kernel_modules.py
+++ b/plugins/src/kernel_modules.py
@@ -41,7 +41,7 @@ class plugin(Plugin):
 
     fix_description = "Contact your security administrator and report this issue."
     fix_cmd = ""
-    if_text = _("you do not think $SOURCE_BASE_PATH should try $ACCESS access on $TARGET_BASE_PATH.")
+    if_text = _("If you do not think $SOURCE_BASE_PATH should try $ACCESS access on $TARGET_BASE_PATH.")
     then_text = _("you may be under attack by a hacker, since confined applications should not need this access.")
     do_text = _("Contact your security administrator and report this issue.")
 
diff --git a/plugins/src/leaks.py b/plugins/src/leaks.py
index c6c16c2..7013608 100644
--- a/plugins/src/leaks.py
+++ b/plugins/src/leaks.py
@@ -39,7 +39,7 @@ class plugin(Plugin):
 
     fix_cmd = ""
 
-    if_text = _('you want to ignore $SOURCE_BASE_PATH trying to $ACCESS access the $TARGET_BASE_PATH $TARGET_CLASS, because you believe it should not need this access.')
+    if_text = _("If you want to ignore $SOURCE_BASE_PATH trying to $ACCESS access the $TARGET_BASE_PATH $TARGET_CLASS, because you believe it should not need this access.")
     then_text = _('You should report this as a bug.  \nYou can generate a local policy module to dontaudit this access.')
     do_text = _("""# ausearch -x $SOURCE_PATH --raw | audit2allow -D -M my-$SOURCE
 # semodule -i my-$SOURCE.pp""")
diff --git a/plugins/src/mmap_zero.py b/plugins/src/mmap_zero.py
index 7f306c0..f3828b2 100644
--- a/plugins/src/mmap_zero.py
+++ b/plugins/src/mmap_zero.py
@@ -43,7 +43,7 @@ class plugin(Plugin):
 
     fix_description = ("Contact your security administrator and report this issue.")
     fix_cmd = ""
-    if_text = _("you do not think $SOURCE_PATH should need to mmap low memory in the kernel.")
+    if_text = _("If you do not think $SOURCE_PATH should need to mmap low memory in the kernel.")
     then_text = _("you may be under attack by a hacker, this is a very dangerous access.")
     do_text = _("Contact your security administrator and report this issue.")
     def __init__(self):
diff --git a/plugins/src/mounton.py b/plugins/src/mounton.py
index 9d148f5..da183df 100644
--- a/plugins/src/mounton.py
+++ b/plugins/src/mounton.py
@@ -45,7 +45,7 @@ class plugin(Plugin):
     "chcon -t mnt_t '$TARGET_PATH'."
     You must also change the default file context files on the system in order to preserve them even on a full relabel.  "semanage fcontext -a -t mnt_t '$FIX_TARGET_PATH'"
     ''')
-    if_text = _("you want to allow $SOURCE_BASE_PATH to mount on $TARGET_BASE_PATH.")
+    if_text = _("If you want to allow $SOURCE_BASE_PATH to mount on $TARGET_BASE_PATH.")
     then_text = _("you must change the labeling on $TARGET_PATH.")
     do_text = """# semanage fcontext -a -t mnt_t '$FIX_TARGET_PATH'
 # restorecon -v $TARGET_PATH"""
diff --git a/plugins/src/mozplugger.py b/plugins/src/mozplugger.py
index 6859b0e..b5705df 100644
--- a/plugins/src/mozplugger.py
+++ b/plugins/src/mozplugger.py
@@ -35,7 +35,7 @@ class plugin(Plugin):
     fix_description = _('''
 Either remove the mozplugger or spice-xpi package by executing 'yum remove mozplugger spice-xpi' or turn off enforcement of SELinux over the Firefox plugins. setsebool -P unconfined_mozilla_plugin_transition 0
     ''')
-    if_text = _("you want to use the %s package")
+    if_text = _("If you want to use the %s package")
 
     def get_if_text(self, avc, args):
         return self.if_text % args[0]
diff --git a/plugins/src/mozplugger_remove.py b/plugins/src/mozplugger_remove.py
index fbb906f..d44c339 100644
--- a/plugins/src/mozplugger_remove.py
+++ b/plugins/src/mozplugger_remove.py
@@ -41,7 +41,7 @@ Either remove the mozplluger package by executing 'yum remove mozplugger'
 Or turn off enforcement of SELinux over the Firefox plugins.
 setsebool -P unconfined_mozilla_plugin_transition 0
     ''')
-    if_text = _("you want to to continue using SELinux Firefox plugin containment rather then using mozplugger package")
+    if_text = _("If you want to to continue using SELinux Firefox plugin containment rather then using mozplugger package")
     then_text = _("you must remove the mozplugger package.")
     do_text = """# yum remove mozplugger"""
 
diff --git a/plugins/src/openvpn.py b/plugins/src/openvpn.py
index 73a7fb8..82e20ae 100644
--- a/plugins/src/openvpn.py
+++ b/plugins/src/openvpn.py
@@ -46,9 +46,9 @@ class plugin(Plugin):
 
     def get_if_text(self, avc, args):
         if (args[0] == "move"):
-            return _('you want to mv $TARGET_BASE_PATH to standard location so that $SOURCE_BASE_PATH can have $ACCESS access')
+            return _('If you want to mv $TARGET_BASE_PATH to standard location so that $SOURCE_BASE_PATH can have $ACCESS access')
         else:
-            return _('you want to modify the label on $TARGET_BASE_PATH so that $SOURCE_BASE_PATH can have $ACCESS access on it')
+            return _('If you want to modify the label on $TARGET_BASE_PATH so that $SOURCE_BASE_PATH can have $ACCESS access on it')
 
     def get_then_text(self, avc, args):
         if (args[0] == "move"):
diff --git a/plugins/src/public_content.py b/plugins/src/public_content.py
index 5f3ccf1..ffe312e 100644
--- a/plugins/src/public_content.py
+++ b/plugins/src/public_content.py
@@ -47,7 +47,7 @@ class plugin(Plugin):
         Plugin.__init__(self, __name__)
         self.set_priority(8)
 
-    if_text=_("you want to treat $TARGET_BASE_PATH as public content")
+    if_text = _("If you want to treat $TARGET_BASE_PATH as public content")
     then_text = _("You need to change the label on $TARGET_BASE_PATH to public_content_t or public_content_rw_t.")
     do_text = """# semanage fcontext -a -t public_content_t '$FIX_TARGET_PATH'
 # restorecon -v '$FIX_TARGET_PATH'"""
diff --git a/plugins/src/qemu_file_image.py b/plugins/src/qemu_file_image.py
index d85f0c4..7ae716d 100644
--- a/plugins/src/qemu_file_image.py
+++ b/plugins/src/qemu_file_image.py
@@ -45,7 +45,7 @@ class plugin(Plugin):
 
     fix_cmd = "chcon -t virt_image_t '$TARGET_PATH'"
 
-    if_text = _("$TARGET_BASE_PATH is a virtualization target")
+    if_text = _("If $TARGET_BASE_PATH is a virtualization target")
     then_text = _("You need to change the label on $TARGET_BASE_PATH'")
     do_text = """# semanage fcontext -a -t virt_image_t '$FIX_TARGET_PATH'
 # restorecon -v '$FIX_TARGET_PATH'"""
diff --git a/plugins/src/restorecon.py b/plugins/src/restorecon.py
index 2c6c2a7..fdff5b0 100644
--- a/plugins/src/restorecon.py
+++ b/plugins/src/restorecon.py
@@ -87,7 +87,7 @@ class plugin(Plugin):
     If you believe this is a bug, please file a bug report against this package.
     ''') % args[1]
 
-    if_text = _('you want to fix the label. \n$TARGET_PATH default label should be %s.')
+    if_text = _("If you want to fix the label. \n$TARGET_PATH default label should be %s.")
 
     def get_if_text(self, avc, args):
         return self.if_text % args[1]
diff --git a/plugins/src/restorecon_source.py b/plugins/src/restorecon_source.py
index 1bc071a..2067432 100644
--- a/plugins/src/restorecon_source.py
+++ b/plugins/src/restorecon_source.py
@@ -57,7 +57,7 @@ class plugin(Plugin):
     If you believe this is a bug, please file a bug report against this package.
     ''') % args[1]
 
-    if_text = _('you want to fix the label. \n$SOURCE_PATH default label should be %s.')
+    if_text = _("If you want to fix the label. \n$SOURCE_PATH default label should be %s.")
 
     def get_if_text(self, avc, args):
         return self.if_text % args[1]
diff --git a/plugins/src/rsync_data.py b/plugins/src/rsync_data.py
index 2679bc7..d9afaf6 100644
--- a/plugins/src/rsync_data.py
+++ b/plugins/src/rsync_data.py
@@ -42,7 +42,7 @@ class plugin(Plugin):
 
     fix_cmd = "chcon -R -t rsync_data_t '$TARGET_PATH'"
 
-    if_text = _("$TARGET_BASE_PATH should be shared via the RSYNC daemon")
+    if_text = _("If $TARGET_BASE_PATH should be shared via the RSYNC daemon")
     then_text = _("You need to change the label on $TARGET_BASE_PATH")
     do_text = """# semanage fcontext -a -t rsync_data_t '$FIX_TARGET_PATH'
 # restorecon -v '$FIX_TARGET_PATH'"""
diff --git a/plugins/src/sandbox_connect.py b/plugins/src/sandbox_connect.py
index f9a7951..0652dd6 100644
--- a/plugins/src/sandbox_connect.py
+++ b/plugins/src/sandbox_connect.py
@@ -44,7 +44,7 @@ class plugin(Plugin):
     ''')
 
     fix_cmd = ''
-    if_text = _('you want to allow $SOURCE_PATH to connect to network port $PORT_NUMBER')
+    if_text = _("If you want to allow $SOURCE_PATH to connect to network port $PORT_NUMBER")
 
     then_text =  _("""you need to modify the sandbox type. sandbox_web_t or sandbox_net_t.
 For example:
diff --git a/plugins/src/selinuxpolicy.py b/plugins/src/selinuxpolicy.py
index d1cc6ca..c26a74c 100644
--- a/plugins/src/selinuxpolicy.py
+++ b/plugins/src/selinuxpolicy.py
@@ -41,7 +41,7 @@ class plugin(Plugin):
 
     fix_description = "Contact your security administrator and report this issue."
     fix_cmd = ""
-    if_text = _("you do not think $SOURCE_BASE_PATH should try $ACCESS access on $TARGET_BASE_PATH.")
+    if_text = _("If you do not think $SOURCE_BASE_PATH should try $ACCESS access on $TARGET_BASE_PATH.")
     then_text = _("you may be under attack by a hacker, since confined applications should not need this access.")
     do_text = _("Contact your security administrator and report this issue.")
 
diff --git a/plugins/src/setenforce.py b/plugins/src/setenforce.py
index 1b386f3..2d05c42 100644
--- a/plugins/src/setenforce.py
+++ b/plugins/src/setenforce.py
@@ -24,7 +24,7 @@ _=translation.gettext
 from setroubleshoot.util import *
 from setroubleshoot.Plugin import Plugin
 
-if_text = _("you did not directly cause this AVC through testing.")
+if_text = _("If you did not directly cause this AVC through testing.")
 then_text = _("if you think that you might have been hacked")
 do_text = _("Contact your security administrator and report this issue.")
 
@@ -45,7 +45,7 @@ class plugin(Plugin):
     fix_description = "Contact your security administrator and report this issue."
     fix_cmd = ""
 
-    if_text = _("you believe $SOURCE_PATH tried to disable SELinux.")
+    if_text = _("If you believe $SOURCE_PATH tried to disable SELinux.")
     then_text = _("you may be under attack by a hacker, since confined applications should never need this access.")
     do_text = _("Contact your security administrator and report this issue.")
 
diff --git a/plugins/src/sys_module.py b/plugins/src/sys_module.py
index 42a9d7b..813ef05 100644
--- a/plugins/src/sys_module.py
+++ b/plugins/src/sys_module.py
@@ -25,7 +25,7 @@ _=translation.gettext
 from setroubleshoot.util import *
 from setroubleshoot.Plugin import Plugin
 
-if_text = _("you do not believe your $SOURCE_PATH should be modifying the kernel, by loading kernel modules")
+if_text = _("If you do not believe your $SOURCE_PATH should be modifying the kernel, by loading kernel modules")
 then_text = _("You might have been hacked.")
 do_text = _("Contact your security administrator and report this issue.")
 
@@ -43,7 +43,7 @@ class plugin(Plugin):
     ''')
 
     fix_description = "Contact your security administrator and report this issue."
-    if_text = _("you do not believe that $SOURCE_PATH should be attempting to modify the kernel by loading a kernel module.")
+    if_text = _("If you do not believe that $SOURCE_PATH should be attempting to modify the kernel by loading a kernel module.")
     then_text = _("A process might be attempting to hack into your system.")
     do_text = _("Contact your security administrator and report this issue.")
     fix_cmd = ""
diff --git a/plugins/src/sys_resource.py b/plugins/src/sys_resource.py
index ad0f80b..c39d9ad 100644
--- a/plugins/src/sys_resource.py
+++ b/plugins/src/sys_resource.py
@@ -36,7 +36,7 @@ class plugin(Plugin):
 
     fix_description = "Fix the cause of the SYS_RESOURCE on your system."
 
-    if_text = _("you do not want processes to require capabilities to use up all the system resources on your system;")
+    if_text = _("If you do not want processes to require capabilities to use up all the system resources on your system;")
     then_text = _("""you need to diagnose why your system is running out of system resources and fix the problem.
 
 According to /usr/include/linux/capability.h, sys_resource is required to:
diff --git a/plugins/src/vbetool.py b/plugins/src/vbetool.py
index 70897ed..c641be4 100644
--- a/plugins/src/vbetool.py
+++ b/plugins/src/vbetool.py
@@ -52,7 +52,7 @@ executing:
 
     fix_cmd = "/usr/sbin/setsebool -P mmap_low_allowed 1"
 
-    if_text=_("you want to ignore this AVC because it is dangerous and your machine seems to be working correctly.")
+    if_text = _("If you want to ignore this AVC because it is dangerous and your machine seems to be working correctly.")
     then_text = _("you must tell SELinux about this by enabling the vbetool_mmap_zero_ignore boolean.")
     do_text = "# setsebool -P vbetool_mmap_zero_ignore 1"
 
diff --git a/plugins/src/wine.py b/plugins/src/wine.py
index 0f4ed05..5a6030e 100644
--- a/plugins/src/wine.py
+++ b/plugins/src/wine.py
@@ -63,7 +63,7 @@ executing:
 
     fix_cmd = "/usr/sbin/setsebool -P mmap_low_allowed 1"
 
-    if_text=_("you want to ignore this AVC because it is dangerous and your wine applications are working correctly.")
+    if_text = _("If you want to ignore this AVC because it is dangerous and your wine applications are working correctly.")
     then_text = _("you must tell SELinux about this by enabling the wine_mmap_zero_ignore boolean.")
     do_text = "# setsebool -P wine_mmap_zero_ignore 1"
 

From bb580a01fda8971f516252fdda39c0a5b7398582 Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Aug 29 2017 13:33:50 +0000
Subject: [PATCH 3/4] framework: we need to set translation domain for Gtk.Builder() object to have strings correctly translated


Related: https://github.com/fedora-selinux/setroubleshoot/issues/63

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1370100

(cherry picked from commit 4a0172ae99bbda60ba0cae7b070285ed55bb2be0)

---

diff --git a/framework/src/setroubleshoot/browser.py b/framework/src/setroubleshoot/browser.py
index 4687aae..5c2edae 100644
--- a/framework/src/setroubleshoot/browser.py
+++ b/framework/src/setroubleshoot/browser.py
@@ -159,7 +159,7 @@ class BrowserApplet:
 
         self.read_config()
         builder = gtk.Builder()
-#        builder.set_translation_domain("setroubleshoot")
+        builder.set_translation_domain(domain)
         builder.add_from_file("/usr/share/setroubleshoot/gui/browser.glade") 
         self.plugins = load_plugins()
 

From 0c553893afc47fa0f895b5d4231e9d20588f881d Mon Sep 17 00:00:00 2001
From: Petr Lautrbach <plautrba@redhat.com>
Date: Aug 29 2017 14:08:27 +0000
Subject: [PATCH 4/4] framework: Make labels on GtkButtons translatable


Related: https://github.com/fedora-selinux/setroubleshoot/issues/63

(cherry picked from commit 8be44048b35333c9745e7c8949f2b69ef1efa2e5)

---

diff --git a/framework/gui/browser.glade b/framework/gui/browser.glade
index 9d38d83..158efd4 100644
--- a/framework/gui/browser.glade
+++ b/framework/gui/browser.glade
@@ -101,7 +101,7 @@ John Dennis &lt;jdennis@redhat.com&gt;</property>
                 </child>
                 <child>
                   <object class="GtkButton" id="delete_list_button">
-                    <property name="label">gtk-delete</property>
+                    <property name="label" translatable="yes">Delete</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -176,7 +176,7 @@ John Dennis &lt;jdennis@redhat.com&gt;</property>
             </child>
             <child>
               <object class="GtkButton" id="close_details_button">
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="yes">Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -545,7 +545,7 @@ John Dennis &lt;jdennis@redhat.com&gt;</property>
                             </child>
                             <child>
                               <object class="GtkButton" id="delete_button">
-                                <property name="label">gtk-delete</property>
+                                <property name="label" translatable="yes">Delete</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -653,7 +653,7 @@ John Dennis &lt;jdennis@redhat.com&gt;</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkButton" id="previous_button">
-                    <property name="label">gtk-media-previous</property>
+                    <property name="label" translatable="yes">Previous</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
@@ -686,7 +686,7 @@ John Dennis &lt;jdennis@redhat.com&gt;</property>
                 </child>
                 <child>
                   <object class="GtkButton" id="next_button">
-                    <property name="label">gtk-media-next</property>
+                    <property name="label" translatable="yes">Next</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>