From 52f6be5504d69959e9f93e879f04bc530c75e512 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Thu, 5 Nov 2009 21:58:28 +0000
Subject: merge r4213 from branch 2.0 to tag 2.0.6 (highly unrecommended
 operation)

feature 1231: subscribe to cn.piwigo.org/announcement when current language is
zh_CN

git-svn-id: http://piwigo.org/svn/tags/2.0.6@4215 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/include/functions.php   |  1 +
 language/zh_CN/admin.lang.php | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/admin/include/functions.php b/admin/include/functions.php
index 63a79a2bf..4f102318a 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -2123,6 +2123,7 @@ function get_newsletter_subscribe_base_url($language) {
     'it_IT' => 'it.piwigo.org',
     'de_DE' => 'de.piwigo.org',
     'es_ES' => 'es.piwigo.org',
+    'zh_CN' => 'cn.piwigo.org',
     );
 
   if (isset($domain_of[$language])) {
diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index c9c06a887..a5ccb2534 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -647,11 +647,11 @@ $lang['Downloads'] = '下载';
 $lang['Released on'] = '发布于';
 $lang['Number of downloads'] = '下载次数';
 // --------- Starting below: New or revised $lang ---- from Colibri (2.1)
-/*TODO*/$lang['Piwigo Announcements Newsletter'] = 'Piwigo Announcements Newsletter';
-/*TODO*/$lang['Subscribe to Piwigo Announcements Newsletter'] = 'Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.';
-/*TODO*/$lang['Subscribe %s'] = 'Subscribe %s';
-/*TODO*/$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Subscribe %s to Piwigo English Announcements Newsletter';
-/*TODO*/$lang['Purge search history'] = 'Purge search history';
-/*TODO*/$lang['Hide'] = 'Hide';
+/*TO CHECK*/$lang['Piwigo Announcements Newsletter'] = 'Piwigo公告时事通讯';
+/*TO CHECK*/$lang['Subscribe to Piwigo Announcements Newsletter'] = '与Piwigo项目保持联系，订阅Piwigo公告时事通讯。 您将收到电子邮件，当新的发行是可利用的(有时包括安全错误修复，知道和升级)是重要的，并且，当主要事件发生在这个项目。 仅一些电子邮件每年。';
+/*TO CHECK*/$lang['Subscribe %s'] = '订阅%s';
+/*TO CHECK*/$lang['Subscribe %s to Piwigo Announcements Newsletter'] = '订阅%s Piwigo中国公告时事通讯';
+/*TO CHECK*/$lang['Purge search history'] = '清除查寻历史';
+/*TO CHECK*/$lang['Hide'] = '皮';
 
 ?>
-- 
cgit v1.2.3