86 files changed, 294 insertions, 98 deletions
diff --git a/src/MANIFEST.in b/src/MANIFEST.in
index b9309c6b..83a993e3 100644
--- a/src/MANIFEST.in
+++ b/src/MANIFEST.in
@@ -1,4 +1,4 @@
-recursive-include locale *.mo
+recursive-include po *.mo
 recursive-include extras *
 include sosreport*
 include README*
@@ -6,4 +6,4 @@ include LICENSE
 include TODO
 include ChangeLog
 include gpgkeys/*.pub
-include sos.conf
-\ No newline at end of file
+include sos.conf
diff --git a/src/Makefile b/src/Makefile
index c961bbff..a49d9219 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,9 +4,9 @@
 
 NAME	= sos
 VERSION = 1.8
-RELEASE = 5
+#RELEASE = 6
 REPO = http://svn.fedorahosted.org/svn/sos
-SVNTAG	= r$(subst .,-,$(VERSION))_$(RELEASE)
+#SVNTAG	= r$(subst .,-,$(VERSION))_$(RELEASE)
 SRCDIR = $(PWD)
 # Needs to be changed to reflect
 # your rpm development tree.
@@ -31,7 +31,7 @@ tarball: clean mo gpgkey
 	@echo " "
 	@echo "The final archive is $(PWD)/dist/"
 
-install:mo gpgkey
+install:gpgkey mo
 	python setup.py install
 	@rm -rf build/lib
 
@@ -41,6 +41,11 @@ clean:
 	@rm -rf MANIFEST
 	@rm -rfv $(TMPDIR)
 	@rm -rf {$(SOURCE2),$(SOURCE3)}
+	@for i in `ls po`; do \
+		if [ -d po/$$i ]; then \
+			rm -rf po/$$i; \
+		fi; \
+	done; \
 
 # TODO: This needs work
 internal-rpm: gpgkey
@@ -68,11 +73,16 @@ rpm: tarball
 	rpmbuild -ba sos.spec
 
 pot:
-	python tools/pygettext.py -o locale/sos.pot sosreport lib/sos/policyredhat.py
+	python tools/pygettext.py -o po/sos.pot sosreport lib/sos/policyredhat.py
 
 mo:
 	@echo "Generating mo files"
-	find locale/*/LC_MESSAGES -name sos.po -exec python tools/msgfmt.py {} \;
+	@for i in `ls po`; do \
+		if [ $$i != 'sos.pot' ]; then \
+			mkdir po/$${i%.po}; \
+			python tools/msgfmt.py -o po/$${i%.po}/sos.mo po/$$i; \
+		fi; \
+	done; \
 
 gpgkey:
 	@echo "Building gpg key"
diff --git a/src/lib/sos/plugins/cs.py b/src/lib/sos/plugins/cs.py
index 871752dd..75803c0e 100644
--- a/src/lib/sos/plugins/cs.py
+++ b/src/lib/sos/plugins/cs.py
@@ -30,9 +30,10 @@ import os
 class cs(sos.plugintools.PluginBase):
     """Certificate System 7.x Diagnostic Information
     """
-    # check for default location of pki services (/var/lib.rhpki-*).  If default path exists, 
-    # assume rhpki- glob and grap all installed subsystems.  If customer has a custom install
-    # path, then ln -s the custom path to /var/lib/rhkpi-installed_subsystem (/var/lib/rhpki-ca, 
+    # check for default location of pki services (/var/lib.rhpki-*).  
+    # If default path exists, assume rhpki- glob and grap all installed 
+    # subsystems.  If customer has a custom install path, then ln -s the 
+    # custom path to /var/lib/rhkpi-installed_subsystem (/var/lib/rhpki-ca, 
     # /var/lib/rhpki-kra ect).
 
     def checkenabled(self):
diff --git a/src/lib/sos/plugins/ds.py b/src/lib/sos/plugins/ds.py
index f1de72ea..f80c7fe5 100644
--- a/src/lib/sos/plugins/ds.py
+++ b/src/lib/sos/plugins/ds.py
@@ -24,10 +24,12 @@ class ds(sos.plugintools.PluginBase):
     ds_version = None
 
     def checkenabled(self):
-        if self.cInfo["policy"].pkgByName("redhat-ds-base") or os.path.exists("/etc/dirsrv"):
+        if self.cInfo["policy"].pkgByName("redhat-ds-base") or \
+        os.path.exists("/etc/dirsrv"):
             self.ds_version = "ds8"
             return True
-        elif self.cInfo["policy"].pkgByName("redhat-ds-7") or os.path.exists("/opt/redhat-ds"):
+        elif self.cInfo["policy"].pkgByName("redhat-ds-7") or \
+        os.path.exists("/opt/redhat-ds"):
             self.ds_version = "ds7"
             return True
         return False
diff --git a/src/lib/sos/plugins/kernel.py b/src/lib/sos/plugins/kernel.py
index 669d8300..32ec59ce 100644
--- a/src/lib/sos/plugins/kernel.py
+++ b/src/lib/sos/plugins/kernel.py
@@ -71,7 +71,6 @@ class kernel(sos.plugintools.PluginBase):
         self.addCopySpec("/proc/cmdline")
         self.addCopySpec("/proc/driver")
         self.addCopySpec("/proc/sys/kernel/tainted")
-        self.addCopySpec("/var/log/messages")
 
         return
 
