nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master'

Browse Source 
Conflicts:
	po/fr.po
	po/sl.po
This commit is contained in:
ninadsp
2010-07-03 21:00:08 +05:30
parent 4f3b8b96ae 9e857f9f84
commit e049c1d158
10 changed files with 114 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -88,6 +88,11 @@ $Id$
3.3.5.0 (not yet released) 3.3.5.0 (not yet released)
- patch #2932113 [information_schema] Slow export when having lots of - patch #2932113 [information_schema] Slow export when having lots of
databases, thanks to Stéphane Pontier - shadow_walker databases, thanks to Stéphane Pontier - shadow_walker
- bug #3022705 [import] Import button does not work in Catalan when there
is no progress bar possible
- bug [replication] Do not offer information_schema in the list of databases
- bug [js] Avoid loading twice a js file
- bug #3024344 [setup] Setup forces numeric MemoryLimit
3.3.4.0 (2010-06-28) 3.3.4.0 (2010-06-28)
- bug #2996161 [import] properly escape import value - bug #2996161 [import] properly escape import value

23
Documentation.html
View File

@@ -946,7 +946,8 @@ since this link provides funding for phpMyAdmin.
table. To allow the usage of this functionality: table. To allow the usage of this functionality:
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li>
<li>put the table name in <li>put the table name in
<tt>$cfg['Servers'][$i]['table_info']</tt></li> <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g.
'pma_table_info')</li>
<li>then for each table where you want to use this feature, <li>then for each table where you want to use this feature,
click &quot;Structure/Relation view/Choose column to display&quot; click &quot;Structure/Relation view/Choose column to display&quot;
to choose the column.</li> to choose the column.</li>
@@ -1005,7 +1006,8 @@ since this link provides funding for phpMyAdmin.
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables
infrastructure</li> infrastructure</li>
<li>put the table name in <li>put the table name in
<tt>$cfg['Servers'][$i]['column_info']</tt></li> <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g.
'pma_column_info')</li>
<li>to update your PRE-2.5.0 Column_comments Table use this: <li>to update your PRE-2.5.0 Column_comments Table use this:
<pre> <pre>
@@ -1045,6 +1047,7 @@ ALTER TABLE `pma_column_comments`
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables
infrastructure</li> infrastructure</li>
<li>put the table name in <tt>$cfg['Servers'][$i]['history']</tt> <li>put the table name in <tt>$cfg['Servers'][$i]['history']</tt>
(e.g. 'pma_history')
</li> </li>
</ul> </ul>
</dd> </dd>
@@ -1075,7 +1078,7 @@ ALTER TABLE `pma_column_comments`
<ul> <ul>
<li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li> <li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li>
<li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt></li> <li>put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> (e.g. 'pma_tracking')</li>
</ul> </ul>
</dd> </dd>
@@ -1147,7 +1150,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
<ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables <ul><li>set up <a href="#pmadb">pmadb</a> and the linked-tables
infrastructure</li> infrastructure</li>
<li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> <li>put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. 'pma_designer_coords')
</li> </li>
</ul> </ul>
</dd> </dd>
@@ -1312,7 +1315,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
<dd>Path for storing session data (<a <dd>Path for storing session data (<a
href="http://php.net/session_save_path">session_save_path PHP parameter</a>).</dd> href="http://php.net/session_save_path">session_save_path PHP parameter</a>).</dd>
<dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] integer [number of bytes]</dt> <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] string [number of bytes]</dt>
<dd>Set the number of bytes a script is allowed to allocate. If set <dd>Set the number of bytes a script is allowed to allocate. If set
to zero, no limit is imposed.<br /> to zero, no limit is imposed.<br />
This setting is used while importing/exporting dump files and at some This setting is used while importing/exporting dump files and at some
@@ -3365,7 +3368,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
<h4 id="login_bug"> <h4 id="login_bug">
<a href="#login_bug">3.1 When using <a href="#login_bug">3.1 When using
<abbr title="HyperText Transfer Protocol">HTTP</abbr> authentication, an user <abbr title="HyperText Transfer Protocol">HTTP</abbr> authentication, a user
who logged out can not log in again in with the same nick.</a></h4> who logged out can not log in again in with the same nick.</a></h4>
<p> This is related to the authentication mechanism (protocol) used by <p> This is related to the authentication mechanism (protocol) used by
@@ -4334,6 +4337,12 @@ chmod o+rwx tmp
<li>Finally when you browse your table, you'll see in your column a link to stream your data, for example &quot;View image&quot;. A header containing the correct MIME-type will be sent to your browser; this MIME-type was stored at upload time but in case it's incorrect, it's possible to edit it by clicking on the displayed MIME-type.</li> <li>Finally when you browse your table, you'll see in your column a link to stream your data, for example &quot;View image&quot;. A header containing the correct MIME-type will be sent to your browser; this MIME-type was stored at upload time but in case it's incorrect, it's possible to edit it by clicking on the displayed MIME-type.</li>
</ol> </ol>
<h4 id="faq6_26">
<a href="#faq6_26">6.26 How can I select a range of rows?</a></h4>
<p> Click the first row of the range, hold the shift key and click the last row of the range. This works everywhere you see rows, for example in Browse mode or on the Structure page.</p>
<h3 id="faqproject">phpMyAdmin project</h3> <h3 id="faqproject">phpMyAdmin project</h3>
<h4 id="faq7_1"> <h4 id="faq7_1">
@@ -4372,7 +4381,7 @@ chmod o+rwx tmp
</p> </p>
<p> <p>
You can then put your translations, as a zip file to avoid losing special You can then put your translations, as a zip file to avoid losing special
characters, on the sourceforge.net <a href="https://sourceforge.net/tracker/?group_id=23067&atid=387645">translation tracker.</a> characters, on the sourceforge.net <a href="https://sourceforge.net/tracker/?group_id=23067&amp;atid=387645">translation tracker.</a>
</p> </p>
<p> <p>
It would be a good idea to subscribe to the <a href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-translators">phpmyadmin-translators</a> mailing It would be a good idea to subscribe to the <a href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-translators">phpmyadmin-translators</a> mailing

