[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-911-ge68305f
Michal Čihař
nijel at users.sourceforge.net
Tue Mar 30 12:27:13 CEST 2010
The branch, master has been updated
via e68305febd52c7d357a02d21b273423887d2783f (commit)
via 0c526a31b5a4b75ebdc023606fa5610baf0fd795 (commit)
via f61c1b400afd42b95ab7b36f270e50821e2fb489 (commit)
via 2329af48519891bc11471e456b4a4b27e589b86c (commit)
via f28b03a66ab2c8e3dbf090c610ee9db5a22e209c (commit)
via ef477e96929cca6eb0fa09f5efbd7c619757f5ea (commit)
from e7f29a389bc269b72f3cf481c77ae5d15f782775 (commit)
- Log -----------------------------------------------------------------
commit e68305febd52c7d357a02d21b273423887d2783f
Author: Michal Čihař <mcihar at novell.com>
Date: Tue Mar 30 12:25:24 2010 +0200
PMA_langList returns only existing languages, no need to check them again.
commit 0c526a31b5a4b75ebdc023606fa5610baf0fd795
Author: Michal Čihař <mcihar at novell.com>
Date: Tue Mar 30 12:25:15 2010 +0200
Add Telugu definition.
commit f61c1b400afd42b95ab7b36f270e50821e2fb489
Author: Michal Čihař <mcihar at novell.com>
Date: Tue Mar 30 12:24:08 2010 +0200
Fix handling of not defined laguanges.
commit 2329af48519891bc11471e456b4a4b27e589b86c
Author: Michal Čihař <mcihar at novell.com>
Date: Tue Mar 30 12:19:06 2010 +0200
Update Czech translation.
commit f28b03a66ab2c8e3dbf090c610ee9db5a22e209c
Merge: ef477e96929cca6eb0fa09f5efbd7c619757f5ea e7f29a389bc269b72f3cf481c77ae5d15f782775
Author: Michal Čihař <michal at cihar.com>
Date: Tue Mar 30 11:32:54 2010 +0200
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit ef477e96929cca6eb0fa09f5efbd7c619757f5ea
Merge: 6f5fe44324c8d3d6b31b4ab0800d0861ffc96ab1 ee015566416517673a8c1a0fa2bb97f20a2073a9
Author: Michal Čihař <michal at cihar.com>
Date: Tue Mar 30 11:32:34 2010 +0200
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
-----------------------------------------------------------------------
Summary of changes:
libraries/select_lang.lib.php | 4 +++-
po/cs.po | 16 ++++++++--------
setup/frames/index.inc.php | 6 ------
3 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index 50afc0d..be1ce37 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -288,6 +288,8 @@ function PMA_langDetails($lang) {
return array('sr|serbian', 'serbian_cyrillic-utf-8', 'sr', 'Српски');
case 'sv':
return array('sv|swedish', 'swedish-utf-8', 'sv', 'Svenska');
+ case 'te':
+ return array('te|telugu', 'telugu-utf-8', 'te', 'తెలుగు');
case 'th':
return array('th|thai', 'thai-utf-8', 'th', 'ภาษาไทย');
case 'tr':
@@ -305,7 +307,7 @@ function PMA_langDetails($lang) {
case 'zh_CN':
return array('zh|chinese simplified', 'chinese_simplified-utf-8', 'zh', '中文');
}
- return array($lang, $lang, $lang, '');
+ return array("$lang|$lang", $lang, $lang);
}
/**
diff --git a/po/cs.po b/po/cs.po
index cf12e39..bfa8ada 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
"POT-Creation-Date: 2010-03-19 00:28+0100\n"
-"PO-Revision-Date: 2010-03-29 09:27+0200\n"
+"PO-Revision-Date: 2010-03-30 12:18+0200\n"
"Last-Translator: Michal <michal at cihar.com>\n"
"Language-Team: czech <cs at li.org>\n"
"MIME-Version: 1.0\n"
@@ -3486,7 +3486,7 @@ msgstr "Přidat replikačního uživatele pro podřízený server"
#: libraries/messages.inc.php:779
#, php-format
msgid "Master server changed succesfully to %s"
-msgstr ""
+msgstr "Nadřízený server bych úspěšně změněn na %s"
#: libraries/messages.inc.php:780
msgid "This server is configured as master in a replication process."
@@ -5074,11 +5074,11 @@ msgstr "Povolit přihlašování uživatele root"
#: libraries/messages.inc.php:1120
msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth"
-msgstr ""
+msgstr "Název pro zobrazení při HTTP autentizace"
#: libraries/messages.inc.php:1121
msgid "HTTP Realm"
-msgstr ""
+msgstr "HTTP doméma"
#: libraries/messages.inc.php:1122
msgid ""
@@ -5120,7 +5120,7 @@ msgid ""
"Leave blank for no column comments/mime types, suggested: [kbd]"
"pma_column_info[/kbd]"
msgstr ""
-"Nechte prázdné pro žádné komentaře či mime typy sloupců, výchozí nastavení: "
+"Nechte prázdné pro žádné komentáře či mime typy sloupců, výchozí nastavení: "
"[kbd]pma_column_info[/kbd]."
#: libraries/messages.inc.php:1129
@@ -5287,7 +5287,7 @@ msgstr ""
#: libraries/messages.inc.php:1161
msgid "PDF schema: pages table"
-msgstr ""
+msgstr "PDF schémata: tabulka stránek"
#: libraries/messages.inc.php:1162
msgid ""
@@ -5372,7 +5372,7 @@ msgstr ""
#: libraries/messages.inc.php:1179
msgid "PDF schema: table coordinates"
-msgstr ""
+msgstr "PDF schéma: tabulka souřadnic"
#: libraries/messages.inc.php:1180
msgid ""
@@ -5382,7 +5382,7 @@ msgstr ""
#: libraries/messages.inc.php:1181
msgid "Display fields table"
-msgstr ""
+msgstr "Tabulka s popisem sloupců"
#: libraries/messages.inc.php:1183
msgid "User for config auth"
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 78c94cb..6282382 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -74,9 +74,6 @@ if (!$is_https) {
// create language list
$lang_list = array();
foreach ($all_languages as $each_lang_key => $each_lang) {
- if (!file_exists($GLOBALS['lang_path'] . $each_lang[1] . '.inc.php')) {
- continue;
- }
$lang_name = ucfirst(substr(strrchr($each_lang[0], '|'), 1));
// Include native name if non empty
@@ -175,9 +172,6 @@ $opts = array(
'values' => array(),
'values_escaped' => true);
foreach ($all_languages as $each_lang_key => $each_lang) {
- if (!file_exists($GLOBALS['lang_path'] . $each_lang[1] . '.inc.php')) {
- continue;
- }
$lang_name = ucfirst(substr(strrchr($each_lang[0], '|'), 1));
// Include native name if non empty
if (!empty($each_lang[3])) {
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list