From 36bcb2f64ed2ec7e7e3bf887e0b7bfc84f80847c Mon Sep 17 00:00:00 2001 From: Kelvin Lee Date: Sat, 9 Jan 2016 03:03:06 +0100 Subject: [PATCH 1/3] Translated using Weblate (Chinese (Taiwan)) Currently translated at 100.0% (3210 of 3210 strings) [CI skip] --- po/zh_TW.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 682e00f741..95cfcd86f1 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.3-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-12-16 07:59+0100\n" -"PO-Revision-Date: 2015-11-04 16:31+0000\n" +"PO-Revision-Date: 2016-01-09 03:03+0000\n" "Last-Translator: Kelvin Lee \n" -"Language-Team: Chinese (Taiwan) \n" +"Language-Team: Chinese (Taiwan) " +"\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +38,7 @@ msgstr "顯示第 %1$s - %2$s 列。" #: db_create.php:61 #, php-format msgid "Database %1$s has been created." -msgstr "己建立資料庫 %1$s。" +msgstr "已建立資料庫 %1$s。" #: db_datadict.php:58 libraries/operations.lib.php:33 msgid "Database comment" @@ -306,7 +306,7 @@ msgstr "資料庫 %1$s 已複製爲 %2$s。" #, php-format msgid "" "The phpMyAdmin configuration storage has been deactivated. %sFind out why%s." -msgstr "phpMyAdmin 設定儲存空間己停用。 %s了解原因%s。" +msgstr "phpMyAdmin 設定儲存空間已停用。 %s了解原因%s。" #: db_qbe.php:129 msgid "You have to choose at least one column to display!" @@ -8151,12 +8151,11 @@ msgstr "" "作。)" #: libraries/display_import.lib.php:309 -#, fuzzy #| msgid "" #| "Skip this number of queries (for SQL) or lines (for other formats), " #| "starting from the first one:" msgid "Skip this number of queries (for SQL) starting from the first one:" -msgstr "跳過此數量的查詢(SQL)或者行數(其他格式)，由第一行開始:" +msgstr "由第一行開始跳過此數量的查詢 (SQL):" #: libraries/display_import.lib.php:339 msgid "Other options:" @@ -13530,7 +13529,7 @@ msgstr "取得自動儲存的查詢" #: libraries/sql_query_form.lib.php:256 msgid "Bind parameters" -msgstr "Bind 參數" +msgstr "繫結參數" #: libraries/sql_query_form.lib.php:303 msgid "Bookmark this SQL query:" From feb8ef4a19f85e712db76f119bf0bf670bec857a Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Fri, 8 Jan 2016 19:06:57 +0100 Subject: [PATCH 2/3] Translated using Weblate (Interlingua) Currently translated at 72.5% (2330 of 3210 strings) [CI skip] --- po/ia.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/ia.po b/po/ia.po index 64e9460f10..51c2bc94a7 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.3-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-12-16 07:59+0100\n" -"PO-Revision-Date: 2015-12-17 12:05+0000\n" +"PO-Revision-Date: 2016-01-08 19:06+0000\n" "Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua " "\n" @@ -10208,6 +10208,8 @@ msgid "" "You probably did not create a configuration file. You might want to use the " "%1$ssetup script%2$s to create one." msgstr "" +"Tu probabilemente non creava un file de configuration. Tu poterea voler usar " +"le %1$ssetup script%2$s pro crear un." #: libraries/plugins/auth/AuthenticationConfig.class.php:144 msgid "" From 36a63a2498fc2fb8422d5681273088570d3e7776 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sun, 10 Jan 2016 17:05:29 +0530 Subject: [PATCH 3/3] Revert onload changes due to side effects Signed-off-by: Atul Pratap Singh --- js/cross_framing_protection.js | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/js/cross_framing_protection.js b/js/cross_framing_protection.js index 70e298b9ac..91e9aa9e49 100644 --- a/js/cross_framing_protection.js +++ b/js/cross_framing_protection.js @@ -2,15 +2,13 @@ /** * Conditionally included if framing is not allowed */ -$(function () { - if (self == top) { - var style_element = document.getElementById("cfs-style"); - // check if style_element has already been removed - // to avoid frequently reported js error - if (typeof(style_element) != 'undefined' && style_element != null) { - style_element.parentNode.removeChild(style_element); - } - } else { - top.location = self.location; +if (self == top) { + var style_element = document.getElementById("cfs-style"); + // check if style_element has already been removed + // to avoid frequently reported js error + if (typeof(style_element) != 'undefined' && style_element != null) { + style_element.parentNode.removeChild(style_element); } -}); +} else { + top.location = self.location; +}