The branch, master has been updated via 40f86a310c4583d299ddb494f0b6972250e47720 (commit) via a001ecb13a8d9d68b8fcd0a965a4cacb3114685e (commit) via afa3cb84826344e36b15bdfebca51cf4114c6046 (commit) via c1deac7154debe4472f2eadc7a80112a1f2dfc42 (commit) via 84515ed04e65cf2b42cd0f4d79398839963e1299 (commit) via c7e62f8f495250aabbaf9a758f5d830af51cc4d3 (commit) via a82954f68cfdf04cc5b63c9c4e8815f59b5e2bcf (commit) via bfc309b7dca3c7452844f84c038e5006d6f7daa3 (commit) via f21a7216fe3921fcbf7777dcce87ae419a83b4a4 (commit) via e56c594a0935148705650b08dbe4e37396ab3334 (commit) via 6a0f93d106e499e16722a7aeb376adc91fef21a7 (commit) via f44523faff4aeb20cfeac38b5f76bb81769e960a (commit) via e253b192fed25231e7ec8dd3a547ac396ba2585d (commit) via dc3a72f64a884a7f4c57e0aae53fe758080945a5 (commit) via 8d9d28487d4ac15f6f0b2cfa4c5a5ea7cf49d6c2 (commit) via e3b0e37b0fad3093458a1f8bf2547da3ccaeb077 (commit) via 08e26f0acdb5fe85ab48844cb0b65b838d1d8887 (commit) via d275f8a0d995fe02de37302362b43d83cd29e99d (commit) via 2246fe3eafd64456e15edc4b14d40c27f1435ffb (commit) via b3dcd2095476b88170104a3f73cb759d8f429dc1 (commit) via 1e8ef1177d9a64ef5fe20bd4bf0a6715c5aacd02 (commit) via 955bc2d8f9348633ef22e5aa389e1d3857cfab9e (commit) via 8820da690eda6dd7706edeeb08b01a98cdc7d055 (commit) via 6134449379723e71fc87904eeb7e8fdd4e21a1e6 (commit) via bf34f862a02977752bd7b0cf709f3fdb1e41b4f4 (commit) via 3f62e9ded5b7ab914ca58e4c04da2ce6767ec7a4 (commit) via aa563c033552f0aa7599eb70d2129f678bf20378 (commit) via 28957322a5a119e48a4d7e94d3ac0e4317e4ae74 (commit) via 556cc653e15463f192a553ec94911637231699b2 (commit) via 4d8c671e161aabb9fa438bca25498e30dcb98f62 (commit) via c93f61075629e955e24e6c9f1a6531a754fc2a29 (commit) via 26221515189d4143a86ebf5dd0f2da67be1cf7dc (commit) via b3121c55bc85880db13e59271dc57ac64adf55bf (commit) via 0dc6c2d180553b5ef76579befba3c010acc85ab2 (commit) via ce9d2960f000dddac02d580816146f52cddb1d80 (commit) via 9745ed6fa729564322665e5a20ba9c6a234b8db6 (commit) via a9e5a34935d91ba3aa88a487cc950a4290c0cf0d (commit) via 42a8a05168fd9d9b16f84e95c0063da88e0eb679 (commit) via 19399c0ff5ef1cce7d6decb5b4f4ee3769ae2fc0 (commit) via d7d3db319294869f5d9f5462429923f018f9f9da (commit) via 27849403c91747e0bac5f31ddbe75916d20622a3 (commit) via 5c54dc1ade861cbfbfe02aad127dc73acb379bbc (commit) via 31714ec7c4cb99936ca73b9cd7bc894e62c3450e (commit) via f38839bca6db1931ac3d712f6bead0c81d347e96 (commit) via 8925f97e1e8e8abd37e1207e9bd9c51794072567 (commit) via 1d4cfeed1c2895956d71b11c8dd5a95af8dd98ec (commit) via 593a21c61050023d2b880367cd39c6f1e5ee82e4 (commit) via a2b870a067f8a780f37723c470c884a100dc6aa3 (commit) via f78d56ae98ee057584796e5537859aa89645ac60 (commit) via ef086e32459ff942112d213e37855b831c386ead (commit) via dd6a2675afc7144393a2d3cb36f7eb7fb78fc060 (commit) via 56cc53340781f972dfc12ec7293d58dee889aade (commit) via d878064e49c063110421a35f8d186d5bc0721a75 (commit) from 79c6825dcf33763c4a24956ec5d39b743573f869 (commit)
- Log ----------------------------------------------------------------- commit 40f86a310c4583d299ddb494f0b6972250e47720 Author: Michal Čihař michal@cihar.com Date: Thu Nov 24 09:01:51 2011 +0100
Update generated files
commit a001ecb13a8d9d68b8fcd0a965a4cacb3114685e Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:48:15 2011 +0200
Translation update done using Pootle.
commit afa3cb84826344e36b15bdfebca51cf4114c6046 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:48:11 2011 +0200
Translation update done using Pootle.
commit c1deac7154debe4472f2eadc7a80112a1f2dfc42 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:48:05 2011 +0200
Translation update done using Pootle.
commit 84515ed04e65cf2b42cd0f4d79398839963e1299 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:48:00 2011 +0200
Translation update done using Pootle.
commit c7e62f8f495250aabbaf9a758f5d830af51cc4d3 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:47:54 2011 +0200
Translation update done using Pootle.
commit a82954f68cfdf04cc5b63c9c4e8815f59b5e2bcf Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:47:46 2011 +0200
Translation update done using Pootle.
commit bfc309b7dca3c7452844f84c038e5006d6f7daa3 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:47:36 2011 +0200
Translation update done using Pootle.
commit f21a7216fe3921fcbf7777dcce87ae419a83b4a4 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:47:28 2011 +0200
Translation update done using Pootle.
commit e56c594a0935148705650b08dbe4e37396ab3334 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:47:18 2011 +0200
Translation update done using Pootle.
commit 6a0f93d106e499e16722a7aeb376adc91fef21a7 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:47:01 2011 +0200
Translation update done using Pootle.
commit f44523faff4aeb20cfeac38b5f76bb81769e960a Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:46:54 2011 +0200
Translation update done using Pootle.
commit e253b192fed25231e7ec8dd3a547ac396ba2585d Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:46:48 2011 +0200
Translation update done using Pootle.
commit dc3a72f64a884a7f4c57e0aae53fe758080945a5 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:46:36 2011 +0200
Translation update done using Pootle.
commit 8d9d28487d4ac15f6f0b2cfa4c5a5ea7cf49d6c2 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:46:33 2011 +0200
Translation update done using Pootle.
commit e3b0e37b0fad3093458a1f8bf2547da3ccaeb077 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:46:29 2011 +0200
Translation update done using Pootle.
commit 08e26f0acdb5fe85ab48844cb0b65b838d1d8887 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:46:25 2011 +0200
Translation update done using Pootle.
commit d275f8a0d995fe02de37302362b43d83cd29e99d Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:46:21 2011 +0200
Translation update done using Pootle.
commit 2246fe3eafd64456e15edc4b14d40c27f1435ffb Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:46:16 2011 +0200
Translation update done using Pootle.
commit b3dcd2095476b88170104a3f73cb759d8f429dc1 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:46:10 2011 +0200
Translation update done using Pootle.
commit 1e8ef1177d9a64ef5fe20bd4bf0a6715c5aacd02 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:45:53 2011 +0200
Translation update done using Pootle.
commit 955bc2d8f9348633ef22e5aa389e1d3857cfab9e Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:45:44 2011 +0200
Translation update done using Pootle.
commit 8820da690eda6dd7706edeeb08b01a98cdc7d055 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:43:53 2011 +0200
Translation update done using Pootle.
commit 6134449379723e71fc87904eeb7e8fdd4e21a1e6 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:43:24 2011 +0200
Translation update done using Pootle.
commit bf34f862a02977752bd7b0cf709f3fdb1e41b4f4 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:42:41 2011 +0200
Translation update done using Pootle.
commit 3f62e9ded5b7ab914ca58e4c04da2ce6767ec7a4 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:42:35 2011 +0200
Translation update done using Pootle.
commit aa563c033552f0aa7599eb70d2129f678bf20378 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:42:26 2011 +0200
Translation update done using Pootle.
commit 28957322a5a119e48a4d7e94d3ac0e4317e4ae74 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:42:09 2011 +0200
Translation update done using Pootle.
commit 556cc653e15463f192a553ec94911637231699b2 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:40:54 2011 +0200
Translation update done using Pootle.
commit 4d8c671e161aabb9fa438bca25498e30dcb98f62 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:40:38 2011 +0200
Translation update done using Pootle.
commit c93f61075629e955e24e6c9f1a6531a754fc2a29 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:40:34 2011 +0200
Translation update done using Pootle.
commit 26221515189d4143a86ebf5dd0f2da67be1cf7dc Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:40:28 2011 +0200
Translation update done using Pootle.
commit b3121c55bc85880db13e59271dc57ac64adf55bf Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:40:19 2011 +0200
Translation update done using Pootle.
commit 0dc6c2d180553b5ef76579befba3c010acc85ab2 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:40:15 2011 +0200
Translation update done using Pootle.
commit ce9d2960f000dddac02d580816146f52cddb1d80 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:40:13 2011 +0200
Translation update done using Pootle.
commit 9745ed6fa729564322665e5a20ba9c6a234b8db6 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:40:09 2011 +0200
Translation update done using Pootle.
commit a9e5a34935d91ba3aa88a487cc950a4290c0cf0d Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:40:03 2011 +0200
Translation update done using Pootle.
commit 42a8a05168fd9d9b16f84e95c0063da88e0eb679 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:39:59 2011 +0200
Translation update done using Pootle.
commit 19399c0ff5ef1cce7d6decb5b4f4ee3769ae2fc0 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:39:50 2011 +0200
Translation update done using Pootle.
commit d7d3db319294869f5d9f5462429923f018f9f9da Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:12:56 2011 +0200
Translation update done using Pootle.
commit 27849403c91747e0bac5f31ddbe75916d20622a3 Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:11:46 2011 +0200
Translation update done using Pootle.
commit 5c54dc1ade861cbfbfe02aad127dc73acb379bbc Author: dannybeckett daniel.beckett@gmail.com Date: Thu Nov 24 03:11:36 2011 +0200
Translation update done using Pootle.
commit 31714ec7c4cb99936ca73b9cd7bc894e62c3450e Author: Robert Readman robert_readman@hotmail.com Date: Thu Nov 24 03:11:28 2011 +0200
Translation update done using Pootle.
commit f38839bca6db1931ac3d712f6bead0c81d347e96 Author: Burak Yavuz hitowerdigit@hotmail.com Date: Wed Nov 23 22:50:56 2011 +0200
Translation update done using Pootle.
commit 8925f97e1e8e8abd37e1207e9bd9c51794072567 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Wed Nov 23 12:17:10 2011 +0200
Translation update done using Pootle.
commit 1d4cfeed1c2895956d71b11c8dd5a95af8dd98ec Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Wed Nov 23 12:13:46 2011 +0200
Translation update done using Pootle.
commit 593a21c61050023d2b880367cd39c6f1e5ee82e4 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Wed Nov 23 12:12:36 2011 +0200
Translation update done using Pootle.
commit a2b870a067f8a780f37723c470c884a100dc6aa3 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Wed Nov 23 12:12:17 2011 +0200
Translation update done using Pootle.
commit f78d56ae98ee057584796e5537859aa89645ac60 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Wed Nov 23 12:10:36 2011 +0200
Translation update done using Pootle.
commit ef086e32459ff942112d213e37855b831c386ead Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Wed Nov 23 12:07:14 2011 +0200
Translation update done using Pootle.
commit dd6a2675afc7144393a2d3cb36f7eb7fb78fc060 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Wed Nov 23 12:05:26 2011 +0200
Translation update done using Pootle.
commit 56cc53340781f972dfc12ec7293d58dee889aade Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Wed Nov 23 12:00:46 2011 +0200
Translation update done using Pootle.
commit d878064e49c063110421a35f8d186d5bc0721a75 Author: Matías Bellone matiasbellone@gmail.com Date: Tue Nov 22 21:02:55 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: output/en_GB/Documentation.html | 6 +- output/en_GB/README | 2 +- output/es/Documentation.html | 4 +- output/ja/Documentation.html | 20 +++--- output/ja/index.html | 2 +- output/tr/Documentation.html | 6 +- po/en_GB.po | 158 +++++++++++++++++++++++++++------------ po/es.po | 8 +- po/ja.po | 35 ++++----- po/tr.po | 8 +- 10 files changed, 150 insertions(+), 99 deletions(-)
diff --git a/output/en_GB/Documentation.html b/output/en_GB/Documentation.html index ace36af..e8b15ca 100644 --- a/output/en_GB/Documentation.html +++ b/output/en_GB/Documentation.html @@ -1224,7 +1224,7 @@ themselves and store them in the database.
If you don't allow for storing preferences in <a href="#pmadb">pmadb</a>, users can still personalise phpMyAdmin, but settings will be saved in -browser's local storage, or, it is is unavailable, until the end of session. +browser's local storage, or, if it is unavailable, until the end of session. <br /><br />
To allow the usage of this functionality: @@ -2042,8 +2042,8 @@ href="#cfg_CharEditing">$cfg['CharEditing']</a>).</dd> <dd>Defines if the whole textarea of the query box will be selected on click.</dd>
<dt id="cfg_LimitChars">$cfg['LimitChars'] integer</dt> - <dd>Maximum number of characters shown in any non-numeric field on browse -view. Can be turned off by a toggle button on the browse page.</dd> + <dd>Maximum number of characters shown in any non-numeric field on browse view. +Can be turned off by a toggle button on the browse page.</dd>
<dt><span id="cfg_RowActionLinks">$cfg['RowActionLinks'] </span>string </dt> diff --git a/output/en_GB/README b/output/en_GB/README index fdd8c91..961355a 100644 --- a/output/en_GB/README +++ b/output/en_GB/README @@ -56,7 +56,7 @@ For a summary of features, please see the Documentation.txt/.html file. Download --------
-You can get the newest version at http://www.phpmyadmin.net/ +You can get the newest version at http://www.phpmyadmin.net/.
More Information ---------------- diff --git a/output/es/Documentation.html b/output/es/Documentation.html index d2122fa..efacc0f 100644 --- a/output/es/Documentation.html +++ b/output/es/Documentation.html @@ -1656,8 +1656,8 @@ class="configrule">$cfg['LeftFrameTableSeparator']</a> </dd>
<dt id="cfg_LeftFrameDBTree">booleano $cfg['LeftFrameDBTree']</dt> - <dd>Defines whether to display the names of databases (in the selector) using a -tree, see also <a href="#cfg_LeftFrameDBSeparator" + <dd>Define si mostrar los nombres de las bases de datos (en el selector) +utilizando un árbol, ver también <a href="#cfg_LeftFrameDBSeparator" class="configrule">$cfg['LeftFrameDBSeparator']</a>. </dd>
diff --git a/output/ja/Documentation.html b/output/ja/Documentation.html index 6a6e755..e203bbb 100644 --- a/output/ja/Documentation.html +++ b/output/ja/Documentation.html @@ -109,7 +109,7 @@ MySQL ユーザを適切にセットアップしてお望みのデータベー <h3>phpMyAdmin は現在次のことができます。</h3>
<ul><li>データベース、テーブル、ビュー、カラム、インデックスの閲覧および削除</li> - <li>データベース、テーブル、カラム、インデックスの作成・コピー・削除・リネーム・定義の変更</li> + <li>データベース、テーブル、カラム、インデックスの作成・複製・削除・名称および定義の変更</li> <li>サーバ、データベース、テーブルの保守、そのためのサーバの設定を提案</li> <li>任意の <abbr title="structured query language">SQL</abbr> 文の実行、編集、ブックマーク。マルチクエリにも対応。</li> @@ -843,9 +843,9 @@ ALTER TABLE `pma_column_comments` ADD `transformation_options` VARCHAR( 255 ) NOT NULL; </pre>
- また、忘れずに <i>config.inc.php</i> にある変数を<br /> + また、忘れずに <i>config.inc.php</i> にある変数名を<br /> <tt>$cfg['Servers'][$i]['column_comments']</tt> から -<tt>$cfg['Servers'][$i]['column_info']</tt> にリネームします。</li> +<tt>$cfg['Servers'][$i]['column_info']</tt> に変更します。</li> </ul> </dd>
@@ -1308,9 +1308,8 @@ class="configrule">$cfg['LeftFrameTableSeparator']</a> </dd>
<dt id="cfg_LeftFrameDBTree">$cfg['LeftFrameDBTree'] 論理型</dt> - <dd>Defines whether to display the names of databases (in the selector) using a -tree, see also <a href="#cfg_LeftFrameDBSeparator" -class="configrule">$cfg['LeftFrameDBSeparator']</a>. + <dd>(セレクターの) データベース名をツリー表示するかどうかを定義します。<a href="#cfg_LeftFrameDBSeparator" +class="configrule">$cfg['LeftFrameDBSeparator']</a> もご覧ください。 </dd>
<dt id="cfg_LeftFrameDBSeparator">$cfg['LeftFrameDBSeparator'] 文字列または配列</dt> @@ -1684,8 +1683,8 @@ href="#cfg_CharEditing">$cfg['CharEditing']</a> でそのように設定され
<dt><span id="cfg_RowActionLinks">$cfg['RowActionLinks']</span> 文字列 </dt> - <dd>テーブルの内容を表示しているとき、行のリンク(編集、コピー、削除)をどこに表示するかを定義します(表示は、左側 (left)、右側 -(right)、左右両側 (both)、なし (none) が行えます)。「左 (left)」と「右 (right)」は、垂直表示モードでは「上 + <dd>テーブルの内容を表示しているとき、行のリンク (編集、複製、削除) をどこに表示するかを定義します (表示は、左側 (left)、右側 +(right)、左右両側 (both)、なし (none) が行えます)。「左 (left)」と「右 (right)」は、垂直表示モードでは「上 (top)」と「下 (bottom)」と解釈されます。</dd>
<dt id="cfg_DefaultDisplay">$cfg['DefaultDisplay'] 文字列</dt> @@ -1902,7 +1901,8 @@ textarea <dd>データベースやテーブルの名前を自然な順番でソートします(たとえば、t1、t2、t10)。いまのところ左パネル(軽快モード)とデータベース画面のテーブル一覧に実装されています。</dd>
<dt id="cfg_InitialSlidersState">$cfg['InitialSlidersState'] 文字列</dt> - <dd><tt>「closed(閉じている)」</tt>に設定した場合、折り畳みは閉じた状態で表示されます。<tt>「open(開いている)」</tt>はその逆です。全ての折り畳みを完全に無効にするには、<tt>「disabled」</tt>にします。</dd> + <dd><tt>「closed (閉じておく)」</tt>に設定した場合、折り畳みは閉じた状態で表示されます。<tt>「open +(開いておく)」</tt>はその逆です。全ての折り畳みを完全に無効にするには、<tt>「disabled (無効)」</tt>にします。</dd>
<dt id="cfg_UserprefsDisallow">$cfg['UserprefsDisallow'] 配列</dt> <dd>ユーザ環境設定を許可させない設定オプションの名前 (<tt>$cfg</tt> 配列のキーで指定) @@ -2915,7 +2915,7 @@ class="configrule">$cfg['CompressOnFly']</a> (逐次圧縮) を使うとこの ファイルが必要な場合、別の方法をとる必要があります。</p>
<h4 id="faq3_3"> - <a href="#faq3_3">3.3 InnoDB テーブルでテーブルやカラムをリネームすると外部キーのリレーションが切れます。</a></h4> + <a href="#faq3_3">3.3 InnoDB テーブルでテーブルやカラムの名称を変更すると外部キーのリレーションが切れます。</a></h4>
<p> これは InnoDB のバグです。<a href="http://bugs.mysql.com/bug.php?id=21704">http://bugs.mysql.com/bug.php?id=21704</a> diff --git a/output/ja/index.html b/output/ja/index.html index a2ce4c3..fae0dc0 100644 --- a/output/ja/index.html +++ b/output/ja/index.html @@ -8,7 +8,7 @@ </head> <body> <h1>phpMyAdmin 日本語ドキュメント</h1> -<p>ドキュメントの日本語� ント</h1>