Blame SOURCES/subscription-manager-1.10.14-3-to-subscription-manager-1.10.14-4.patch

2d607d
diff --git a/po/as.po b/po/as.po
2d607d
index b8df6c4..2a7e7da 100644
2d607d
--- a/po/as.po
2d607d
+++ b/po/as.po
2d607d
@@ -7,8 +7,8 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-06 11:15-0500\n"
2d607d
-"Last-Translator: John Sefler <jsefler@redhat.com>\n"
2d607d
+"PO-Revision-Date: 2014-02-28 04:29-0500\n"
2d607d
+"Last-Translator: ngoswami <ngoswami@fedoraproject.org>\n"
2d607d
 "Language-Team: Assamese\n"
2d607d
 "Language: as\n"
2d607d
 "MIME-Version: 1.0\n"
2d607d
@@ -202,7 +202,7 @@ msgstr "%%prog %s [বিকল্পসমূহ]"
2d607d
 #: ../src/subscription_manager/cli.py:93
2d607d
 #, python-format
2d607d
 msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
2d607d
-msgstr "ব্যৱহাৰ: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
2d607d
+msgstr "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author ngoswami
2d607d
 #: ../src/subscription_manager/cli.py:105
2d607d
diff --git a/po/bn_IN.po b/po/bn_IN.po
2d607d
index b251625..b1d9591 100644
2d607d
--- a/po/bn_IN.po
2d607d
+++ b/po/bn_IN.po
2d607d
@@ -7,8 +7,8 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-05 05:41-0500\n"
2d607d
-"Last-Translator: John Sefler <jsefler@redhat.com>\n"
2d607d
+"PO-Revision-Date: 2014-02-28 03:03-0500\n"
2d607d
+"Last-Translator: bnin <sray@redhat.com>\n"
2d607d
 "Language-Team: Bengali (India)\n"
2d607d
 "Language: bn-IN\n"
2d607d
 "MIME-Version: 1.0\n"
2d607d
@@ -4416,7 +4416,7 @@ msgid ""
2d607d
 "You will need to use Red Hat Subscription Manager to manually attach "
2d607d
 "subscriptions to this system after completing firstboot."
2d607d
 msgstr ""
2d607d
-"Firstboot সমাপ্ত করার পরে, সিস্টেমের সাথে স্বয়ং সাবস্ক্রিপশন যোগ করার জন্য Red Hat "
2d607d
+"firstboot সমাপ্ত করার পরে, সিস্টেমের সাথে স্বয়ং সাবস্ক্রিপশন যোগ করার জন্য Red Hat "
2d607d
 "Subscription Manager ব্যবহার করা আবশ্যক।"
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
2d607d
diff --git a/po/de_DE.po b/po/de_DE.po
2d607d
index 7e4c497..cc98d56 100644
2d607d
--- a/po/de_DE.po
2d607d
+++ b/po/de_DE.po
2d607d
@@ -10,7 +10,7 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-05 10:53-0500\n"
2d607d
+"PO-Revision-Date: 2014-02-27 06:32-0500\n"
2d607d
 "Last-Translator: John Sefler <jsefler@redhat.com>\n"
2d607d
 "Language-Team: German (Germany)\n"
2d607d
 "Language: de-DE\n"
2d607d
@@ -4497,7 +4497,7 @@ msgid ""
2d607d
 "You will need to use Red Hat Subscription Manager to manually attach "
2d607d
 "subscriptions to this system after completing firstboot."
2d607d
 msgstr ""
