r25049 - in /packages/unstable/meld/debian: changelog patches/fix-chinese-translation.patch patches/series

[rbalint-guest at users.alioth.debian.org]

Author: rbalint-guest
Date: Tue Aug 31 17:29:27 2010
New Revision: 25049

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25049
Log:
[Adam Collard]
* fix-chinese-translation.patch: stolen from upstream's GIT. Fix a crash
  when launching meld in a zh_CN environment. (Closes: #595025)

Added:
    packages/unstable/meld/debian/patches/fix-chinese-translation.patch
Modified:
    packages/unstable/meld/debian/changelog
    packages/unstable/meld/debian/patches/series

Modified: packages/unstable/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/changelog?rev=25049&op=diff
==============================================================================
--- packages/unstable/meld/debian/changelog [utf-8] (original)
+++ packages/unstable/meld/debian/changelog [utf-8] Tue Aug 31 17:29:27 2010
@@ -3,6 +3,10 @@
   [ Balint Reczey ]
   * debian/control.in:
     - Standards-Version is 3.9.1, no changes needed.
+
+  [Adam Collard]
+  * fix-chinese-translation.patch: stolen from upstream's GIT. Fix a crash
+    when launching meld in a zh_CN environment. (Closes: #595025)
 
  -- Balint Reczey <balint at balintreczey.hu>  Wed, 04 Aug 2010 16:56:52 +0200
 

Added: packages/unstable/meld/debian/patches/fix-chinese-translation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/fix-chinese-translation.patch?rev=25049&op=file
==============================================================================
--- packages/unstable/meld/debian/patches/fix-chinese-translation.patch (added)
+++ packages/unstable/meld/debian/patches/fix-chinese-translation.patch [utf-8] Tue Aug 31 17:29:27 2010
@@ -1,0 +1,16 @@
+## Description: Use regular colon character in zh_CN translation
+## Origin/Author: darren.hoo at gmail.com
+## Bug: https://bugzilla.gnome.org/show_bug.cgi?id=623217
+Index: meld-1.3.2/po/zh_CN.po
+===================================================================
+--- meld-1.3.2.orig/po/zh_CN.po	2010-08-31 14:45:33.000000000 +0100
++++ meld-1.3.2/po/zh_CN.po	2010-08-31 14:45:26.000000000 +0100
+@@ -1222,7 +1222,7 @@
+ msgid ""
+ "Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:"
+ "Missing"
+-msgstr "忽略：版本不详:::错误::新添加:已修改:<b>冲突</b>:已删除:丢失"
++msgstr "忽略:版本不详:::错误::新添加:已修改:<b>冲突</b>:已删除:丢失"
+ 
+ #: ../meld/vc/cvs.py:151
+ #, python-format

Modified: packages/unstable/meld/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/series?rev=25049&op=diff
==============================================================================
--- packages/unstable/meld/debian/patches/series [utf-8] (original)
+++ packages/unstable/meld/debian/patches/series [utf-8] Tue Aug 31 17:29:27 2010
@@ -1,2 +1,3 @@
 sourceview-package.patch
 python-path.patch
+fix-chinese-translation.patch