diff --git a/Makefile b/Makefile
index f37573b..bbb27b1 100644
--- a/Makefile
+++ b/Makefile
@@ -337,6 +337,7 @@ po/POTFILES.in:
 	find etc-conf/ -name "*.desktop.in" >> po/POTFILES.in
 	find $(RCT_SRC_DIR)/ -name "*.py" >> po/POTFILES.in
 	find $(RD_SRC_DIR)/ -name "*.py" >> po/POTFILES.in
+	echo $$(echo `pwd`|rev | sed -r 's|[^/]+|..|g') | sed 's|$$|$(shell find /usr/lib*/python2* -name "optparse.py")|' >> po/POTFILES.in

 .PHONY: po/POTFILES.in %.desktop

diff --git a/po/as.po b/po/as.po
index 2a7e7da..b4b718f 100644
--- a/po/as.po
+++ b/po/as.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
-"PO-Revision-Date: 2014-02-28 04:29-0500\n"
+"PO-Revision-Date: 2014-03-05 04:58-0500\n"
 "Last-Translator: ngoswami <ngoswami@fedoraproject.org>\n"
 "Language-Team: Assamese\n"
 "Language: as\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
@@ -202,7 +202,7 @@ msgstr "%%prog %s [বিকল্পসমূহ]"
 #: ../src/subscription_manager/cli.py:93
 #, python-format
 msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
-msgstr "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
+msgstr "ব্যৱহাৰ: %s মডিউল-নাম [মডিউল-বিকল্পসমূহ] [--help]"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author ngoswami
 #: ../src/subscription_manager/cli.py:105
diff --git a/po/bn_IN.po b/po/bn_IN.po
index b1d9591..9db6661 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
-"PO-Revision-Date: 2014-02-28 03:03-0500\n"
+"PO-Revision-Date: 2014-03-10 02:22-0400\n"
 "Last-Translator: bnin <sray@redhat.com>\n"
 "Language-Team: Bengali (India)\n"
 "Language: bn-IN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
@@ -202,7 +202,7 @@ msgstr "%%prog %s [বিকল্প]"
 #: ../src/subscription_manager/cli.py:93
 #, python-format
 msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
-msgstr "ব্যবহারপ্রণালী: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
+msgstr "ব্যবহারপ্রণালী: %s মডিউল-নাম [মডিউল-বিকল্প] [--help]"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author Runa Bhattacharjee
 #: ../src/subscription_manager/cli.py:105
diff --git a/po/de_DE.po b/po/de_DE.po
index cc98d56..a82a7c3 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
diff --git a/po/es_ES.po b/po/es_ES.po
index 19992c8..0c0e385 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -10,14 +10,14 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
-"PO-Revision-Date: 2014-02-27 08:38-0500\n"
-"Last-Translator: Gladys Guerrero Lozano <gladysguerrerolozano419@gmail.com>\n"
+"PO-Revision-Date: 2014-03-04 05:31-0500\n"
+"Last-Translator: John Sefler <jsefler@redhat.com>\n"
 "Language-Team: Spanish (Spain)\n"
 "Language: es-ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
@@ -4482,8 +4482,7 @@ msgid ""
 "subscriptions to this system after completing firstboot."
 msgstr ""
 "Necesitará utilizar el Gestor de suscripciones de Red Hat para vincular "
-"manualmente suscripciones a este sistema después de completar el primer "
-"inicio. "
+"manualmente suscripciones a este sistema después de completar firstboot."

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author Gladys Guerrero Lozano
 #: ../src/subscription_manager/gui/data/manually_subscribe.glade.h:2
diff --git a/po/fr.po b/po/fr.po
index b1bbdf3..90c987b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
diff --git a/po/gu.po b/po/gu.po
index 60d6511..425330b 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -9,14 +9,14 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
-"PO-Revision-Date: 2014-02-05 06:25-0500\n"
-"Last-Translator: John Sefler <jsefler@redhat.com>\n"
+"PO-Revision-Date: 2014-03-06 02:09-0500\n"
+"Last-Translator: Ankit Patel <ankit@redhat.com>\n"
 "Language-Team: Gujarati\n"
 "Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
@@ -204,7 +204,7 @@ msgstr "%%prog %s [વિકલ્પો]"
 #: ../src/subscription_manager/cli.py:93
 #, python-format
 msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
-msgstr "વપરાશ: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
+msgstr "વપરાશ: %s મોડ્યુલ-નામ [મોડ્યુલ-વિકલ્પો] [--help]"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author swkothar
 #: ../src/subscription_manager/cli.py:105
diff --git a/po/hi.po b/po/hi.po
index 9e60df7..7c07d19 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
-"PO-Revision-Date: 2014-02-28 05:15-0500\n"
+"PO-Revision-Date: 2014-03-10 02:29-0400\n"
 "Last-Translator: rajesh <rajesh@fedoraproject.org>\n"
 "Language-Team: Hindi <kde-i18n-doc@kde.org>\n"
 "Language: hi\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author rajesh
 #. note default is lower caps
@@ -4355,8 +4355,8 @@ msgid ""
 "You will need to use Red Hat Subscription Manager to manually attach "
 "subscriptions to this system after completing firstboot."
 msgstr ""
-"आपको Red Hat सदस्यता प्रबंधन को दस्ती रूप से इस तंत्र में जोड़ने के बाद फर्स्टबूट पूरा होने के "
-"बाद उपयोग की जरूरत होगी."
+"आपको Red Hat सदस्यता प्रबंधन को दस्ती रूप से इस तंत्र में जोड़ने के बाद firstboot पूरा होने "
+"के बाद उपयोग की जरूरत होगी."

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
 #: ../src/subscription_manager/gui/data/manually_subscribe.glade.h:2
diff --git a/po/it.po b/po/it.po
index 401876a..9b2155c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author fvalen
diff --git a/po/ja.po b/po/ja.po
index d2a5f89..c37986a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -18,7 +18,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=1; plural=0\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
diff --git a/po/kn.po b/po/kn.po
index e0089e5..00f312a 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,19 +1,20 @@
 # bkearney <bkearney@fedoraproject.org>, 2013. #zanata
 # shanky <shanky@fedoraproject.org>, 2013. #zanata
