From a8cacf2944ddd803909d2111bdf2d43ab90e1111 Mon Sep 17 00:00:00 2001

From: Petr Lautrbach <plautrba@redhat.com>

Date: Mon, 6 Aug 2018 13:37:07 +0200

Subject: [PATCH] Use correct gettext domains in python/ gui/ sandbox/

https://github.com/fedora-selinux/selinux/issues/43

---

 gui/booleansPage.py                          | 2 +-

 gui/domainsPage.py                           | 2 +-

 gui/fcontextPage.py                          | 2 +-

 gui/loginsPage.py                            | 2 +-

 gui/modulesPage.py                           | 2 +-

 gui/polgengui.py                             | 2 +-

 gui/portsPage.py                             | 2 +-

 gui/semanagePage.py                          | 2 +-

 gui/statusPage.py                            | 2 +-

 gui/system-config-selinux.py                 | 2 +-

 gui/usersPage.py                             | 2 +-

 python/chcat/chcat                           | 2 +-

 python/semanage/semanage                     | 2 +-

 python/semanage/seobject.py                  | 2 +-

 python/sepolgen/src/sepolgen/sepolgeni18n.py | 2 +-

 python/sepolicy/sepolicy.py                  | 2 +-

 python/sepolicy/sepolicy/__init__.py         | 2 +-

 python/sepolicy/sepolicy/generate.py         | 2 +-

 python/sepolicy/sepolicy/gui.py              | 2 +-

 python/sepolicy/sepolicy/interface.py        | 2 +-

 sandbox/sandbox                              | 2 +-

 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/gui/booleansPage.py b/gui/booleansPage.py

index 7849bea26a06..dd12b6d6ab86 100644

--- a/gui/booleansPage.py

+++ b/gui/booleansPage.py

@@ -38,7 +38,7 @@ DISABLED = 2

 ##

 ## I18N

 ##

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-gui"

 try:

     import gettext

     kwargs = {}

diff --git a/gui/domainsPage.py b/gui/domainsPage.py

index bad5140d8c59..6bbe4de5884f 100644

--- a/gui/domainsPage.py

+++ b/gui/domainsPage.py

@@ -30,7 +30,7 @@ from semanagePage import *

 ##

 ## I18N

 ##

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-gui"

 try:

     import gettext

     kwargs = {}

diff --git a/gui/fcontextPage.py b/gui/fcontextPage.py

index d26aa1b405a9..52292cae01d2 100644

--- a/gui/fcontextPage.py

+++ b/gui/fcontextPage.py

@@ -47,7 +47,7 @@ class context:

 ##

 ## I18N

 ##

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-gui"

 try:

     import gettext

     kwargs = {}

diff --git a/gui/loginsPage.py b/gui/loginsPage.py

index b67eb8bc42af..cbfb0cc23f65 100644

--- a/gui/loginsPage.py

+++ b/gui/loginsPage.py

@@ -29,7 +29,7 @@ from semanagePage import *

 ##

 ## I18N

 ##

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-gui"

 try:

     import gettext

     kwargs = {}

diff --git a/gui/modulesPage.py b/gui/modulesPage.py

index 0584acf9b3a4..35a0129bab9c 100644

--- a/gui/modulesPage.py

+++ b/gui/modulesPage.py

@@ -30,7 +30,7 @@ from semanagePage import *

 ##

 ## I18N

 ##

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-gui"

 try:

     import gettext

     kwargs = {}

diff --git a/gui/polgengui.py b/gui/polgengui.py

index d284ded65279..01f541bafae8 100644

--- a/gui/polgengui.py

+++ b/gui/polgengui.py

@@ -63,7 +63,7 @@ def get_all_modules():

 ##

 ## I18N

 ##

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-gui"

 try:

     import gettext

     kwargs = {}

diff --git a/gui/portsPage.py b/gui/portsPage.py

index 30f58383bc1d..a537ecc8c0a1 100644

--- a/gui/portsPage.py

+++ b/gui/portsPage.py

@@ -35,7 +35,7 @@ from semanagePage import *

 ##

 ## I18N

 ##

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-gui"

 try:

     import gettext

     kwargs = {}

diff --git a/gui/semanagePage.py b/gui/semanagePage.py

index 4127804fbbee..5361d69c1313 100644

--- a/gui/semanagePage.py

+++ b/gui/semanagePage.py

@@ -22,7 +22,7 @@ from gi.repository import Gdk, Gtk

 ##

 ## I18N

 ##

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-gui"

 try:

     import gettext

     kwargs = {}

diff --git a/gui/statusPage.py b/gui/statusPage.py

index 766854b19cba..a8f079b9b163 100644

--- a/gui/statusPage.py

+++ b/gui/statusPage.py

@@ -35,7 +35,7 @@ RELABELFILE = "/.autorelabel"

 ##

 ## I18N

 ##

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-gui"

 try:

     import gettext

     kwargs = {}

diff --git a/gui/system-config-selinux.py b/gui/system-config-selinux.py

index 3f70122b87e8..8c46c987b974 100644

--- a/gui/system-config-selinux.py

