Merge branch 'master' into htmlmail

* master: (382 commits)
  Romanian language update
  Marathi language update
  Arabic Language Update
  when there's not enough space for images, make sure they stay proportional (might be FS#2480)
  added minimal RTL print styles (part of FS#2185)
  moved plugins' rtl.css to their style.css counterpart (part of FS#2185)
  removed all browser-specific gradients as the recently (in 42ff6730) introduced svg makes them unnecessary
  removed comments from accidentally commented lines in tpl_includeFile()
  removed obsolete template file
  added tpl_includeFile() to core
  Make getTitle method in remote interface public
  Changed an error code in XML-RPC interface. This error hasn't anything to do with the rest of the -32600 errors.
  BG: language update
  Korean language update
  fixed performance issues with gradient in Firefox (which also added gradient support for IE9) (FS#2447)
  deleted very old (and unused) images
  added accidentally removed '<?php' back in (was in 57fc5edd)
  wrapped X-UA-Compatible meta tag with conditional comments
  added explanation to todo in _forms.css
  removed problematic 'overflow: hidden' from lists again ('unfixes' FS#1950)
  ...

Conflicts:
	inc/auth.php
	inc/load.php

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/plugins/config/lang/zh-tw/lang.php b/lib/plugins/config/lang/zh-tw/lang.php
index 29aeaec3b..dd5f287b9 100644
--- a/lib/plugins/config/lang/zh-tw/lang.php
+++ b/lib/plugins/config/lang/zh-tw/lang.php
@@ -44,6 +44,7 @@ $lang['lang']                  = '語系';
 $lang['basedir']               = '根目錄';
 $lang['baseurl']               = '根路徑 (URL)';
 $lang['savedir']               = '儲存資料的目錄';
+$lang['cookiedir']             = 'Cookie 路徑。設定空白則使用 baseurl。';
 $lang['start']                 = '開始頁面的名稱';
 $lang['title']                 = '維基標題';
 $lang['template']              = '樣板';
@@ -89,8 +90,6 @@ $lang['disableactions_other']  = '其他功能 (逗號分隔)';
 $lang['sneaky_index']          = '預設情況下，DokuWiki 會在索引頁會顯示所有命名空間。啟用此選項會隱藏用戶沒有閱讀權限的頁面，但也可能將能閱讀的子頁面一併隱藏。在特定 ACL 設定下，這可能導致索引無法使用。';
 $lang['auth_security_timeout'] = '安全認證的計時 (秒)';
 $lang['securecookie']          = 'HTTPS 頁面設定的 cookie 是否只能由瀏覽器經 HTTPS 傳送？取消此選項後，只有登入維基會被 SSL 保護而瀏覽時不會。';
-$lang['xmlrpc']                = '啟用/停用 XML-RPC 介面';
-$lang['xmlrpcuser']            = 'XML-RPC 存取權限將局限於在此提供的群組或使用者 (逗號分隔)。若要開放權限給所有人請留白。';
 $lang['updatecheck']           = '檢查更新與安全性警告？DokuWiki 需要聯繫 update.dokuwiki.org 才能使用此功能。';
 $lang['userewrite']            = '使用好看的 URL';
 $lang['useslash']              = '在 URL 中使用斜線作為命名空間的分隔字元';
@@ -114,6 +113,7 @@ $lang['jpg_quality']           = 'JPG 壓縮品質(0-100)';
 $lang['subscribers']           = '啟用頁面訂閱';
 $lang['subscribe_time']        = '訂閱列表和摘要發送的時間間隔 (秒)；這個值應該小於指定的最近更改保留時間 (recent_days)。';
 $lang['compress']              = '壓縮 CSS 與 JavaScript 的輸出';
+$lang['cssdatauri']            = 'CSS 中所引用的圖片假如小於該數字大小(bytes)，將會被直接嵌入 CSS 中來減少 HTTP Request 的發送。此功能在 IE 7 及之下版本不支援。推薦使用 <code>400</code> 到 <code>600</code> 之間。設定為<code>0</code> 則停用。';
 $lang['hidepages']             = '隱藏匹配的界面 (正規式)';
 $lang['send404']               = '存取不存在的頁面時送出 "HTTP 404/Page Not Found"';
 $lang['sitemap']               = '產生 Google 站台地圖 (天)';