August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13464-g3803a1c
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 3803a1cde4d153bd5d43b34e16c9eb4c44fd8183 (commit) via 3d621fd3afb302cfa14940f30bf71815a3263b8c (commit) via 5379b55691620d107ed33ee43d63727079137413 (commit) via c722d0d696125345e4ef8f0db095458a696c72d6 (commit) via 323026c0ea041dd818e0e7f0f453c7dc1ec4d3b2 (commit) from fcf2a7be85ded45e35ce805816657f98de1c4531 (commit) - Log ----------------------------------------------------------------- commit 3803a1cde4d153bd5d43b34e16c9eb4c44fd8183 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 16:20:37 2011 +0200 Single call of strtr instead of three str_replace commit 3d621fd3afb302cfa14940f30bf71815a3263b8c Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 16:19:05 2011 +0200 Simplify replace logic commit 5379b55691620d107ed33ee43d63727079137413 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 16:17:48 2011 +0200 Coding style commit c722d0d696125345e4ef8f0db095458a696c72d6 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 16:16:47 2011 +0200 Simplify escape functions usint strtr commit 323026c0ea041dd818e0e7f0f453c7dc1ec4d3b2 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 16:15:24 2011 +0200 Use strtr instead of str_replace and array_keys/values combo ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index c83ab34..3b8a6b9 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -100,7 +100,7 @@ function PMA_getIcon($icon, $alternate = '', $force_text = false, $noSprite = fa } else { $button .= '<img src="themes/dot.gif"' . ' title="' . $alternate . '" alt="' . $alternate . '"' - . ' class="icon ic_' . str_replace(array('.gif','.png'),array('',''),$icon) . '" />'; + . ' class="icon ic_' . str_replace(array('.gif','.png'), '', $icon) . '" />'; } } @@ -174,9 +174,10 @@ function PMA_sqlAddSlashes($a_string = '', $is_like = false, $crlf = false, $php } if ($crlf) { - $a_string = str_replace("\n", '\n', $a_string); - $a_string = str_replace("\r", '\r', $a_string); - $a_string = str_replace("\t", '\t', $a_string); + $a_string = strtr( + $a_string, + array("\n" => '\n', "\r" => '\r', "\t" => '\t') + ); } if ($php_code) { @@ -202,10 +203,7 @@ function PMA_sqlAddSlashes($a_string = '', $is_like = false, $crlf = false, $php */ function PMA_escape_mysql_wildcards($name) { - $name = str_replace('_', '\\_', $name); - $name = str_replace('%', '\\%', $name); - - return $name; + return strtr($name, array('_' => '\\_', '%' => '\\%')); } // end of the 'PMA_escape_mysql_wildcards()' function /** @@ -220,10 +218,7 @@ function PMA_escape_mysql_wildcards($name) */ function PMA_unescape_mysql_wildcards($name) { - $name = str_replace('\\_', '_', $name); - $name = str_replace('\\%', '%', $name); - - return $name; + return strtr($name, array('\\_' => '_', '\\%' => '%')); } // end of the 'PMA_unescape_mysql_wildcards()' function /** @@ -1393,7 +1388,9 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow //number_format is not multibyte safe, str_replace is safe if ($digits_left === 0) { $value = number_format($value, $digits_right); - if ($originalValue!=0 && floatval($value) == 0) $value = ' <'.(1/PMA_pow(10,$digits_right)); + if ($originalValue != 0 && floatval($value) == 0) { + $value = ' <' . (1 / PMA_pow(10, $digits_right)); + } return PMA_localizeNumber($value); } @@ -2927,7 +2924,7 @@ function PMA_expandUserString($string, $escape = null, $updates = array()) } /* Do the replacement */ - return str_replace(array_keys($replace), array_values($replace), strftime($string)); + return strtr(strftime($string), $replace); } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13459-gfcf2a7b
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via fcf2a7be85ded45e35ce805816657f98de1c4531 (commit) from e502237c623b1981f683f504104c22fdb7d93522 (commit) - Log ----------------------------------------------------------------- commit fcf2a7be85ded45e35ce805816657f98de1c4531 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 16:11:38 2011 +0200 Improve coding style ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 24f8ee0..c83ab34 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1429,10 +1429,16 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow $dh = PMA_pow(10, $digits_right); - // This gives us the right SI prefix already, but $digits_left parameter not incorporated + /* + * This gives us the right SI prefix already, + * but $digits_left parameter not incorporated + */ $d = floor(log10($value) / 3); - // Lowering the SI prefix by 1 gives us an additional 3 zeros - // So if we have 3,6,9,12.. free digits ($digits_left - $cur_digits) to use, then lower the SI prefix + /* + * Lowering the SI prefix by 1 gives us an additional 3 zeros + * So if we have 3,6,9,12.. free digits ($digits_left - $cur_digits) + * to use, then lower the SI prefix + */ $cur_digits = floor(log10($value / PMA_pow(1000, $d, 'pow'))+1); if ($digits_left > $cur_digits) { $d-= floor(($digits_left - $cur_digits)/3); @@ -1444,12 +1450,18 @@ function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_dow $unit = $units[$d]; // If we dont want any zeros after the comma just add the thousand seperator - if ($noTrailingZero) - $value = PMA_localizeNumber(preg_replace("/(?<=\d)(?=(\d{3})+(?!\d))/",",",$value)); - else - $value = PMA_localizeNumber(number_format($value, $digits_right)); //number_format is not multibyte safe, str_replace is safe + if ($noTrailingZero) { + $value = PMA_localizeNumber( + preg_replace('/(?<=\d)(?=(\d{3})+(?!\d))/', ',', $value) + ); + } else { + //number_format is not multibyte safe, str_replace is safe + $value = PMA_localizeNumber(number_format($value, $digits_right)); + } - if ($originalValue!=0 && floatval($value) == 0) return ' <'.(1/PMA_pow(10,$digits_right)).' '.$unit; + if ($originalValue!=0 && floatval($value) == 0) { + return ' <' . (1 / PMA_pow(10, $digits_right)) . ' ' . $unit; + } return $sign . $value . ' ' . $unit; } // end of the 'PMA_formatNumber' function hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13457-ga1af5cc
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via a1af5cc1c708395eb88d9baff2277c56761ed068 (commit) via e7793905900289cd6f651212bedf2671b3954b7a (commit) via a11d307639b8101e6a96520387180c0613664a97 (commit) via 5d8cb09efbeee6d30be8d2db8a06f7dbe59eb497 (commit) via 9998d700ae5f368e68ffe28763f5ea590018e86a (commit) via e286d28d3a77e0031d61d962762937bedd1e1ed2 (commit) via 3e1548c7692adaa78d5cdc38ecc9679bf95028b2 (commit) via 59fa68aca80d3bbad9698fdd6fad4720ed8f902a (commit) via f19b2a59c351dab5c599792256092714999efc49 (commit) via 472246898411aab3c6dcdcfead6a77f48371ae11 (commit) via 52eac7b7c83e4f559aabe4ffc02063467d3fbed6 (commit) via b249e97320c013c1c06629ee16da86cc019105f9 (commit) via 56980d06d08992bfe3288a8a2be994efb921df33 (commit) via 3a8421abbb9ac2b43bf045ee45d2f3f6c1c32020 (commit) via 1b3c6b14191082df1e5c98772edda40053b2297c (commit) via 44026739a306ac6fb08b4b10f8665bdbe8a2a66c (commit) via b9d3dc75ec1d1ac870ecd7c51daf933f66f5fea2 (commit) via 2542b649885abb628e54025b5daa412f799d6b8f (commit) via 338216de8dc86ab7d485f67d865401671c8407a2 (commit) via d43a725e2e90a00913df6738c8f5bc8bcc4914a7 (commit) via b6454434fa98edb260192b72bca81af195ae6574 (commit) via 440271b9fb4f0a5bd34d95e7c804c432c2496615 (commit) via 18f81120d0997fb44719743c6f13ab2d706d045b (commit) via 8efc22fc6a2ce6ba3faaf5e31e2e10b400d3eb08 (commit) via f383298198b848f02f3b1c1c9f6dc01914f69316 (commit) from fd5bf0e64e7a9dcdd76549fcb0f161ab190e2cc8 (commit) - Log ----------------------------------------------------------------- commit a1af5cc1c708395eb88d9baff2277c56761ed068 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 16:03:30 2011 +0200 Fix typo commit e7793905900289cd6f651212bedf2671b3954b7a Merge: a11d307639b8101e6a96520387180c0613664a97 fd5bf0e64e7a9dcdd76549fcb0f161ab190e2cc8 Author: Pootle server <pootle(a)cihar.com> Date: Mon Aug 8 16:02:27 2011 +0200 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit a11d307639b8101e6a96520387180c0613664a97 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:01:41 2011 +0200 Translation update done using Pootle. commit 5d8cb09efbeee6d30be8d2db8a06f7dbe59eb497 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:01:31 2011 +0200 Translation update done using Pootle. commit 9998d700ae5f368e68ffe28763f5ea590018e86a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 16:01:04 2011 +0200 Translation update done using Pootle. commit e286d28d3a77e0031d61d962762937bedd1e1ed2 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:59:59 2011 +0200 Translation update done using Pootle. commit 3e1548c7692adaa78d5cdc38ecc9679bf95028b2 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:59:52 2011 +0200 Translation update done using Pootle. commit 59fa68aca80d3bbad9698fdd6fad4720ed8f902a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:59:00 2011 +0200 Translation update done using Pootle. commit f19b2a59c351dab5c599792256092714999efc49 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:58:44 2011 +0200 Translation update done using Pootle. commit 472246898411aab3c6dcdcfead6a77f48371ae11 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:58:32 2011 +0200 Translation update done using Pootle. commit 52eac7b7c83e4f559aabe4ffc02063467d3fbed6 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:58:23 2011 +0200 Translation update done using Pootle. commit b249e97320c013c1c06629ee16da86cc019105f9 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:57:23 2011 +0200 Translation update done using Pootle. commit 56980d06d08992bfe3288a8a2be994efb921df33 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:57:10 2011 +0200 Translation update done using Pootle. commit 3a8421abbb9ac2b43bf045ee45d2f3f6c1c32020 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:56:40 2011 +0200 Translation update done using Pootle. commit 1b3c6b14191082df1e5c98772edda40053b2297c Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:55:41 2011 +0200 Translation update done using Pootle. commit 44026739a306ac6fb08b4b10f8665bdbe8a2a66c Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:55:05 2011 +0200 Translation update done using Pootle. commit b9d3dc75ec1d1ac870ecd7c51daf933f66f5fea2 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:54:37 2011 +0200 Translation update done using Pootle. commit 2542b649885abb628e54025b5daa412f799d6b8f Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:54:23 2011 +0200 Translation update done using Pootle. commit 338216de8dc86ab7d485f67d865401671c8407a2 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:54:02 2011 +0200 Translation update done using Pootle. commit d43a725e2e90a00913df6738c8f5bc8bcc4914a7 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:52:50 2011 +0200 Translation update done using Pootle. commit b6454434fa98edb260192b72bca81af195ae6574 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:52:39 2011 +0200 Translation update done using Pootle. commit 440271b9fb4f0a5bd34d95e7c804c432c2496615 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:52:28 2011 +0200 Translation update done using Pootle. commit 18f81120d0997fb44719743c6f13ab2d706d045b Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:52:18 2011 +0200 Translation update done using Pootle. commit 8efc22fc6a2ce6ba3faaf5e31e2e10b400d3eb08 Merge: f383298198b848f02f3b1c1c9f6dc01914f69316 563a9e6739da02a7c028000768698a40ca89a531 Author: Pootle server <pootle(a)cihar.com> Date: Mon Aug 8 15:52:03 2011 +0200 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit f383298198b848f02f3b1c1c9f6dc01914f69316 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:51:49 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/af.po | 2 +- po/ar.po | 2 +- po/az.po | 2 +- po/be.po | 2 +- po/be(a)latin.po | 2 +- po/bg.po | 2 +- po/bn.po | 2 +- po/br.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 2 +- po/es.po | 2 +- po/et.po | 2 +- po/eu.po | 2 +- po/fa.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/id.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ka.po | 2 +- po/ko.po | 2 +- po/lt.po | 59 ++++++++++++++++++++----------------------------------- po/lv.po | 2 +- po/mk.po | 2 +- po/ml.po | 2 +- po/mn.po | 2 +- po/ms.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/si.po | 2 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sq.po | 2 +- po/sr.po | 2 +- po/sr(a)latin.po | 2 +- po/sv.po | 2 +- po/ta.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/tt.po | 2 +- po/ug.po | 2 +- po/uk.po | 2 +- po/ur.po | 2 +- po/uz.po | 2 +- po/uz(a)latin.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 64 files changed, 85 insertions(+), 100 deletions(-) diff --git a/po/af.po b/po/af.po index 2d58fb2..0b7533e 100644 --- a/po/af.po +++ b/po/af.po @@ -1928,7 +1928,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "So" diff --git a/po/ar.po b/po/ar.po index 4c4e8b2..11d011b 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1842,7 +1842,7 @@ msgstr "السبت" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "الأحد" diff --git a/po/az.po b/po/az.po index 782a6e7..0783a30 100644 --- a/po/az.po +++ b/po/az.po @@ -1957,7 +1957,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Baz" diff --git a/po/be.po b/po/be.po index 233d382..0624f23 100644 --- a/po/be.po +++ b/po/be.po @@ -1989,7 +1989,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Ндз" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 6f35a29..15877c6 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -1996,7 +1996,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Ndz" diff --git a/po/bg.po b/po/bg.po index daaccea..12b7126 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1861,7 +1861,7 @@ msgstr "събота" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "нд" diff --git a/po/bn.po b/po/bn.po index e04129f..f8eb53e 100644 --- a/po/bn.po +++ b/po/bn.po @@ -1974,7 +1974,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "রবিবার" diff --git a/po/br.po b/po/br.po index 5049627..cdc2618 100644 --- a/po/br.po +++ b/po/br.po @@ -1857,7 +1857,7 @@ msgstr "Sadorn" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Sul" diff --git a/po/bs.po b/po/bs.po index 9abd157..130caa3 100644 --- a/po/bs.po +++ b/po/bs.po @@ -1949,7 +1949,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Ned" diff --git a/po/ca.po b/po/ca.po index 7ffc480..c54e55c 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1903,7 +1903,7 @@ msgstr "Dissabte" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Diu" diff --git a/po/cs.po b/po/cs.po index 3df272a..eff6864 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1829,7 +1829,7 @@ msgstr "Sobota" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Ned" diff --git a/po/cy.po b/po/cy.po index 6dcfdc5..6d2fa70 100644 --- a/po/cy.po +++ b/po/cy.po @@ -1936,7 +1936,7 @@ msgstr "Dydd Sadwrn" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Sul" diff --git a/po/da.po b/po/da.po index 5db681c..b68fdff 100644 --- a/po/da.po +++ b/po/da.po @@ -1877,7 +1877,7 @@ msgstr "lørdag" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "søn" diff --git a/po/de.po b/po/de.po index 57f25a9..e8f00d6 100644 --- a/po/de.po +++ b/po/de.po @@ -1860,7 +1860,7 @@ msgstr "Samstag" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "So" diff --git a/po/el.po b/po/el.po index 57f54aa..3a99ef5 100644 --- a/po/el.po +++ b/po/el.po @@ -1872,7 +1872,7 @@ msgstr "Σάββατο" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Κυρ" diff --git a/po/en_GB.po b/po/en_GB.po index 018a644..29cc2ff 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1832,7 +1832,7 @@ msgstr "Saturday" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Sun" diff --git a/po/es.po b/po/es.po index b0458dc..3a509c5 100644 --- a/po/es.po +++ b/po/es.po @@ -1867,7 +1867,7 @@ msgstr "Sábado" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Dom" diff --git a/po/et.po b/po/et.po index d50a88e..3ebc006 100644 --- a/po/et.po +++ b/po/et.po @@ -1978,7 +1978,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Püh" diff --git a/po/eu.po b/po/eu.po index b3e878b..436cfa3 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1954,7 +1954,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Iga" diff --git a/po/fa.po b/po/fa.po index 7c32e3f..6698c26 100644 --- a/po/fa.po +++ b/po/fa.po @@ -1917,7 +1917,7 @@ msgstr "شنبه" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "يكشنبه" diff --git a/po/fi.po b/po/fi.po index 157a73a..18e068b 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1897,7 +1897,7 @@ msgstr "La" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Su" diff --git a/po/fr.po b/po/fr.po index 04fee6d..b367dea 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1845,7 +1845,7 @@ msgstr "Samedi" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Dim" diff --git a/po/gl.po b/po/gl.po index 8887705..db4c9fe 100644 --- a/po/gl.po +++ b/po/gl.po @@ -2004,7 +2004,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Do" diff --git a/po/he.po b/po/he.po index 9b84983..87e68dd 100644 --- a/po/he.po +++ b/po/he.po @@ -1951,7 +1951,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "יום ראשון" diff --git a/po/hi.po b/po/hi.po index c8b9212..ce883a1 100644 --- a/po/hi.po +++ b/po/hi.po @@ -1877,7 +1877,7 @@ msgstr "शनिवार" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "रविवार" diff --git a/po/hr.po b/po/hr.po index c4255fc..7067270 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1988,7 +1988,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Ned" diff --git a/po/hu.po b/po/hu.po index a95be70..ad43a5e 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1895,7 +1895,7 @@ msgstr "Szombat" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "V" diff --git a/po/id.po b/po/id.po index 4da8f97..acaf1df 100644 --- a/po/id.po +++ b/po/id.po @@ -1879,7 +1879,7 @@ msgstr "Sabtu" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Minggu" diff --git a/po/it.po b/po/it.po index 7f6d027..bbc4886 100644 --- a/po/it.po +++ b/po/it.po @@ -1887,7 +1887,7 @@ msgstr "Sabato" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Dom" diff --git a/po/ja.po b/po/ja.po index ca8329f..82b43a0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1838,7 +1838,7 @@ msgstr "土" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "日" diff --git a/po/ka.po b/po/ka.po index 55fcf44..616af70 100644 --- a/po/ka.po +++ b/po/ka.po @@ -1999,7 +1999,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "კვი" diff --git a/po/ko.po b/po/ko.po index 4925686..6d83c74 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1911,7 +1911,7 @@ msgstr "토요일" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "일" diff --git a/po/lt.po b/po/lt.po index 081106c..e9f7595 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-08 10:07+0200\n" -"PO-Revision-Date: 2011-08-08 15:51+0200\n" +"PO-Revision-Date: 2011-08-08 16:01+0200\n" "Last-Translator: Kęstutis <forkik(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" "Language: lt\n" @@ -1548,38 +1548,33 @@ msgid "Create Table" msgstr "Lentelės kūrimas" #: js/messages.php:209 -#, fuzzy #| msgid "Use Tables" msgid "Insert Table" -msgstr "Naudoti lenteles" +msgstr "Įterpti lentelę" #: js/messages.php:210 -#, fuzzy #| msgid "Apply index(s)" msgid "Hide indexes" -msgstr "Keisti žurnalą(us) (indeksą)" +msgstr "Nerodyti indeksų" #: js/messages.php:211 -#, fuzzy #| msgid "Show grid" msgid "Show indexes" -msgstr "Rodyti tinklelį" +msgstr "Rodyti indeksus" #: js/messages.php:214 msgid "Searching" msgstr "Ieškoma" #: js/messages.php:215 -#, fuzzy #| msgid "Hide search criteria" msgid "Hide search results" -msgstr "Slėpti paieškos kriterijų" +msgstr "Slėpti paieškos rezultatus" #: js/messages.php:216 -#, fuzzy #| msgid "Show search criteria" msgid "Show search results" -msgstr "Rodyti paieškos kriterijų" +msgstr "Rodyti paieškos rezultatas" #: js/messages.php:217 #, fuzzy @@ -1600,7 +1595,7 @@ msgstr "" #: js/messages.php:224 msgid "" "Note: If the file contains multiple tables, they will be combined into one" -msgstr "" +msgstr "Pastaba: Jei failas turi keletą lentelių jos bus sukombinuotos į vieną." #: js/messages.php:227 msgid "Hide query box" @@ -1638,10 +1633,9 @@ msgid "Change" msgstr "Redaguoti" #: js/messages.php:235 -#, fuzzy #| msgid "Maximum execution time" msgid "Query execution time" -msgstr "Ilgiausias vykdymo laikas" +msgstr "Užklausos vykdymo laikas" #: js/messages.php:238 msgid "Hide search criteria" @@ -1657,7 +1651,6 @@ msgid "Ignore" msgstr "Ignoruoti" #: js/messages.php:245 -#, fuzzy #| msgid "Add column(s)" msgid "Add columns" msgstr "Pridėti stulpelį(-ius)" @@ -1719,10 +1712,9 @@ msgid ", latest stable version:" msgstr ", naujausia stabili versija:" #: js/messages.php:269 -#, fuzzy #| msgid "Jump to database" msgid "up to date" -msgstr "Eiti į duomenų bazę" +msgstr "naujausias" #. l10n: Display text for calendar close link #: js/messages.php:287 @@ -1886,7 +1878,7 @@ msgstr "Šeštadienis" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Sek" @@ -1978,13 +1970,12 @@ msgstr "Šrifto dydis" #: libraries/File.class.php:220 msgid "File was not an uploaded file." -msgstr "" +msgstr "Failas nebuvo įkeltasis failas." #: libraries/File.class.php:259 libraries/File.class.php:388 -#, fuzzy #| msgid "Unknown error in file upload." msgid "Unknown error while uploading." -msgstr "Nežinoma klaida failų įkėlime." +msgstr "Nežinoma klaida vykstant siuntimui." #: libraries/File.class.php:277 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." @@ -2028,11 +2019,11 @@ msgstr "" #: libraries/File.class.php:507 msgid "Error while moving uploaded file." -msgstr "" +msgstr "Klaida perkeliant atsiųstą failą." #: libraries/File.class.php:515 msgid "Cannot read (moved) upload file." -msgstr "" +msgstr "Negalima perskaityti (perkelti) įkelto failo." #: libraries/Index.class.php:418 tbl_relation.php:526 msgid "No index defined!" @@ -2118,22 +2109,19 @@ msgstr[1] "Įterptos %1$d eilutės." msgstr[2] "Įterpta %1$d eilučių." #: libraries/RecentTable.class.php:107 -#, fuzzy #| msgid "Could not save configuration" msgid "Could not save recent table" -msgstr "Nepavyko išsaugoti konfigūracijos" +msgstr "Negalėjo išsaugoti paskiausios lentelės" #: libraries/RecentTable.class.php:142 -#, fuzzy #| msgid "Count tables" msgid "Recent tables" -msgstr "Suskaičiuoti lenteles" +msgstr "Paskiausios lentelės" #: libraries/RecentTable.class.php:148 -#, fuzzy #| msgid "There are no configured servers" msgid "There are no recent tables" -msgstr "Nėra jokių sukonfigūruotų serverių" +msgstr "Nėra jokių paskiausių lentelių" #: libraries/StorageEngine.class.php:180 msgid "" @@ -2156,10 +2144,9 @@ msgid "This MySQL server does not support the %s storage engine." msgstr "Šis MySQL serveris nepalaiko %s saugojimo variklio." #: libraries/Table.class.php:303 -#, fuzzy #| msgid "Show slave status" msgid "unknown table status: " -msgstr "Rodyti pavaldinio būklę" +msgstr "lentelės būsena nežinoma:" #: libraries/Table.class.php:1034 msgid "Invalid database" @@ -2181,7 +2168,7 @@ msgstr "Lentelė %s pervadinta į %s" #: libraries/Table.class.php:1274 msgid "Could not save table UI preferences" -msgstr "" +msgstr "Nepavyko išsaugoti lentelės naudotojo sąsajos nustatymų." #: libraries/Theme.class.php:144 #, php-format @@ -2213,7 +2200,7 @@ msgstr "Kelias iki temos nerastas temai %s!" #: libraries/Theme_Manager.class.php:286 themes.php:20 themes.php:41 msgid "Theme" -msgstr "" +msgstr "Apipavidalinimas" #: libraries/auth/config.auth.lib.php:71 msgid "Cannot connect: invalid settings." @@ -2343,10 +2330,9 @@ msgid "PBMS get BLOB info failed:" msgstr "PBMS gavimas BLOB informacijos nepavyko:" #: libraries/blobstreaming.lib.php:332 -#, fuzzy #| msgid "get BLOB Content-Type failed" msgid "PBMS get BLOB Content-Type failed" -msgstr "gavimas BLOB Content-Type nepatyko" +msgstr "PBMS gauti BLOB Content-Type nepatyko" #: libraries/blobstreaming.lib.php:358 msgid "View image" @@ -2419,10 +2405,9 @@ msgid "Check Privileges" msgstr "Patikrinti privilegijas" #: libraries/common.inc.php:588 -#, fuzzy #| msgid "Could not save configuration" msgid "Failed to read configuration file" -msgstr "Nepavyko išsaugoti konfigūracijos" +msgstr "Nepavyko perskaityti konfigūracijos failo" #: libraries/common.inc.php:589 msgid "" diff --git a/po/lv.po b/po/lv.po index 469744c..0a77b42 100644 --- a/po/lv.po +++ b/po/lv.po @@ -1957,7 +1957,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Sv" diff --git a/po/mk.po b/po/mk.po index da9eb72..dc1310d 100644 --- a/po/mk.po +++ b/po/mk.po @@ -1955,7 +1955,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Нед" diff --git a/po/ml.po b/po/ml.po index 4ed0de6..87f6c23 100644 --- a/po/ml.po +++ b/po/ml.po @@ -1790,7 +1790,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "" diff --git a/po/mn.po b/po/mn.po index e4e180b..1b91b6d 100644 --- a/po/mn.po +++ b/po/mn.po @@ -1966,7 +1966,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Ня" diff --git a/po/ms.po b/po/ms.po index 323873a..1793244 100644 --- a/po/ms.po +++ b/po/ms.po @@ -1940,7 +1940,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Aha" diff --git a/po/nb.po b/po/nb.po index c8682f3..b4f3947 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1899,7 +1899,7 @@ msgstr "Lørdag" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Søn" diff --git a/po/nl.po b/po/nl.po index f70653e..8f21297 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1888,7 +1888,7 @@ msgstr "zaterdag" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "zo" diff --git a/po/pl.po b/po/pl.po index 279f0f9..e53f85a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1923,7 +1923,7 @@ msgstr "Sobota" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Nie" diff --git a/po/pt.po b/po/pt.po index 9b1820c..59ebcb1 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1931,7 +1931,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Dom" diff --git a/po/pt_BR.po b/po/pt_BR.po index f2f8f13..0e8c5e9 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1872,7 +1872,7 @@ msgstr "Sábado" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Dom" diff --git a/po/ro.po b/po/ro.po index adafc26..36a8409 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1979,7 +1979,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Dum" diff --git a/po/ru.po b/po/ru.po index 7b1645c..c7dca65 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1878,7 +1878,7 @@ msgstr "Суббота" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Вс" diff --git a/po/si.po b/po/si.po index 29fabfd..b89eb4d 100644 --- a/po/si.po +++ b/po/si.po @@ -1881,7 +1881,7 @@ msgstr "සෙනසුරාදා" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "ඉරිදා" diff --git a/po/sk.po b/po/sk.po index 923f027..1fa7eb9 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1868,7 +1868,7 @@ msgstr "Sobota" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Ne" diff --git a/po/sl.po b/po/sl.po index 9444891..5540b24 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1879,7 +1879,7 @@ msgstr "sobota" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "ned" diff --git a/po/sq.po b/po/sq.po index 67d56c8..ad67c0a 100644 --- a/po/sq.po +++ b/po/sq.po @@ -1958,7 +1958,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Djl" diff --git a/po/sr.po b/po/sr.po index cd329ce..551727a 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1978,7 +1978,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Нед" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 43b4686..fe6ede6 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -1972,7 +1972,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Ned" diff --git a/po/sv.po b/po/sv.po index d49096c..2b9fc95 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1848,7 +1848,7 @@ msgstr "Lördag" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Sön" diff --git a/po/ta.po b/po/ta.po index 73d1d12..f0c5ec5 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1834,7 +1834,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "ஞாயிறு" diff --git a/po/te.po b/po/te.po index 3f08e4b..b1991f6 100644 --- a/po/te.po +++ b/po/te.po @@ -1878,7 +1878,7 @@ msgstr "శనివారం" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "ఆది" diff --git a/po/th.po b/po/th.po index bfd3b31..1641d2b 100644 --- a/po/th.po +++ b/po/th.po @@ -1922,7 +1922,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "อา." diff --git a/po/tr.po b/po/tr.po index f050ada..25f6d82 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1837,7 +1837,7 @@ msgstr "Cumartesi" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Paz" diff --git a/po/tt.po b/po/tt.po index 176e6cf..1ef7d32 100644 --- a/po/tt.po +++ b/po/tt.po @@ -1964,7 +1964,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Ykş" diff --git a/po/ug.po b/po/ug.po index 9e69bd7..cbf5b1b 100644 --- a/po/ug.po +++ b/po/ug.po @@ -1906,7 +1906,7 @@ msgstr "شەنبە" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "يەكشەنبە" diff --git a/po/uk.po b/po/uk.po index 2a656b0..321199b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1862,7 +1862,7 @@ msgstr "Субота" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Нд" diff --git a/po/ur.po b/po/ur.po index eb2f70c..6b61c03 100644 --- a/po/ur.po +++ b/po/ur.po @@ -1892,7 +1892,7 @@ msgstr "ہفتہ" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "اتوار" diff --git a/po/uz.po b/po/uz.po index c37dab4..616fc84 100644 --- a/po/uz.po +++ b/po/uz.po @@ -2009,7 +2009,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Якш" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 4ddad89..0599fae 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -2016,7 +2016,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "Yaksh" diff --git a/po/zh_CN.po b/po/zh_CN.po index b6fc99f..bf9ea89 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1858,7 +1858,7 @@ msgstr "星期六" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "周日" diff --git a/po/zh_TW.po b/po/zh_TW.po index 38d24d8..3a71693 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1852,7 +1852,7 @@ msgstr "星期六" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 -msgctx "Short week day name" +msgctxt "Short week day name" msgid "Sun" msgstr "週日" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13432-gfd5bf0e
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via fd5bf0e64e7a9dcdd76549fcb0f161ab190e2cc8 (commit) from 563a9e6739da02a7c028000768698a40ca89a531 (commit) - Log ----------------------------------------------------------------- commit fd5bf0e64e7a9dcdd76549fcb0f161ab190e2cc8 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 15:59:46 2011 +0200 Avoid disambigution with Sun as a star ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 2 +- po/af.po | 1 + po/ar.po | 1 + po/az.po | 1 + po/be.po | 1 + po/be(a)latin.po | 1 + po/bg.po | 1 + po/bn.po | 1 + po/br.po | 1 + po/bs.po | 1 + po/ca.po | 1 + po/cs.po | 1 + po/cy.po | 1 + po/da.po | 1 + po/de.po | 1 + po/el.po | 1 + po/en_GB.po | 1 + po/es.po | 1 + po/et.po | 1 + po/eu.po | 1 + po/fa.po | 1 + po/fi.po | 1 + po/fr.po | 1 + po/gl.po | 1 + po/he.po | 1 + po/hi.po | 1 + po/hr.po | 1 + po/hu.po | 1 + po/id.po | 1 + po/it.po | 1 + po/ja.po | 1 + po/ka.po | 1 + po/ko.po | 1 + po/lt.po | 1 + po/lv.po | 1 + po/mk.po | 1 + po/ml.po | 1 + po/mn.po | 1 + po/ms.po | 1 + po/nb.po | 1 + po/nl.po | 1 + po/pl.po | 1 + po/pt.po | 1 + po/pt_BR.po | 1 + po/ro.po | 1 + po/ru.po | 1 + po/si.po | 1 + po/sk.po | 1 + po/sl.po | 1 + po/sq.po | 1 + po/sr.po | 1 + po/sr(a)latin.po | 1 + po/sv.po | 1 + po/ta.po | 1 + po/te.po | 1 + po/th.po | 1 + po/tr.po | 1 + po/tt.po | 1 + po/ug.po | 1 + po/uk.po | 1 + po/ur.po | 1 + po/uz.po | 1 + po/uz(a)latin.po | 1 + po/zh_CN.po | 1 + po/zh_TW.po | 1 + 65 files changed, 65 insertions(+), 1 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 2f61cec..24f8ee0 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1514,7 +1514,7 @@ function PMA_localisedDate($timestamp = -1, $format = '') __('Dec')); $day_of_week = array( /* l10n: Short week day name */ - __('Sun'), + _pgettext('Short week day name', 'Sun'), /* l10n: Short week day name */ __('Mon'), /* l10n: Short week day name */ diff --git a/po/af.po b/po/af.po index b5b12c9..2d58fb2 100644 --- a/po/af.po +++ b/po/af.po @@ -1928,6 +1928,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "So" diff --git a/po/ar.po b/po/ar.po index 47c29af..4c4e8b2 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1842,6 +1842,7 @@ msgstr "السبت" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "الأحد" diff --git a/po/az.po b/po/az.po index a9238ce..782a6e7 100644 --- a/po/az.po +++ b/po/az.po @@ -1957,6 +1957,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Baz" diff --git a/po/be.po b/po/be.po index 179763c..233d382 100644 --- a/po/be.po +++ b/po/be.po @@ -1989,6 +1989,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Ндз" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 80c5d80..6f35a29 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -1996,6 +1996,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Ndz" diff --git a/po/bg.po b/po/bg.po index 71ab75e..daaccea 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1861,6 +1861,7 @@ msgstr "събота" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "нд" diff --git a/po/bn.po b/po/bn.po index 2503c8d..e04129f 100644 --- a/po/bn.po +++ b/po/bn.po @@ -1974,6 +1974,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "রবিবার" diff --git a/po/br.po b/po/br.po index d88c06e..5049627 100644 --- a/po/br.po +++ b/po/br.po @@ -1857,6 +1857,7 @@ msgstr "Sadorn" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Sul" diff --git a/po/bs.po b/po/bs.po index b965cf7..9abd157 100644 --- a/po/bs.po +++ b/po/bs.po @@ -1949,6 +1949,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Ned" diff --git a/po/ca.po b/po/ca.po index 611b819..7ffc480 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1903,6 +1903,7 @@ msgstr "Dissabte" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Diu" diff --git a/po/cs.po b/po/cs.po index 3e2cefb..3df272a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1829,6 +1829,7 @@ msgstr "Sobota" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Ned" diff --git a/po/cy.po b/po/cy.po index cfe5ed3..6dcfdc5 100644 --- a/po/cy.po +++ b/po/cy.po @@ -1936,6 +1936,7 @@ msgstr "Dydd Sadwrn" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Sul" diff --git a/po/da.po b/po/da.po index 67b3f45..5db681c 100644 --- a/po/da.po +++ b/po/da.po @@ -1877,6 +1877,7 @@ msgstr "lørdag" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "søn" diff --git a/po/de.po b/po/de.po index 75539d4..57f25a9 100644 --- a/po/de.po +++ b/po/de.po @@ -1860,6 +1860,7 @@ msgstr "Samstag" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "So" diff --git a/po/el.po b/po/el.po index 714e7ea..57f54aa 100644 --- a/po/el.po +++ b/po/el.po @@ -1872,6 +1872,7 @@ msgstr "Σάββατο" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Κυρ" diff --git a/po/en_GB.po b/po/en_GB.po index 65cff64..018a644 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1832,6 +1832,7 @@ msgstr "Saturday" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Sun" diff --git a/po/es.po b/po/es.po index bf4a88b..b0458dc 100644 --- a/po/es.po +++ b/po/es.po @@ -1867,6 +1867,7 @@ msgstr "Sábado" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Dom" diff --git a/po/et.po b/po/et.po index 12142e4..d50a88e 100644 --- a/po/et.po +++ b/po/et.po @@ -1978,6 +1978,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Püh" diff --git a/po/eu.po b/po/eu.po index 186e19c..b3e878b 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1954,6 +1954,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Iga" diff --git a/po/fa.po b/po/fa.po index 10d6fbd..7c32e3f 100644 --- a/po/fa.po +++ b/po/fa.po @@ -1917,6 +1917,7 @@ msgstr "شنبه" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "يكشنبه" diff --git a/po/fi.po b/po/fi.po index bde0ea0..157a73a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1897,6 +1897,7 @@ msgstr "La" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Su" diff --git a/po/fr.po b/po/fr.po index 30471f2..04fee6d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1845,6 +1845,7 @@ msgstr "Samedi" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Dim" diff --git a/po/gl.po b/po/gl.po index 9515e80..8887705 100644 --- a/po/gl.po +++ b/po/gl.po @@ -2004,6 +2004,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Do" diff --git a/po/he.po b/po/he.po index 383ebf8..9b84983 100644 --- a/po/he.po +++ b/po/he.po @@ -1951,6 +1951,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "יום ראשון" diff --git a/po/hi.po b/po/hi.po index d38d32e..c8b9212 100644 --- a/po/hi.po +++ b/po/hi.po @@ -1877,6 +1877,7 @@ msgstr "शनिवार" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "रविवार" diff --git a/po/hr.po b/po/hr.po index e955907..c4255fc 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1988,6 +1988,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Ned" diff --git a/po/hu.po b/po/hu.po index 680c53a..a95be70 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1895,6 +1895,7 @@ msgstr "Szombat" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "V" diff --git a/po/id.po b/po/id.po index b90679c..4da8f97 100644 --- a/po/id.po +++ b/po/id.po @@ -1879,6 +1879,7 @@ msgstr "Sabtu" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Minggu" diff --git a/po/it.po b/po/it.po index e2f000c..7f6d027 100644 --- a/po/it.po +++ b/po/it.po @@ -1887,6 +1887,7 @@ msgstr "Sabato" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Dom" diff --git a/po/ja.po b/po/ja.po index 66eb462..ca8329f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1838,6 +1838,7 @@ msgstr "土" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "日" diff --git a/po/ka.po b/po/ka.po index eb5d0ff..55fcf44 100644 --- a/po/ka.po +++ b/po/ka.po @@ -1999,6 +1999,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "კვი" diff --git a/po/ko.po b/po/ko.po index bd0f2fb..4925686 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1911,6 +1911,7 @@ msgstr "토요일" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "일" diff --git a/po/lt.po b/po/lt.po index 265e94c..081106c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1886,6 +1886,7 @@ msgstr "Šeštadienis" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Sek" diff --git a/po/lv.po b/po/lv.po index 9173140..469744c 100644 --- a/po/lv.po +++ b/po/lv.po @@ -1957,6 +1957,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Sv" diff --git a/po/mk.po b/po/mk.po index da792bb..da9eb72 100644 --- a/po/mk.po +++ b/po/mk.po @@ -1955,6 +1955,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Нед" diff --git a/po/ml.po b/po/ml.po index 07b1f86..4ed0de6 100644 --- a/po/ml.po +++ b/po/ml.po @@ -1790,6 +1790,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "" diff --git a/po/mn.po b/po/mn.po index 958b36c..e4e180b 100644 --- a/po/mn.po +++ b/po/mn.po @@ -1966,6 +1966,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Ня" diff --git a/po/ms.po b/po/ms.po index ac1afe0..323873a 100644 --- a/po/ms.po +++ b/po/ms.po @@ -1940,6 +1940,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Aha" diff --git a/po/nb.po b/po/nb.po index 94418a2..c8682f3 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1899,6 +1899,7 @@ msgstr "Lørdag" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Søn" diff --git a/po/nl.po b/po/nl.po index d60a80f..f70653e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1888,6 +1888,7 @@ msgstr "zaterdag" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "zo" diff --git a/po/pl.po b/po/pl.po index b84ece8..279f0f9 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1923,6 +1923,7 @@ msgstr "Sobota" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Nie" diff --git a/po/pt.po b/po/pt.po index bfa7c3e..9b1820c 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1931,6 +1931,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Dom" diff --git a/po/pt_BR.po b/po/pt_BR.po index c8b77e8..f2f8f13 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1872,6 +1872,7 @@ msgstr "Sábado" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Dom" diff --git a/po/ro.po b/po/ro.po index 097bdf1..adafc26 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1979,6 +1979,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Dum" diff --git a/po/ru.po b/po/ru.po index 8d98693..7b1645c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1878,6 +1878,7 @@ msgstr "Суббота" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Вс" diff --git a/po/si.po b/po/si.po index 46b38b6..29fabfd 100644 --- a/po/si.po +++ b/po/si.po @@ -1881,6 +1881,7 @@ msgstr "සෙනසුරාදා" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "ඉරිදා" diff --git a/po/sk.po b/po/sk.po index ebf9938..923f027 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1868,6 +1868,7 @@ msgstr "Sobota" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Ne" diff --git a/po/sl.po b/po/sl.po index c782bbd..9444891 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1879,6 +1879,7 @@ msgstr "sobota" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "ned" diff --git a/po/sq.po b/po/sq.po index 344100f..67d56c8 100644 --- a/po/sq.po +++ b/po/sq.po @@ -1958,6 +1958,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day ibraries/common.lib.php:1493��"= -1, $format = '') [172.29.30.124]��F+��"q��F+��F+��x��F+��F+脶�F+�h��F+��F+��덕�F+6 ��!�!��x$��F+��"q��F+��F+��p��F+��F+�x��F+�F+��F+��F+��F+x$��F+��덕�F+�!�!��F+��"q��F+��F+��p��F+��F+�p��x��F+��F+��덕�F+GHIJKMNOP��H�h�F+��"q��F+��F+��0�F+�x��F+0��F+��E�F+�F+��F+��F+��F+H�h�F+��덕�F+8�h�F+��덕�F+(�h�F+��0��덕�F+�h�F+��`��덕�F+ ��F+�x��F+��F+��(F�F+�w��F+��F+��y(F�F+�w��F+�F+0��Z(F�F+�w��F+��E�F+0��F+��E�F+�F+�4��F+��F+��F+��F+�D�F+��덕�F+#%')*-.035678:<=��p[�F+��"q��F+8?��F+�x��F+�4��F+�9��F+��F+cf��F+��p[�F+��덕�F+�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv�2��F+@ ��F@y�F+F@y�F+?��F+ ��`�� F+�w��F+脶�F+�!��B@y�F+P ��F+��B@y�F+��덕�name" msgid "Sun" msgstr "Djl" diff --git a/po/sr.po b/po/sr.po index f1ede88..cd329ce 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1978,6 +1978,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Нед" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 41da8ff..43b4686 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -1972,6 +1972,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Ned" diff --git a/po/sv.po b/po/sv.po index 4a51bdc..d49096c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1848,6 +1848,7 @@ msgstr "Lördag" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Sön" diff --git a/po/ta.po b/po/ta.po index 82a7e44..73d1d12 100644 --- a/po/ta.po +++ b/po/ta.po @@ -1834,6 +1834,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "ஞாயிறு" diff --git a/po/te.po b/po/te.po index ffbdba2..3f08e4b 100644 --- a/po/te.po +++ b/po/te.po @@ -1878,6 +1878,7 @@ msgstr "శనివారం" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "ఆది" diff --git a/po/th.po b/po/th.po index 055f409..bfd3b31 100644 --- a/po/th.po +++ b/po/th.po @@ -1922,6 +1922,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "อา." diff --git a/po/tr.po b/po/tr.po index a36ea46..f050ada 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1837,6 +1837,7 @@ msgstr "Cumartesi" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Paz" diff --git a/po/tt.po b/po/tt.po index e6f7d17..176e6cf 100644 --- a/po/tt.po +++ b/po/tt.po @@ -1964,6 +1964,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Ykş" diff --git a/po/ug.po b/po/ug.po index 36c8ec6..9e69bd7 100644 --- a/po/ug.po +++ b/po/ug.po @@ -1906,6 +1906,7 @@ msgstr "شەنبە" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "يەكشەنبە" diff --git a/po/uk.po b/po/uk.po index 0e0d3e2..2a656b0 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1862,6 +1862,7 @@ msgstr "Субота" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Нд" diff --git a/po/ur.po b/po/ur.po index 4578809..eb2f70c 100644 --- a/po/ur.po +++ b/po/ur.po @@ -1892,6 +1892,7 @@ msgstr "ہفتہ" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "اتوار" diff --git a/po/uz.po b/po/uz.po index cd08bee..c37dab4 100644 --- a/po/uz.po +++ b/po/uz.po @@ -2009,6 +2009,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Якш" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index c1325c9..4ddad89 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -2016,6 +2016,7 @@ msgstr "" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "Yaksh" diff --git a/po/zh_CN.po b/po/zh_CN.po index 4aae818..b6fc99f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1858,6 +1858,7 @@ msgstr "星期六" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "周日" diff --git a/po/zh_TW.po b/po/zh_TW.po index c3d6046..38d24d8 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1852,6 +1852,7 @@ msgstr "星期六" #. l10n: Short week day name #: js/messages.php:346 libraries/common.lib.php:1493 +msgctx "Short week day name" msgid "Sun" msgstr "週日" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13431-g563a9e6
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 563a9e6739da02a7c028000768698a40ca89a531 (commit) via 8d6e11b41d0903c5689ebeb77364497fc2168fbb (commit) via 6626e0d28bcb22656db0d0661939608221c3326b (commit) via c5cb922c123534387d4f63deb4c627217109e296 (commit) via 6cefcb72006635654b9ce364ae7aec9b79d68f21 (commit) via 946ef336ee01efbf1cc76385bdaf009e868a2f2d (commit) via 0a74c0396960419df344dbeaac425e2061eeb18e (commit) via 93f2ba40cc5afea1b81cf4b27c1faf1415218012 (commit) via 457373f3452df9f93b3e95fe25447554319a3469 (commit) via 89e6ad808795891322631a36a20a1b5fe22f5125 (commit) via 4004d44094e272f217ad01b0bed141e12b625ff9 (commit) via ec14675696941a3c4d6628d9cad844a49a325e8b (commit) via b2260d84fcd8624bed3d2937b1daa616bbe63ea3 (commit) via 62d916b6085b6c145d14df1ff7bd9df44eb79359 (commit) via 71b049aa06a7ae37dccb6dc34c5c981608bfd66a (commit) via 07906017ca18da61052d19b86e3860dd7d847c34 (commit) via 90936bf92106ba11473a71cf6ae41a9a5e2cddef (commit) via 015a3be675e23cb9cf81a5edaf0e1d553f530e73 (commit) via 66df04db7cf65248b2b4e55656fb6bdb015edd80 (commit) via 0a841b9648d63b80a90ee67c2d4087e4a891f7fe (commit) via b5e6b6eb883378dfa1006d7785f2f79ff4c5f3ae (commit) via 3291364b0f523b42f7000958a11752dc461f892c (commit) via 604185b3a85f234e8e7f34fe4179a14bad3d9bec (commit) via d03fd6b7852343a59aeded50ffe3c6df807b83e7 (commit) via b515423896fc4e4f7e345e20e7a7a785242b0d62 (commit) via 331aebb8aa06f587b00ea65406b9087a4a593178 (commit) via b4d92b6de4e6bd6eca8f6249d1c549f26c6ed3a1 (commit) via 0f1bd4c5bf3557f7ef92bd9c34aa49ea2cdbb380 (commit) via 45ee21c57415d12d81b43dfafabe73f146090393 (commit) via ef76b48b808aa82bb64095c5e374ab5a80a67f52 (commit) via 0e2f6711f72c1b05b604d63ced35e27cace56377 (commit) via 1c7aec142df4249d65c30315ac7218a98673c786 (commit) via 78d791300428de3d705f3eda36c82316f007e9cc (commit) via 4e089013e7fc2471d773f7c043563fffc618090e (commit) via dab3295bfdcf2e4ca4391736847a6529948b359c (commit) via acb178ce00267bf99594134f5fbff83a598a104d (commit) via fc78444dc3d462b1e3c351bd6da966fe4ab69fcf (commit) via 35cb219f81816cac7155c246261e5eeb8578afb7 (commit) via 3668e4ce58b7b1fbf1e08fff8d5d092a6d188803 (commit) via 8491d2697cb2cfd3d7a2b706d506b2c0309f4b5e (commit) via 843bd3d32fa7de78b2cfda051a020edaca7da89f (commit) via a03147eef148905e314f177225def6f586b89241 (commit) via 883e468966f74bd58ac9f521823c77a5258cd682 (commit) via 408522d6afbb197693fb2a67ff689a90dc1d6e99 (commit) via 1cce2ff0b43fe52df33a08ea5373dd5b4cf5a97c (commit) via 527192206696eb0689e7f7463f69f328b6a58a93 (commit) via 175f1a320c2a670877c7095e829509da97546ccb (commit) via 746d8096a249976c1df7b8596177414024ef2ccb (commit) via c935e7f6a9d9644efc87cb6ef4d7e28504840725 (commit) via b7b09c3a8c6720e2b80387cd0e283fc9fa61966c (commit) via 27488ffbb514b16c30be41f10e83eb562d55c02a (commit) via dd124036e4c20b32bd21d0060b43393ac50ec221 (commit) via 9ec66350b221598a69fbdf5e93c075d2ea2fb802 (commit) from e35debd7b5ef79f2c219194e51c8724171326b37 (commit) - Log ----------------------------------------------------------------- commit 563a9e6739da02a7c028000768698a40ca89a531 Merge: e35debd 8d6e11b Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 15:51:46 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 8d6e11b41d0903c5689ebeb77364497fc2168fbb Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:51:00 2011 +0200 Translation update done using Pootle. commit 6626e0d28bcb22656db0d0661939608221c3326b Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:50:48 2011 +0200 Translation update done using Pootle. commit c5cb922c123534387d4f63deb4c627217109e296 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:50:39 2011 +0200 Translation update done using Pootle. commit 6cefcb72006635654b9ce364ae7aec9b79d68f21 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:50:28 2011 +0200 Translation update done using Pootle. commit 946ef336ee01efbf1cc76385bdaf009e868a2f2d Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:49:58 2011 +0200 Translation update done using Pootle. commit 0a74c0396960419df344dbeaac425e2061eeb18e Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:49:43 2011 +0200 Translation update done using Pootle. commit 93f2ba40cc5afea1b81cf4b27c1faf1415218012 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:49:34 2011 +0200 Translation update done using Pootle. commit 457373f3452df9f93b3e95fe25447554319a3469 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:49:22 2011 +0200 Translation update done using Pootle. commit 89e6ad808795891322631a36a20a1b5fe22f5125 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:47:43 2011 +0200 Translation update done using Pootle. commit 4004d44094e272f217ad01b0bed141e12b625ff9 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:47:34 2011 +0200 Translation update done using Pootle. commit ec14675696941a3c4d6628d9cad844a49a325e8b Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:47:23 2011 +0200 Translation update done using Pootle. commit b2260d84fcd8624bed3d2937b1daa616bbe63ea3 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:47:11 2011 +0200 Translation update done using Pootle. commit 62d916b6085b6c145d14df1ff7bd9df44eb79359 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:46:59 2011 +0200 Translation update done using Pootle. commit 71b049aa06a7ae37dccb6dc34c5c981608bfd66a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:46:15 2011 +0200 Translation update done using Pootle. commit 07906017ca18da61052d19b86e3860dd7d847c34 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:45:18 2011 +0200 Translation update done using Pootle. commit 90936bf92106ba11473a71cf6ae41a9a5e2cddef Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:44:41 2011 +0200 Translation update done using Pootle. commit 015a3be675e23cb9cf81a5edaf0e1d553f530e73 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:44:10 2011 +0200 Translation update done using Pootle. commit 66df04db7cf65248b2b4e55656fb6bdb015edd80 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:44:03 2011 +0200 Translation update done using Pootle. commit 0a841b9648d63b80a90ee67c2d4087e4a891f7fe Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:43:42 2011 +0200 Translation update done using Pootle. commit b5e6b6eb883378dfa1006d7785f2f79ff4c5f3ae Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:43:33 2011 +0200 Translation update done using Pootle. commit 3291364b0f523b42f7000958a11752dc461f892c Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:43:24 2011 +0200 Translation update done using Pootle. commit 604185b3a85f234e8e7f34fe4179a14bad3d9bec Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:43:17 2011 +0200 Translation update done using Pootle. commit d03fd6b7852343a59aeded50ffe3c6df807b83e7 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:43:11 2011 +0200 Translation update done using Pootle. commit b515423896fc4e4f7e345e20e7a7a785242b0d62 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:43:04 2011 +0200 Translation update done using Pootle. commit 331aebb8aa06f587b00ea65406b9087a4a593178 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:42:57 2011 +0200 Translation update done using Pootle. commit b4d92b6de4e6bd6eca8f6249d1c549f26c6ed3a1 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:42:44 2011 +0200 Translation update done using Pootle. commit 0f1bd4c5bf3557f7ef92bd9c34aa49ea2cdbb380 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:42:22 2011 +0200 Translation update done using Pootle. commit 45ee21c57415d12d81b43dfafabe73f146090393 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:42:12 2011 +0200 Translation update done using Pootle. commit ef76b48b808aa82bb64095c5e374ab5a80a67f52 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:42:04 2011 +0200 Translation update done using Pootle. commit 0e2f6711f72c1b05b604d63ced35e27cace56377 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:41:35 2011 +0200 Translation update done using Pootle. commit 1c7aec142df4249d65c30315ac7218a98673c786 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:41:23 2011 +0200 Translation update done using Pootle. commit 78d791300428de3d705f3eda36c82316f007e9cc Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:41:13 2011 +0200 Translation update done using Pootle. commit 4e089013e7fc2471d773f7c043563fffc618090e Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:40:11 2011 +0200 Translation update done using Pootle. commit dab3295bfdcf2e4ca4391736847a6529948b359c Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:40:02 2011 +0200 Translation update done using Pootle. commit acb178ce00267bf99594134f5fbff83a598a104d Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:39:30 2011 +0200 Translation update done using Pootle. commit fc78444dc3d462b1e3c351bd6da966fe4ab69fcf Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:39:07 2011 +0200 Translation update done using Pootle. commit 35cb219f81816cac7155c246261e5eeb8578afb7 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:38:51 2011 +0200 Translation update done using Pootle. commit 3668e4ce58b7b1fbf1e08fff8d5d092a6d188803 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:38:15 2011 +0200 Translation update done using Pootle. commit 8491d2697cb2cfd3d7a2b706d506b2c0309f4b5e Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:38:04 2011 +0200 Translation update done using Pootle. commit 843bd3d32fa7de78b2cfda051a020edaca7da89f Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:37:44 2011 +0200 Translation update done using Pootle. commit a03147eef148905e314f177225def6f586b89241 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:37:14 2011 +0200 Translation update done using Pootle. commit 883e468966f74bd58ac9f521823c77a5258cd682 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:36:54 2011 +0200 Translation update done using Pootle. commit 408522d6afbb197693fb2a67ff689a90dc1d6e99 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:35:46 2011 +0200 Translation update done using Pootle. commit 1cce2ff0b43fe52df33a08ea5373dd5b4cf5a97c Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:35:33 2011 +0200 Translation update done using Pootle. commit 527192206696eb0689e7f7463f69f328b6a58a93 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:35:07 2011 +0200 Translation update done using Pootle. commit 175f1a320c2a670877c7095e829509da97546ccb Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:34:15 2011 +0200 Translation update done using Pootle. commit 746d8096a249976c1df7b8596177414024ef2ccb Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:33:44 2011 +0200 Translation update done using Pootle. commit c935e7f6a9d9644efc87cb6ef4d7e28504840725 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:33:01 2011 +0200 Translation update done using Pootle. commit b7b09c3a8c6720e2b80387cd0e283fc9fa61966c Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:32:40 2011 +0200 Translation update done using Pootle. commit 27488ffbb514b16c30be41f10e83eb562d55c02a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:32:10 2011 +0200 Translation update done using Pootle. commit dd124036e4c20b32bd21d0060b43393ac50ec221 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:30:11 2011 +0200 Translation update done using Pootle. commit 9ec66350b221598a69fbdf5e93c075d2ea2fb802 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 15:29:35 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/lt.po | 131 +++++++++++++++++++++++++++----------------------------------- 1 files changed, 57 insertions(+), 74 deletions(-) diff --git a/po/lt.po b/po/lt.po index 7b0e89b..265e94c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-08 10:07+0200\n" -"PO-Revision-Date: 2011-04-05 15:52+0200\n" +"PO-Revision-Date: 2011-08-08 15:51+0200\n" "Last-Translator: Kęstutis <forkik(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" -"%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" +"100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 @@ -415,10 +415,10 @@ msgid "You have to choose at least one column to display" msgstr "Pasirinkite bent vieną stulpelį išvedimui" #: db_qbe.php:186 -#, fuzzy, php-format +#, php-format #| msgid "visual builder" msgid "Switch to %svisual builder%s" -msgstr "vizuali daryklė" +msgstr "Pereiti į %svizualią daryklę%s" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:951 @@ -567,10 +567,9 @@ msgid "Search in database" msgstr "Paieška duomenų bazėje" #: db_search.php:275 -#, fuzzy #| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" msgid "Words or values to search for (wildcard: \"%\"):" -msgstr "Paieškos žodis(iai) arba reikšmė(ės) (pakaitos simbolis: \"%\"):" +msgstr "Paieškos žodis(iai) arba reikšmė(ės) (pakaitos simboliui: \"%\"):" #: db_search.php:280 msgid "Find:" @@ -714,22 +713,19 @@ msgid "Analyze table" msgstr "Analizuoti lentelę" #: db_structure.php:515 -#, fuzzy #| msgid "Go to table" msgid "Add prefix to table" -msgstr "Eiti į lentelę" +msgstr "Pridėti priešdėlį lentelės pavadinimui" #: db_structure.php:517 libraries/mult_submits.inc.php:251 -#, fuzzy #| msgid "Replace table data with file" msgid "Replace table prefix" -msgstr "Pakeisti lentelės turinį failo duomenimis " +msgstr "Pakeisti lentelės pavadinimo priešdėlį" #: db_structure.php:519 libraries/mult_submits.inc.php:251 -#, fuzzy #| msgid "Replace table data with file" msgid "Copy table with prefix" -msgstr "Pakeisti lentelės turinį failo duomenimis " +msgstr "Kopijuoti lentelę su pavadinimo priešdėliu" #: db_structure.php:559 libraries/schema/User_Schema.class.php:382 msgid "Data Dictionary" @@ -825,7 +821,7 @@ msgstr "Įveskite kiekvieną reikšmę atskirame laukelyje." #: enum_editor.php:57 msgid "+ Restart insertion and add a new value" -msgstr "" +msgstr "+ Paleisti iš naujo įterpimą ir pridėti naują reikšmę" #: enum_editor.php:67 msgid "Output" @@ -975,16 +971,14 @@ msgid "You are about to DESTROY a complete database!" msgstr "Jūs ruošiatės SUNAIKINTI visą duomenų bazę!" #: js/messages.php:34 -#, fuzzy #| msgid "You are about to DESTROY a complete database!" msgid "You are about to DESTROY a complete table!" -msgstr "Jūs ruošiatės SUNAIKINTI visą duomenų bazę!" +msgstr "Jūs ruošiatės SUNAIKINTI visą lentelę!" #: js/messages.php:35 -#, fuzzy #| msgid "You are about to DESTROY a complete database!" msgid "You are about to TRUNCATE a complete table!" -msgstr "Jūs ruošiatės SUNAIKINTI visą duomenų bazę!" +msgstr "Jūs ruošiatės SUNAIKINTI visą lentelę!" #: js/messages.php:37 msgid "Deleting tracking data" @@ -1017,7 +1011,6 @@ msgstr "Įveskite skaičių!" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:51 -#, fuzzy #| msgid "Total" msgid "Total count" msgstr "Iš viso" @@ -1040,10 +1033,9 @@ msgstr "Slaptažodžiai nesutampa!" #: js/messages.php:58 server_privileges.php:1766 server_privileges.php:1790 #: server_privileges.php:2195 server_privileges.php:2389 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "Bet kurį vartotoją" +msgstr "Pridėti naudotoją" #: js/messages.php:59 msgid "Reloading Privileges" @@ -1067,24 +1059,22 @@ msgid "Edit" msgstr "Redaguoti" #: js/messages.php:66 server_status.php:667 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "Pasirinkti serverį" +msgstr "Tiesioginių duomenų srauto diagrama" #: js/messages.php:67 server_status.php:670 msgid "Live conn./process chart" -msgstr "" +msgstr "Tiesioginių prisijungimų/procesų diagrama" #: js/messages.php:68 server_status.php:688 -#, fuzzy #| msgid "Show query box" msgid "Live query chart" -msgstr "Rodyti užklausos laukelį" +msgstr "Tiesioginė užklausos diagrama" #: js/messages.php:70 msgid "Static data" -msgstr "" +msgstr "Statiniai duomenys" #. l10n: Total number of queries #: js/messages.php:72 libraries/build_html_for_db.lib.php:46 @@ -1097,7 +1087,7 @@ msgstr "Iš viso" #. l10n: Other, small valued, queries #: js/messages.php:74 server_status.php:873 msgid "Other" -msgstr "" +msgstr "Kita" #. l10n: Thousands separator #: js/messages.php:76 libraries/common.lib.php:1332 @@ -1111,31 +1101,29 @@ msgstr "," #: js/messages.php:80 msgid "KiB sent since last refresh" -msgstr "" +msgstr "KiB išsiųsta nuo paskutinio naujinimo" #: js/messages.php:81 msgid "KiB received since last refresh" -msgstr "" +msgstr "KiB gauta nuo paskutinio naujinimo" #: js/messages.php:82 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic (in KiB)" -msgstr "Pasirinkti serverį" +msgstr "Serverio duomenų srautas (KiB)" #: js/messages.php:83 msgid "Connections since last refresh" -msgstr "" +msgstr "prisijungimų nuo paskutinio įkėlimo iš naujo" #: js/messages.php:84 js/messages.php:115 server_status.php:1068 msgid "Processes" msgstr "Procesai" #: js/messages.php:85 -#, fuzzy #| msgid "Connections" msgid "Connections / Processes" -msgstr "Prisijungimai" +msgstr "Prisijungimai / Procesai" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:87 @@ -1153,15 +1141,15 @@ msgstr "Užklausų statistika" #: js/messages.php:94 msgid "System CPU Usage" -msgstr "" +msgstr "Sistemos CPU naudojimas" #: js/messages.php:95 msgid "System memory" -msgstr "" +msgstr "Sistemos atmintis" #: js/messages.php:96 msgid "System swap" -msgstr "" +msgstr "Sistemos swap" #: js/messages.php:97 libraries/common.lib.php:1291 server_status.php:1512 msgid "MiB" @@ -1173,61 +1161,56 @@ msgstr "KiB" #: js/messages.php:100 msgid "Average load" -msgstr "" +msgstr "Vidutinis apkrovimas" #: js/messages.php:101 -#, fuzzy #| msgid "Total" msgid "Total memory" -msgstr "Iš viso" +msgstr "Iš viso atminties" #: js/messages.php:102 msgid "Cached memory" -msgstr "" +msgstr "Podėlio atmintis" #: js/messages.php:103 -#, fuzzy #| msgid "Buffer Pool" msgid "Buffered memory" -msgstr "Buferio Pool'as" +msgstr "Buferio atmintis" #: js/messages.php:104 msgid "Free memory" -msgstr "" +msgstr "Laisva atmintis" #: js/messages.php:105 msgid "Used memory" -msgstr "" +msgstr "Naudojama atmintis" #: js/messages.php:107 -#, fuzzy #| msgid "Total" msgid "Total Swap" -msgstr "Iš viso" +msgstr "Iš viso Swap" #: js/messages.php:108 msgid "Cached Swap" -msgstr "" +msgstr "Podėlio Swap" #: js/messages.php:109 msgid "Used Swap" -msgstr "" +msgstr "Naudojama swap" #: js/messages.php:110 -#, fuzzy #| msgid "Free pages" msgid "Free Swap" -msgstr "Tušti puslapiai" +msgstr "Laisva Swap" #: js/messages.php:112 msgid "Bytes sent" -msgstr "" +msgstr "Išsiųsta baitų" #: js/messages.php:113 -#, fuzzy #| msgid "Received" msgid "Bytes received" -msgstr "Gauta" +msgstr "Gauta baitų" #: js/messages.php:114 server_status.php:994 msgid "Connections" @@ -1250,14 +1233,13 @@ msgid "Settings" msgstr "Nustatymai" #: js/messages.php:121 -#, fuzzy #| msgid "Remove database" msgid "Remove chart" -msgstr "Pašalinti duomenų bazę" +msgstr "Pašalinti diagramą" #: js/messages.php:122 msgid "Edit title and labels" -msgstr "" +msgstr "Keisti pavadinimą ir etiketes" #: js/messages.php:123 #, fuzzy @@ -1267,7 +1249,7 @@ msgstr "Pritraukti prie tinklelio" #: js/messages.php:125 msgid "Please add at least one variable to the series" -msgstr "" +msgstr "Prašome pridėti bent vieną kintamąjį į eilę" #: js/messages.php:126 libraries/display_export.lib.php:308 #: libraries/display_tbl.lib.php:573 libraries/export/sql.php:1052 @@ -1286,19 +1268,19 @@ msgstr "" #: js/messages.php:130 msgid "general_log and slow_query_log are enabled." -msgstr "" +msgstr "general_log ir slow_query_log yra įjungti." #: js/messages.php:131 msgid "general_log is enabled." -msgstr "" +msgstr "general_log įjungtas." #: js/messages.php:132 msgid "slow_query_log is enabled." -msgstr "" +msgstr "slow_query_log įjungtas." #: js/messages.php:133 msgid "slow_query_log and general_log are disabled." -msgstr "" +msgstr "slow_query_log ir general_log yra išjungti." #: js/messages.php:134 msgid "log_output is not set to TABLE." @@ -1326,6 +1308,8 @@ msgid "" "Following settings will be applied globally and reset to default on server " "restart:" msgstr "" +"Sekantys nustatymai bus pritaikyti globaliai ir nustatyti į numatytuosius po " +"serverio pakartotino paleidimo:" #. l10n: %s is FILE or TABLE #: js/messages.php:140 @@ -1336,47 +1320,46 @@ msgstr "Išsaugoti į failą" #. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:142 -#, fuzzy, php-format +#, php-format #| msgid "Enabled" msgid "Enable %s" -msgstr "Įjungta" +msgstr "Įjungti %s" #. l10n: Disable in this context means setting a status variable to OFF #: js/messages.php:144 -#, fuzzy, php-format +#, php-format #| msgid "Disabled" msgid "Disable %s" -msgstr "Išjungta" +msgstr "Išjungti %s" #. l10n: %d seconds #: js/messages.php:146 #, php-format msgid "Set long_query_time to %ds" -msgstr "" +msgstr "Nustatyti long_query_time į %ds" #: js/messages.php:147 msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." msgstr "" +"Jūs negalite pakeisti šių kintamųjų. Prašome prisijungti kaip root arba " +"susisiekite su Jūsų duombazės administratoriumi." #: js/messages.php:148 -#, fuzzy #| msgid "Manage your settings" msgid "Change settings" -msgstr "Keiskite savo nustatymus" +msgstr "Keisti nustatymus" #: js/messages.php:149 -#, fuzzy #| msgid "More settings" msgid "Current settings" -msgstr "Daugiau nustatymų" +msgstr "Dabartiniai nustatymai" #: js/messages.php:151 server_status.php:1472 -#, fuzzy #| msgid "Report title:" msgid "Chart Title" -msgstr "Ataskaitos antraštė:" +msgstr "Diagramos antraštė" #. l10n: As in differential values #: js/messages.php:153 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13378-ge35debd
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via e35debd7b5ef79f2c219194e51c8724171326b37 (commit) via 3f2ffbe297210136099faf15039041ee2c921cbe (commit) via 1fae25710df561d0fed52b96cd5885fe4e05d63f (commit) via b9e17020b889bfe5e10de3e8ab8b5ab23ea81126 (commit) via dae7d3bd4a2f1c36f5a928fad015c5d099aeec9f (commit) via 21afd1786006ebd1045123446a4a87c592359dcb (commit) via 0fc55bb503fdb18dc701bc9a6a84374aad1ecc0d (commit) from f16efa15ddfa22852a9195d40c3cc39d8b26cd4f (commit) - Log ----------------------------------------------------------------- commit e35debd7b5ef79f2c219194e51c8724171326b37 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 15:50:43 2011 +0200 Proper placement of l10n comments commit 3f2ffbe297210136099faf15039041ee2c921cbe Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 15:48:23 2011 +0200 Avoid defining link several times commit 1fae25710df561d0fed52b96cd5885fe4e05d63f Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 15:46:37 2011 +0200 Wrap long line commit b9e17020b889bfe5e10de3e8ab8b5ab23ea81126 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 15:46:18 2011 +0200 Whitespace cleanup commit dae7d3bd4a2f1c36f5a928fad015c5d099aeec9f Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 15:46:05 2011 +0200 Improve code readability commit 21afd1786006ebd1045123446a4a87c592359dcb Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 15:45:47 2011 +0200 Wrap long line commit 0fc55bb503fdb18dc701bc9a6a84374aad1ecc0d Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 15:43:34 2011 +0200 Remove debugging code ----------------------------------------------------------------------- Summary of changes: js/common.js | 2 - libraries/common.lib.php | 52 +++++++++++++++++++++++++++++++++------------ 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/js/common.js b/js/common.js index 9b5dcf6..47fd3bf 100644 --- a/js/common.js +++ b/js/common.js @@ -180,7 +180,6 @@ function markDbTable(db, table) */ function setAll( new_lang, new_collation_connection, new_server, new_db, new_table, new_token ) { - //alert('setAll( ' + new_lang + ', ' + new_collation_connection + ', ' + new_server + ', ' + new_db + ', ' + new_table + ', ' + new_token + ' )'); if (new_server != server || new_lang != lang || new_collation_connection != collation_connection) { // something important has changed @@ -240,7 +239,6 @@ function focus_querywindow(sql_query) if ( !querywindow || querywindow.closed || !querywindow.location) { // we need first to open the window and cannot pass the query with it // as we dont know if the query exceeds max url length - /* url = 'querywindow.php?' + common_query + '&db=' + db + '&table=' + table + '&sql_query=SELECT * FROM'; */ query_to_load = sql_query; open_querywindow(); insertQuery(0); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index c3a9d69..2f61cec 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -253,7 +253,10 @@ function PMA_unQuote($quoted_string, $quote = null) && substr($quoted_string, -1, 1) === $quote) { $unquoted_string = substr($quoted_string, 1, -1); // replace escaped quotes - $unquoted_string = str_replace($quote . $quote, $quote, $unquoted_string); + $unquoted_string = str_replace( + $quote . $quote, + $quote, + $unquoted_string); return $unquoted_string; } } @@ -290,9 +293,13 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '') if (! is_array($parsed_sql)) { // We don't so just return the input directly // This is intended to be used for when the SQL Parser is turned off - $formatted_sql = '<pre>' . "\n" - . (($cfg['SQP']['fmtType'] == 'none' && $unparsed_sql != '') ? $unparsed_sql : $parsed_sql) . "\n" - . '</pre>'; + $formatted_sql = '<pre>' . "\n"; + if ($cfg['SQP']['fmtType'] == 'none' && $unparsed_sql != '') { + $formatted_sql .= $unparsed_sql; + } else { + $formatted_sql .= $parsed_sql; + } + $formatted_sql .= '</pre>'; return $formatted_sql; } @@ -301,7 +308,9 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '') switch ($cfg['SQP']['fmtType']) { case 'none': if ($unparsed_sql != '') { - $formatted_sql = '<span class="inner_sql"><pre>' . "\n" . PMA_SQP_formatNone(array('raw' => $unparsed_sql)) . "\n" . '</pre></span>'; + $formatted_sql = '<span class="inner_sql"><pre>' . "\n" + . PMA_SQP_formatNone(array('raw' => $unparsed_sql)) . "\n" + . '</pre></span>'; } else { $formatted_sql = PMA_SQP_formatNone($parsed_sql); } @@ -399,14 +408,15 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju break; } + $open_link = '<a href="' . PMA_linkURL($url) . '" target="mysql_doc">'; if ($just_open) { - return '<a href="' . PMA_linkURL($url) . '" target="mysql_doc">'; + return $open_link; } elseif ($big_icon) { - return '<a href="' . PMA_linkURL($url) . '" target="mysql_doc"><img class="icon ic_b_sqlhelp" src="themes/dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>'; + return $open_link . '<img class="icon ic_b_sqlhelp" src="themes/dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>'; } elseif ($GLOBALS['cfg']['ReplaceHelpImg']) { - return '<a href="' . PMA_linkURL($url) . '" target="mysql_doc"><img class="icon ic_b_help_s" src="themes/dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>'; + return $open_link . '<img class="icon ic_b_help_s" src="themes/dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>'; } else { - return '[<a href="' . PMA_linkURL($url) . '" target="mysql_doc">' . __('Documentation') . '</a>]'; + return '[' . $open_link . __('Documentation') . '</a>]'; } } // end of the 'PMA_showMySQLDocu()' function @@ -1287,8 +1297,22 @@ function PMA_profilingCheckbox($sql_query) */ function PMA_formatByteDown($value, $limes = 6, $comma = 0) { - /* l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ */ - $byteUnits = array(__('B'), __('KiB'), __('MiB'), __('GiB'), __('TiB'), __('PiB'), __('EiB')); + $byteUnits = array( + /* l10n: shortcuts for Byte */ + __('B'), + /* l10n: shortcuts for Kilobyte */ + __('KiB'), + /* l10n: shortcuts for Megabyte */ + __('MiB'), + /* l10n: shortcuts for Gigabyte */ + __('GiB'), + /* l10n: shortcuts for Terabyte */ + __('TiB'), + /* l10n: shortcuts for Petabyte */ + __('PiB'), + /* l10n: shortcuts for Exabyte */ + __('EiB') + ); $dh = PMA_pow(10, $comma); $li = PMA_pow(10, $limes); @@ -1702,7 +1726,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), if (stristr($message, '<img') && (!$strip_img || $GLOBALS['cfg']['PropertiesIconic'] === true) && strip_tags($message)==$message) { $displayed_message = '<span>' . htmlspecialchars(preg_replace('/^.*\salt="([^"]*)".*$/si', '\1', $message)) . '</span>'; } - + // Suhosin: Check that each query parameter is not above maximum $in_suhosin_limits = true; if ($url_length <= $GLOBALS['cfg']['LinkLengthLimit']) { @@ -1732,12 +1756,12 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), if (empty($tag_params['class'])) { $tag_params['class'] = 'link'; } - + if (! isset($query_parts)) { $query_parts = PMA_splitURLQuery($url); } $url_parts = parse_url($url); - + if ($new_form) { $ret = '<form action="' . $url_parts['path'] . '" class="link"' . ' method="post"' . $target . ' style="display: inline;">'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13371-gf16efa1
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via f16efa15ddfa22852a9195d40c3cc39d8b26cd4f (commit) via 021e81165360a6762a24be3a99f9da4f480d07ea (commit) from 662c96494fde621775f01afabc91ac4d293004c3 (commit) - Log ----------------------------------------------------------------- commit f16efa15ddfa22852a9195d40c3cc39d8b26cd4f Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 15:23:27 2011 +0200 Whitespace cleanup commit 021e81165360a6762a24be3a99f9da4f480d07ea Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 15:23:20 2011 +0200 Use standard way for passing messages ----------------------------------------------------------------------- Summary of changes: js/makegrid.js | 120 ++++++++++++++++++++-------------------- js/messages.php | 7 +++ libraries/display_tbl.lib.php | 6 -- 3 files changed, 67 insertions(+), 66 deletions(-) diff --git a/js/makegrid.js b/js/makegrid.js index 00d839f..13fcc37 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -4,7 +4,7 @@ var g = { // constant minColWidth: 15, - + // variables, assigned with default value, changed later actionSpan: 5, colOrder: new Array(), // array of column order @@ -21,7 +21,7 @@ showColVisibHint: false, showAllColText: '', // string, text for "show all" button under column visibility list visibleHeadersCount: 0, // number of visible data headers - + // functions dragStartRsz: function(e, obj) { // start column resize var n = $(this.cRsz).find('div').index(obj); @@ -35,7 +35,7 @@ $('body').css('cursor', 'col-resize'); $('body').noSelect(); }, - + dragStartMove: function(e, obj) { // start column move // prepare the cCpy and cPointer from the dragged column $(this.cCpy).text($(obj).text()); @@ -49,10 +49,10 @@ $(this.cPointer).css({ top: objPos.top }); - + // get the column index, zero-based var n = this.getHeaderIdx(obj); - + this.colMov = { x0: e.pageX, y0: e.pageY, @@ -66,7 +66,7 @@ $('body').css('cursor', 'move'); $('body').noSelect(); }, - + dragMove: function(e) { if (this.colRsz) { var dx = e.pageX - this.colRsz.x0; @@ -79,7 +79,7 @@ $(this.cCpy) .css('left', this.colMov.objLeft + dx) .show(); - + // pointer animation var hoveredCol = this.getHoveredCol(e); if (hoveredCol) { @@ -103,7 +103,7 @@ } } }, - + dragEnd: function(e) { if (this.colRsz) { var dx = e.pageX - this.colRsz.x0; @@ -114,7 +114,7 @@ var n = this.colRsz.n; // do the resizing this.resize(n, nw); - + $('body').css('cursor', 'default'); this.reposRsz(); this.reposDrop(); @@ -134,7 +134,7 @@ } this.refreshRestoreButton(); } - + // animate new column position $(this.cCpy).stop(true, true) .animate({ @@ -149,7 +149,7 @@ $('body').css('cursor', 'default'); $('body').noSelect(false); }, - + /** * Resize column n to new width "nw" */ @@ -160,7 +160,7 @@ .css('width', nw); }); }, - + /** * Reposition column resize bars. */ @@ -175,7 +175,7 @@ } $(this.cRsz).css('height', $(this.t).height()); }, - + /** * Shift column from index oldn to newn. */ @@ -195,7 +195,7 @@ }); // reposition the column resize bars this.reposRsz(); - + // adjust the column visibility list if (newn < oldn) { $(g.cList).find('.lDiv div:eq(' + newn + ')') @@ -213,7 +213,7 @@ this.colVisib.splice(oldn, 1); this.colVisib.splice(newn, 0, tmp); }, - + /** * Find currently hovered table column's header (excluding actions column). * @return the hovered column's th object or undefined if no hovered column found. @@ -230,14 +230,14 @@ }); return hoveredCol; }, - + /** * Get a zero-based index from a <th class="draggable"> tag in a table. */ getHeaderIdx: function(obj) { return $(obj).parents('tr').find('th.draggable').index(obj); }, - + /** * Reposition the table back to normal order. */ @@ -259,7 +259,7 @@ } this.refreshRestoreButton(); }, - + /** * Send column preferences (column order and visibility) to the server. */ @@ -276,7 +276,7 @@ table_create_time: this.tableCreateTime }); }, - + /** * Refresh restore button state. * Make restore button disabled if the table is similar with initial state. @@ -299,7 +299,7 @@ $('.restore_column').show(); } }, - + /** * Update current hint using the boolean values (showReorderHint, showSortHint, etc.). * It will hide the hint if all the boolean values is false. @@ -324,16 +324,16 @@ text += text.length > 0 ? '<br />' : ''; text += this.colVisibHint; } - + // hide the hint if no text this.qtip.disable(!text && e.type == 'mouseenter'); - + this.qtip.updateContent(text, false); } else { this.qtip.disable(true); } }, - + /** * Toggle column's visibility. * After calling this function and it returns true, afterToggleCol() must be called. @@ -367,7 +367,7 @@ } return true; }, - + /** * This must be called after calling toggleCol() and the return value is true. * @@ -379,12 +379,12 @@ this.reposRsz(); this.reposDrop(); this.sendColPrefs(); - + // check visible first row headers count this.visibleHeadersCount = $(this.t).find('tr:first th.draggable:visible').length; this.refreshRestoreButton(); }, - + /** * Show columns' visibility list. */ @@ -404,7 +404,7 @@ $(obj).addClass('coldrop-hover'); } }, - + /** * Hide columns' visibility list. */ @@ -412,7 +412,7 @@ $(this.cList).hide(); $(g.cDrop).find('.coldrop-hover').removeClass('coldrop-hover'); }, - + /** * Reposition the column visibility drop-down arrow. */ @@ -427,7 +427,7 @@ }); } }, - + /** * Show all hidden columns. */ @@ -440,61 +440,61 @@ this.afterToggleCol(); } } - + // wrap all data cells, except actions cell, with span $(t).find('th, td:not(:has(span))') .wrapInner('<span />'); - + g.gDiv = document.createElement('div'); // create global div g.cRsz = document.createElement('div'); // column resizer g.cCpy = document.createElement('div'); // column copy, to store copy of dragged column header g.cPointer = document.createElement('div'); // column pointer, used when reordering column g.cDrop = document.createElement('div'); // column drop-down arrows g.cList = document.createElement('div'); // column visibility list - + // adjust g.cCpy g.cCpy.className = 'cCpy'; $(g.cCpy).hide(); - + // adjust g.cPoint g.cPointer.className = 'cPointer'; $(g.cPointer).css('visibility', 'hidden'); - + // adjust g.cDrop g.cDrop.className = 'cDrop'; - + // adjust g.cList g.cList.className = 'cList'; $(g.cList).hide(); - + // chain table and grid together t.grid = g; g.t = t; - + // get first row data columns var $firstRowCols = $(t).find('tr:first th.draggable'); - + // initialize g.visibleHeadersCount g.visibleHeadersCount = $firstRowCols.filter(':visible').length; - + // assign first column (actions) span if (! $(t).find('tr:first th:first').hasClass('draggable')) { // action header exist g.actionSpan = $(t).find('tr:first th:first').prop('colspan'); } else { g.actionSpan = 0; } - + // assign table create time // #table_create_time will only available if we are in "Browse" tab g.tableCreateTime = $('#table_create_time').val(); - + // assign column reorder & column sort hint - g.reorderHint = $('#col_order_hint').val(); - g.sortHint = $('#sort_hint').val(); - g.markHint = $('#col_mark_hint').val(); - g.colVisibHint = $('#col_visib_hint').val(); - g.showAllColText = $('#show_all_col_text').val(); - + g.reorderHint = PMA_messages['strColOrderHint']; + g.sortHint = PMA_messages['strSortHint']; + g.markHint = PMA_messages['strMarkHint']; + g.colVisibHint = PMA_messages['strVisibHint']; + g.showAllColText = PMA_messages['strShowAll']; + // initialize column order $col_order = $('#col_order'); if ($col_order.length > 0) { @@ -508,7 +508,7 @@ g.colOrder.push(i); } } - + // initialize column visibility $col_visib = $('#col_visib'); if ($col_visib.length > 0) { @@ -522,7 +522,7 @@ g.colVisib.push(1); } } - + if ($firstRowCols.length > 1) { // create column drop-down arrow(s) $(t).find('th:not(.draggable)').each(function() { @@ -542,7 +542,7 @@ }); $(g.cDrop).append(cd); }); - + // add column visibility control g.cList.innerHTML = '<div class="lDiv"></div>'; var $listDiv = $(g.cList).find('div'); @@ -576,7 +576,7 @@ }); } } - + // create column borders $firstRowCols.each(function() { $this = $(this); @@ -588,15 +588,15 @@ $(g.cRsz).append(cb); }); g.reposRsz(); - + // bind event to update currently hovered qtip API $(t).find('th').mouseenter(function(e) { g.qtip = $(this).qtip('api'); }); - + // create qtip for each <th> with draggable class PMA_createqTip($(t).find('th.draggable')); - + // register events if (g.reorderHint) { // make sure columns is reorderable $(t).find('th.draggable') @@ -621,7 +621,7 @@ } if ($firstRowCols.length > 1) { var $colVisibTh = $(t).find('th:not(.draggable)'); - + PMA_createqTip($colVisibTh); $colVisibTh.mouseenter(function(e) { g.showColVisibHint = true; @@ -663,10 +663,10 @@ $(t).find('td, th.draggable').mouseenter(function() { g.hideColList(); }); - + // add table class $(t).addClass('pma_table'); - + // link all divs $(t).before(g.gDiv); $(g.gDiv).append(t); @@ -686,13 +686,13 @@ return false; }); }; - + // document ready checking var docready = false; $(document).ready(function() { docready = true; }); - + // Additional jQuery functions /** * Make resizable, reorderable grid. @@ -732,6 +732,6 @@ } }); } - + })(jQuery); diff --git a/js/messages.php b/js/messages.php index d5565ac..72d5f04 100644 --- a/js/messages.php +++ b/js/messages.php @@ -268,6 +268,13 @@ $js_messages['strNewerVersion'] = __('A newer version of phpMyAdmin is available $js_messages['strLatestAvailable'] = __(', latest stable version:'); $js_messages['strUpToDate'] = __('up to date'); +/* Browsing grid */ +$js_messages['strColOrderHint'] = __('Drag to reorder'); +$js_messages['strSortHint'] = __('Click to sort'); +$js_messages['strMarkHint'] = __('Click to mark/unmark'); +$js_messages['strVisibHint'] = __('Click the drop-down arrow<br />to toggle column\'s visibility'); +$js_messages['strShowAll'] = __('Show all'); + echo "var PMA_messages = new Array();\n"; foreach ($js_messages as $name => $js_message) { PMA_printJsValue("PMA_messages['" . $name . "']", $js_message); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 2f95f11..711998d 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -419,12 +419,6 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], 'Create_time') . '" />'; } } - // generate hints - echo '<input id="col_order_hint" type="hidden" value="' . __('Drag to reorder') . '" />'; - echo '<input id="sort_hint" type="hidden" value="' . __('Click to sort') . '" />'; - echo '<input id="col_mark_hint" type="hidden" value="' . __('Click to mark/unmark') . '" />'; - echo '<input id="col_visib_hint" type="hidden" value="' . __('Click the drop-down arrow<br />to toggle column\'s visibility') . '" />'; - echo '<input id="show_all_col_text" type="hidden" value="' . __('Show all') . '" />'; ?> </td> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13369-g662c964
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 662c96494fde621775f01afabc91ac4d293004c3 (commit) from 79df74937cd20a400837b76f264eef4a4f2fe245 (commit) - Log ----------------------------------------------------------------- commit 662c96494fde621775f01afabc91ac4d293004c3 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 14:33:23 2011 +0200 Fix and simplify theme selection js ----------------------------------------------------------------------- Summary of changes: js/functions.js | 6 ++---- libraries/Theme.class.php | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/js/functions.js b/js/functions.js index 9eb1244..b16cf80 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3135,10 +3135,8 @@ $(document).ready(function() { /** * Theme changer. */ - $('.take_theme').live('click', function(e) { - alert(e.target.nodeName); - var evt = $(e); - var what = evt.target.id; + $('.take_theme').click(function(e) { + var what = this.name; if (window.opener && window.opener.document.forms['setTheme'].elements['set_theme']) { window.opener.document.forms['setTheme'].elements['set_theme'].value = what; window.opener.document.forms['setTheme'].submit(); diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php index 252d554..f6b08a0 100644 --- a/libraries/Theme.class.php +++ b/libraries/Theme.class.php @@ -324,7 +324,7 @@ class PMA_Theme .' (' . htmlspecialchars($this->getVersion()) . ')</h2>'; echo '<p>'; echo '<a target="_top" class="take_theme" ' - .'id="' . htmlspecialchars($this->getId()) . '" ' + .'name="' . htmlspecialchars($this->getId()) . '" ' . 'href="index.php'.PMA_generate_common_url(array( 'set_theme' => $this->getId() )) . '">'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13368-g79df749
by Marc Delisle 08 Aug '11

08 Aug '11

The branch, master has been updated via 79df74937cd20a400837b76f264eef4a4f2fe245 (commit) via 1fa702b45c1d7cadf00fbcd4762f9368517fac09 (commit) via bfdf28e24c6b5b92451e3d9f71e9984eadf6c58c (commit) from 4d15c3d1205895b7eccfbcc79a0760c15c71724a (commit) - Log ----------------------------------------------------------------- commit 79df74937cd20a400837b76f264eef4a4f2fe245 Merge: 1fa702b45c1d7cadf00fbcd4762f9368517fac09 4d15c3d1205895b7eccfbcc79a0760c15c71724a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Aug 8 08:27:28 2011 -0400 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 1fa702b45c1d7cadf00fbcd4762f9368517fac09 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Aug 8 08:27:10 2011 -0400 Coding style commit bfdf28e24c6b5b92451e3d9f71e9984eadf6c58c Author: Tyron Madlener <tyronx(a)gmail.com> Date: Mon Aug 8 08:25:20 2011 -0400 Workaround too small value of suhosin.get.max_value_length ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 49 +++++++++++++++++++++++++++++++++------------ 1 files changed, 36 insertions(+), 13 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 5de802b..c3a9d69 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1702,8 +1702,23 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), if (stristr($message, '<img') && (!$strip_img || $GLOBALS['cfg']['PropertiesIconic'] === true) && strip_tags($message)==$message) { $displayed_message = '<span>' . htmlspecialchars(preg_replace('/^.*\salt="([^"]*)".*$/si', '\1', $message)) . '</span>'; } - + + // Suhosin: Check that each query parameter is not above maximum + $in_suhosin_limits = true; if ($url_length <= $GLOBALS['cfg']['LinkLengthLimit']) { + if ($suhosin_get_MaxValueLength = ini_get('suhosin.get.max_value_length')) { + $query_parts = PMA_splitURLQuery($url); + foreach($query_parts as $query_pair) { + list($eachvar, $eachval) = explode('=', $query_pair); + if(strlen($eachval) > $suhosin_get_MaxValueLength) { + $in_suhosin_limits = false; + break; + } + } + } + } + + if ($url_length <= $GLOBALS['cfg']['LinkLengthLimit'] && $in_suhosin_limits) { // no whitespace within an <a> else Safari will make it part of the link $ret = "\n" . '<a href="' . $url . '" ' . implode(' ', $tag_params_strings) . '>' @@ -1717,20 +1732,12 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), if (empty($tag_params['class'])) { $tag_params['class'] = 'link'; } - - // decode encoded url separators - $separator = PMA_get_arg_separator(); - // on most places separator is still hard coded ... - if ($separator !== '&') { - // ... so always replace & with $separator - $url = str_replace(htmlentities('&'), $separator, $url); - $url = str_replace('&', $separator, $url); + + if (! isset($query_parts)) { + $query_parts = PMA_splitURLQuery($url); } - $url = str_replace(htmlentities($separator), $separator, $url); - // end decode - $url_parts = parse_url($url); - $query_parts = explode($separator, $url_parts['query']); + if ($new_form) { $ret = '<form action="' . $url_parts['path'] . '" class="link"' . ' method="post"' . $target . ' style="display: inline;">'; @@ -1768,6 +1775,22 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), } // end of the 'PMA_linkOrButton()' function +function PMA_splitURLQuery($url) { + // decode encoded url separators + $separator = PMA_get_arg_separator(); + // on most places separator is still hard coded ... + if ($separator !== '&') { + // ... so always replace & with $separator + $url = str_replace(htmlentities('&'), $separator, $url); + $url = str_replace('&', $separator, $url); + } + $url = str_replace(htmlentities($separator), $separator, $url); + // end decode + + $url_parts = parse_url($url); + return explode($separator, $url_parts['query']); +} + /** * Returns a given timespan value in a readable format. * hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13365-g4d15c3d
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 4d15c3d1205895b7eccfbcc79a0760c15c71724a (commit) from b57e186331d2f1abeff9febbf8f9933d906eb029 (commit) - Log ----------------------------------------------------------------- commit 4d15c3d1205895b7eccfbcc79a0760c15c71724a Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 14:17:10 2011 +0200 Remove debugging code, adjust coding style ----------------------------------------------------------------------- Summary of changes: js/functions.js | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/js/functions.js b/js/functions.js index 008dcf2..9eb1244 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3116,8 +3116,12 @@ $(document).ready(function() { /** * Theme selector. */ - $('a.themeselect').live('click',function(e) { - window.open(e.target + '?foo=bar', 'themes','left=10,top=20,width=510,height=350,scrollbars=yes,status=yes,resizable=yes'); + $('a.themeselect').live('click', function(e) { + window.open( + e.target, + 'themes', + 'left=10,top=20,width=510,height=350,scrollbars=yes,status=yes,resizable=yes' + ); return false; }); hooks/post-receive -- phpMyAdmin

1 0