- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-392-g186426c
by Michal Čihař 18 Mar '11

18 Mar '11

The branch, master has been updated via 186426cbaf0262b49dfc4a67e4b1347296ef0219 (commit) from 724f11f20d7b05963fcf9c1a4e1a462fa6488c93 (commit) - Log ----------------------------------------------------------------- commit 186426cbaf0262b49dfc4a67e4b1347296ef0219 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 15:29:18 2011 +0100 Ignore NULL charset ----------------------------------------------------------------------- Summary of changes: libraries/import.lib.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 79a43b7..f0a431e 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -908,13 +908,13 @@ $import_notice = NULL; */ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = NULL, $options = NULL) { /* Take care of the options */ - if (isset($options['db_collation'])) { + if (isset($options['db_collation'])&& ! is_null($options['db_collation'])) { $collation = $options['db_collation']; } else { $collation = "utf8_general_ci"; } - if (isset($options['db_charset'])) { + if (isset($options['db_charset']) && ! is_null($options['db_charset'])) { $charset = $options['db_charset']; } else { $charset = "utf8"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-391-g724f11f
by Michal Čihař 18 Mar '11

18 Mar '11

The branch, master has been updated via 724f11f20d7b05963fcf9c1a4e1a462fa6488c93 (commit) from 33e4c3f7e906273cbe4a8d8a8d83d7cad985e455 (commit) - Log ----------------------------------------------------------------- commit 724f11f20d7b05963fcf9c1a4e1a462fa6488c93 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 15:06:48 2011 +0100 No need for extra loading of js and headers here (bug#3222746). All cases bellow does it as well and this breaks export page. ----------------------------------------------------------------------- Summary of changes: tbl_row_action.php | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tbl_row_action.php b/tbl_row_action.php index e5217bf..cce3f7b 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -69,10 +69,6 @@ switch($submit_mult) { break; } -$GLOBALS['js_include'][] = 'tbl_change.js'; - -require_once './libraries/header.inc.php'; - if (!empty($submit_mult)) { switch($submit_mult) { case 'row_edit': hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. ddf344ad28fc2858d230fb37ea34c6eafae88d4b
by Michal Čihař 18 Mar '11

18 Mar '11

The branch, master has been updated via ddf344ad28fc2858d230fb37ea34c6eafae88d4b (commit) via b67b6872bc06e637f2de505ef6b0f380af015f60 (commit) via d8996e9400e96c6f7ff7ec9c3c2504aa219b6719 (commit) via 5f0ba8a6724202de64a4c3e3cc29ebb998996d0a (commit) via 22bb766977a3acd679058d6be1bc7b129ec45b7f (commit) via 3a0d7d5920e4b908ebc84fc2903db2c9f2f783ee (commit) via bb753c7cabe2105e1cb5b5724d09cbefc979e219 (commit) via 84def85a2169f574350ac169455f03af21ea32ef (commit) via 99bfaec99380fd1a6b195281809c933e535ba8fe (commit) via 781ce357af60169f6d9bb257114866810126f1c1 (commit) via 3f26f97bbdc124f6a7bd7be2cb2c2e8b41c64b1f (commit) via b38e455ee4ec1ccbfaa9128962ff35a1dc7877f2 (commit) via 9fc8ca8489fa4adbf59f0f7e07b815add025fba7 (commit) via d4bbb0a93e1ad7e0432eb6b1ccf78de5e72f5a36 (commit) via 43b8aafc5ca071e1d99a16aa09a5bb99a916cd9b (commit) via ddea734037835680044bb68b82e78630adb6126a (commit) via 9463991f7c1eb9ace26da85b1eb1f49b14083b41 (commit) via 1f770d157c4a851192066e84073a52549fd2eaec (commit) via 1632c04f2790507499ef02a53f26f3554be0a696 (commit) via 0c864e63ca9fa7c7c1d189d74f3e67743715cb26 (commit) via ed21a85f046f851015163f7d509064f20501c93a (commit) via abff54790b35022eeb2cbf1f5d1cc3db328b1073 (commit) via 728e8ed6169d401e144f5e435fdf071a3eda2aaa (commit) via b59300edb0282558d47b2485b9737abc43db3527 (commit) via 67bd9010f49614318b9cc5826486bcb6f19d446b (commit) via 6dee9774cb699e08c03a121111dbb59498385811 (commit) via 9437bb6c92d0cafa592bddffbaa88361532ce0d4 (commit) from eb0b8523cfdb63dea14b75c56b9f7f3f3afcbdd7 (commit) - Log ----------------------------------------------------------------- commit ddf344ad28fc2858d230fb37ea34c6eafae88d4b Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:56:30 2011 +0100 Update translated docs commit b67b6872bc06e637f2de505ef6b0f380af015f60 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:53:16 2011 +0200 Translation update done using Pootle. commit d8996e9400e96c6f7ff7ec9c3c2504aa219b6719 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:52:43 2011 +0200 Translation update done using Pootle. commit 5f0ba8a6724202de64a4c3e3cc29ebb998996d0a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:52:29 2011 +0200 Translation update done using Pootle. commit 22bb766977a3acd679058d6be1bc7b129ec45b7f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:52:05 2011 +0200 Translation update done using Pootle. commit 3a0d7d5920e4b908ebc84fc2903db2c9f2f783ee Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:51:35 2011 +0200 Translation update done using Pootle. commit bb753c7cabe2105e1cb5b5724d09cbefc979e219 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:51:16 2011 +0200 Translation update done using Pootle. commit 84def85a2169f574350ac169455f03af21ea32ef Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:50:24 2011 +0200 Translation update done using Pootle. commit 99bfaec99380fd1a6b195281809c933e535ba8fe Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:50:15 2011 +0200 Translation update done using Pootle. commit 781ce357af60169f6d9bb257114866810126f1c1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:49:51 2011 +0200 Translation update done using Pootle. commit 3f26f97bbdc124f6a7bd7be2cb2c2e8b41c64b1f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:49:48 2011 +0200 Translation update done using Pootle. commit b38e455ee4ec1ccbfaa9128962ff35a1dc7877f2 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:49:39 2011 +0200 Translation update done using Pootle. commit 9fc8ca8489fa4adbf59f0f7e07b815add025fba7 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:48:39 2011 +0200 Translation update done using Pootle. commit d4bbb0a93e1ad7e0432eb6b1ccf78de5e72f5a36 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:47:11 2011 +0200 Translation update done using Pootle. commit 43b8aafc5ca071e1d99a16aa09a5bb99a916cd9b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:46:53 2011 +0200 Translation update done using Pootle. commit ddea734037835680044bb68b82e78630adb6126a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:46:49 2011 +0200 Translation update done using Pootle. commit 9463991f7c1eb9ace26da85b1eb1f49b14083b41 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:46:32 2011 +0200 Translation update done using Pootle. commit 1f770d157c4a851192066e84073a52549fd2eaec Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:46:29 2011 +0200 Translation update done using Pootle. commit 1632c04f2790507499ef02a53f26f3554be0a696 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:46:16 2011 +0200 Translation update done using Pootle. commit 0c864e63ca9fa7c7c1d189d74f3e67743715cb26 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:46:12 2011 +0200 Translation update done using Pootle. commit ed21a85f046f851015163f7d509064f20501c93a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:46:00 2011 +0200 Translation update done using Pootle. commit abff54790b35022eeb2cbf1f5d1cc3db328b1073 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:45:54 2011 +0200 Translation update done using Pootle. commit 728e8ed6169d401e144f5e435fdf071a3eda2aaa Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:45:45 2011 +0200 Translation update done using Pootle. commit b59300edb0282558d47b2485b9737abc43db3527 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:45:41 2011 +0200 Translation update done using Pootle. commit 67bd9010f49614318b9cc5826486bcb6f19d446b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:45:31 2011 +0200 Translation update done using Pootle. commit 6dee9774cb699e08c03a121111dbb59498385811 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:45:26 2011 +0200 Translation update done using Pootle. commit 9437bb6c92d0cafa592bddffbaa88361532ce0d4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Mar 18 15:45:03 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/tr/Documentation.html | 36 +++++++++--------- po/tr.po | 83 +++++++++++++++++++++++++++++++----------- 2 files changed, 80 insertions(+), 39 deletions(-) diff --git a/output/tr/Documentation.html b/output/tr/Documentation.html index 605ddd6..44f3ec3 100644 --- a/output/tr/Documentation.html +++ b/output/tr/Documentation.html @@ -3444,7 +3444,7 @@ dump you have to turn it into valid MySQL. This means, you have to add a whitespace after the first two dashes of the line or add a # before it: <br /> <code> -- -------------------------------------------------------<br /> - </code> or<br /> + </code> ya da<br /> <code> #--------------------------------------------------------- </code> </p> @@ -4010,28 +4010,28 @@ tables:</p> <pre> CREATE TABLE REL_countries ( - country_code char(1) NOT NULL default '', - description varchar(10) NOT NULL default '', - PRIMARY KEY (country_code) +country_code char(1) NOT NULL default '', +description varchar(10) NOT NULL default '', +PRIMARY KEY (country_code) ) TYPE=MyISAM; INSERT INTO REL_countries VALUES ('C', 'Canada'); CREATE TABLE REL_persons ( - id tinyint(4) NOT NULL auto_increment, - person_name varchar(32) NOT NULL default '', - town_code varchar(5) default '0', - country_code char(1) NOT NULL default '', - PRIMARY KEY (id) +id tinyint(4) NOT NULL auto_increment, +person_name varchar(32) NOT NULL default '', +town_code varchar(5) default '0', +country_code char(1) NOT NULL default '', +PRIMARY KEY (id) ) TYPE=MyISAM; INSERT INTO REL_persons VALUES (11, 'Marc', 'S', ''); INSERT INTO REL_persons VALUES (15, 'Paul', 'S', 'C'); CREATE TABLE REL_towns ( - town_code varchar(5) NOT NULL default '0', - description varchar(30) NOT NULL default '', - PRIMARY KEY (town_code) +town_code varchar(5) NOT NULL default '0', +description varchar(30) NOT NULL default '', +PRIMARY KEY (town_code) ) TYPE=MyISAM; INSERT INTO REL_towns VALUES ('S', 'Sherbrooke'); @@ -4435,22 +4435,22 @@ you can not get the table name), but the following variables can be used: </p> <dl> <dt><code>@HTTP_HOST@</code></dt> - <dd>HTTP host that runs phpMyAdmin</dd> + <dd>phpMyAdmin'i çalıştıran HTTP anamakinesi</dd> <dt><code>@SERVER@</code></dt> - <dd>MySQL server name</dd> + <dd>MySQL sunucu adı</dd> <dt><code>@VERBOSE@</code></dt> <dd>Verbose MySQL server name as defined in <a href="#cfg_Servers_verbose">server configuration</a></dd> <dt><code>@VSERVER@</code></dt> <dd>Verbose MySQL server name if set, otherwise normal</dd> <dt><code>@DATABASE@</code></dt> - <dd>Currently opened database</dd> + <dd>Şu anda açık olan veritabanı</dd> <dt><code>@TABLE@</code></dt> - <dd>Currently opened table</dd> + <dd>Şu anda açık olan tablo</dd> <dt><code>@FIELDS@</code></dt> - <dd>Fields of currently opened table</dd> + <dd>Şu anda açık olan tablo alanı</dd> <dt><code>@PHPMYADMIN@</code></dt> - <dd>phpMyAdmin with version</dd> + <dd>phpMyAdmin ile birlikte sürümü</dd> </dl> <h4 id="wysiwyg"> diff --git a/po/tr.po b/po/tr.po index a9c86df..ef21d0a 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-03-02 13:51+0100\n" -"PO-Revision-Date: 2011-03-15 11:58+0200\n" +"PO-Revision-Date: 2011-03-18 15:53+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -6854,7 +6854,7 @@ msgstr "" #: orig-docs/Documentation.html:2827 #, no-wrap msgid "set-variable = lower_case_table_names=0" -msgstr "" +msgstr "set-variable = lower_case_table_names=0" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2829 @@ -6867,7 +6867,7 @@ msgstr "" #: orig-docs/Documentation.html:2832 #, no-wrap msgid "SHOW VARIABLES LIKE 'lower_case_table_names';" -msgstr "" +msgstr "SHOW VARIABLES LIKE 'lower_case_table_names';" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2835 @@ -6896,6 +6896,8 @@ msgid "" "# mod_gzip_item_include file \\.php$\n" "# mod_gzip_item_include mime \"application/x-httpd-php.*\"\n" msgstr "" +"# mod_gzip_item_include file \\.php$\n" +"# mod_gzip_item_include mime \"application/x-httpd-php.*\"\n" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2850 @@ -7137,6 +7139,15 @@ msgid "" "RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)$ index.php?db=$1&table=$2 [R]\n" "RewriteRule ^([a-zA-Z0-9_]+)$ index.php?db=$1 [R]\n" msgstr "" +"RewriteEngine On\n" +"RewriteBase /path_to_phpMyAdmin\n" +"RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/([a-z_]+\\.php)$ " +"index.php?db=$1&table=$2&target=$3 [R]\n" +"RewriteRule ^([a-zA-Z0-9_]+)/([a-z_]+\\.php)$ index.php?db=$1&target=$2 " +"[R]\n" +"RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)$ index.php?db=$1&table=$2 " +"[R]\n" +"RewriteRule ^([a-zA-Z0-9_]+)$ index.php?db=$1 [R]\n" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2979 @@ -7160,6 +7171,8 @@ msgid "" "RewriteEngine On\n" "RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]\n" msgstr "" +"RewriteEngine On\n" +"RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]\n" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2990 @@ -7439,7 +7452,7 @@ msgstr "" #: orig-docs/Documentation.html:3120 #, no-wrap msgid "mysql.default_socket = /tmp/mysql.sock" -msgstr "" +msgstr "mysql.default_socket = /tmp/mysql.sock" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3122 @@ -7450,7 +7463,7 @@ msgstr "" #: orig-docs/Documentation.html:3124 #, no-wrap msgid "mysql.default_socket = /var/lib/mysql/mysql.sock" -msgstr "" +msgstr "mysql.default_socket = /var/lib/mysql/mysql.sock" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3126 @@ -7853,18 +7866,19 @@ msgstr "" #. type: Content of: <html><body><div><p><code> #: orig-docs/Documentation.html:3322 msgid "<code> -- -------------------------------------------------------" -msgstr "" +msgstr "<code> -- -------------------------------------------------------" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3324 msgid "</code> or" -msgstr "" +msgstr "</code> ya da" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3326 msgid "" "<code> #--------------------------------------------------------- </code>" msgstr "" +"<code> #--------------------------------------------------------- </code>" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3332 @@ -8847,6 +8861,33 @@ msgid "" "INSERT INTO REL_towns VALUES ('S', 'Sherbrooke');\n" "INSERT INTO REL_towns VALUES ('M', 'Montréal');\n" msgstr "" +"CREATE TABLE REL_countries (\n" +"country_code char(1) NOT NULL default '',\n" +"description varchar(10) NOT NULL default '',\n" +"PRIMARY KEY (country_code)\n" +") TYPE=MyISAM;\n" +"\n" +"INSERT INTO REL_countries VALUES ('C', 'Canada');\n" +"\n" +"CREATE TABLE REL_persons (\n" +"id tinyint(4) NOT NULL auto_increment,\n" +"person_name varchar(32) NOT NULL default '',\n" +"town_code varchar(5) default '0',\n" +"country_code char(1) NOT NULL default '',\n" +"PRIMARY KEY (id)\n" +") TYPE=MyISAM;\n" +"\n" +"INSERT INTO REL_persons VALUES (11, 'Marc', 'S', '');\n" +"INSERT INTO REL_persons VALUES (15, 'Paul', 'S', 'C');\n" +"\n" +"CREATE TABLE REL_towns (\n" +"town_code varchar(5) NOT NULL default '0',\n" +"description varchar(30) NOT NULL default '',\n" +"PRIMARY KEY (town_code)\n" +") TYPE=MyISAM;\n" +"\n" +"INSERT INTO REL_towns VALUES ('S', 'Sherbrooke');\n" +"INSERT INTO REL_towns VALUES ('M', 'Montréal');\n" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3884 @@ -9649,27 +9690,27 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4268 msgid "<code>@HTTP_HOST@</code>" -msgstr "" +msgstr "<code>@HTTP_HOST@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4269 msgid "HTTP host that runs phpMyAdmin" -msgstr "" +msgstr "phpMyAdmin'i çalıştıran HTTP anamakinesi" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4270 msgid "<code>@SERVER@</code>" -msgstr "" +msgstr "<code>@SERVER@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4271 msgid "MySQL server name" -msgstr "" +msgstr "MySQL sunucu adı" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4272 msgid "<code>@VERBOSE@</code>" -msgstr "" +msgstr "<code>@VERBOSE@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4273 @@ -9681,7 +9722,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4274 msgid "<code>@VSERVER@</code>" -msgstr "" +msgstr "<code>@VSERVER@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4275 @@ -9691,42 +9732,42 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4276 msgid "<code>@DATABASE@</code>" -msgstr "" +msgstr "<code>@DATABASE@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4277 msgid "Currently opened database" -msgstr "" +msgstr "Şu anda açık olan veritabanı" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4278 msgid "<code>@TABLE@</code>" -msgstr "" +msgstr "<code>@TABLE@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4279 msgid "Currently opened table" -msgstr "" +msgstr "Şu anda açık olan tablo" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4280 msgid "<code>@FIELDS@</code>" -msgstr "" +msgstr "<code>@FIELDS@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4281 msgid "Fields of currently opened table" -msgstr "" +msgstr "Şu anda açık olan tablo alanı" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:4282 msgid "<code>@PHPMYADMIN@</code>" -msgstr "" +msgstr "<code>@PHPMYADMIN@</code>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:4283 msgid "phpMyAdmin with version" -msgstr "" +msgstr "phpMyAdmin ile birlikte sürümü" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:4287 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-389-g54942a7
by Michal Čihař 18 Mar '11

18 Mar '11

The branch, master has been updated via 54942a7cf0802f313caa10740941fce6443bbbf1 (commit) via 0e63bd04874accd13eaa83bade8f28c937b01f40 (commit) via 5f1f0a8bdba101444067470b23b8e82ba422f83d (commit) via 24396fe0244bb8e17315b3c3d9bd71f2835dd041 (commit) via 7899b0f199acc67214598b30bdd1b78544656063 (commit) from 13f919da6ad9217e5cc349d2501782fbf7291749 (commit) - Log ----------------------------------------------------------------- commit 54942a7cf0802f313caa10740941fce6443bbbf1 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:55:42 2011 +0100 Fix typo commit 0e63bd04874accd13eaa83bade8f28c937b01f40 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:55:27 2011 +0100 Fix multi submits for MSIE with <input type="image".. commit 5f1f0a8bdba101444067470b23b8e82ba422f83d Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:53:05 2011 +0100 Forgotten use of translated string commit 24396fe0244bb8e17315b3c3d9bd71f2835dd041 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:52:08 2011 +0100 There are no empty/drop tabs anymore commit 7899b0f199acc67214598b30bdd1b78544656063 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:48:55 2011 +0100 Avoid comparing translated strings and simplify the code. ----------------------------------------------------------------------- Summary of changes: db_structure.php | 2 +- libraries/common.lib.php | 5 +---- libraries/mult_submits.inc.php | 4 ++-- tbl_structure.php | 16 ++++++++-------- tbl_tracking.php | 11 ++++++----- 5 files changed, 18 insertions(+), 20 deletions(-) diff --git a/db_structure.php b/db_structure.php index 03a31be..d81af5d 100644 --- a/db_structure.php +++ b/db_structure.php @@ -501,7 +501,7 @@ echo ' <option value="' . __('With selected:') . '" selected="selected">' . __('With selected:') . '</option>' . "\n"; echo ' <option value="export" >' . __('Export') . '</option>' . "\n"; -echo ' <option value="' . __('Print view') . '" >' +echo ' <option value="print" >' . __('Print view') . '</option>' . "\n"; if (!$db_is_information_schema) { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 7451df4..bea2c65 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1660,10 +1660,7 @@ function PMA_generate_html_tab($tab, $url_params = array()) // determine additionnal style-class if (empty($tab['class'])) { - if ($tab['text'] == __('Empty') - || $tab['text'] == __('Drop')) { - $tab['class'] = 'caution'; - } elseif (! empty($tab['active']) + if (! empty($tab['active']) || PMA_isValid($GLOBALS['active_page'], 'identical', $tab['link'])) { $tab['class'] = 'active'; } elseif (is_null($tab['active']) && empty($GLOBALS['active_page']) diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index e566576..665b76d 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -24,7 +24,7 @@ if (! empty($submit_mult) $what = 'drop_db'; } elseif (isset($selected_tbl) && !empty($selected_tbl)) { // coming from database structure view - do something with selected tables - if ($submit_mult == __('Print view')) { + if ($submit_mult == 'print') { require './tbl_printview.php'; } else { $selected = $selected_tbl; @@ -100,7 +100,7 @@ if (! empty($submit_mult) // this should already be handled by tbl_structure.php } } else { - // coming from borwsing - do something with selected rows + // coming from browsing - do something with selected rows $what = 'row_delete'; $selected = $rows_to_delete; } diff --git a/tbl_structure.php b/tbl_structure.php index 18eedee..73a45fc 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -21,19 +21,19 @@ $GLOBALS['js_include'][] = 'tbl_structure.js'; * submit_mult_*_x comes from IE if <input type="img" ...> is used */ if (isset($_REQUEST['submit_mult_change_x'])) { - $submit_mult = __('Change'); + $submit_mult = 'change'; } elseif (isset($_REQUEST['submit_mult_drop_x'])) { - $submit_mult = __('Drop'); + $submit_mult = 'drop'; } elseif (isset($_REQUEST['submit_mult_primary_x'])) { - $submit_mult = __('Primary'); + $submit_mult = 'primary'; } elseif (isset($_REQUEST['submit_mult_index_x'])) { - $submit_mult = __('Index'); + $submit_mult = 'index'; } elseif (isset($_REQUEST['submit_mult_unique_x'])) { - $submit_mult = __('Unique'); + $submit_mult = 'unique'; } elseif (isset($_REQUEST['submit_mult_fulltext_x'])) { - $submit_mult = __('Fulltext'); + $submit_mult = 'ftext'; } elseif (isset($_REQUEST['submit_mult_browse_x'])) { - $submit_mult = __('Browse'); + $submit_mult = 'browse'; } elseif (isset($_REQUEST['submit_mult'])) { $submit_mult = $_REQUEST['submit_mult']; } elseif (isset($_REQUEST['mult_btn']) && $_REQUEST['mult_btn'] == __('Yes')) { @@ -45,7 +45,7 @@ if (isset($_REQUEST['submit_mult_change_x'])) { if (! empty($submit_mult) && isset($_REQUEST['selected_fld'])) { $err_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table); - if ($submit_mult == __('Browse')) { + if ($submit_mult == 'browse') { // browsing the table displaying only selected fields/columns $GLOBALS['active_page'] = 'sql.php'; $sql_query = ''; diff --git a/tbl_tracking.php b/tbl_tracking.php index b651986..757456b 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -601,11 +601,12 @@ if ($last_version > 0) { } else { $version_status = __('not active'); } - if (($version['version'] == $last_version) && ($version_status == __('not active'))) { - $tracking_active = false; - } - if (($version['version'] == $last_version) && ($version_status == __('active'))) { - $tracking_active = true; + if ($version['version'] == $last_version){ + if ($version['tracking_active'] == 1) { + $tracking_active = true; + } else { + $tracking_active = false; + } } ?> <tr class="noclick <?php echo $style;?>"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-384-g13f919d
by Michal Čihař 18 Mar '11

18 Mar '11

The branch, master has been updated via 13f919da6ad9217e5cc349d2501782fbf7291749 (commit) via ff80c4d7f1aac7086733a1b8d8afe6b3071ce0b8 (commit) via cb377c360c79790aefc2427c363c3ca60900503d (commit) via 95bc3c92aa9d3741110d64986ae0f64f2824bd0d (commit) via fc965daabdb1de08fdb346aef0e7d5030e60c4f3 (commit) from 65e53a8bb8afd76d4779b0d0e536d7ab2690b439 (commit) - Log ----------------------------------------------------------------- commit 13f919da6ad9217e5cc349d2501782fbf7291749 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:42:24 2011 +0100 Another replacement of translated strings by fixed ones commit ff80c4d7f1aac7086733a1b8d8afe6b3071ce0b8 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:42:07 2011 +0100 Whitespace cleanup commit cb377c360c79790aefc2427c363c3ca60900503d Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:38:19 2011 +0100 Use non translated string for identification of submited value in table properties commit 95bc3c92aa9d3741110d64986ae0f64f2824bd0d Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:35:30 2011 +0100 Allow to specify value parameter for PMA_buttonOrImage commit fc965daabdb1de08fdb346aef0e7d5030e60c4f3 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 14:32:36 2011 +0100 Do not pass translated strings as parameter. This can cause problem for non ascii languages and breaks if user meanwhile switches language. ----------------------------------------------------------------------- Summary of changes: db_structure.php | 14 +++++----- libraries/common.lib.php | 11 +++++--- libraries/display_tbl.lib.php | 6 ++-- libraries/mult_submits.inc.php | 48 +++++++++++++-------------------------- tbl_row_action.php | 15 +++++------ tbl_structure.php | 14 +++++----- 6 files changed, 47 insertions(+), 61 deletions(-) diff --git a/db_structure.php b/db_structure.php index dcce45b..03a31be 100644 --- a/db_structure.php +++ b/db_structure.php @@ -499,23 +499,23 @@ $checkall_url = 'db_structure.php?' . PMA_generate_common_url($db); <?php echo ' <option value="' . __('With selected:') . '" selected="selected">' . __('With selected:') . '</option>' . "\n"; -echo ' <option value="' . __('Export') . '" >' +echo ' <option value="export" >' . __('Export') . '</option>' . "\n"; echo ' <option value="' . __('Print view') . '" >' . __('Print view') . '</option>' . "\n"; if (!$db_is_information_schema) { - echo ' <option value="' . __('Empty') . '" >' + echo ' <option value="empty_tbl" >' . __('Empty') . '</option>' . "\n"; - echo ' <option value="' . __('Drop') . '" >' + echo ' <option value="drop_tbl" >' . __('Drop') . '</option>' . "\n"; - echo ' <option value="' . __('Check table') . '" >' + echo ' <option value="check_tbl" >' . __('Check table') . '</option>' . "\n"; - echo ' <option value="' . __('Optimize table') . '" >' + echo ' <option value="optimize_tbl" >' . __('Optimize table') . '</option>' . "\n"; - echo ' <option value="' . __('Repair table') . '" >' + echo ' <option value="repair_tbl" >' . __('Repair table') . '</option>' . "\n"; - echo ' <option value="' . __('Analyze table') . '" >' + echo ' <option value="analyze_tbl" >' . __('Analyze table') . '</option>' . "\n"; } ?> diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 2b7f738..7451df4 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2180,11 +2180,14 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force * @access public */ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text, - $image) + $image, $value = '') { + if ($value == '') { + $value = $text; + } if (false === $GLOBALS['cfg']['PropertiesIconic']) { echo ' <input type="submit" name="' . $button_name . '"' - .' value="' . htmlspecialchars($text) . '"' + .' value="' . htmlspecialchars($value) . '"' .' title="' . htmlspecialchars($text) . '" />' . "\n"; return; } @@ -2193,13 +2196,13 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text, /* IE has trouble with <button> */ if (PMA_USR_BROWSER_AGENT != 'IE') { echo '<button class="' . $button_class . '" type="submit"' - .' name="' . $button_name . '" value="' . htmlspecialchars($text) . '"' + .' name="' . $button_name . '" value="' . htmlspecialchars($value) . '"' .' title="' . htmlspecialchars($text) . '">' . "\n" . PMA_getIcon($image, $text) .'</button>' . "\n"; } else { echo '<input type="image" name="' . $image_name . '" value="' - . htmlspecialchars($text) . '" title="' . htmlspecialchars($text) . '" src="' . $GLOBALS['pmaThemeImage'] + . htmlspecialchars($value) . '" title="' . htmlspecialchars($text) . '" src="' . $GLOBALS['pmaThemeImage'] . $image . '" />' . ($GLOBALS['cfg']['PropertiesIconic'] === 'both' ? ' ' . htmlspecialchars($text) : '') . "\n"; } diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index ef9e397..9c98f61 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -2161,13 +2161,13 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) .'<i>' . __('With selected:') . '</i>' . "\n"; PMA_buttonOrImage('submit_mult', 'mult_submit', - 'submit_mult_change', __('Change'), 'b_edit.png'); + 'submit_mult_change', __('Change'), 'b_edit.png', 'edit'); PMA_buttonOrImage('submit_mult', 'mult_submit', - 'submit_mult_delete', $delete_text, 'b_drop.png'); + 'submit_mult_delete', $delete_text, 'b_drop.png', 'delete'); if (isset($analyzed_sql[0]) && $analyzed_sql[0]['querytype'] == 'SELECT') { PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_export', __('Export'), - 'b_tblexport.png'); + 'b_tblexport.png', 'export'); } echo "\n"; diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index e473192..e566576 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -30,35 +30,19 @@ if (! empty($submit_mult) $selected = $selected_tbl; switch ($submit_mult) { case 'drop_db': - $what = 'drop_db'; + case 'drop_tbl': + case 'empty_tbl': + $what = $submit_mult; break; - case __('Drop'): - $what = 'drop_tbl'; - break; - case __('Empty'): - $what = 'empty_tbl'; - break; - case __('Check table'): - unset($submit_mult); - $query_type = 'check_tbl'; - $mult_btn = __('Yes'); - break; - case __('Optimize table'): - unset($submit_mult); - $query_type = 'optimize_tbl'; - $mult_btn = __('Yes'); - break; - case __('Repair table'): - unset($submit_mult); - $query_type = 'repair_tbl'; - $mult_btn = __('Yes'); - break; - case __('Analyze table'): + case 'check_tbl': + case 'optimize_tbl': + case 'repair_tbl': + case 'analyze_tbl': + $query_type = $submit_mult; unset($submit_mult); - $query_type = 'analyze_tbl'; $mult_btn = __('Yes'); break; - case __('Export'): + case 'export': unset($submit_mult); require('db_export.php'); exit; @@ -69,10 +53,10 @@ if (! empty($submit_mult) // coming from table structure view - do something with selected columns/fileds $selected = $selected_fld; switch ($submit_mult) { - case __('Drop'): + case 'drop': $what = 'drop_fld'; break; - case __('Primary'): + case 'primary': // Gets table primary key PMA_DBI_select_db($db); $result = PMA_DBI_query('SHOW KEYS FROM ' . PMA_backquote($table) . ';'); @@ -94,25 +78,25 @@ if (! empty($submit_mult) $what = 'primary_fld'; } break; - case __('Index'): + case 'index': unset($submit_mult); $query_type = 'index_fld'; $mult_btn = __('Yes'); break; - case __('Unique'): + case 'unique': unset($submit_mult); $query_type = 'unique_fld'; $mult_btn = __('Yes'); break; - case __('Fulltext'): + case 'ftext': unset($submit_mult); $query_type = 'fulltext_fld'; $mult_btn = __('Yes'); break; - case __('Change'): + case 'change': require './tbl_alter.php'; break; - case __('Browse'): + case 'browse': // this should already be handled by tbl_structure.php } } else { diff --git a/tbl_row_action.php b/tbl_row_action.php index d44e808..e5217bf 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -55,17 +55,16 @@ switch($submit_mult) { // leave as is break; - case __('Export'): + case 'export': $submit_mult = 'row_export'; break; - case __('Delete'): - case __('Kill'): + case 'delete': $submit_mult = 'row_delete'; break; default: - case __('Edit'): + case 'edit': $submit_mult = 'row_edit'; break; } @@ -77,9 +76,9 @@ require_once './libraries/header.inc.php'; if (!empty($submit_mult)) { switch($submit_mult) { case 'row_edit': - // As we got the fields to be edited from the + // As we got the fields to be edited from the // 'rows_to_delete' checkbox, we use the index of it as the - // indicating WHERE clause. Then we build the array which is used + // indicating WHERE clause. Then we build the array which is used // for the tbl_change.php script. $where_clause = array(); foreach ($_REQUEST['rows_to_delete'] as $i_where_clause => $del_query) { @@ -94,9 +93,9 @@ if (!empty($submit_mult)) { // Needed to allow SQL export $single_table = TRUE; - // As we got the fields to be edited from the + // As we got the fields to be edited from the // 'rows_to_delete' checkbox, we use the index of it as the - // indicating WHERE clause. Then we build the array which is used + // indicating WHERE clause. Then we build the array which is used // for the tbl_change.php script. $where_clause = array(); foreach ($_REQUEST['rows_to_delete'] as $i_where_clause => $del_query) { diff --git a/tbl_structure.php b/tbl_structure.php index cd5b9be..18eedee 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -554,19 +554,19 @@ $checkall_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table); <i><?php echo __('With selected:'); ?></i> <?php -PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_browse', __('Browse'), 'b_browse.png'); +PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_browse', __('Browse'), 'b_browse.png', 'browse'); if (! $tbl_is_view && ! $db_is_information_schema) { - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_change', __('Change'), 'b_edit.png'); - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_drop', __('Drop'), 'b_drop.png'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_change', __('Change'), 'b_edit.png', 'change'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_drop', __('Drop'), 'b_drop.png', 'drop'); if ('ARCHIVE' != $tbl_type) { - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_primary', __('Primary'), 'b_primary.png'); - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_unique', __('Unique'), 'b_unique.png'); - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_index', __('Index'), 'b_index.png'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_primary', __('Primary'), 'b_primary.png', 'primary'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_unique', __('Unique'), 'b_unique.png', 'unique'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_index', __('Index'), 'b_index.png', 'index'); } if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'ARIA' || $tbl_type == 'MARIA')) { - PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_fulltext', __('Fulltext'), 'b_ftext.png'); + PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_fulltext', __('Fulltext'), 'b_ftext.png', 'ftext'); } } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. eb0b8523cfdb63dea14b75c56b9f7f3f3afcbdd7
by Michal Čihař 18 Mar '11

