From ab2952e77ef993eff352295ba981e22ec6a1008f Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 4 Oct 2006 14:05:41 +0200
Subject: * po/pl.po, po/ro.po:   - fix plural forms *
 SoftwareProperties/SoftwareProperties.py:   - xml-escape comments before
 rendering them on a gtktreeview

---
 SoftwareProperties/SoftwareProperties.py | 6 +++---
 debian/changelog                         | 2 ++
 po/pl.po                                 | 4 ++--
 po/ro.po                                 | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index 14ddeefc..983a8cce 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -33,8 +33,7 @@ from gettext import gettext as _
 import os
 import string
 import re
-
-#sys.path.append("@prefix/share/update-manager/python")
+from xml.sax.saxutils import escape
 
 from UpdateManager.Common.SimpleGladeApp import SimpleGladeApp
 from UpdateManager.Common.HelpViewer import HelpViewer
@@ -46,6 +45,7 @@ import dialog_add_sources_list
 from dialog_apt_key import apt_key
 from utils import *
 
+
 (LIST_MARKUP, LIST_ENABLED, LIST_ENTRY_OBJ) = range(3)
 
 CONF_MAP = {
@@ -701,7 +701,7 @@ class SoftwareProperties(SimpleGladeApp):
 
     if source.template == None:
         if source.comment:
-            contents = "<b>%s</b>" % source.comment
+            contents = "<b>%s</b>" % escape(source.comment)
             # Only show the components if there are more than one
             if len(source.comps) > 1:
                 for c in source.comps:
diff --git a/debian/changelog b/debian/changelog
index c078cfc8..cfc806ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ update-manager (0.44.15) edgy; urgency=low
   * fix bad english grammar (lp: #63761)
   * fix in the edgyUpdates quirks handler (lp: #63723)
   * catch error from _tryMarkObsoleteForRemoval() (lp: #63617)
+  * fix plural forms for ro, pl (lp: #46421)
+  * properly escape comments before displaying them (lp: #63475)
 
  --
 
diff --git a/po/pl.po b/po/pl.po
index ef473e6a..26856cee 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:136
 msgid "Daily"
diff --git a/po/ro.po b/po/ro.po
index 306fe47f..0bd1db76 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n %\n"
+"Plural-Forms: nplurals=3;plural=(n==1?0:(n==0||((n%100)>0&&(n%100)<20))?1:2)\n"
 
 #: ../SoftwareProperties/SoftwareProperties.py:136
 msgid "Daily"
-- 
cgit v1.2.3