+# John Sefler <jsefler@redhat.com>, 2014. #zanata
 # shanky <shanky@fedoraproject.org>, 2014. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
-"PO-Revision-Date: 2014-02-28 03:05-0500\n"
-"Last-Translator: shanky <shanky@fedoraproject.org>\n"
+"PO-Revision-Date: 2014-03-11 05:11-0400\n"
+"Last-Translator: John Sefler <jsefler@redhat.com>\n"
 "Language-Team: Kannada\n"
 "Language: kn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=2; plural=(n!=1)\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
@@ -201,7 +202,7 @@ msgstr "%%prog %s [ಆಯ್ಕೆಗಳು]"
 #: ../src/subscription_manager/cli.py:93
 #, python-format
 msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
-msgstr "ಬಳಕೆ: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
+msgstr "ಬಳಕೆ: %s ಮಾಡ್ಯೂಲ್-ಹೆಸರು [ಮಾಡ್ಯೂಲ್-ಆಯ್ಕೆಗಳು] [--help]"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author shanky
 #: ../src/subscription_manager/cli.py:105
@@ -1706,7 +1707,7 @@ msgstr "ಆವೃತ್ತಿಯ ಮಾಹಿತಿಯನ್ನು ಮುದ್
 #: ../src/subscription_manager/managercli.py:2332
 #, python-format
 msgid "subscription management server: %s"
-msgstr "subscription management ಪೂರೈಕೆಗಣಕ: %s"
+msgstr "ಚಂದಾದಾರಿಕೆ ವ್ಯವಸ್ಥಾಪನಾ ಪೂರೈಕೆಗಣಕ: %s"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author shanky
 #: ../src/subscription_manager/managercli.py:2333
@@ -1874,8 +1875,7 @@ msgid ""
 "don't execute the auto-attach option while registering with subscription "
 "manager"
 msgstr ""
-"subscription manager ನೊಂದಿಗೆ ನೋಂದಾಯಿಸುವಾಗ auto-attach ಆಯ್ಕೆಯನ್ನು "
-"ಕಾರ್ಯಗತಗೊಳಿಸಬೇಡ."
+"ಚಂದಾದಾರ ವ್ಯವಸ್ಥಾಪಕ ನೊಂದಿಗೆ ನೋಂದಾಯಿಸುವಾಗ auto-attach ಆಯ್ಕೆಯನ್ನು ಕಾರ್ಯಗತಗೊಳಿಸಬೇಡ."

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
 #: ../src/subscription_manager/migrate/migrate.py:161
@@ -1889,7 +1889,7 @@ msgstr ""
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author shanky
 #: ../src/subscription_manager/migrate/migrate.py:164
 msgid "specify the subscription management server to migrate to"
-msgstr "ಇಲ್ಲಿಗೆ ವರ್ಗಾಯಿಸಬೇಕಿರುವ subscription manager ಪೂರೈಕೆಗಣಕವನ್ನು ಸೂಚಿಸಿ."
+msgstr "ಇಲ್ಲಿಗೆ ವರ್ಗಾಯಿಸಬೇಕಿರುವ ಚಂದಾದಾರಿಕೆ ವ್ಯವಸ್ಥಾಪನಾ ಪೂರೈಕೆಗಣಕವನ್ನು ಸೂಚಿಸಿ."

 #: ../src/subscription_manager/migrate/migrate.py:166
 msgid "specify the Red Hat user name"
@@ -1962,7 +1962,7 @@ msgid ""
 "Management.  Exiting."
 msgstr ""
 "\n"
-"ಈ ವ್ಯವಸ್ಥೆಯನ್ನು ಈಗಾಗಲೆ Red Hat Subscription Managementಗೆ  ನೋಂದಾಯಿಸಲಾಗಿದೆ. "
+"ಈ ವ್ಯವಸ್ಥೆಯನ್ನು ಈಗಾಗಲೆ Red Hat ಚಂದಾದಾರಿಕೆ ವ್ಯವಸ್ಥಾಪನಾಗೆ  ನೋಂದಾಯಿಸಲಾಗಿದೆ. "
 "ನಿರ್ಗಮಿಸಲಾಗುತ್ತಿದೆ."

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
@@ -2131,7 +2131,7 @@ msgstr "RHN Classic ‌ನಿಂದ ನೋಂದಣಿಯನ್ನು ರದ್
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author shanky
 #: ../src/subscription_manager/migrate/migrate.py:622
 msgid "Attempting to register system to Red Hat Subscription Management..."
-msgstr "Red Hat ನ subscription managementಗೆ ನೋಂದಾಯಿಸಲು ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತಿದೆ..."
+msgstr "Red Hat ನ ಚಂದಾದಾರಿಕೆ ವ್ಯವಸ್ಥಾಪನಾಗೆ ನೋಂದಾಯಿಸಲು ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತಿದೆ..."

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
 #: ../src/subscription_manager/migrate/migrate.py:635
@@ -2150,7 +2150,7 @@ msgstr ""
 msgid ""
 "System '%s' successfully registered to Red Hat Subscription Management.\n"
 msgstr ""
-"'%s' ವ್ಯವಸ್ಥೆಯನ್ನು ಯಶಸ್ವಿಯಾಗಿ Red Hat Subscription Managementಗೆ ನೋಂದಾಯಿಸಲಾಗಿದೆ.\n"
+"'%s' ವ್ಯವಸ್ಥೆಯನ್ನು ಯಶಸ್ವಿಯಾಗಿ Red Hat ಚಂದಾದಾರಿಕೆ ವ್ಯವಸ್ಥಾಪನಾಗೆ ನೋಂದಾಯಿಸಲಾಗಿದೆ.\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author shanky
 #. Display an actual message for the empty string level.
@@ -2334,8 +2334,8 @@ msgid ""
 "Unregister this system from the Customer Portal or another subscription "
 "management service"
 msgstr ""
