From 4e1eaad3a93588ccf164e62b41a887d597802a7b Mon Sep 17 00:00:00 2001
From: Chien Wei Lin <cwlin0416@gmail.com>
Date: Thu, 28 May 2015 05:21:22 +0200
Subject: [PATCH 1/2] Translated using Weblate (Chinese (Taiwan))

Currently translated at 98.2% (2981 of 3035 strings)

[CI skip]
---
 po/zh_TW.po | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 621ff90d1c..7a67274e0f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.4.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2015-05-05 15:46-0400\n"
-"PO-Revision-Date: 2015-05-26 13:54+0200\n"
+"PO-Revision-Date: 2015-05-28 05:21+0200\n"
 "Last-Translator: Chien Wei Lin <cwlin0416@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) "
 "<https://hosted.weblate.org/projects/phpmyadmin/4-4/zh_TW/>\n"
@@ -4615,12 +4615,12 @@ msgstr "檢查權限"
 msgid ""
 "The configuration storage is not ready for the central list of columns "
 "feature."
-msgstr ""
+msgstr "設定儲存空間尚未預備供欄位中央清單功能使用。"
 
 #: libraries/central_columns.lib.php:283
 #, php-format
 msgid "Could not add %1$s as they already exist in central list!"
-msgstr ""
+msgstr "中央清單不存在欄位 %1$s ，無法新增！"
 
 #: libraries/central_columns.lib.php:298
 msgid "Could not add columns!"
@@ -4630,7 +4630,7 @@ msgstr "無法新增欄位！"
 #, php-format
 msgid ""
 "Couldn't remove Column(s) %1$s as they don't exist in central columns list!"
-msgstr ""
+msgstr "中央清單不存在欄位 %1$s ，無法移除！"
 
 #: libraries/central_columns.lib.php:385
 msgid "Could not remove columns!"
@@ -4747,6 +4747,9 @@ msgid ""
 "setting for [em]$cfg['Servers'][%3$d]['SessionTimeZone'][/em]. phpMyAdmin is "
 "currently using the default time zone of the database server."
 msgstr ""
+"無法於伺服器 %2$d 使用時區 %1$s。請檢查您於設定檔的 "
+"[em]$cfg['Servers'][%3$d]['SessionTimeZone'][/em] 設定。phpMyAdmin "
+"目前使用資料庫伺服器的預設時區。"
 
 #: libraries/common.inc.php:1022
 #, php-format

From 834df9d98279be72459ef33185f79c1138ca3d60 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Thu, 28 May 2015 14:39:47 +0530
Subject: [PATCH 2/2] - bug #4923 Do not limit table comments to 60 characters

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 ChangeLog                                     |  1 +
 libraries/operations.lib.php                  |  4 +++-
 libraries/tbl_columns_definition_form.lib.php | 10 ++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index af28623407..734530b4f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog
 - bug #4924 Recaptcha failure
 - bug #4930 Database copy doesn't work for tables with more than one FULLTEXT index
 - bug #4929 Edit view structure doesn't load the algorithm
+- bug #4923 Do not limit table comments to 60 characters
 
 4.4.7.0 (2015-05-16)
 - bug #4876 Settings issues (Favorite tables shown twice in Settings)
diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index 782d6e0eb9..220fe42477 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -743,8 +743,10 @@ function PMA_getTableOptionFieldset($comment, $tbl_collation,
         . '</tr>';
 
     //Table comments
+    $commentLength = PMA_MYSQL_INT_VERSION >= 50503 ? 2048 : 60;
     $html_output .= '<tr><td>' . __('Table comments') . '</td>'
-        . '<td><input type="text" name="comment" maxlength="60" size="30"'
+        . '<td><input type="text" name="comment"'
+        . ' maxlength="' . $commentLength . '" size="30"'
         . 'value="' . htmlspecialchars($comment) . '" />'
         . '<input type="hidden" name="prev_comment" value="'
         . htmlspecialchars($comment) . '" />'
diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index ce49a0ef47..9626ac6eb7 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -83,8 +83,10 @@ function PMA_getHtmlForTableConfigurations()
         . '</th>'
         . '</tr>';
 
+    $commentLength = PMA_MYSQL_INT_VERSION >= 50503 ? 2048 : 60;
     $html .= '<tr>'
-        . '<td><input type="text" name="comment" size="40" maxlength="80"'
+        . '<td><input type="text" name="comment"'
+        . ' size="40" maxlength="' . $commentLength . '"'
         . ' value="'
         . (isset($_REQUEST['comment'])
         ? htmlspecialchars($_REQUEST['comment'])
@@ -238,7 +240,7 @@ function PMA_getHtmlForTableFieldDefinitions($header_cells, $content_cells)
 }
 
 /**
- * Function to get html for the hidden fields containing index creation info 
+ * Function to get html for the hidden fields containing index creation info
  *
  * @param string $index_type the index type
  *
@@ -248,7 +250,7 @@ function PMA_getHtmlForHiddenIndexInfo($index_type)
 {
     $html = '<input type="hidden" name="' . $index_type . '" value="';
     if (! empty($_REQUEST[$index_type])) {
-        // happens when an index has been set on a column, 
+        // happens when an index has been set on a column,
         // and a column is added to the table creation dialog
         //
         // this contains a JSON-encoded string
@@ -259,7 +261,7 @@ function PMA_getHtmlForHiddenIndexInfo($index_type)
     $html .= '">';
 
     return $html;
-}    
+}
 
 /**
  * Function to get html for the create table or field add view