3
js/common.js
View File

@@ -101,10 +101,13 @@ function setDb(new_db) {
var old_db = db; var old_db = db;
db = new_db; db = new_db;
// the db name as an id exists only when LeftFrameLight is false
if (window.frame_navigation.document.getElementById(db) == null) { if (window.frame_navigation.document.getElementById(db) == null) {
// happens when LeftFrameLight is true
// db is unknown, reload complete left frame // db is unknown, reload complete left frame
refreshNavigation(); refreshNavigation();
} else { } else {
// happens when LeftFrameLight is false
unmarkDbTable(old_db); unmarkDbTable(old_db);
markDbTable(db); markDbTable(db);
} }

8
js/functions.js
View File

@@ -876,9 +876,9 @@ function PMA_markRowsInit() {
checkbox.checked = marked_row[unique_id]; checkbox.checked = marked_row[unique_id];
if (typeof(event) == 'object') { if (typeof(event) == 'object') {
table = this.parentNode; table = this.parentNode;
i = 0; parentTableLimit = 0;
while (table.tagName.toLowerCase() != 'table' && i < 20) { while (table.tagName.toLowerCase() != 'table' && parentTableLimit < 20) {
i++; parentTableLimit++;
table = table.parentNode; table = table.parentNode;
} }
@@ -893,7 +893,7 @@ function PMA_markRowsInit() {
} }
while (i != this.rowIndex) { while (i != this.rowIndex) {
table.rows[i].onmousedown(); $(table.rows[i]).mousedown();
if (i < this.rowIndex) { if (i < this.rowIndex) {
i++; i++;
} else { } else {

8
libraries/config.default.php
View File

@@ -542,11 +542,13 @@ $cfg['ExecTimeLimit'] = 300;
$cfg['SessionSavePath'] = ''; $cfg['SessionSavePath'] = '';
/** /**
* maximum allocated bytes (0 for no limit) * maximum allocated bytes ('0' for no limit)
* this is a string because '16M' is a valid value; we must put here
* a string as the default value so that /setup accepts strings
* *
* @global integer $cfg['MemoryLimit'] * @global string $cfg['MemoryLimit']
*/ */
$cfg['MemoryLimit'] = 0; $cfg['MemoryLimit'] = '0';
/** /**
* mark used tables, make possible to show locked tables (since MySQL 3.23.30) * mark used tables, make possible to show locked tables (since MySQL 3.23.30)

5
libraries/display_import.lib.php
View File

@@ -2,7 +2,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* *
* @version $Id$
* @package phpMyAdmin * @package phpMyAdmin
*/ */
if (! defined('PHPMYADMIN')) { if (! defined('PHPMYADMIN')) {
@@ -94,9 +93,9 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
window.setTimeout(perform_upload, 1000); window.setTimeout(perform_upload, 1000);
<?php <?php
} else { // no plugin avaliable } else { // no plugin available
?> ?>
$('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo __('Please be patient, the file is being uploaded. Details about the upload are not available.') . PMA_showDocu('faq2_9'); ?>'); $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.')) . PMA_showDocu('faq2_9'); ?>');
$('#upload_form_status').css("display", "none"); $('#upload_form_status').css("display", "none");
<?php <?php
} // else } // else

3
libraries/header_scripts.inc.php
View File

@@ -66,6 +66,9 @@ $GLOBALS['js_events'][] = array(
* upgrade phpMyAdmin are not stuck with older .js files in their * upgrade phpMyAdmin are not stuck with older .js files in their
* browser cache. This produces an HTTP 304 request for each file. * browser cache. This produces an HTTP 304 request for each file.
*/ */
// avoid loading twice a js file
$GLOBALS['js_include'] = array_unique($GLOBALS['js_include']);
foreach ($GLOBALS['js_include'] as $js_script_file) { foreach ($GLOBALS['js_include'] as $js_script_file) {
if (strpos($js_script_file, '?') === FALSE) { if (strpos($js_script_file, '?') === FALSE) {
echo '<script src="./js/' . $js_script_file . '?ts=' . filemtime('./js/' . $js_script_file) . '" type="text/javascript"></script>' . "\n"; echo '<script src="./js/' . $js_script_file . '?ts=' . filemtime('./js/' . $js_script_file) . '" type="text/javascript"></script>' . "\n";

3
libraries/replication_gui.lib.php
View File

@@ -20,6 +20,9 @@ function PMA_replication_db_multibox()
$multi_values .= '<select name="db_select[]" size="6" multiple="multiple" id="db_select">'; $multi_values .= '<select name="db_select[]" size="6" multiple="multiple" id="db_select">';
foreach ($GLOBALS['pma']->databases as $current_db) { foreach ($GLOBALS['pma']->databases as $current_db) {
if ('information_schema' == $current_db) {
continue;
}
if (! empty($selectall) || (isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))) { if (! empty($selectall) || (isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))) {
$is_selected = ' selected="selected"'; $is_selected = ' selected="selected"';
} else { } else {

140
po/fr.po
View File

@@ -3,14 +3,14 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-02 03:37+0530\n" "POT-Creation-Date: 2010-06-13 09:03-0400\n"
"PO-Revision-Date: 2010-06-08 18:57+0200\n" "PO-Revision-Date: 2010-07-01 19:56+0200\n"
"Last-Translator: Marc <marc@infomarc.info>\n" "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: french <fr@li.org>\n" "Language-Team: french <fr@li.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Pootle 2.0.1\n" "X-Generator: Pootle 2.0.1\n"
@@ -224,7 +224,7 @@ msgstr "La base de données %s a été copiée sur %s"
#: db_operations.php:423 #: db_operations.php:423
msgid "Rename database to" msgid "Rename database to"
msgstr "<b>Changer le nom</b> de la base de données pour" msgstr "Changer le nom de la base de données pour"
#: db_operations.php:428 server_processlist.php:57 #: db_operations.php:428 server_processlist.php:57
msgid "Command" msgid "Command"
@@ -283,7 +283,7 @@ msgstr "État"
#: db_operations.php:559 #: db_operations.php:559
msgctxt "BLOB repository" msgctxt "BLOB repository"
msgid "Enabled" msgid "Enabled"
msgstr "activé" msgstr "Activé"
#: db_operations.php:563 #: db_operations.php:563
msgid "Disable" msgid "Disable"
@@ -301,7 +301,7 @@ msgstr "Réparer"
#: db_operations.php:585 #: db_operations.php:585
msgctxt "BLOB repository" msgctxt "BLOB repository"
msgid "Disabled" msgid "Disabled"
msgstr "désactivé" msgstr "Désactivé"
#: db_operations.php:589 #: db_operations.php:589
msgid "Enable" msgid "Enable"
@@ -424,7 +424,7 @@ msgstr "Ajouter"
#: db_qbe.php:357 db_qbe.php:439 db_qbe.php:524 db_qbe.php:555 #: db_qbe.php:357 db_qbe.php:439 db_qbe.php:524 db_qbe.php:555
msgid "And" msgid "And"
msgstr "et" msgstr "Et"
#: db_qbe.php:366 db_qbe.php:447 db_qbe.php:529 db_qbe.php:560 #: db_qbe.php:366 db_qbe.php:447 db_qbe.php:529 db_qbe.php:560
msgid "Del" msgid "Del"
@@ -884,8 +884,8 @@ msgstr "Retour"
#: index.php:190 #: index.php:190
msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser." msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
msgstr "" msgstr ""
"L'utilisation de phpMyAdmin est plus aisée avec un navigateur <b>supportant " "phpMyAdmin est plus convivial avec un navigateur <b>supportant les "
"les cadres</b>." "cadres</b>."
#: js/messages.php:25 server_synchronize.php:345 server_synchronize.php:357 #: js/messages.php:25 server_synchronize.php:345 server_synchronize.php:357
#: server_synchronize.php:373 server_synchronize.php:380 #: server_synchronize.php:373 server_synchronize.php:380
@@ -1083,7 +1083,7 @@ msgstr "Fonctions relationnelles"
#: js/messages.php:85 libraries/relation.lib.php:101 #: js/messages.php:85 libraries/relation.lib.php:101
#: libraries/relation.lib.php:108 #: libraries/relation.lib.php:108
msgid "Disabled" msgid "Disabled"
msgstr "désactivé" msgstr "Désactivé"
#: js/messages.php:86 #: js/messages.php:86
msgid "Select referenced key" msgid "Select referenced key"
@@ -1791,7 +1791,7 @@ msgstr "Documentation"
#: libraries/common.lib.php:595 libraries/header_printview.inc.php:61 #: libraries/common.lib.php:595 libraries/header_printview.inc.php:61
#: server_processlist.php:60 server_status.php:358 #: server_processlist.php:60 server_status.php:358
msgid "SQL query" msgid "SQL query"
msgstr "requête SQL" msgstr "Requête SQL"
#: libraries/common.lib.php:634 #: libraries/common.lib.php:634
msgid "MySQL said: " msgid "MySQL said: "
@@ -2036,7 +2036,7 @@ msgstr "Modifier le mot de passe"
#: libraries/display_change_password.lib.php:35 #: libraries/display_change_password.lib.php:35
#: libraries/replication_gui.lib.php:345 server_privileges.php:808 #: libraries/replication_gui.lib.php:345 server_privileges.php:808
msgid "No Password" msgid "No Password"
msgstr "aucun mot de passe" msgstr "Aucun mot de passe"
#: libraries/display_change_password.lib.php:41 #: libraries/display_change_password.lib.php:41
#: libraries/replication_gui.lib.php:59 libraries/replication_gui.lib.php:60 #: libraries/replication_gui.lib.php:59 libraries/replication_gui.lib.php:60
@@ -2059,7 +2059,7 @@ msgstr "Hachage du mot de passe"
#: libraries/display_change_password.lib.php:66 #: libraries/display_change_password.lib.php:66
msgid "MySQL 4.0 compatible" msgid "MySQL 4.0 compatible"
msgstr "compatible MySQL 4.0" msgstr "Compatible MySQL 4.0"
#: libraries/display_change_password.lib.php:72 #: libraries/display_change_password.lib.php:72
#: libraries/replication_gui.lib.php:360 server_privileges.php:823 #: libraries/replication_gui.lib.php:360 server_privileges.php:823
@@ -2083,7 +2083,7 @@ msgstr "Créer"
#: libraries/display_create_database.lib.php:40 server_privileges.php:114 #: libraries/display_create_database.lib.php:40 server_privileges.php:114
#: server_privileges.php:1441 server_replication.php:35 #: server_privileges.php:1441 server_replication.php:35
msgid "No Privileges" msgid "No Privileges"
msgstr "aucun privilège" msgstr "Aucun privilège"
#: libraries/display_create_table.lib.php:47 #: libraries/display_create_table.lib.php:47
#, php-format #, php-format
@@ -2165,7 +2165,7 @@ msgstr "Compression"
#: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575 #: libraries/export/sql.php:868 libraries/tbl_properties.inc.php:575
#: server_privileges.php:1897 server_processlist.php:75 #: server_privileges.php:1897 server_processlist.php:75
msgid "None" msgid "None"
msgstr "aucune" msgstr "Aucune"
#: libraries/display_export.lib.php:247 #: libraries/display_export.lib.php:247
msgid "\"zipped\"" msgid "\"zipped\""
@@ -2265,7 +2265,7 @@ msgstr "Format du fichier d'importation"
#: libraries/display_pdf_schema.lib.php:11 #: libraries/display_pdf_schema.lib.php:11
msgid "Display PDF schema" msgid "Display PDF schema"
msgstr "<b>Afficher le schéma</b> en PDF" msgstr "Afficher le schéma en PDF"
#: libraries/display_pdf_schema.lib.php:33 #: libraries/display_pdf_schema.lib.php:33
msgid "Show grid" msgid "Show grid"
@@ -2795,7 +2795,7 @@ msgstr ""
#: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88 #: libraries/export/codegen.php:37 setup/lib/messages.inc.php:88
#: tbl_printview.php:375 tbl_structure.php:735 #: tbl_printview.php:375 tbl_structure.php:735
msgid "Format" msgid "Format"
msgstr "format" msgstr "Format"
#: libraries/export/csv.php:17 libraries/import/csv.php:22 #: libraries/export/csv.php:17 libraries/import/csv.php:22
msgid "CSV" msgid "CSV"
@@ -3253,7 +3253,7 @@ msgstr "Conversion de l'encodage"
#: libraries/kanji-encoding.lib.php:145 #: libraries/kanji-encoding.lib.php:145
msgctxt "None encoding conversion" msgctxt "None encoding conversion"
msgid "None" msgid "None"
msgstr "aucune" msgstr "Aucune"
#. l10n: This is currently used only in Japanese locales #. l10n: This is currently used only in Japanese locales
#: libraries/kanji-encoding.lib.php:151 #: libraries/kanji-encoding.lib.php:151
@@ -3294,15 +3294,15 @@ msgstr "Binaire"
#: libraries/mysql_charsets.lib.php:223 #: libraries/mysql_charsets.lib.php:223
msgid "Bulgarian" msgid "Bulgarian"
msgstr "bulgare" msgstr "Bulgare"
#: libraries/mysql_charsets.lib.php:227 libraries/mysql_charsets.lib.php:352 #: libraries/mysql_charsets.lib.php:227 libraries/mysql_charsets.lib.php:352
msgid "Simplified Chinese" msgid "Simplified Chinese"
msgstr "chinois simplifié" msgstr "Chinois simplifié"
#: libraries/mysql_charsets.lib.php:229 libraries/mysql_charsets.lib.php:372 #: libraries/mysql_charsets.lib.php:229 libraries/mysql_charsets.lib.php:372
msgid "Traditional Chinese" msgid "Traditional Chinese"
msgstr "chinois traditionnel" msgstr "Chinois traditionnel"
#: libraries/mysql_charsets.lib.php:233 libraries/mysql_charsets.lib.php:419 #: libraries/mysql_charsets.lib.php:233 libraries/mysql_charsets.lib.php:419
msgid "case-insensitive" msgid "case-insensitive"
@@ -3314,19 +3314,19 @@ msgstr "sensible à la casse"
#: libraries/mysql_charsets.lib.php:239 #: libraries/mysql_charsets.lib.php:239
msgid "Croatian" msgid "Croatian"
msgstr "croate" msgstr "Croate"
#: libraries/mysql_charsets.lib.php:242 #: libraries/mysql_charsets.lib.php:242
msgid "Czech" msgid "Czech"
msgstr "tchèque" msgstr "Tchèque"
#: libraries/mysql_charsets.lib.php:245 #: libraries/mysql_charsets.lib.php:245
msgid "Danish" msgid "Danish"
msgstr "danois" msgstr "Danois"
#: libraries/mysql_charsets.lib.php:248 #: libraries/mysql_charsets.lib.php:248
msgid "English" msgid "English"
msgstr "anglais" msgstr "Anglais"
#: libraries/mysql_charsets.lib.php:251 #: libraries/mysql_charsets.lib.php:251
msgid "Esperanto" msgid "Esperanto"
@@ -3334,11 +3334,11 @@ msgstr "Espéranto"
#: libraries/mysql_charsets.lib.php:254 #: libraries/mysql_charsets.lib.php:254
msgid "Estonian" msgid "Estonian"
msgstr "estonien" msgstr "Estonien"
#: libraries/mysql_charsets.lib.php:257 libraries/mysql_charsets.lib.php:260 #: libraries/mysql_charsets.lib.php:257 libraries/mysql_charsets.lib.php:260
msgid "German" msgid "German"
msgstr "allemand" msgstr "Allemand"
#: libraries/mysql_charsets.lib.php:257 #: libraries/mysql_charsets.lib.php:257
msgid "dictionary" msgid "dictionary"
@@ -3350,35 +3350,35 @@ msgstr "annuaire téléphonique"
#: libraries/mysql_charsets.lib.php:263 #: libraries/mysql_charsets.lib.php:263
msgid "Hungarian" msgid "Hungarian"
msgstr "hongrois" msgstr "Hongrois"
#: libraries/mysql_charsets.lib.php:266 #: libraries/mysql_charsets.lib.php:266
msgid "Icelandic" msgid "Icelandic"
msgstr "islandais" msgstr "Islandais"
#: libraries/mysql_charsets.lib.php:269 libraries/mysql_charsets.lib.php:359 #: libraries/mysql_charsets.lib.php:269 libraries/mysql_charsets.lib.php:359
msgid "Japanese" msgid "Japanese"
msgstr "japonais" msgstr "Japonais"
#: libraries/mysql_charsets.lib.php:272 #: libraries/mysql_charsets.lib.php:272
msgid "Latvian" msgid "Latvian"
msgstr "letton" msgstr "Letton"
#: libraries/mysql_charsets.lib.php:275 #: libraries/mysql_charsets.lib.php:275
msgid "Lithuanian" msgid "Lithuanian"
msgstr "lituanien" msgstr "Lituanien"
#: libraries/mysql_charsets.lib.php:278 libraries/mysql_charsets.lib.php:381 #: libraries/mysql_charsets.lib.php:278 libraries/mysql_charsets.lib.php:381
msgid "Korean" msgid "Korean"
msgstr "coréen" msgstr "Coréen"
#: libraries/mysql_charsets.lib.php:281 #: libraries/mysql_charsets.lib.php:281
msgid "Persian" msgid "Persian"
msgstr "perse" msgstr "Perse"
#: libraries/mysql_charsets.lib.php:284 #: libraries/mysql_charsets.lib.php:284
msgid "Polish" msgid "Polish"
msgstr "polonais" msgstr "Polonais"
#: libraries/mysql_charsets.lib.php:287 libraries/mysql_charsets.lib.php:335 #: libraries/mysql_charsets.lib.php:287 libraries/mysql_charsets.lib.php:335
msgid "West European" msgid "West European"
@@ -3386,39 +3386,39 @@ msgstr "Europe de l'ouest"
#: libraries/mysql_charsets.lib.php:290 #: libraries/mysql_charsets.lib.php:290
msgid "Romanian" msgid "Romanian"
msgstr "roumain" msgstr "Roumain"
#: libraries/mysql_charsets.lib.php:293 #: libraries/mysql_charsets.lib.php:293
msgid "Slovak" msgid "Slovak"
msgstr "slovaque" msgstr "Slovaque"
#: libraries/mysql_charsets.lib.php:296 #: libraries/mysql_charsets.lib.php:296
msgid "Slovenian" msgid "Slovenian"
msgstr "slovène" msgstr "Slovène"
#: libraries/mysql_charsets.lib.php:299 #: libraries/mysql_charsets.lib.php:299
msgid "Spanish" msgid "Spanish"
msgstr "espagnol" msgstr "Espagnol"
#: libraries/mysql_charsets.lib.php:302 #: libraries/mysql_charsets.lib.php:302
msgid "Traditional Spanish" msgid "Traditional Spanish"
msgstr "espagnol traditionnel" msgstr "Espagnol traditionnel"
#: libraries/mysql_charsets.lib.php:305 libraries/mysql_charsets.lib.php:402 #: libraries/mysql_charsets.lib.php:305 libraries/mysql_charsets.lib.php:402
msgid "Swedish" msgid "Swedish"
msgstr "suédois" msgstr "Suédois"
#: libraries/mysql_charsets.lib.php:308 libraries/mysql_charsets.lib.php:405 #: libraries/mysql_charsets.lib.php:308 libraries/mysql_charsets.lib.php:405
msgid "Thai" msgid "Thai"
msgstr "thaï" msgstr "Thaï"
#: libraries/mysql_charsets.lib.php:311 libraries/mysql_charsets.lib.php:399 #: libraries/mysql_charsets.lib.php:311 libraries/mysql_charsets.lib.php:399
msgid "Turkish" msgid "Turkish"
msgstr "turc" msgstr "Turc"
#: libraries/mysql_charsets.lib.php:314 libraries/mysql_charsets.lib.php:396 #: libraries/mysql_charsets.lib.php:314 libraries/mysql_charsets.lib.php:396
msgid "Ukrainian" msgid "Ukrainian"
msgstr "ukrainien" msgstr "Ukrainien"
#: libraries/mysql_charsets.lib.php:317 libraries/mysql_charsets.lib.php:326 #: libraries/mysql_charsets.lib.php:317 libraries/mysql_charsets.lib.php:326
msgid "Unicode" msgid "Unicode"
@@ -3436,39 +3436,39 @@ msgstr "Europe centrale"
#: libraries/mysql_charsets.lib.php:347 #: libraries/mysql_charsets.lib.php:347
msgid "Russian" msgid "Russian"
msgstr "russe" msgstr "Russe"
#: libraries/mysql_charsets.lib.php:364 #: libraries/mysql_charsets.lib.php:364
msgid "Baltic" msgid "Baltic"
msgstr "baltique" msgstr "Baltique"
#: libraries/mysql_charsets.lib.php:369 #: libraries/mysql_charsets.lib.php:369
msgid "Armenian" msgid "Armenian"
msgstr "arménien" msgstr "Arménien"
#: libraries/mysql_charsets.lib.php:375 #: libraries/mysql_charsets.lib.php:375
msgid "Cyrillic" msgid "Cyrillic"
msgstr "cyrillique" msgstr "Cyrillique"
#: libraries/mysql_charsets.lib.php:378 #: libraries/mysql_charsets.lib.php:378
msgid "Arabic" msgid "Arabic"
msgstr "arabe" msgstr "Arabe"
#: libraries/mysql_charsets.lib.php:384 #: libraries/mysql_charsets.lib.php:384
msgid "Hebrew" msgid "Hebrew"
msgstr "hébreu" msgstr "Hébreu"
#: libraries/mysql_charsets.lib.php:387 #: libraries/mysql_charsets.lib.php:387
msgid "Georgian" msgid "Georgian"
msgstr "géorgien" msgstr "Géorgien"
#: libraries/mysql_charsets.lib.php:390 #: libraries/mysql_charsets.lib.php:390
msgid "Greek" msgid "Greek"
msgstr "grec" msgstr "Grec"
#: libraries/mysql_charsets.lib.php:393 #: libraries/mysql_charsets.lib.php:393
msgid "Czech-Slovak" msgid "Czech-Slovak"
msgstr "tchèque-slovaque" msgstr "Tchèque-slovaque"
#: libraries/mysql_charsets.lib.php:408 libraries/mysql_charsets.lib.php:415 #: libraries/mysql_charsets.lib.php:408 libraries/mysql_charsets.lib.php:415
msgid "unknown" msgid "unknown"
@@ -3502,7 +3502,7 @@ msgstr "en erreur"
#: libraries/relation.lib.php:100 #: libraries/relation.lib.php:100
msgid "Enabled" msgid "Enabled"
msgstr "activé" msgstr "Activé"
#: libraries/relation.lib.php:123 #: libraries/relation.lib.php:123
msgid "Display Features" msgid "Display Features"
@@ -3919,7 +3919,7 @@ msgstr ""
#: libraries/tbl_properties.inc.php:393 #: libraries/tbl_properties.inc.php:393
msgctxt "for default" msgctxt "for default"
msgid "None" msgid "None"
msgstr "aucune" msgstr "Aucune"
#: libraries/tbl_properties.inc.php:394 #: libraries/tbl_properties.inc.php:394
msgid "As defined:" msgid "As defined:"
@@ -4984,7 +4984,7 @@ msgstr "Base de données pour cet utilisateur"
#: server_privileges.php:2060 #: server_privileges.php:2060
msgctxt "Create none database for user" msgctxt "Create none database for user"
msgid "None" msgid "None"
msgstr "aucune" msgstr "Aucune"
#: server_privileges.php:2061 #: server_privileges.php:2061
msgid "Create database with same name and grant all privileges" msgid "Create database with same name and grant all privileges"
@@ -6347,7 +6347,7 @@ msgstr "Secret Blowfish"
#: setup/lib/messages.inc.php:26 #: setup/lib/messages.inc.php:26
msgid "Highlight selected rows" msgid "Highlight selected rows"
msgstr "(utilisé quand on clique sur une ligne)" msgstr "Utilisé quand on clique sur une ligne"
#: setup/lib/messages.inc.php:27 #: setup/lib/messages.inc.php:27
msgid "Row marker" msgid "Row marker"
@@ -6414,7 +6414,7 @@ msgstr "Édition des colonnes CHAR"
#: setup/lib/messages.inc.php:37 #: setup/lib/messages.inc.php:37
msgid "Number of columns for CHAR/VARCHAR textareas" msgid "Number of columns for CHAR/VARCHAR textareas"
msgstr "(colonnes CHAR/VARCHAR)" msgstr "Nombre de colonnes pour les textareas CHAR/VARCHAR)"
#: setup/lib/messages.inc.php:38 #: setup/lib/messages.inc.php:38
msgid "CHAR textarea columns" msgid "CHAR textarea columns"
@@ -6422,7 +6422,7 @@ msgstr "Taille horizontale pour un textarea"
#: setup/lib/messages.inc.php:39 #: setup/lib/messages.inc.php:39
msgid "Number of rows for CHAR/VARCHAR textareas" msgid "Number of rows for CHAR/VARCHAR textareas"
msgstr "(colonnes CHAR/VARCHAR)" msgstr "Nombre de lignes pour les textareas CHAR/VARCHAR)"
#: setup/lib/messages.inc.php:40 #: setup/lib/messages.inc.php:40
msgid "CHAR textarea rows" msgid "CHAR textarea rows"
@@ -6498,7 +6498,7 @@ msgstr ""
#: setup/lib/messages.inc.php:59 #: setup/lib/messages.inc.php:59
msgid "Show database listing as a list instead of a drop down" msgid "Show database listing as a list instead of a drop down"
msgstr "...au lieu d'un menu déroulant" msgstr "Montrer la liste des bases de données au lieu d'un menu déroulant"
#: setup/lib/messages.inc.php:60 #: setup/lib/messages.inc.php:60
msgid "Display databases as a list" msgid "Display databases as a list"
@@ -6506,7 +6506,7 @@ msgstr "Affiche les bases de données sous forme de liste"
#: setup/lib/messages.inc.php:62 #: setup/lib/messages.inc.php:62
msgid "Show server listing as a list instead of a drop down" msgid "Show server listing as a list instead of a drop down"
msgstr "...au lieu d'un menu déroulant" msgstr "Montrer la liste des serveurs au lieu d'un menu déroulant"
#: setup/lib/messages.inc.php:63 #: setup/lib/messages.inc.php:63
msgid "Display servers as a list" msgid "Display servers as a list"
@@ -6624,8 +6624,8 @@ msgid ""
"Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is " "Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is "
"the referenced data, [kbd]id[/kbd] is the key value" "the referenced data, [kbd]id[/kbd] is the key value"
msgstr "" msgstr ""
"[kbd]content[/kbd] signifie la donnée référencée, [kbd]id[/kbd] représente " "Ordre du tri pour les éléments de clé étrangère; [kbd]content[/kbd] signifie "
"la valeur de la clé" "la donnée référencée, [kbd]id[/kbd] représente la valeur de la clé"
#: setup/lib/messages.inc.php:97 #: setup/lib/messages.inc.php:97
msgid "Foreign key dropdown order" msgid "Foreign key dropdown order"
@@ -6927,7 +6927,7 @@ msgstr "Cible de l'icône d'accès rapide"
#: setup/lib/messages.inc.php:169 #: setup/lib/messages.inc.php:169
msgid "Show logo in left frame" msgid "Show logo in left frame"
msgstr "...dans le panneau de navigation" msgstr "Montrer le logo dans le panneau de navigation"
#: setup/lib/messages.inc.php:170 #: setup/lib/messages.inc.php:170
msgid "Display logo" msgid "Display logo"
@@ -6935,7 +6935,7 @@ msgstr "Affichage du logo"
#: setup/lib/messages.inc.php:171 #: setup/lib/messages.inc.php:171
msgid "Display server choice at the top of the left frame" msgid "Display server choice at the top of the left frame"
msgstr "...en haut du panneau de navigation" msgstr "Montrer le choix de serveurs au haut du panneau de navigation"
#: setup/lib/messages.inc.php:172 #: setup/lib/messages.inc.php:172
msgid "Display servers selection" msgid "Display servers selection"
@@ -6943,7 +6943,7 @@ msgstr "Affiche la liste des serveurs"
#: setup/lib/messages.inc.php:173 #: setup/lib/messages.inc.php:173
msgid "String that separates databases into different tree levels" msgid "String that separates databases into different tree levels"
msgstr "...pour la séparation en niveaux" msgstr "Chaîne qui sépare les noms de bases de données en niveaux"
#: setup/lib/messages.inc.php:174 #: setup/lib/messages.inc.php:174
msgid "Database tree separator" msgid "Database tree separator"
@@ -6975,7 +6975,7 @@ msgstr "Nombre de niveaux pour l'arborescence des tables"
#: setup/lib/messages.inc.php:180 #: setup/lib/messages.inc.php:180
msgid "String that separates tables into different tree levels" msgid "String that separates tables into different tree levels"
msgstr "...pour la séparation en niveaux" msgstr "Chaîne qui sépare les noms de table en niveaux"
#: setup/lib/messages.inc.php:181 #: setup/lib/messages.inc.php:181
msgid "Table tree separator" msgid "Table tree separator"
@@ -6999,7 +6999,7 @@ msgstr "Fenêtre-cible pour la page ouverte lors d'un clic sur le logo"
#: setup/lib/messages.inc.php:185 #: setup/lib/messages.inc.php:185
msgid "Highlight server under the mouse cursor" msgid "Highlight server under the mouse cursor"
msgstr "...dans le panneau de navigation" msgstr "Faire ressortir le nom du serveur dans le panneau de navigation"
#: setup/lib/messages.inc.php:186 #: setup/lib/messages.inc.php:186
msgid "Enable highlighting" msgid "Enable highlighting"
@@ -7074,7 +7074,7 @@ msgstr "Durée de validité de la connexion (mode cookie)"
#: setup/lib/messages.inc.php:200 #: setup/lib/messages.inc.php:200
msgid "Maximum number of characters used when a SQL query is displayed" msgid "Maximum number of characters used when a SQL query is displayed"
msgstr "...en nombre de caractères" msgstr "Nombre maximum de caractères quand une requête SQL est affichée"
#: setup/lib/messages.inc.php:201 #: setup/lib/messages.inc.php:201
msgid "Maximum displayed SQL length" msgid "Maximum displayed SQL length"

6
po/sl.po
View File

@@ -3,8 +3,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-02 03:37+0530\n" "POT-Creation-Date: 2010-06-13 09:03-0400\n"
"PO-Revision-Date: 2010-06-17 01:10+0200\n" "PO-Revision-Date: 2010-06-29 22:42+0200\n"
"Last-Translator: Domen <dbc334@gmail.com>\n" "Last-Translator: Domen <dbc334@gmail.com>\n"
"Language-Team: slovenian <sl@li.org>\n" "Language-Team: slovenian <sl@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@@ -193,7 +193,7 @@ msgstr "Natisni"
#: db_export.php:29 #: db_export.php:29
msgid "View dump (schema) of database" msgid "View dump (schema) of database"
msgstr "Preglej povzetek stanja podatkovne baze" msgstr "Preglej povzetek stanja podatkovne zbirke"
#: db_export.php:33 db_printview.php:96 db_qbe.php:102 db_structure.php:51 #: db_export.php:33 db_printview.php:96 db_qbe.php:102 db_structure.php:51
#: db_tracking.php:35 export.php:359 navigation.php:332 #: db_tracking.php:35 export.php:359 navigation.php:332