-"ಗ್ರಾಹಕರ ಪೋರ್ಟಲ್‌ ಅಥವ ಬೇರೊಂದು subscription management ಸೇವೆಯಿಂದ ಈ ವ್ಯವಸ್ಥೆಯ "
-"ನೋಂದಣಿಯನ್ನು ರದ್ದುಗೊಳಿಸು"
+"ಗ್ರಾಹಕರ ಪೋರ್ಟಲ್‌ ಅಥವ ಬೇರೊಂದು ಚಂದಾದಾರಿಕೆ ವ್ಯವಸ್ಥಾಪನಾ ಸೇವೆಯಿಂದ ಈ ವ್ಯವಸ್ಥೆಯ ನೋಂದಣಿಯನ್ನು "
+"ರದ್ದುಗೊಳಿಸು"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author shanky
 #: ../src/subscription_manager/branding/redhat_branding.py:10
@@ -2390,7 +2390,7 @@ msgid ""
 "This system is registered using both RHN Classic and Red Hat Subscription "
 "Management."
 msgstr ""
-"ಈ ವ್ಯವಸ್ಥೆಯನ್ನು RHN Classic ಮತ್ತು Red Hat Subscription Management ಯನ್ನು ಬಳಸಿಕೊಂಡು "
+"ಈ ವ್ಯವಸ್ಥೆಯನ್ನು RHN Classic ಮತ್ತು Red Hat ಚಂದಾದಾರಿಕೆ ವ್ಯವಸ್ಥಾಪನಾವನ್ನು ಬಳಸಿಕೊಂಡು "
 "ನೋಂದಾಯಿಸಲಾಗಿದೆ."

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author shanky
@@ -2411,7 +2411,7 @@ msgstr ""
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author shanky
 #: ../src/subscription_manager/branding/redhat_branding.py:28
 msgid "RHN Classic and Red Hat Subscription Management"
-msgstr "RHN Classic ಮತ್ತು Red Hat Subscription Management"
+msgstr "RHN Classic ಮತ್ತು Red Hat ಚಂದಾದಾರಿಕೆ ವ್ಯವಸ್ಥಾಪನಾ"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author shanky
 #: ../src/subscription_manager/branding/redhat_branding.py:30
@@ -2711,7 +2711,7 @@ msgid ""
 "'Subscription Manager' to manually attach a subscription."
 msgstr ""
 "ಸ್ವಯಂ-ಲಗತ್ತಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ, ಪೂರೈಕೆಗಣಕವು ಸೇವಾ ಹಂತಗಳನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ. ಒಂದು "
-"ಚಂದಾದಾರಿಕೆಯನ್ನು ಕೈಯಾರೆ ಲಗತ್ತಿಸಲು ದಯವಿಟ್ಟು 'subscription manager' ಅನ್ನು ಚಲಾಯಿಸಿ."
+"ಚಂದಾದಾರಿಕೆಯನ್ನು ಕೈಯಾರೆ ಲಗತ್ತಿಸಲು ದಯವಿಟ್ಟು 'ಚಂದಾದಾರ ವ್ಯವಸ್ಥಾಪಕ' ಅನ್ನು ಚಲಾಯಿಸಿ."

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
 #: ../src/subscription_manager/gui/firstboot/rhsm_login.py:68
@@ -2748,7 +2748,7 @@ msgid ""
 "'Subscription Manager' to manually attach subscriptions."
 msgstr ""
 "ಯಾವ ಸೇವಾ ಮಟ್ಟಗಳೂ ಸಹ ಅನುಸ್ಥಾಪಿಸಲಾದ ಎಲ್ಲಾ ಉತ್ಪನ್ನಗಳನ್ನು ಒಳಗೊಂಡಿರುವುದಿಲ್ಲ. "
-"ಚಂದಾದಾರಿಕೆಗಳನ್ನು ಕೈಯಾರೆ ಲಗತ್ತಿಸಲು 'Subscription Manager' ಅನ್ನು ಚಲಾಯಿಸಿ."
+"ಚಂದಾದಾರಿಕೆಗಳನ್ನು ಕೈಯಾರೆ ಲಗತ್ತಿಸಲು 'ಚಂದಾದಾರ ವ್ಯವಸ್ಥಾಪಕ' ಅನ್ನು ಚಲಾಯಿಸಿ."

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
 #: ../src/subscription_manager/gui/firstboot/rhsm_login.py:126
@@ -2766,7 +2766,7 @@ msgstr "ಪೂರ್ಣಗೊಳಿಸು"
 #. firstboot modules, not just the rhsm ones. See bz #828042
 #: ../src/subscription_manager/gui/firstboot/rhsm_login.py:196
 msgid "Subscription Management Registration"
-msgstr "Subscription Management ನ ನೋಂದಣಿ"
+msgstr "ಚಂದಾದಾರಿಕೆ ವ್ಯವಸ್ಥಾಪನಾ ನೋಂದಣಿ"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author shanky
 #: ../src/subscription_manager/gui/firstboot/rhsm_login.py:197
@@ -3273,7 +3273,7 @@ msgstr "<b>python-rhsm ಆವೃತ್ತಿ:</b> %s"
 #: ../src/subscription_manager/gui/about.py:76
 #, python-format
 msgid "<b>subscription management service version:</b> %s"
-msgstr "<b>subscription management ಸೇವೆಯ ಆವೃತ್ತಿ:</b> %s"
+msgstr "<b>ಚಂದಾದಾರಿಕೆ ವ್ಯವಸ್ಥಾಪನಾ ಸೇವೆಯ ಆವೃತ್ತಿ:</b> %s"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
 #: ../src/subscription_manager/gui/about.py:100
@@ -4433,8 +4433,8 @@ msgid ""
 "You will need to use Red Hat Subscription Manager to manually attach "
 "subscriptions to this system after completing firstboot."
 msgstr ""
