Git January 2012

git@phpmyadmin.net

5 participants
135 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25811-gfc928ad

by Marc Delisle

The branch, master has been updated via fc928ad7b6bf491b83713dfc8979cfeebf0dbd7f (commit) from 04b01182c4dafd9a278637e917d7b622da127784 (commit) - Log ----------------------------------------------------------------- commit fc928ad7b6bf491b83713dfc8979cfeebf0dbd7f Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jan 5 07:57:12 2012 -0500 bug #3093145 [display] Page through rows returned from a view ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + Documentation.html | 2 +- libraries/config.default.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba7c9fe..c5622a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ phpMyAdmin - ChangeLog - bug #3442069 [AJAX] database list not updated after adding/deleting a user + database - bug #3461750 [edit] Sort by key generates wrong sql with limit clause - bug #3340842 [structure] Error dropping index of non-existing column +- bug #3093145 [display] Page through rows returned from a view 3.4.10.0 (not yet released) - bug #3460090 [interface] TextareaAutoSelect feature broken diff --git a/Documentation.html b/Documentation.html index 7ddf464..48f9a89 100644 --- a/Documentation.html +++ b/Documentation.html @@ -2248,7 +2248,7 @@ setfacl -d -m "g:www-data:rwx" tmp <dt id="cfg_MaxExactCountViews">$cfg['MaxExactCountViews'] integer</dt> <dd>For VIEWs, since obtaining the exact count could have an impact on performance, this value is the maximum to be displayed, using - a <code>SELECT COUNT ... LIMIT</code>. The default value of 0 bypasses + a <code>SELECT COUNT ... LIMIT</code>. Setting this to 0 bypasses any row counting. </dd> diff --git a/libraries/config.default.php b/libraries/config.default.php index 8dff000..94005b7 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2426,7 +2426,7 @@ $cfg['MaxExactCount'] = 20000; * * @global integer $cfg['MaxExactCountViews'] */ -$cfg['MaxExactCountViews'] = 0; +$cfg['MaxExactCountViews'] = 100000; /** * Sort table and database in natural order hooks/post-receive -- phpMyAdmin

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. de7b3b65b1a15502059fa18c45dc757bcba7d4d6

by Michal Čihař

The branch, master has been updated via de7b3b65b1a15502059fa18c45dc757bcba7d4d6 (commit) from d9811573c47ccb8b314f36f72e444fb934df0eb5 (commit) - Log ----------------------------------------------------------------- commit de7b3b65b1a15502059fa18c45dc757bcba7d4d6 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jan 4 16:19:39 2012 +0100 Update year in template ----------------------------------------------------------------------- Summary of changes: templates/security/_PMASA_ | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/security/_PMASA_ b/templates/security/_PMASA_ index 42f4f53..485f486 100644 --- a/templates/security/_PMASA_ +++ b/templates/security/_PMASA_ @@ -3,16 +3,16 @@ <py:def function="announcement_id"> -PMASA-2011-? +PMASA-2012-? </py:def> <py:def function="announcement_date"> -2011-??-?? +2012-??-?? </py:def>  hooks/post-receive -- phpMyAdmin website

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25810-g04b0118

by Michal Čihař

The branch, master has been updated via 04b01182c4dafd9a278637e917d7b622da127784 (commit) from bca0185dfbdff8ce6586e5c034e7d9916a770481 (commit) - Log ----------------------------------------------------------------- commit 04b01182c4dafd9a278637e917d7b622da127784 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jan 4 16:20:23 2012 +0100 Update year ----------------------------------------------------------------------- Summary of changes: README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index bbc7762..8eafce0 100644 --- a/README +++ b/README @@ -13,7 +13,7 @@ Copyright Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> -Copyright (C) 2001-2011 +Copyright (C) 2001-2012 Marc Delisle <marc_at_infomarc.info> Olivier Müller <om_at_omnis.ch> Robin Johnson <robbat2_at_users.sourceforge.net> hooks/post-receive -- phpMyAdmin

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25809-gbca0185

