The branch, master has been updated
via c35fbae1b747a18588be2ab82a77930e30e22271 (commit)
from b78bd77e415fdb1d1574e3e5f9b9cd397e221b9c (commit)
- Log -----------------------------------------------------------------
commit c35fbae1b747a18588be2ab82a77930e30e22271
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Feb 24 11:32:45 2011 +0100
Remove non translated bits
-----------------------------------------------------------------------
Summary of changes:
po/ur.po | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/po/ur.po b/po/ur.po
index 93fd250..b70850e 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -637,8 +637,6 @@ msgid ""
"This view has at least this number of rows. Please refer to %sdocumentation"
"%s."
msgstr ""
-"This view has at least this number of rows. Please refer to %sdocumentation"
-"%s."
#: db_structure.php:393 db_structure.php:407 libraries/header.inc.php:138
#: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73
@@ -658,7 +656,7 @@ msgstr "مجموعہ"
#: db_structure.php:455 libraries/StorageEngine.class.php:351
#, php-format
msgid "%s is the default storage engine on this MySQL server."
-msgstr "%s is the default storage engine on this MySQL server."
+msgstr ""
#: db_structure.php:483 db_structure.php:500 db_structure.php:501
#: libraries/display_tbl.lib.php:2155 libraries/display_tbl.lib.php:2160
@@ -666,7 +664,7 @@ msgstr "%s is the default storage engine on this MySQL server."
#: server_databases.php:251 server_privileges.php:1683 tbl_structure.php:545
#: tbl_structure.php:554
msgid "With selected:"
-msgstr "With selected:"
+msgstr ""
#: db_structure.php:486 libraries/display_tbl.lib.php:2150
#: server_databases.php:248 server_privileges.php:576
@@ -843,29 +841,28 @@ msgstr "مجموئی قیمت کو “Length/Values“ کے خانے میں چس
#: export.php:73
msgid "Selected export type has to be saved in file!"
-msgstr "Selected export type has to be saved in file!"
+msgstr ""
#: export.php:164 export.php:189 export.php:671
#, php-format
msgid "Insufficient space to save the file %s."
-msgstr "Insufficient space to save the file %s."
+msgstr ""
#: export.php:307
#, php-format
msgid ""
"File %s already exists on server, change filename or check overwrite option."
msgstr ""
-"File %s already exists on server, change filename or check overwrite option."
#: export.php:311 export.php:315
#, php-format
msgid "The web server does not have permission to save the file %s."
-msgstr "The web server does not have permission to save the file %s."
+msgstr ""
#: export.php:673
#, php-format
msgid "Dump has been saved to file %s."
-msgstr "Dump has been saved to file %s."
+msgstr ""
#: import.php:58
#, php-format
@@ -873,8 +870,6 @@ msgid ""
"You probably tried to upload too large file. Please refer to %sdocumentation"
"%s for ways to workaround this limit."
msgstr ""
-"You probably tried to upload too large file. Please refer to %sdocumentation"
-"%s for ways to workaround this limit."
#: import.php:278 import.php:331 libraries/File.class.php:501
#: libraries/File.class.php:611
@@ -889,8 +884,6 @@ msgid ""
"You attempted to load file with unsupported compression (%s). Either support "
"for it is not implemented or disabled by your configuration."
msgstr ""
-"You attempted to load file with unsupported compression (%s). Either support "
-"for it is not implemented or disabled by your configuration."
#: import.php:336
msgid ""
@@ -898,13 +891,10 @@ msgid ""
"file size exceeded the maximum size permitted by your PHP configuration. See "
"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
msgstr ""
-"No data was received to import. Either no file name was submitted, or the "
-"file size exceeded the maximum size permitted by your PHP configuration. See "
-"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
#: import.php:371 libraries/display_import.lib.php:23
msgid "Could not load import plugins, please check your installation!"
-msgstr "Could not load import plugins, please check your installation!"
+msgstr ""
#: import.php:396
msgid "The bookmark has been deleted."
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via b78bd77e415fdb1d1574e3e5f9b9cd397e221b9c (commit)
from 147a1836f5e3d13245f284272a5e44afd05c311d (commit)
- Log -----------------------------------------------------------------
commit b78bd77e415fdb1d1574e3e5f9b9cd397e221b9c
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Feb 24 05:21:24 2011 -0500
For bug 3168757:
- Change default link length limit to 2000
- Add text next to the image
-----------------------------------------------------------------------
Summary of changes:
libraries/common.lib.php | 9 ++++++++-
libraries/config.default.php | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index f132e75..4023cb2 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1870,7 +1870,14 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
. implode(' ', $tag_params_strings)
. ' src="' . preg_replace(
'/^.*\ssrc="([^"]*)".*$/si', '\1', $message) . '"'
- . ' value="' . $displayed_message . '" title="' . $displayed_message . '" />';
+ . ' value="' . $displayed_message . '" title="' . $displayed_message . '" />';
+ // Here we cannot obey PropertiesIconic completely as a
+ // generated link would have a length over LinkLengthLimit
+ // but we can at least show the message.
+ // If PropertiesIconic is false or 'both'
+ if ($GLOBALS['cfg']['PropertiesIconic'] !== true) {
+ $ret .= ' ' . $displayed_message;
+ }
}
} else {
$message = trim(strip_tags($message));
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 9fece7a..604030b 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2590,7 +2590,7 @@ $cfg['CheckConfigurationPermissions'] = true;
* is replaced by form with button.
* This is required as some web servers (IIS) have problems with long URLs.
*/
-$cfg['LinkLengthLimit'] = 1000;
+$cfg['LinkLengthLimit'] = 2000;
/*******************************************************************************
* SQL Parser Settings
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via aefd12b57848c104b09863a600bf13ade9d0b4f7 (commit)
via 7b751a6378da20b71bcf5fc353939faea68f1b9e (commit)
via c6361c2eb0cacc2feda330f6175195814934d7bb (commit)
from c30b83ebb36ca649f2bb331b4c93b9233beaeb8b (commit)
- Log -----------------------------------------------------------------
commit aefd12b57848c104b09863a600bf13ade9d0b4f7
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Feb 24 10:17:29 2011 +0100
Update generated docs
commit 7b751a6378da20b71bcf5fc353939faea68f1b9e
Author: mjaning <mjaning(a)gmail.com>
Date: Wed Feb 23 22:49:41 2011 +0200
Translation update done using Pootle.
commit c6361c2eb0cacc2feda330f6175195814934d7bb
Author: mjaning <mjaning(a)gmail.com>
Date: Wed Feb 23 22:41:06 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
output/pt_BR/Documentation.html | 20 ++++++++++----------
po/pt_BR.po | 16 ++++++++++++++--
2 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/output/pt_BR/Documentation.html b/output/pt_BR/Documentation.html
index 092095a..53088d1 100644
--- a/output/pt_BR/Documentation.html
+++ b/output/pt_BR/Documentation.html
@@ -422,17 +422,17 @@ em um cookie temporário.</li>
<li id="pmausr">Note: this section is only applicable if your MySQL server is running with
<tt>--skip-show-database</tt>.<br /><br />
- For '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' and 'cookie'
-modes, phpMyAdmin needs a controluser that has <b>only</b> the
-<tt>SELECT</tt> privilege on the <i>`mysql`.`user` (all columns except
-`Password`)</i>, <i>`mysql`.`db` (all columns)</i>, <i>`mysql`.`host` (all
-columns)</i> and <i>`mysql`.`tables_priv` (all columns except `Grantor` and
-`Timestamp`)</i> tables.<br /> You must specify the details for the <a href="#controluser">controluser</a>
-in the <tt>config.inc.php</tt> file under the <tt><a
-href="#cfg_Servers_controluser" class="configrule">
-$cfg['Servers'][$i]['controluser']</a></tt> and <tt><a
+ Para modo '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' e modo
+'cookie', o phpMyAdmin precisa de um usuário master que tenha <b>somente</b>
+o privilégio <tt>SELECT</tt> na tabela <i>`mysql`.`user` (todas as colunas
+exceto `Password`)</i>, <i>`mysql`.`db` (todas as colunas)</i>,
+<i>`mysql`.`host` (todas as colunas)</i> e <i>`mysql`.`tables_priv` (todas
+as colunas exceto `Grantor` e `Timestamp`)</i> tables.<br /> Você deve configurar os detalhes para o usuário <a
+href="#controluser">master</a> no arquivo <tt>config.inc.php</tt> sob a
+sessão <tt><a href="#cfg_Servers_controluser" class="configrule">
+$cfg['Servers'][$i]['controluser']</a></tt> e <tt><a
href="#cfg_Servers_controlpass" class="configrule">
-$cfg['Servers'][$i]['controlpass']</a></tt> settings.<br />
+$cfg['Servers'][$i]['controlpass']</a></tt>.<br />
The following example assumes you want to use <tt>pma</tt> as the
controluser and <tt>pmapass</tt> as the controlpass, but <b>this is only an
example: use something else in your file!</b> Input these statements from
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 67ee6d1..2cb3dc8 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin-docs VERSION\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-02-19 23:01+0100\n"
-"PO-Revision-Date: 2011-02-02 20:17+0200\n"
-"Last-Translator: MaurÃcio Meneghini Fauth <mauriciofauth(a)gmail.com>\n"
+"PO-Revision-Date: 2011-02-23 22:49+0200\n"
+"Last-Translator: <mjaning(a)gmail.com>\n"
"Language-Team: none\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
@@ -1088,6 +1088,12 @@ msgid ""
"<i>`mysql`.`tables_priv` (all columns except `Grantor` and `Timestamp`)</i> "
"tables."
msgstr ""
+"Para modo '<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr>' e modo "
+"'cookie', o phpMyAdmin precisa de um usuário master que tenha <b>somente</b> "
+"o privilégio <tt>SELECT</tt> na tabela <i>`mysql`.`user` (todas as colunas "
+"exceto `Password`)</i>, <i>`mysql`.`db` (todas as colunas)</i>, "
+"<i>`mysql`.`host` (todas as colunas)</i> e <i>`mysql`.`tables_priv` (todas "
+"as colunas exceto `Grantor` e `Timestamp`)</i> tables."
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:405
@@ -1098,6 +1104,12 @@ msgid ""
"['controluser']</a></tt> and <tt><a href=\"#cfg_Servers_controlpass\" class="
"\"configrule\"> $cfg['Servers'][$i]['controlpass']</a></tt> settings."
msgstr ""
+"Você deve configurar os detalhes para o usuário <a "
+"href=\"#controluser\">master</a> no arquivo <tt>config.inc.php</tt> sob a "
+"sessão <tt><a href=\"#cfg_Servers_controluser\" class=\"configrule\"> "
+"$cfg['Servers'][$i]['controluser']</a></tt> e <tt><a "
+"href=\"#cfg_Servers_controlpass\" class=\"configrule\"> "
+"$cfg['Servers'][$i]['controlpass']</a></tt>."
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:412
hooks/post-receive
--
phpMyAdmin localized documentation