-"ಪ್ರಥಮಬೂಟ್‌ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ ನಂತರ ನೀವು ಈ ವ್ಯವಸ್ಥೆಗೆ ಚಂದಾದಾರಿಕೆಗಳನ್ನು ಕೈಯಾರೆ "
-"ಲಗತ್ತಿಸಲು  Red Hat ಚಂದಾದಾರಿಕೆ ವ್ಯವಸ್ಥಾಪಕವನ್ನು ಬಳಸಬೇಕಾಗುತ್ತದೆ."
+"firstboot ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ ನಂತರ ನೀವು ಈ ವ್ಯವಸ್ಥೆಗೆ ಚಂದಾದಾರಿಕೆಗಳನ್ನು ಕೈಯಾರೆ "
+"ಲಗತ್ತಿಸಲು Red Hat ಚಂದಾದಾರಿಕೆ ವ್ಯವಸ್ಥಾಪಕವನ್ನು ಬಳಸಬೇಕಾಗುತ್ತದೆ."

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author shanky
 #: ../src/subscription_manager/gui/data/manually_subscribe.glade.h:2
@@ -4442,8 +4442,8 @@ msgid ""
 "After opening Red Hat Subscription Manager, manually attach subscriptions "
 "via the <b>All Available Subscriptions</b> tab."
 msgstr ""
-"Red Hat Subscription Manager ಅನ್ನು ತೆರೆದ ನಂತರ, <b>ಲಭ್ಯವಿರುವ ಎಲ್ಲಾ ಚಂದಾರಿಕೆಗಳು</"
-"b> ಟ್ಯಾಬ್‌ ಮುಖಾಂತರ ಚಂದಾದಾರಿಕೆಗಳನ್ನು ಕೈಯಾರೆ ಲಗತ್ತಿಸಿ."
+"Red Hat ಚಂದಾದಾರ ವ್ಯವಸ್ಥಾಪಕ ಅನ್ನು ತೆರೆದ ನಂತರ, <b>ಲಭ್ಯವಿರುವ ಎಲ್ಲಾ ಚಂದಾರಿಕೆಗಳು</b> "
+"ಟ್ಯಾಬ್‌ ಮುಖಾಂತರ ಚಂದಾದಾರಿಕೆಗಳನ್ನು ಕೈಯಾರೆ ಲಗತ್ತಿಸಿ."

 #: ../src/subscription_manager/gui/data/repositories.glade.h:1
 msgid "Manage Repositories"
@@ -5141,8 +5141,8 @@ msgid ""
 "system must be registered with the Customer Portal. Please enter your Red "
 "Hat login to ensure your system is up-to-date."
 msgstr ""
-"Subscription Manager ನಿಮ್ಮ ವ್ಯವಸ್ಥೆಗಾಗಿ ಅಪ್‌ಡೇಟ್‌ಗಳನ್ನು ಒದಗಿಸಲು, ನಿಮ್ಮ ವ್ಯವಸ್ಥೆಯನ್ನು "
-"ಗ್ರಾಹಕರ ಪೋರ್ಟಲ್‌ನಲ್ಲಿ ನೋಂದಾಯಿಸಬೇಕು. ನಿಮ್ಮ ವ್ಯವಸ್ಥೆಯು ಅಪ್‌-ಟು-ಡೇಟ್ ಆಗಿದೆ ಎನ್ನುವುದನ್ನು "
+"ಚಂದಾದಾರ ವ್ಯವಸ್ಥಾಪಕ ನಿಮ್ಮ ವ್ಯವಸ್ಥೆಗಾಗಿ ಅಪ್‌ಡೇಟ್‌ಗಳನ್ನು ಒದಗಿಸಲು, ನಿಮ್ಮ ವ್ಯವಸ್ಥೆಯನ್ನು ಗ್ರಾಹಕರ "
+"ಪೋರ್ಟಲ್‌ನಲ್ಲಿ ನೋಂದಾಯಿಸಬೇಕು. ನಿಮ್ಮ ವ್ಯವಸ್ಥೆಯು ಅಪ್‌-ಟು-ಡೇಟ್ ಆಗಿದೆ ಎನ್ನುವುದನ್ನು "
 "ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಲು ನಿಮ್ಮ Red Hat ಲಾಗಿನ್ ಅನ್ನು ದಾಖಲಿಸಿ."

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
diff --git a/po/ko.po b/po/ko.po
index f8b1223..72f6e83 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
-"PO-Revision-Date: 2014-03-03 06:40-0500\n"
+"PO-Revision-Date: 2014-03-13 07:22-0400\n"
 "Last-Translator: eukim <eukim@fedoraproject.org>\n"
 "Language-Team: Korean\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=1; plural=0\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author eukim
@@ -203,7 +203,7 @@ msgstr "%%prog %s [옵션]"
 #: ../src/subscription_manager/cli.py:93
 #, python-format
 msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
-msgstr "사용법: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
+msgstr "사용법: %s 모듈-이름 [모듈-옵션] [--help]"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author eukim
 #: ../src/subscription_manager/cli.py:105
diff --git a/po/ml.po b/po/ml.po
index e8596e3..efdaba3 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
-"PO-Revision-Date: 2014-02-28 03:15-0500\n"
-"Last-Translator: anipeter <anipeter@fedoraproject.org>\n"
+"PO-Revision-Date: 2014-03-06 08:51-0500\n"
+"Last-Translator: John Sefler <jsefler@redhat.com>\n"
 "Language-Team: Malayalam\n"
 "Language: ml\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
@@ -203,7 +203,7 @@ msgstr "%%prog %s [ഐച്ഛികങ്ങള്‍]"
 #: ../src/subscription_manager/cli.py:93
 #, python-format
 msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
-msgstr "ഉപയോഗിയ്ക്കേണ്ട വിധം: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
+msgstr "ഉപയോഗിയ്ക്കേണ്ട വിധം: %s ഘടകത്തിന്റെ പേരു് [ഘടകത്തിനുള്ള ഐച്ഛികങ്ങള്‍] [--help]"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author anipeter
 #: ../src/subscription_manager/cli.py:105
diff --git a/po/mr.po b/po/mr.po
index ffb3948..7fc5b29 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1,20 +1,21 @@
 # Sandeep Shedmake <sshedmak@redhat.com>, 2014.
 # John Sefler <jsefler@redhat.com>, 2013. #zanata
 # sandeeps <sandeeps@fedoraproject.org>, 2013. #zanata
