[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24846-gcfc6039 - Git

15 Dec 2011

The branch, master has been updated
       via  cfc6039972ec41cdefe3dc9f1afdf500ed89ac6d (commit)
       via  cb2ee44bba6a2e51ea9870de8fd33a294cfe5ce2 (commit)
       via  074fafa62b3c7482d41706c6dba4bf2c3e818ee3 (commit)
       via  76925d39d95d0158e7786e34c2be24fd1a89c19d (commit)
       via  5317c4cff6d625ff4273edc32846f05644a3d11e (commit)
       via  2f182250274b84d9ed907f21b0a890da3b6846d7 (commit)
       via  6a5b7a97a15823519cc262b873e8a625a931cc54 (commit)
       via  38075df392f8cce33c7e641afbe29f6158dd7016 (commit)
       via  a9badb693edd762dd7bb38babb637f81cf5c8062 (commit)
       via  c9d38d9bbcda9e2054d02c772f32cc479e552aca (commit)
       via  2445a0ac7715f1de5b1c2b191ef0e700163dccef (commit)
       via  40640b57f936ae4b05920864c3afe320a11aa13b (commit)
       via  0d58e32a25e1c13b98815e34cd8241b588ac72bb (commit)
       via  e0fc575ec03376788280fd6ea0b93c9e46b4c781 (commit)
       via  4bc8d83d1cf53cf09efd5f0bfc228b3900dcaf4d (commit)
       via  f2e5e47f15406428c7e84073adc81dab4cd3c286 (commit)
       via  452a22aecdd759bac2b0f2aad15a0dc27fb4fb32 (commit)
       via  4d6ec724730c7e05052a9a42ceb99fcedad03243 (commit)
       via  65407ce993dddf3557aad32b1468d769fb3b019e (commit)
       via  2af5b62eb39a3e5299a5543f10f0c9b6f29d949c (commit)
       via  1c3ed8e3f1b2aea24540af7913aa01c06d38a698 (commit)
       via  7573d5e25592b57991a8e1bd7c24a661afb11b10 (commit)
       via  2ed96fae3272a906d44892051e8c0b34068bf118 (commit)
       via  1de59290ec8750220003b470a8eab6ada09d7ca3 (commit)
       via  9691334b414201f03114f886a0ec233939f9c024 (commit)
       via  694acaf240c93041e4501140e6753d4d56c38227 (commit)
       via  bc90c5b33266d238043711316d53a7c031aef518 (commit)
       via  5e200a11c431b882ebc7ae278afb1bfc74119bfc (commit)
       via  7fae43703cac52926caadc50b514f48935f4a7cc (commit)
       via  f72f22f72f3ad75a5998fd3c6631b3a1c73d9ea0 (commit)
       via  685e11cf83fe2cf039e67c1fb69183feab1d709f (commit)
       via  a9adf4511417958b2f5dd82d54ff18cc170c94b1 (commit)
       via  40d3688db023c1d98bb9ff7834963d9d536de0e7 (commit)
       via  9953e1defca8ebfcb223b1ae05b458017f8aafe0 (commit)
       via  7c8469f60101607e3610c989d1acea1b80eeedc2 (commit)
       via  954aa7d511c4918d300556dd783d207b117dac36 (commit)
       via  ae6cd6f2db10b8d389624ffb2b296fc005a1dade (commit)
       via  f43f436c6be5744d781f49286e3ef783c3b4d7d8 (commit)
       via  e640c3c40f37734b0f42884ff63d6c8e27c8474b (commit)
       via  a725a11c3b2c3e302a30e67ace989e8965f23d9f (commit)
       via  676982b49943c139c3d0c0a78487d9a2aa27ca14 (commit)
       via  133cf72e9dda812868f61831fc31d08152190491 (commit)
       via  9de5a5ad170ac92eb2a6df5e665b41d386bca8b4 (commit)
       via  560da6e0cd1b308bdecd9b235ff8d6fe41f3942d (commit)
       via  3ac7a3020ffb0cb5e1a609343b8d0cb0cfb652ef (commit)
       via  fded23de42721c470c1c345c7b3062150f357f10 (commit)
       via  73a37fdd526f82ca59a26601aaea08eea857d2c5 (commit)
       via  8bf5c1972532a462e81dc909cb7889de693c2fb7 (commit)
      from  b8539c230e1c7906195a42dc49e4a4f6110f18d9 (commit)
- Log -----------------------------------------------------------------
commit cfc6039972ec41cdefe3dc9f1afdf500ed89ac6d
Merge: b8539c2 cb2ee44
Author: Michal Čihař mcihar@suse.cz
Date:   Thu Dec 15 11:25:05 2011 +0100
Merge remote-tracking branch 'pootle/master'
Conflicts:
    	po/de.po
    	po/ja.po
    	po/ru.po
commit cb2ee44bba6a2e51ea9870de8fd33a294cfe5ce2
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:46:37 2011 +0200
Translation update done using Pootle.
commit 074fafa62b3c7482d41706c6dba4bf2c3e818ee3
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:46:28 2011 +0200
Translation update done using Pootle.
commit 76925d39d95d0158e7786e34c2be24fd1a89c19d
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:45:41 2011 +0200
Translation update done using Pootle.
commit 5317c4cff6d625ff4273edc32846f05644a3d11e
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:45:35 2011 +0200
Translation update done using Pootle.
commit 2f182250274b84d9ed907f21b0a890da3b6846d7
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:45:30 2011 +0200
Translation update done using Pootle.
commit 6a5b7a97a15823519cc262b873e8a625a931cc54
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:45:22 2011 +0200
Translation update done using Pootle.
commit 38075df392f8cce33c7e641afbe29f6158dd7016
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:44:42 2011 +0200
Translation update done using Pootle.
commit a9badb693edd762dd7bb38babb637f81cf5c8062
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:44:10 2011 +0200
Translation update done using Pootle.
commit c9d38d9bbcda9e2054d02c772f32cc479e552aca
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:42:42 2011 +0200
Translation update done using Pootle.
commit 2445a0ac7715f1de5b1c2b191ef0e700163dccef
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:41:12 2011 +0200
Translation update done using Pootle.
commit 40640b57f936ae4b05920864c3afe320a11aa13b
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:40:54 2011 +0200
Translation update done using Pootle.
commit 0d58e32a25e1c13b98815e34cd8241b588ac72bb
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:38:09 2011 +0200
Translation update done using Pootle.
commit e0fc575ec03376788280fd6ea0b93c9e46b4c781
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:37:46 2011 +0200
Translation update done using Pootle.
commit 4bc8d83d1cf53cf09efd5f0bfc228b3900dcaf4d
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:37:29 2011 +0200
Translation update done using Pootle.
commit f2e5e47f15406428c7e84073adc81dab4cd3c286
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:36:17 2011 +0200
Translation update done using Pootle.
commit 452a22aecdd759bac2b0f2aad15a0dc27fb4fb32
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:35:50 2011 +0200
Translation update done using Pootle.
commit 4d6ec724730c7e05052a9a42ceb99fcedad03243
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:35:37 2011 +0200
Translation update done using Pootle.
commit 65407ce993dddf3557aad32b1468d769fb3b019e
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:35:20 2011 +0200
Translation update done using Pootle.
commit 2af5b62eb39a3e5299a5543f10f0c9b6f29d949c
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:34:16 2011 +0200
Translation update done using Pootle.
commit 1c3ed8e3f1b2aea24540af7913aa01c06d38a698
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:33:59 2011 +0200
Translation update done using Pootle.
commit 7573d5e25592b57991a8e1bd7c24a661afb11b10
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:33:42 2011 +0200
Translation update done using Pootle.
commit 2ed96fae3272a906d44892051e8c0b34068bf118
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:32:47 2011 +0200
Translation update done using Pootle.
commit 1de59290ec8750220003b470a8eab6ada09d7ca3
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:31:41 2011 +0200
Translation update done using Pootle.
commit 9691334b414201f03114f886a0ec233939f9c024
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:31:33 2011 +0200
Translation update done using Pootle.
commit 694acaf240c93041e4501140e6753d4d56c38227
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:31:17 2011 +0200
Translation update done using Pootle.
commit bc90c5b33266d238043711316d53a7c031aef518
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:31:07 2011 +0200
Translation update done using Pootle.
commit 5e200a11c431b882ebc7ae278afb1bfc74119bfc
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:30:41 2011 +0200
Translation update done using Pootle.
commit 7fae43703cac52926caadc50b514f48935f4a7cc
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Thu Dec 15 11:30:33 2011 +0200
Translation update done using Pootle.
commit f72f22f72f3ad75a5998fd3c6631b3a1c73d9ea0
Author: Sven Strickroth email@cs-ware.de
Date:   Wed Dec 14 21:22:24 2011 +0200
Translation update done using Pootle.
commit 685e11cf83fe2cf039e67c1fb69183feab1d709f
Author: Sven Strickroth email@cs-ware.de
Date:   Wed Dec 14 21:17:53 2011 +0200
Translation update done using Pootle.
commit a9adf4511417958b2f5dd82d54ff18cc170c94b1
Author: Sven Strickroth email@cs-ware.de
Date:   Wed Dec 14 21:17:23 2011 +0200
Translation update done using Pootle.
commit 40d3688db023c1d98bb9ff7834963d9d536de0e7
Author: Sven Strickroth email@cs-ware.de
Date:   Wed Dec 14 21:16:17 2011 +0200
Translation update done using Pootle.
commit 9953e1defca8ebfcb223b1ae05b458017f8aafe0
Author: Sven Strickroth email@cs-ware.de
Date:   Wed Dec 14 21:16:10 2011 +0200
Translation update done using Pootle.
commit 7c8469f60101607e3610c989d1acea1b80eeedc2
Author: Sven Strickroth email@cs-ware.de
Date:   Wed Dec 14 21:14:23 2011 +0200
Translation update done using Pootle.
commit 954aa7d511c4918d300556dd783d207b117dac36
Author: Sven Strickroth email@cs-ware.de
Date:   Wed Dec 14 21:14:14 2011 +0200
Translation update done using Pootle.
commit ae6cd6f2db10b8d389624ffb2b296fc005a1dade
Author: Sven Strickroth email@cs-ware.de
Date:   Wed Dec 14 21:13:48 2011 +0200
Translation update done using Pootle.
commit f43f436c6be5744d781f49286e3ef783c3b4d7d8
Author: Sven Strickroth email@cs-ware.de
Date:   Wed Dec 14 21:13:27 2011 +0200
Translation update done using Pootle.
commit e640c3c40f37734b0f42884ff63d6c8e27c8474b
Author: Sven Strickroth email@cs-ware.de
Date:   Wed Dec 14 21:13:17 2011 +0200
Translation update done using Pootle.
commit a725a11c3b2c3e302a30e67ace989e8965f23d9f
Author: Sven Strickroth email@cs-ware.de
Date:   Wed Dec 14 21:13:09 2011 +0200
Translation update done using Pootle.
commit 676982b49943c139c3d0c0a78487d9a2aa27ca14
Author: Sven Strickroth email@cs-ware.de
Date:   Wed Dec 14 21:13:02 2011 +0200
Translation update done using Pootle.
commit 133cf72e9dda812868f61831fc31d08152190491
Author: any anonymous user <>
Date:   Wed Dec 14 21:12:26 2011 +0200
Translation update done using Pootle.
commit 9de5a5ad170ac92eb2a6df5e665b41d386bca8b4
Author: minichip holger@ronecker.com
Date:   Wed Dec 14 21:12:25 2011 +0200
Translation update done using Pootle.
commit 560da6e0cd1b308bdecd9b235ff8d6fe41f3942d
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Wed Dec 14 19:08:59 2011 +0200
Translation update done using Pootle.
commit 3ac7a3020ffb0cb5e1a609343b8d0cb0cfb652ef
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Wed Dec 14 19:08:23 2011 +0200
Translation update done using Pootle.
commit fded23de42721c470c1c345c7b3062150f357f10
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Wed Dec 14 19:08:12 2011 +0200
Translation update done using Pootle.
commit 73a37fdd526f82ca59a26601aaea08eea857d2c5
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Wed Dec 14 19:07:54 2011 +0200
Translation update done using Pootle.
commit 8bf5c1972532a462e81dc909cb7889de693c2fb7
Author: Victor Volkov hanut@php-myadmin.ru
Date:   Wed Dec 14 19:07:40 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 po/de.po |   47 +++++++++++++++++++------------------------
 po/ja.po |   66 +++++++++++++++++++++++--------------------------------------
 po/ru.po |   16 +++++---------
 3 files changed, 52 insertions(+), 77 deletions(-)

diff --git a/po/de.po b/po/de.po
index 4ca23d3..98d2d59 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-12-14 18:08+0100\n"
-"PO-Revision-Date: 2011-12-12 06:13+0200\n"
-"Last-Translator: minichip holger@ronecker.com\n"
+"PO-Revision-Date: 2011-12-14 21:17+0200\n"
+"Last-Translator: Sven Strickroth email@cs-ware.de\n"
 "Language-Team: german de@li.org\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -1264,9 +1264,10 @@ msgid ""
 "your configuration to default in the <i>Settings</i> menu."
 msgstr ""
 "Die Diagram Anordnung in Ihrem lokalen Browser Speicher ist nicht mehr "
-"kompatibel zur neuen Version des Monitor Dialogs. Es ist sehr Wahrscheinlich "
-"das Ihre aktuellen Einstellungen nicht mehr funktionieren. Bitte setzen Sie "
-"die Konfiguration im <i>Einstellungen</i> Menü auf die Standardwerte zurück."
+"kompatibel zur neuen Version des Monitor Dialogs. Es ist sehr "
+"wahrscheinlich, dass Ihre aktuellen Einstellungen nicht mehr funktionieren. "
+"Bitte setzen Sie die Konfiguration im <i>Einstellungen</i> Menü auf die "
+"Standardwerte zurück."
#: js/messages.php:97
 msgid "Query cache efficiency"
@@ -1548,10 +1549,9 @@ msgid "Analysing & loading logs. This may take a while."
 msgstr "Analysiere und Lade Protokolle. Dies kann eine Weile dauern."
#: js/messages.php:176
-#, fuzzy
 #| msgid "Read requests"
 msgid "Cancel request"
-msgstr "Leseanfragen"
+msgstr "Abfrage abbrechen"
#: js/messages.php:177
 msgid ""
@@ -1589,16 +1589,14 @@ msgstr ""
 "angegebenen Zeitraum gefunden."
#: js/messages.php:184
-#, fuzzy
 #| msgid "Analyze"
 msgid "Analyzing..."
-msgstr "Analysieren"
+msgstr "Analysieren..."
#: js/messages.php:185
-#, fuzzy
 #| msgid "Explain SQL"
 msgid "Explain output"
-msgstr "SQL erklären"
+msgstr "Ausgabe erklären"
#: js/messages.php:187 js/messages.php:487 libraries/rte/rte_list.lib.php:62
 #: libraries/rte/rte_triggers.lib.php:326 server_status.php:1236 sql.php:893
@@ -1606,10 +1604,9 @@ msgid "Time"
 msgstr "Zeit"
#: js/messages.php:188
-#, fuzzy
 #| msgid "Total:"
 msgid "Total time:"
-msgstr "Insgesamt:"
+msgstr "Gesamt Zeit:"
#: js/messages.php:189
 #, fuzzy
@@ -1625,9 +1622,8 @@ msgid "Table"
 msgstr "Tabelle"
#: js/messages.php:191
-#, fuzzy
 msgid "Chart"
-msgstr "Zeichensätze"
+msgstr "Diagramm"
#. l10n: A collection of available filters
 #: js/messages.php:194
@@ -1682,11 +1678,10 @@ msgid "Affected rows:"
 msgstr "Betroffene Zeilen:"
#: js/messages.php:209
-#, fuzzy
 #| msgid "Failed parsing config file. It doesn't seem to be valid JSON code"
 msgid "Failed parsing config file. It doesn't seem to be valid JSON code."
 msgstr ""
-"Das Einlesen der Konfigutationsdatei ist fehlgeschlagen. Es scheint sich "
+"Das Einlesen der Konfigurationsdatei ist fehlgeschlagen. Es scheint sich "
 "nicht um eine gültige JSON-Kodierung zu handeln."
#: js/messages.php:210
@@ -1897,10 +1892,9 @@ msgid "Hovering over a point will show its label."
 msgstr "Das Überfliegen eines Punktes zeigt seine Bezeichnung."
#: js/messages.php:296
-#, fuzzy
 msgid "Use mousewheel to zoom in or out of the plot."
 msgstr ""
-"Verwenden Sie das Mausrad um die Grafik zu vergrößern oder verkleinern."
+"Verwenden Sie das Mausrad, um die Grafik zu vergrößern oder verkleinern."
#: js/messages.php:298
 #, fuzzy
@@ -2024,9 +2018,9 @@ msgid ""
 "This table does not contain a unique column. Features related to the grid "
 "edit, checkbox, Edit, Copy and Delete links may not work after saving."
 msgstr ""
-"Diese Tabelle enthält keine eindeutige Spalte. Merkmale in Bezug auf Gitter "
-"bearbeiten, Kontrollkästchen, Bearbeiten, Kopieren und Löschen von Links "
-"können nach dem Speichern eventuell nicht funktionieren."
+"Diese Tabelle enthält keine eindeutige Spalte. Optionen in Bezug zur Gitter-"
+"Bearbeitungsfunktion, Kontrollkästchen, Bearbeiten, Kopieren und Löschen von "
+"Links können nach dem Speichern eventuell nicht funktionieren."
#: js/messages.php:351
 msgid ""
@@ -2338,7 +2332,7 @@ msgstr "pro Stunde"
#: libraries/Advisor.class.php:335
 msgid "per day"
-msgstr ""
+msgstr "pro Tag"
#: libraries/Config.class.php:703
 msgid "Remove "./config" directory before using phpMyAdmin!"
@@ -5546,7 +5540,7 @@ msgstr "Die Erweiterung %s fehlt. Bitte die PHP Konfiguration überprüfen."
#: libraries/core.lib.php:414
 msgid "possible deep recursion attack"
-msgstr ""
+msgstr "möglicher Deep-Recursion-Angriff"
#: libraries/database_interface.lib.php:1813
 msgid ""
@@ -5563,6 +5557,8 @@ msgstr "Der Server antwortet nicht."
 #: libraries/database_interface.lib.php:1820
 msgid "Please check privileges of directory containing database."
 msgstr ""
+"Bitte prüfen Sie die Rechte des Verzeichnisses, in dem sich die Datenbank "
+"befindet."
#: libraries/database_interface.lib.php:1828
 msgid "Details..."
@@ -11590,10 +11586,9 @@ msgid "Add index"
 msgstr "Index hinzufügen"
#: tbl_indexes.php:175
-#, fuzzy
 #| msgid "Edit mode"
 msgid "Edit index"
-msgstr "Bearbeitungsmodus"
+msgstr "Index bearbeiten"
#: tbl_indexes.php:187
 msgid "Index name:"
diff --git a/po/ja.po b/po/ja.po
index 70f7a77..b35b0ea 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-12-14 18:08+0100\n"
-"PO-Revision-Date: 2011-12-13 11:32+0200\n"
+"PO-Revision-Date: 2011-12-15 11:46+0200\n"
 "Last-Translator: Yuichiro yuichiro@pop07.odn.ne.jp\n"
 "Language-Team: japanese jp@li.org\n"
 "Language: ja\n"
@@ -1098,7 +1098,6 @@ msgid "This is not a number!"
 msgstr "数値ではありません!"
#: js/messages.php:46
-#, fuzzy
 #| msgid "Add index"
 msgid "Add Index"
 msgstr "インデックスを追加する"
@@ -1467,7 +1466,7 @@ msgstr ""
 #: js/messages.php:157
 #, php-format
 msgid "Set log_output to %s"
-msgstr "%s に log_output を設定する"
+msgstr "log_output に %s を設定する"
#. l10n: Enable in this context means setting a status variable to ON
 #: js/messages.php:159
@@ -1519,11 +1518,11 @@ msgstr ""
#: js/messages.php:173
 msgid "From slow log"
-msgstr ""
+msgstr "スロークエリログより"
#: js/messages.php:174
 msgid "From general log"
-msgstr ""
+msgstr "一般クエリログより"
#: js/messages.php:175
 msgid "Analysing & loading logs. This may take a while."
@@ -1650,11 +1649,9 @@ msgid "Affected rows:"
 msgstr "変更された行:"
#: js/messages.php:209
-#, fuzzy
 #| msgid "Failed parsing config file. It doesn't seem to be valid JSON code"
 msgid "Failed parsing config file. It doesn't seem to be valid JSON code."
-msgstr ""
-"設定ファイルの構文解析に失敗しました。有効な JSON コードではないようです。"
+msgstr "設定ファイルの構文解析に失敗しました。有効な JSON コードではないようです。"
#: js/messages.php:210
 msgid ""
@@ -10485,11 +10482,10 @@ msgid ""
 "enabled. Note however, that the general_log produces a lot of data and "
 "increases server load by up to 15%"
 msgstr ""
-"phpMyAdmin モニタは、サーバ構成の最適化を支援し、時間のかかるクエリを追跡する"
-"ことができます。後者の場合には、テーブルに log_output を設定し、"
-"slow_query_log または general_log のいずれかを有効にする必要があります。な"
-"お、general_log は大量のデータを生成し、サーバの負荷を 15% 増加させますので、"
-"注意するようにしてください。"
+"phpMyAdmin モニタは、サーバ構成の最適化を支援し、時間のかかるクエリを追跡することができます。後者を行うには、log_output "
+"(ログの出力先) にテーブルを設定し、slow_query_log (スロークエリログ) または general_log (一般クエリログ) "
+"のいずれかを有効にする必要があります。なお、general_log は大量のデータを生成し、サーバの負荷を 15% "
+"増加させますので、注意するようにしてください。"
#: server_status.php:1605
 msgid ""
@@ -10541,10 +10537,9 @@ msgid ""
 "it is advisable to select only a small time span and to disable the "
 "general_log and empty its table once monitoring is not required any more."
 msgstr ""
-"general_log を有効にすると、5～15% サーバの負荷が増加することがあります。ログ"
-"から生成される統計は、負荷が集中する作業であることを認識しておいてください。"
-"ですから、短時間だけモニタするようにし、それ以上必要がないのであれば、"
-"general_log を無効にしてログテーブルを空にしておくのが望ましいです。"
+"general_log (一般クエリログ) を有効にすると、5～15% サーバの負荷が増加することがあります。ログから生成される統計は、負荷が集中する作"
+"業であることを認識しておいてください。このような理由から、一般クエリログは短時間だけモニタするようにし、それ以上必要がないのであれば、general_l"
+"og を無効にして一般クエリログテーブルを空にしておくのが望ましいです。"
#: server_status.php:1643
 msgid "Preset chart"
@@ -11207,14 +11202,12 @@ msgid "Line"
 msgstr "折れ線グラフ"
#: tbl_chart.php:91
-#, fuzzy
 #| msgid "Spline"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "曲線グラフ"
#: tbl_chart.php:92
-#, fuzzy
 #| msgid "Pie"
 msgctxt "Chart type"
 msgid "Pie"
@@ -11897,43 +11890,39 @@ msgstr "現在の問い合わせ総数: %s"
#: po/advisory_rules.php:15
 msgid "Percentage of slow queries"
-msgstr "遅いクエリの比率"
+msgstr "スロークエリの比率"
#: po/advisory_rules.php:16
 msgid ""
 "There is a lot of slow queries compared to the overall amount of Queries."
-msgstr "クエリの全体量に対して遅いクエリが多く存在します。"
+msgstr "クエリの全体量に対して長時間処理であるスロークエリが多く存在します。"
#: po/advisory_rules.php:17 po/advisory_rules.php:22
 msgid ""
 "You might want to increase {long_query_time} or optimize the queries listed "
 "in the slow query log"
-msgstr ""
-"{long_query_time} を増やすか、クエリログから遅いクエリを見つけ出し最適化して"
-"みてください。"
+msgstr "{long_query_time} を増やすか、クエリログからスロークエリを見つけ出し最適化してみてください。"
#: po/advisory_rules.php:18
 #, php-format
 msgid "The slow query rate should be below 5%%, your value is %s%%."
-msgstr "遅いクエリの割合は 5%% 未満が推奨です。現在は %s%% です。"
+msgstr "スロークエリの割合は 5%% 未満がいいと言われています。現在は %s%% です。"
#: po/advisory_rules.php:20
 msgid "Slow query rate"
-msgstr "遅いクエリの割合"
+msgstr "スロークエリの割合"
#: po/advisory_rules.php:21
 msgid ""
 "There is a high percentage of slow queries compared to the server uptime."
-msgstr "サーバの稼働時間と比較して遅いクエリの比率が高いです。"
+msgstr "サーバの稼働時間と比較して長時間処理であるスロークエリの比率が高いです。"
#: po/advisory_rules.php:23
 #, php-format
 msgid ""
 "You have a slow query rate of %s per hour, you should have less than 1%% per "
 "hour."
-msgstr ""
-"現在の遅いクエリの割合は 1 時間当たり %s です。この値は、1 時間当たり 1%% 未"
-"満がいいと言われています。"
+msgstr "現在のスロークエリの割合は 1 時間当たり %s です。この値は、1 時間当たり 1%% 未満がいいと言われています。"
#: po/advisory_rules.php:25
 msgid "Long query time"
@@ -11943,9 +11932,7 @@ msgstr "長いクエリ時間"
 msgid ""
 "long_query_time is set to 10 seconds or more, thus only slow queries that "
 "take above 10 seconds are logged."
-msgstr ""
-"long_query_time は 10 秒以上に設定されています。従って、10 秒を超える遅いクエ"
-"リだけがログに記録されます。"
+msgstr "long_query_time は 10 秒以上に設定されています。従って、10 秒を超えるものがスロークエリとしてログに記録されます。"
#: po/advisory_rules.php:27
 msgid ""
@@ -11962,19 +11949,19 @@ msgstr "long_query_time は現在 %d 秒に設定されています。"
#: po/advisory_rules.php:30
 msgid "Slow query logging"
-msgstr "遅いクエリのログへの記録"
+msgstr "スロークエリログ"
#: po/advisory_rules.php:31
 msgid "The slow query log is disabled."
-msgstr "遅いクエリのログへの記録が無効になっています。"
+msgstr "スロークエリログが無効になっています。"
#: po/advisory_rules.php:32
 msgid ""
 "Enable slow query logging by setting {log_slow_queries} to 'ON'. This will "
 "help troubleshooting badly performing queries."
 msgstr ""
-"{log_slow_queries} を「ON」に設定することで、遅いクエリのログへの記録が有効に"
-"なります。これは、パフォーマンスの悪いクエリの切り分けに役立つでしょう。"
+"{log_slow_queries} "
+"を「ON」に設定することで、スロークエリログが有効になります。これは、パフォーマンスの悪いクエリの切り分けに役立つでしょう。"
#: po/advisory_rules.php:33
 msgid "log_slow_queries is set to 'OFF'"
@@ -12696,16 +12683,13 @@ msgid "Percentage of used open files limit"
 msgstr "開いているファイルの上限に対する比率"
#: po/advisory_rules.php:186
-#, fuzzy
 #| msgid ""
 #| "The number of open files is approaching the max number of open files.  "
 #| "You may get a \"Too many open files\" error."
 msgid ""
 "The number of open files is approaching the max number of open files.  You "
 "may get a "Too many open files" error."
-msgstr ""
-"開いているファイルの数が最大になりつつあります。エラー「開いているファイルが"
-"多すぎます」になるかもしれません。"
+msgstr "開いているファイルの数が最大になりつつあります。エラー「開いているファイルが多すぎます」になるかもしれません。"
#: po/advisory_rules.php:187 po/advisory_rules.php:192
 msgid ""
diff --git a/po/ru.po b/po/ru.po
index 4431178..2e1bd76 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-12-14 18:08+0100\n"
-"PO-Revision-Date: 2011-12-14 19:06+0200\n"
+"PO-Revision-Date: 2011-12-14 19:08+0200\n"
 "Last-Translator: Victor Volkov hanut@php-myadmin.ru\n"
 "Language-Team: russian ru@li.org\n"
 "Language: ru\n"
@@ -1590,16 +1590,14 @@ msgid "Time"
 msgstr "Время"
#: js/messages.php:188
-#, fuzzy
 #| msgid "Total:"
 msgid "Total time:"
-msgstr "Всего:"
+msgstr "Полное время:"
#: js/messages.php:189
-#, fuzzy
 #| msgid "Profiling"
 msgid "Profiling results"
-msgstr "Профилирование"
+msgstr "Профилирование результатов"
#: js/messages.php:190
 #, fuzzy
@@ -1609,10 +1607,9 @@ msgid "Table"
 msgstr "Таблица"
#: js/messages.php:191
-#, fuzzy
 #| msgid "Charset"
 msgid "Chart"
-msgstr "Кодировка"
+msgstr "График"
#. l10n: A collection of available filters
 #: js/messages.php:194
@@ -2308,7 +2305,7 @@ msgstr "в час"
#: libraries/Advisor.class.php:335
 msgid "per day"
-msgstr ""
+msgstr "на день"
#: libraries/Config.class.php:703
 msgid "Remove "./config" directory before using phpMyAdmin!"
@@ -8705,10 +8702,9 @@ msgid "Toggle small/big"
 msgstr "Обратное отображение"
#: pmd_general.php:99
-#, fuzzy
 #| msgid "To select relation, click :"
 msgid "Toggle relation lines"
-msgstr "Для выбора связи нажмите на точке соединения:"
+msgstr "Переключение линий связи"
#: pmd_general.php:104 pmd_pdf.php:76
 msgid "Import/Export coordinates for PDF schema"
hooks/post-receive
-- 
phpMyAdmin


    