merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -16,7 +16,7 @@
<description xml:lang="vi">Module này dành cho in ấn RSS.</description>
<description xml:lang="es">Este módulo es para imprimir RSS.</description>
<description xml:lang="ru">Этот модуль служит для печати RSS.</description>
<description xml:lang="zh-TW">負責輸出RSS的模組。</description>
<description xml:lang="zh-TW">負責輸出 RSS 的模組。</description>
<description xml:lang="tr">Bu modül RSS çıktısı almak içindir.</description>
<version>0.1</version>
<date>2007-02-28</date>

View file

@ -127,7 +127,7 @@
<value xml:lang="en"><![CDATA[If checked, RSS will be disabled.]]></value>
<value xml:lang="jp"><![CDATA[チェックを入れるとRSSの出力を行いません。]]></value>
<value xml:lang="zh-CN"><![CDATA[选此项不显示RSS。]]></value>
<value xml:lang="zh-TW"><![CDATA[隱藏 RSS Feed]]></value>
<value xml:lang="zh-TW"><![CDATA[隱藏 RSS Feed]]></value>
<value xml:lang="fr"><![CDATA[Si vous cochez, RSS sera invalidé.]]></value>
<value xml:lang="ru"><![CDATA[Если выбрано, RSS будет отключен.]]></value>
<value xml:lang="es"><![CDATA[Si selecciona esta opción, RSS será desactivado.]]></value>

View file

@ -9,7 +9,7 @@
<id>{$info->id}</id>
<link rel="alternate" type="text/html" hreflang="{$info->language}" href="{$info->link}"/>
<link rel="self" type="application/atom+xml" href="{$info->id}"/>
<generator uri="http://www.xpressengine.com/" version="{__ZBXE_VERSION__}">XpressEngine</generator>
<generator uri="http://www.xpressengine.com/">XpressEngine</generator>
<!--@foreach($document_list as $oDocument)--> <entry>
<title>{str_replace('\'', '&apos;',htmlspecialchars($oDocument->getTitleText()))}</title>
<id>{$oDocument->getPermanentUrl()}</id>

View file

@ -25,7 +25,7 @@
<tr>
<td colspan="2">
<input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('act','')}'" />
<input type="submit" value="{$lang->cmd_registration}" accesskey="s" />
<input type="submit" value="{$lang->cmd_registration}" />
</td>
</tr>
</table>

View file

@ -8,7 +8,7 @@
<language>{$info->language}</language>
<pubDate>{$info->date}</pubDate>
<lastBuildDate>{$info->date}</lastBuildDate>
<generator>XpressEngine {__ZBXE_VERSION__}</generator>
<generator>XpressEngine</generator>
<!--@if($info->feed_copyright)-->
<copyright>{$info->feed_copyright}</copyright>
<!--@end-->

View file

@ -21,7 +21,7 @@
</li>
<li>
<p class="q"><label for="feed_description">{$lang->description}</label></p>
<p class="a"><textarea name="feed_description" id="feed_description" cols="42" rows="5">{$total_config->feed_description}</textarea></p>
<p class="a"><textarea name="feed_description" id="feed_description" rows="8" cols="42">{$total_config->feed_description}</textarea></p>
</li>
<li>
<p class="q"><label for="image">{$lang->feed_image}</label></p>

View file

@ -30,7 +30,7 @@
<tr>
<th scope="row"><label for="feed_description">{$lang->description}</label></th>
<td class="text">
<textarea name="feed_description" id="feed_description">{$rss_config->feed_description}</textarea>
<textarea name="feed_description" id="feed_description" rows="8" cols="42">{$rss_config->feed_description}</textarea>
<p class="desc">{$lang->about_feed_description}</p>
</td>
</tr>