+# sandeeps <sandeeps@fedoraproject.org>, 2014. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
-"PO-Revision-Date: 2014-03-03 03:30-0500\n"
-"Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
+"PO-Revision-Date: 2014-03-11 12:04-0400\n"
+"Last-Translator: sandeeps <sandeeps@fedoraproject.org>\n"
 "Language-Team: Marathi <sshedmak@redhat.com>\n"
 "Language: mr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
 #. note default is lower caps
@@ -4351,7 +4352,7 @@ msgid ""
 "You will need to use Red Hat Subscription Manager to manually attach "
 "subscriptions to this system after completing firstboot."
 msgstr ""
-"फर्स्टबूट पूर्ण झाल्यानंतर ह्या प्रणालीकरिता सबस्क्रिप्शन्स स्वतः जोडण्याकरिता Red Hat "
+"firstboot पूर्ण झाल्यानंतर ह्या प्रणालीकरिता सबस्क्रिप्शन्स स्वतः जोडण्याकरिता Red Hat "
 "सबस्क्रिप्शन मॅनेजरचा वापर करणे आवश्यक आहे."

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
diff --git a/po/or.po b/po/or.po
index daaae26..e7a0e45 100644
--- a/po/or.po
+++ b/po/or.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
-"PO-Revision-Date: 2014-02-28 03:33-0500\n"
+"PO-Revision-Date: 2014-03-10 01:02-0400\n"
 "Last-Translator: mgiri <mgiri@fedoraproject.org>\n"
 "Language-Team: Oriya <oriya-it@googlegroups.com>\n"
 "Language: or\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
@@ -202,7 +202,7 @@ msgstr "%%prog %s [ବିକଳ୍ପଗୁଡିକ]"
 #: ../src/subscription_manager/cli.py:93
 #, python-format
 msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
-msgstr "ବ୍ୟବହାର ବିଧ: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
+msgstr "ବ୍ୟବହାର ବିଧି: %s ମଡ୍ୟୁଲ-ନାମ [ମଡ୍ୟୁଲ-ବିକଳ୍ପଗୁଡିକ] [--help]"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author mgiri
 #: ../src/subscription_manager/cli.py:105
diff --git a/po/pa.po b/po/pa.po
index 7348666..d8b4d41 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -9,14 +9,14 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
-"PO-Revision-Date: 2014-02-28 03:14-0500\n"
+"PO-Revision-Date: 2014-03-06 03:52-0500\n"
 "Last-Translator: asaini <asaini@redhat.com>\n"
 "Language-Team: Punjabi\n"
 "Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
@@ -204,7 +204,7 @@ msgstr "%%prog %s [ਚੋਣਾਂ]"
 #: ../src/subscription_manager/cli.py:93
 #, python-format
 msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
-msgstr "ਵਰਤੋਂ: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
+msgstr "ਵਰਤੋਂ: %s ਮੌਡਿਊਲ-ਨਾਂ [ਮੌਡਿਊਲ-ਚੋਣਾਂ] [--help]"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author jassy
 #: ../src/subscription_manager/cli.py:105
@@ -4324,8 +4324,8 @@ msgid ""
 "You will need to use Red Hat Subscription Manager to manually attach "
 "subscriptions to this system after completing firstboot."
 msgstr ""
-"ਤੁਹਾਨੂੰ ਇਸ ਸਿਸਟਮ ਨਾਲ ਦਸਤੀ ਮੈਂਬਰੀ ਜੋੜਨ ਲਈ ਫਸਟਬੂਟ ਮੁਕੰਮਲ ਹੋਣ ਤੋਂ ਬਾਅਦ Red Hat ਮੈਂਬਰੀ ਪ੍ਰਬੰਧਕ "
-"ਵਰਤਣ ਦੀ ਲੋੜ ਪਵੇਗੀ।"
+"ਤੁਹਾਨੂੰ ਇਸ ਸਿਸਟਮ ਨਾਲ ਦਸਤੀ ਮੈਂਬਰੀ ਜੋੜਨ ਲਈ firstboot ਮੁਕੰਮਲ ਹੋਣ ਤੋਂ ਬਾਅਦ Red Hat ਮੈਂਬਰੀ "
+"ਪ੍ਰਬੰਧਕ ਵਰਤਣ ਦੀ ਲੋੜ ਪਵੇਗੀ।"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
 #: ../src/subscription_manager/gui/data/manually_subscribe.glade.h:2
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f7d8c54..83feae4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,14 +10,14 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
-"PO-Revision-Date: 2014-02-27 03:47-0500\n"
+"PO-Revision-Date: 2014-03-05 06:22-0500\n"
 "Last-Translator: John Sefler <jsefler@redhat.com>\n"
 "Language-Team: Portuguese (Brazil)\n"
 "Language: pt-BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author gcintra
@@ -205,7 +205,7 @@ msgstr "%%prog %s [OPÇÕES]"
 #: ../src/subscription_manager/cli.py:93
 #, python-format
 msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
-msgstr "Uso: %s MODULE-NAME [MODULE-OPÇÕES] [--help]"
+msgstr "Uso: %s MÓDULO-NOME [MÓDULO-OPÇÕES] [--help]"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
 #: ../src/subscription_manager/cli.py:105
diff --git a/po/ru.po b/po/ru.po
index 906496b..55a40ea 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
-"PO-Revision-Date: 2014-02-27 10:06-0500\n"
+"PO-Revision-Date: 2014-03-06 07:23-0500\n"
 "Last-Translator: ypoyarko <ypoyarko@redhat.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"

@@ -2310,7 +2310,7 @@ msgstr "Система зарегистрирована в RHN Classic."
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
 #: ../src/subscription_manager/branding/redhat_branding.py:13
 msgid "This system has already been registered with Red Hat using RHN Classic."
-msgstr "Система уже зарегистрирована в режиме RHN Classic."
+msgstr "Система уже зарегистрирована в Red Hat в режиме RHN Classic."

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author ypoyarko
 #: ../src/subscription_manager/branding/redhat_branding.py:15
@@ -2371,7 +2371,7 @@ msgstr ""
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
 #: ../src/subscription_manager/branding/redhat_branding.py:28
 msgid "RHN Classic and Red Hat Subscription Management"