2d607d
-"Sie müssen dieses System nach Abschluss von Firstboot mithilfe des Red Hat "
2d607d
+"Sie müssen dieses System nach Abschluss von firstboot mithilfe des Red Hat "
2d607d
 "Subscription Managers manuell mit Subskriptionen verknüpfen."
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
2d607d
diff --git a/po/es_ES.po b/po/es_ES.po
2d607d
index 5ab1208..19992c8 100644
2d607d
--- a/po/es_ES.po
2d607d
+++ b/po/es_ES.po
2d607d
@@ -10,8 +10,8 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-05 10:59-0500\n"
2d607d
-"Last-Translator: John Sefler <jsefler@redhat.com>\n"
2d607d
+"PO-Revision-Date: 2014-02-27 08:38-0500\n"
2d607d
+"Last-Translator: Gladys Guerrero Lozano <gladysguerrerolozano419@gmail.com>\n"
2d607d
 "Language-Team: Spanish (Spain)\n"
2d607d
 "Language: es-ES\n"
2d607d
 "MIME-Version: 1.0\n"
2d607d
@@ -1182,7 +1182,7 @@ msgstr ""
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author Gladys Guerrero Lozano
2d607d
 #: ../src/subscription_manager/managercli.py:1466
2d607d
 msgid "Deprecated, see attach"
2d607d
-msgstr "Depreciado, ver vincular"
2d607d
+msgstr "Depreciado, ver attach"
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
2d607d
 #: ../src/subscription_manager/managercli.py:1484
2d607d
@@ -4483,7 +4483,7 @@ msgid ""
2d607d
 msgstr ""
2d607d
 "Necesitará utilizar el Gestor de suscripciones de Red Hat para vincular "
2d607d
 "manualmente suscripciones a este sistema después de completar el primer "
2d607d
-"inicio."
2d607d
+"inicio. "
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author Gladys Guerrero Lozano
2d607d
 #: ../src/subscription_manager/gui/data/manually_subscribe.glade.h:2
2d607d
diff --git a/po/hi.po b/po/hi.po
2d607d
index 0efd932..9e60df7 100644
2d607d
--- a/po/hi.po
2d607d
+++ b/po/hi.po
2d607d
@@ -8,8 +8,8 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-06 05:33-0500\n"
2d607d
-"Last-Translator: John Sefler <jsefler@redhat.com>\n"
2d607d
+"PO-Revision-Date: 2014-02-28 05:15-0500\n"
2d607d
+"Last-Translator: rajesh <rajesh@fedoraproject.org>\n"
2d607d
 "Language-Team: Hindi <kde-i18n-doc@kde.org>\n"
2d607d
 "Language: hi\n"
2d607d
 "MIME-Version: 1.0\n"
2d607d
diff --git a/po/kn.po b/po/kn.po
2d607d
index 9b3b601..e0089e5 100644
2d607d
--- a/po/kn.po
2d607d
+++ b/po/kn.po
2d607d
@@ -6,7 +6,7 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-05 06:44-0500\n"
2d607d
+"PO-Revision-Date: 2014-02-28 03:05-0500\n"
2d607d
 "Last-Translator: shanky <shanky@fedoraproject.org>\n"
2d607d
 "Language-Team: Kannada\n"
2d607d
 "Language: kn\n"
2d607d
@@ -201,7 +201,7 @@ msgstr "%%prog %s [ಆಯ್ಕೆಗಳು]"
2d607d
 #: ../src/subscription_manager/cli.py:93
2d607d
 #, python-format
2d607d
 msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
2d607d
-msgstr "ಬಳಕೆ: %s MODULE-NAME [ಮಾಡ್ಯೂಲ್-ಆಯ್ಕೆಗಳು] [--help]"
2d607d
+msgstr "ಬಳಕೆ: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author shanky
2d607d
 #: ../src/subscription_manager/cli.py:105
2d607d
@@ -4434,7 +4434,7 @@ msgid ""
2d607d
 "subscriptions to this system after completing firstboot."
2d607d
 msgstr ""
2d607d
 "ಪ್ರಥಮಬೂಟ್‌ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ ನಂತರ ನೀವು ಈ ವ್ಯವಸ್ಥೆಗೆ ಚಂದಾದಾರಿಕೆಗಳನ್ನು ಕೈಯಾರೆ "