by Michal Čihař

The branch, master has been updated via bca0185dfbdff8ce6586e5c034e7d9916a770481 (commit) from 75c263252716351ffeb5900f2d5573199a311820 (commit) - Log ----------------------------------------------------------------- commit bca0185dfbdff8ce6586e5c034e7d9916a770481 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jan 4 16:18:35 2012 +0100 Update year ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index 59788c1..7ddf464 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4694,7 +4694,7 @@ clicking on them, they will turn grey, what means that they will be synchronized <pre> Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> -Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info> +Copyright (C) 2001-2012 Marc Delisle <marc_at_infomarc.info> Olivier Müller <om_at_omnis.ch> Robin Johnson <robbat2_at_users.sourceforge.net> Alexander M. Turek <me_at_derrabus.de> hooks/post-receive -- phpMyAdmin

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25808-g75c2632

by Michal Čihař

The branch, master has been updated via 75c263252716351ffeb5900f2d5573199a311820 (commit) via 5d3b448c985d380d81c261e96e2badf4a031b369 (commit) via b1d61e7b881871d98a1203e9082523bf352d0976 (commit) via 948d7a290a803ede8e859c0867aab09ca236dc65 (commit) via ac1f345d75ecefcf4165697f305dd7e320d3e3a0 (commit) from 17eb0c75c5efa43760ac5715103a67ff92da5192 (commit) - Log ----------------------------------------------------------------- commit 75c263252716351ffeb5900f2d5573199a311820 Merge: 5d3b448 17eb0c7 Author: Pootle server <pootle(a)cihar.com> Date: Wed Jan 4 10:40:08 2012 +0100 Merge remote-tracking branch 'origin/master' commit 5d3b448c985d380d81c261e96e2badf4a031b369 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jan 3 20:53:53 2012 +0200 Translation update done using Pootle. commit b1d61e7b881871d98a1203e9082523bf352d0976 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jan 3 20:53:23 2012 +0200 Translation update done using Pootle. commit 948d7a290a803ede8e859c0867aab09ca236dc65 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jan 3 20:53:00 2012 +0200 Translation update done using Pootle. commit ac1f345d75ecefcf4165697f305dd7e320d3e3a0 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Jan 3 20:20:09 2012 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 17 +++++++---------- po/tr.po | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 2e08703..8fa5a34 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-02 07:46-0500\n" -"PO-Revision-Date: 2011-12-29 14:54+0200\n" +"PO-Revision-Date: 2012-01-03 20:53+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.1.6\n" @@ -2251,15 +2251,14 @@ msgstr "Wk" #. l10n: Month-year order for calendar, use either "calendar-month-year" or "calendar-year-month". #: js/messages.php:483 msgid "calendar-month-year" -msgstr "" +msgstr "calendar-month-year" #. l10n: Year suffix for calendar, "none" is empty. #: js/messages.php:485 -#, fuzzy #| msgid "None" msgctxt "Year suffix" msgid "none" -msgstr "None" +msgstr "none" #: js/messages.php:494 msgid "Hour" @@ -10525,7 +10524,6 @@ msgid "Using the monitor:" msgstr "Using the monitor:" #: server_status.php:1620 -#, fuzzy #| msgid "" #| "Ok, you are good to go! Once you click 'Start monitor' your browser will " #| "refresh all displayed charts in a regular interval. You may add charts " @@ -10536,10 +10534,9 @@ msgid "" "may add charts and change the refresh rate under 'Settings', or remove any " "chart using the cog icon on each respective chart." msgstr "" -"Ok, you are good to go! Once you click 'Start monitor' your browser will " -"refresh all displayed charts in a regular interval. You may add charts and " -"change the refresh rate under 'Settings', or remove any chart using the cog " -"icon on each respective chart." +"Your browser will refresh all displayed charts in a regular interval. You " +"may add charts and change the refresh rate under 'Settings', or remove any " +"chart using the cog icon on each respective chart." #: server_status.php:1622 msgid "" diff --git a/po/tr.po b/po/tr.po index be75ef6..00d1ea9 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2262,7 +2262,7 @@ msgstr "Hs" #. l10n: Month-year order for calendar, use either "calendar-month-year" or "calendar-year-month". #: js/messages.php:483 msgid "calendar-month-year" -msgstr "takvim-ay-yıl" +msgstr "calendar-month-year" #. l10n: Year suffix for calendar, "none" is empty. #: js/messages.php:485 hooks/post-receive -- phpMyAdmin

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25803-g17eb0c7

