[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15037-g2704835
Michal Čihař
nijel at users.sourceforge.net
Mon Aug 15 22:49:14 CEST 2011
The branch, master has been updated
via 2704835c4aea9abae0fb8836f98cce7809927b1d (commit)
via c68ea6c71a2e4b52fd8c0f4c55b2476188419980 (commit)
via 51fe1fa9510d4fae206a64bc42b42008306fc7a1 (commit)
via b405a4ef73e30a111894d1356dbbda455fc5e53d (commit)
via caff9c0c30f37b22b8ce777041bf612c10bfb9b8 (commit)
via c3e15641a0f6cf5b6aa9a59975d27fd97193ebf5 (commit)
via 0ff31b439ef689cb16c77457aaa6d5df38ee7685 (commit)
via 5817269b4ef598ad69f8981c03ec6674a9d68c5d (commit)
via a1cfb5422035dc66311ce55e07f0caad936180d0 (commit)
via 6a8e166762fd48e7cee36b456e2c7e57431c404c (commit)
via 6b40383f8dc4a218b8191e7242e1b0612ba1735d (commit)
from 35401e093c9613b9d1afe85f2acd28140acf1031 (commit)
- Log -----------------------------------------------------------------
commit 2704835c4aea9abae0fb8836f98cce7809927b1d
Merge: c68ea6c 51fe1fa
Author: Michal Čihař <michal at cihar.com>
Date: Mon Aug 15 22:48:53 2011 +0200
Merge remote-tracking branch 'pootle/master'
commit c68ea6c71a2e4b52fd8c0f4c55b2476188419980
Author: Michal Čihař <michal at cihar.com>
Date: Mon Aug 15 22:48:43 2011 +0200
Cleanup
commit 51fe1fa9510d4fae206a64bc42b42008306fc7a1
Merge: b405a4e 35401e0
Author: Pootle server <pootle at cihar.com>
Date: Mon Aug 15 18:40:16 2011 +0200
Merge remote-tracking branch 'origin/master'
commit b405a4ef73e30a111894d1356dbbda455fc5e53d
Merge: caff9c0 7546350
Author: Pootle server <pootle at cihar.com>
Date: Mon Aug 15 14:40:09 2011 +0200
Merge remote-tracking branch 'origin/master'
commit caff9c0c30f37b22b8ce777041bf612c10bfb9b8
Merge: c3e1564 e19d93a
Author: Pootle server <pootle at cihar.com>
Date: Mon Aug 15 12:40:23 2011 +0200
Merge remote-tracking branch 'origin/master'
commit c3e15641a0f6cf5b6aa9a59975d27fd97193ebf5
Merge: 0ff31b4 099be90
Author: Pootle server <pootle at cihar.com>
Date: Mon Aug 15 10:40:16 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 0ff31b439ef689cb16c77457aaa6d5df38ee7685
Merge: 5817269 2f04095
Author: Pootle server <pootle at cihar.com>
Date: Mon Aug 15 10:11:54 2011 +0200
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
po/cs.po
commit 5817269b4ef598ad69f8981c03ec6674a9d68c5d
Author: Michal Čihař <michal at cihar.com>
Date: Mon Aug 15 09:53:33 2011 +0200
Translation update done using Pootle.
commit a1cfb5422035dc66311ce55e07f0caad936180d0
Author: Michal Čihař <michal at cihar.com>
Date: Mon Aug 15 09:53:23 2011 +0200
Translation update done using Pootle.
commit 6a8e166762fd48e7cee36b456e2c7e57431c404c
Author: Michal Čihař <michal at cihar.com>
Date: Mon Aug 15 09:53:16 2011 +0200
Translation update done using Pootle.
commit 6b40383f8dc4a218b8191e7242e1b0612ba1735d
Author: Michal Čihař <michal at cihar.com>
Date: Mon Aug 15 09:50:00 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/cs.po | 14 +++++---------
po/de.po | 12 ------------
po/es.po | 12 ------------
po/zh_CN.po | 12 ------------
4 files changed, 5 insertions(+), 45 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index 001bedb..354fabe 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-08-15 10:09+0200\n"
+"POT-Creation-Date: 2011-08-15 09:43+0200\n"
"PO-Revision-Date: 2011-08-11 11:38+0200\n"
"Last-Translator: Michal Čihař <michal at cihar.com>\n"
"Language-Team: czech <cs at li.org>\n"
@@ -1127,10 +1127,9 @@ msgid "Query statistics"
msgstr "Statistika dotazů"
#: js/messages.php:93
-#, fuzzy
#| msgid "Failed to read configuration file"
msgid "Local monitor configuration icompatible"
-msgstr "Nepodařilo se načíst konfigurační soubor"
+msgstr "Lokální nastavení monitoru není kompatibilní"
#: js/messages.php:94
msgid ""
@@ -1141,22 +1140,19 @@ msgid ""
msgstr ""
#: js/messages.php:96
-#, fuzzy
#| msgid "Query cache"
msgid "Query cache efficiency"
-msgstr "Vyrovnávací paměť dotazů"
+msgstr "Úspěšnost vyrovnávací paměti dotazů"
#: js/messages.php:97 po/advisory_rules.php:70
-#, fuzzy
#| msgid "Query cache"
msgid "Query cache usage"
-msgstr "Vyrovnávací paměť dotazů"
+msgstr "Využití vyrovnávací paměti dotazů"
#: js/messages.php:98
-#, fuzzy
#| msgid "Query cache"
msgid "Query cache used"
-msgstr "Vyrovnávací paměť dotazů"
+msgstr "Využito vyrovnávací paměti dotazů"
#: js/messages.php:100
msgid "System CPU Usage"
diff --git a/po/de.po b/po/de.po
index 822ed74..b1bd558 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12907,18 +12907,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid ""
-#~| "The Advisor system can provide recommendations on server variables by "
-#~| "analyzing the server status variables. \n"
-#~| " Do note however that this system provides recommendations based "
-#~| "on fairly simple calculations and by rule of thumb and \n"
-#~| " may not necessarily work for your system.\n"
-#~| " Prior to changing any of the configuration, be sure to know what "
-#~| "you are changing and how to undo the change. Wrong tuning\n"
-#~| " can have a very negative effect on performance.\n"
-#~| " The best way to tune the system would be to change only one "
-#~| "setting at a time, observe or benchmark your database, and \n"
-#~| " undo the change if there was no clearly measurable improvement."
#~ msgid ""
#~ "The Advisor system can provide recommendations on server variables by "
#~ "analyzing the server status variables. <p>Do note however that this "
diff --git a/po/es.po b/po/es.po
index 8f2c69f..ad03d35 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12959,18 +12959,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid ""
-#~| "The Advisor system can provide recommendations on server variables by "
-#~| "analyzing the server status variables.\n"
-#~| " Do note however that this system provides recommendations based "
-#~| "on fairly simple calculations and by rule of thumb and\n"
-#~| " may not necessarily work for your system.\n"
-#~| " Prior to changing any of the configuration, be sure to know what "
-#~| "you are changing and how to undo the change. Wrong tuning\n"
-#~| " can have a very negative effect on performance.\n"
-#~| " The best way to tune the system would be to change only one "
-#~| "setting at a time, observe or benchmark your database, and\n"
-#~| " undo the change if there was no clearly measurable improvement."
#~ msgid ""
#~ "The Advisor system can provide recommendations on server variables by "
#~ "analyzing the server status variables. <p>Do note however that this "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d8ee9f6..4902bd6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12325,18 +12325,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid ""
-#~| "The Advisor system can provide recommendations on server variables by "
-#~| "analyzing the server status variables.\n"
-#~| " Do note however that this system provides recommendations based "
-#~| "on fairly simple calculations and by rule of thumb and\n"
-#~| " may not necessarily work for your system.\n"
-#~| " Prior to changing any of the configuration, be sure to know what "
-#~| "you are changing and how to undo the change. Wrong tuning\n"
-#~| " can have a very negative effect on performance.\n"
-#~| " The best way to tune the system would be to change only one "
-#~| "setting at a time, observe or benchmark your database, and\n"
-#~| " undo the change if there was no clearly measurable improvement."
#~ msgid ""
#~ "The Advisor system can provide recommendations on server variables by "
#~ "analyzing the server status variables. <p>Do note however that this "
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list