[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11888-g8a7b1ca - Git

25 Jul 2011

The branch, master has been updated
       via  8a7b1caa0d437872f94611fe80242b544403d1c4 (commit)
       via  c220188be90250d9b42daf0047d5f62e0e3ba765 (commit)
       via  6c88d2b5b3f04d6be7917a08a9a204cef668ad85 (commit)
       via  f4ebc3c645763dbb788419d0cedaaff4e2c2b2f0 (commit)
       via  0f49e0add9b26605b75b1b6305c549f150da9ef0 (commit)
       via  38c4ebc12913447c63ad6f1fba570cef8d23d35d (commit)
       via  1c3a9273018b81c08aa9caa73571275622d90ddc (commit)
       via  afa6453775628b1cc93fb0951c2baf3210d64b25 (commit)
       via  dfc54dee5cfe3c35f872ef56b341af22b98b0d48 (commit)
       via  a02b041884d82deb7153fe45809ab316c93abfb8 (commit)
       via  5a64ad4d99b162df9f61de2b5f75bfb3a15fa851 (commit)
       via  f56b34a57a02848e8c7d5202f72e3e2cc98dc71c (commit)
       via  6148254288992981d36863c675e170573d29ae23 (commit)
       via  f17bf24ce0ed4ae4bd585c3ea255539e33489eb3 (commit)
       via  529ab15ef387193aca0fbd8cf50ed8edb42de0e2 (commit)
       via  1f3ba34a086f75f99d50bf891e4841fa4f092a93 (commit)
       via  b36193e94ca9c66aac5c476cfceefe0bdb2cafd9 (commit)
       via  78b971999f7d253b0ca9fd0c9480b25b6bab1455 (commit)
       via  41ba19fb0a7b32db9b775451fea86d138e22bfaa (commit)
       via  ef7743efd25db04590f6efbfe400d614cd0a1ab1 (commit)
       via  87cb78743e1117c44388d623e68d453b32aad266 (commit)
       via  dd662a1413433d0a1bc9013da1af6558ab4009f9 (commit)
       via  473408e770fbfd1a45333f34aceb23167ffb4685 (commit)
       via  09060a354940768620a70cfe4ec5a76c0e9616a9 (commit)
       via  37f66401371d7ac9a095867715c97d04fa962663 (commit)
       via  f01249d9ba37137fea2eda83e3553c6af6ca1705 (commit)
       via  3a3fc4a17c72b9a2fe7ef9bbb0d6332bed8afc0c (commit)
       via  7f6661d732994025b4f75de43858d4b4ba277ecb (commit)
       via  0260eb6230cecb3059040a783833edd8d56f8703 (commit)
       via  b22162642c97604fe9f1681c47505dc5cb4f271f (commit)
       via  27c290717795d392f0700202deac4fca3463ca29 (commit)
       via  5cfc97cc9b5672662b50b8c672a7aa4422e9e281 (commit)
       via  ef8a6e659cfcedf5facf8438e3b78ea5c6fa2698 (commit)
       via  72e64c35221f9357a275a5002562bba17cd6d800 (commit)
       via  ad8481f667f9c51fa5819392e1f1120a8765f412 (commit)
       via  aeec4c100035fee2af07829dc70802df11128a1e (commit)
       via  f2f60faeda11fbd918457482294c57ef445ca096 (commit)
       via  eb981cc245505d5e1edda0ea30bb3305059800be (commit)
       via  2f1cd196882802a88610279f2fce9a8bb417f84e (commit)
       via  ffdb9529c353e5bb7ae3700da6d49cbdd5baad8c (commit)
       via  86aeca005909cb8049be5c9a427f300789fc6df2 (commit)
       via  c79bf67e0678cb9bc8e9e8976e456c4b9f09b458 (commit)
       via  1863618fe3cd75f9658c6c646e70b236f0bbdb0a (commit)
       via  fe8df8a0256dd721763dc8fb92e2a37266b6bc9b (commit)
       via  45760aeec9953661a4df745505868402c167a749 (commit)
       via  7cd2a2fb6df75c4960f45930d54af0ee9fd9f9d5 (commit)
       via  764adfb4f375183339e350fd06fa55f9af035916 (commit)
       via  17fd5467574180e7dcd00fdc20c8aa28137eba76 (commit)
       via  7790ed664af95b5b853a350f839a51af45e517c6 (commit)
       via  700dd273aa848e7b8a8841d67629e98e3baa489d (commit)
       via  90fdb587e4d2d201d9b72dc2106285b3f9385f48 (commit)
       via  bbd8b11968e535e6738fe7d7ae7aa7aadb6d3957 (commit)
       via  c7378dde60587cde736fa605efcaa7389c9da4a7 (commit)
       via  3116edbfb2d4cc81a5ca3ff6b2c687f45c1261b4 (commit)
       via  7a84b1bbcd471d18bdca696f8d5e9136e9fc2615 (commit)
       via  3dfd6b0b1b0b1e63a850b4ded04fd4021ed269cb (commit)
       via  00150477f7c0992e6a3f1928a86407ca474bc8cc (commit)
       via  e6b073a92a3fe2013676bce73db90d62c37cd3ed (commit)
       via  4684dc7b13ca9ae1cca9e37a31ff8ed53ac04652 (commit)
       via  4e24e226b3f6c706bc7486dbb105e7e51d2a4ebd (commit)
       via  6af495af1827c3eb1c9910200b5d688a87c1785f (commit)
       via  8869d5de05fe89b121c968ea780064c7634dcc1b (commit)
       via  0062f3e5a409356248afbf7b5609c1cd6d50ec9d (commit)
       via  6f698116983a905201ab857c778f6e718cd29994 (commit)
       via  49029ac2f5349cb872e8c035cf8fd78683b6f21c (commit)
      from  73ee8639e3283d4fc1458345c404885b93a1d52e (commit)
- Log -----------------------------------------------------------------
commit 8a7b1caa0d437872f94611fe80242b544403d1c4
Merge: 73ee8639e3283d4fc1458345c404885b93a1d52e c220188be90250d9b42daf0047d5f62e0e3ba765
Author: Michal Čihař michal@cihar.com
Date:   Mon Jul 25 08:26:29 2011 +0200
Merge remote-tracking branch 'pootle/master'
Conflicts:
    	po/de.po
    	po/en_GB.po
    	po/hi.po
commit c220188be90250d9b42daf0047d5f62e0e3ba765
Author: email email@cs-ware.de
Date:   Sun Jul 24 21:55:46 2011 +0200
Translation update done using Pootle.
commit 6c88d2b5b3f04d6be7917a08a9a204cef668ad85
Author: email email@cs-ware.de
Date:   Sun Jul 24 21:54:00 2011 +0200
Translation update done using Pootle.
commit f4ebc3c645763dbb788419d0cedaaff4e2c2b2f0
Author: email email@cs-ware.de
Date:   Sun Jul 24 21:52:04 2011 +0200
Translation update done using Pootle.
commit 0f49e0add9b26605b75b1b6305c549f150da9ef0
Author: email email@cs-ware.de
Date:   Sun Jul 24 21:50:07 2011 +0200
Translation update done using Pootle.
commit 38c4ebc12913447c63ad6f1fba570cef8d23d35d
Author: email email@cs-ware.de
Date:   Sun Jul 24 21:49:21 2011 +0200
Translation update done using Pootle.
commit 1c3a9273018b81c08aa9caa73571275622d90ddc
Author: email email@cs-ware.de
Date:   Sun Jul 24 21:49:03 2011 +0200
Translation update done using Pootle.
commit afa6453775628b1cc93fb0951c2baf3210d64b25
Author: email email@cs-ware.de
Date:   Sun Jul 24 21:48:28 2011 +0200
Translation update done using Pootle.
commit dfc54dee5cfe3c35f872ef56b341af22b98b0d48
Author: email email@cs-ware.de
Date:   Sun Jul 24 21:48:13 2011 +0200
Translation update done using Pootle.
commit a02b041884d82deb7153fe45809ab316c93abfb8
Author: email email@cs-ware.de
Date:   Sun Jul 24 21:47:59 2011 +0200
Translation update done using Pootle.
commit 5a64ad4d99b162df9f61de2b5f75bfb3a15fa851
Author: email email@cs-ware.de
Date:   Sun Jul 24 21:47:32 2011 +0200
Translation update done using Pootle.
commit f56b34a57a02848e8c7d5202f72e3e2cc98dc71c
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:54:22 2011 +0200
Translation update done using Pootle.
commit 6148254288992981d36863c675e170573d29ae23
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:46:18 2011 +0200
Translation update done using Pootle.
commit f17bf24ce0ed4ae4bd585c3ea255539e33489eb3
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:46:11 2011 +0200
Translation update done using Pootle.
commit 529ab15ef387193aca0fbd8cf50ed8edb42de0e2
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:46:03 2011 +0200
Translation update done using Pootle.
commit 1f3ba34a086f75f99d50bf891e4841fa4f092a93
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:45:54 2011 +0200
Translation update done using Pootle.
commit b36193e94ca9c66aac5c476cfceefe0bdb2cafd9
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:45:46 2011 +0200
Translation update done using Pootle.
commit 78b971999f7d253b0ca9fd0c9480b25b6bab1455
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:45:39 2011 +0200
Translation update done using Pootle.
commit 41ba19fb0a7b32db9b775451fea86d138e22bfaa
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:45:33 2011 +0200
Translation update done using Pootle.
commit ef7743efd25db04590f6efbfe400d614cd0a1ab1
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:45:27 2011 +0200
Translation update done using Pootle.
commit 87cb78743e1117c44388d623e68d453b32aad266
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:45:19 2011 +0200
Translation update done using Pootle.
commit dd662a1413433d0a1bc9013da1af6558ab4009f9
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:45:12 2011 +0200
Translation update done using Pootle.
commit 473408e770fbfd1a45333f34aceb23167ffb4685
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:45:02 2011 +0200
Translation update done using Pootle.
commit 09060a354940768620a70cfe4ec5a76c0e9616a9
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:44:53 2011 +0200
Translation update done using Pootle.
commit 37f66401371d7ac9a095867715c97d04fa962663
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:44:46 2011 +0200
Translation update done using Pootle.
commit f01249d9ba37137fea2eda83e3553c6af6ca1705
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:44:37 2011 +0200
Translation update done using Pootle.
commit 3a3fc4a17c72b9a2fe7ef9bbb0d6332bed8afc0c
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:44:30 2011 +0200
Translation update done using Pootle.
commit 7f6661d732994025b4f75de43858d4b4ba277ecb
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:44:17 2011 +0200
Translation update done using Pootle.
commit 0260eb6230cecb3059040a783833edd8d56f8703
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:44:03 2011 +0200
Translation update done using Pootle.
commit b22162642c97604fe9f1681c47505dc5cb4f271f
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:43:53 2011 +0200
Translation update done using Pootle.
commit 27c290717795d392f0700202deac4fca3463ca29
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:43:06 2011 +0200
Translation update done using Pootle.
commit 5cfc97cc9b5672662b50b8c672a7aa4422e9e281
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:42:55 2011 +0200
Translation update done using Pootle.
commit ef8a6e659cfcedf5facf8438e3b78ea5c6fa2698
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:39:50 2011 +0200
Translation update done using Pootle.
commit 72e64c35221f9357a275a5002562bba17cd6d800
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:39:42 2011 +0200
Translation update done using Pootle.
commit ad8481f667f9c51fa5819392e1f1120a8765f412
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:39:35 2011 +0200
Translation update done using Pootle.
commit aeec4c100035fee2af07829dc70802df11128a1e
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:39:10 2011 +0200
Translation update done using Pootle.
commit f2f60faeda11fbd918457482294c57ef445ca096
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:39:04 2011 +0200
Translation update done using Pootle.
commit eb981cc245505d5e1edda0ea30bb3305059800be
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:38:58 2011 +0200
Translation update done using Pootle.
commit 2f1cd196882802a88610279f2fce9a8bb417f84e
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:38:51 2011 +0200
Translation update done using Pootle.
commit ffdb9529c353e5bb7ae3700da6d49cbdd5baad8c
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:38:44 2011 +0200
Translation update done using Pootle.
commit 86aeca005909cb8049be5c9a427f300789fc6df2
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:38:36 2011 +0200
Translation update done using Pootle.
commit c79bf67e0678cb9bc8e9e8976e456c4b9f09b458
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:38:28 2011 +0200
Translation update done using Pootle.
commit 1863618fe3cd75f9658c6c646e70b236f0bbdb0a
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:38:19 2011 +0200
Translation update done using Pootle.
commit fe8df8a0256dd721763dc8fb92e2a37266b6bc9b
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:38:14 2011 +0200
Translation update done using Pootle.
commit 45760aeec9953661a4df745505868402c167a749
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:38:07 2011 +0200
Translation update done using Pootle.
commit 7cd2a2fb6df75c4960f45930d54af0ee9fd9f9d5
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:38:00 2011 +0200
Translation update done using Pootle.
commit 764adfb4f375183339e350fd06fa55f9af035916
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:37:51 2011 +0200
Translation update done using Pootle.
commit 17fd5467574180e7dcd00fdc20c8aa28137eba76
Author: Marc Delisle marc@infomarc.info
Date:   Sun Jul 24 20:37:41 2011 +0200
Translation update done using Pootle.
commit 7790ed664af95b5b853a350f839a51af45e517c6
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 19:04:16 2011 +0200
Translation update done using Pootle.
commit 700dd273aa848e7b8a8841d67629e98e3baa489d
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 19:03:26 2011 +0200
Translation update done using Pootle.
commit 90fdb587e4d2d201d9b72dc2106285b3f9385f48
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 19:02:01 2011 +0200
Translation update done using Pootle.
commit bbd8b11968e535e6738fe7d7ae7aa7aadb6d3957
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 19:01:02 2011 +0200
Translation update done using Pootle.
commit c7378dde60587cde736fa605efcaa7389c9da4a7
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 19:00:22 2011 +0200
Translation update done using Pootle.
commit 3116edbfb2d4cc81a5ca3ff6b2c687f45c1261b4
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 19:00:06 2011 +0200
Translation update done using Pootle.
commit 7a84b1bbcd471d18bdca696f8d5e9136e9fc2615
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 18:59:38 2011 +0200
Translation update done using Pootle.
commit 3dfd6b0b1b0b1e63a850b4ded04fd4021ed269cb
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 18:41:30 2011 +0200
Translation update done using Pootle.
commit 00150477f7c0992e6a3f1928a86407ca474bc8cc
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 18:41:09 2011 +0200
Translation update done using Pootle.
commit e6b073a92a3fe2013676bce73db90d62c37cd3ed
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 18:39:03 2011 +0200
Translation update done using Pootle.
commit 4684dc7b13ca9ae1cca9e37a31ff8ed53ac04652
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 18:38:39 2011 +0200
Translation update done using Pootle.
commit 4e24e226b3f6c706bc7486dbb105e7e51d2a4ebd
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 18:37:29 2011 +0200
Translation update done using Pootle.
commit 6af495af1827c3eb1c9910200b5d688a87c1785f
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 18:33:43 2011 +0200
Translation update done using Pootle.
commit 8869d5de05fe89b121c968ea780064c7634dcc1b
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 18:33:26 2011 +0200
Translation update done using Pootle.
commit 0062f3e5a409356248afbf7b5609c1cd6d50ec9d
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 18:32:37 2011 +0200
Translation update done using Pootle.
commit 6f698116983a905201ab857c778f6e718cd29994
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 18:32:17 2011 +0200
Translation update done using Pootle.
commit 49029ac2f5349cb872e8c035cf8fd78683b6f21c
Author: deadefy deadefy@nepalimail.com
Date:   Sun Jul 24 18:31:47 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 po/de.po    |   47 ++++++++++++++----------------
 po/en_GB.po |   90 +++++++++++++++++++++++++++++-----------------------------
 po/hi.po    |   27 ++++++++---------
 3 files changed, 80 insertions(+), 84 deletions(-)

diff --git a/po/de.po b/po/de.po
index 5158e97..9305f2d 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-07-24 14:43-0400\n"
-"PO-Revision-Date: 2011-07-21 15:15+0200\n"
-"Last-Translator:  mrbendig@mrbendig.com\n"
+"PO-Revision-Date: 2011-07-24 21:55+0200\n"
+"Last-Translator:  email@cs-ware.de\n"
 "Language-Team: german de@li.org\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1851,10 +1851,9 @@ msgstr "Schriftgröße"
#: libraries/File.class.php:220
 msgid "File was not an uploaded file."
-msgstr ""
+msgstr "Bei der Datei handelt es sich um keine hochgeladene Datei,"
#: libraries/File.class.php:259 libraries/File.class.php:388
-#, fuzzy
 #| msgid "Unknown error in file upload."
 msgid "Unknown error while uploading."
 msgstr "Unbekannter Fehler beim Dateihochladen."
@@ -1903,11 +1902,11 @@ msgstr ""
#: libraries/File.class.php:507
 msgid "Error while moving uploaded file."
-msgstr ""
+msgstr "Fehler beim Verschieben der hochgeladenen Datei."
#: libraries/File.class.php:515
 msgid "Cannot read (moved) upload file."
-msgstr ""
+msgstr "Die hochgeladene und verschobene Datei kann nicht gelesen werden."
#: libraries/Index.class.php:418 tbl_relation.php:526
 msgid "No index defined!"
@@ -2464,10 +2463,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s Tage, %s Stunden, %s Minuten und %s Sekunden"
#: libraries/common.lib.php:1870
-#, fuzzy
 #| msgid "Routine parameters"
 msgid "Missing parameter:"
-msgstr "Prozeduren-Parameter"
+msgstr "Fehlender Parameter."
#: libraries/common.lib.php:2176 libraries/common.lib.php:2179
 #: libraries/display_tbl.lib.php:299
@@ -10012,7 +10010,6 @@ msgid "Monitor Instructions"
 msgstr "Einführung zur Überwachung"
#: server_status.php:1337
-#, fuzzy
 #| msgid ""
 #| "The phpMyAdmin Monitor can assist you in optimizing the server "
 #| "configuration and track down time intensive\n"
@@ -10029,11 +10026,12 @@ msgid ""
 msgstr ""
 "Die phpMyAdmin-Überwachung kann Sie bei der Server-Konfiguration, und auch "
 "beim Aufspühren von zeitintensiven Abfragen unterstützen. Für das Letztere "
-"müssen Sie log_output auf 'TABLE' stellen, und entweder slow_query_log oder "
-"general_log aktivieren."
+"müssen Sie log_output auf 'TABLE' stellen und entweder slow_query_log oder "
+"general_log aktivieren. Beachten Sie aber, dass das Aktivieren der "
+"general_log viele Daten produzieren und die Serverauslastung um bis zu 15% "
+"erhöhen kann."
#: server_status.php:1346
-#, fuzzy
 #| msgid ""
 #| "<b>Using the monitor:</b><br/>\n"
 #| "        Ok, you are good to go! Once you click 'Start monitor' your "
@@ -10065,24 +10063,18 @@ msgid ""
 "statistics from the logs helping you find what caused the\n"
 "        activity spike.</p>"
 msgstr ""
-"<b>Verwendung der Überwachung</b><br />\n"
+"<b>Verwendung der Überwachung:</b><br />\n"
 "OK, Sie sind bereit zum Starten! Sobald Sie 'Überwachung starten' angeklickt "
-"haben, wird ihr Browser in regelmäßigen Intervallen alle angezeigten "
-"Schaubilder aktualisieren. Unter 'Einstellungen' können Sie Schaubilder "
-"hinzufügen und den Aktualisierungs-Intervall ändern, oder beliebige "
-"Schaubilder entfernen, wenn Sie das Zahnrad-Icon des entsprechenden "
-"Schaubilds verwenden.\n"
+"haben, wird Ihr Browser in regelmäßigen Intervallen alle angezeigten "
+"Diagramme aktualisieren. Unter 'Einstellungen' können Sie Diagramme "
+"hinzufügen und das Aktualisierungsintervall ändern oder beliebige Diagramme "
+"entfernen, wenn Sie das Zahnrad-Icon des entsprechenden Schaubilds "
+"verwenden.\n"
 "<p>Wenn Sie eine plötzliche Spitze in der Aktivität feststellen, wählen Sie "
-"den entsprechenden Zeitraum in einem beliebigen Schaubild, in dem Sie die\n"
+"den entsprechenden Zeitraum in einem beliebigen Diagramm, indem Sie die\n"
 "linke Maustaste gedrückt halten und über das Schaubild ziehen. Dies wird "
 "Statistiken aus den Protokollen laden um Sie bei der Auffindung der \n"
 "Aktivitätsspitze zu unterstützen.</p>\n"
-"<p><b>Bitte beachten Sie:</b>\n"
-"Das aktivieren des general_log kann die Serverlast um 5-15% steigern. Seien "
-"Sie es sich bewusst, dass das erzeigen von Statistiken aus den Logs ein \n"
-"sehr Lasten-Intensiver prozess ist. Deshalb ist es ratsam, nur einen kleinen "
-"Zeitraum auszuwählen.\n"
-"</p> "
#: server_status.php:1356
 msgid ""
@@ -10094,6 +10086,11 @@ msgid ""
 "not required any more.\n"
 "        "
 msgstr ""
+"<b>Bitte beachten Sie:</b>\n"
+"Das Aktivieren des general_log kann die Serverlast um 5-15% steigern. Seien "
+"Sie sich bewusst, dass das Erzeugen von Statistiken aus den Logs ein \n"
+"sehr aufwändiger Prozess ist. Deshalb ist es ratsam, nur einen kleinen "
+"Zeitraum auszuwählen.\n"
#: server_status.php:1369
 msgid "CPU Usage"
diff --git a/po/en_GB.po b/po/en_GB.po
index 4d037bf..2df19ed 100644
--- a/po/en_GB.po
+++ b/po/en_GB.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-07-24 14:43-0400\n"
-"PO-Revision-Date: 2011-07-16 14:33+0200\n"
+"PO-Revision-Date: 2011-07-24 20:54+0200\n"
 "Last-Translator: Marc Delisle marc@infomarc.info\n"
 "Language-Team: english-gb en_GB@li.org\n"
 "MIME-Version: 1.0\n"
@@ -1116,15 +1116,14 @@ msgstr "Connections / Processes"
#. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:87
-#, fuzzy
 #| msgid "Connections since last refresh"
 msgid "Questions since last refresh"
-msgstr "Connections since last refresh"
+msgstr "Questions since last refresh"
#. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:89
 msgid "Questions (executed statements by the server)"
-msgstr ""
+msgstr "Questions (executed statements by the server)"
#: js/messages.php:91 server_status.php:590
 msgid "Query statistics"
@@ -1132,15 +1131,15 @@ msgstr "Query statistics"
#: js/messages.php:94
 msgid "System CPU Usage"
-msgstr ""
+msgstr "System CPU Usage"
#: js/messages.php:95
 msgid "System memory"
-msgstr ""
+msgstr "System memory"
#: js/messages.php:96
 msgid "System swap"
-msgstr ""
+msgstr "System swap"
#: js/messages.php:97 libraries/common.lib.php:1270 server_status.php:1406
 msgid "MiB"
@@ -1152,14 +1151,13 @@ msgstr "KiB"
#: js/messages.php:100
 msgid "Average load"
-msgstr ""
+msgstr "Average load"
#. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:102
-#, fuzzy
 #| msgid "Suggestions:"
 msgid "Questions"
-msgstr "Suggestions:"
+msgstr "Questions"
#: js/messages.php:103 server_status.php:867
 msgid "Traffic"
@@ -1171,24 +1169,22 @@ msgid "Settings"
 msgstr "Settings"
#: js/messages.php:105
-#, fuzzy
 #| msgid "Remove database"
 msgid "Remove chart"
-msgstr "Remove database"
+msgstr "Remove chart"
#: js/messages.php:106
 msgid "Edit labels and series"
-msgstr ""
+msgstr "Edit labels and series"
#: js/messages.php:107
-#, fuzzy
 #| msgid "Snap to grid"
 msgid "Add chart to grid"
-msgstr "Snap to grid"
+msgstr "Add chart to grid"
#: js/messages.php:109
 msgid "Please add at least one variable to the series"
-msgstr ""
+msgstr "Please add at least one variable to the series"
#: js/messages.php:110 libraries/display_export.lib.php:306
 #: libraries/display_tbl.lib.php:561 libraries/export/sql.php:1052
@@ -1199,11 +1195,11 @@ msgstr "None"
#: js/messages.php:111
 msgid "Resume monitor"
-msgstr ""
+msgstr "Resume monitor"
#: js/messages.php:112
 msgid "Pause monitor"
-msgstr ""
+msgstr "Pause monitor"
#: js/messages.php:114
 msgid "general_log and slow_query_log are enabled."
@@ -1211,11 +1207,11 @@ msgstr ""
#: js/messages.php:115
 msgid "general_log is enabled."
-msgstr ""
+msgstr "general_log is enabled."
#: js/messages.php:116
 msgid "slow_query_log is enabled."
-msgstr ""
+msgstr "slow_query_log is enabled."
#: js/messages.php:117
 msgid "slow_query_log and general_log are disabled."
@@ -1223,11 +1219,11 @@ msgstr ""
#: js/messages.php:118
 msgid "log_output is not set to TABLE."
-msgstr ""
+msgstr "log_output is not set to TABLE."
#: js/messages.php:119
 msgid "log_output is set to TABLE."
-msgstr ""
+msgstr "log_output is set to TABLE."
#: js/messages.php:120
 #, php-format
@@ -1236,108 +1232,112 @@ msgid ""
 "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
 "depending on your system."
 msgstr ""
+"slow_query_log is enabled, but the server logs only queries that take longer "
+"than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
+"depending on your system."
#: js/messages.php:121
 #, php-format
 msgid "long_query_time is set to %d second(s)."
-msgstr ""
+msgstr "long_query_time is set to %d second(s)."
#: js/messages.php:122
 msgid ""
 "Following settings will be applied globally and reset to default on server "
 "restart:"
 msgstr ""
+"Following settings will be applied globally and reset to default on server "
+"restart:"
#. l10n: %s is FILE or TABLE
 #: js/messages.php:124
-#, fuzzy, php-format
+#, php-format
 #| msgid "Save output to a file"
 msgid "Set log_output to %s"
-msgstr "Save output to a file"
+msgstr "Set log_output to %s"
#. l10n: Enable in this context means setting a status variable to ON
 #: js/messages.php:126
-#, fuzzy, php-format
+#, php-format
 #| msgid "Enabled"
 msgid "Enable %s"
-msgstr "Enabled"
+msgstr "Enable %s"
#. l10n: Disable in this context means setting a status variable to OFF
 #: js/messages.php:128
-#, fuzzy, php-format
+#, php-format
 #| msgid "Disabled"
 msgid "Disable %s"
-msgstr "Disabled"
+msgstr "Disable %s"
#. l10n: %d seconds
 #: js/messages.php:130
 #, php-format
 msgid "Set long_query_time to %ds"
-msgstr ""
+msgstr "Set long_query_time to %ds"
#: js/messages.php:131
 msgid ""
 "You can't change these variables. Please log in as root or contact your "
 "database administrator."
 msgstr ""
+"You can't change these variables. Please log in as root or contact your "
+"database administrator."
#: js/messages.php:132
-#, fuzzy
 #| msgid "Manage your settings"
 msgid "Change settings"
-msgstr "Manage your settings"
+msgstr "Change settings"
#: js/messages.php:133
-#, fuzzy
 #| msgid "More settings"
 msgid "Current settings"
-msgstr "More settings"
+msgstr "Current settings"
#: js/messages.php:135 server_status.php:1366
-#, fuzzy
 #| msgid "Chart title"
 msgid "Chart Title"
-msgstr "Chart title"
+msgstr "Chart Title"
#. l10n: As in differential values
 #: js/messages.php:137
-#, fuzzy
 #| msgid "Difference"
 msgid "Differential"
-msgstr "Difference"
+msgstr "Differential"
#: js/messages.php:138
 #, php-format
 msgid "Divided by %s:"
-msgstr ""
+msgstr "Divided by %s:"
#: js/messages.php:140
-#, fuzzy
 #| msgid "Select page"
 msgid "Selected time range:"
-msgstr "Select page"
+msgstr "Selected time range:"
#: js/messages.php:141
 msgid "Group together INSERTs into same table"
-msgstr ""
+msgstr "Group together INSERTs into same table"
#: js/messages.php:142
 msgid ""
 "<p>Choose from which log you want the statistics to be generated from.</p> "
 "Results are grouped by query text."
 msgstr ""
+"<p>Choose from which log you want the statistics to be generated from.</p> "
+"Results are grouped by query text."
#: js/messages.php:143
 msgid "From slow log"
-msgstr ""
+msgstr "From slow log"
#: js/messages.php:144
 msgid "From general log"
-msgstr ""
+msgstr "From general log"
#: js/messages.php:145
 msgid "Analysing & loading logs. This may take a while."
-msgstr ""
+msgstr "Analysing & loading logs. This may take a while."
#: js/messages.php:146
 msgid ""
diff --git a/po/hi.po b/po/hi.po
index 57f8f39..bacaddf 100644
--- a/po/hi.po
+++ b/po/hi.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-07-24 14:43-0400\n"
-"PO-Revision-Date: 2011-07-18 18:20+0200\n"
+"PO-Revision-Date: 2011-07-24 19:04+0200\n"
 "Last-Translator:  deadefy@nepalimail.com\n"
 "Language-Team: hindi hi@li.org\n"
 "MIME-Version: 1.0\n"
@@ -35,15 +35,16 @@ msgid ""
 "parent window, or your browser's security settings are configured to block "
 "cross-window updates."
 msgstr ""
-"लक्ष्य ब्राउज़र विंडो को अद्यतन नहीं किया जा सकता है. शायद आपने मूल विंडो बंद कर दिया है,"
-"या अपनी ब्राउसर की सिक्यूरिटी सेट्टिंग को क्रोस-विंडो अद्यतन के लिए कांफिगुर कर रखा है."
+"लक्ष्य ब्राउज़र विंडो को अद्यतन नहीं किया जा सकता है. शायद आपने मूल विंडो "
+"बंद कर दिया है,या अपनी ब्राउसर की सिक्यूरिटी सेट्टिंग को क्रोस-विंडो अद्यतन "
+"के लिए कांफिगुर कर रखा है."
#: browse_foreigners.php:151 libraries/common.lib.php:2714
 #: libraries/common.lib.php:2721 libraries/common.lib.php:2904
 #: libraries/common.lib.php:2905 libraries/db_links.inc.php:60
 #: libraries/tbl_links.inc.php:68
 msgid "Search"
-msgstr "खोजें"
+msgstr "ढूंढें"
#: browse_foreigners.php:154 db_operations.php:369 db_operations.php:409
 #: db_operations.php:517 db_operations.php:544 db_search.php:335
@@ -79,7 +80,7 @@ msgstr "खोजें"
 #: tbl_structure.php:735 tbl_tracking.php:425 tbl_tracking.php:563
 #: view_create.php:181 view_operations.php:99
 msgid "Go"
-msgstr "आगे"
+msgstr "जाएँ"
#: browse_foreigners.php:169 browse_foreigners.php:173
 #: libraries/Index.class.php:432 tbl_tracking.php:313
@@ -116,8 +117,8 @@ msgid ""
 "The %s file is not available on this system, please visit www.phpmyadmin.net "
 "for more information."
 msgstr ""
-"ये %s फ़ाइल तंत्र में उपलब्ध नहीं है, कृपया अधिक जानकारी के लिए www.phpmyadmin.net "
-"वेबसाईट पर जाएँ "
+"ये %s फ़ाइल तंत्र में उपलब्ध नहीं है, कृपया अधिक जानकारी के लिए "
+"www.phpmyadmin.net वेबसाईट पर जाएँ "
#: db_create.php:58
 #, php-format
@@ -143,7 +144,7 @@ msgstr " टेबल टिप्पणि:"
 #: tbl_indexes.php:196 tbl_printview.php:139 tbl_relation.php:399
 #: tbl_select.php:113 tbl_tracking.php:266 tbl_tracking.php:317
 msgid "Column"
-msgstr "कोलम"
+msgstr "स्तम्भ"
#: db_datadict.php:167 db_printview.php:104 libraries/Index.class.php:433
 #: libraries/db_structure.lib.php:46 libraries/export/htmlword.php:252
@@ -158,9 +159,8 @@ msgstr "कोलम"
 #: tbl_change.php:292 tbl_change.php:319 tbl_printview.php:140
 #: tbl_printview.php:310 tbl_select.php:114 tbl_structure.php:205
 #: tbl_structure.php:792 tbl_tracking.php:267 tbl_tracking.php:314
-#, fuzzy
 msgid "Type"
-msgstr "टाइप"
+msgstr "प्रकार/किस्म"
#: db_datadict.php:169 libraries/Index.class.php:439
 #: libraries/export/htmlword.php:253 libraries/export/latex.php:361
@@ -170,9 +170,8 @@ msgstr "टाइप"
 #: libraries/tbl_properties.inc.php:112 tbl_change.php:328
 #: tbl_printview.php:142 tbl_structure.php:208 tbl_tracking.php:269
 #: tbl_tracking.php:320
-#, fuzzy
 msgid "Null"
-msgstr "अशक्त"
+msgstr "शून्य"
#: db_datadict.php:170 db_structure.php:454 libraries/export/htmlword.php:254
 #: libraries/export/latex.php:361 libraries/export/odt.php:297
@@ -274,11 +273,11 @@ msgstr " डेटाबेस  %s का नाम बदल कर %s रख
 #: db_operations.php:276
 #, php-format
 msgid "Database %s has been copied to %s"
-msgstr " डेटाबेस %s से %s में कॉपी किया गया है"
+msgstr " डेटाबेस %s से %s में  नकल किया गया है"
#: db_operations.php:403
 msgid "Rename database to"
-msgstr "डेटाबेस का नाम बदल कर ____ रखें"
+msgstr "डेटाबेस का नाम इसमें पुनर्नामकरण करें"
#: db_operations.php:427
 msgid "Remove database"
hooks/post-receive
-- 
phpMyAdmin


    