2d607d
-"ಲಗತ್ತಿಸಲು  Red Hat Subscription Manager ಅನ್ನು ಬಳಸಬೇಕಾಗುತ್ತದೆ."
2d607d
+"ಲಗತ್ತಿಸಲು  Red Hat ಚಂದಾದಾರಿಕೆ ವ್ಯವಸ್ಥಾಪಕವನ್ನು ಬಳಸಬೇಕಾಗುತ್ತದೆ."
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author shanky
2d607d
 #: ../src/subscription_manager/gui/data/manually_subscribe.glade.h:2
2d607d
diff --git a/po/ko.po b/po/ko.po
2d607d
index bbcaaaa..f8b1223 100644
2d607d
--- a/po/ko.po
2d607d
+++ b/po/ko.po
2d607d
@@ -8,7 +8,7 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-04 08:13-0500\n"
2d607d
+"PO-Revision-Date: 2014-03-03 06:40-0500\n"
2d607d
 "Last-Translator: eukim <eukim@fedoraproject.org>\n"
2d607d
 "Language-Team: Korean\n"
2d607d
 "Language: ko\n"
2d607d
diff --git a/po/ml.po b/po/ml.po
2d607d
index b88bfbe..e8596e3 100644
2d607d
--- a/po/ml.po
2d607d
+++ b/po/ml.po
2d607d
@@ -8,8 +8,8 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-20 10:47-0500\n"
2d607d
-"Last-Translator: John Sefler <jsefler@redhat.com>\n"
2d607d
+"PO-Revision-Date: 2014-02-28 03:15-0500\n"
2d607d
+"Last-Translator: anipeter <anipeter@fedoraproject.org>\n"
2d607d
 "Language-Team: Malayalam\n"
2d607d
 "Language: ml\n"
2d607d
 "MIME-Version: 1.0\n"
2d607d
diff --git a/po/mr.po b/po/mr.po
2d607d
index c0cd4f8..ffb3948 100644
2d607d
--- a/po/mr.po
2d607d
+++ b/po/mr.po
2d607d
@@ -6,7 +6,7 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-05 04:59-0500\n"
2d607d
+"PO-Revision-Date: 2014-03-03 03:30-0500\n"
2d607d
 "Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
2d607d
 "Language-Team: Marathi <sshedmak@redhat.com>\n"
2d607d
 "Language: mr\n"
2d607d
@@ -4351,7 +4351,7 @@ msgid ""
2d607d
 "You will need to use Red Hat Subscription Manager to manually attach "
2d607d
 "subscriptions to this system after completing firstboot."
2d607d
 msgstr ""
2d607d
-"फर्स्टबूट पूर्ण झाल्यानंतर ह्या प्रणालीकरिता सबस्क्रिप्शन्स् स्वतः जोडण्याकरिता Red Hat "
2d607d
+"फर्स्टबूट पूर्ण झाल्यानंतर ह्या प्रणालीकरिता सबस्क्रिप्शन्स स्वतः जोडण्याकरिता Red Hat "
2d607d
 "सबस्क्रिप्शन मॅनेजरचा वापर करणे आवश्यक आहे."
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
2d607d
diff --git a/po/or.po b/po/or.po
2d607d
index cde4d49..daaae26 100644
2d607d
--- a/po/or.po
2d607d
+++ b/po/or.po
2d607d
@@ -7,7 +7,7 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-06 08:15-0500\n"
2d607d
+"PO-Revision-Date: 2014-02-28 03:33-0500\n"
2d607d
 "Last-Translator: mgiri <mgiri@fedoraproject.org>\n"
2d607d
 "Language-Team: Oriya <oriya-it@googlegroups.com>\n"
2d607d
 "Language: or\n"
2d607d
@@ -202,7 +202,7 @@ msgstr "%%prog %s [ବିକଳ୍ପଗୁଡିକ]"
2d607d
 #: ../src/subscription_manager/cli.py:93
2d607d
 #, python-format
2d607d
 msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