by Michal Čihař

The branch, master has been updated via 17eb0c75c5efa43760ac5715103a67ff92da5192 (commit) from aac185956cef6c59875701dfd0537070871b7d07 (commit) - Log ----------------------------------------------------------------- commit 17eb0c75c5efa43760ac5715103a67ff92da5192 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Jan 4 09:48:00 2012 +0100 Remove duplicate line ----------------------------------------------------------------------- Summary of changes: config.sample.inc.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/config.sample.inc.php b/config.sample.inc.php index d392003..a98d548 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -53,7 +53,6 @@ $cfg['Servers'][$i]['AllowNoPassword'] = false; // $cfg['Servers'][$i]['pdf_pages'] = 'pma_pdf_pages'; // $cfg['Servers'][$i]['column_info'] = 'pma_column_info'; // $cfg['Servers'][$i]['history'] = 'pma_history'; -// $cfg['Servers'][$i]['recent'] = 'pma_recent'; // $cfg['Servers'][$i]['table_uiprefs'] = 'pma_table_uiprefs'; // $cfg['Servers'][$i]['tracking'] = 'pma_tracking'; // $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords'; hooks/post-receive -- phpMyAdmin

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25802-gaac1859

by Michal Čihař

The branch, master has been updated via aac185956cef6c59875701dfd0537070871b7d07 (commit) via d0a0141ae5b31b6f8c072d795d8ad290e3cc8555 (commit) via de002ea747661d300bd88427900f71078f5ebfe2 (commit) from 547998e68ac54c6e7ddd0aa1324e3fb718df408c (commit) - Log ----------------------------------------------------------------- commit aac185956cef6c59875701dfd0537070871b7d07 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Jan 3 17:09:18 2012 +0200 Translation update done using Pootle. commit d0a0141ae5b31b6f8c072d795d8ad290e3cc8555 Author: any anonymous user <> Date: Tue Jan 3 17:09:01 2012 +0200 Translation update done using Pootle. commit de002ea747661d300bd88427900f71078f5ebfe2 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Jan 3 17:09:00 2012 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/po/tr.po b/po/tr.po index ef171eb..be75ef6 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-02 07:46-0500\n" -"PO-Revision-Date: 2011-12-19 17:00+0200\n" +"PO-Revision-Date: 2012-01-03 17:09+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.1.6\n" @@ -2262,15 +2262,14 @@ msgstr "Hs" #. l10n: Month-year order for calendar, use either "calendar-month-year" or "calendar-year-month". #: js/messages.php:483 msgid "calendar-month-year" -msgstr "" +msgstr "takvim-ay-yıl" #. l10n: Year suffix for calendar, "none" is empty. #: js/messages.php:485 -#, fuzzy #| msgid "None" msgctxt "Year suffix" msgid "none" -msgstr "Yok" +msgstr "yok" #: js/messages.php:494 msgid "Hour" hooks/post-receive -- phpMyAdmin

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25799-g547998e

by Michal Čihař

