[meego-commits] 7240: Changes to MeeGo:1.0:Core:Update:Testing/evolution-data-server

[daihan]

Hi,
I have made the following changes to evolution-data-server in project MeeGo:1.0:Core:Update:Testing. Please review and accept ASAP.

Thank You,
daihan

[This message was auto-generated]

---

Request #7240:

  submit:   home:daihan:branches:MeeGo:1.0:Core:Update:Testing/evolution-data-server(r2)(cleanup) -> MeeGo:1.0:Core:Update:Testing/evolution-data-server


Message:
     add a patch to fix BMC#2330, which is a update 3 blocker

State:   new          2010-09-01T18:50:20 daihan
Comment: None



changes files:
--------------
--- evolution-data-server.changes
+++ evolution-data-server.changes
@@ -0,0 +1,3 @@
+* Thu Sep 2 2010 Hao Li <hao.h.li at intel.com> - 2.30.2
+- Update simplified chinese translation in contacts/categories to fix BMC #2330
+

new:
----
  evolution-data-server-contacts-bug-2330.patch

spec files:
-----------
--- evolution-data-server.spec
+++ evolution-data-server.spec
@@ -14,7 +14,7 @@
 
 Name: evolution-data-server
 Version: 2.30.2~20100629
-Release: 1%{?dist}
+Release: 1
 License: LGPLv2
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -57,6 +57,7 @@
 Patch3: BUGFIX-GNOME-Bug-593882-Ghost-mails-seen-in-Anjal-v3.patch
 Patch4: evolution-data-server-bmo182-camel-socks-proxy.patch
 Patch5: evolution-data-server-bmo182-camel-socks5.patch
+Patch6: evolution-data-server-contacts-bug-2330.patch
 
 %description
 The %{name} package provides a unified backend for programs
@@ -83,6 +84,7 @@
 %patch3 -p1 -b .ghost-mails
 %patch4 -p1 -b .evolution-data-server-bmo182-camel-socks-proxy
 %patch5 -p1 -b .evolution-data-server-bmo182-camel-socks5
+%patch6 -p1 -b .evolution-data-server-contacts-bug-2330
 %build
 
 %if %{ldap_support}

other changes:
--------------

++++++ evolution-data-server-contacts-bug-2330.patch (new)
--- evolution-data-server-contacts-bug-2330.patch
+++ evolution-data-server-contacts-bug-2330.patch
+diff --git a/po/zh_CN.po b/po/zh_CN.po
+index ac607f8..c061980 100644
+--- a/po/zh_CN.po
++++ b/po/zh_CN.po
+@@ -4819,8 +4819,8 @@ msgid "Category _Name"
+ msgstr "类别名称(_N)"
+ 
+ #: ../libedataserverui/e-categories-dialog.ui.h:5
+-msgid "Item(s) belong to these _categories:"
+-msgstr "项目属于这些类别(_C)："
++msgid "Item(s) _belong to these categories:"
++msgstr "项目属于这些类别(_B)："
+ 
+ #: ../libedataserverui/e-categories-dialog.ui.h:6
+ msgid "_Available Categories:"