2d607d
-msgstr "ବ୍ୟବହାର ବିଧି: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
2d607d
+msgstr "ବ୍ୟବହାର ବିଧ: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author mgiri
2d607d
 #: ../src/subscription_manager/cli.py:105
2d607d
diff --git a/po/pa.po b/po/pa.po
2d607d
index 11d50e9..7348666 100644
2d607d
--- a/po/pa.po
2d607d
+++ b/po/pa.po
2d607d
@@ -9,7 +9,7 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-14 01:36-0500\n"
2d607d
+"PO-Revision-Date: 2014-02-28 03:14-0500\n"
2d607d
 "Last-Translator: asaini <asaini@redhat.com>\n"
2d607d
 "Language-Team: Punjabi\n"
2d607d
 "Language: pa\n"
2d607d
@@ -4325,7 +4325,7 @@ msgid ""
2d607d
 "subscriptions to this system after completing firstboot."
2d607d
 msgstr ""
2d607d
 "ਤੁਹਾਨੂੰ ਇਸ ਸਿਸਟਮ ਨਾਲ ਦਸਤੀ ਮੈਂਬਰੀ ਜੋੜਨ ਲਈ ਫਸਟਬੂਟ ਮੁਕੰਮਲ ਹੋਣ ਤੋਂ ਬਾਅਦ Red Hat ਮੈਂਬਰੀ ਪ੍ਰਬੰਧਕ "
2d607d
-"ਵਰਤਣ ਦੀ ਲੋੜ ਹੈ।"
2d607d
+"ਵਰਤਣ ਦੀ ਲੋੜ ਪਵੇਗੀ।"
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
2d607d
 #: ../src/subscription_manager/gui/data/manually_subscribe.glade.h:2
2d607d
diff --git a/po/pt_BR.po b/po/pt_BR.po
2d607d
index 2c6f777..f7d8c54 100644
2d607d
--- a/po/pt_BR.po
2d607d
+++ b/po/pt_BR.po
2d607d
@@ -10,7 +10,7 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-20 11:26-0500\n"
2d607d
+"PO-Revision-Date: 2014-02-27 03:47-0500\n"
2d607d
 "Last-Translator: John Sefler <jsefler@redhat.com>\n"
2d607d
 "Language-Team: Portuguese (Brazil)\n"
2d607d
 "Language: pt-BR\n"
2d607d
@@ -4651,7 +4651,7 @@ msgid ""
2d607d
 "the following to register:"
2d607d
 msgstr ""
2d607d
 "Este assistente vai lhe ajudar no processo de registro do seu sistema com a "
2d607d
-"Red hat para receber as atualizações de software e outros benefícios. Você "
2d607d
+"Red Hat para receber as atualizações de software e outros benefícios. Você "
2d607d
 "irá precisar do seguinte para se registrar:"
9179ba
2d607d
 #: ../src/subscription_manager/gui/data/registration_info.glade.h:2
2d607d
@@ -4672,7 +4672,7 @@ msgstr "• O endereço de um serviço de gerenciamento de subscrição (opciona
9179ba
2d607d
 #: ../src/subscription_manager/gui/data/registration_info.glade.h:6
2d607d
 msgid "_Why Should I Register?"
2d607d
-msgstr "Por que devo me Registrar?"
2d607d
+msgstr "_Por que devo me Registrar?"
9179ba
2d607d
 #: ../src/subscription_manager/gui/data/registration_info.glade.h:7
2d607d
 msgid "Why Should I Register?"
2d607d
diff --git a/po/ru.po b/po/ru.po
2d607d
index 72543c7..906496b 100644
2d607d
--- a/po/ru.po
2d607d
+++ b/po/ru.po
2d607d
@@ -7,8 +7,8 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-06 05:45-0500\n"
2d607d
-"Last-Translator: John Sefler <jsefler@redhat.com>\n"
2d607d
+"PO-Revision-Date: 2014-02-27 10:06-0500\n"
2d607d
+"Last-Translator: ypoyarko <ypoyarko@redhat.com>\n"
2d607d
 "Language-Team: Russian\n"