The branch, master has been updated via 547998e68ac54c6e7ddd0aa1324e3fb718df408c (commit) via df4e77e3aa1cb61621f98ea4b8c372ff446c4155 (commit) via e3315b3948240c0e32757165124f7ee2dd3b7339 (commit) via 248e6b4547055bb79b94e1d50fae3da902489281 (commit) via 95ad7c1467d5e0b6b715e5700078c4bd9fe2bcc6 (commit) via 6153ce4b94ec108b96758316addcf77e2fac0333 (commit) via fa0bfeab3c66ddb3a5306af417599051ac2edf1b (commit) via 1553b5b3117ed8ad543a104cafa1bba2640a49d6 (commit) via 3b43d6e313bb3b1bec38a62f83549f8c9df7fb03 (commit) via d286c895455bfd20fb67dc86be39d790697c507e (commit) via d2c771fc56a68be9fc2f1eb7dcfa18523003e368 (commit) via 7110341e1a1298a03d14e873648d56eaa970037c (commit) via f31441fe62c90c31d4761786d7a0026f473975b9 (commit) via 017c47e1c4eed610b622bb5c7da5e6034667ac0f (commit) via a474d6302284d712f367cda58ad0f2d71d5a1a75 (commit) via 0cc8891fcba72a465e832745a0d6ba0bd7d9891b (commit) from 072162a3f53cc368611f3313d682d06a72f21758 (commit) - Log ----------------------------------------------------------------- commit 547998e68ac54c6e7ddd0aa1324e3fb718df408c Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 3 13:00:42 2012 +0200 Translation update done using Pootle. commit df4e77e3aa1cb61621f98ea4b8c372ff446c4155 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 3 12:53:38 2012 +0200 Translation update done using Pootle. commit e3315b3948240c0e32757165124f7ee2dd3b7339 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 3 12:53:13 2012 +0200 Translation update done using Pootle. commit 248e6b4547055bb79b94e1d50fae3da902489281 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 3 12:52:58 2012 +0200 Translation update done using Pootle. commit 95ad7c1467d5e0b6b715e5700078c4bd9fe2bcc6 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 3 12:52:36 2012 +0200 Translation update done using Pootle. commit 6153ce4b94ec108b96758316addcf77e2fac0333 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 3 12:52:19 2012 +0200 Translation update done using Pootle. commit fa0bfeab3c66ddb3a5306af417599051ac2edf1b Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 3 12:51:50 2012 +0200 Translation update done using Pootle. commit 1553b5b3117ed8ad543a104cafa1bba2640a49d6 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 3 12:51:33 2012 +0200 Translation update done using Pootle. commit 3b43d6e313bb3b1bec38a62f83549f8c9df7fb03 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 3 12:48:39 2012 +0200 Translation update done using Pootle. commit d286c895455bfd20fb67dc86be39d790697c507e Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 3 12:48:18 2012 +0200 Translation update done using Pootle. commit d2c771fc56a68be9fc2f1eb7dcfa18523003e368 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jan 3 04:25:00 2012 +0200 Translation update done using Pootle. commit 7110341e1a1298a03d14e873648d56eaa970037c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Jan 3 04:24:47 2012 +0200 Translation update done using Pootle. commit f31441fe62c90c31d4761786d7a0026f473975b9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jan 2 20:18:43 2012 +0200 Translation update done using Pootle. commit 017c47e1c4eed610b622bb5c7da5e6034667ac0f Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Mon Jan 2 20:18:10 2012 +0200 Translation update done using Pootle. commit a474d6302284d712f367cda58ad0f2d71d5a1a75 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 2 18:29:36 2012 +0200 Translation update done using Pootle. commit 0cc8891fcba72a465e832745a0d6ba0bd7d9891b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 2 18:29:16 2012 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 29 ++++++++++++----------------- po/es.po | 9 ++++----- po/fr.po | 9 ++++----- po/ja.po | 9 ++++----- 4 files changed, 24 insertions(+), 32 deletions(-) diff --git a/po/cs.po b/po/cs.po index 208ce3d..5e5b97c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,13 +5,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-02 07:46-0500\n" -"PO-Revision-Date: 2011-12-12 15:13+0200\n" +"PO-Revision-Date: 2012-01-03 12:53+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.1.6\n" @@ -2250,15 +2250,14 @@ msgstr "Týd" #. l10n: Month-year order for calendar, use either "calendar-month-year" or "calendar-year-month". #: js/messages.php:483 msgid "calendar-month-year" -msgstr "" +msgstr "calendar-month-year" #. l10n: Year suffix for calendar, "none" is empty. #: js/messages.php:485 -#, fuzzy #| msgid "None" msgctxt "Year suffix" msgid "none" -msgstr "Žádná" +msgstr "none" #: js/messages.php:494 msgid "Hour" @@ -12790,14 +12789,13 @@ msgid "" msgstr "" #: po/advisory_rules.php:240 -#, fuzzy #| msgid "Format of imported file" msgid "Percentage of aborted clients" -msgstr "Formát importovaného souboru" +msgstr "Procento přerušených klientů" #: po/advisory_rules.php:241 po/advisory_rules.php:246 msgid "Too many clients are aborted." -msgstr "" +msgstr "Příliš mnoho přerušených klientů." #: po/advisory_rules.php:242 po/advisory_rules.php:247 msgid "" @@ -12841,10 +12839,9 @@ msgid "have_innodb is set to 'value'" msgstr "have_innodb je nastaveno na 'value'" #: po/advisory_rules.php:255 -#, fuzzy #| msgid "Buffer pool size" msgid "InnoDB log size" -msgstr "Velikost vyrovnávací paměti" +msgstr "Velikost záznamu InnoDB" #: po/advisory_rules.php:256 #, fuzzy @@ -12877,7 +12874,7 @@ msgstr "" #: po/advisory_rules.php:260 msgid "Max InnoDB log size" -msgstr "" +msgstr "Maximální velikost záznamu InnoDB" #: po/advisory_rules.php:261 msgid "The InnoDB log file size is inadequately large." @@ -12903,14 +12900,13 @@ msgid "Your absolute InnoDB log size is %s MiB" msgstr "" #: po/advisory_rules.php:265 -#, fuzzy #| msgid "Buffer pool size" msgid "InnoDB buffer pool size" -msgstr "Velikost vyrovnávací paměti" +msgstr "Velikost vyrovnávací paměti InnoDB" #: po/advisory_rules.php:266 msgid "Your InnoDB buffer pool is fairly small." -msgstr "" +msgstr "Nastavená vyrovnávací paměť InnoDB je poměrně malá" #: po/advisory_rules.php:267 #, php-format @@ -12937,14 +12933,13 @@ msgid "" msgstr "" #: po/advisory_rules.php:270 -#, fuzzy #| msgid "max. concurrent connections" msgid "MyISAM concurrent inserts" -msgstr "Maximum současných připojení" +msgstr "Současné vkládání do MyISAM" #: po/advisory_rules.php:271 msgid "Enable concurrent_insert by setting it to 1" -msgstr "" +msgstr "Povolte concurrent_insert nastavením na 1" #: po/advisory_rules.php:272 msgid "" diff --git a/po/es.po b/po/es.po index 63304eb..1bee5f0 100644 --- a/po/es.po +++ b/po/es.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-02 07:46-0500\n" -"PO-Revision-Date: 2011-12-19 21:11+0200\n" +"PO-Revision-Date: 2012-01-02 20:18+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: spanish <es(a)li.org>\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.1.6\n" @@ -2281,15 +2281,14 @@ msgstr "Sem" #. l10n: Month-year order for calendar, use either "calendar-month-year" or "calendar-year-month". #: js/messages.php:483 msgid "calendar-month-year" -msgstr "" +msgstr "calendar-year-month" #. l10n: Year suffix for calendar, "none" is empty. #: js/messages.php:485 -#, fuzzy #| msgid "None" msgctxt "Year suffix" msgid "none" -msgstr "Ninguna" +msgstr "none" #: js/messages.php:494 msgid "Hour" diff --git a/po/fr.po b/po/fr.po index e407c11..b1a36b4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-02 07:46-0500\n" -"PO-Revision-Date: 2011-12-28 15:53+0200\n" +"PO-Revision-Date: 2012-01-02 18:29+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.1.6\n" @@ -2270,15 +2270,14 @@ msgstr "Sem" #. l10n: Month-year order for calendar, use either "calendar-month-year" or "calendar-year-month". #: js/messages.php:483 msgid "calendar-month-year" -msgstr "" +msgstr "calendar-month-year" #. l10n: Year suffix for calendar, "none" is empty. #: js/messages.php:485 -#, fuzzy #| msgid "None" msgctxt "Year suffix" msgid "none" -msgstr "Aucune" +msgstr "none" #: js/messages.php:494 msgid "Hour" diff --git a/po/ja.po b/po/ja.po index b7db983..e3d193e 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-02 07:46-0500\n" -"PO-Revision-Date: 2011-12-21 12:04+0200\n" +"PO-Revision-Date: 2012-01-03 04:24+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.1.6\n" @@ -2254,15 +2254,14 @@ msgstr "週" #. l10n: Month-year order for calendar, use either "calendar-month-year" or "calendar-year-month". #: js/messages.php:483 msgid "calendar-month-year" -msgstr "" +msgstr "calendar-year-month" #. l10n: Year suffix for calendar, "none" is empty. #: js/messages.php:485 -#, fuzzy #| msgid "None" msgctxt "Year suffix" msgid "none" -msgstr "なし" +msgstr " 年" #: js/messages.php:494 msgid "Hour" hooks/post-receive -- phpMyAdmin

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25783-g072162a