+++ b/gui/system-config-selinux.py

@@ -45,7 +45,7 @@ import selinux

 ##

 ## I18N

 ##

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-gui"

 try:

     import gettext

     kwargs = {}

diff --git a/gui/usersPage.py b/gui/usersPage.py

index 26794ed5c3f3..d15d4c5a71dd 100644

--- a/gui/usersPage.py

+++ b/gui/usersPage.py

@@ -29,7 +29,7 @@ from semanagePage import *

 ##

 ## I18N

 ##

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-gui"

 try:

     import gettext

     kwargs = {}

diff --git a/python/chcat/chcat b/python/chcat/chcat

index fdd2e46ee3f9..839ddd3b54b6 100755

--- a/python/chcat/chcat

+++ b/python/chcat/chcat

@@ -30,7 +30,7 @@ import getopt

 import selinux

 import seobject

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-python"

 try:

     import gettext

     kwargs = {}

diff --git a/python/semanage/semanage b/python/semanage/semanage

index 18a2710531ca..0980aecb6311 100644

--- a/python/semanage/semanage

+++ b/python/semanage/semanage

@@ -30,7 +30,7 @@ import seobject

 import sys

 import traceback

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-python"

 try:

     import gettext

     kwargs = {}

diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py

index 21adbf6eb74f..69e60db80060 100644

--- a/python/semanage/seobject.py

+++ b/python/semanage/seobject.py

@@ -29,7 +29,7 @@ import sys

 import stat

 import socket

 from semanage import *

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-python"

 import sepolicy

 from setools.policyrep import SELinuxPolicy

 from setools.typequery import TypeQuery

diff --git a/python/sepolgen/src/sepolgen/sepolgeni18n.py b/python/sepolgen/src/sepolgen/sepolgeni18n.py

index 998c4356415c..56ebd807c69c 100644

--- a/python/sepolgen/src/sepolgen/sepolgeni18n.py

+++ b/python/sepolgen/src/sepolgen/sepolgeni18n.py

@@ -19,7 +19,7 @@

 try: 

     import gettext

-    t = gettext.translation( 'yumex' )

+    t = gettext.translation( 'selinux-python' )

     _ = t.gettext

 except:

     def _(str):

diff --git a/python/sepolicy/sepolicy.py b/python/sepolicy/sepolicy.py

index 7b2230651099..32956e58f52e 100755

--- a/python/sepolicy/sepolicy.py

+++ b/python/sepolicy/sepolicy.py

@@ -28,7 +28,7 @@ import sepolicy

 from multiprocessing import Pool

 from sepolicy import get_os_version, get_conditionals, get_conditionals_format_text

 import argparse

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-python"

 try:

     import gettext

     kwargs = {}

diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py

index 8055a12f6020..aa8beda313c8 100644

--- a/python/sepolicy/sepolicy/__init__.py

+++ b/python/sepolicy/sepolicy/__init__.py

@@ -23,7 +23,7 @@ from setools.typeattrquery import TypeAttributeQuery

 from setools.typequery import TypeQuery

 from setools.userquery import UserQuery

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-python"

 try:

     import gettext

     kwargs = {}

diff --git a/python/sepolicy/sepolicy/generate.py b/python/sepolicy/sepolicy/generate.py

index 4e1ed4e9dc31..43180ca6fda4 100644

--- a/python/sepolicy/sepolicy/generate.py

+++ b/python/sepolicy/sepolicy/generate.py

@@ -48,7 +48,7 @@ import sepolgen.defaults as defaults

 ##

 ## I18N

 ##

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-python"

 try:

     import gettext

     kwargs = {}

diff --git a/python/sepolicy/sepolicy/gui.py b/python/sepolicy/sepolicy/gui.py

index 1e86422b864a..c9ca158ddd09 100644

--- a/python/sepolicy/sepolicy/gui.py

+++ b/python/sepolicy/sepolicy/gui.py

@@ -41,7 +41,7 @@ import os

 import re

 import unicodedata

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-python"

 try:

     import gettext

     kwargs = {}

diff --git a/python/sepolicy/sepolicy/interface.py b/python/sepolicy/sepolicy/interface.py

index bdffb770f364..9d40aea1498d 100644

--- a/python/sepolicy/sepolicy/interface.py

+++ b/python/sepolicy/sepolicy/interface.py

@@ -30,7 +30,7 @@ __all__ = ['get_all_interfaces', 'get_interfaces_from_xml', 'get_admin', 'get_us

 ##

 ## I18N

 ##

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-python"

 try:

     import gettext

     kwargs = {}

diff --git a/sandbox/sandbox b/sandbox/sandbox

index ca5f1e030a51..16c43b51eaaa 100644

--- a/sandbox/sandbox

+++ b/sandbox/sandbox

@@ -37,7 +37,7 @@ import sepolicy

 SEUNSHARE = "/usr/sbin/seunshare"

 SANDBOXSH = "/usr/share/sandbox/sandboxX.sh"

-PROGNAME = "policycoreutils"

+PROGNAME = "selinux-sandbox"

 try:

     import gettext

     kwargs = {}

-- 

2.32.0