2d607d
 "Language: ru\n"
2d607d
 "MIME-Version: 1.0\n"
2d607d
@@ -1932,7 +1932,8 @@ msgid ""
2d607d
 "Management.  Exiting."
2d607d
 msgstr ""
2d607d
 "\n"
2d607d
-"Cистема уже зарегистрирована в RHSM. Выход..."
2d607d
+"Cистема уже зарегистрирована при помощи схемы управления подписками Red Hat. "
2d607d
+"Выход..."
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author ypoyarko
2d607d
 #: ../src/subscription_manager/migrate/migrate.py:274
2d607d
@@ -2115,7 +2116,7 @@ msgid ""
2d607d
 "System '%s' successfully registered to Red Hat Subscription Management.\n"
2d607d
 msgstr ""
2d607d
 "Система «%s» успешно зарегистрирована с помощью механизма управления "
2d607d
-"подписками Red Hat. \n"
2d607d
+"подписками Red Hat.\n"
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author ypoyarko
2d607d
 #. Display an actual message for the empty string level.
2d607d
@@ -4384,8 +4385,8 @@ msgid ""
2d607d
 "After opening Red Hat Subscription Manager, manually attach subscriptions "
2d607d
 "via the All Available Subscriptions tab."
2d607d
 msgstr ""
2d607d
-"Выделить подписки вручную можно в программе управления подписками, на "
2d607d
-"вкладке Доступные подписки."
2d607d
+"В окне управления подписками Red Hat выберите подписки на вкладке "
2d607d
+"Доступные подписки."
9179ba
2d607d
 #: ../src/subscription_manager/gui/data/repositories.glade.h:1
2d607d
 msgid "Manage Repositories"
2d607d
diff --git a/po/ta_IN.po b/po/ta_IN.po
2d607d
index 2db7235..cc47238 100644
2d607d
--- a/po/ta_IN.po
2d607d
+++ b/po/ta_IN.po
2d607d
@@ -9,8 +9,8 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-05 10:41-0500\n"
2d607d
-"Last-Translator: John Sefler <jsefler@redhat.com>\n"
2d607d
+"PO-Revision-Date: 2014-03-03 04:53-0500\n"
2d607d
+"Last-Translator: Shantha kumar <shkumar@redhat.com>\n"
2d607d
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
2d607d
 "Language: ta-IN\n"
2d607d
 "MIME-Version: 1.0\n"
2d607d
diff --git a/po/te.po b/po/te.po
2d607d
index 0ce0b8b..6cb979f 100644
2d607d
--- a/po/te.po
2d607d
+++ b/po/te.po
2d607d
@@ -8,8 +8,8 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-06 05:31-0500\n"
2d607d
-"Last-Translator: John Sefler <jsefler@redhat.com>\n"
2d607d
+"PO-Revision-Date: 2014-03-02 05:18-0500\n"
2d607d
+"Last-Translator: kkrothap <kkrothap@fedoraproject.org>\n"
2d607d
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
2d607d
 "Language: te\n"
2d607d
 "MIME-Version: 1.0\n"
2d607d
diff --git a/po/zh_CN.po b/po/zh_CN.po
2d607d
index 7675349..e816d16 100644
2d607d
--- a/po/zh_CN.po
2d607d
+++ b/po/zh_CN.po
2d607d
@@ -9,8 +9,8 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-26 08:40-0500\n"
2d607d
-"Last-Translator: John Sefler <jsefler@redhat.com>\n"
2d607d
+"PO-Revision-Date: 2014-02-27 08:42-0500\n"
2d607d
+"Last-Translator: leahliu <lliu@redhat.com>\n"
2d607d
 "Language-Team: Chinese (Simplified Han, China)\n"
2d607d
 "Language: zh-Hans-CN\n"
2d607d
 "MIME-Version: 1.0\n"
2d607d
@@ -204,7 +204,7 @@ msgstr "%%prog %s [选项]"
2d607d
 #: ../src/subscription_manager/cli.py:93
