From cf2939e0c55661ce50ed259cbe74ed9a610ad0f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C3=A9cureuil?= <nlecureuil@mandriva.com>
Date: Mon, 10 May 2010 09:40:22 +0000
Subject: Add strings from our port from trunk

---
 po/zh_CN.po | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c358214..6b36e2d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -182,9 +182,7 @@ msgstr "禁用警告"
 msgid ""
 "You are running low on disk space on your home partition (currently %2%, %1 "
 "MiB free)."
-msgstr ""
-"您的主分区磁盘空间不足(目前只剩 %2%, %1 "
-"MiB 空闲)。"
+msgstr "您的主分区磁盘空间不足(目前只剩 %2%, %1 MiB 空闲)。"
 
 # ###################      Kio SysInfo translation   ##################################
 msgid "KSysInfo"
@@ -426,3 +424,22 @@ msgstr "按日期浏览"
 
 msgid "&Configure Trash Bin"
 msgstr "配置回收站(&C)"
+
+# Strings from akonadi backport from trunk
+msgid "Akonadi personal information management service is starting..."
+msgstr ""
+
+msgid "<p><b>Akonadi not operational.<br/>"
+msgstr ""
+
+msgid "Akonadi personal information management service is shutting down..."
+msgstr ""
+
+msgid "Invalid resource instance."
+msgstr ""
+
+msgid "Unable to obtain D-Bus interface for resource '%1'"
+msgstr ""
+
+msgid "Unable to create agent instance."
+msgstr ""
-- 
cgit v1.2.1