From 764b61216007a681bf39e53db86882b9680bd794 Mon Sep 17 00:00:00 2001 From: Masahiko HISAKAWA Date: Mon, 9 Mar 2015 14:05:24 +0100 Subject: [PATCH 1/2] Translated using Weblate (Japanese) Currently translated at 72.6% (2204 of 3032 strings) [CI skip] --- po/ja.po | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/po/ja.po b/po/ja.po index 009563338a..7751ed5499 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.0-alpha1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-06 08:15-0500\n" -"PO-Revision-Date: 2015-02-21 01:16+0200\n" +"PO-Revision-Date: 2015-03-09 14:05+0200\n" "Last-Translator: Masahiko HISAKAWA \n" -"Language-Team: Japanese \n" +"Language-Team: Japanese " +"\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.2\n" +"X-Generator: Weblate 2.3-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -329,10 +329,9 @@ msgid "Access denied!" msgstr "アクセスが拒否されました!" #: db_tracking.php:39 db_tracking.php:64 -#, fuzzy #| msgid "Tracking data definition successfully deleted" msgid "Tracking data deleted successfully." -msgstr "追跡データ定義コマンドは正常に削除されました" +msgstr "追跡データは正常に削除されました。" #: db_tracking.php:48 #, fuzzy, php-format @@ -5937,7 +5936,6 @@ msgstr "カラムのエスケープ記号:" #: libraries/config/messages.inc.php:148 libraries/config/messages.inc.php:152 #: libraries/config/messages.inc.php:193 libraries/config/messages.inc.php:196 #: libraries/config/messages.inc.php:198 -#, fuzzy #| msgid "Replace NULL with:" msgid "Replace NULL with" msgstr "NULL の代替文字列:" @@ -5949,7 +5947,6 @@ msgstr "カラムに含まれている CRLF 文字を取り除く" #: libraries/config/messages.inc.php:119 libraries/config/messages.inc.php:338 #: libraries/config/messages.inc.php:349 #: libraries/plugins/import/ImportCsv.class.php:122 -#, fuzzy #| msgid "Columns terminated by" msgid "Columns terminated with" msgstr "カラムの終端記号" @@ -6189,20 +6186,18 @@ msgid "Edit mode" msgstr "編集モード" #: libraries/config/messages.inc.php:218 -#, fuzzy #| msgid "Customize edit mode" msgid "Customize edit mode." -msgstr "編集モードの詳細設定" +msgstr "編集モードの詳細設定." #: libraries/config/messages.inc.php:220 msgid "Export defaults" msgstr "エクスポートのデフォルト" #: libraries/config/messages.inc.php:221 -#, fuzzy #| msgid "Customize default export options" msgid "Customize default export options." -msgstr "デフォルトのエクスポートオプションの詳細設定" +msgstr "デフォルトのエクスポートオプション詳細設定。" #: libraries/config/messages.inc.php:222 libraries/config/messages.inc.php:283 #: setup/frames/menu.inc.php:22 @@ -6443,10 +6438,9 @@ msgid "Startup" msgstr "スタートアップ" #: libraries/config/messages.inc.php:295 -#, fuzzy #| msgid "Customize startup page" msgid "Customize startup page." -msgstr "スタートアップページの詳細設定" +msgstr "スタートアップページの詳細設定。" #: libraries/config/messages.inc.php:296 msgid "Database structure" @@ -6478,7 +6472,7 @@ msgstr "タブ" #, fuzzy #| msgid "Choose how you want tabs to work" msgid "Choose how you want tabs to work." -msgstr "アクションがあったときに動作させるタブの選択" +msgstr "タブの動作を選択してください" #: libraries/config/messages.inc.php:304 msgid "Display relational schema" @@ -7001,10 +6995,9 @@ msgstr "" "示」。" #: libraries/config/messages.inc.php:485 -#, fuzzy #| msgid "Iconic navigation bar" msgid "Table navigation bar" -msgstr "ナビゲーションバーのアイコン" +msgstr "テーブルナビゲーションバー" #: libraries/config/messages.inc.php:487 #, fuzzy @@ -7160,10 +7153,9 @@ msgid "Default sort order for tables with a primary key." msgstr "" #: libraries/config/messages.inc.php:537 -#, fuzzy #| msgid "Default sorting order" msgid "Primary key default sort order" -msgstr "デフォルトの並び順" +msgstr "プライマリキーのデフォルトの並び順" #: libraries/config/messages.inc.php:539 #, fuzzy From 92d276b3aceda6514ab9dfb4e4d36571f3a58dfc Mon Sep 17 00:00:00 2001 From: Rakesh Kumar Date: Tue, 10 Mar 2015 06:52:52 +0530 Subject: [PATCH 2/2] Add missing database link Signed-off-by: Madhura Jayaratne --- libraries/central_columns.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php index f400e95182..cb053cd245 100644 --- a/libraries/central_columns.lib.php +++ b/libraries/central_columns.lib.php @@ -90,7 +90,7 @@ function PMA_getCentralColumnsCount($db) return 0; } $pmadb = $cfgCentralColumns['db']; - $GLOBALS['dbi']->selectDb($pmadb); + $GLOBALS['dbi']->selectDb($pmadb, $GLOBALS['controllink']); $central_list_table = $cfgCentralColumns['table']; $query = 'SELECT count(db_name) FROM ' . PMA_Util::backquote($central_list_table) . ' '