The branch, master has been updated
via 04d64c3bfe6b086063f165e8625cf9675d5b924b (commit)
via f048865abaeee728d159d0130cfc5240b00358e2 (commit)
via 12b6fc11ed702d715a0521a4f90b7e7b99e9b232 (commit)
via c4632a11fc813f17e30906c5a1bc57dc92130ddd (commit)
via 6740d3b25006380c469f0c045cc4b23eb85d22b5 (commit)
via fd76dd3f399a00c3bb28738e9a0760b904d0ba91 (commit)
via 0f3d3efc0eac122162a17bc5ed841853a4eeb1d7 (commit)
via 9b482a2885a380bdc7f789e5481b6e6badbc10a3 (commit)
via 56e7d3748627c70fdd1bbd136e1c4ce212af66e0 (commit)
via 7e588fb83f6a454981bd18274da05b65b57d712e (commit)
via 447114f11f62d42c4ce221f5d64e0438bb029152 (commit)
via 1bf62cb592cdef0c8e53100f3815c20c7d60eeab (commit)
via 7ab053e9c68301949a9e5ee80a67fe3da85e8b16 (commit)
via 1dd2a6c1f608705aebb2a75cb77c06844a69a7be (commit)
via 3737aa11c8d9b961b73e64c75d11a23bf342dd5c (commit)
via 9d6ebb5f4f4671b630f14c7f3c03d91e165570f3 (commit)
via caf226313bd96038f8e3d6f2d8da0dcdf0235e89 (commit)
via 1c002af0c11e239610902fa1cfd43cf9aee90bc4 (commit)
via a8025cacd07d7e1fda3cdf79f731fcb4d78926b3 (commit)
via cb22bdbe44fce0cb9b69d8b4d3a9f6198c3f9171 (commit)
via 7597017876db84cacc4401ee504028105a46e069 (commit)
via 2cccb70e11a1a17cfe7d2708d930506d75833ac1 (commit)
via 8ca978a6b9fb6aa96428d5f1ad2485b2e871e3da (commit)
via 774d312bcc8a58f47769dac357187d55f05dcdaa (commit)
via ffa1fcc77f4764012a80e431b4aea08135c8afba (commit)
via d025833063e4920b51e6597e5ca1a61e60ec649c (commit)
via 5983e97e0c4be0e97ff165b8822be04dda1c502c (commit)
via 3d90e8373135df757a388fb99477f47604597895 (commit)
via 441ec6b3f32b4eed5d5f4ad8189823e5cc1f814d (commit)
via c6a890b2f17a69f1a5cee30c96051584105de855 (commit)
via d91ada14ce434e9f26c46af608497fb1fc91d3af (commit)
via 917a97a757eec10fe6daa34ac8110d548dddb82c (commit)
via 4ecfdbd95e9f3a604eb57fb5922d47a93df5a7cf (commit)
from c19200e4e279981d2c14af9991564e6501b50c78 (commit)
- Log -----------------------------------------------------------------
commit 04d64c3bfe6b086063f165e8625cf9675d5b924b
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Dec 31 12:53:50 2010 +0100
Czech translation update.
commit f048865abaeee728d159d0130cfc5240b00358e2
Merge: c19200e4e279981d2c14af9991564e6501b50c78 12b6fc11ed702d715a0521a4f90b7e7b99e9b232
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Dec 31 12:52:00 2010 +0100
Merge remote branch 'pootle/master'
commit 12b6fc11ed702d715a0521a4f90b7e7b99e9b232
Merge: c4632a11fc813f17e30906c5a1bc57dc92130ddd ecdbb6dcc73aa97fc4df90d92e0ff4b4530f69e9
Author: Pootle server <pootle(a)cihar.com>
Date: Thu Dec 30 14:40:24 2010 +0100
Merge remote branch 'origin/master'
commit c4632a11fc813f17e30906c5a1bc57dc92130ddd
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 05:04:16 2010 +0200
Translation update done using Pootle.
commit 6740d3b25006380c469f0c045cc4b23eb85d22b5
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 05:02:19 2010 +0200
Translation update done using Pootle.
commit fd76dd3f399a00c3bb28738e9a0760b904d0ba91
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 04:56:05 2010 +0200
Translation update done using Pootle.
commit 0f3d3efc0eac122162a17bc5ed841853a4eeb1d7
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 04:55:33 2010 +0200
Translation update done using Pootle.
commit 9b482a2885a380bdc7f789e5481b6e6badbc10a3
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 04:55:13 2010 +0200
Translation update done using Pootle.
commit 56e7d3748627c70fdd1bbd136e1c4ce212af66e0
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 04:54:55 2010 +0200
Translation update done using Pootle.
commit 7e588fb83f6a454981bd18274da05b65b57d712e
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 04:54:34 2010 +0200
Translation update done using Pootle.
commit 447114f11f62d42c4ce221f5d64e0438bb029152
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 04:53:32 2010 +0200
Translation update done using Pootle.
commit 1bf62cb592cdef0c8e53100f3815c20c7d60eeab
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 04:53:11 2010 +0200
Translation update done using Pootle.
commit 7ab053e9c68301949a9e5ee80a67fe3da85e8b16
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 04:49:46 2010 +0200
Translation update done using Pootle.
commit 1dd2a6c1f608705aebb2a75cb77c06844a69a7be
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 04:48:03 2010 +0200
Translation update done using Pootle.
commit 3737aa11c8d9b961b73e64c75d11a23bf342dd5c
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 04:47:04 2010 +0200
Translation update done using Pootle.
commit 9d6ebb5f4f4671b630f14c7f3c03d91e165570f3
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 04:46:54 2010 +0200
Translation update done using Pootle.
commit caf226313bd96038f8e3d6f2d8da0dcdf0235e89
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 04:46:28 2010 +0200
Translation update done using Pootle.
commit 1c002af0c11e239610902fa1cfd43cf9aee90bc4
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 04:44:10 2010 +0200
Translation update done using Pootle.
commit a8025cacd07d7e1fda3cdf79f731fcb4d78926b3
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 04:42:55 2010 +0200
Translation update done using Pootle.
commit cb22bdbe44fce0cb9b69d8b4d3a9f6198c3f9171
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 04:42:47 2010 +0200
Translation update done using Pootle.
commit 7597017876db84cacc4401ee504028105a46e069
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Dec 30 04:39:30 2010 +0200
Translation update done using Pootle.
commit 2cccb70e11a1a17cfe7d2708d930506d75833ac1
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Dec 29 21:36:16 2010 +0200
Translation update done using Pootle.
commit 8ca978a6b9fb6aa96428d5f1ad2485b2e871e3da
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Dec 29 21:35:54 2010 +0200
Translation update done using Pootle.
commit 774d312bcc8a58f47769dac357187d55f05dcdaa
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Dec 29 21:35:41 2010 +0200
Translation update done using Pootle.
commit ffa1fcc77f4764012a80e431b4aea08135c8afba
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Dec 29 21:34:23 2010 +0200
Translation update done using Pootle.
commit d025833063e4920b51e6597e5ca1a61e60ec649c
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Dec 29 20:40:25 2010 +0200
Translation update done using Pootle.
commit 5983e97e0c4be0e97ff165b8822be04dda1c502c
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Dec 29 20:40:14 2010 +0200
Translation update done using Pootle.
commit 3d90e8373135df757a388fb99477f47604597895
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Dec 29 20:38:16 2010 +0200
Translation update done using Pootle.
commit 441ec6b3f32b4eed5d5f4ad8189823e5cc1f814d
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Dec 29 20:38:06 2010 +0200
Translation update done using Pootle.
commit c6a890b2f17a69f1a5cee30c96051584105de855
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Dec 29 20:37:27 2010 +0200
Translation update done using Pootle.
commit d91ada14ce434e9f26c46af608497fb1fc91d3af
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Dec 29 20:37:18 2010 +0200
Translation update done using Pootle.
commit 917a97a757eec10fe6daa34ac8110d548dddb82c
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Dec 29 20:37:11 2010 +0200
Translation update done using Pootle.
commit 4ecfdbd95e9f3a604eb57fb5922d47a93df5a7cf
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Dec 29 20:37:06 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/cs.po | 52 +++++++++++++++++++++++++---------------------------
po/en_GB.po | 14 ++++++--------
po/fr.po | 14 ++++++--------
po/tr.po | 14 ++++++--------
po/zh_CN.po | 47 ++++++++++++++++++-----------------------------
5 files changed, 61 insertions(+), 80 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index 8e98418..ef044fc 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-beta1\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-12-29 08:42-0500\n"
-"PO-Revision-Date: 2010-12-27 13:17+0100\n"
+"PO-Revision-Date: 2010-12-31 12:53+0100\n"
"Last-Translator: Michal Čihař <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -617,8 +617,8 @@ msgstr "Sledování není zapnuté."
#: db_structure.php:374 libraries/display_tbl.lib.php:1942
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"Tento pohled má alespoň tolik řádek. Podrobnosti naleznete v %sdokumentaci%s."
@@ -812,17 +812,16 @@ msgstr "Zadejte každou hodnotu do samostatného políčka."
#: enum_editor.php:57
msgid "+ Restart insertion and add a new value"
-msgstr ""
+msgstr "+ Začít nové vkládání a přidat novou hodnotu"
#: enum_editor.php:67
-#, fuzzy
#| msgid "Output:"
msgid "Output"
-msgstr "Výstup:"
+msgstr "Výstup"
#: enum_editor.php:68
msgid "Copy and paste the joined values into the \"Length/Values\" field"
-msgstr ""
+msgstr "Zkopírujte spojené hodnoty do pole „Délka/Hodnoty“"
#: export.php:73
msgid "Selected export type has to be saved in file!"
@@ -854,8 +853,8 @@ msgstr "Výpis byl uložen do souboru %s."
#: import.php:58
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Pravděpodobně jste se pokusili nahrát příliš velký soubor. Přečtěte si "
"prosím %sdokumentaci%s, jak toto omezení obejít."
@@ -1621,8 +1620,8 @@ msgstr "Vítejte v %s"
#: libraries/auth/config.auth.lib.php:106
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Pravděpodobná příčina je, že nemáte vytvořený konfigurační soubor. Pro jeho "
"vytvoření by se vám mohl hodit %1$snastavovací skript%2$s."
@@ -4550,8 +4549,8 @@ msgstr ", @TABLE@ bude nahrazen jménem tabulky"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Tato hodnota je interpretována pomocí %1$sstrftime%2$s, takže můžete použít "
"libovolné řetězce pro formátování data a času. Dále budou provedena "
@@ -6479,8 +6478,8 @@ msgid ""
"For a list of available transformation options and their MIME type "
"transformations, click on %stransformation descriptions%s"
msgstr ""
-"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na %"
-"spopisy transformací%s"
+"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na "
+"%spopisy transformací%s"
#: libraries/tbl_properties.inc.php:143
msgid "Transformation options"
@@ -6521,8 +6520,8 @@ msgid ""
"No description is available for this transformation.<br />Please ask the "
"author what %s does."
msgstr ""
-"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co %"
-"s dělá."
+"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co "
+"%s dělá."
#: libraries/tbl_properties.inc.php:725 server_engines.php:56
#: tbl_operations.php:352
@@ -6543,10 +6542,9 @@ msgid "You have to add at least one column."
msgstr "Musíte přidat alespoň jedno pole."
#: libraries/tbl_properties.inc.php:797
-#, fuzzy
#| msgid "Add a new server"
msgid "+ Add a new value"
-msgstr "Přidat nový server"
+msgstr "+ Přidat novou hodnotu"
#: libraries/tbl_triggers.lib.php:28
msgid "Event"
@@ -7147,8 +7145,8 @@ msgid ""
"You can set more settings by modifying config.inc.php, eg. by using %sSetup "
"script%s."
msgstr ""
-"Více věcí můžete nastavit úpravou config.inc.php, např. použitím %"
-"sNastavovacího skriptu%s."
+"Více věcí můžete nastavit úpravou config.inc.php, např. použitím "
+"%sNastavovacího skriptu%s."
#: prefs_manage.php:302
msgid "Save to browser's storage"
@@ -7596,8 +7594,8 @@ msgstr "Odstranit databáze se stejnými jmény jako uživatelé."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Poznámka: phpMyAdmin získává oprávnění přímo z tabulek MySQL. Obsah těchto "
"tabulek se může lišit od oprávnění, která server právě používá, pokud byly "
@@ -9068,8 +9066,8 @@ msgid ""
"If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin "
"cookie validity%s must be set to a value less or equal to it."
msgstr ""
-"Při použití přihlašování přes cookies a při %sUkládádání přihlašovaci cookie%"
-"s vyšší než 0 musí být %sPlatnost přihlašovací cookie%s nastavena na vyšší "
+"Při použití přihlašování přes cookies a při %sUkládádání přihlašovaci cookie"
+"%s vyšší než 0 musí být %sPlatnost přihlašovací cookie%s nastavena na vyšší "
"hodnotu než je tato."
#: setup/lib/index.lib.php:266
@@ -9080,8 +9078,8 @@ msgid ""
"protection may not be reliable if your IP belongs to an ISP where thousands "
"of users, including you, are connected to."
msgstr ""
-"Pokud to považujete za nutné, použijte další možnosti zabezpečení - %"
-"somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení "
+"Pokud to považujete za nutné, použijte další možnosti zabezpečení - "
+"%somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení "
"založené na IP adresách nemusí být spolehlivé, pokud je vaše IP adresa "
"dynamicky přidělována poskytovatelem spolu s mnoha dalšími uživateli."
diff --git a/po/en_GB.po b/po/en_GB.po
index cf3d158..5914a92 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-beta1\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-12-29 08:42-0500\n"
-"PO-Revision-Date: 2010-12-29 14:28+0200\n"
+"PO-Revision-Date: 2010-12-29 20:37+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: english-gb <en_GB(a)li.org>\n"
+"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -807,17 +807,16 @@ msgstr "Enter each value in a separate field."
#: enum_editor.php:57
msgid "+ Restart insertion and add a new value"
-msgstr ""
+msgstr "+ Restart insertion and add a new value"
#: enum_editor.php:67
-#, fuzzy
#| msgid "Output:"
msgid "Output"
-msgstr "Output:"
+msgstr "Output"
#: enum_editor.php:68
msgid "Copy and paste the joined values into the \"Length/Values\" field"
-msgstr ""
+msgstr "Copy and paste the joined values into the \"Length/Values\" field"
#: export.php:73
msgid "Selected export type has to be saved in file!"
@@ -6530,10 +6529,9 @@ msgid "You have to add at least one column."
msgstr "You have to add at least one column."
#: libraries/tbl_properties.inc.php:797
-#, fuzzy
#| msgid "Add a new server"
msgid "+ Add a new value"
-msgstr "Add a new server"
+msgstr "+ Add a new value"
#: libraries/tbl_triggers.lib.php:28
msgid "Event"
diff --git a/po/fr.po b/po/fr.po
index 9f3cbe6..b953d7a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-beta1\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-12-29 08:42-0500\n"
-"PO-Revision-Date: 2010-12-29 14:29+0200\n"
+"PO-Revision-Date: 2010-12-29 20:40+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: french <fr(a)li.org>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -808,17 +808,16 @@ msgstr "Saisir chaque valeur dans un champ séparé."
#: enum_editor.php:57
msgid "+ Restart insertion and add a new value"
-msgstr ""
+msgstr "+ Recommencer l'insertion et ajouter une valeur"
#: enum_editor.php:67
-#, fuzzy
#| msgid "Output:"
msgid "Output"
-msgstr "Sortie:"
+msgstr "Résultat"
#: enum_editor.php:68
msgid "Copy and paste the joined values into the \"Length/Values\" field"
-msgstr ""
+msgstr "Copiez les valeurs et collez-les dans le champ «Taille/Valeurs»"
#: export.php:73
msgid "Selected export type has to be saved in file!"
@@ -6611,10 +6610,9 @@ msgid "You have to add at least one column."
msgstr "Vous devez ajouter au moins une colonne."
#: libraries/tbl_properties.inc.php:797
-#, fuzzy
#| msgid "Add a new server"
msgid "+ Add a new value"
-msgstr "Ajouter un serveur"
+msgstr "+ Ajouter une valeur"
#: libraries/tbl_triggers.lib.php:28
msgid "Event"
diff --git a/po/tr.po b/po/tr.po
index 2b5a1b5..ec80dd1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-beta1\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-12-29 08:42-0500\n"
-"PO-Revision-Date: 2010-12-28 11:17+0200\n"
+"PO-Revision-Date: 2010-12-29 21:36+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n"
"Language-Team: turkish <tr(a)li.org>\n"
+"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -803,17 +803,16 @@ msgstr "Her bir değeri ayrı alana girin."
#: enum_editor.php:57
msgid "+ Restart insertion and add a new value"
-msgstr ""
+msgstr "+ Eklemeyi yeniden başlat ve yeni bir değer gir"
#: enum_editor.php:67
-#, fuzzy
#| msgid "Output:"
msgid "Output"
-msgstr "Çıktı:"
+msgstr "Çıktı"
#: enum_editor.php:68
msgid "Copy and paste the joined values into the \"Length/Values\" field"
-msgstr ""
+msgstr "\"Genişlik/Değerler\" alanına katılan değerleri kopyala ve yapıştır"
#: export.php:73
msgid "Selected export type has to be saved in file!"
@@ -6575,10 +6574,9 @@ msgid "You have to add at least one column."
msgstr "En az bir sütun eklemek zorundasınız."
#: libraries/tbl_properties.inc.php:797
-#, fuzzy
#| msgid "Add a new server"
msgid "+ Add a new value"
-msgstr "Yeni sunucu ekle"
+msgstr "+ Yeni bir değer ekle"
#: libraries/tbl_triggers.lib.php:28
msgid "Event"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 640e1d8..3d818cf 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-beta1\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-12-29 08:42-0500\n"
-"PO-Revision-Date: 2010-12-08 05:44+0200\n"
+"PO-Revision-Date: 2010-12-30 05:04+0200\n"
"Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n"
"Language-Team: chinese_simplified <zh_CN(a)li.org>\n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -799,17 +799,16 @@ msgstr "请将每个值分别输入在不同的输入框中。"
#: enum_editor.php:57
msgid "+ Restart insertion and add a new value"
-msgstr ""
+msgstr "+ 重新插入并添加一个值"
#: enum_editor.php:67
-#, fuzzy
#| msgid "Output:"
msgid "Output"
-msgstr "输出:"
+msgstr "输出"
#: enum_editor.php:68
msgid "Copy and paste the joined values into the \"Length/Values\" field"
-msgstr ""
+msgstr "将生成的内容复制粘贴到 \"长度/值\" 一栏中"
#: export.php:73
msgid "Selected export type has to be saved in file!"
@@ -1082,16 +1081,14 @@ msgid "Inline Edit"
msgstr "快速编辑"
#: js/messages.php:89
-#, fuzzy
#| msgid "Hide query chart"
msgid "Hide search criteria"
-msgstr "隐藏查询图表"
+msgstr "隐藏搜索条件"
#: js/messages.php:90
-#, fuzzy
#| msgid "Show query chart"
msgid "Show search criteria"
-msgstr "显示查询图表"
+msgstr "显示搜索条件"
#: js/messages.php:93 tbl_change.php:294 tbl_indexes.php:198
#: tbl_indexes.php:223
@@ -2054,7 +2051,7 @@ msgstr "用于上传的文件夹出错,无法使用"
#: libraries/common.lib.php:2983
msgid "There are no files to upload"
-msgstr ""
+msgstr "没有可上传的文件"
#: libraries/config.values.php:95 libraries/export/htmlword.php:24
#: libraries/export/latex.php:41 libraries/export/odt.php:33
@@ -6336,10 +6333,9 @@ msgid "You have to add at least one column."
msgstr "至少要添加一个字段。"
#: libraries/tbl_properties.inc.php:797
-#, fuzzy
#| msgid "Add a new server"
msgid "+ Add a new value"
-msgstr "添加服务器"
+msgstr "+ 添加"
#: libraries/tbl_triggers.lib.php:28
msgid "Event"
@@ -6808,34 +6804,29 @@ msgid "Page creation failed"
msgstr "页面创建失败"
#: pmd_pdf.php:89
-#, fuzzy
#| msgid "pages"
msgid "Page"
-msgstr "页数"
+msgstr "页面"
#: pmd_pdf.php:99
-#, fuzzy
#| msgid "Import from file"
msgid "Import from selected page"
-msgstr "从文件导入"
+msgstr "从所选页导入"
#: pmd_pdf.php:100
-#, fuzzy
#| msgid "Export/Import to scale"
msgid "Export to selected page"
-msgstr "按比例导出/导入"
+msgstr "导出至所选页"
#: pmd_pdf.php:102
-#, fuzzy
#| msgid "Create a new index"
msgid "Create a page and export to it"
-msgstr "新建索引"
+msgstr "导出至新页"
#: pmd_pdf.php:111
-#, fuzzy
#| msgid "New name"
msgid "New page name: "
-msgstr "新名称"
+msgstr "新页面名: "
#: pmd_pdf.php:114
msgid "Export/Import to scale"
@@ -9269,24 +9260,22 @@ msgid "Browse distinct values"
msgstr "浏览非重复值 (DISTINCT)"
#: tbl_structure.php:165 tbl_structure.php:166
-#, fuzzy
#| msgid "Adding Primary Key"
msgid "Add primary key"
-msgstr "正在添加主键"
+msgstr "添加主键"
#: tbl_structure.php:167 tbl_structure.php:168
-#, fuzzy
#| msgid "Apply index(s)"
msgid "Add index"
-msgstr "增加索引"
+msgstr "添加索引"
#: tbl_structure.php:169 tbl_structure.php:170
msgid "Add unique index"
-msgstr ""
+msgstr "添加唯一键"
#: tbl_structure.php:171 tbl_structure.php:172
msgid "Add FULLTEXT index"
-msgstr ""
+msgstr "添加全文索引"
#: tbl_structure.php:384
msgctxt "None for default"
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via ecdbb6dcc73aa97fc4df90d92e0ff4b4530f69e9 (commit)
from c63d6a59a17f618de00311eb2b2d20ae5e5ae426 (commit)
- Log -----------------------------------------------------------------
commit ecdbb6dcc73aa97fc4df90d92e0ff4b4530f69e9
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Dec 30 08:14:46 2010 -0500
Bug #3141319 Query execution time changes and disappears when no rows are returned
-----------------------------------------------------------------------
Summary of changes:
js/sql.js | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/js/sql.js b/js/sql.js
index 875b501..96483e0 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -224,7 +224,10 @@ $(document).ready(function() {
$.post($(this).attr('action'), $(this).serialize() , function(data) {
if(data.success == true) {
- PMA_ajaxShowMessage(data.message);
+ // fade out previous success message, if any
+ $('.success').fadeOut();
+ // show a message that stays on screen
+ $('#sqlqueryform').before(data.message);
$('#sqlqueryresults').show();
// this happens if a USE command was typed
if (typeof data.reload != 'undefined') {
@@ -243,6 +246,7 @@ $(document).ready(function() {
$('#sqlqueryresults').hide();
}
else {
+ // real results are returned
$('#sqlqueryresults').show();
$("#sqlqueryresults").html(data);
$("#sqlqueryresults").trigger('appendAnchor');
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via 818965f8830ee877a4bbfe5f4255dd2db0b8ae10 (commit)
from 0c979971a28c05e3fece7fb21ff2937e92c6d5e9 (commit)
- Log -----------------------------------------------------------------
commit 818965f8830ee877a4bbfe5f4255dd2db0b8ae10
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Dec 30 06:50:23 2010 -0500
Inline edit links were not displayed in search results
-----------------------------------------------------------------------
Summary of changes:
js/sql.js | 10 +++++-----
js/tbl_select.js | 20 ++++++++++++++++++++
tbl_select.php | 1 +
3 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/js/sql.js b/js/sql.js
index d9ecdea..8e7bab2 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -54,10 +54,11 @@ function getFieldName($this_field, disp_mode) {
* The function that iterates over each row in the table_results and appends a
* new inline edit anchor to each table row.
*
- * @param disp_mode string
*/
-function appendInlineAnchor(disp_mode) {
- if(disp_mode == 'vertical') {
+function appendInlineAnchor() {
+ var disp_mode = $("#top_direction_dropdown").val();
+
+ if (disp_mode == 'vertical') {
// there can be one or two tr containing this class, depending
// on the ModifyDeleteAtLeft and ModifyDeleteAtRight cfg parameters
$('#table_results tr')
@@ -163,10 +164,9 @@ $(document).ready(function() {
* Attach the {@link appendInlineAnchor} function to a custom event, which
* will be triggered manually everytime the table of results is reloaded
* @memberOf jQuery
- * @name sqlqueryresults_live
*/
$("#sqlqueryresults").live('appendAnchor',function() {
- appendInlineAnchor(disp_mode);
+ appendInlineAnchor();
})
/**
diff --git a/js/tbl_select.js b/js/tbl_select.js
index 6b03cce..208daac 100644
--- a/js/tbl_select.js
+++ b/js/tbl_select.js
@@ -22,6 +22,25 @@ $(document).ready(function() {
cache: 'false'
});
+ /**
+ * Attach the {@link appendInlineAnchor} function to a custom event, which
+ * will be triggered manually everytime the table of results is reloaded;
+ *
+ * Needs appendInlineAnchor() which is defined in sql.js
+ * @memberOf jQuery
+ */
+ $("#searchresults").live('appendAnchor',function() {
+ appendInlineAnchor();
+ })
+
+ /**
+ * Trigger the appendAnchor event to prepare the first table for inline edit
+ *
+ * @memberOf jQuery
+ */
+ $("#searchresults").trigger('appendAnchor');
+
+
$('<a id="togglesearchform"></a>')
.html(PMA_messages['strShowSearchCriteria'])
.insertAfter('#tbl_search_form')
@@ -63,6 +82,7 @@ $(document).ready(function() {
if (typeof response == 'string') {
// found results
$("#searchresults").html(response);
+ $("#searchresults").trigger('appendAnchor');
$('#tbl_search_form').hide();
$('#togglesearchform')
// always start with the Show message
diff --git a/tbl_select.php b/tbl_select.php
index a680c86..6913a9a 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -16,6 +16,7 @@
require_once './libraries/common.inc.php';
require_once './libraries/mysql_charsets.lib.php';
+$GLOBALS['js_include'][] = 'sql.js';
$GLOBALS['js_include'][] = 'tbl_select.js';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via 0c979971a28c05e3fece7fb21ff2937e92c6d5e9 (commit)
from 829b3c73c1246a4730cc806fff74936cc72f3dcc (commit)
- Log -----------------------------------------------------------------
commit 0c979971a28c05e3fece7fb21ff2937e92c6d5e9
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Dec 29 08:54:59 2010 -0500
split() is deprecated
-----------------------------------------------------------------------
Summary of changes:
enum_editor.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/enum_editor.php b/enum_editor.php
index 4a24c5b..088275f 100644
--- a/enum_editor.php
+++ b/enum_editor.php
@@ -24,7 +24,7 @@ require_once './libraries/header_meta_style.inc.php';
<?php
$values = array();
if (isset($_GET['values'])) { // This page was displayed when the "add a new value" link or the link in tbl_alter.php was clicked
- $values = split(',', urldecode($_GET['values']));
+ $values = explode(',', urldecode($_GET['values']));
} elseif (isset($_GET['num_fields'])) { // This page was displayed from submitting this form
for($field_num = 1; $field_num <= $_GET['num_fields']; $field_num++) {
$values[] = "'" . str_replace(array("'", '\\'), array("''", '\\\\'), $_GET['field' . $field_num]) . "'";
hooks/post-receive
--
phpMyAdmin