Merge remote-tracking branch 'weblate/master'

Conflicts:
	po/zh_TW.po

po/zh_TW.po

@@ -4,10 +4,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.3.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-07-09 08:12-0400\n"
-"PO-Revision-Date: 2014-06-26 18:51+0200\n"
-"Last-Translator: Chien Wei Lin <cwlin0416@gmail.com>\n"
-"Language-Team: Traditional Chinese <https://l10n.cihar.com/projects/"
-"phpmyadmin/master/zh_TW/>\n"
+"PO-Revision-Date: 2014-07-09 12:20+0200\n"
+"Last-Translator: Peter Dave Hello <hsu@peterdavehello.org>\n"
+"Language-Team: Traditional Chinese "
+"<https://l10n.cihar.com/projects/phpmyadmin/master/zh_TW/>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2006,7 +2006,7 @@ msgstr "使用拖曳來重新排序。"
 
 #: js/messages.php:392
 msgid "Click to sort results by this column."
-msgstr ""
+msgstr "使用本欄位進行資料排序。"
 
 #: js/messages.php:393
 msgid ""
@@ -2092,10 +2092,9 @@ msgid "You can also edit most values<br />by clicking directly on them."
 msgstr "您可以直接點選數值<br />以進行編輯修改。"
 
 #: js/messages.php:423
-#, fuzzy
 #| msgid "Go to link."
 msgid "Go to link:"
-msgstr "前往此連結。"
+msgstr "前往此連結："
 
 #: js/messages.php:424
 msgid "Copy column name."
@@ -6429,7 +6428,7 @@ msgstr "資料表偏好設定的儲存最大值"
 #, fuzzy
 #| msgid "See slave status table"
 msgid "QBE saved searches table"
-msgstr "查看次要伺服器狀態"
+msgstr "使用範例查詢(QBE)已儲存的搜尋資料表"
 
 #: libraries/config/messages.inc.php:608
 #, fuzzy
@@ -6439,7 +6438,7 @@ msgstr "查看次要伺服器狀態"
 msgid ""
 "Leave blank for no QBE saved searches support, suggested: [kbd]"
 "pma__savedsearches[/kbd]."
-msgstr "不使用 PDF 大綱功能請留空，建議值: [kbd]pma__pdf_pages[/kbd]。"
+msgstr "不使用 QBE 查詢功能請留空，建議值：[kbd]pma__savedsearches[/kbd]。"
 
 #: libraries/config/messages.inc.php:612
 msgid "Try to connect without password."