18 Mar '11

The branch, master has been updated via eb0b8523cfdb63dea14b75c56b9f7f3f3afcbdd7 (commit) via 1462c5ab77ae91a753e713571654f8a987aaf70c (commit) via a18fb1e927a7cbfbc2f0fd834fdd260327039f24 (commit) via ffdea0ff26402e976f8699cc522b2487119970ad (commit) via 109a6765c74e26b1e0ecf9409dbf2efb5cf5d27d (commit) via 204666a437cc309df730f74bc5c9bafb8beea070 (commit) via 5e41495f3104fd9b995b081cb6a442b5a2fb2703 (commit) via b31b2bf6058f9af03a3f41badcbe28a56e88e620 (commit) via df828ca43f3411d0c977f3e25c64054c2d9d2f2b (commit) via 14b4375503a335f5c419b2e081cb6cc6e966bbb8 (commit) via f96a83d5bbcd10649fbb20e2ac8463695765c1ff (commit) via cced3921575cf5231f19ad732f3ac7be3302667c (commit) via 9d34788d1f5dc6913d3560d89143cbf0cb413bc2 (commit) via e9916ab72c92cc45a14c4ce5ea2a640e9301e4b0 (commit) via a96a3160caf8666240220d4038a59f3b5e615b53 (commit) via 5d417811b4ca3a47345ef0b4aee124ba355be835 (commit) via 7d42577ef53ff718279f0399ffa66ecf78c06bac (commit) via 1b8bbb7e4f06de45f3fd377be88b0eaecb2101a6 (commit) via 7ed6663ac2c38acf3da8f9af97a3b97c6f04ee19 (commit) via 840e048d31df15f4b6d7fb75a481965611ad9ecd (commit) via dc8af288a9173f909addc2425686f18c737bd8e4 (commit) via d2cd71d7910d7962a48a8d05f66c7e428ce28267 (commit) via a5eefbdda02b137e26b63fb477b87794cb43a9c0 (commit) via 35d7455bfee40468d2c00762d02bcc3411e62c3d (commit) via f93e2cbdf77040b92472cb47fafd61c2e30015fb (commit) via 35a1b1815c33e83020b2bec5f5b0beeb7024690a (commit) via bae558cec3c59661fee8eea357ef6aff9c98f279 (commit) via f07d92c6cad43f52e069fc1737493f52cda0c3f3 (commit) via 85514ecbebfa87d7a7be8bb6526ee706d658f454 (commit) via f1dcacd8941690e36e402744ebbe2179c0597b0f (commit) via 09674ab9f70c1c57db1096fc21889ef7b9684db0 (commit) via d31a665d1a41ef5d41464f55129c4ddb9cc438ae (commit) via f966c538c851534beb673429a1d4e02a0b288f7c (commit) via 698b0fc01884000140729242c2fb79c980b44a1d (commit) via e3ea99b761d865e69498c268ca34f65b5070dd97 (commit) via a697965a63c5957b27466e05b39bce62aa225f89 (commit) via fa651d3e05e247493ad854cefa9e416607de4557 (commit) via a3c656a53499b708810023a7aaeb4f67f8f32ab3 (commit) via 296cb22734779dea829851e024d73c5cb327fef0 (commit) via be8e79f4cd487d4300188edbbd415f72b2080004 (commit) via 178b39d587e07177cc3d62294084e4e37230e5ea (commit) via 85838d7373570d803e08a7ad9f60937ee4cd5342 (commit) via cca4a9213d5e41f9c67e0647c7d1ee17ff88916f (commit) via 4c6b44cd0cbb80ac7f4e518fe5590b0db190f593 (commit) via 27ead06f03374d36b60eb5eeeb86e9ff73feeacd (commit) via a0eadf3af5ec4e8ce4fcab70d8813817a0ab9b58 (commit) via 2fc31f9b6d1ccb9a2dd64d70874c4798cc5dc08d (commit) via 99de1eb3651429693a613cae41771976f34ab60e (commit) via cc4e438ffd59c65c87a70facca387a42aea1db3a (commit) via 903056ef917f27672164fca8cee62b83fd554d77 (commit) via fad2194034598305a983d4e6fc376d931b339999 (commit) via 17fe7a9e875031cca1e79f1986ae73ac531cb554 (commit) via ee9eb91ba5248eeb672f51c89dfc2fb1987045c0 (commit) via 24bffb4c180fb601f081c17fbcf99376b6846746 (commit) via 9ce3db227345626fc547a45aa8f6a68a104a6a06 (commit) via 13242f532a1f344bebf2c71c219d193f7577d394 (commit) via 2b1d7eb2acdc7c98d7554924c088dd606d96153c (commit) via 5fe5b154a3dffc730e84bf16f4a2d6ea4c1069e9 (commit) from 3449370c045f2f1d61297400d5ac916e8e6593d9 (commit) - Log ----------------------------------------------------------------- commit eb0b8523cfdb63dea14b75c56b9f7f3f3afcbdd7 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Mar 18 09:49:30 2011 +0100 Update translated doc commit 1462c5ab77ae91a753e713571654f8a987aaf70c Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:20:27 2011 +0200 Translation update done using Pootle. commit a18fb1e927a7cbfbc2f0fd834fdd260327039f24 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:18:14 2011 +0200 Translation update done using Pootle. commit ffdea0ff26402e976f8699cc522b2487119970ad Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:18:00 2011 +0200 Translation update done using Pootle. commit 109a6765c74e26b1e0ecf9409dbf2efb5cf5d27d Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:16:11 2011 +0200 Translation update done using Pootle. commit 204666a437cc309df730f74bc5c9bafb8beea070 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:15:57 2011 +0200 Translation update done using Pootle. commit 5e41495f3104fd9b995b081cb6a442b5a2fb2703 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:14:01 2011 +0200 Translation update done using Pootle. commit b31b2bf6058f9af03a3f41badcbe28a56e88e620 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:13:27 2011 +0200 Translation update done using Pootle. commit df828ca43f3411d0c977f3e25c64054c2d9d2f2b Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:12:47 2011 +0200 Translation update done using Pootle. commit 14b4375503a335f5c419b2e081cb6cc6e966bbb8 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:12:37 2011 +0200 Translation update done using Pootle. commit f96a83d5bbcd10649fbb20e2ac8463695765c1ff Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:12:11 2011 +0200 Translation update done using Pootle. commit cced3921575cf5231f19ad732f3ac7be3302667c Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:11:57 2011 +0200 Translation update done using Pootle. commit 9d34788d1f5dc6913d3560d89143cbf0cb413bc2 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:11:37 2011 +0200 Translation update done using Pootle. commit e9916ab72c92cc45a14c4ce5ea2a640e9301e4b0 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:11:23 2011 +0200 Translation update done using Pootle. commit a96a3160caf8666240220d4038a59f3b5e615b53 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:09:58 2011 +0200 Translation update done using Pootle. commit 5d417811b4ca3a47345ef0b4aee124ba355be835 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:08:25 2011 +0200 Translation update done using Pootle. commit 7d42577ef53ff718279f0399ffa66ecf78c06bac Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:07:51 2011 +0200 Translation update done using Pootle. commit 1b8bbb7e4f06de45f3fd377be88b0eaecb2101a6 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:07:37 2011 +0200 Translation update done using Pootle. commit 7ed6663ac2c38acf3da8f9af97a3b97c6f04ee19 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:07:16 2011 +0200 Translation update done using Pootle. commit 840e048d31df15f4b6d7fb75a481965611ad9ecd Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:06:56 2011 +0200 Translation update done using Pootle. commit dc8af288a9173f909addc2425686f18c737bd8e4 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:06:44 2011 +0200 Translation update done using Pootle. commit d2cd71d7910d7962a48a8d05f66c7e428ce28267 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:06:29 2011 +0200 Translation update done using Pootle. commit a5eefbdda02b137e26b63fb477b87794cb43a9c0 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:06:19 2011 +0200 Translation update done using Pootle. commit 35d7455bfee40468d2c00762d02bcc3411e62c3d Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:06:01 2011 +0200 Translation update done using Pootle. commit f93e2cbdf77040b92472cb47fafd61c2e30015fb Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:05:27 2011 +0200 Translation update done using Pootle. commit 35a1b1815c33e83020b2bec5f5b0beeb7024690a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:04:45 2011 +0200 Translation update done using Pootle. commit bae558cec3c59661fee8eea357ef6aff9c98f279 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:04:32 2011 +0200 Translation update done using Pootle. commit f07d92c6cad43f52e069fc1737493f52cda0c3f3 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:02:19 2011 +0200 Translation update done using Pootle. commit 85514ecbebfa87d7a7be8bb6526ee706d658f454 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:01:13 2011 +0200 Translation update done using Pootle. commit f1dcacd8941690e36e402744ebbe2179c0597b0f Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 18:00:40 2011 +0200 Translation update done using Pootle. commit 09674ab9f70c1c57db1096fc21889ef7b9684db0 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:57:46 2011 +0200 Translation update done using Pootle. commit d31a665d1a41ef5d41464f55129c4ddb9cc438ae Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:56:27 2011 +0200 Translation update done using Pootle. commit f966c538c851534beb673429a1d4e02a0b288f7c Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:56:11 2011 +0200 Translation update done using Pootle. commit 698b0fc01884000140729242c2fb79c980b44a1d Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:55:33 2011 +0200 Translation update done using Pootle. commit e3ea99b761d865e69498c268ca34f65b5070dd97 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:54:54 2011 +0200 Translation update done using Pootle. commit a697965a63c5957b27466e05b39bce62aa225f89 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:54:33 2011 +0200 Translation update done using Pootle. commit fa651d3e05e247493ad854cefa9e416607de4557 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:54:11 2011 +0200 Translation update done using Pootle. commit a3c656a53499b708810023a7aaeb4f67f8f32ab3 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:53:03 2011 +0200 Translation update done using Pootle. commit 296cb22734779dea829851e024d73c5cb327fef0 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:52:39 2011 +0200 Translation update done using Pootle. commit be8e79f4cd487d4300188edbbd415f72b2080004 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:52:21 2011 +0200 Translation update done using Pootle. commit 178b39d587e07177cc3d62294084e4e37230e5ea Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:51:56 2011 +0200 Translation update done using Pootle. commit 85838d7373570d803e08a7ad9f60937ee4cd5342 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:51:40 2011 +0200 Translation update done using Pootle. commit cca4a9213d5e41f9c67e0647c7d1ee17ff88916f Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:51:20 2011 +0200 Translation update done using Pootle. commit 4c6b44cd0cbb80ac7f4e518fe5590b0db190f593 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:50:54 2011 +0200 Translation update done using Pootle. commit 27ead06f03374d36b60eb5eeeb86e9ff73feeacd Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:50:32 2011 +0200 Translation update done using Pootle. commit a0eadf3af5ec4e8ce4fcab70d8813817a0ab9b58 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:49:17 2011 +0200 Translation update done using Pootle. commit 2fc31f9b6d1ccb9a2dd64d70874c4798cc5dc08d Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:48:42 2011 +0200 Translation update done using Pootle. commit 99de1eb3651429693a613cae41771976f34ab60e Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:48:21 2011 +0200 Translation update done using Pootle. commit cc4e438ffd59c65c87a70facca387a42aea1db3a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:48:09 2011 +0200 Translation update done using Pootle. commit 903056ef917f27672164fca8cee62b83fd554d77 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:47:50 2011 +0200 Translation update done using Pootle. commit fad2194034598305a983d4e6fc376d931b339999 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:47:46 2011 +0200 Translation update done using Pootle. commit 17fe7a9e875031cca1e79f1986ae73ac531cb554 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:47:36 2011 +0200 Translation update done using Pootle. commit ee9eb91ba5248eeb672f51c89dfc2fb1987045c0 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:46:53 2011 +0200 Translation update done using Pootle. commit 24bffb4c180fb601f081c17fbcf99376b6846746 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:46:23 2011 +0200 Translation update done using Pootle. commit 9ce3db227345626fc547a45aa8f6a68a104a6a06 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:46:13 2011 +0200 Translation update done using Pootle. commit 13242f532a1f344bebf2c71c219d193f7577d394 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:45:48 2011 +0200 Translation update done using Pootle. commit 2b1d7eb2acdc7c98d7554924c088dd606d96153c Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:45:19 2011 +0200 Translation update done using Pootle. commit 5fe5b154a3dffc730e84bf16f4a2d6ea4c1069e9 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 17:44:16 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/es/Documentation.html | 202 ++++++++++++++++++++++-------------------- po/es.po | 130 ++++++++++++++++++++++----- 2 files changed, 213 insertions(+), 119 deletions(-) diff --git a/output/es/Documentation.html b/output/es/Documentation.html index 7c6a559..dca9668 100644 --- a/output/es/Documentation.html +++ b/output/es/Documentation.html @@ -1921,132 +1921,144 @@ algunos servidores web (IIS) tienen problemas con URLs extensas. El valor predeterminado es <code>1000</code>. </dd> - <dt id="cfg_NaviWidth">$cfg['NaviWidth'] integer</dt> - <dd>Navi frame width in pixels. See <tt>themes/themename/layout.inc.php</tt>. + <dt id="cfg_NaviWidth">entero $cfg['NaviWidth']</dt> + <dd>Anchura del marco de navegación en píxeles. Revise +<tt>themes/themename/layout.inc.php</tt>. </dd> - <dt><span id="cfg_NaviBackground">$cfg['NaviBackground']</span> string [CSS -color for background]<br /> - <span id="cfg_MainBackground">$cfg['MainBackground']</span> string [CSS -color for background] + <dt>cadena <span id="cfg_NaviBackground">$cfg['NaviBackground']</span> (Color +CSS para el fondo)<br /> + cadena <span id="cfg_MainBackground">$cfg['MainBackground']</span> (Color +CSS para el fondo) </dt> - <dd>The background styles used for both the frames. See + <dd>El estilo de findo a utilizar para ambos marcos. Revise <tt>themes/themename/layout.inc.php</tt>.</dd> - <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] string [CSS color for background]<br /> - <span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> string [CSS -color]</dt> - <dd>The style used for the pointer in the navi frame. See + <dt id="cfg_NaviPointerBackground">cadena $cfg['NaviPointerBackground'] (Color CSS para el fondo)<br /> + cadena <span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> +(Color CSS)</dt> + <dd>El estilo a utilizar apara el señalador en el marco de navegación. Revise <tt>themes/themename/layout.inc.php</tt>.</dd> - <dt id="cfg_LeftPointerEnable">$cfg['LeftPointerEnable'] boolean</dt> - <dd>A value of <tt>TRUE</tt> activates the navi pointer (when LeftFrameLight is -<tt>FALSE</tt>).</dd> + <dt id="cfg_LeftPointerEnable">booleano $cfg['LeftPointerEnable']</dt> + <dd>Un valor de <tt>TRUE</tt> activa el señalador en la navegación (cuando +LeftFramLight es <tt>FALSE</tt>).</dd> - <dt id="cfg_Border">$cfg['Border'] integer</dt> - <dd>The size of a table's border. See <tt>themes/themename/layout.inc.php</tt>. + <dt id="cfg_Border">entero $cfg['Border']</dt> + <dd>El tamaño del borde las tablas. Revise +<tt>themes/themename/layout.inc.php</tt>. </dd> - <dt id="cfg_ThBackground">$cfg['ThBackground'] string [CSS color for background]<br /> - <span id="cfg_ThColor">$cfg['ThColor']</span> string [CSS color]</dt> - <dd>The style used for table headers. See + <dt id="cfg_ThBackground">cadena $cfg['ThBackground'] (Color CSS para el fondo)<br /> + cadena <span id="cfg_ThColor">$cfg['ThColor']</span> (Color CSS)</dt> + <dd>El estilo a utilizar para las cabeceras de tablas. Revise <tt>themes/themename/layout.inc.php</tt>.</dd> - <dt id="cfg_BgcolorOne">$cfg['BgOne'] string [CSS color]</dt> - <dd>The color (HTML) #1 for table rows. See + <dt id="cfg_BgcolorOne">cadena $cfg['BgOne'] (Color CSS)</dt> + <dd>El 1º color (HTML) para las filas de tabla. Revise <tt>themes/themename/layout.inc.php</tt>. </dd> - <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] string [CSS color]</dt> - <dd>The color (HTML) #2 for table rows. See + <dt id="cfg_BgcolorTwo">cadena $cfg['BgTwo'] (Color CSS)</dt> + <dd>El 2º color (HTML) para filas de tabla. Revise <tt>themes/themename/layout.inc.php</tt>. </dd> - <dt><span id="cfg_BrowsePointerBackground">$cfg['BrowsePointerBackground'] -</span>string [CSS color]<br /> - <span id="cfg_BrowsePointerColor">$cfg['BrowsePointerColor'] </span>string -[CSS color]<br /> - <span id="cfg_BrowseMarkerBackground">$cfg['BrowseMarkerBackground'] -</span>string [CSS color]<br /> - <span id="cfg_BrowseMarkerColor">$cfg['BrowseMarkerColor'] </span>string -[CSS color] + <dt>cadena <span +id="cfg_BrowsePointerBackground">$cfg['BrowsePointerBackground']</span> +(Color CSS)<br /> + cadena <span id="cfg_BrowsePointerColor">$cfg['BrowsePointerColor']</span> +(Color CSS)<br /> + cadena <span +id="cfg_BrowseMarkerBackground">$cfg['BrowseMarkerBackground']</span> (Color +CSS)<br /> + cadena <span id="cfg_BrowseMarkerColor">$cfg['BrowseMarkerColor']</span> +(Color CSS) </dt> - <dd>The colors (HTML) uses for the pointer and the marker in browse mode.<br /> - The former feature highlights the row over which your mouse is passing and -the latter lets you visually mark/unmark rows by clicking on -them. Highlighting / marking a column is done by hovering over / clicking -the column's header (outside of the text).<br /> - See <tt>themes/themename/layout.inc.php</tt>.</dd> - - - <dt id="cfg_FontFamily">$cfg['FontFamily'] string</dt> - <dd>You put here a valid CSS font family value, for example <tt>arial, -sans-serif</tt>.<br /> - See <tt>themes/themename/layout.inc.php</tt>.</dd> - - <dt id="cfg_FontFamilyFixed">$cfg['FontFamilyFixed'] string</dt> - <dd>You put here a valid CSS font family value, for example -<tt>monospace</tt>. This one is used in textarea.<br /> - See <tt>themes/themename/layout.inc.php</tt>.</dd> - - <dt id="cfg_BrowsePointerEnable">$cfg['BrowsePointerEnable'] boolean</dt> - <dd>Whether to activate the browse pointer or not.</dd> - - <dt id="cfg_BrowseMarkerEnable">$cfg['BrowseMarkerEnable'] boolean</dt> - <dd>Whether to activate the browse marker or not.</dd> - - <dt><span id="cfg_TextareaCols">$cfg['TextareaCols'] </span>integer<br /> - <span id="cfg_TextareaRows">$cfg['TextareaRows'] </span>integer<br /> - <span id="cfg_CharTextareaCols">$cfg['CharTextareaCols'] </span>integer<br /> - <span id="cfg_CharTextareaRows">$cfg['CharTextareaRows'] </span>integer + <dd>Los colores (HTML) utilizados para el selector y marcador en el modo de +exploración.<br /> + La funcionalidad anterior reslata la fila sobre la que el mouse está pasando +y luego permite marcar/desmarcar visualmente al pulsar en ellas. El +resaltado/marcado de una columna es realizado al pasar sobre/pulsar la +cabecera de la columna (fuera del texto).<br /> + Revise <tt>themes/themename/layout.inc.php</tt>.</dd> + + + <dt id="cfg_FontFamily">cadena $cfg['FontFamily']</dt> + <dd>Ingrese aquí un valor aceptable para la propiedad CSS font-family; por +ejemplo: <tt>arial, sans-serif</tt>.<br /> + Revise <tt>themes/themename/layout.inc.php</tt>.</dd> + + <dt id="cfg_FontFamilyFixed">cadena $cfg['FontFamilyFixed']</dt> + <dd>Ingrese aquí un valor aceptable para la propiedad CSS font-family; por +ejemplo: <tt>monospace</tt>. Este valor será utilizado en las áreas de +texto.<br /> + Revise <tt>themes/themename/layout.inc.php</tt>.</dd> + + <dt id="cfg_BrowsePointerEnable">booleano $cfg['BrowsePointerEnable']</dt> + <dd>Si activar la exploración por selector o no.</dd> + + <dt id="cfg_BrowseMarkerEnable">booleano $cfg['BrowseMarkerEnable']</dt> + <dd>Si activar el marcado de exploración o no.</dd> + + <dt>entero <span id="cfg_TextareaCols">$cfg['TextareaCols']</span><br /> + entero <span id="cfg_TextareaRows">$cfg['TextareaRows']</span><br /> + entero <span id="cfg_CharTextareaCols">$cfg['CharTextareaCols']</span><br /> + entero <span id="cfg_CharTextareaRows">$cfg['CharTextareaRows']</span> </dt> - <dd>Number of columns and rows for the textareas.<br /> - This value will be emphasized (*2) for <abbr title="structured query -language">SQL</abbr> query textareas and (*1.25) for <abbr title="structured -query language">SQL</abbr> textareas inside the query window.<br /> - The Char* values are used for CHAR and VARCHAR editing (if configured via <a + <dd>Número de columnas y filas para las áreas de texto.<br /> + El valor será duplicado para áreas de texto para consultas <abbr +title="structured query language">SQL</abbr> y aumentando un 25% para las +áreas de texto <abbr title="structured query language">SQL</abbr> dentro de +la ventana de consultas.<br /> + Las configuraciones que comienzan con Char son utilizadas para edición de +campos CHAR y VARCHAR (si están configurados mediante <a href="#cfg_CharEditing">$cfg['CharEditing']</a>).</dd> - <dt><span id="cfg_LongtextDoubleTextarea">$cfg['LongtextDoubleTextarea'] -</span>boolean + <dt>booleano <span +id="cfg_LongtextDoubleTextarea">$cfg['LongtextDoubleTextarea']</span> </dt> - <dd>Defines whether textarea for LONGTEXT columns should have double size.</dd> + <dd>Define si el área de texto para columnas LONGTEXT deben de tener el doble de +tamaño.</dd> - <dt><span id="cfg_TextareaAutoSelect">$cfg['TextareaAutoSelect'] </span>boolean + <dt>booleano <span id="cfg_TextareaAutoSelect">$cfg['TextareaAutoSelect']</span> </dt> - <dd>Defines if the whole textarea of the query box will be selected on click.</dd> + <dd>Define si el área de texto completa de una consulta será seleccionada al +pulsar en ella.</dd> - <dt id="cfg_LimitChars">$cfg['LimitChars'] integer</dt> - <dd>Maximum number of characters shown in any non-numeric field on browse view. -Can be turned off by a toggle button on the browse page.</dd> + <dt id="cfg_LimitChars">entero $cfg['LimitChars']</dt> + <dd>Máximo número de caracteres a mostrar en cualquier campo no-numérico en el +modo de exploración. Puede ser desactivado mediante un botón en la página de +exploración.</dd> - <dt><span id="cfg_ModifyDeleteAtLeft">$cfg['ModifyDeleteAtLeft'] </span>boolean -<span id="cfg_ModifyDeleteAtRight">$cfg['ModifyDeleteAtRight'] -</span>boolean + <dt>booleano <span +id="cfg_ModifyDeleteAtLeft">$cfg['ModifyDeleteAtLeft']</span>, booleano +<span id="cfg_ModifyDeleteAtRight">$cfg['ModifyDeleteAtRight']</span> </dt> - <dd>Defines the place where table row links (Edit, Inline edit, Copy, Delete) -would be put when tables contents are displayed (you may have them displayed -both at the left and at the right). "Left" and "right" -are parsed as "top" and "bottom" with vertical display -mode.</dd> - - <dt id="cfg_DefaultDisplay">$cfg['DefaultDisplay'] string</dt> - <dd>There are 3 display modes: horizontal, horizontalflipped and vertical. -Define which one is displayed by default. The first mode displays each row -on a horizontal line, the second rotates the headers by 90 degrees, so you -can use descriptive headers even though columns only contain small values -and still print them out. The vertical mode sorts each row on a vertical -lineup. + <dd>Define la posición de los enlaces de fila de tabla (Editar, Editar en línea, +Copiar, Borrar) al mostrar los contenidos de una tabla (pueden ser mostrados +tanto a la derecha como a la izquierda). "Left" (izquierda) y +"right" (derecha) son interpretados como "top" (arriba) +y "bottom" (abajo) en el modo de visualización vertical.</dd> + + <dt id="cfg_DefaultDisplay">cadena $cfg['DefaultDisplay']</dt> + <dd>Hay 3 modos de visualización: horizontal, horizontalflipped y vertical. Esta +configuración define el modo predeterminado a utilizar. El primero muestra +cada fila en una línea horizontal, el segundo rota las cabeceras 90 grados +para poder utilizar cabeceras descriptivas aún cuando las columnas contengan +valores cortos y poder imprimirlos. El modo 'vertical' ordena cada fila en +una línea vertical. </dd> - <dt id="cfg_HeaderFlipType">$cfg['HeaderFlipType'] string</dt> + <dt id="cfg_HeaderFlipType">cadena $cfg['HeaderFlipType']</dt> <dd> - The HeaderFlipType can be set to 'auto', 'css' or 'fake'. When using 'css' -the rotation of the header for horizontalflipped is done via CSS. The CSS -transformation currently works only in Internet Explorer.If set to 'fake' -PHP does the transformation for you, but of course this does not look as -good as CSS. The 'auto' option enables CSS transformation when browser -supports it and use PHP based one otherwise. + Esta configuración puede ser 'auto', 'css' o 'fake'. Al utilizar 'css' la +rotación de la cabecera para la visualización 'horizontalflipped' es +realizada mediante CSS. La transformación CSS actualizamente sólo funciona +en Internet Explorer. Si está definido como 'fake' PHP hace la +transformación, pero no se verá tan bien como la versión con CSS. El valor +'auto' activa la transformación por CSS si el navegador lo soporta, de lo +contrario utiliza la versión PHP. </dd> <dt id="DefaultPropDisplay"> diff --git a/po/es.po b/po/es.po index 8079479..3a31fef 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-03-02 13:51+0100\n" -"PO-Revision-Date: 2011-03-17 02:57+0200\n" +"PO-Revision-Date: 2011-03-17 18:20+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: none\n" "Language: es\n" @@ -5067,13 +5067,15 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1797 msgid "$cfg['NaviWidth'] integer" -msgstr "" +msgstr "entero $cfg['NaviWidth']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1798 msgid "" "Navi frame width in pixels. See <tt>themes/themename/layout.inc.php</tt>." msgstr "" +"Anchura del marco de navegación en píxeles. Revise " +"<tt>themes/themename/layout.inc.php</tt>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1801 @@ -5081,6 +5083,8 @@ msgid "" "<span id=\"cfg_NaviBackground\">$cfg['NaviBackground']</span> string [CSS " "color for background]" msgstr "" +"cadena <span id=\"cfg_NaviBackground\">$cfg['NaviBackground']</span> (Color " +"CSS para el fondo)" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1802 @@ -5088,6 +5092,8 @@ msgid "" "<span id=\"cfg_MainBackground\">$cfg['MainBackground']</span> string [CSS " "color for background]" msgstr "" +"cadena <span id=\"cfg_MainBackground\">$cfg['MainBackground']</span> (Color " +"CSS para el fondo)" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1804 @@ -5095,11 +5101,13 @@ msgid "" "The background styles used for both the frames. See <tt>themes/themename/" "layout.inc.php</tt>." msgstr "" +"El estilo de findo a utilizar para ambos marcos. Revise " +"<tt>themes/themename/layout.inc.php</tt>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1807 msgid "$cfg['NaviPointerBackground'] string [CSS color for background]" -msgstr "" +msgstr "cadena $cfg['NaviPointerBackground'] (Color CSS para el fondo)" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1808 @@ -5107,6 +5115,8 @@ msgid "" "<span id=\"cfg_NaviPointerColor\">$cfg['NaviPointerColor']</span> string " "[CSS color]" msgstr "" +"cadena <span id=\"cfg_NaviPointerColor\">$cfg['NaviPointerColor']</span> " +"(Color CSS)" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1809 @@ -5114,11 +5124,13 @@ msgid "" "The style used for the pointer in the navi frame. See <tt>themes/themename/" "layout.inc.php</tt>." msgstr "" +"El estilo a utilizar apara el señalador en el marco de navegación. Revise " +"<tt>themes/themename/layout.inc.php</tt>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1812 msgid "$cfg['LeftPointerEnable'] boolean" -msgstr "" +msgstr "booleano $cfg['LeftPointerEnable']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1813 @@ -5126,27 +5138,31 @@ msgid "" "A value of <tt>TRUE</tt> activates the navi pointer (when LeftFrameLight is " "<tt>FALSE</tt>)." msgstr "" +"Un valor de <tt>TRUE</tt> activa el señalador en la navegación (cuando " +"LeftFramLight es <tt>FALSE</tt>)." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1816 msgid "$cfg['Border'] integer" -msgstr "" +msgstr "entero $cfg['Border']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1817 msgid "" "The size of a table's border. See <tt>themes/themename/layout.inc.php</tt>." msgstr "" +"El tamaño del borde las tablas. Revise " +"<tt>themes/themename/layout.inc.php</tt>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1820 msgid "$cfg['ThBackground'] string [CSS color for background]" -msgstr "" +msgstr "cadena $cfg['ThBackground'] (Color CSS para el fondo)" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1821 msgid "<span id=\"cfg_ThColor\">$cfg['ThColor']</span> string [CSS color]" -msgstr "" +msgstr "cadena <span id=\"cfg_ThColor\">$cfg['ThColor']</span> (Color CSS)" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1822 @@ -5154,11 +5170,13 @@ msgid "" "The style used for table headers. See <tt>themes/themename/layout.inc.php</" "tt>." msgstr "" +"El estilo a utilizar para las cabeceras de tablas. Revise " +"<tt>themes/themename/layout.inc.php</tt>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1825 msgid "$cfg['BgOne'] string [CSS color]" -msgstr "" +msgstr "cadena $cfg['BgOne'] (Color CSS)" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1826 @@ -5166,11 +5184,13 @@ msgid "" "The color (HTML) #1 for table rows. See <tt>themes/themename/layout.inc.php</" "tt>." msgstr "" +"El 1º color (HTML) para las filas de tabla. Revise " +"<tt>themes/themename/layout.inc.php</tt>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1829 msgid "$cfg['BgTwo'] string [CSS color]" -msgstr "" +msgstr "cadena $cfg['BgTwo'] (Color CSS)" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1830 @@ -5178,6 +5198,8 @@ msgid "" "The color (HTML) #2 for table rows. See <tt>themes/themename/layout.inc.php</" "tt>." msgstr "" +"El 2º color (HTML) para filas de tabla. Revise " +"<tt>themes/themename/layout.inc.php</tt>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1833 @@ -5185,6 +5207,9 @@ msgid "" "<span id=\"cfg_BrowsePointerBackground\">$cfg['BrowsePointerBackground'] </" "span>string [CSS color]" msgstr "" +"cadena <span " +"id=\"cfg_BrowsePointerBackground\">$cfg['BrowsePointerBackground']</span> " +"(Color CSS)" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1834 @@ -5192,6 +5217,8 @@ msgid "" "<span id=\"cfg_BrowsePointerColor\">$cfg['BrowsePointerColor'] </span>string " "[CSS color]" msgstr "" +"cadena <span id=\"cfg_BrowsePointerColor\">$cfg['BrowsePointerColor']</span> " +"(Color CSS)" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1835 @@ -5199,6 +5226,9 @@ msgid "" "<span id=\"cfg_BrowseMarkerBackground\">$cfg['BrowseMarkerBackground'] </" "span>string [CSS color]" msgstr "" +"cadena <span " +"id=\"cfg_BrowseMarkerBackground\">$cfg['BrowseMarkerBackground']</span> (Color " +"CSS)" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1836 @@ -5206,11 +5236,15 @@ msgid "" "<span id=\"cfg_BrowseMarkerColor\">$cfg['BrowseMarkerColor'] </span>string " "[CSS color]" msgstr "" +"cadena <span id=\"cfg_BrowseMarkerColor\">$cfg['BrowseMarkerColor']</span> " +"(Color CSS)" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1838 msgid "The colors (HTML) uses for the pointer and the marker in browse mode." msgstr "" +"Los colores (HTML) utilizados para el selector y marcador en el modo de " +"exploración." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1839 @@ -5220,17 +5254,21 @@ msgid "" "Highlighting / marking a column is done by hovering over / clicking the " "column's header (outside of the text)." msgstr "" +"La funcionalidad anterior reslata la fila sobre la que el mouse está pasando " +"y luego permite marcar/desmarcar visualmente al pulsar en ellas. El " +"resaltado/marcado de una columna es realizado al pasar sobre/pulsar la " +"cabecera de la columna (fuera del texto)." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1843 orig-docs/Documentation.html:1849 #: orig-docs/Documentation.html:1854 msgid "See <tt>themes/themename/layout.inc.php</tt>." -msgstr "" +msgstr "Revise <tt>themes/themename/layout.inc.php</tt>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1846 msgid "$cfg['FontFamily'] string" -msgstr "" +msgstr "cadena $cfg['FontFamily']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1847 @@ -5238,11 +5276,13 @@ msgid "" "You put here a valid CSS font family value, for example <tt>arial, sans-" "serif</tt>." msgstr "" +"Ingrese aquí un valor aceptable para la propiedad CSS font-family; por " +"ejemplo: <tt>arial, sans-serif</tt>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1851 msgid "$cfg['FontFamilyFixed'] string" -msgstr "" +msgstr "cadena $cfg['FontFamilyFixed']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1852 @@ -5250,53 +5290,56 @@ msgid "" "You put here a valid CSS font family value, for example <tt>monospace</tt>. " "This one is used in textarea." msgstr "" +"Ingrese aquí un valor aceptable para la propiedad CSS font-family; por " +"ejemplo: <tt>monospace</tt>. Este valor será utilizado en las áreas de " +"texto." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1856 msgid "$cfg['BrowsePointerEnable'] boolean" -msgstr "" +msgstr "booleano $cfg['BrowsePointerEnable']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1857 msgid "Whether to activate the browse pointer or not." -msgstr "" +msgstr "Si activar la exploración por selector o no." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1859 msgid "$cfg['BrowseMarkerEnable'] boolean" -msgstr "" +msgstr "booleano $cfg['BrowseMarkerEnable']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1860 msgid "Whether to activate the browse marker or not." -msgstr "" +msgstr "Si activar el marcado de exploración o no." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1862 msgid "<span id=\"cfg_TextareaCols\">$cfg['TextareaCols'] </span>integer" -msgstr "" +msgstr "entero <span id=\"cfg_TextareaCols\">$cfg['TextareaCols']</span>" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1863 msgid "<span id=\"cfg_TextareaRows\">$cfg['TextareaRows'] </span>integer" -msgstr "" +msgstr "entero <span id=\"cfg_TextareaRows\">$cfg['TextareaRows']</span>" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1864 msgid "" "<span id=\"cfg_CharTextareaCols\">$cfg['CharTextareaCols'] </span>integer" -msgstr "" +msgstr "entero <span id=\"cfg_CharTextareaCols\">$cfg['CharTextareaCols']</span>" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1865 msgid "" "<span id=\"cfg_CharTextareaRows\">$cfg['CharTextareaRows'] </span>integer" -msgstr "" +msgstr "entero <span id=\"cfg_CharTextareaRows\">$cfg['CharTextareaRows']</span>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1867 msgid "Number of columns and rows for the textareas." -msgstr "" +msgstr "Número de columnas y filas para las áreas de texto." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1868 @@ -5305,6 +5348,10 @@ msgid "" "language\">SQL</abbr> query textareas and (*1.25) for <abbr title=" "\"structured query language\">SQL</abbr> textareas inside the query window." msgstr "" +"El valor será duplicado para áreas de texto para consultas <abbr " +"title=\"structured query language\">SQL</abbr> y aumentando un 25% para las " +"áreas de texto <abbr title=\"structured query language\">SQL</abbr> dentro de " +"la ventana de consultas." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1870 @@ -5312,6 +5359,9 @@ msgid "" "The Char* values are used for CHAR and VARCHAR editing (if configured via <a " "href=\"#cfg_CharEditing\">$cfg['CharEditing']</a>)." msgstr "" +"Las configuraciones que comienzan con Char son utilizadas para edición de " +"campos CHAR y VARCHAR (si están configurados mediante <a " +"href=\"#cfg_CharEditing\">$cfg['CharEditing']</a>)." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1873 @@ -5319,28 +5369,35 @@ msgid "" "<span id=\"cfg_LongtextDoubleTextarea\">$cfg['LongtextDoubleTextarea'] </" "span>boolean" msgstr "" +"booleano <span " +"id=\"cfg_LongtextDoubleTextarea\">$cfg['LongtextDoubleTextarea']</span>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1875 msgid "Defines whether textarea for LONGTEXT columns should have double size." msgstr "" +"Define si el área de texto para columnas LONGTEXT deben de tener el doble de " +"tamaño." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1877 msgid "" "<span id=\"cfg_TextareaAutoSelect\">$cfg['TextareaAutoSelect'] </span>boolean" msgstr "" +"booleano <span id=\"cfg_TextareaAutoSelect\">$cfg['TextareaAutoSelect']</span>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1879 msgid "" "Defines if the whole textarea of the query box will be selected on click." msgstr "" +"Define si el área de texto completa de una consulta será seleccionada al " +"pulsar en ella." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1882 msgid "$cfg['LimitChars'] integer" -msgstr "" +msgstr "entero $cfg['LimitChars']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1883 @@ -5348,6 +5405,9 @@ msgid "" "Maximum number of characters shown in any non-numeric field on browse view. " "Can be turned off by a toggle button on the browse page." msgstr "" +"Máximo número de caracteres a mostrar en cualquier campo no-numérico en el " +"modo de exploración. Puede ser desactivado mediante un botón en la página de " +"exploración." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1886 @@ -5356,6 +5416,9 @@ msgid "" "span>boolean <span id=\"cfg_ModifyDeleteAtRight\">$cfg" "['ModifyDeleteAtRight'] </span>boolean" msgstr "" +"booleano <span " +"id=\"cfg_ModifyDeleteAtLeft\">$cfg['ModifyDeleteAtLeft']</span>, booleano " +"<span id=\"cfg_ModifyDeleteAtRight\">$cfg['ModifyDeleteAtRight']</span>" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1889 @@ -5366,11 +5429,17 @@ msgid "" "are parsed as "top" and "bottom" with vertical display " "mode." msgstr "" +"Define la posición de los enlaces de fila de tabla (Editar, Editar en línea, " +"Copiar, Borrar) al mostrar los contenidos de una tabla (pueden ser " +"mostrados tanto a la derecha como a la izquierda). "Left" " +"(izquierda) y "right" (derecha) son interpretados como " +""top" (arriba) y "bottom" (abajo) en el modo de " +"visualización vertical." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1896 msgid "$cfg['DefaultDisplay'] string" -msgstr "" +msgstr "cadena $cfg['DefaultDisplay']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1897 @@ -5382,11 +5451,17 @@ msgid "" "and still print them out. The vertical mode sorts each row on a vertical " "lineup." msgstr "" +"Hay 3 modos de visualización: horizontal, horizontalflipped y vertical. Esta " +"configuración define el modo predeterminado a utilizar. El primero muestra " +"cada fila en una línea horizontal, el segundo rota las cabeceras 90 grados " +"para poder utilizar cabeceras descriptivas aún cuando las columnas contengan " +"valores cortos y poder imprimirlos. El modo 'vertical' ordena cada fila en " +"una línea vertical." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1905 msgid "$cfg['HeaderFlipType'] string" -msgstr "" +msgstr "cadena $cfg['HeaderFlipType']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1907 @@ -5398,6 +5473,13 @@ msgid "" "good as CSS. The 'auto' option enables CSS transformation when browser " "supports it and use PHP based one otherwise." msgstr "" +"Esta configuración puede ser 'auto', 'css' o 'fake'. Al utilizar 'css' la " +"rotación de la cabecera para la visualización 'horizontalflipped' es " +"realizada mediante CSS. La transformación CSS actualizamente sólo funciona " +"en Internet Explorer. Si está definido como 'fake' PHP hace la " +"transformación, pero no se verá tan bien como la versión con CSS. El valor " +"'auto' activa la transformación por CSS si el navegador lo soporta, de lo " +"contrario utiliza la versión PHP." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1917 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-379-g65e53a8
by Michal Čihař 17 Mar '11

17 Mar '11

The branch, master has been updated via 65e53a8bb8afd76d4779b0d0e536d7ab2690b439 (commit) from 45926a3a2dd93873ff942e98b2bebba5c3ab2bba (commit) - Log ----------------------------------------------------------------- commit 65e53a8bb8afd76d4779b0d0e536d7ab2690b439 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 17 16:10:36 2011 +0100 bug#3212720 Show error message on error. ----------------------------------------------------------------------- Summary of changes: libraries/import/ods.php | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/libraries/import/ods.php b/libraries/import/ods.php index c0db7af..4bf5200 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -74,7 +74,14 @@ $xml = simplexml_load_string($buffer, "SimpleXMLElement", LIBXML_COMPACT); unset($buffer); -$sheets = $xml->children('office', true)->{'body'}->{'spreadsheet'}->children('table', true); +if ($xml === FALSE) { + $sheets = array(); + /* TODO: this message should be improved later, used existing because of string freeze */ + $message = PMA_Message::error(__('Error in Processing Request')); + $error = TRUE; +} else { + $sheets = $xml->children('office', true)->{'body'}->{'spreadsheet'}->children('table', true); +} $tables = array(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-378-g45926a3
by Madhura Jayaratne 17 Mar '11

17 Mar '11

The branch, master has been updated via 45926a3a2dd93873ff942e98b2bebba5c3ab2bba (commit) via a5116cd8cf349ae85986e6362e54b3d86f41c241 (commit) via 876fa8fd3d287457c4823606845450aaa4ff9198 (commit) from 351915f066a7d3db6b37b9cdcd2c59779f815917 (commit) - Log ----------------------------------------------------------------- commit 45926a3a2dd93873ff942e98b2bebba5c3ab2bba Merge: a5116cd8cf349ae85986e6362e54b3d86f41c241 351915f066a7d3db6b37b9cdcd2c59779f815917 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Mar 17 20:05:26 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit a5116cd8cf349ae85986e6362e54b3d86f41c241 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Mar 17 19:59:22 2011 +0530 Proper handling of marked and hover classes for inline edit. commit 876fa8fd3d287457c4823606845450aaa4ff9198 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Mar 17 18:50:26 2011 +0530 Fixed row marking for vertical mode Edit and Inline Edit 'td's. ----------------------------------------------------------------------- Summary of changes: js/sql.js | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/js/sql.js b/js/sql.js index 9fc8bb3..acd9c8d 100644 --- a/js/sql.js +++ b/js/sql.js @@ -64,7 +64,7 @@ function appendInlineAnchor() { // on the ModifyDeleteAtLeft and ModifyDeleteAtRight cfg parameters $('#table_results tr') .find('.edit_row_anchor') - .removeClass('.edit_row_anchor') + .removeClass('edit_row_anchor') .parent().each(function() { var $this_tr = $(this); var $cloned_tr = $this_tr.clone(); @@ -474,16 +474,13 @@ $(document).ready(function() { $chg_submit.empty(); $chg_submit.append(data_vt); - var $this_row = $(this).parent().parent(); - if(parseInt(pos) % 2 == 0) { - $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active").addClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor"); + var $this_row = $(this).parents('tr'); + // changing inline_edit_active to inline_edit_anchor + $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("inline_edit_active").addClass("inline_edit_anchor"); - $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active hover").addClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor"); - } else { - $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active").addClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor"); + // removing marked and hover classes. + $this_row.parent('tbody').find('tr').find("td:eq(" + pos + ")").removeClass("marked hover"); - $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active hover").addClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor"); - } for( var i = 6; i <= rows + 2; i++){ if( $this_row.siblings("tr:eq(" + i + ") td:eq(" + pos + ")").hasClass("inline_edit") == false) { continue; @@ -899,9 +896,17 @@ $(document).ready(function() { } PMA_ajaxShowMessage(data.message); - $this_td.removeClass('inline_edit_active hover').addClass('inline_edit_anchor'); - $this_td.parent().removeClass('hover noclick'); - $this_td.siblings().removeClass('hover'); + + // changing inline_edit_active to inline_edit_anchor + $this_td.removeClass('inline_edit_active').addClass('inline_edit_anchor'); + + // removing hover, marked and noclick classes + $this_td.parent('tr').removeClass('noclick'); + if(disp_mode != 'vertical') { + $this_td.parent('tr').removeClass('hover').find('td').removeClass('hover'); + } else { + $this_td.parents('tbody').find('tr').find('td:eq(' + $this_td.index() + ')').removeClass('marked'); + } $input_siblings.each(function() { // Inline edit post has been successful. hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-375-g351915f
by Marc Delisle 17 Mar '11

17 Mar '11

The branch, master has been updated via 351915f066a7d3db6b37b9cdcd2c59779f815917 (commit) from c52a7d8c7b569281055daec7b037b5857d18d916 (commit) - Log ----------------------------------------------------------------- commit 351915f066a7d3db6b37b9cdcd2c59779f815917 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Mar 17 10:30:05 2011 -0400 Deactivated custom color feature for 3.4.0-rc1 ----------------------------------------------------------------------- Summary of changes: main.php | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/main.php b/main.php index 5f18ba8..431f65b 100644 --- a/main.php +++ b/main.php @@ -12,7 +12,7 @@ define('PMA_COLORPICKER', true); require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'colorpicker/js/colorpicker.js'; -$GLOBALS['js_include'][] = 'main_custom_color.js'; +//$GLOBALS['js_include'][] = 'main_custom_color.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js'; @@ -137,6 +137,8 @@ if ($GLOBALS['cfg']['ThemeManager']) { echo '</li>'; // see js/main_custom_color.js + /* + * deactivated for 3.4.0-rc1 echo '<li id="li_custom_color" class="hide">'; echo __('Background color') . ': '; echo '<input type="submit" name="custom_color_choose" value="' . __('Choose...') . '" />'; @@ -146,6 +148,7 @@ if ($GLOBALS['cfg']['ThemeManager']) { echo '<input type="submit" name="custom_color_reset" value="' . __('Reset') . '" />'; echo '</form>'; echo '</li>'; + */ } echo '<li id="li_select_fontsize">'; echo PMA_Config::getFontsizeForm(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 3449370c045f2f1d61297400d5ac916e8e6593d9
by Michal Čihař 17 Mar '11

17 Mar '11

The branch, master has been updated via 3449370c045f2f1d61297400d5ac916e8e6593d9 (commit) via a71e6866db28113c76533f71f40479877dd67f37 (commit) via c268f8306572de1db5e27cbdbc1afe1890e24d74 (commit) via d826d3465ed292c1bd47a56ed8b53713598c236f (commit) via 62d3dba73f8dac15cdbe29bd76525fbe6680dfa3 (commit) via 56061e4f3d3dcd2bc858cdcaa80208ffed21f502 (commit) via b54615a8edbc17b5678cd5d410cffa9d78f05447 (commit) via 4a50b42c52d10fc3558f8fb2844af90135b1bd3b (commit) via b84f074fa6f03d17129597f2381a531ac39d93df (commit) via 2ad2aad58393e1ee7353dbcd06d439fc9a99da19 (commit) via 8c0e9f444cc0b9f1fdad15b35f3ea65d02cc873d (commit) via 24b2599ae41753c89fb33359e797f9a1b610f6f0 (commit) via 57994905e92a4ade1fddd68bf020d2e90df4b91c (commit) via 77abacd96df32d9ba37ed76b516df98d3a3d7b0b (commit) via ee7ed02d0d870b3e15a0c5d8a9485709997b1320 (commit) via d33efb4f054539ee2938e4a67ea07cbe83dd27d2 (commit) via 51d976fd3662133b1b96a6dcd34eb14c5643f306 (commit) via 0f0949a8f6e31caa7c9fbe43d328b4797857c82a (commit) via 59e8aeb3e32ff614a4096105b3ca661d38381d5e (commit) via 9d40bfd982b78a34c3149e64b137339eaa5a109a (commit) via 9d2ae65c66d07126595b98cc921d6c4d37fe54e7 (commit) via 8b45fad80da2dad81e47af9fc25b4b3a5825ec0b (commit) via 1e095a3f0cbd601ae0aa083604baae3b47810d6e (commit) via d7ac1f14b8c1b07bcebc14e733854962991abd1a (commit) via c9f298b47759d2c014a46f82c21c1ebeb9673db4 (commit) via 0a9a5ebfc47e3175b356bb977a1875f55dc565df (commit) via 16eab1f32d1d39a2b254845890e07549b18faef1 (commit) via face6d4c3b8c1d9823909c5465f40a65d519c351 (commit) via cf5fb442a673720f0dba6b766d64bc5830975f2f (commit) from 56af2a0cfef8e6e39e14d4f23eb0fe154122e1a6 (commit) - Log ----------------------------------------------------------------- commit 3449370c045f2f1d61297400d5ac916e8e6593d9 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Mar 17 06:58:05 2011 +0100 Update docs commit a71e6866db28113c76533f71f40479877dd67f37 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:57:41 2011 +0200 Translation update done using Pootle. commit c268f8306572de1db5e27cbdbc1afe1890e24d74 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:56:28 2011 +0200 Translation update done using Pootle. commit d826d3465ed292c1bd47a56ed8b53713598c236f Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:56:13 2011 +0200 Translation update done using Pootle. commit 62d3dba73f8dac15cdbe29bd76525fbe6680dfa3 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:54:32 2011 +0200 Translation update done using Pootle. commit 56061e4f3d3dcd2bc858cdcaa80208ffed21f502 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:54:23 2011 +0200 Translation update done using Pootle. commit b54615a8edbc17b5678cd5d410cffa9d78f05447 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:54:10 2011 +0200 Translation update done using Pootle. commit 4a50b42c52d10fc3558f8fb2844af90135b1bd3b Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:53:56 2011 +0200 Translation update done using Pootle. commit b84f074fa6f03d17129597f2381a531ac39d93df Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:53:07 2011 +0200 Translation update done using Pootle. commit 2ad2aad58393e1ee7353dbcd06d439fc9a99da19 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:52:50 2011 +0200 Translation update done using Pootle. commit 8c0e9f444cc0b9f1fdad15b35f3ea65d02cc873d Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:52:10 2011 +0200 Translation update done using Pootle. commit 24b2599ae41753c89fb33359e797f9a1b610f6f0 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:51:52 2011 +0200 Translation update done using Pootle. commit 57994905e92a4ade1fddd68bf020d2e90df4b91c Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:51:10 2011 +0200 Translation update done using Pootle. commit 77abacd96df32d9ba37ed76b516df98d3a3d7b0b Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:51:01 2011 +0200 Translation update done using Pootle. commit ee7ed02d0d870b3e15a0c5d8a9485709997b1320 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:50:24 2011 +0200 Translation update done using Pootle. commit d33efb4f054539ee2938e4a67ea07cbe83dd27d2 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:47:53 2011 +0200 Translation update done using Pootle. commit 51d976fd3662133b1b96a6dcd34eb14c5643f306 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:46:53 2011 +0200 Translation update done using Pootle. commit 0f0949a8f6e31caa7c9fbe43d328b4797857c82a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:45:18 2011 +0200 Translation update done using Pootle. commit 59e8aeb3e32ff614a4096105b3ca661d38381d5e Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:45:08 2011 +0200 Translation update done using Pootle. commit 9d40bfd982b78a34c3149e64b137339eaa5a109a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:43:27 2011 +0200 Translation update done using Pootle. commit 9d2ae65c66d07126595b98cc921d6c4d37fe54e7 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:43:17 2011 +0200 Translation update done using Pootle. commit 8b45fad80da2dad81e47af9fc25b4b3a5825ec0b Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:40:23 2011 +0200 Translation update done using Pootle. commit 1e095a3f0cbd601ae0aa083604baae3b47810d6e Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:40:10 2011 +0200 Translation update done using Pootle. commit d7ac1f14b8c1b07bcebc14e733854962991abd1a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:39:43 2011 +0200 Translation update done using Pootle. commit c9f298b47759d2c014a46f82c21c1ebeb9673db4 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:39:19 2011 +0200 Translation update done using Pootle. commit 0a9a5ebfc47e3175b356bb977a1875f55dc565df Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:38:47 2011 +0200 Translation update done using Pootle. commit 16eab1f32d1d39a2b254845890e07549b18faef1 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:38:08 2011 +0200 Translation update done using Pootle. commit face6d4c3b8c1d9823909c5465f40a65d519c351 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:36:54 2011 +0200 Translation update done using Pootle. commit cf5fb442a673720f0dba6b766d64bc5830975f2f Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Mar 17 02:36:43 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/es/Documentation.html | 127 ++++++++++++++++++++++-------------------- po/es.po | 80 +++++++++++++++++++++----- 2 files changed, 131 insertions(+), 76 deletions(-) diff --git a/output/es/Documentation.html b/output/es/Documentation.html index b5be12b..7c6a559 100644 --- a/output/es/Documentation.html +++ b/output/es/Documentation.html @@ -1836,82 +1836,89 @@ locale/<i>code</i>/LC_MESSAGES/phpmyadmin.mo. </dd> <dt id="cfg_FilterLanguages">cadena $cfg['FilterLanguages']</dt> - <dd>Limit list of available languages to those matching the given regular -expression. For example if you want only Czech and English, you should set -filter to <code>'^(cs|en)'</code>.</dd> - - <dt id="cfg_RecodingEngine">$cfg['RecodingEngine'] string</dt> - <dd>You can select here which functions will be used for character set -conversion. Possible values are: - <ul><li>auto - automatically use available one (first is tested iconv, then recode)</li> - <li>iconv - use iconv or libiconv functions</li> - <li>recode - use recode_string function</li> - <li>none - disable encoding conversion</li> + <dd>Limitar la lista de lenguajes disponibles a aquellos que coincidan con la +expresión regular provista. Por ejemplo, si sólo se desean Español e Inglés, +el filtro debería de ser <code>'^(es|en)'</code>.</dd> + + <dt id="cfg_RecodingEngine">cadena $cfg['RecodingEngine']</dt> + <dd>Se puede definir aquí qué funciones utilizar para la conversión entre +conjuntos de caracteres. Los valores posibles son: + <ul><li>auto - utilizar automáticamente los disponibles (primero se intenta con +iconv, luego recode)</li> + <li>iconv - utilizar funciones iconv o libiconv</li> + <li>recode - utilizar la función recode_string</li> + <li>none - desactivar la conversión de codificación</li> </ul> - Default is auto.</dd> + El valor predeterminado es auto.</dd> <dd> - Enabled charset conversion activates a pull-down menu in the Export and -Import pages, to choose the character set when exporting a file. The default -value in this menu comes from <tt>$cfg['Export']['charset']</tt> and -<tt>$cfg['Import']['charset']</tt>. + Las funciones de conversión de conjuntos de caracteres habilitadas activarán +una lista desplegable en las páginas de importación y exportación para +elegir el conjunto de caracteres a utilizar en el archivo. El valor +predeterminado de esa lista proviene de <tt>$cfg['Import']['charset']</tt> y +<tt>$cfg['Export']['charset']</tt> respectivamente. </dd> - <dt id="cfg_IconvExtraParams">$cfg['IconvExtraParams'] string</dt> - <dd>Specify some parameters for iconv used in charset conversion. See <a -href="http://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.ht…">iconv -documentation</a> for details. By default <code>//TRANSLIT</code> is used, -so that invalid characters will be transliterated.</dd> - - <dt id="cfg_AvailableCharsets">$cfg['AvailableCharsets'] array</dt> - <dd>Available character sets for MySQL conversion. You can add your own (any of -supported by recode/iconv) or remove these which you don't use. Character -sets will be shown in same order as here listed, so if you frequently use -some of these move them to the top.</dd> - - <dt id="cfg_TrustedProxies">$cfg['TrustedProxies'] array</dt> - <dd>Lists proxies and HTTP headers which are trusted for <a -href="#servers_allowdeny_order">IP Allow/Deny</a>. This list is by default -empty, you need to fill in some trusted proxy servers if you want to use -rules for IP addresses behind proxy.<br /><br /> - - The following example specifies that phpMyAdmin should trust a -HTTP_X_FORWARDED_FOR (<tt>X-Forwarded-For</tt>) header coming from the proxy -1.2.3.4: + <dt id="cfg_IconvExtraParams">cadena $cfg['IconvExtraParams']</dt> + <dd>Especificar algunos parámetros para la conversión de conjuntos de caracteres +con funciones iconv. Visite <a +href="http://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.ht…">la +documentación iconv</a> para más detalles. El valor predeterminado es +<code>//TRANSLIT</code> para transliterar caracteres inválidos.</dd> + + <dt id="cfg_AvailableCharsets">array $cfg['AvailableCharsets']</dt> + <dd>Los conjuntos de caracteres disponibles para conversión MySQL. Puedes +agregar otros propios (cualquiera soportado por recode/iconv) o eliminar +aquellos que no utilices. Los conjuntos de caracteres serán mostrados en el +mismo orden en el que estén listados aquí, por lo que es recomendable mover +al principio aquellos que utilices frecuentemente.</dd> + + <dt id="cfg_TrustedProxies">array $cfg['TrustedProxies']</dt> + <dd>Lista de proxies y cabeceras HTTP confiables para <a +href="#servers_allowdeny_order">IP Allow/Deny</a>. El valor predeterminado +es que la lista esté vacía, necesitarás completarla con servidores proxy si +se desea utilizar esas reglas para direcciones IPs detrás de un proxy.<br /><br /> + + En el siguiente ejemplo, phpMyAdmin debería de confiar en la cabecera +HTTP_X_FORWARDED_FOR (<tt>X-Forwarded-For</tt>) cuando provenga del proxy +con dirección IP 1.2.3.4: <pre> $cfg['TrustedProxies'] = - array('1.2.3.4' => 'HTTP_X_FORWARDED_FOR'); +array('1.2.3.4' => 'HTTP_X_FORWARDED_FOR'); </pre> - The $cfg['Servers'][$i]['AllowDeny']['rules'] directive uses the client's IP -address as usual. + La directiva $cfg['Servers'][$i]['AllowDeny']['rules'] utilizará las +direcciones IP de los clientes como siempre. </dd> - <dt id="cfg_GD2Available">$cfg['GD2Available'] string</dt> - <dd>Specifies whether GD >= 2 is available. If yes it can be used for MIME -transformations.<br /> - Possible values are: - <ul><li>auto - automatically detect, this is a bit expensive operation for php < -4.3.0 so it is preferred to change this according to your server real -possibilities</li> - <li>yes - GD 2 functions can be used</li> - <li>no - GD 2 function cannot be used</li> + <dt id="cfg_GD2Available">cadena $cfg['GD2Available']</dt> + <dd>Especifica si está disponible GD >= 2. Si está disponible, puede ser +utilizada para transformaciones MIME.<br /> + Los valores posibles son: + <ul><li>auto - detectar automáticamente, esta es una operación costosa para PHP < +4.3.0 por lo que es preferible modificarla según las capacidades reales del +servidor.</li> + <li>yes - las funciones GD 2 pueden ser utilizadas</li> + <li>no - las funciones GD2 no pueden ser utilizadas</li> </ul> - Default is auto. + El valor predeterminado es auto. </dd> - <dt id="cfg_CheckConfigurationPermissions">$cfg['CheckConfigurationPermissions'] boolean</dt> + <dt id="cfg_CheckConfigurationPermissions">booleano $cfg['CheckConfigurationPermissions']</dt> <dd> - We normally check the permissions on the configuration file to ensure it's -not world writable. However, phpMyAdmin could be installed on a NTFS -filesystem mounted on a non-Windows server, in which case the permissions -seems wrong but in fact cannot be detected. In this case a sysadmin would -set this parameter to <tt>FALSE</tt>. Default is <tt>TRUE</tt>. + Normalmente se revisan los permisos en el archivo de configuración para +asegurarse que todo el mundo no pueda escribir en él. Sin embargo, +phpMyAdmin podría estar instalado en un sistema de archivos NTFS montado en +un servidor no-Windows, en cuyo caso los permisos parecerán incorrectos +debido a problemas de detección. En dichos casos, el administrador deberá +configurar este parámetro a <tt>FALSE</tt>. El valor predeterminado es +<tt>TRUE</tt>. </dd> - <dt id="cfg_LinkLengthLimit">$cfg['LinkLengthLimit'] integer</dt> + <dt id="cfg_LinkLengthLimit">entero $cfg['LinkLengthLimit']</dt> <dd> - Limit for length of URL in links. When length would be above this limit, it -is replaced by form with button. This is required as some web servers (IIS) -have problems with long URLs. Default is <code>1000</code>. + Limitar la longitud de las URLs en los enlaces. Cuando la longitud esté por +encima de este límite, es reemplazado con un botón. Esto es necesario ya que +algunos servidores web (IIS) tienen problemas con URLs extensas. El valor +predeterminado es <code>1000</code>. </dd> <dt id="cfg_NaviWidth">$cfg['NaviWidth'] integer</dt> diff --git a/po/es.po b/po/es.po index 6d723e5..8079479 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-03-02 13:51+0100\n" -"PO-Revision-Date: 2011-03-15 06:36+0200\n" +"PO-Revision-Date: 2011-03-17 02:57+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: none\n" "Language: es\n" @@ -4839,11 +4839,14 @@ msgid "" "expression. For example if you want only Czech and English, you should set " "filter to <code>'^(cs|en)'</code>." msgstr "" +"Limitar la lista de lenguajes disponibles a aquellos que coincidan con la " +"expresión regular provista. Por ejemplo, si sólo se desean Español e Inglés, " +"el filtro debería de ser <code>'^(es|en)'</code>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1722 msgid "$cfg['RecodingEngine'] string" -msgstr "" +msgstr "cadena $cfg['RecodingEngine']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1723 @@ -4851,33 +4854,36 @@ msgid "" "You can select here which functions will be used for character set " "conversion. Possible values are:" msgstr "" +"Se puede definir aquí qué funciones utilizar para la conversión entre " +"conjuntos de caracteres. Los valores posibles son:" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1725 msgid "" "auto - automatically use available one (first is tested iconv, then recode)" msgstr "" +"auto - utilizar automáticamente los disponibles (primero se intenta con " +"iconv, luego recode)" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1727 msgid "iconv - use iconv or libiconv functions" -msgstr "" +msgstr "iconv - utilizar funciones iconv o libiconv" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1728 msgid "recode - use recode_string function" -msgstr "" +msgstr "recode - utilizar la función recode_string" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1729 -#, fuzzy msgid "none - disable encoding conversion" -msgstr "Motor de recodificación" +msgstr "none - desactivar la conversión de codificación" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1731 orig-docs/Documentation.html:1777 msgid "Default is auto." -msgstr "" +msgstr "El valor predeterminado es auto." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1733 @@ -4887,11 +4893,16 @@ msgid "" "value in this menu comes from <tt>$cfg['Export']['charset']</tt> and <tt>$cfg" "['Import']['charset']</tt>." msgstr "" +"Las funciones de conversión de conjuntos de caracteres habilitadas activarán " +"una lista desplegable en las páginas de importación y exportación para " +"elegir el conjunto de caracteres a utilizar en el archivo. El valor " +"predeterminado de esa lista proviene de <tt>$cfg['Import']['charset']</tt> y " +"<tt>$cfg['Export']['charset']</tt> respectivamente." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1739 msgid "$cfg['IconvExtraParams'] string" -msgstr "" +msgstr "cadena $cfg['IconvExtraParams']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1740 @@ -4901,11 +4912,16 @@ msgid "" "html\">iconv documentation</a> for details. By default <code>//TRANSLIT</" "code> is used, so that invalid characters will be transliterated." msgstr "" +"Especificar algunos parámetros para la conversión de conjuntos de caracteres " +"con funciones iconv. Visite <a href=\"http://www.gnu.org/software/libiconv/d" +"ocumentation/libiconv/iconv_open.3.html\">la documentación iconv</a> para más " +"detalles. El valor predeterminado es <code>//TRANSLIT</code> para " +"transliterar caracteres inválidos." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1745 msgid "$cfg['AvailableCharsets'] array" -msgstr "" +msgstr "array $cfg['AvailableCharsets']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1746 @@ -4915,11 +4931,16 @@ msgid "" "sets will be shown in same order as here listed, so if you frequently use " "some of these move them to the top." msgstr "" +"Los conjuntos de caracteres disponibles para conversión MySQL. Puedes " +"agregar otros propios (cualquiera soportado por recode/iconv) o eliminar " +"aquellos que no utilices. Los conjuntos de caracteres serán mostrados en el " +"mismo orden en el que estén listados aquí, por lo que es recomendable mover " +"al principio aquellos que utilices frecuentemente." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1751 msgid "$cfg['TrustedProxies'] array" -msgstr "" +msgstr "array $cfg['TrustedProxies']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1752 @@ -4929,6 +4950,10 @@ msgid "" "empty, you need to fill in some trusted proxy servers if you want to use " "rules for IP addresses behind proxy." msgstr "" +"Lista de proxies y cabeceras HTTP confiables para <a " +"href=\"#servers_allowdeny_order\">IP Allow/Deny</a>. El valor predeterminado " +"es que la lista esté vacía, necesitarás completarla con servidores proxy si " +"se desea utilizar esas reglas para direcciones IPs detrás de un proxy." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1757 @@ -4937,6 +4962,9 @@ msgid "" "HTTP_X_FORWARDED_FOR (<tt>X-Forwarded-For</tt>) header coming from the proxy " "1.2.3.4:" msgstr "" +"En el siguiente ejemplo, phpMyAdmin debería de confiar en la cabecera " +"HTTP_X_FORWARDED_FOR (<tt>X-Forwarded-For</tt>) cuando provenga del proxy " +"con dirección IP 1.2.3.4:" #. type: Content of: <html><body><div><dl><dd><pre> #: orig-docs/Documentation.html:1760 @@ -4945,6 +4973,8 @@ msgid "" "$cfg['TrustedProxies'] =\n" " array('1.2.3.4' => 'HTTP_X_FORWARDED_FOR');\n" msgstr "" +"$cfg['TrustedProxies'] =\n" +"array('1.2.3.4' => 'HTTP_X_FORWARDED_FOR');\n" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1763 @@ -4952,11 +4982,13 @@ msgid "" "The $cfg['Servers'][$i]['AllowDeny']['rules'] directive uses the client's IP " "address as usual." msgstr "" +"La directiva $cfg['Servers'][$i]['AllowDeny']['rules'] utilizará las " +"direcciones IP de los clientes como siempre." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1767 msgid "$cfg['GD2Available'] string" -msgstr "" +msgstr "cadena $cfg['GD2Available']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1768 @@ -4964,11 +4996,13 @@ msgid "" "Specifies whether GD >= 2 is available. If yes it can be used for MIME " "transformations." msgstr "" +"Especifica si está disponible GD >= 2. Si está disponible, puede ser " +"utilizada para transformaciones MIME." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1770 msgid "Possible values are:" -msgstr "" +msgstr "Los valores posibles son:" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1771 @@ -4977,21 +5011,24 @@ msgid "" "4.3.0 so it is preferred to change this according to your server real " "possibilities" msgstr "" +"auto - detectar automáticamente, esta es una operación costosa para PHP < " +"4.3.0 por lo que es preferible modificarla según las capacidades reales del " +"servidor." #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1774 msgid "yes - GD 2 functions can be used" -msgstr "" +msgstr "yes - las funciones GD 2 pueden ser utilizadas" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1775 msgid "no - GD 2 function cannot be used" -msgstr "" +msgstr "no - las funciones GD2 no pueden ser utilizadas" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1780 msgid "$cfg['CheckConfigurationPermissions'] boolean" -msgstr "" +msgstr "booleano $cfg['CheckConfigurationPermissions']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1782 @@ -5002,11 +5039,18 @@ msgid "" "seems wrong but in fact cannot be detected. In this case a sysadmin would " "set this parameter to <tt>FALSE</tt>. Default is <tt>TRUE</tt>." msgstr "" +"Normalmente se revisan los permisos en el archivo de configuración para " +"asegurarse que todo el mundo no pueda escribir en él. Sin embargo, " +"phpMyAdmin podría estar instalado en un sistema de archivos NTFS montado en " +"un servidor no-Windows, en cuyo caso los permisos parecerán incorrectos " +"debido a problemas de detección. En dichos casos, el administrador deberá " +"configurar este parámetro a <tt>FALSE</tt>. El valor predeterminado es " +"<tt>TRUE</tt>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1789 msgid "$cfg['LinkLengthLimit'] integer" -msgstr "" +msgstr "entero $cfg['LinkLengthLimit']" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1791 @@ -5015,6 +5059,10 @@ msgid "" "is replaced by form with button. This is required as some web servers (IIS) " "have problems with long URLs. Default is <code>1000</code>." msgstr "" +"Limitar la longitud de las URLs en los enlaces. Cuando la longitud esté por " +"encima de este límite, es reemplazado con un botón. Esto es necesario ya que " +"algunos servidores web (IIS) tienen problemas con URLs extensas. El valor " +"predeterminado es <code>1000</code>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1797 hooks/post-receive -- phpMyAdmin localized documentation

1 0