diff --git a/src/lib/sos/plugins/rhn.py b/src/lib/sos/plugins/rhn.py
index 46ff2fbf..482aa143 100644
--- a/src/lib/sos/plugins/rhn.py
+++ b/src/lib/sos/plugins/rhn.py
@@ -47,7 +47,7 @@ class rhn(sos.plugintools.PluginBase):
         self.addCopySpec("/var/log/rhn*")	# rhn-logs
         self.addCopySpec("/var/log/rhn/rhn-database-installation.log")
 
-	# all these used to go in $DIR/mon-logs/
+        # all these used to go in $DIR/mon-logs/
         self.addCopySpec("/opt/notification/var/*.log*")
         self.addCopySpec("/var/tmp/ack_handler.log*")
         self.addCopySpec("/var/tmp/enqueue.log*")
diff --git a/src/locale/af/LC_MESSAGES/sos.po b/src/po/af.po
index 755d47b8..755d47b8 100644
--- a/src/locale/af/LC_MESSAGES/sos.po
+++ b/src/po/af.po
diff --git a/src/locale/am/LC_MESSAGES/sos.po b/src/po/am.po
index 2fda8a60..2fda8a60 100644
--- a/src/locale/am/LC_MESSAGES/sos.po
+++ b/src/po/am.po
diff --git a/src/locale/ar/LC_MESSAGES/sos.po b/src/po/ar.po
index ec98674d..ec98674d 100644
--- a/src/locale/ar/LC_MESSAGES/sos.po
+++ b/src/po/ar.po
diff --git a/src/locale/as/LC_MESSAGES/sos.po b/src/po/as.po
index 25b4a528..25b4a528 100644
--- a/src/locale/as/LC_MESSAGES/sos.po
+++ b/src/po/as.po
diff --git a/src/locale/be/LC_MESSAGES/sos.po b/src/po/be.po
index 16c8f3a9..16c8f3a9 100644
--- a/src/locale/be/LC_MESSAGES/sos.po
+++ b/src/po/be.po
diff --git a/src/locale/bg/LC_MESSAGES/sos.po b/src/po/bg.po
index f9ff3df3..f9ff3df3 100644
--- a/src/locale/bg/LC_MESSAGES/sos.po
+++ b/src/po/bg.po
diff --git a/src/locale/bn/LC_MESSAGES/sos.po b/src/po/bn.po
index 938bd950..938bd950 100644
--- a/src/locale/bn/LC_MESSAGES/sos.po
+++ b/src/po/bn.po
diff --git a/src/locale/bn_IN/LC_MESSAGES/sos.po b/src/po/bn_IN.po
index f11f705b..f11f705b 100644
--- a/src/locale/bn_IN/LC_MESSAGES/sos.po
+++ b/src/po/bn_IN.po
diff --git a/src/locale/bs/LC_MESSAGES/sos.po b/src/po/bs.po
index 369d768c..369d768c 100644
--- a/src/locale/bs/LC_MESSAGES/sos.po
+++ b/src/po/bs.po
diff --git a/src/locale/ca/LC_MESSAGES/sos.po b/src/po/ca.po
index 978d1d5a..978d1d5a 100644
--- a/src/locale/ca/LC_MESSAGES/sos.po
+++ b/src/po/ca.po
diff --git a/src/locale/cs/LC_MESSAGES/sos.po b/src/po/cs.po
index a38459da..a38459da 100644
--- a/src/locale/cs/LC_MESSAGES/sos.po
+++ b/src/po/cs.po
diff --git a/src/locale/cy/LC_MESSAGES/sos.po b/src/po/cy.po
index f58bc815..f58bc815 100644
--- a/src/locale/cy/LC_MESSAGES/sos.po
+++ b/src/po/cy.po
diff --git a/src/locale/da/LC_MESSAGES/sos.po b/src/po/da.po
index 3a06b425..3a06b425 100644
--- a/src/locale/da/LC_MESSAGES/sos.po
+++ b/src/po/da.po
diff --git a/src/locale/de/LC_MESSAGES/sos.po b/src/po/de.po
index f6e67226..f6e67226 100644
--- a/src/locale/de/LC_MESSAGES/sos.po
+++ b/src/po/de.po
diff --git a/src/locale/el/LC_MESSAGES/sos.po b/src/po/el.po
index 6ea7ac4f..6ea7ac4f 100644
--- a/src/locale/el/LC_MESSAGES/sos.po
+++ b/src/po/el.po
diff --git a/src/locale/en/LC_MESSAGES/sos.po b/src/po/en.po
index 9f608ee5..9f608ee5 100644
--- a/src/locale/en/LC_MESSAGES/sos.po
+++ b/src/po/en.po
diff --git a/src/locale/en_GB/LC_MESSAGES/sos.po b/src/po/en_GB.po
index a4edc5b9..a4edc5b9 100644
--- a/src/locale/en_GB/LC_MESSAGES/sos.po
+++ b/src/po/en_GB.po
diff --git a/src/locale/es/LC_MESSAGES/sos.po b/src/po/es.po
index 175c6c19..175c6c19 100644
--- a/src/locale/es/LC_MESSAGES/sos.po
+++ b/src/po/es.po
diff --git a/src/locale/et/LC_MESSAGES/sos.po b/src/po/et.po
index 616eb47d..616eb47d 100644
--- a/src/locale/et/LC_MESSAGES/sos.po
+++ b/src/po/et.po
diff --git a/src/locale/eu_ES/LC_MESSAGES/sos.po b/src/po/eu_ES.po
index 79661522..79661522 100644
--- a/src/locale/eu_ES/LC_MESSAGES/sos.po
+++ b/src/po/eu_ES.po
diff --git a/src/locale/fa/LC_MESSAGES/sos.po b/src/po/fa.po
index b76962c2..b76962c2 100644
--- a/src/locale/fa/LC_MESSAGES/sos.po
+++ b/src/po/fa.po
diff --git a/src/locale/fi/LC_MESSAGES/sos.po b/src/po/fi.po
index f3d66dbf..f3d66dbf 100644
--- a/src/locale/fi/LC_MESSAGES/sos.po
+++ b/src/po/fi.po
diff --git a/src/locale/fr/LC_MESSAGES/sos.po b/src/po/fr.po
index 752355ab..752355ab 100644
--- a/src/locale/fr/LC_MESSAGES/sos.po
+++ b/src/po/fr.po
diff --git a/src/locale/gl/LC_MESSAGES/sos.po b/src/po/gl.po
index 895450bd..895450bd 100644
--- a/src/locale/gl/LC_MESSAGES/sos.po
+++ b/src/po/gl.po
diff --git a/src/locale/gu/LC_MESSAGES/sos.po b/src/po/gu.po
index cb6bf9b4..cb6bf9b4 100644
--- a/src/locale/gu/LC_MESSAGES/sos.po
+++ b/src/po/gu.po
diff --git a/src/locale/he/LC_MESSAGES/sos.po b/src/po/he.po
index 083dc7b4..083dc7b4 100644
--- a/src/locale/he/LC_MESSAGES/sos.po
+++ b/src/po/he.po
diff --git a/src/locale/hi/LC_MESSAGES/sos.po b/src/po/hi.po
index 8ce09410..8ce09410 100644
--- a/src/locale/hi/LC_MESSAGES/sos.po
+++ b/src/po/hi.po
diff --git a/src/locale/hr/LC_MESSAGES/sos.po b/src/po/hr.po
index cce1263a..cce1263a 100644
--- a/src/locale/hr/LC_MESSAGES/sos.po
+++ b/src/po/hr.po
diff --git a/src/locale/hu/LC_MESSAGES/sos.po b/src/po/hu.po
index 9febfbac..9febfbac 100644
--- a/src/locale/hu/LC_MESSAGES/sos.po
+++ b/src/po/hu.po
diff --git a/src/locale/hy/LC_MESSAGES/sos.po b/src/po/hy.po
index 05b68c82..05b68c82 100644
--- a/src/locale/hy/LC_MESSAGES/sos.po
+++ b/src/po/hy.po
diff --git a/src/locale/id/LC_MESSAGES/sos.po b/src/po/id.po
index 616b5d6e..616b5d6e 100644
--- a/src/locale/id/LC_MESSAGES/sos.po
+++ b/src/po/id.po
diff --git a/src/locale/ilo/LC_MESSAGES/sos.po b/src/po/ilo.po
index fd19366a..fd19366a 100644
--- a/src/locale/ilo/LC_MESSAGES/sos.po
+++ b/src/po/ilo.po
diff --git a/src/locale/is/LC_MESSAGES/sos.po b/src/po/is.po
index 4402f77d..4402f77d 100644
--- a/src/locale/is/LC_MESSAGES/sos.po
+++ b/src/po/is.po
diff --git a/src/locale/it/LC_MESSAGES/sos.po b/src/po/it.po
index 7e6ee4c2..7e6ee4c2 100644
--- a/src/locale/it/LC_MESSAGES/sos.po
+++ b/src/po/it.po
diff --git a/src/locale/ja/LC_MESSAGES/sos.po b/src/po/ja.po
index c8bfc5c3..c8bfc5c3 100644
--- a/src/locale/ja/LC_MESSAGES/sos.po
+++ b/src/po/ja.po
diff --git a/src/locale/ka/LC_MESSAGES/sos.po b/src/po/ka.po
index 81661a75..81661a75 100644
--- a/src/locale/ka/LC_MESSAGES/sos.po
+++ b/src/po/ka.po
diff --git a/src/locale/kn/LC_MESSAGES/sos.po b/src/po/kn.po
index 15449598..15449598 100644
--- a/src/locale/kn/LC_MESSAGES/sos.po
+++ b/src/po/kn.po
diff --git a/src/locale/ko/LC_MESSAGES/sos.po b/src/po/ko.po
index e0d39239..e0d39239 100644
--- a/src/locale/ko/LC_MESSAGES/sos.po
+++ b/src/po/ko.po
diff --git a/src/locale/ku/LC_MESSAGES/sos.po b/src/po/ku.po
index 01927c3d..01927c3d 100644
--- a/src/locale/ku/LC_MESSAGES/sos.po
+++ b/src/po/ku.po
diff --git a/src/locale/lo/LC_MESSAGES/sos.po b/src/po/lo.po
index 1814dec5..1814dec5 100644
--- a/src/locale/lo/LC_MESSAGES/sos.po
+++ b/src/po/lo.po
diff --git a/src/locale/lt/LC_MESSAGES/sos.po b/src/po/lt.po
index 865a1c24..865a1c24 100644
--- a/src/locale/lt/LC_MESSAGES/sos.po
+++ b/src/po/lt.po
diff --git a/src/locale/lv/LC_MESSAGES/sos.po b/src/po/lv.po
index 1dca496c..1dca496c 100644
--- a/src/locale/lv/LC_MESSAGES/sos.po
+++ b/src/po/lv.po
diff --git a/src/locale/mk/LC_MESSAGES/sos.po b/src/po/mk.po
index 93a9073f..93a9073f 100644
--- a/src/locale/mk/LC_MESSAGES/sos.po
+++ b/src/po/mk.po
diff --git a/src/locale/ml/LC_MESSAGES/sos.po b/src/po/ml.po
index e570171d..e570171d 100644
--- a/src/locale/ml/LC_MESSAGES/sos.po
+++ b/src/po/ml.po
diff --git a/src/locale/mr/LC_MESSAGES/sos.po b/src/po/mr.po
index 95aace9e..95aace9e 100644
--- a/src/locale/mr/LC_MESSAGES/sos.po
+++ b/src/po/mr.po
diff --git a/src/locale/ms/LC_MESSAGES/sos.po b/src/po/ms.po
index 8dd0d654..8dd0d654 100644
--- a/src/locale/ms/LC_MESSAGES/sos.po
+++ b/src/po/ms.po
diff --git a/src/locale/my/LC_MESSAGES/sos.po b/src/po/my.po
index c9795f0b..c9795f0b 100644
--- a/src/locale/my/LC_MESSAGES/sos.po
+++ b/src/po/my.po
diff --git a/src/locale/nb/LC_MESSAGES/sos.po b/src/po/nb.po
index 60eda445..60eda445 100644
--- a/src/locale/nb/LC_MESSAGES/sos.po
+++ b/src/po/nb.po
diff --git a/src/locale/nl/LC_MESSAGES/sos.po b/src/po/nl.po
index 13ab923d..13ab923d 100644
--- a/src/locale/nl/LC_MESSAGES/sos.po
+++ b/src/po/nl.po
diff --git a/src/locale/nn/LC_MESSAGES/sos.po b/src/po/nn.po
index 009640f6..009640f6 100644
--- a/src/locale/nn/LC_MESSAGES/sos.po
+++ b/src/po/nn.po
diff --git a/src/locale/no/LC_MESSAGES/sos.po b/src/po/no.po
index 81788af7..81788af7 100644
--- a/src/locale/no/LC_MESSAGES/sos.po
+++ b/src/po/no.po
diff --git a/src/locale/nso/LC_MESSAGES/sos.po b/src/po/nso.po
index f94fa245..f94fa245 100644
--- a/src/locale/nso/LC_MESSAGES/sos.po
+++ b/src/po/nso.po
diff --git a/src/locale/or/LC_MESSAGES/sos.po b/src/po/or.po
index f64420bd..f64420bd 100644
--- a/src/locale/or/LC_MESSAGES/sos.po
+++ b/src/po/or.po
diff --git a/src/locale/pa/LC_MESSAGES/sos.po b/src/po/pa.po
index a1b82a6d..a1b82a6d 100644
--- a/src/locale/pa/LC_MESSAGES/sos.po
+++ b/src/po/pa.po
diff --git a/src/locale/pl/LC_MESSAGES/sos.po b/src/po/pl.po
index 32bab657..32bab657 100644
--- a/src/locale/pl/LC_MESSAGES/sos.po
+++ b/src/po/pl.po
diff --git a/src/locale/pt/LC_MESSAGES/sos.po b/src/po/pt.po
index 1586fce7..1586fce7 100644
--- a/src/locale/pt/LC_MESSAGES/sos.po
+++ b/src/po/pt.po
diff --git a/src/locale/pt_BR/LC_MESSAGES/sos.po b/src/po/pt_BR.po
index 429abb79..429abb79 100644
--- a/src/locale/pt_BR/LC_MESSAGES/sos.po
+++ b/src/po/pt_BR.po
diff --git a/src/locale/ro/LC_MESSAGES/sos.po b/src/po/ro.po
index f622e9b1..f622e9b1 100644
--- a/src/locale/ro/LC_MESSAGES/sos.po
+++ b/src/po/ro.po
diff --git a/src/locale/ru/LC_MESSAGES/sos.po b/src/po/ru.po
index da6c0522..da6c0522 100644
--- a/src/locale/ru/LC_MESSAGES/sos.po
+++ b/src/po/ru.po
diff --git a/src/locale/si/LC_MESSAGES/sos.po b/src/po/si.po
index 35e3550e..35e3550e 100644
--- a/src/locale/si/LC_MESSAGES/sos.po
+++ b/src/po/si.po
diff --git a/src/locale/sk/LC_MESSAGES/sos.po b/src/po/sk.po
index 55ecefeb..55ecefeb 100644
--- a/src/locale/sk/LC_MESSAGES/sos.po
+++ b/src/po/sk.po
diff --git a/src/locale/sl/LC_MESSAGES/sos.po b/src/po/sl.po
index 631cad61..631cad61 100644
--- a/src/locale/sl/LC_MESSAGES/sos.po
+++ b/src/po/sl.po
diff --git a/src/po/sos.pot b/src/po/sos.pot
new file mode 100644
index 00000000..c2454a74
--- /dev/null
+++ b/src/po/sos.pot
@@ -0,0 +1,178 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2008-12-19 06:40\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: utf-8\n"
+"Generated-By: pygettext.py 1.5\n"
+
+
+#: lib/sos/policyredhat.py:203
+msgid "Please enter your first initial and last name [%s]: "
+msgstr ""
+
+#: lib/sos/policyredhat.py:206
+msgid "Please enter the case number that you are generating this report for: "
+msgstr ""
+
+#: lib/sos/policyredhat.py:231
+msgid "Creating compressed archive..."
+msgstr ""
+
+#: lib/sos/policyredhat.py:253
+msgid "Encrypting archive..."
+msgstr ""
+
+#: lib/sos/policyredhat.py:271
+msgid "There was a problem encrypting your report."
+msgstr ""
+
+#: lib/sos/policyredhat.py:292
+msgid ""
+"Your sosreport has been generated and saved in:\n"
+"  %s"
+msgstr ""
+
+#: lib/sos/policyredhat.py:295
+msgid "The md5sum is: "
+msgstr ""
+
+#: lib/sos/policyredhat.py:297
+msgid "Please send this file to your support representative."
+msgstr ""
+
+#: lib/sos/policyredhat.py:323
+msgid "Cannot upload to specified URL."
+msgstr ""
+
+#: lib/sos/policyredhat.py:360
+msgid "There was a problem uploading your report to Red Hat support."
+msgstr ""
+
+#: lib/sos/policyredhat.py:362
+msgid "Your report was successfully uploaded to Red Hat's ftp server with name:"
+msgstr ""
+
+#: lib/sos/policyredhat.py:365
+msgid "Please communicate this name to your support representative."
+msgstr ""
+
+#: sosreport:401
+msgid "Could not create temporary directory."
+msgstr ""
+
+#: sosreport:457
+msgid "sosreport (version %s)"
+msgstr ""
+
+#: sosreport:474
+msgid "plugin %s does not validate, skipping"
+msgstr ""
+
+#: sosreport:480
+msgid "plugin %s skipped (--skip-plugins)"
+msgstr ""
+
+#: sosreport:484
+msgid "plugin %s is inactive (use -e or -o to enable)."
+msgstr ""
+
+#: sosreport:492
+msgid "plugin %s not specified in --only-plugins list"
+msgstr ""
+
+#: sosreport:497
+msgid "plugin %s does not install, skipping"
+msgstr ""
+
+#: sosreport:568
+msgid "processing options from plugin: %s"
+msgstr ""
+
+#: sosreport:579
+msgid "no valid plugins found"
+msgstr ""
+
+#: sosreport:584
+msgid "The following plugins are currently enabled:"
+msgstr ""
+
+#: sosreport:589
+msgid "No plugin enabled."
+msgstr ""
+
+#: sosreport:593
+msgid "The following plugins are currently disabled:"
+msgstr ""
+
+#: sosreport:600
+msgid "The following plugin options are available:"
+msgstr ""
+
+#: sosreport:620
+msgid "No plugin options available."
+msgstr ""
+
+#: sosreport:628
+msgid "sosreport requires root permissions to run."
+msgstr ""
+
+#: sosreport:635
+msgid "no valid plugins were enabled"
+msgstr ""
+
+#: sosreport:638
+msgid ""
+"This utility will collect some detailed  information about the\n"
+"hardware and  setup of your  Red Hat Enterprise Linux  system.\n"
+"The information is collected and an archive is  packaged under\n"
+"/tmp, which you can send to a support representative.\n"
+"Red Hat will use this information for diagnostic purposes ONLY\n"
+"and it will be considered confidential information.\n"
+"\n"
+"This process may take a while to complete.\n"
+"No changes will be made to your system.\n"
+"\n"
+msgstr ""
+
+#: sosreport:652
+msgid ""
+"Press ENTER to continue, or CTRL-C to quit.\n"
+msgstr ""
+
+#: sosreport:668
+msgid "One or more plugins have detected a problem in your configuration."
+msgstr ""
+
+#: sosreport:669
+msgid "Please review the following messages:"
+msgstr ""
+
+#: sosreport:685
+msgid "Are you sure you would like to continue (y/n) ? "
+msgstr ""
+
+#: sosreport:686
+msgid "Y"
+msgstr ""
+
+#: sosreport:686
+msgid "y"
+msgstr ""
+
+#: sosreport:689
+msgid "N"
+msgstr ""
+
+#: sosreport:689
+msgid "n"
+msgstr ""
+
diff --git a/src/locale/sq/LC_MESSAGES/sos.po b/src/po/sq.po
index 530f9aa7..530f9aa7 100644
--- a/src/locale/sq/LC_MESSAGES/sos.po
+++ b/src/po/sq.po
diff --git a/src/locale/sr/LC_MESSAGES/sos.po b/src/po/sr.po
index 2d46ceee..2d46ceee 100644
--- a/src/locale/sr/LC_MESSAGES/sos.po
+++ b/src/po/sr.po
diff --git a/src/locale/sr@latin/LC_MESSAGES/sos.po b/src/po/sr@latin.po
index 2d46ceee..2d46ceee 100644
--- a/src/locale/sr@latin/LC_MESSAGES/sos.po
+++ b/src/po/sr@latin.po
diff --git a/src/locale/sv/LC_MESSAGES/sos.po b/src/po/sv.po
index 3010c699..3010c699 100644
--- a/src/locale/sv/LC_MESSAGES/sos.po
+++ b/src/po/sv.po
diff --git a/src/locale/ta/LC_MESSAGES/sos.po b/src/po/ta.po
index e517e2e7..e517e2e7 100644
--- a/src/locale/ta/LC_MESSAGES/sos.po
+++ b/src/po/ta.po
diff --git a/src/locale/te/LC_MESSAGES/sos.po b/src/po/te.po
index 3b9ccfd8..3b9ccfd8 100644
--- a/src/locale/te/LC_MESSAGES/sos.po
+++ b/src/po/te.po
diff --git a/src/locale/th/LC_MESSAGES/sos.po b/src/po/th.po
index 86ead703..86ead703 100644
--- a/src/locale/th/LC_MESSAGES/sos.po
+++ b/src/po/th.po
diff --git a/src/locale/tr/LC_MESSAGES/sos.po b/src/po/tr.po
index 255bf880..255bf880 100644
--- a/src/locale/tr/LC_MESSAGES/sos.po
+++ b/src/po/tr.po
diff --git a/src/locale/uk/LC_MESSAGES/sos.po b/src/po/uk.po
index bc6846d5..bc6846d5 100644
--- a/src/locale/uk/LC_MESSAGES/sos.po
+++ b/src/po/uk.po
diff --git a/src/locale/ur/LC_MESSAGES/sos.po b/src/po/ur.po
index de0ab5d9..de0ab5d9 100644
--- a/src/locale/ur/LC_MESSAGES/sos.po
+++ b/src/po/ur.po
diff --git a/src/locale/vi/LC_MESSAGES/sos.po b/src/po/vi.po
index 4e713e61..4e713e61 100644
--- a/src/locale/vi/LC_MESSAGES/sos.po
+++ b/src/po/vi.po
diff --git a/src/locale/zh_CN/LC_MESSAGES/sos.po b/src/po/zh_CN.po
index b7212e1f..b7212e1f 100644
--- a/src/locale/zh_CN/LC_MESSAGES/sos.po
+++ b/src/po/zh_CN.po
diff --git a/src/locale/zh_TW/LC_MESSAGES/sos.po b/src/po/zh_TW.po
index 1ef4f9fe..1ef4f9fe 100644
--- a/src/locale/zh_TW/LC_MESSAGES/sos.po
+++ b/src/po/zh_TW.po
diff --git a/src/locale/zu/LC_MESSAGES/sos.po b/src/po/zu.po
index 5cae0a56..5cae0a56 100644
--- a/src/locale/zu/LC_MESSAGES/sos.po
+++ b/src/po/zu.po
diff --git a/src/setup.py b/src/setup.py
index f5fa60d8..e2f26d6a 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -20,81 +20,81 @@ setup(
     ('/usr/share/sos/',['gpgkeys/rhsupport.pub']),
     ('/usr/share/sysreport', ['extras/sysreport/text.xsl', 'extras/sysreport/functions', 'extras/sysreport/sysreport-fdisk']), 
     ('/usr/share/man/man1', ['sosreport.1.gz']),
-	('/usr/share/locale/af/LC_MESSAGES', ['locale/af/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/am/LC_MESSAGES', ['locale/am/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/ar/LC_MESSAGES', ['locale/ar/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/as/LC_MESSAGES', ['locale/as/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/be/LC_MESSAGES', ['locale/be/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/bg/LC_MESSAGES', ['locale/bg/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/bn/LC_MESSAGES', ['locale/bn/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/bn_IN/LC_MESSAGES', ['locale/bn_IN/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/bs/LC_MESSAGES', ['locale/bs/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/ca/LC_MESSAGES', ['locale/ca/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/cs/LC_MESSAGES', ['locale/cs/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/cy/LC_MESSAGES', ['locale/cy/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/da/LC_MESSAGES', ['locale/da/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/de/LC_MESSAGES', ['locale/de/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/el/LC_MESSAGES', ['locale/el/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/en/LC_MESSAGES', ['locale/en/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/en_GB/LC_MESSAGES', ['locale/en_GB/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/es/LC_MESSAGES', ['locale/es/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/et/LC_MESSAGES', ['locale/et/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/eu_ES/LC_MESSAGES', ['locale/eu_ES/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/fa/LC_MESSAGES', ['locale/fa/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/fi/LC_MESSAGES', ['locale/fi/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/fr/LC_MESSAGES', ['locale/fr/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/gl/LC_MESSAGES', ['locale/gl/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/gu/LC_MESSAGES', ['locale/gu/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/he/LC_MESSAGES', ['locale/he/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/hi/LC_MESSAGES', ['locale/hi/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/hr/LC_MESSAGES', ['locale/hr/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/hu/LC_MESSAGES', ['locale/hu/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/hy/LC_MESSAGES', ['locale/hy/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/id/LC_MESSAGES', ['locale/id/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/ilo/LC_MESSAGES', ['locale/ilo/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/is/LC_MESSAGES', ['locale/is/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/it/LC_MESSAGES', ['locale/it/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/ja/LC_MESSAGES', ['locale/ja/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/ka/LC_MESSAGES', ['locale/ka/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/kn/LC_MESSAGES', ['locale/kn/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/ko/LC_MESSAGES', ['locale/ko/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/ku/LC_MESSAGES', ['locale/ku/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/lo/LC_MESSAGES', ['locale/lo/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/lt/LC_MESSAGES', ['locale/lt/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/lv/LC_MESSAGES', ['locale/lv/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/mk/LC_MESSAGES', ['locale/mk/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/ml/LC_MESSAGES', ['locale/ml/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/mr/LC_MESSAGES', ['locale/mr/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/ms/LC_MESSAGES', ['locale/ms/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/my/LC_MESSAGES', ['locale/my/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/nb/LC_MESSAGES', ['locale/nb/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/nl/LC_MESSAGES', ['locale/nl/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/nn/LC_MESSAGES', ['locale/nn/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/no/LC_MESSAGES', ['locale/no/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/nso/LC_MESSAGES', ['locale/nso/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/or/LC_MESSAGES', ['locale/or/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/pa/LC_MESSAGES', ['locale/pa/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/pl/LC_MESSAGES', ['locale/pl/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/pt/LC_MESSAGES', ['locale/pt/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/pt_BR/LC_MESSAGES', ['locale/pt_BR/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/ro/LC_MESSAGES', ['locale/ro/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/ru/LC_MESSAGES', ['locale/ru/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/si/LC_MESSAGES', ['locale/si/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/sk/LC_MESSAGES', ['locale/sk/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/sl/LC_MESSAGES', ['locale/sl/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/sq/LC_MESSAGES', ['locale/sq/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/sr/LC_MESSAGES', ['locale/sr/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/sr@latin/LC_MESSAGES', ['locale/sr@latin/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/sv/LC_MESSAGES', ['locale/sv/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/ta/LC_MESSAGES', ['locale/ta/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/te/LC_MESSAGES', ['locale/te/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/th/LC_MESSAGES', ['locale/th/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/tr/LC_MESSAGES', ['locale/tr/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/uk/LC_MESSAGES', ['locale/uk/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/ur/LC_MESSAGES', ['locale/ur/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/vi/LC_MESSAGES', ['locale/vi/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/zh_CN/LC_MESSAGES', ['locale/zh_CN/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/zh_TW/LC_MESSAGES', ['locale/zh_TW/LC_MESSAGES/sos.mo']),
-	('/usr/share/locale/zu/LC_MESSAGES', ['locale/zu/LC_MESSAGES/sos.mo']),
+	('/usr/share/locale/af/LC_MESSAGES', ['po/af/sos.mo']),
+	('/usr/share/locale/am/LC_MESSAGES', ['po/am/sos.mo']),
+	('/usr/share/locale/ar/LC_MESSAGES', ['po/ar/sos.mo']),
+	('/usr/share/locale/as/LC_MESSAGES', ['po/as/sos.mo']),
+	('/usr/share/locale/be/LC_MESSAGES', ['po/be/sos.mo']),
+	('/usr/share/locale/bg/LC_MESSAGES', ['po/bg/sos.mo']),
+	('/usr/share/locale/bn/LC_MESSAGES', ['po/bn/sos.mo']),
+	('/usr/share/locale/bn_IN/LC_MESSAGES', ['po/bn_IN/sos.mo']),
+	('/usr/share/locale/bs/LC_MESSAGES', ['po/bs/sos.mo']),
+	('/usr/share/locale/ca/LC_MESSAGES', ['po/ca/sos.mo']),
+	('/usr/share/locale/cs/LC_MESSAGES', ['po/cs/sos.mo']),
+	('/usr/share/locale/cy/LC_MESSAGES', ['po/cy/sos.mo']),
+	('/usr/share/locale/da/LC_MESSAGES', ['po/da/sos.mo']),
+	('/usr/share/locale/de/LC_MESSAGES', ['po/de/sos.mo']),
+	('/usr/share/locale/el/LC_MESSAGES', ['po/el/sos.mo']),
+	('/usr/share/locale/en/LC_MESSAGES', ['po/en/sos.mo']),
+	('/usr/share/locale/en_GB/LC_MESSAGES', ['po/en_GB/sos.mo']),
+	('/usr/share/locale/es/LC_MESSAGES', ['po/es/sos.mo']),
+	('/usr/share/locale/et/LC_MESSAGES', ['po/et/sos.mo']),
+	('/usr/share/locale/eu_ES/LC_MESSAGES', ['po/eu_ES/sos.mo']),
+	('/usr/share/locale/fa/LC_MESSAGES', ['po/fa/sos.mo']),
+	('/usr/share/locale/fi/LC_MESSAGES', ['po/fi/sos.mo']),
+	('/usr/share/locale/fr/LC_MESSAGES', ['po/fr/sos.mo']),
+	('/usr/share/locale/gl/LC_MESSAGES', ['po/gl/sos.mo']),
+	('/usr/share/locale/gu/LC_MESSAGES', ['po/gu/sos.mo']),
+	('/usr/share/locale/he/LC_MESSAGES', ['po/he/sos.mo']),
+	('/usr/share/locale/hi/LC_MESSAGES', ['po/hi/sos.mo']),
+	('/usr/share/locale/hr/LC_MESSAGES', ['po/hr/sos.mo']),
+	('/usr/share/locale/hu/LC_MESSAGES', ['po/hu/sos.mo']),
+	('/usr/share/locale/hy/LC_MESSAGES', ['po/hy/sos.mo']),
+	('/usr/share/locale/id/LC_MESSAGES', ['po/id/sos.mo']),
+	('/usr/share/locale/ilo/LC_MESSAGES', ['po/ilo/sos.mo']),
+	('/usr/share/locale/is/LC_MESSAGES', ['po/is/sos.mo']),
+	('/usr/share/locale/it/LC_MESSAGES', ['po/it/sos.mo']),
+	('/usr/share/locale/ja/LC_MESSAGES', ['po/ja/sos.mo']),
+	('/usr/share/locale/ka/LC_MESSAGES', ['po/ka/sos.mo']),
+	('/usr/share/locale/kn/LC_MESSAGES', ['po/kn/sos.mo']),
+	('/usr/share/locale/ko/LC_MESSAGES', ['po/ko/sos.mo']),
+	('/usr/share/locale/ku/LC_MESSAGES', ['po/ku/sos.mo']),
+	('/usr/share/locale/lo/LC_MESSAGES', ['po/lo/sos.mo']),
+	('/usr/share/locale/lt/LC_MESSAGES', ['po/lt/sos.mo']),
+	('/usr/share/locale/lv/LC_MESSAGES', ['po/lv/sos.mo']),
+	('/usr/share/locale/mk/LC_MESSAGES', ['po/mk/sos.mo']),
+	('/usr/share/locale/ml/LC_MESSAGES', ['po/ml/sos.mo']),
+	('/usr/share/locale/mr/LC_MESSAGES', ['po/mr/sos.mo']),
+	('/usr/share/locale/ms/LC_MESSAGES', ['po/ms/sos.mo']),
+	('/usr/share/locale/my/LC_MESSAGES', ['po/my/sos.mo']),
+	('/usr/share/locale/nb/LC_MESSAGES', ['po/nb/sos.mo']),
+	('/usr/share/locale/nl/LC_MESSAGES', ['po/nl/sos.mo']),
+	('/usr/share/locale/nn/LC_MESSAGES', ['po/nn/sos.mo']),
+	('/usr/share/locale/no/LC_MESSAGES', ['po/no/sos.mo']),
+	('/usr/share/locale/nso/LC_MESSAGES', ['po/nso/sos.mo']),
+	('/usr/share/locale/or/LC_MESSAGES', ['po/or/sos.mo']),
+	('/usr/share/locale/pa/LC_MESSAGES', ['po/pa/sos.mo']),
+	('/usr/share/locale/pl/LC_MESSAGES', ['po/pl/sos.mo']),
+	('/usr/share/locale/pt/LC_MESSAGES', ['po/pt/sos.mo']),
+	('/usr/share/locale/pt_BR/LC_MESSAGES', ['po/pt_BR/sos.mo']),
+	('/usr/share/locale/ro/LC_MESSAGES', ['po/ro/sos.mo']),
+	('/usr/share/locale/ru/LC_MESSAGES', ['po/ru/sos.mo']),
+	('/usr/share/locale/si/LC_MESSAGES', ['po/si/sos.mo']),
+	('/usr/share/locale/sk/LC_MESSAGES', ['po/sk/sos.mo']),
+	('/usr/share/locale/sl/LC_MESSAGES', ['po/sl/sos.mo']),
+	('/usr/share/locale/sq/LC_MESSAGES', ['po/sq/sos.mo']),
+	('/usr/share/locale/sr/LC_MESSAGES', ['po/sr/sos.mo']),
+	('/usr/share/locale/sr@latin/LC_MESSAGES', ['po/sr@latin/sos.mo']),
+	('/usr/share/locale/sv/LC_MESSAGES', ['po/sv/sos.mo']),
+	('/usr/share/locale/ta/LC_MESSAGES', ['po/ta/sos.mo']),
+	('/usr/share/locale/te/LC_MESSAGES', ['po/te/sos.mo']),
+	('/usr/share/locale/th/LC_MESSAGES', ['po/th/sos.mo']),
+	('/usr/share/locale/tr/LC_MESSAGES', ['po/tr/sos.mo']),
+	('/usr/share/locale/uk/LC_MESSAGES', ['po/uk/sos.mo']),
+	('/usr/share/locale/ur/LC_MESSAGES', ['po/ur/sos.mo']),
+	('/usr/share/locale/vi/LC_MESSAGES', ['po/vi/sos.mo']),
+	('/usr/share/locale/zh_CN/LC_MESSAGES', ['po/zh_CN/sos.mo']),
+	('/usr/share/locale/zh_TW/LC_MESSAGES', ['po/zh_TW/sos.mo']),
+	('/usr/share/locale/zu/LC_MESSAGES', ['po/zu/sos.mo']),
 	]
 )
diff --git a/src/sos.spec b/src/sos.spec
index cff1dc17..4e459c24 100644
--- a/src/sos.spec
+++ b/src/sos.spec
@@ -5,7 +5,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 6%{?dist}
+Release: 9%{?dist}
 Group: Application/Tools
 Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
@@ -31,28 +31,34 @@ support technicians and developers.
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub
+install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/rhsupport.pub
+install -D -m644 extras/sysreport/sysreport.legacy ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/sysreport
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport
+%find_lang %{name}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/rh-upload-core
 %{_sbindir}/sosreport
 %{_sbindir}/sysreport
 %{_sbindir}/sysreport.legacy
-/usr/share/sysreport
-/usr/share/sos/rhsupport.pub
+%{_datadir}/%{name}
+%{_datadir}/sysreport
 %{python_sitelib}/*
 %{_mandir}/man1/sosreport.1.gz
-%{_localedir}/*/LC_MESSAGES/sos.mo
+#%{_localedir}/*/LC_MESSAGES
 %doc README README.rh-upload-core TODO LICENSE ChangeLog
 %config %{_sysconfdir}/sos.conf
 
 %changelog
+* Wed Jan 21 2009 Adam Stokes <ajs at redhat dot com> - 1.8-9
+- Resolves: bz436053 /usr/share/sos is not owned by any package 
+- Resolves: bz434626 Wrong directory structure for translations 
+
 * Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 1.8-5
 - removed source defines as python manifest handles this
 
diff --git a/src/sosreport b/src/sosreport
index e94dc269..c7fbf070 100755
--- a/src/sosreport
+++ b/src/sosreport
@@ -402,8 +402,8 @@ def sosreport():
     # find the plugins path
     paths = sys.path
     for path in paths:
-        if path.strip()[-len("site-packages"):] == "site-packages" and \ 
-        os.path.isdir(path + "/sos/plugins"):
+        if path.strip()[-len("site-packages"):] == "site-packages" \
+        and os.path.isdir(path + "/sos/plugins"):
             pluginpath = path + "/sos/plugins"
 
     # Set up common info and create destinations