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
This commit is contained in:
plegall
2009-11-05 21:58:28 +00:00
parent f4d3386886
commit 52f6be5504
2 changed files with 7 additions and 6 deletions
+1
View File
@@ -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])) {
+6 -6
View File
@@ -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'] = '';
?>