-msgstr "RHN Classic и RHSM"
+msgstr "RHN Classic и Управление подписками Red Hat"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author ypoyarko
 #: ../src/subscription_manager/branding/redhat_branding.py:30
@@ -4376,8 +4376,8 @@ msgid ""
 "You will need to use Red Hat Subscription Manager to manually attach "
 "subscriptions to this system after completing firstboot."
 msgstr ""
-"После завершения firstboot можно выбрать подписки в программе управления "
-"подписками."
+"После завершения firstboot подписки можно будет выделить с помощью программы "
+"управления подписками Red Hat."

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author ypoyarko
 #: ../src/subscription_manager/gui/data/manually_subscribe.glade.h:2
diff --git a/po/ta_IN.po b/po/ta_IN.po
index cc47238..a6cda36 100644
--- a/po/ta_IN.po
+++ b/po/ta_IN.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
-"PO-Revision-Date: 2014-03-03 04:53-0500\n"
+"PO-Revision-Date: 2014-03-05 12:57-0500\n"
 "Last-Translator: Shantha kumar <shkumar@redhat.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "Language: ta-IN\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
 #. note default is lower caps
@@ -4428,7 +4428,7 @@ msgid ""
 "You will need to use Red Hat Subscription Manager to manually attach "
 "subscriptions to this system after completing firstboot."
 msgstr ""
-"முதல் பூட்டை முடித்த பிறகு இந்த கணினிக்கு சந்தாக்களை கைமுறையாக இணைக்க நீங்கள் Red Hat "
+"firstboot ஐ முடித்த பிறகு இந்த கணினிக்கு சந்தாக்களை கைமுறையாக இணைக்க நீங்கள் Red Hat "
 "சந்தா நிர்வாகியைப் பயன்படுத்த வேண்டும்."

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
diff --git a/po/te.po b/po/te.po
index 6cb979f..f6afa0e 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
-"PO-Revision-Date: 2014-03-02 05:18-0500\n"
+"PO-Revision-Date: 2014-03-10 08:16-0400\n"
 "Last-Translator: kkrothap <kkrothap@fedoraproject.org>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "Language: te\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
 #. note default is lower caps
@@ -203,7 +203,7 @@ msgstr "%%prog %s [ఐచ్చికాలు]"
 #: ../src/subscription_manager/cli.py:93
 #, python-format
 msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
-msgstr "వాడుక: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
+msgstr "వాడుక: %s మాడ్యూల్-పేరు [మాడ్యూల్-ఐచ్చికాలు] [--help]"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author kkrothap
 #: ../src/subscription_manager/cli.py:105
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e816d16..4965589 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=1; plural=0\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d01096b..b2f1750 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,14 +10,14 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
-"PO-Revision-Date: 2014-03-02 07:08-0500\n"
+"PO-Revision-Date: 2014-03-11 07:21-0400\n"
 "Last-Translator: tchuang <tchuang@redhat.com>\n"
 "Language-Team: Chinese (Traditional Han, Taiwan)\n"
 "Language: zh-Hant-TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.2.3\n"
+"X-Generator: Zanata 3.3.2\n"
 "Plural-Forms: nplurals=1; plural=0\n"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
@@ -205,7 +205,7 @@ msgstr "%%prog %s [選項]"
 #: ../src/subscription_manager/cli.py:93
 #, python-format
 msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
-msgstr "使用方法：%s MODULE-NAME [MODULE-OPTIONS] [--help]"
+msgstr "使用方法：%s 模組名稱 [模組選項] [--help]"

 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author snowlet
 #: ../src/subscription_manager/cli.py:105
diff --git a/rel-eng/packages/subscription-manager b/rel-eng/packages/subscription-manager
index 6df7ff7..5c960bd 100644
--- a/rel-eng/packages/subscription-manager
+++ b/rel-eng/packages/subscription-manager
@@ -1 +1 @@
-1.10.14-4 ./
+1.10.14-5 ./
diff --git a/src/subscription_manager/gui/messageWindow.py b/src/subscription_manager/gui/messageWindow.py
index 295b4bc..eb62ad9 100644
--- a/src/subscription_manager/gui/messageWindow.py
+++ b/src/subscription_manager/gui/messageWindow.py
@@ -66,6 +66,12 @@ class MessageWindow(gobject.GObject):
         # escape product strings see rh bz#633438
         self.dialog.set_markup(text)

+        # If translations contain bad markup (perhaps from bad text encoding)
+        # that doesn't render, just show the message including the markup.
+        # See rhbz #865702
+        if self.dialog.label.get_text() == '':
+            self.dialog.label.set_use_markup(False)
+
         self.dialog.set_default_response(0)

         self.dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
diff --git a/src/subscription_manager/hwprobe.py b/src/subscription_manager/hwprobe.py
index 23e6c26..9d894b3 100644
--- a/src/subscription_manager/hwprobe.py
+++ b/src/subscription_manager/hwprobe.py
@@ -385,6 +385,9 @@ class Hardware:

         return None

+    def check_for_cpu_topo(self, cpu_topo_dir):
+        return os.access(cpu_topo_dir, os.R_OK)
+
     def get_cpu_info(self):
         self.cpuinfo = {}
         # we also have cpufreq, etc in this dir, so match just the numbs
@@ -394,7 +397,27 @@ class Hardware:
         sys_cpu_path = self.prefix + "/sys/devices/system/cpu/"
         for cpu in os.listdir(sys_cpu_path):
             if re.match(cpu_re, cpu):
-                cpu_files.append("%s/%s" % (sys_cpu_path, cpu))
+                cpu_topo_dir = os.path.join(sys_cpu_path, cpu, "topology")
+
+                # see rhbz#1070908
+                # ppc64 machines running on LPARs will add
+                # a sys cpu entry for every cpu thread on the
+                # physical machine, regardless of how many are
+                # allocated to the LPAR. This throws off the cpu
+                # thread count, which throws off the cpu socket count.
+                # The entries for the unallocated or offline cpus
+                # do not have topology info however.
+                # So, skip sys cpu entries without topology info.
+                #
+                # NOTE: this assumes RHEL6+, prior to rhel5, on
+                # some arches like ppc and s390, there is no topology
+                # info ever, so this will break.
+                if self.check_for_cpu_topo(cpu_topo_dir):
+                    cpu_files.append("%s/%s" % (sys_cpu_path, cpu))
+
+        # for systems with no cpus
+        if not cpu_files:
+            return self.cpuinfo

         cpu_count = len(cpu_files)

