client/rhel
by Miroslav Suchý
client/rhel/yum-rhn-plugin/po/bn_IN.po | 25 ++++++++++-------
client/rhel/yum-rhn-plugin/po/de.po | 35 ++++++++++++-------------
client/rhel/yum-rhn-plugin/po/es.po | 31 +++++++---------------
client/rhel/yum-rhn-plugin/po/fr.po | 37 +++++++++++---------------
client/rhel/yum-rhn-plugin/po/gu.po | 32 ++++++++++------------
client/rhel/yum-rhn-plugin/po/hi.po | 23 +++++++++-------
client/rhel/yum-rhn-plugin/po/it.po | 26 ++++++------------
client/rhel/yum-rhn-plugin/po/ja.po | 39 +++++++++++++--------------
client/rhel/yum-rhn-plugin/po/kn.po | 19 +++++++------
client/rhel/yum-rhn-plugin/po/ko.po | 34 +++++++++++-------------
client/rhel/yum-rhn-plugin/po/ml.po | 37 ++++++++++++--------------
client/rhel/yum-rhn-plugin/po/mr.po | 34 +++++++++++-------------
client/rhel/yum-rhn-plugin/po/or.po | 23 +++++++++-------
client/rhel/yum-rhn-plugin/po/pa.po | 25 ++++++++++-------
client/rhel/yum-rhn-plugin/po/pt_BR.po | 34 +++++++++++-------------
client/rhel/yum-rhn-plugin/po/ru.po | 10 +++----
client/rhel/yum-rhn-plugin/po/ta.po | 23 ++++++++++------
client/rhel/yum-rhn-plugin/po/te.po | 25 ++++++++++-------
client/rhel/yum-rhn-plugin/po/zh_CN.po | 46 ++++++++++++---------------------
client/rhel/yum-rhn-plugin/po/zh_TW.po | 35 ++++++++++++-------------
20 files changed, 289 insertions(+), 304 deletions(-)
New commits:
commit b68f5fb3e2214a4a570fd5015cad0865c4dc34a2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Feb 24 16:28:17 2011 +0100
forward port translations from RHEL6 to yum-rhn-plugin
diff --git a/client/rhel/yum-rhn-plugin/po/bn_IN.po b/client/rhel/yum-rhn-plugin/po/bn_IN.po
index aeec6a7..ec80942 100644
--- a/client/rhel/yum-rhn-plugin/po/bn_IN.po
+++ b/client/rhel/yum-rhn-plugin/po/bn_IN.po
@@ -1,21 +1,21 @@
# translation of bn_IN.po to Bengali India
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Runa Bhattacharjee <runab(a)redhat.com>, 2006.
#
+# Runa Bhattacharjee <runab(a)redhat.com>, 2006, 2011.
msgid ""
msgstr ""
"Project-Id-Version: bn_IN\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2006-11-29 10:04+0530\n"
-"Last-Translator: Runa Bhattacharjee <runab(a)redhat.com>\n"
-"Language-Team: Bengali India\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-15 12:53+0530\n"
+"Last-Translator: \n"
+"Language-Team: Bengali (India) <anubad(a)lists.ankur.org.in>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: Lokalize 1.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"\n"
"\n"
@@ -25,8 +25,8 @@ msgid "There was an error communicating with RHN."
msgstr "RHN'র সাথে তথ্য আদান-প্রদানে সমস্যা।"
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "RHN সমর্থন ব্যবস্থা নিষ্ক্রয় করা হবে।"
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "RHN Satellite অথবা RHN Classic সমর্থন ব্যবস্থা নিষ্ক্রিয় করা হবে।"
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
@@ -34,6 +34,9 @@ msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
msgstr ""
+"*উল্লেখ্য* Red Hat Network-র সংগ্রহস্থলগুলি নীচে তালিকাভুক্ত করা হয়নি। RHN "
+"সংগ্রহস্থলগুলি প্রাপ্ত করার জন্য root ব্যবহারকারী রূপে এই কমান্ডটি প্রয়োগ "
+"করুন।"
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
@@ -55,6 +58,7 @@ msgstr "সিস্টেমটি কোনো চ্যানেলে সা
msgid ""
"This system may not be a registered to RHN. SystemId could not be acquired.\n"
msgstr ""
+"এই সিস্টেমটি সম্ভবত RHN-র সাথে নিবন্ধিত হয়নি। SystemId প্রাপ্ত করা যায়নি।\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
@@ -65,11 +69,12 @@ msgstr "প্যাকেজ প্রোফাইল সংক্রান্
#. bz: 438175
#: ../rhnplugin.py:200
msgid "Error Message:"
-msgstr ""
+msgstr "ত্রুটির বার্তা:"
#: ../rhnplugin.py:201
msgid "Please run rhn_register as root on this client"
msgstr ""
+"অনুগ্রহ করে এই ক্লায়েন্ট মেশিনের মধ্যে root পরিচয়ে rhn_register প্রয়োগ করুন।"
#: ../rhnplugin.py:280
#, python-format
diff --git a/client/rhel/yum-rhn-plugin/po/de.po b/client/rhel/yum-rhn-plugin/po/de.po
index 75ca1ab..4fde6dd 100644
--- a/client/rhel/yum-rhn-plugin/po/de.po
+++ b/client/rhel/yum-rhn-plugin/po/de.po
@@ -1,31 +1,32 @@
-# translation of spacewalk.yum-rhn-plugin.po to
# translation of de.po to
-# translation of de.po to
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+# This file is distributed under the same license as the yum-rhn-plugin package.
+# Copyright (C) 2011.
#
# sknirT omiT <moc.tahder@sknirtt>, 2010.
+# Timo Trinks <ttrinks(a)redhat.com>, 2006.
+# Hedda Peters <hpeters(a)redhat.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: spacewalk.yum-rhn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2010-05-06 13:34+1000\n"
-"Last-Translator: sknirT omiT <moc.tahder@sknirtt>\n"
-"Language-Team: <de(a)li.org>\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-17 15:15+1000\n"
+"Last-Translator: Hedda Peters <hpeters(a)redhat.com>\n"
+"Language-Team: de_DE <kde-i18n-doc(a)kde.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../rhnplugin.py:48
msgid "There was an error communicating with RHN."
msgstr "Bei der Kommunikation mit RHN trat ein Fehler auf."
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "RHN-Unterstützung wird deaktiviert."
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "RHN Satellite oder RHN Classic Unterstützung wird deaktiviert."
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
@@ -33,9 +34,9 @@ msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
msgstr ""
-"*Hinweis* Red Hat Network Repositories werden nachfolgend nicht aufgeführt. "
-"Sie müssen diesen Befehl als Root ausführen, um Zugriff auf RHN-Repositories "
-"zu erhalten."
+"*Hinweis* Red Hat Network Repositorys sind unten nicht aufgeführt. Sie "
+"müssen "
+"folgenden Befehl als Root ausführen, um auf RHN Repositorys zuzugreifen."
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
@@ -57,8 +58,8 @@ msgstr "Dieses System hat keine Channels abonniert."
msgid ""
"This system may not be a registered to RHN. SystemId could not be acquired.\n"
msgstr ""
-"Dieses System ist ggf. nicht bei RHN registriert. SystemID konnte nicht "
-"abgerufen werden.\n"
+"Dieses System ist womöglich nicht bei RHN registriert. SystemId konnte nicht "
+"ermittelt werden.\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
diff --git a/client/rhel/yum-rhn-plugin/po/es.po b/client/rhel/yum-rhn-plugin/po/es.po
index f804d87..696148b 100644
--- a/client/rhel/yum-rhn-plugin/po/es.po
+++ b/client/rhel/yum-rhn-plugin/po/es.po
@@ -3,19 +3,19 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
#
# Manuel Ospina <mospina(a)redhat.com>, 2006.
-# Gladys Guerrero <gguerrer(a)redhat.com>, 2010.
+# Gladys Guerrero <gguerrer(a)redhat.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: spacewalk.yum-rhn-plugin.es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2010-06-01 10:00+1000\n"
-"Last-Translator: Gladys Guerrero <gguerrer(a)redhat.com>\n"
-"Language-Team: Spanish <es(a)li.org>\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-15 17:25+1000\n"
+"Last-Translator: Gladys Guerrero <gguerrer(a)redhat.com>\n"
+"Language-Team: Spanish <en(a)li.org>\n"
+"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
"X-Generator: KBabel 1.11.4\n"
#: ../rhnplugin.py:48
@@ -23,17 +23,15 @@ msgid "There was an error communicating with RHN."
msgstr "Hubo un error al comunicarse con RHN."
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "El soporte de RHN será desactivado."
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "El soporte de RHN Satellite o RHN Classic será desactivado."
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
-msgstr ""
-"*Nota* Los repositorios de Red Hat Network no aparecen en la lista de abajo. "
-"Ejecute el comando como root para acceder a los repositorios de RHN."
+msgstr "*Nota* Los repositorios de Red Hat Network no se listan abajo. Debe ejecutar este comando como root para acceder a repositorios de RHN."
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
@@ -52,10 +50,8 @@ msgid "This system is not subscribed to any channels."
msgstr "Este sistema no está suscrito a ningún canal."
#: ../rhnplugin.py:135
-msgid ""
-"This system may not be a registered to RHN. SystemId could not be acquired.\n"
-msgstr ""
-"Este sistema puede no estar registrado a RHN. Systemld no se pudo adquirir.\n"
+msgid "This system may not be a registered to RHN. SystemId could not be acquired.\n"
+msgstr "Este sistema puede que no esté registrado a RHN. SystemId no puede adquirirse.\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
@@ -77,8 +73,3 @@ msgstr "Por favor ejecute rhn_register como root en este cliente"
msgid "Missing required login information for RHN: %s"
msgstr "Falta la información de ingreso requerida para RHN: %s"
-#~ msgid "Cleaning"
-#~ msgstr "Limpieza"
-
-#~ msgid "Either --version, or no commands entered"
-#~ msgstr "No ingresó --versión o comando"
diff --git a/client/rhel/yum-rhn-plugin/po/fr.po b/client/rhel/yum-rhn-plugin/po/fr.po
index 24870ad..e6848b7 100644
--- a/client/rhel/yum-rhn-plugin/po/fr.po
+++ b/client/rhel/yum-rhn-plugin/po/fr.po
@@ -1,38 +1,37 @@
-# translation of fr.po to French
-# translation of yum-rhn-plugin.po to Français
+# translation of yum-rhn-plugin_fr.po to French
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+#
# Decroux Fabien <fdecroux(a)redhat.com>, 2006.
# Alain PORTAL <aportal(a)univ-montp2.fr>, 2006.
-#
+# Sam Friedmann <sfriedma(a)hotmail.com>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: fr\n"
+"Project-Id-Version: yum-rhn-plugin_fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2006-12-08 11:52+1000\n"
-"Last-Translator: Decroux Fabien <fdecroux(a)redhat.com>\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-18 11:29+1000\n"
+"Last-Translator: Sam Friedmann <sfriedma(a)hotmail.com>\n"
"Language-Team: French <fr(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.4\n"
#: ../rhnplugin.py:48
msgid "There was an error communicating with RHN."
msgstr "Il y a eu une erreur de communication avec RHN."
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "Le support RHN sera désactivé."
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "Le support de RHN Satellite ou RHN Classic sera désactivé."
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
-msgstr ""
+msgstr "*Remarque* Les référentiels de Red Hat Network ne sont pas répertoriés ci-dessous. Vous devez saisir cette commande en tant que super-utilisateur (root) pour accéder aux référentiels RHN."
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
@@ -51,30 +50,26 @@ msgid "This system is not subscribed to any channels."
msgstr "Ce système n'est abonné à aucun canal."
#: ../rhnplugin.py:135
-msgid ""
-"This system may not be a registered to RHN. SystemId could not be acquired.\n"
-msgstr ""
+msgid "This system may not be a registered to RHN. SystemId could not be acquired.\n"
+msgstr "Ce système n'est peut-être pas enregistré avec RHN. SystemId n'a pas pu être acquis.\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
-msgstr ""
-"Les informations sur le profil de paquetage n'ont pas pu être envoyées."
+msgstr "Les informations sur le profil de paquetage n'ont pas pu être envoyées."
#. This is compensating for hosted/satellite returning back an error
#. message instructing RHEL5 clients to run "up2date --register"
#. bz: 438175
#: ../rhnplugin.py:200
msgid "Error Message:"
-msgstr ""
+msgstr "Message d'erreur :"
#: ../rhnplugin.py:201
msgid "Please run rhn_register as root on this client"
-msgstr ""
+msgstr "Veuillez exécuter rhn_register en tant que root sur ce client"
#: ../rhnplugin.py:280
#, python-format
msgid "Missing required login information for RHN: %s"
msgstr "Absence d'informations de connexion requises par RHN : %s"
-#~ msgid "Either --version, or no commands entered"
-#~ msgstr "Pas de --version ou de commandes entrées"
diff --git a/client/rhel/yum-rhn-plugin/po/gu.po b/client/rhel/yum-rhn-plugin/po/gu.po
index f2f7714..5f9db11 100644
--- a/client/rhel/yum-rhn-plugin/po/gu.po
+++ b/client/rhel/yum-rhn-plugin/po/gu.po
@@ -1,21 +1,22 @@
# translation of gu.po to Gujarati
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Ankit Patel <ankit(a)redhat.com>, 2006.
#
+# Ankit Patel <ankit(a)redhat.com>, 2006.
+# Sweta Kothari <swkothar(a)redhat.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: gu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2006-11-29 10:42+0530\n"
-"Last-Translator: Ankit Patel <ankit(a)redhat.com>\n"
-"Language-Team: Gujarati <fedora-trans-gu(a)redhat.com>\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-15 11:47+0530\n"
+"Last-Translator: Sweta Kothari <swkothar(a)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"
-"Language: gu\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"\n"
"\n"
@@ -25,15 +26,15 @@ msgid "There was an error communicating with RHN."
msgstr "RHN સાથે સંપર્કવ્યવહાર કરવામાં ભૂલ હતી."
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "RHN આધાર નિષ્ક્રિય કરવામાં આવશે."
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "RHN સેટેલાઇટ અથવા RHN Classic આધાર નિષ્ક્રિય થયેલ હશે."
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
-msgstr ""
+msgstr "*નોંધ* Red Hat Network રિપોઝીટરીઓ નીચે યાદી થયેલ નથી. તમારે RHN રિપોઝીટરીઓને વાપરવા માટે રુટ તરીકે આ આદેશને ચલાવવો જ પડશે."
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
@@ -52,9 +53,8 @@ msgid "This system is not subscribed to any channels."
msgstr "આ સિસ્ટમની કોઈ ચેનલોમાં ઉમેદવારી નોંધાયેલ નથી."
#: ../rhnplugin.py:135
-msgid ""
-"This system may not be a registered to RHN. SystemId could not be acquired.\n"
-msgstr ""
+msgid "This system may not be a registered to RHN. SystemId could not be acquired.\n"
+msgstr "આ સિસ્ટમ RHN માં રજીસ્ટર થઇ શકશે નહિં. SystemId ને મેળવી શક્યા નહિં.\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
@@ -65,16 +65,14 @@ msgstr "પેકેજ રૂપરેખા જાણકારી મોકલ
#. bz: 438175
#: ../rhnplugin.py:200
msgid "Error Message:"
-msgstr ""
+msgstr "ભૂલ સંદેશો:"
#: ../rhnplugin.py:201
msgid "Please run rhn_register as root on this client"
-msgstr ""
+msgstr "મહેરબાની કરીને આ ક્લાયન્ટ પર રુટ તરીકે rhn_register ને ચલાવો"
#: ../rhnplugin.py:280
#, python-format
msgid "Missing required login information for RHN: %s"
msgstr "RHN માટેની ગુમ થયેલ પ્રવેશ જાણકારી: %s"
-#~ msgid "Either --version, or no commands entered"
-#~ msgstr "ક્યાં તો --version, દાખલ કરો અથવા કોઈ આદેશો દાખલ કરો નહિં"
diff --git a/client/rhel/yum-rhn-plugin/po/hi.po b/client/rhel/yum-rhn-plugin/po/hi.po
index b873ea2..87a10c9 100644
--- a/client/rhel/yum-rhn-plugin/po/hi.po
+++ b/client/rhel/yum-rhn-plugin/po/hi.po
@@ -1,21 +1,20 @@
# translation of hi.po to Hindi
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Rajesh Ranjan <rranjan(a)redhat.com>, 2006.
#
+# Rajesh Ranjan <rranjan(a)redhat.com>, 2006, 2011.
msgid ""
msgstr ""
"Project-Id-Version: hi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2006-11-29 10:51+0530\n"
-"Last-Translator: Rajesh Ranjan <rranjan(a)redhat.com>\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-15 12:04+0530\n"
+"Last-Translator: \n"
"Language-Team: Hindi <fedora-trans-hi(a)redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: hi\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: Lokalize 1.1\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"\n"
"\n"
@@ -25,8 +24,8 @@ msgid "There was an error communicating with RHN."
msgstr "RHN से साथ संचार में त्रुटि."
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "RHN समर्थन निष्क्रिय किया जायेगा."
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "RHN सैटेलाइट या RHN क्लासिक समर्थन को निष्क्रिय किया जाएगा."
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
@@ -34,6 +33,8 @@ msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
msgstr ""
+"*नोट* Red Hat Network रिपोजिटरी को नीचे सूचीबद्ध किया गया है. आपको जरूर इस "
+"कमांड को बतौर रूट RHN रिपोजिटरी के पहुँच के लिए चलाना चाहिए."
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
@@ -55,6 +56,8 @@ msgstr "यह सिस्टम किसी चैनल से सदस्
msgid ""
"This system may not be a registered to RHN. SystemId could not be acquired.\n"
msgstr ""
+"यह सिस्टम RHN में पंजीकृत नहीं हो सकता है. SystemId को अर्जित नहीं किया जा "
+"सकता है.\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
@@ -65,11 +68,11 @@ msgstr "संकुल प्रोफाइल सूचना नहीं
#. bz: 438175
#: ../rhnplugin.py:200
msgid "Error Message:"
-msgstr ""
+msgstr "त्रुटि संदेश:"
#: ../rhnplugin.py:201
msgid "Please run rhn_register as root on this client"
-msgstr ""
+msgstr "कृपया rhn_register को बतौर रूट इस क्लाइंट पर चलाएँ"
#: ../rhnplugin.py:280
#, python-format
diff --git a/client/rhel/yum-rhn-plugin/po/it.po b/client/rhel/yum-rhn-plugin/po/it.po
index 3de08a8..2d48ee1 100644
--- a/client/rhel/yum-rhn-plugin/po/it.po
+++ b/client/rhel/yum-rhn-plugin/po/it.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2010-11-14 20:27+0100\n"
-"Last-Translator: Francesco Tombolini <tombo(a)adamantio.net>\n"
-"Language-Team: Italian <trans-it(a)lists.fedoraproject.org>\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-15 08:22+1000\n"
+"Last-Translator: \n"
+"Language-Team: <it(a)li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Generator: Lokalize 1.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -23,8 +23,8 @@ msgid "There was an error communicating with RHN."
msgstr "Si è verificato un errore durante la comunicazione con RHN."
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "Il supporto di RHN verrà disabilitato."
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "Il supporto per RHN Satellite o RHN Classic verrà disabilitato."
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
@@ -54,11 +54,8 @@ msgid "This system is not subscribed to any channels."
msgstr "Questo sistema non è registrato su alcun canale."
#: ../rhnplugin.py:135
-msgid ""
-"This system may not be a registered to RHN. SystemId could not be acquired.\n"
-msgstr ""
-"Questo sistema potrebbe non essere registrato a RHN. Il systemId non può "
-"essere acquisito.\n"
+msgid "This system may not be a registered to RHN. SystemId could not be acquired.\n"
+msgstr "Questo sistema potrebbe non essere registrato con RHN. Impossibile acquisire SystemId.\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
@@ -80,8 +77,3 @@ msgstr "Si prega di eseguire rhn_register come root su questo client"
msgid "Missing required login information for RHN: %s"
msgstr "Informazioni di login necessarie mancanti per RHN: %s"
-#~ msgid "Cleaning"
-#~ msgstr "Pulizia"
-
-#~ msgid "Either --version, or no commands entered"
-#~ msgstr "--version, o nessun comando inserito"
diff --git a/client/rhel/yum-rhn-plugin/po/ja.po b/client/rhel/yum-rhn-plugin/po/ja.po
index 26e3f54..c790f4b 100644
--- a/client/rhel/yum-rhn-plugin/po/ja.po
+++ b/client/rhel/yum-rhn-plugin/po/ja.po
@@ -1,41 +1,43 @@
# translation of ja.po to Japanese
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+#
# Kiyoto James Hashida <khashida(a)redhat.com>, 2006.
# Noriko Mizumoto <noriko(a)redhat.com>, 2006.
-#
+# Noriko Mizumoto <noriko(a)fedoraproject.org>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ja\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2006-11-30 20:58+1000\n"
-"Last-Translator: Noriko Mizumoto <noriko(a)redhat.com>\n"
-"Language-Team: Japanese <fedora-trans-ja(a)redhat.com>\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-15 14:18+1000\n"
+"Last-Translator: Noriko Mizumoto <noriko(a)fedoraproject.org>\n"
+"Language-Team: Japanese\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: ../rhnplugin.py:48
msgid "There was an error communicating with RHN."
msgstr "RHN との通信中にエラーが発生しました。"
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "RHN サポートは無効になります。"
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "RHN Satellite または RHN Classic のサポートは無効になります。"
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
-msgstr ""
+msgstr "以下には Red Hat Network レポジトリは表示されませんので注意してください。 RHN のレポジトリにアクセスするには root でこのコマンドを実行する必要があります。"
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
-msgstr "RHN proxy 設定の構文解析でエラーがありました。"
+msgstr "RHN Proxy 設定の構文解析中にエラーが発生しました。"
#: ../rhnplugin.py:122
msgid "This system is not registered with RHN."
@@ -47,32 +49,29 @@ msgstr "RHN チャンネルサポートは無効になります。"
#: ../rhnplugin.py:131
msgid "This system is not subscribed to any channels."
-msgstr "このシステムは、どのチャンネルにも購読していません。"
+msgstr "このシステムはいずれのチャンネルにもサブスクライブされていません。"
#: ../rhnplugin.py:135
-msgid ""
-"This system may not be a registered to RHN. SystemId could not be acquired.\n"
-msgstr ""
+msgid "This system may not be a registered to RHN. SystemId could not be acquired.\n"
+msgstr "このシステムは RHN に登録されていない可能性があります。 SystemID を取得できませんでした。\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
-msgstr "パッケージプロフィール情報を送信できませんでした。"
+msgstr "パッケージプロファイル情報を送信できませんでした。"
#. This is compensating for hosted/satellite returning back an error
#. message instructing RHEL5 clients to run "up2date --register"
#. bz: 438175
#: ../rhnplugin.py:200
msgid "Error Message:"
-msgstr ""
+msgstr "エラーメッセージ:"
#: ../rhnplugin.py:201
msgid "Please run rhn_register as root on this client"
-msgstr ""
+msgstr "このクライアント上で root として rhn_register を実行してください"
#: ../rhnplugin.py:280
#, python-format
msgid "Missing required login information for RHN: %s"
msgstr "RHN に必要なログイン情報が見つかりません: %s"
-#~ msgid "Either --version, or no commands entered"
-#~ msgstr "バージョンか、コマンドが入力されていません"
diff --git a/client/rhel/yum-rhn-plugin/po/kn.po b/client/rhel/yum-rhn-plugin/po/kn.po
index 05a8a29..276fc52 100644
--- a/client/rhel/yum-rhn-plugin/po/kn.po
+++ b/client/rhel/yum-rhn-plugin/po/kn.po
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# shankar Prasad <svenkate(a)redhat.com>, 2006.
+# Shankar Prasad <svenkate(a)redhat.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: kn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2006-12-10 15:10+0530\n"
-"Last-Translator: shankar Prasad <svenkate(a)redhat.com>\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-14 17:09+0530\n"
+"Last-Translator: Shankar Prasad <svenkate(a)redhat.com>\n"
"Language-Team: Kannada <en(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: kn\n"
-"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: Plural-Forms: nplural=2;plural=(n !=1);\n"
#: ../rhnplugin.py:48
@@ -23,8 +23,8 @@ msgid "There was an error communicating with RHN."
msgstr "RHN ಜೊತೆಗೆ ಸಂಪರ್ಕ ಸಾಧಿಸುವಲ್ಲಿ ದೋಷ ಉಂಟಾಗಿದೆ."
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "RHN ಬೆಂಬಲವು ಅಶಕ್ತಗೊಳ್ಳುತ್ತದೆ."
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "RHN Satellite ಅಥವ RHN Classic ಬೆಂಬಲವನ್ನು ಅಶಕ್ತಗೊಳಿಸಲಾಗುತ್ತದೆ."
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
@@ -32,6 +32,8 @@ msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
msgstr ""
+"*ಸೂಚನೆ* Red Hat Network ರೆಪೊಸಿಟರಿಗಳನ್ನು ಈ ಕೆಳಗೆ ಪಟ್ಟಿ ಮಾಡಲಾಗಿರುವುದಿಲ್ಲ. RHN "
+"ರೆಪೊಸಿಟರಿಗಳನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು ನೀವು ಈ ಆಜ್ಞೆಯನ್ನು ನಿರ್ವಾಹಕನಾಗಿ ಚಲಾಯಿಸಬೇಕು."
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
@@ -53,6 +55,7 @@ msgstr "ಈ ವ್ಯವಸ್ಥೆಯು ಯಾವುದೇ ಮಾರ್ಗಗ
msgid ""
"This system may not be a registered to RHN. SystemId could not be acquired.\n"
msgstr ""
+"ಈ ವ್ಯವಸ್ಥೆಯನ್ನು RHN ನೊಂದಿಗೆ ನೋಂದಾಯಿಸಲಾಗಿಲ್ಲ. SystemId ಅನ್ನು ಪಡೆಯಲಾಗಿಲ್ಲ.\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
@@ -63,11 +66,11 @@ msgstr "ಪ್ಯಾಕೆಜಿನ ಮಾಹಿತಿ ಪರಿಚಯವನ್
#. bz: 438175
#: ../rhnplugin.py:200
msgid "Error Message:"
-msgstr ""
+msgstr "ದೋಷ ಸಂದೇಶ:"
#: ../rhnplugin.py:201
msgid "Please run rhn_register as root on this client"
-msgstr ""
+msgstr "ಈ ಕ್ಲೈಂಟ್ನಲ್ಲಿ ನಿರ್ವಾಹಕರಾಗಿ rhn_register ಅನ್ನು ಚಲಾಯಿಸಿ"
#: ../rhnplugin.py:280
#, python-format
diff --git a/client/rhel/yum-rhn-plugin/po/ko.po b/client/rhel/yum-rhn-plugin/po/ko.po
index 9680b38..80ef52d 100644
--- a/client/rhel/yum-rhn-plugin/po/ko.po
+++ b/client/rhel/yum-rhn-plugin/po/ko.po
@@ -1,36 +1,37 @@
-# translation of ko.po to Korean
+# translation of ko.po to
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Eunju Kim <eukim(a)redhat.com>, 2006.
#
+# Eunju Kim <eukim(a)redhat.com>, 2006.
+# Eun-Ju Kim <eukim(a)redhat.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ko\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2006-11-29 13:42+1000\n"
-"Last-Translator: Eunju Kim <eukim(a)redhat.com>\n"
-"Language-Team: Korean <ko(a)li.org>\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-15 10:10+1000\n"
+"Last-Translator: Eun-Ju Kim <eukim(a)redhat.com>\n"
+"Language-Team: <ko(a)li.org>\n"
+"Language: ko\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ko\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.4\n"
#: ../rhnplugin.py:48
msgid "There was an error communicating with RHN."
msgstr "RHN과 통신하는 도중 오류가 발생했습니다."
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "RHN 지원은 비활성화됩니다."
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "RHN Satellite 또는 RHN Classic 지원은 비활성화됩니다. "
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
-msgstr ""
+msgstr "*알림* Red Hat Network 리포지터리가 아래 목록에 없습니다. RHN 리포지터리에 액세스하기 위해 이 명령을 root로 실행해야 합니다. "
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
@@ -49,9 +50,8 @@ msgid "This system is not subscribed to any channels."
msgstr "이 시스템은 아무 채널에도 등록되지 않았습니다."
#: ../rhnplugin.py:135
-msgid ""
-"This system may not be a registered to RHN. SystemId could not be acquired.\n"
-msgstr ""
+msgid "This system may not be a registered to RHN. SystemId could not be acquired.\n"
+msgstr "이 시스템을 RHN에 등록할 수 없습니다. 시스템 ID를 가져올 수 없습니다.\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
@@ -62,16 +62,14 @@ msgstr "패키지 프로파일 정보를 보낼 수 없습니다."
#. bz: 438175
#: ../rhnplugin.py:200
msgid "Error Message:"
-msgstr ""
+msgstr "오류 메세지: "
#: ../rhnplugin.py:201
msgid "Please run rhn_register as root on this client"
-msgstr ""
+msgstr "클라이언트에서 root로 rhn_register를 실행하십시오 "
#: ../rhnplugin.py:280
#, python-format
msgid "Missing required login information for RHN: %s"
msgstr "RHN에 로그인하기 위해 필요한 정보가 없습니다: %s"
-#~ msgid "Either --version, or no commands entered"
-#~ msgstr "--version 이나 아무 명령도 입력하지 않습니다"
diff --git a/client/rhel/yum-rhn-plugin/po/ml.po b/client/rhel/yum-rhn-plugin/po/ml.po
index 1896942..d8c2bc1 100644
--- a/client/rhel/yum-rhn-plugin/po/ml.po
+++ b/client/rhel/yum-rhn-plugin/po/ml.po
@@ -1,4 +1,4 @@
-# translation of ml.po to Malayalam
+# translation of ml.po to
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
# Ani Peter <apeter(a)redhat.com>, 2006.
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: ml\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2006-11-29 10:33+0530\n"
-"Last-Translator: Ani Peter <apeter(a)redhat.com>\n"
-"Language-Team: Malayalam\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-14 18:09+0530\n"
+"Last-Translator: \n"
+"Language-Team: <en(a)li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"\n"
"\n"
@@ -25,8 +25,8 @@ msgid "There was an error communicating with RHN."
msgstr "RHN-മായി ബന്ധപ്പെടുന്നതില് ഒരു പിഴവ് ഉണ്ടായിരുന്നു."
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "RHN പിന്തുണ അപ്രാപ്യമായിരിക്കും."
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "RHN സാറ്റിലൈറ്റ് അല്ലെങ്കില് RHN ക്ലാസ്സികിനുള്ള പിന്തുണ സജ്ജമായിരിക്കില്ല."
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
@@ -34,6 +34,8 @@ msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
msgstr ""
+"*കുറിപ്പു്* Red Hat നെറ്റ്വര്ക്ക് റിപ്പോസിറ്ററികള് താഴെ ലഭ്യമാക്കിയിട്ടില്ല. RHN റിപ്പോസിറ്ററികള് ലഭ്യമാക്കുന്നതിനായി "
+"ഈ കമാന്ഡ് നിങ്ങള് റൂട്ടായി പ്രവര്ത്തിപ്പിക്കണം."
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
@@ -45,36 +47,33 @@ msgstr "ഈ സിസ്റ്റം RHN-മായി രജിസ്ടര്
#: ../rhnplugin.py:127
msgid "RHN channel support will be disabled."
-msgstr "RHN ചാനലിന്റെ പിന്തുണ സജ്ജമായിരിക്കില്ല."
+msgstr "RHN ചാനലിനുള്ള പിന്തുണ സജ്ജമായിരിക്കില്ല."
#: ../rhnplugin.py:131
msgid "This system is not subscribed to any channels."
-msgstr "ഈ സിസ്റ്റം ഒരു ചാനലിന്റേയും അംഗം അല്ല."
+msgstr "ഈ സിസ്റ്റം ഒരു ചാനലിന്റെയും അംഗമല്ല."
#: ../rhnplugin.py:135
-msgid ""
-"This system may not be a registered to RHN. SystemId could not be acquired.\n"
-msgstr ""
+msgid "This system may not be a registered to RHN. SystemId could not be acquired.\n"
+msgstr "ഈ സിസ്റ്റം RHN-ലേക്കു് രജിസ്ടര് ചെയ്തിട്ടില്ല. സിസ്റ്റം ഐഡി ലഭ്യമാക്കുവാന് സാധ്യമായില്ല.\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
-msgstr "പാക്കേജിന്റെ പ്രൊഫൈല് വിവരം അയയ്ക്കുവാന് സാധ്യമായില്ല."
+msgstr "പാക്കേജിനുള്ള പ്രൊഫൈല് വിവരം അയയ്ക്കുവാന് സാധ്യമായില്ല."
#. This is compensating for hosted/satellite returning back an error
#. message instructing RHEL5 clients to run "up2date --register"
#. bz: 438175
#: ../rhnplugin.py:200
msgid "Error Message:"
-msgstr ""
+msgstr "പിശക് സന്ദേശം:"
#: ../rhnplugin.py:201
msgid "Please run rhn_register as root on this client"
-msgstr ""
+msgstr "ദയവായി ഈ ക്ലയന്റില് rhn_register റൂട്ടായി പ്രവര്ത്തിപ്പിയ്ക്കുക"
#: ../rhnplugin.py:280
#, python-format
msgid "Missing required login information for RHN: %s"
msgstr "RHN-ലേക്ക് പ്രവേശിക്കുന്നതിനുളള വിവരം ലഭ്യമല്ല: %s"
-#~ msgid "Either --version, or no commands entered"
-#~ msgstr "--version അല്ലെങ്കില് ഒരു കമാന്ഡും എന്റര് ചെയ്തിട്ടില്ല"
diff --git a/client/rhel/yum-rhn-plugin/po/mr.po b/client/rhel/yum-rhn-plugin/po/mr.po
index c543b40..59e564f 100644
--- a/client/rhel/yum-rhn-plugin/po/mr.po
+++ b/client/rhel/yum-rhn-plugin/po/mr.po
@@ -1,37 +1,38 @@
# translation of mr.po to Marathi
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Rahul Bhalerao <b.rahul.pm(a)gmail.com>, 2006.
#
+# Rahul Bhalerao <b.rahul.pm(a)gmail.com>, 2006.
+# Sandeep Shedmake <sshedmak(a)redhat.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: mr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2006-11-29 13:27+0530\n"
-"Last-Translator: Rahul Bhalerao <b.rahul.pm(a)gmail.com>\n"
-"Language-Team: Marathi\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-15 10:11+0530\n"
+"Last-Translator: Sandeep Shedmake <sshedmak(a)redhat.com>\n"
+"Language-Team: Marathi <fedora-trans-mr(a)redhat.com>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Generator: KBabel 1.9.1\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#: ../rhnplugin.py:48
msgid "There was an error communicating with RHN."
msgstr "RHN शी संवाद करण्यात चूक झाली."
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "RHN आधार अकार्यान्वित केला जाईल."
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "RHN सॅटेलाइट किंवा RHN क्लासिक सपोर्ट बंद केले जाईल."
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
-msgstr ""
+msgstr "*टिप* Red Hat Network रेपॉजिटरीज् सूचीत दाखवले नाही. RHN रेपॉजिटरीजकरीता प्रवेशसाठी या आदेशला रूट म्हणून चालवा."
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
@@ -50,9 +51,8 @@ msgid "This system is not subscribed to any channels."
msgstr "ही प्रणालीचे कोणत्याही वाहिनीवर सदस्यत्व नाही."
#: ../rhnplugin.py:135
-msgid ""
-"This system may not be a registered to RHN. SystemId could not be acquired.\n"
-msgstr ""
+msgid "This system may not be a registered to RHN. SystemId could not be acquired.\n"
+msgstr "ही प्रणालीची RHN सह नोंदणी नाही. SystemId प्राप्त करणे अशक्य.\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
@@ -63,16 +63,14 @@ msgstr "संकुल प्रोफाइल माहिती पाठव
#. bz: 438175
#: ../rhnplugin.py:200
msgid "Error Message:"
-msgstr ""
+msgstr "त्रुटी संदेश:"
#: ../rhnplugin.py:201
msgid "Please run rhn_register as root on this client"
-msgstr ""
+msgstr "या क्लाएंटवर rhn_register यास रूट म्हणून चालवा"
#: ../rhnplugin.py:280
#, python-format
msgid "Missing required login information for RHN: %s"
msgstr "RHN साठी आवश्यक लॉगिन माहिती सापडली नाही: %s"
-#~ msgid "Either --version, or no commands entered"
-#~ msgstr "एकतर --version, किंवा कोणताही आदेश दाखल केला नाही"
diff --git a/client/rhel/yum-rhn-plugin/po/or.po b/client/rhel/yum-rhn-plugin/po/or.po
index 7f1a0d7..537e38b 100644
--- a/client/rhel/yum-rhn-plugin/po/or.po
+++ b/client/rhel/yum-rhn-plugin/po/or.po
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Subhransu Behera <sbehera(a)redhat.com>, 2006.
+# Manoj Kumar Giri <mgiri(a)redhat.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: or\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2006-11-29 17:37+0530\n"
-"Last-Translator: Subhransu Behera <sbehera(a)redhat.com>\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-21 16:54+0530\n"
+"Last-Translator: Manoj Kumar Giri <mgiri(a)redhat.com>\n"
"Language-Team: Oriya <oriya-group(a)lists.sarovar.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: or\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.1\n"
"Plural-Forms: Plural-Forms: nplurals=2; plural=(n!=1);\n"
"\n"
"\n"
@@ -25,8 +25,8 @@ msgid "There was an error communicating with RHN."
msgstr "RHN ସହିତ ସମ୍ବାଦ ବିନିମୟ କରିବା ସମୟରେ ଗୋଟିଏ ତୃଟି ପରିଲିଖିତ ହେଲା।"
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "RHN ସହାୟତାକୁ ନିଷ୍କ୍ରିୟ କରି ଦିଆଯିବ।"
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "RHN ସାଟେଲାଇଟ କିମ୍ବା RHN ଉତ୍କୃଷ୍ଟ ଶ୍ରେଣୀ ସହାୟତାକୁ ନିଷ୍କ୍ରିୟ କରି ଦିଆଯିବ।"
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
@@ -34,6 +34,9 @@ msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
msgstr ""
+"*ଟିପ୍ପଣୀ* Red Hat ନେଟୱର୍କ ସଂଗ୍ରହାଳୟଗୁଡ଼ିକ ନିମ୍ନରେ ତାଲିକାଭୁକ୍ତ ହୋଇନାହିଁ। ଆପଣ "
+"ନିଶ୍ଚିତ ଭାବରେ ଏହି ନିର୍ଦ୍ଦେଶକୁ "
+"RHN ସଂଗ୍ରହାଳୟରେ ମୂଖ୍ୟ ଚାଳକ ଭାବରେ ଚଲାଇବା ଉଚିତ।"
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
@@ -54,7 +57,7 @@ msgstr "ତନ୍ତ୍ରଟି କୌଣସି ଉପପଥ ସହିତ ହ
#: ../rhnplugin.py:135
msgid ""
"This system may not be a registered to RHN. SystemId could not be acquired.\n"
-msgstr ""
+msgstr "ଏହି ତନ୍ତ୍ର ହୁଏତଃ RHN ରେ ପଞ୍ଜିକୃତ ହୋଇନାହିଁ। SystemId କୁ ଧରିହେଲାନାହିଁ।\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
@@ -65,11 +68,11 @@ msgstr "ପ୍ଯାକେଜ ରୂପରେଖ ସୂଚନାକୁ ପଠା
#. bz: 438175
#: ../rhnplugin.py:200
msgid "Error Message:"
-msgstr ""
+msgstr "ତ୍ରୁଟି ସନ୍ଦେଶ:"
#: ../rhnplugin.py:201
msgid "Please run rhn_register as root on this client"
-msgstr ""
+msgstr "rhn_register କୁ ମୂଖ୍ୟ ଚାଳକ ଭାବରେ ଏହି କ୍ଲାଏଣ୍ଟ ଉପରେ ଚଲାନ୍ତୁ"
#: ../rhnplugin.py:280
#, python-format
diff --git a/client/rhel/yum-rhn-plugin/po/pa.po b/client/rhel/yum-rhn-plugin/po/pa.po
index 1d227f4..6c8e02b 100644
--- a/client/rhel/yum-rhn-plugin/po/pa.po
+++ b/client/rhel/yum-rhn-plugin/po/pa.po
@@ -1,21 +1,21 @@
# translation of pa.po to Punjabi
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Jaswinder Singh <jsingh(a)redhat.com>, 2006.
#
+# Jaswinder Singh <jsingh(a)redhat.com>, 2006, 2011.
msgid ""
msgstr ""
"Project-Id-Version: pa\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2006-12-01 14:14+0530\n"
-"Last-Translator: Jaswinder Singh <jsingh(a)redhat.com>\n"
-"Language-Team: Punjabi <fedora-trans-pa(a)redhat.com>\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-15 15:31+0530\n"
+"Last-Translator: \n"
+"Language-Team: Punjabi/Panjabi <kde-i18n-doc(a)kde.org>\n"
+"Language: pa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pa\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: Lokalize 1.0\n"
"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
"\n"
"\n"
@@ -25,8 +25,8 @@ msgid "There was an error communicating with RHN."
msgstr "RHN ਨਾਲ ਸੰਪਰਕ ਕਰਨ ਸਮੇਂ ਗਲਤੀ ਸੀ।"
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "RHN ਸਹਿਯੋਗ ਅਯੋਗ ਕੀਤਾ ਜਾਏਗਾ।"
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "RHN ਸੈਟੇਲਾਈਟ ਜਾਂ RHN ਕਲਾਸਿਕ ਸਹਿਯੋਗ ਅਯੋਗ ਕੀਤਾ ਜਾਏਗਾ।"
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
@@ -34,6 +34,8 @@ msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
msgstr ""
+"*ਸੂਚਨਾ* Red Hat Network ਰਿਪੋਜ਼ਟਰੀਆਂ ਹੇਠਾਂ ਨਹੀਂ ਵੇਖਾਈਆਂ ਹਨ। ਤੁਹਾਨੂੰ RHN "
+"ਰਿਪੋਜ਼ਟਰੀਆਂ ਵਰਤਣ ਲਈ ਪਰਬੰਧਕ ਦੇ ਤੌਰ ਤੇ ਇਹ ਕਮਾਂਡ ਚਲਾਉਣੀ ਪਵੇਗੀ।"
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
@@ -55,6 +57,7 @@ msgstr "ਇਹ ਸਿਸਟਮ ਕਿਸੇ ਵੀ ਚੈਨਲ ਤੇ ਮੈਂ
msgid ""
"This system may not be a registered to RHN. SystemId could not be acquired.\n"
msgstr ""
+"ਇਹ ਸਿਸਟਮ ਹੋ ਸਕਦਾ ਕਿ RHN ਨਾਲ ਰਜਿਸਟਰ ਨਾ ਹੋਵੇ। SystemId ਫੇਲ ਨਹੀਂ ਹੋ ਸਕਦਾ।\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
@@ -65,11 +68,11 @@ msgstr "ਪੈਕੇਜ ਪਰੋਫਾਈਲ ਜਾਣਕਾਰੀ ਭੇਜੀ
#. bz: 438175
#: ../rhnplugin.py:200
msgid "Error Message:"
-msgstr ""
+msgstr "ਗਲਤੀ ਸੁਨੇਹਾ:"
#: ../rhnplugin.py:201
msgid "Please run rhn_register as root on this client"
-msgstr ""
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਪਰਬੰਧਕ ਦੇ ਤੌਰ ਤੇ ਇਸ ਕਲਾਂਈਟ ਉੱਪਰ rhn_register ਚਲਾਓ"
#: ../rhnplugin.py:280
#, python-format
diff --git a/client/rhel/yum-rhn-plugin/po/pt_BR.po b/client/rhel/yum-rhn-plugin/po/pt_BR.po
index c4d59a9..65534e3 100644
--- a/client/rhel/yum-rhn-plugin/po/pt_BR.po
+++ b/client/rhel/yum-rhn-plugin/po/pt_BR.po
@@ -1,36 +1,37 @@
-# translation of pt_BR.po to Brazilian Portuguese
+# translation of pt_BR.po to Portuguese
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Valnir Ferreira Jr. <vferreir(a)redhat.com>, 2006.
#
+# Valnir Ferreira Jr. <vferreir(a)redhat.com>, 2006.
+# Glaucia Cintra <gcintra(a)redhat.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2006-11-30 10:21+1000\n"
-"Last-Translator: Valnir Ferreira Jr.\n"
-"Language-Team: Brazilian Portuguese\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-14 21:46+1000\n"
+"Last-Translator: Glaucia Cintra <gcintra(a)redhat.com>\n"
+"Language-Team: Portuguese <en(a)li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.4\n"
#: ../rhnplugin.py:48
msgid "There was an error communicating with RHN."
msgstr "Houve um erro ao tentar a comunicação com o RHN."
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "Suporte ao RHN será desabilitado."
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "Suporte a canais do RHN Satellite ou RHN Classic será desabilitado."
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
-msgstr ""
+msgstr "*Nota* Os repositórios da Red Hat Network não estão listados abaixo. Você precisa rodar este comando como root para acessar os repositórios do RHN."
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
@@ -49,9 +50,8 @@ msgid "This system is not subscribed to any channels."
msgstr "Este sistema não está subscrito a nenhum canal."
#: ../rhnplugin.py:135
-msgid ""
-"This system may not be a registered to RHN. SystemId could not be acquired.\n"
-msgstr ""
+msgid "This system may not be a registered to RHN. SystemId could not be acquired.\n"
+msgstr "Este sistema pode não ser registrado com o RHN. O Systemid pode não ser obtido.\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
@@ -62,16 +62,14 @@ msgstr "Informação sobre perfil de pacote não pôde ser enviada."
#. bz: 438175
#: ../rhnplugin.py:200
msgid "Error Message:"
-msgstr ""
+msgstr "Mensagem de Erro:"
#: ../rhnplugin.py:201
msgid "Please run rhn_register as root on this client"
-msgstr ""
+msgstr "Por favor, execute o rhn_register como root neste cliente"
#: ../rhnplugin.py:280
#, python-format
msgid "Missing required login information for RHN: %s"
msgstr "Informação de login necessária para o RHN não foi encontrada: %s"
-#~ msgid "Either --version, or no commands entered"
-#~ msgstr "Ou --version ou nenhum comando foi digitado"
diff --git a/client/rhel/yum-rhn-plugin/po/ru.po b/client/rhel/yum-rhn-plugin/po/ru.po
index c420319..b7f6478 100644
--- a/client/rhel/yum-rhn-plugin/po/ru.po
+++ b/client/rhel/yum-rhn-plugin/po/ru.po
@@ -9,14 +9,14 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2011-02-15 16:55+1100\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-15 16:23+1100\n"
"Last-Translator: \n"
"Language-Team: Russian\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Generator: KBabel 1.11.4\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"
@@ -25,8 +25,8 @@ msgid "There was an error communicating with RHN."
msgstr "Ошибка при обращении к RHN."
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "Поддержка RHN будет отключена."
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "Поддержка RHN Satellite и RHN Classic будет отключена."
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
diff --git a/client/rhel/yum-rhn-plugin/po/ta.po b/client/rhel/yum-rhn-plugin/po/ta.po
index c8becc4..c86248f 100644
--- a/client/rhel/yum-rhn-plugin/po/ta.po
+++ b/client/rhel/yum-rhn-plugin/po/ta.po
@@ -1,21 +1,22 @@
# translation of ta.po to Tamil
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Felix <ifelix(a)redhat.com>, 2006.
#
+# Felix <ifelix(a)redhat.com>, 2006.
+# I Felix <ifelix(a)redhat.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ta\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2006-11-29 11:11+0530\n"
-"Last-Translator: Felix <ifelix(a)redhat.com>\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-15 15:13+0530\n"
+"Last-Translator: I Felix <ifelix(a)redhat.com>\n"
"Language-Team: Tamil <ta(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ta\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: Lokalize 1.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"\n"
"\n"
@@ -26,8 +27,8 @@ msgid "There was an error communicating with RHN."
msgstr "RHN உடன் தொடர்பு கொள்வதில் பிழை."
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "RHN துணை செயல்நீக்கப்படும்."
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "RHN சேட்டிலைட் அல்லது RHN கிளாஸிக் சேவை செயல்நீக்கப்படும்."
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
@@ -35,6 +36,8 @@ msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
msgstr ""
+"*குறிப்பு* Red Hat Network தொகுபதிவங்கள் கீழே பட்டியலிடப்படவில்லை. நீங்கள் "
+"ரூட்டாக இருந்து RHN தொகுபதிவங்களை இயக்க வேண்டும்."
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
@@ -56,6 +59,8 @@ msgstr "இந்த கணினி எந்த தடங்களுடனு
msgid ""
"This system may not be a registered to RHN. SystemId could not be acquired.\n"
msgstr ""
+"இந்த கணினி RHNவுடன் பதிவு செய்யப்பட்டிருக்காது. SystemId "
+"எடுத்துக்கொள்ளப்படவில்லை.\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
@@ -66,11 +71,11 @@ msgstr "தொகுப்பு விவரக்குறிப்பு த
#. bz: 438175
#: ../rhnplugin.py:200
msgid "Error Message:"
-msgstr ""
+msgstr "பிழை செய்தி:பிழை செய்தி"
#: ../rhnplugin.py:201
msgid "Please run rhn_register as root on this client"
-msgstr ""
+msgstr "இந்த கிளையன்டில் rhn_registerஐ ரூட்டாக இயக்கவும்"
#: ../rhnplugin.py:280
#, python-format
diff --git a/client/rhel/yum-rhn-plugin/po/te.po b/client/rhel/yum-rhn-plugin/po/te.po
index 94480ab..22ff929 100644
--- a/client/rhel/yum-rhn-plugin/po/te.po
+++ b/client/rhel/yum-rhn-plugin/po/te.po
@@ -2,29 +2,30 @@
# translation of te.po to
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2006.
-# Sree Ganesh <sthottem(a)redhat.com>, 2006.
#
+# Sree Ganesh <sthottem(a)redhat.com>, 2006.
+# Krishnababu Krothapalli <kkrothap(a)redhat.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: te\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2006-11-30 17:44+0530\n"
-"Last-Translator: Sree Ganesh <sthottem(a)redhat.com>\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-15 17:00+0530\n"
+"Last-Translator: Krishnababu Krothapalli <kkrothap(a)redhat.com>\n"
"Language-Team: Telugu <en(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: te\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: Lokalize 1.1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: ../rhnplugin.py:48
msgid "There was an error communicating with RHN."
msgstr "RHNతో సంప్రదించటంలో దోషం ఉంది."
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "RHN మద్దతు అసాధ్యం అవుతుంది."
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "RHN శాటిలైట్ లేదా RHN క్లాసిక్ తోడ్పాటు అచేతనమగును."
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
@@ -32,6 +33,9 @@ msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
msgstr ""
+"*గమనిక* Red Hat నెట్వర్కు రిపోజిటరీలు కిందన జాబితా చేసిలేవు. RHN "
+"రిపోజిటరీలను వాడుకొనుటకు "
+"మీరు యీ ఆదేశమును root గా నడుపవలెను."
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
@@ -53,6 +57,7 @@ msgstr "ఈ కంప్యూటరు ఏ చానళ్లకీ అను
msgid ""
"This system may not be a registered to RHN. SystemId could not be acquired.\n"
msgstr ""
+"ఈ సిస్టమ్ RHN తో నమోదై వుండకపోవచ్చును. సిస్టమ్ఐడి పొందలేక పోవుచున్నది.\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
@@ -63,11 +68,11 @@ msgstr "ప్యాకేజీ రూప సమాచారం పంపబడ
#. bz: 438175
#: ../rhnplugin.py:200
msgid "Error Message:"
-msgstr ""
+msgstr "దోషం సందేశం:"
#: ../rhnplugin.py:201
msgid "Please run rhn_register as root on this client"
-msgstr ""
+msgstr "దయచేసి ఈ క్లైంట్ పై root గా rhn_register నడుపుము"
#: ../rhnplugin.py:280
#, python-format
diff --git a/client/rhel/yum-rhn-plugin/po/zh_CN.po b/client/rhel/yum-rhn-plugin/po/zh_CN.po
index 817d3fc..ac225c3 100644
--- a/client/rhel/yum-rhn-plugin/po/zh_CN.po
+++ b/client/rhel/yum-rhn-plugin/po/zh_CN.po
@@ -1,46 +1,42 @@
-# translation of spacewalk.yum-rhn-plugin.po to Wei Liu
-# translation of zh_CN.po to
-# translation of zh_CN.po to
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+# translation of zh_CN.po to Wei Liu
+# This file is distributed under the same license as the yum-rhn-plugin package.
+# Copyright (C) 2011.
#
# Tony Fu <tfu(a)redhat.com>, 2006.
# Xi Huang <xhuang(a)redhat.com>, 2006.
-# Leah Liu <lliu(a)redhat.com>, 2010.
+# Leah Liu <lliu(a)redhat.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: spacewalk.yum-rhn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2010-06-10 12:08+1000\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-15 10:11+1000\n"
"Last-Translator: Leah Liu <lliu(a)redhat.com>\n"
"Language-Team: Wei Liu\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Generator: KBabel 1.11.4\n"
#: ../rhnplugin.py:48
msgid "There was an error communicating with RHN."
-msgstr "有一个 RHN 的连接错误。"
+msgstr "连接到 RHN 时出错。"
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "RHN 支持将被禁用。"
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "RHN Satellite 或者 RHN Classic 支持将被禁用。"
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
-msgstr ""
-"*备注* 以下没有列出红帽网络程序库。您必须以根用户身份运行这个命令方可进入 "
-"RHN 程序库。"
+msgstr "*备注* 下面没有列出红帽网络程序库。您必须以 root 身份运行这个命令方可访问 RHN 程序库。"
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
-msgstr "RHN 代理服务器设置解释错误。"
+msgstr "解析 RHN 代理服务器设置时出错。"
#: ../rhnplugin.py:122
msgid "This system is not registered with RHN."
@@ -52,16 +48,15 @@ msgstr "RHN 频道支持将被禁用。"
#: ../rhnplugin.py:131
msgid "This system is not subscribed to any channels."
-msgstr "这个系统没有订阅到任何频道。"
+msgstr "没有在任何频道中订阅这个系统。"
#: ../rhnplugin.py:135
-msgid ""
-"This system may not be a registered to RHN. SystemId could not be acquired.\n"
-msgstr "这个系统可能没有在 RHN 注册。无法获得 SystemId。\n"
+msgid "This system may not be a registered to RHN. SystemId could not be acquired.\n"
+msgstr "这个系统还没有在 RHN 中注册。无法获得 SystemId。\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
-msgstr "软件包配置档案信息无法发送。"
+msgstr "无法发送软件包侧写信息。"
#. This is compensating for hosted/satellite returning back an error
#. message instructing RHEL5 clients to run "up2date --register"
@@ -72,15 +67,10 @@ msgstr "出错信息:"
#: ../rhnplugin.py:201
msgid "Please run rhn_register as root on this client"
-msgstr "请在客户端中以根用户身份运行 rhn_register"
+msgstr "请在这个客户端中以 root 身份运行 rhn_register"
#: ../rhnplugin.py:280
#, python-format
msgid "Missing required login information for RHN: %s"
-msgstr "缺少 RHN: %s 所要求的登录信息"
-
-#~ msgid "Cleaning"
-#~ msgstr "清除中"
+msgstr "缺少 RHN 所需登录信息:%s"
-#~ msgid "Either --version, or no commands entered"
-#~ msgstr "输入 --version 或不输入命令"
diff --git a/client/rhel/yum-rhn-plugin/po/zh_TW.po b/client/rhel/yum-rhn-plugin/po/zh_TW.po
index d5f41ef..59536e0 100644
--- a/client/rhel/yum-rhn-plugin/po/zh_TW.po
+++ b/client/rhel/yum-rhn-plugin/po/zh_TW.po
@@ -1,16 +1,18 @@
-# translation of zh_TW.po to Chinese (Traditional)
+# translation of zh_TW.po to Traditional Chinese
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
#
# Chester Cheng <ccheng(a)redhat.com>, 2006.
+# Terry Chuang <tchuang(a)redhat.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: zh_TW\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 05:57-0500\n"
-"PO-Revision-Date: 2006-12-01 15:22+1000\n"
-"Last-Translator: Chester Cheng <ccheng(a)redhat.com>\n"
-"Language-Team: Chinese (Traditional) <zh_TW(a)li.org>\n"
+"POT-Creation-Date: 2011-02-11 17:20+0100\n"
+"PO-Revision-Date: 2011-02-16 11:48+1000\n"
+"Last-Translator: Terry Chuang <tchuang(a)redhat.com>\n"
+"Language-Team: Traditional Chinese <zh(a)li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -22,15 +24,15 @@ msgid "There was an error communicating with RHN."
msgstr "與 RHN 通訊時發生錯誤。"
#: ../rhnplugin.py:90
-msgid "RHN support will be disabled."
-msgstr "支援 RHN 功能將被停用。"
+msgid "RHN Satellite or RHN Classic support will be disabled."
+msgstr "RHN Satellite 或 RHN Classic 的支援將被停用。"
#. If non-root notify user RHN repo not accessible
#: ../rhnplugin.py:94
msgid ""
"*Note* Red Hat Network repositories are not listed below. You must run this "
"command as root to access RHN repositories."
-msgstr ""
+msgstr "*請注意* Red Hat Network 軟體庫並未列在以下。您必須以 root 身份執行這項指令,以存取 RHN 軟體庫。"
#: ../rhnplugin.py:108
msgid "There was an error parsing the RHN proxy settings."
@@ -38,7 +40,7 @@ msgstr "解析 RHN 代理伺服器設定時出現錯誤。"
#: ../rhnplugin.py:122
msgid "This system is not registered with RHN."
-msgstr "這台系統並未向 RHN 註冊"
+msgstr "這台系統尚未向 RHN 註冊。"
#: ../rhnplugin.py:127
msgid "RHN channel support will be disabled."
@@ -46,12 +48,11 @@ msgstr "RHN 頻道的支援功能將被停用。"
#: ../rhnplugin.py:131
msgid "This system is not subscribed to any channels."
-msgstr "這系統並未訂閱任何頻道。"
+msgstr "這台系統尚未訂閱任何頻道。"
#: ../rhnplugin.py:135
-msgid ""
-"This system may not be a registered to RHN. SystemId could not be acquired.\n"
-msgstr ""
+msgid "This system may not be a registered to RHN. SystemId could not be acquired.\n"
+msgstr "這台系統可能尚未向 RHN 註冊。無法取得 SystemId。\n"
#: ../rhnplugin.py:193
msgid "Package profile information could not be sent."
@@ -62,16 +63,14 @@ msgstr "套件設定檔資訊無法送出。"
#. bz: 438175
#: ../rhnplugin.py:200
msgid "Error Message:"
-msgstr ""
+msgstr "錯誤訊息:"
#: ../rhnplugin.py:201
msgid "Please run rhn_register as root on this client"
-msgstr ""
+msgstr "請在此客戶端上,以 root 身份執行 rhn_register"
#: ../rhnplugin.py:280
#, python-format
msgid "Missing required login information for RHN: %s"
-msgstr "找不到登入 RHN 的所需資訊:%s"
+msgstr "找不到登入 RHN 所需的資訊:%s"
-#~ msgid "Either --version, or no commands entered"
-#~ msgstr "可能是以下二者之一:版本,或沒有輸入指令"
13 years, 2 months
client/debian
by Miroslav Suchý
client/debian/rhnlib/debian/changelog | 6 ++++++
client/debian/rhnlib/debian/compat | 1 +
client/debian/rhnlib/debian/control | 18 ++++++++++++++++++
client/debian/rhnlib/debian/copyright | 21 +++++++++++++++++++++
client/debian/rhnlib/debian/docs | 4 ++++
client/debian/rhnlib/debian/pycompat | 1 +
client/debian/rhnlib/debian/python-rhnlib.dsc | 15 +++++++++++++++
client/debian/rhnlib/debian/rules | 25 +++++++++++++++++++++++++
client/debian/rhnlib/debian/source/format | 1 +
client/debian/rhnlib/debian/watch | 2 ++
10 files changed, 94 insertions(+)
New commits:
commit 74099034b8824bd9fe3d02fe10ac7d21e7a7caf4
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Feb 24 14:39:26 2011 +0100
foo
diff --git a/client/debian/rhnlib/debian/changelog b/client/debian/rhnlib/debian/changelog
new file mode 100644
index 0000000..2ae6b7b
--- /dev/null
+++ b/client/debian/rhnlib/debian/changelog
@@ -0,0 +1,6 @@
+python-rhnlib (2.5.27-1) unstable; urgency=low
+
+ * Initial release (Closes: #597490) Package was created.
+
+ -- Miroslav Suchý <miroslav(a)suchy.cz> Mon, 20 Sep 2010 10:38:44 +0200
+
diff --git a/client/debian/rhnlib/debian/compat b/client/debian/rhnlib/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/client/debian/rhnlib/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/client/debian/rhnlib/debian/control b/client/debian/rhnlib/debian/control
new file mode 100644
index 0000000..26e5a62
--- /dev/null
+++ b/client/debian/rhnlib/debian/control
@@ -0,0 +1,18 @@
+Source: python-rhnlib
+Section: python
+Priority: extra
+Maintainer: Miroslav Suchý <miroslav(a)suchy.cz>
+Build-Depends: python, debhelper (>= 7.0.50~)
+Build-Depends-Indep: python-support (>= 0.8)
+Standards-Version: 3.9.1
+Homepage: https://fedorahosted.org/spacewalk
+
+Package: python-rhnlib
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}, python-openssl
+Provides: ${python:Provides}
+Description: Collection of Python modules used by the Spacewalk software
+ Collection of base Python modules used by the Red Hat Network
+ (http://rhn.redhat.com) and Spacewalk software.
+ This is common library used by both clients and server.
+
diff --git a/client/debian/rhnlib/debian/copyright b/client/debian/rhnlib/debian/copyright
new file mode 100644
index 0000000..52c8c06
--- /dev/null
+++ b/client/debian/rhnlib/debian/copyright
@@ -0,0 +1,21 @@
+Rhnlib is copyright 2010 by Red Hat Inc.
+Rhnlib is currently developed by Spacewalk Development Team <spacewalk-devel(a)redhat.com>.
+
+License: GPLv2
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+See /usr/share/common-licenses/GPL-2, or
+<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version
+of the GNU General Public License.
diff --git a/client/debian/rhnlib/debian/docs b/client/debian/rhnlib/debian/docs
new file mode 100644
index 0000000..70cfe37
--- /dev/null
+++ b/client/debian/rhnlib/debian/docs
@@ -0,0 +1,4 @@
+ChangeLog
+copyright
+README
+TODO
diff --git a/client/debian/rhnlib/debian/pycompat b/client/debian/rhnlib/debian/pycompat
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/client/debian/rhnlib/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/client/debian/rhnlib/debian/python-rhnlib.dsc b/client/debian/rhnlib/debian/python-rhnlib.dsc
new file mode 100644
index 0000000..217c99a
--- /dev/null
+++ b/client/debian/rhnlib/debian/python-rhnlib.dsc
@@ -0,0 +1,15 @@
+Format: 1.0
+Source: python-rhnlib
+Binary: python-rhnlib
+Architecture: all
+Version: 2.5.27-1
+Maintainer: Miroslav Suchý <miroslav(a)suchy.cz>
+Homepage: https://fedorahosted.org/spacewalk/
+Standards-Version: 3.7.3
+Build-Depends: python-all-dev, python-support (>= 0.8), debhelper (>= 7)
+Checksums-Sha1:
+ 444fe0994b77e6a9cc8a006fd1bcb003115c9091 51389 rhnlib-2.5.27.tar.gz
+Checksums-Sha256:
+ 31394cab7c60f25707c704ff2a1a722e335626ae20fc165db61d20b6be856291 51389 rhnlib-2.5.27.tar.gz
+Files:
+ 3b5541a03a0690b26a2691d44076fa81 rhnlib-2.5.27.tar.gz
diff --git a/client/debian/rhnlib/debian/rules b/client/debian/rhnlib/debian/rules
new file mode 100755
index 0000000..d581922
--- /dev/null
+++ b/client/debian/rhnlib/debian/rules
@@ -0,0 +1,25 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+override_dh_auto_build:
+ if [ ! -e setup.py ]; then sed -e "s/\@VERSION\@/$(shell dpkg-parsechangelog | grep Version: | cut -f2 -d' ' | cut -f1 -d- )/" -e 's/\@NAME\@/rhnlib/' setup.py.in > setup.py; fi
+ if [ ! -e setup.cfg ]; then sed 's/\@RELEASE\@/$(shell dpkg-parsechangelog | grep Version: | cut -f2 -d' ' | cut -f2 -d- )/' setup.cfg.in > setup.cfg; fi
+ dh_auto_configure --buildsystem=python_distutils
+
+clean:
+ if [ -f setup.py ]; then dh --buildsystem=python_distutils $@; fi
+ rm -f setup.py setup.cfg
+ rm -rf build
+
+%:
+ dh --buildsystem=python_distutils $@
+
diff --git a/client/debian/rhnlib/debian/source/format b/client/debian/rhnlib/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/client/debian/rhnlib/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/client/debian/rhnlib/debian/watch b/client/debian/rhnlib/debian/watch
new file mode 100644
index 0000000..c76ceee
--- /dev/null
+++ b/client/debian/rhnlib/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://fedorahosted.org/releases/s/p/spacewalk/rhnlib-(.*)\.tar\.gz
13 years, 2 months
java/code
by Milan Zazrivec
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 21 +++++
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 5 +
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 23 +++++
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java | 4 -
java/code/src/com/redhat/rhn/manager/channel/ChannelEntitlementCounter.java | 12 +++
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 17 ++++
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 39 ++++++++--
7 files changed, 115 insertions(+), 6 deletions(-)
New commits:
commit 009afe5bf9fa73a050d3516c09437ba2d5f2c157
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Feb 24 14:34:07 2011 +0100
673394 - correct entitlement logic when altering channel subscriptions
This fix is to make sure that when altering channel subscriptions, we
first check number of available flex guest entitlements in applicable
scenarios, then (if needed) check number of available regular entitlements.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index baa5bd3..ffe9db3 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -1794,6 +1794,27 @@ SELECT 1
</query>
</mode>
+<mode name="is_server_fve_eligible">
+ <query params="sid">
+ select 1
+ from rhnVirtualInstance vi
+ inner join rhnServer s on vi.virtual_system_id = s.id
+ where s.id = :sid and (
+ vi.host_system_id is null or
+ not exists (
+ select 1
+ from rhnServerGroupMembers sgm
+ inner join rhnServerGroup sg on sgm.server_group_id = sg.id
+ inner join rhnServerGroupType sgt on sgt.id = sg.group_type
+ inner join rhnServer s2 on s2.id = sgm.server_id
+ where s2.id = vi.host_system_id
+ and sgt.label in
+ ('virtualization_host', 'virtualization_host_platform')
+ )
+ )
+ </query>
+</mode>
+
<write-mode name="delete_note">
<query params="id,server_id">
delete from rhnServerNotes where id = :id and server_id = :server_id
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index d435ae2..02fa661 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -264,6 +264,11 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<![CDATA[select rhn_channel.available_chan_subscriptions(:channel_id, :org_id) as entitlements from dual]]>
</sql-query>
+ <sql-query name="Channel.availableFveEntitlements">
+ <return-scalar type="long" column="entitlements"/>
+ <![CDATA[select rhn_channel.available_fve_chan_subs(:channel_id, :org_id) as entitlements from dual]]>
+ </sql-query>
+
<sql-query name="Channel.verifyLabel">
<return-scalar type="string" column="label"/>
<![CDATA[select label from rhnChannel where label = :label]]>
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
index 469847e..ebca149 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
@@ -544,6 +544,29 @@ public class ChannelFactory extends HibernateFactory {
}
/**
+ * Returns available flex entitlements for the org and the given channel.
+ * @param org Org (used <b>only</b> when channel's org is NULL)
+ * @param c Channel
+ * @return available flex entitlements for the org and the given channel.
+ */
+ public static Long getAvailableFveEntitlements(Org org, Channel c) {
+ //
+ // The channel's org is used when not NULL to support
+ // shared channels.
+ //
+ Org channelOrg = c.getOrg();
+ if (channelOrg != null) {
+ org = channelOrg;
+ }
+ Map params = new HashMap();
+ params.put("channel_id", c.getId());
+ params.put("org_id", org.getId());
+ return (Long) singleton.lookupObjectByNamedQuery(
+ "Channel.availableFveEntitlements", params);
+
+ }
+
+ /**
* Creates an empty Channel
* @return empty Channel
*/
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java
index b8d1314..3e7f04c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemChannelsAction.java
@@ -105,8 +105,10 @@ public class SystemChannelsAction extends RhnLookupDispatchAction {
s.isSubscribed(child),
ChannelManager.isChannelFreeForSubscription(s, child),
child.isSubscribable(user.getOrg(), s));
+
childchannels[i].setAvailableSubscriptions(
- ChannelManager.getAvailableEntitlements(user.getOrg(), child));
+ SystemManager.availableSystemChannelSubscriptions(
+ s, child, user.getOrg()));
}
request.setAttribute(AVAIL_CHILD_CHANNELS, childchannels);
form.set(NEW_BASE_CHANNEL_ID, s.getBaseChannel().getId());
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelEntitlementCounter.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelEntitlementCounter.java
index d58f6fd..07d3f01 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelEntitlementCounter.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelEntitlementCounter.java
@@ -37,4 +37,16 @@ public class ChannelEntitlementCounter {
return retval;
}
+ /**
+ * Get the available flex guest entitlements for the passed in Org
+ * and Channel
+ * @param orgIn to check
+ * @param channelIn to check
+ * @return Long count, null if unlimited.
+ */
+ public Long getAvailableFveEntitlements(Org orgIn, Channel channelIn) {
+ Long retval = ChannelFactory.getAvailableFveEntitlements(orgIn, channelIn);
+ return retval;
+ }
+
}
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index 8c6e73b..4c54913 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -1128,6 +1128,23 @@ public class ChannelManager extends BaseManager {
}
/**
+ * Returns available flex entitlements for the org and the given channel.
+ * @param org Org
+ * @param c Channel
+ * @return available flex entitlements for the org and the given channel.
+ */
+ public static Long getAvailableFveEntitlements(Org org, Channel c) {
+ ChannelEntitlementCounter counter =
+ (ChannelEntitlementCounter) MethodUtil.getClassFromConfig(
+ ChannelEntitlementCounter.class.getName());
+
+ Long retval = counter.getAvailableFveEntitlements(org, c);
+ log.debug("getAvailableFveEntitlements: " + c.getLabel() + " got: " + retval);
+
+ return retval;
+ }
+
+ /**
* Returns the latest packages in the channel. This call will return more details
* about the channel than the API specific call
* {@link #latestPackagesInChannel(com.redhat.rhn.domain.channel.Channel)}.
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index bca2708..07b02f0 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2003,12 +2003,10 @@ public class SystemManager extends BaseManager {
return true;
}
- // Otherwise check available subs
- Long availableSubscriptions =
- ChannelManager.getAvailableEntitlements(orgIn, channelIn);
+ Long availableSubscriptions = availableSystemChannelSubscriptions(serverIn,
+ channelIn, orgIn);
- if (availableSubscriptions != null &&
- (availableSubscriptions.longValue() < 1)) {
+ if (availableSubscriptions != null && (availableSubscriptions.longValue() < 1)) {
log.debug("avail subscriptions is to small : " + availableSubscriptions);
return false;
}
@@ -2017,6 +2015,37 @@ public class SystemManager extends BaseManager {
}
/**
+ * For given Server, Channel and Org return number of available subscriptions
+ * @param serverIn Server to check
+ * @param channelIn Channel to check
+ * @param orgIn Org to check
+ * @return number of subscriptions available
+ */
+ public static Long availableSystemChannelSubscriptions(Server serverIn,
+ Channel channelIn, Org orgIn) {
+ SelectMode m = ModeFactory.getMode("System_queries", "is_server_fve_eligible");
+ Map params = new HashMap();
+ params.put("sid", serverIn.getId());
+
+ Long availableSubscriptions = null;
+
+ /* If serverIn is fve eligible, check number of flex guest entitlements available */
+ if (m.execute(params).size() >= 1) {
+ availableSubscriptions = ChannelManager.getAvailableFveEntitlements(orgIn, channelIn);
+ }
+
+ /* If the previous query did not result any data or the number of flex guest
+ * subscriptions is zero, check number of regular entitlements available
+ */
+ if ((availableSubscriptions == null) || (availableSubscriptions.longValue() < 1)) {
+ availableSubscriptions = ChannelManager.getAvailableEntitlements(orgIn,
+ channelIn);
+ }
+
+ return availableSubscriptions;
+ }
+
+ /**
* Checks if the user has permissions to see the Server
* @param user User being checked
* @param sid ID of the Server being checked
13 years, 2 months
client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 3612ebb308e43497ab380464f2d197e591579396
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Feb 24 14:28:58 2011 +0100
651792 - if system is not registered, print nice error insted of TB
addressing:
Traceback (most recent call last):
File "/usr/sbin/rhn-channel", line 139, in <module>
main()
File "/usr/sbin/rhn-channel", line 125, in main
channels = map(lambda x: x['label'], getChannels().channels())
File "/usr/share/rhn/up2date_client/rhnChannel.py", line 97, in getChannels
raise up2dateErrors.NoSystemIdError(_("Unable to Locate SystemId"))
up2date_client.up2dateErrors.NoSystemIdError: Unable to Locate SystemId
diff --git a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
index c2fba91..b798b4f 100644
--- a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
+++ b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
@@ -129,6 +129,8 @@ def main():
channels = map(lambda x: x['label'], getChannels().channels())
except up2dateErrors.NoChannelsError:
systemExit(1, _('This system is not associated with any channel.'))
+ except up2dateErrors.NoSystemIdError:
+ systemExit(1, _('Unable to locate SystemId file. Is this system registered?'))
channels.sort()
print '\n'.join(channels)
elif OPTIONS.available_channels:
13 years, 2 months
Changes to 'refs/tags/rhnpush-5.5.18-1'
by Michael Mraka
Tag 'rhnpush-5.5.18-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-02-24 13:24 +0000
Tagging package [rhnpush] version [5.5.18-1] in directory [client/tools/rhnpush/].
Changes since osad-5.10.4-1:
Michael Mraka (1):
Automatic commit of package [rhnpush] release [5.5.18-1].
---
client/tools/rhnpush/rhnpush.spec | 5 ++++-
rel-eng/packages/rhnpush | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 2 months
client/tools rel-eng/packages
by Michael Mraka
client/tools/rhnpush/rhnpush.spec | 5 ++++-
rel-eng/packages/rhnpush | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 58703f7ec83a2cedcadd2b6a1ddbbb1d61661047
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 24 14:24:53 2011 +0100
Automatic commit of package [rhnpush] release [5.5.18-1].
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index af98f3f..0314181 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -5,7 +5,7 @@ Summary: Common programs needed to be installed on the RHN servers/proxies
Group: Applications/System
License: GPLv2
URL: http://fedorahosted.org/spacewalk
-Version: 5.5.17
+Version: 5.5.18
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/solaris2mpm.8*
%changelog
+* Thu Feb 24 2011 Michael Mraka <michael.mraka(a)redhat.com> 5.5.18-1
+- use size instead of archivesize
+
* Fri Feb 18 2011 Jan Pazdziora 5.5.17-1
- Revert "Revert "get_server_capability() is defined twice in osad and rhncfg,
merge and move to rhnlib and make it member of rpclib.Server""
diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush
index 31f476f..edfba71 100644
--- a/rel-eng/packages/rhnpush
+++ b/rel-eng/packages/rhnpush
@@ -1 +1 @@
-5.5.17-1 client/tools/rhnpush/
+5.5.18-1 client/tools/rhnpush/
13 years, 2 months
Changes to 'refs/tags/osad-5.10.4-1'
by Jan Pazdziora
Tag 'osad-5.10.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-02-24 13:16 +0000
Tagging package [osad] version [5.10.4-1] in directory [client/tools/osad/].
Changes since spacewalk-web-1.4.5-1:
Jan Pazdziora (1):
Automatic commit of package [osad] release [5.10.4-1].
---
client/tools/osad/osad.spec | 5 ++++-
rel-eng/packages/osad | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 2 months
client/tools rel-eng/packages
by Jan Pazdziora
client/tools/osad/osad.spec | 5 ++++-
rel-eng/packages/osad | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit ca3563c25e4ea3bbe9786ae1455235cc1a891a18
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Feb 24 14:16:37 2011 +0100
Automatic commit of package [osad] release [5.10.4-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index ddf4676..1febca9 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -9,7 +9,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.3
+Version: 5.10.4
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -247,6 +247,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
# $Id$
%changelog
+* Thu Feb 24 2011 Jan Pazdziora 5.10.4-1
+- 662593 - let osad initiate presence subscription (mzazrivec(a)redhat.com)
+
* Fri Feb 18 2011 Jan Pazdziora 5.10.3-1
- Revert "Revert "get_server_capability() is defined twice in osad and rhncfg,
merge and move to rhnlib and make it member of rpclib.Server""
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index cb597c1..6052200 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.10.3-1 client/tools/osad/
+5.10.4-1 client/tools/osad/
13 years, 2 months
Changes to 'refs/tags/spacewalk-web-1.4.5-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.4.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-02-24 13:15 +0000
Tagging package [spacewalk-web] version [1.4.5-1] in directory [web/].
Changes since spacewalk-schema-1.4.5-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [1.4.5-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
13 years, 2 months
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 9102bd559bc00c9dccb06291fa5d2dbd65280db3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Feb 24 14:15:22 2011 +0100
Automatic commit of package [spacewalk-web] release [1.4.5-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index f0ae33d..9ab6d48 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.4.4-1 web/
+1.4.5-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 6f4ec20..0f63fc5 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.4.4
+Version: 1.4.5
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -260,6 +260,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Feb 24 2011 Jan Pazdziora 1.4.5-1
+- The module Text::Diff is no longer needed, removing its use.
+
* Fri Feb 18 2011 Jan Pazdziora 1.4.4-1
- Localize the filehandle globs; also use three-parameter opens.
13 years, 2 months