2d607d
 #, python-format
2d607d
 msgid "Usage: %s MODULE-NAME [MODULE-OPTIONS] [--help]"
2d607d
-msgstr "用法: %s MODULE-NAME [MODULE-选项] [--help]"
2d607d
+msgstr "使用: %s 模块名称 [模块选项] [--help]"
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
2d607d
 #: ../src/subscription_manager/cli.py:105
2d607d
@@ -2035,7 +2035,6 @@ msgstr "尝试在红帽订阅管理(Red Hat Subscription Management)中注
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
2d607d
 #: ../src/subscription_manager/migrate/migrate.py:635
2d607d
-#, fuzzy
2d607d
 msgid ""
2d607d
 "\n"
2d607d
 "Unable to register.\n"
2d607d
@@ -2043,7 +2042,7 @@ msgid ""
2d607d
 msgstr ""
2d607d
 "\n"
2d607d
 "无法注册。\n"
2d607d
-"如需进一步的帮助,请联络红帽全球支持服务。"
2d607d
+"如需进一步的帮助,请联络红帽全球支持服务(Red Hat Global Support Services)。"
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
2d607d
 #: ../src/subscription_manager/migrate/migrate.py:638
2d607d
@@ -2242,11 +2241,12 @@ msgstr "已经使用 RHN 传统订阅在 Red Hat 注册这个系统。"
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys, author leahliu
2d607d
 #: ../src/subscription_manager/branding/redhat_branding.py:15
2d607d
-#, fuzzy
2d607d
 msgid ""
2d607d
 "Your system is being registered again using Red Hat Subscription Management. "
2d607d
 "Red Hat recommends that customers only register once."
2d607d
-msgstr "您正在使用红帽订阅管理再次注册您的系统。红帽建议客户只注册一次。"
2d607d
+msgstr ""
2d607d
+"您正在使用红帽订阅管理(Red Hat Subscription Management)再次注册您的系统。"
2d607d
+"Red Hat 建议客户只注册一次。"
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
2d607d
 #: ../src/subscription_manager/branding/redhat_branding.py:17
2d607d
@@ -4279,8 +4279,8 @@ msgid ""
2d607d
 "You will need to use Red Hat Subscription Manager to manually attach "
2d607d
 "subscriptions to this system after completing firstboot."
2d607d
 msgstr ""
2d607d
-"完成首次引导后,您需要使用 Red Hat Subscription Manager 手动在这个系统中附加"
2d607d
-"订阅。"
2d607d
+"完成 firstboot 后,您需要使用 Red Hat Subscription Manager 手动在这个系统中添"
2d607d
+"加订阅。"
9179ba
2d607d
 # translation auto-copied from project subscription-manager, version 1.9.X, document keys
2d607d
 #: ../src/subscription_manager/gui/data/manually_subscribe.glade.h:2
2d607d
diff --git a/po/zh_TW.po b/po/zh_TW.po
2d607d
index 6c50d98..d01096b 100644
2d607d
--- a/po/zh_TW.po
2d607d
+++ b/po/zh_TW.po
2d607d
@@ -10,7 +10,7 @@ msgstr ""
2d607d
 "Project-Id-Version: PACKAGE VERSION\n"
2d607d
 "Report-Msgid-Bugs-To: \n"
2d607d
 "POT-Creation-Date: 2014-02-04 08:45-0500\n"
2d607d
-"PO-Revision-Date: 2014-02-23 11:48-0500\n"
2d607d
+"PO-Revision-Date: 2014-03-02 07:08-0500\n"
2d607d
 "Last-Translator: tchuang <tchuang@redhat.com>\n"
2d607d
 "Language-Team: Chinese (Traditional Han, Taiwan)\n"
2d607d
 "Language: zh-Hant-TW\n"