by Marc Delisle

The branch, master has been updated via 072162a3f53cc368611f3313d682d06a72f21758 (commit) from 18c683234c905c3fd46a68947e5ac351285f9e00 (commit) - Log ----------------------------------------------------------------- commit 072162a3f53cc368611f3313d682d06a72f21758 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 2 08:54:07 2012 -0500 rfe #3292013 Dialogs when dropping indices ----------------------------------------------------------------------- Summary of changes: sql.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sql.php b/sql.php index 4252efd..3e6e6d4 100644 --- a/sql.php +++ b/sql.php @@ -17,6 +17,8 @@ require_once './libraries/bookmark.lib.php'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; $GLOBALS['js_include'][] = 'tbl_change.js'; +// the next one needed because sql.php may do a "goto" to tbl_structure.php +$GLOBALS['js_include'][] = 'tbl_structure.js'; $GLOBALS['js_include'][] = 'gis_data_editor.js'; if (isset($_SESSION['profiling'])) { hooks/post-receive -- phpMyAdmin

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25782-g18c6832

by Marc Delisle

The branch, master has been updated via 18c683234c905c3fd46a68947e5ac351285f9e00 (commit) from 1a10f735b6690566946cb424f2bef9adeb94524f (commit) - Log ----------------------------------------------------------------- commit 18c683234c905c3fd46a68947e5ac351285f9e00 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 2 08:13:47 2012 -0500 Comment adjusted to reflect a previous change of function name ----------------------------------------------------------------------- Summary of changes: tbl_alter.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_alter.php b/tbl_alter.php index 8efee90..344d65a 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -184,7 +184,7 @@ if ($abort == false) { // could be executed to replace the info given by SHOW FULL COLUMNS FROM. /** * @todo put this code into a require() - * or maybe make it part of PMA_DBI_get_fields(); + * or maybe make it part of PMA_DBI_get_columns(); */ // We also need this to correctly learn if a TIMESTAMP is NOT NULL, since hooks/post-receive -- phpMyAdmin

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git January 2012