From 65a334414d6579cd5d771230d072f7946a3e9f4e Mon Sep 17 00:00:00 2001 From: Masahiko HISAKAWA Date: Sat, 21 Feb 2015 01:16:57 +0100 Subject: [PATCH 1/3] Translated using Weblate (Japanese) Currently translated at 74.3% (2217 of 2982 strings) [CI skip] --- po/ja.po | 103 ++++++++++++++++++++----------------------------------- 1 file changed, 38 insertions(+), 65 deletions(-) diff --git a/po/ja.po b/po/ja.po index 971e7b6e0e..f672d23da5 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2015-02-08 08:28+0200\n" -"Last-Translator: worldwideskier \n" +"PO-Revision-Date: 2015-02-21 01:16+0200\n" +"Last-Translator: Masahiko HISAKAWA \n" "Language-Team: Japanese " "\n" "Language: ja\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.2-dev\n" +"X-Generator: Weblate 2.2\n" #: changelog.php:36 license.php:28 #, php-format @@ -896,7 +896,7 @@ msgstr "" "削除するべきです。" #: index.php:533 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The phpMyAdmin configuration storage is not completely configured, some " #| "extended features have been deactivated. To find out why click %shere%s." @@ -904,8 +904,7 @@ msgid "" "The phpMyAdmin configuration storage is not completely configured, some " "extended features have been deactivated. %sFind out why%s. " msgstr "" -"phpMyAdmin 環境保管領域が完全に設定されていないため、いくつかの拡張機能が無効" -"になっています。理由については%sこちら%sをご覧ください。" +"phpMyAdmin 環境保管領域が完全に設定されていないため、いくつかの拡張機能が無効になっています。理由については%sこちら%sをご覧ください。 " #: index.php:540 msgid "" @@ -974,10 +973,10 @@ msgid "This operation could take a long time. Proceed anyway?" msgstr "この作業には時間がかかることがあります。続行しますか?" #: js/messages.php:45 -#, fuzzy, php-format +#, php-format #| msgid "Do you really want to execute \"%s\"?" msgid "Do you really want to delete user group \"%s\"?" -msgstr "「%s」を本当に実行しますか？" +msgstr "本当にユーザーグループ「%s」を削除しますか？" #: js/messages.php:46 #, fuzzy, php-format @@ -996,16 +995,14 @@ msgstr "" "ら移動してもよろしいですか?" #: js/messages.php:48 -#, fuzzy #| msgid "Do you really want to execute \"%s\"?" msgid "Do you really want to revoke the selected user(s) ?" -msgstr "「%s」を本当に実行しますか？" +msgstr "選択されたユーザー「%s」を本当に無効にしますか？" #: js/messages.php:51 -#, fuzzy #| msgid "Save as file" msgid "Save & Close" -msgstr "ファイルに保存する" +msgstr "保存して閉じる" #: js/messages.php:52 libraries/config/FormDisplay.tpl.php:395 #: libraries/insert_edit.lib.php:1543 prefs_manage.php:339 @@ -1014,20 +1011,18 @@ msgid "Reset" msgstr "リセット" #: js/messages.php:53 -#, fuzzy #| msgid "Select All" msgid "Reset All" -msgstr "全選択" +msgstr "全リセット" #: js/messages.php:56 msgid "Missing value in the form!" msgstr "フォームに入力されていない値があります!" #: js/messages.php:57 -#, fuzzy #| msgid "at least one of the words" msgid "Select at least one of the options!" -msgstr "いずれかの単語を含む" +msgstr "オプションを一つ以上選択してください！" #: js/messages.php:58 #, fuzzy @@ -1633,10 +1628,9 @@ msgid "Import monitor configuration" msgstr "モニタ環境設定のインポート" #: js/messages.php:229 -#, fuzzy #| msgid "Please select the file you want to import" msgid "Please select the file you want to import." -msgstr "インポートするファイルを選択してください" +msgstr "インポートするファイルを選択してください。" #: js/messages.php:230 msgid "No files available on server for import!" @@ -2142,7 +2136,7 @@ msgstr "" #, fuzzy #| msgid "Do you want to import remaining settings?" msgid "Do you want to copy encryption key?" -msgstr "残っている設定を読み込みますか?" +msgstr "暗号化キーをコピーしますか？" #: js/messages.php:392 msgid "Encryption key" @@ -2157,10 +2151,9 @@ msgid "Select Foreign Key" msgstr "外部キーを選択してください" #: js/messages.php:397 -#, fuzzy #| msgid "Please select the primary key or a unique key" msgid "Please select the primary key or a unique key!" -msgstr "主キーまたはユニークキーを選択してください" +msgstr "主キーまたはユニークキーを選択してください！" #: js/messages.php:398 libraries/db_designer.lib.php:318 msgid "Choose column to display" @@ -2223,20 +2216,19 @@ msgid "Successfully deleted the page" msgstr "" #: js/messages.php:412 -#, fuzzy #| msgid "Edit or export relational schema" msgid "Export relational schema" -msgstr "リレーショナルスキーマを編集またはエクスポートする" +msgstr "リレーショナルスキーマをエクスポートする" #: js/messages.php:413 msgid "Modifications have been saved" msgstr "修正を保存しました" #: js/messages.php:416 -#, fuzzy, php-format +#, php-format #| msgid "Add an option for column " msgid "Add an option for column \"%s\"." -msgstr "カラムに対するオプションを追加する " +msgstr "カラム「\"%s\"」に対するオプションを追加する。" #: js/messages.php:417 #, fuzzy, php-format @@ -2285,7 +2277,7 @@ msgstr "クリックでカラムを反転/解除" #, fuzzy #| msgid "Double-click to copy column name" msgid "Double-click to copy column name." -msgstr "ダブルクリックでカラム名をコピー" +msgstr "ダブルクリックでカラム名をコピー。" #: js/messages.php:428 #, fuzzy @@ -2320,7 +2312,6 @@ msgid "" msgstr "" #: js/messages.php:436 -#, fuzzy #| msgid "Cancel" msgid "cancel" msgstr "キャンセル" @@ -2346,10 +2337,9 @@ msgid "Drop files here" msgstr "ログファイルの閾値" #: js/messages.php:442 -#, fuzzy #| msgid "Select Tables" msgid "Select database first" -msgstr "テーブルを選択してください" +msgstr "最初にデータベースを選択してください" #: js/messages.php:447 msgid "You can also edit most values
by double-clicking directly on them." @@ -2360,16 +2350,15 @@ msgid "You can also edit most values
by clicking directly on them." msgstr "ほとんどの値は、直接クリック
することでも、編集できます。" #: js/messages.php:455 -#, fuzzy #| msgid "Go to link" msgid "Go to link:" -msgstr "リンク先へ移動する" +msgstr "リンク先へ移動する:" #: js/messages.php:456 #, fuzzy #| msgid "Copy column name" msgid "Copy column name." -msgstr "カラム名のコピー" +msgstr "カラム名のコピー。" #: js/messages.php:457 msgid "Right-click the column name to copy it to your clipboard." @@ -2379,7 +2368,7 @@ msgstr "右クリックでカラム名をクリップボードにコピーして #, fuzzy #| msgid "Show data row(s)" msgid "Show data row(s)." -msgstr "データ行の表示" +msgstr "データ行の表示。" #: js/messages.php:461 msgid "Generate password" @@ -2425,10 +2414,9 @@ msgid "Unlink from main panel" msgstr "メインフレームの詳細設定" #: js/messages.php:476 -#, fuzzy #| msgid "The selected user was not found in the privilege table." msgid "The requested page was not found in the history, it may have expired." -msgstr "特権テーブルには選択したユーザがいません。" +msgstr "リクエストされたページが履歴にありません。おそらく有効期限切れです。" #: js/messages.php:479 setup/lib/index.lib.php:160 #, php-format @@ -2500,7 +2488,7 @@ msgstr "" #, fuzzy #| msgid "Ignore" msgid "Ignore All" -msgstr "無視" +msgstr "全て無視" #: js/messages.php:520 msgid "" @@ -2511,13 +2499,12 @@ msgstr "" #, fuzzy #| msgid "Show this query here again" msgid "Execute this query again?" -msgstr "実行したクエリをここに表示する" +msgstr "このクエリをもう一度実行しますか？" #: js/messages.php:528 -#, fuzzy #| msgid "Do you really want to execute \"%s\"?" msgid "Do you really want to delete this bookmark?" -msgstr "「%s」を本当に実行しますか？" +msgstr "このブックマークを本当に削除しますか？" #: js/messages.php:556 msgctxt "Previous month" @@ -2916,10 +2903,9 @@ msgid "Profiling" msgstr "プロファイリング" #: libraries/Console.class.php:183 -#, fuzzy #| msgid "Bookmark table" msgid "Bookmark" -msgstr "ブックマークテーブル" +msgstr "ブックマーク" #: libraries/Console.class.php:184 #, fuzzy @@ -5222,7 +5208,7 @@ msgstr "この値の変更をユーザに許可する" #: libraries/config/FormDisplay.tpl.php:393 msgid "Apply" -msgstr "" +msgstr "適用" #: libraries/config/ServerConfigChecks.class.php:168 msgid "You should use SSL connections if your database server supports it." @@ -6028,10 +6014,9 @@ msgstr "表示モードの詳細設定" #: libraries/config/messages.inc.php:207 libraries/config/messages.inc.php:209 #: libraries/config/messages.inc.php:227 libraries/config/messages.inc.php:238 #: libraries/config/messages.inc.php:240 libraries/config/messages.inc.php:286 -#, fuzzy #| msgid "Customize default options" msgid "Customize default options." -msgstr "デフォルトオプションの詳細設定" +msgstr "デフォルトオプションの詳細設定。" #: libraries/config/messages.inc.php:208 libraries/config/setup.forms.php:247 #: libraries/config/setup.forms.php:324 @@ -6117,10 +6102,9 @@ msgid "Databases display options." msgstr "データベースの表示オプション" #: libraries/config/messages.inc.php:230 setup/frames/menu.inc.php:24 -#, fuzzy #| msgid "Navigation frame" msgid "Navigation panel" -msgstr "ナビゲーションフレーム" +msgstr "ナビゲーションパネル" #: libraries/config/messages.inc.php:231 #, fuzzy @@ -6140,10 +6124,9 @@ msgid "Servers display options." msgstr "サーバの表示オプション" #: libraries/config/messages.inc.php:235 -#, fuzzy #| msgid "Tables display options" msgid "Tables display options." -msgstr "テーブルの表示オプション" +msgstr "テーブル表示オプション." #: libraries/config/messages.inc.php:236 setup/frames/menu.inc.php:25 #, fuzzy @@ -6690,10 +6673,9 @@ msgid "Link with main panel by highlighting the current database or table." msgstr "" #: libraries/config/messages.inc.php:421 -#, fuzzy #| msgid "Show logo in left frame" msgid "Show logo in navigation panel." -msgstr "左のフレーム内にロゴを表示します。" +msgstr "ナビゲーションパネル内にロゴを表示します。" #: libraries/config/messages.inc.php:422 msgid "Display logo" @@ -6710,16 +6692,13 @@ msgid "Logo link URL" msgstr "ロゴのリンク URL" #: libraries/config/messages.inc.php:427 -#, fuzzy #| msgid "" #| "Open the linked page in the main window ([kbd]main[/kbd]) or in a new one " #| "([kbd]new[/kbd])" msgid "" "Open the linked page in the main window ([kbd]main[/kbd]) or in a new one " "([kbd]new[/kbd])." -msgstr "" -"メインウィンドウ ([kbd]main[/kbd]) もしくは新しいウィンドウ ([kbd]new[/kbd]) " -"にリンクされたページを開きます。" +msgstr "リンク先のページをメインウィンドウ ([kbd]main[/kbd]) または新しいウィンドウ ([kbd]new[/kbd]) で開く。" #: libraries/config/messages.inc.php:430 msgid "Logo link target" @@ -6854,10 +6833,9 @@ msgstr "自然順" #: libraries/config/messages.inc.php:472 libraries/config/messages.inc.php:503 #: libraries/config/messages.inc.php:505 -#, fuzzy #| msgid "Use only icons, only text or both" msgid "Use only icons, only text or both." -msgstr "「アイコンのみ」、「テキストのみ」、「両方」のいずれかが使えます。" +msgstr "「アイコンのみ表示」または「テキストのみ表示」または「アイコン/テキスト両方表示」。" #: libraries/config/messages.inc.php:473 #, fuzzy @@ -6953,10 +6931,9 @@ msgid "MySQL reserved word warning" msgstr "" #: libraries/config/messages.inc.php:504 -#, fuzzy #| msgid "Allow to display all the rows" msgid "How to display the menu tabs" -msgstr "すべての行の表示を許可する" +msgstr "メニュータブの表示方法" #: libraries/config/messages.inc.php:506 msgid "How to display various action links" @@ -13140,16 +13117,13 @@ msgid "Reset to default" msgstr "デフォルトに戻す" #: libraries/server_status_processes.lib.php:24 -#, fuzzy #| msgid "" #| "Note: Enabling the database statistics here might cause heavy traffic " #| "between the web server and the MySQL server." msgid "" "Note: Enabling the auto refresh here might cause heavy traffic between the " "web server and the MySQL server." -msgstr "" -"注意: データベースの統計を有効にするとウェブサーバと MySQL サーバの間の通信量" -"が激増することがあります。" +msgstr "注意: 自動再描画を有効にするとウェブサーバと MySQL サーバの間の通信量が激増することがあります。" #: libraries/server_status_processes.lib.php:69 msgid "ID" @@ -13895,7 +13869,7 @@ msgstr "" #, fuzzy #| msgid "Users" msgid "User groups" -msgstr "ユーザ" +msgstr "ユーザグループ" #: libraries/server_user_groups.lib.php:77 #, fuzzy @@ -14091,10 +14065,9 @@ msgid "Run SQL query/queries on database %s" msgstr "データベース %s 上でクエリを実行する" #: libraries/sql_query_form.lib.php:280 -#, fuzzy #| msgid "Bookmark this SQL query" msgid "Bookmark this SQL query:" -msgstr "この SQL をブックマークする" +msgstr "この SQL をブックマークする。" #: libraries/sql_query_form.lib.php:294 msgid "Replace existing bookmark of same name" From d0f0bd00a59c57a19fa45a2229f9c66545ed7fb0 Mon Sep 17 00:00:00 2001 From: JongDeok Date: Sat, 21 Feb 2015 19:46:07 +0100 Subject: [PATCH 2/3] Translated using Weblate (Korean) Currently translated at 82.8% (2472 of 2982 strings) [CI skip] --- po/ko.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index da6b9c6305..5354496604 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2015-02-21 18:49+0200\n" -"Last-Translator: Koo Young Min \n" +"PO-Revision-Date: 2015-02-21 19:45+0200\n" +"Last-Translator: JongDeok \n" "Language-Team: Korean " "\n" "Language: ko\n" @@ -10319,7 +10319,7 @@ msgstr "마스터 리플리케이션" #: libraries/replication_gui.lib.php:47 msgid "This server is configured as master in a replication process." -msgstr "" +msgstr "이 서버는 이중화 환경 내의 마스터 서버로 구성되지 않았습니다." #: libraries/replication_gui.lib.php:55 msgid "Show connected slaves" From 55dccb6138075ccab64b383bbcff94cfefadef79 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 23 Feb 2015 11:58:26 +0530 Subject: [PATCH 3/3] bug #4777 Some images are missing in Designer for original theme Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/db_designer.lib.php | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index e07124a368..3bcca3c51b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 4.3.11.0 (not yet released) - bug #4774 SQL links are completely wrong - bug #4768 MariaDB: version mismatch +- bug #4777 Some images are missing in Designer for original theme 4.3.10.0 (2015-02-20) - bug Undefined index navwork diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php index a46e912167..0f4fd5479d 100644 --- a/libraries/db_designer.lib.php +++ b/libraries/db_designer.lib.php @@ -701,32 +701,32 @@ function PMA_getDatabaseTables( if (isset($tables_pk_or_unique_keys[$t_n . "." . $tab_column[$t_n]["COLUMN_NAME"][$j]])) { - $html .= '*'; - + $html .= '*'; } else { - $html .= 'getImgPath($image) . '" alt="*" />'; } $html .= htmlspecialchars(