2d607d
diff --git a/rel-eng/packages/subscription-manager b/rel-eng/packages/subscription-manager
2d607d
index cab0aeb..6df7ff7 100644
2d607d
--- a/rel-eng/packages/subscription-manager
2d607d
+++ b/rel-eng/packages/subscription-manager
2d607d
@@ -1 +1 @@
2d607d
-1.10.14-3 ./
2d607d
+1.10.14-4 ./
2d607d
diff --git a/rel-eng/tito.props b/rel-eng/tito.props
2d607d
index 17792b0..6f078a5 100644
2d607d
--- a/rel-eng/tito.props
2d607d
+++ b/rel-eng/tito.props
2d607d
@@ -1,4 +1,5 @@
2d607d
 [globalconfig]
2d607d
-default_builder = tito.builder.UpstreamBuilder
2d607d
+#default_builder = tito.builder.UpstreamBuilder
2d607d
+default_builder = tito.distributionbuilder.DistributionBuilder
2d607d
 default_tagger = tito.tagger.ReleaseTagger
9179ba
2d607d
diff --git a/src/rhsm_debug/debug_commands.py b/src/rhsm_debug/debug_commands.py
2d607d
index f7b85c3..d1b2bbe 100644
2d607d
--- a/src/rhsm_debug/debug_commands.py
2d607d
+++ b/src/rhsm_debug/debug_commands.py
2d607d
@@ -132,8 +132,8 @@ class SystemCommand(CliCommand):
2d607d
             # (as is the default) we will have already copied there contents,
2d607d
             # so ignore directory exists errors
2d607d
             try:
2d607d
-                if defaults['ca_cert_dir'] != cfg.get('server', 'ca_cert_dir') or not sos:
2d607d
-                    self._copy_cert_directory(cfg.get('server', 'ca_cert_dir'), content_path)
2d607d
+                if defaults['ca_cert_dir'] != cfg.get('rhsm', 'ca_cert_dir') or not sos:
2d607d
+                    self._copy_cert_directory(cfg.get('rhsm', 'ca_cert_dir'), content_path)
2d607d
             except EnvironmentError, e:
2d607d
                 if e.errno != errno.EEXIST:
2d607d
                     raise
2d607d
diff --git a/subscription-manager.spec b/subscription-manager.spec
2d607d
index 68de3c2..db8a262 100644
2d607d
--- a/subscription-manager.spec
2d607d
+++ b/subscription-manager.spec
2d607d
@@ -1,22 +1,20 @@
2d607d
 # Prefer systemd over sysv on Fedora 17+ and RHEL 7+
2d607d
-%define use_systemd (0%{?fedora} && 0%{?fedora} >= 17) || (0%{?rhel} && 0%{?rhel} >= 7)
2d607d
-%define use_dateutil (0%{?fedora} && 0%{?fedora} >= 17) || (0%{?rhel} && 0%{?rhel} >= 6)
2d607d
-%define use_old_firstboot (0%{?rhel} && 0%{?rhel} <= 6)
2d607d
-
2d607d
-
2d607d
-%define rhsm_plugins_dir   /usr/share/rhsm-plugins
2d607d
+%global use_systemd (0%{?fedora} && 0%{?fedora} >= 17) || (0%{?rhel} && 0%{?rhel} >= 7)
2d607d
+%global use_dateutil (0%{?fedora} && 0%{?fedora} >= 17) || (0%{?rhel} && 0%{?rhel} >= 6)
2d607d
+%global use_old_firstboot (0%{?rhel} && 0%{?rhel} <= 6)
2d607d
+%global rhsm_plugins_dir  /usr/share/rhsm-plugins
9179ba
9179ba
2d607d
 %global _hardened_build 1
9179ba
2d607d
 # A couple files are for RHEL 5 only:
2d607d
 %if 0%{?rhel} == 5
2d607d
-%define el5 1
2d607d
+%global el5 1
2d607d
 %endif
9179ba
2d607d
 Name: subscription-manager
2d607d
 Version: 1.10.14
2d607d
-Release: 3%{?dist}
2d607d
+Release: 4%{?dist}
2d607d
 Summary: Tools and libraries for subscription and repository management