diff --git a/src/subscription_manager/i18n_optparse.py b/src/subscription_manager/i18n_optparse.py
index 899eebe..eaad0e3 100644
--- a/src/subscription_manager/i18n_optparse.py
+++ b/src/subscription_manager/i18n_optparse.py
@@ -25,6 +25,7 @@ http://bugs.python.org/issue4319
 """

 import gettext
+import optparse
 from optparse import IndentedHelpFormatter as _IndentedHelpFormatter
 from optparse import OptionParser as _OptionParser
 import sys
@@ -32,6 +33,7 @@ import textwrap


 _ = gettext.gettext
+optparse._ = gettext.gettext

 # note default is lower caps
 USAGE = _("%prog [OPTIONS]")
@@ -129,37 +131,6 @@ class WrappedIndentedHelpFormatter(_IndentedHelpFormatter):

 class OptionParser(_OptionParser):

-    # These are a bunch of strings that are marked for translation in optparse,
-    # but not actually translated anywhere. Mark them for translation here,
-    # so we get it picked up. for local translation, and then optparse will
-    # use them.
-
-    #translators: this should have the same translation as "Usage: %s\n"
-    _("usage: %s\n")   # For older versions of optparse
-    _("Usage: %s\n")
-    _("Usage")
-    _("%prog [options]")
-    _("Options")
-    _("options")
-    _("options:")
-
-    # stuff for option value sanity checking
-    _("no such option: %s")
-    _("ambiguous option: %s (%s?)")
-    _("%s option requires an argument")
-    _("%s option requires %d arguments")
-    _("%s option does not take a value")
-    _("integer")
-    _("long integer")
-    _("floating-point")
-    _("complex")
-    _("option %s: invalid %s value: %r")
-    _("option %s: invalid choice: %r (choose from %s)")
-
-    # default options
-    _("show this help message and exit")
-    _("show program's version number and exit")
-
     def print_help(self):
         sys.stdout.write(self.format_help())

diff --git a/src/subscription_manager/migrate/migrate.py b/src/subscription_manager/migrate/migrate.py
index bbf81b8..63a8a46 100755
--- a/src/subscription_manager/migrate/migrate.py
+++ b/src/subscription_manager/migrate/migrate.py
@@ -42,6 +42,7 @@ if _LIBPATH not in sys.path:

 from subscription_manager.certdirectory import ProductDirectory
 from subscription_manager.certlib import ConsumerIdentity
+from subscription_manager.identity import Identity
 from subscription_manager.cli import system_exit
 from subscription_manager.i18n_optparse import OptionParser, \
         USAGE, WrappedIndentedHelpFormatter
@@ -707,7 +708,8 @@ class MigrationEngine(object):
             return

         # create and populate the redhat.repo file
-        repolib.RepoLib(uep=self.cp).update()
+        identity = Identity()
+        repolib.RepoLib(uep=self.cp, identity=identity).update()

         # read in the redhat.repo file
         repofile = repolib.RepoFile()
diff --git a/src/subscription_manager/repolib.py b/src/subscription_manager/repolib.py
index bea3b69..ad0fc30 100644
--- a/src/subscription_manager/repolib.py
+++ b/src/subscription_manager/repolib.py
@@ -20,6 +20,7 @@ import logging
 import os
 import string
 import subscription_manager.injection as inj
+from subscription_manager.cache import OverrideStatusCache
 from urllib import basejoin

 from rhsm.config import initConfig
@@ -38,13 +39,13 @@ ALLOWED_CONTENT_TYPES = ["yum"]

 class RepoLib(DataLib):

-    def __init__(self, lock=ActionLock(), uep=None, cache_only=False):
+    def __init__(self, lock=ActionLock(), uep=None, cache_only=False, identity=None):
         self.cache_only = cache_only
         DataLib.__init__(self, lock, uep)
-        self.identity = inj.require(inj.IDENTITY)
+        self.identity = identity or inj.require(inj.IDENTITY)

     def _do_update(self):
-        action = UpdateAction(self.uep, cache_only=self.cache_only)
+        action = UpdateAction(self.uep, cache_only=self.cache_only, identity=self.identity)
         return action.perform()

     def is_managed(self, repo):
@@ -52,7 +53,8 @@ class RepoLib(DataLib):
         return repo in [c.label for c in action.matching_content()]

     def get_repos(self, apply_overrides=True):
-        action = UpdateAction(self.uep, cache_only=self.cache_only, apply_overrides=apply_overrides)
+        action = UpdateAction(self.uep, cache_only=self.cache_only,
+                apply_overrides=apply_overrides, identity=self.identity)
         repos = action.get_unique_content()
         if self.identity.is_valid() and action.override_supported:
             return repos
@@ -89,8 +91,9 @@ class RepoLib(DataLib):
 # Datalib.update() method anyhow. Pretty sure these can go away.
 class UpdateAction:

-    def __init__(self, uep, ent_dir=None, prod_dir=None, cache_only=False, apply_overrides=True):
-        self.identity = inj.require(inj.IDENTITY)
+    def __init__(self, uep, ent_dir=None, prod_dir=None,
+            cache_only=False, apply_overrides=True, identity=None):
+        self.identity = identity or inj.require(inj.IDENTITY)
         if ent_dir:
             self.ent_dir = ent_dir
         else:
@@ -119,7 +122,10 @@ class UpdateAction:
         # Only attempt to update the overrides if they are supported
         # by the server.
         if self.override_supported:
-            override_cache = inj.require(inj.OVERRIDE_STATUS_CACHE)
+            try:
+                override_cache = inj.require(inj.OVERRIDE_STATUS_CACHE)
+            except KeyError:
+                override_cache = OverrideStatusCache()
             if cache_only:
                 status = override_cache._read_cache()
             else:
diff --git a/subscription-manager.spec b/subscription-manager.spec
index db8a262..492af14 100644
--- a/subscription-manager.spec
+++ b/subscription-manager.spec
@@ -14,7 +14,7 @@

 Name: subscription-manager
 Version: 1.10.14
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Tools and libraries for subscription and repository management
 Group:   System Environment/Base
 License: GPLv2
@@ -419,6 +419,14 @@ fi
 %endif

 %changelog
+* Wed Mar 19 2014 ckozak <ckozak@redhat.com> 1.10.14-5
+- 1070908: Don't count cpus without topo for lpar (alikins@redhat.com)
+- 865702: Dont render exc messages with bogus markup (alikins@redhat.com)
+- 1074568: Use our translations in optparser (ckozak@redhat.com)
+- 1075167: Avoid using injected values in migrate-classic-to-rhsm
+  (ckozak@redhat.com)
+- 1020474: Strings are 100%% translated again. (alikins@redhat.com)
+
 * Tue Mar 04 2014 ckozak <ckozak@redhat.com> 1.10.14-4
 - 1030378: Latest strings from zanata. (alikins@redhat.com)
 - 1070737: correct config section for ca_cert_dir (ckozak@redhat.com)
diff --git a/test/test_hw.py b/test/test_hw.py
index ce50160..b4eb776 100644
--- a/test/test_hw.py
+++ b/test/test_hw.py
@@ -506,12 +506,20 @@ class HardwareProbeTests(fixture.SubManFixture):
 #        # this is going to be empty as non root
 #        print platform_info

+    def _cpu_topo_check(self, cpu_topo_dir):
+        return True
+
+    def reload(self):
+        reload(hwprobe)
+        hw = hwprobe.Hardware()
+        hw.check_for_cpu_topo = self._cpu_topo_check
+        return hw
+
     def test_parse_s390_sysinfo_empty(self):
         cpu_count = 0
         sysinfo_lines = []

-        reload(hwprobe)
-        hw = hwprobe.Hardware()
+        hw = self.reload()

         ret = hw._parse_s390x_sysinfo_topology(cpu_count, sysinfo_lines)
         self.assertTrue(ret is None)
@@ -520,8 +528,7 @@ class HardwareProbeTests(fixture.SubManFixture):
         cpu_count = 24
         sysinfo_lines = ["CPU Topology SW:      0 0 0 4 6 4"]

-        reload(hwprobe)
-        hw = hwprobe.Hardware()
+        hw = self.reload()

         ret = hw._parse_s390x_sysinfo_topology(cpu_count, sysinfo_lines)

@@ -532,8 +539,7 @@ class HardwareProbeTests(fixture.SubManFixture):

     @patch("os.listdir")
     def test_cpu_info_s390(self, mock_list_dir):
-        reload(hwprobe)
-        hw = hwprobe.Hardware()
+        hw = self.reload()

         mock_list_dir.return_value = ["cpu%s" % i for i in range(0, 3)]

@@ -566,7 +572,6 @@ class HardwareProbeTests(fixture.SubManFixture):
     @patch("os.listdir")
     def test_cpu_info_s390_sysinfo(self, mock_list_dir,
                                    mock_read_sysinfo, mock_has_sysinfo):
-        #reload(hwprobe)

         mock_list_dir.return_value = ["cpu%s" % i for i in range(0, 20)]
         mock_has_sysinfo.return_value = True
@@ -574,6 +579,7 @@ class HardwareProbeTests(fixture.SubManFixture):

         hw = hwprobe.Hardware()
         hw.arch = "s390x"
+        hw.check_for_cpu_topo = Mock(return_value=True)

         def count_cpumask(cpu, field):
             return self.cpumask_vals[field]
@@ -612,8 +618,7 @@ class HardwareProbeTests(fixture.SubManFixture):
     @patch('subscription_manager.hwprobe.Hardware.count_cpumask_entries')
     @patch("os.listdir")
     def test_cpu_info(self, mock_list_dir, mock_count):
-        reload(hwprobe)
-        hw = hwprobe.Hardware()
+        hw = self.reload()

         def count_cpumask(cpu, field):
             return self.cpumask_vals[field]
@@ -635,8 +640,7 @@ class HardwareProbeTests(fixture.SubManFixture):

     @patch("os.listdir")
     def test_cpu_info_no_topo(self, mock_list_dir):
-        reload(hwprobe)
-        hw = hwprobe.Hardware()
+        hw = self.reload()

         def count_cpumask(cpu, field):
             return self.cpumask_vals[field]
@@ -659,8 +663,7 @@ class HardwareProbeTests(fixture.SubManFixture):
     @patch("os.listdir")
     def test_cpu_info_no_topo_ppc64_physical_id(self, mock_list_dir,
                                                 mock_read_physical):
-        reload(hwprobe)
-        hw = hwprobe.Hardware()
+        hw = self.reload()
         hw.arch = "ppc64"

         def get_physical(cpu_file):
@@ -687,10 +690,10 @@ class HardwareProbeTests(fixture.SubManFixture):

     @patch("os.listdir")
     def test_cpu_info_lots_cpu(self, mock_list_dir):
-        reload(hwprobe)
-        hw = hwprobe.Hardware()
+        hw = self.reload()

         mock_list_dir.return_value = ["cpu%s" % i for i in range(0, 2000)]
+        hw.check_for_cpu_topo = Mock(return_value=True)

         def count_cpumask(cpu, field):
             vals = {'thread_siblings_list': 1,
@@ -706,14 +709,13 @@ class HardwareProbeTests(fixture.SubManFixture):
                                'cpu.cpu_socket(s)': 1,
                                'cpu.topology_source':
                                     'kernel /sys cpu sibling lists'},
-                               hw.get_cpu_info(),
-)
+                               hw.get_cpu_info())

     @patch("os.listdir")
     def test_cpu_info_other_files(self, mock_list_dir):
-        reload(hwprobe)
-        hw = hwprobe.Hardware()
+        hw = self.reload()

+        hw.check_for_cpu_topo = Mock(return_value=True)
         mock_list_dir.return_value = ["cpu0", "cpu1",  # normal cpu ids (valid)
                                       "cpu123123",     # big cpu   (valid)
                                       "cpu_",          # not valid