2d607d
 Group:   System Environment/Base
2d607d
 License: GPLv2
2d607d
@@ -49,20 +47,19 @@ Requires: python-dateutil
2d607d
 Requires: PyXML
2d607d
 %endif
9179ba
2d607d
-
2d607d
 # There's no dmi to read on these arches, so don't pull in this dep.
2d607d
 %ifnarch ppc ppc64 s390 s390x
2d607d
 Requires:  python-dmidecode
2d607d
 %endif
9179ba
2d607d
+%if %use_systemd
2d607d
+Requires(post): systemd
2d607d
+Requires(preun): systemd
2d607d
+Requires(postun): systemd
2d607d
+%else
2d607d
 Requires(post): chkconfig
2d607d
 Requires(preun): chkconfig
2d607d
 Requires(preun): initscripts
2d607d
-
2d607d
-%if %use_systemd
2d607d
-Requires(post): systemd-units
2d607d
-Requires(preun): systemd-units
2d607d
-Requires(postun): systemd-units
2d607d
 %endif
9179ba
2d607d
 BuildRequires: python-devel
2d607d
@@ -74,6 +71,10 @@ BuildRequires: desktop-file-utils
2d607d
 BuildRequires: redhat-lsb
2d607d
 BuildRequires: scrollkeeper
2d607d
 BuildRequires: GConf2-devel
2d607d
+%if %use_systemd
2d607d
+# We need the systemd RPM macros
2d607d
+BuildRequires: systemd
2d607d
+%endif
9179ba
9179ba
2d607d
 %description
2d607d
@@ -286,7 +287,7 @@ rm -rf %{buildroot}
9179ba
2d607d
 %if %use_systemd
2d607d
     %attr(644,root,root) %{_unitdir}/rhsmcertd.service
2d607d
-    %attr(644,root,root) %{_prefix}/lib/tmpfiles.d/%{name}.conf
2d607d
+    %attr(644,root,root) %{_tmpfilesdir}/%{name}.conf
2d607d
 %else
2d607d
     %attr(755,root,root) %{_initrddir}/rhsmcertd
2d607d
 %endif
2d607d
@@ -401,8 +402,7 @@ fi
2d607d
 %preun
2d607d
 if [ $1 -eq 0 ] ; then
2d607d
     %if %use_systemd
2d607d
-        /bin/systemctl --no-reload disable rhsmcertd.service > /dev/null 2>&1 || :
2d607d
-        /bin/systemctl stop rhsmcertd.service > /dev/null 2>&1 || :
2d607d
+        %systemd_preun rhsmcertd.service
2d607d
     %else
2d607d
         /sbin/service rhsmcertd stop >/dev/null 2>&1
2d607d
         /sbin/chkconfig --del rhsmcertd
2d607d
@@ -415,13 +415,15 @@ fi
9179ba
2d607d
 %postun
2d607d
 %if %use_systemd
2d607d
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
2d607d
-    if [ $1 -eq 1 ] ; then
2d607d
-        /bin/systemctl try-restart rhsmcertd.service >/dev/null 2>&1 || :
2d607d
-    fi
2d607d
+    %systemd_postun_with_restart rhsmcertd.service
2d607d
 %endif
9179ba
2d607d
 %changelog
2d607d
+* Tue Mar 04 2014 ckozak <ckozak@redhat.com> 1.10.14-4
2d607d
+- 1030378: Latest strings from zanata. (alikins@redhat.com)
2d607d
+- 1070737: correct config section for ca_cert_dir (ckozak@redhat.com)
2d607d
+- Use systemd RPM macros to make life easier. (awood@redhat.com)
2d607d
+
2d607d
 * Wed Feb 26 2014 ckozak <ckozak@redhat.com> 1.10.14-3
2d607d
 - 906567: Fix translations of "Red Hat" (alikins@redhat.com)
2d607d
 - 1039914: rhsm-debug updates and fixes (alikins@redhat.com)