diff --git a/ChangeLog b/ChangeLog index f61fac728..4b6bda786 100755 --- a/ChangeLog +++ b/ChangeLog @@ -115,6 +115,7 @@ $Id$ thanks to Will Palmer - wpalmer - bug #3040226 [XHTML] LockFromUpdate checkbox not checked by default - bug [doc] Withdraw or edit FAQ entries related to older MySQL or PHP +- bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop 3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/Documentation.html b/Documentation.html index d6e4f3b9f..edfad9bdc 100755 --- a/Documentation.html +++ b/Documentation.html @@ -2813,7 +2813,7 @@ setfacl -d -m "g:www-data:rwx" tmp

- 1.18 (withdrawn). + 1.18 (withdrawn).

1.19 I can't run the "display relations" feature because the @@ -4380,7 +4380,7 @@ chmod o+rwx tmp localized_docs/po from Git, or just go to the translation server and translate it online. If your language is missing, just contact - Michal Čihař; he will add it. If + Michal Čihař; he will add it. If you prefer to directly translate the po files, please put updated ones into our translation tracker.

@@ -4568,7 +4568,7 @@ Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info> Olivier Müller <om_at_omnis.ch> Robin Johnson <robbat2_at_users.sourceforge.net> Alexander M. Turek <me_at_derrabus.de> - Michal Čihař <michal_at_cihar.com> + Michal Čihař <michal_at_cihar.com> Garvin Hicking <me_at_supergarv.de> Michael Keck <mkkeck_at_users.sourceforge.net> Sebastian Mendel <cybot_tm_at_users.sourceforge.net> diff --git a/js/server_privileges.js b/js/server_privileges.js index e85637e3b..e59ec6297 100755 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -13,8 +13,8 @@ /** * Validates the password field in a form * - * @uses PMA_messages['strPasswordEmpty'] - * @uses PMA_messages['strPasswordNotSame'] + * @see PMA_messages['strPasswordEmpty'] + * @see PMA_messages['strPasswordNotSame'] * @param object the form * @return boolean whether the field value is valid or not */ @@ -138,6 +138,10 @@ function appendNewUser(new_user_string, new_user_initial, new_user_initial_strin .html(new_user_initial_string); }; +/**#@+ + * @namespace jQuery + */ + /** * AJAX scripts for server_privileges page. * @@ -149,18 +153,24 @@ function appendNewUser(new_user_string, new_user_initial, new_user_initial_strin * Paginate table of users * Flush privileges * + * @memberOf jQuery + * @name document.ready */ $(document).ready(function() { + /** @lends jQuery */ /** * AJAX event handler for 'Add a New User' * - * @uses PMA_ajaxShowMessage() - * @uses appendNewUser() + * @see PMA_ajaxShowMessage() + * @see appendNewUser() + * @memberOf jQuery + * @name add_user_click * */ $("#fieldset_add_user a").live("click", function(event) { + /** @lends jQuery */ event.preventDefault(); PMA_ajaxShowMessage(); @@ -228,7 +238,9 @@ $(document).ready(function() { /** * Ajax event handler for 'Reload Privileges' anchor * - * @uses PMA_ajaxShowMessage() + * @see PMA_ajaxShowMessage() + * @memberOf jQuery + * @name reload_privileges_click */ $("#reload_privileges_anchor").live("click", function(event) { event.preventDefault(); @@ -249,8 +261,9 @@ $(document).ready(function() { /** * AJAX handler for 'Revoke User' * - * @uses PMA_ajaxShowMessage() - * + * @see PMA_ajaxShowMessage() + * @memberOf jQuery + * @name revoke_user_click */ $("#fieldset_delete_user_footer #buttonGo").live('click', function(event) { event.preventDefault(); @@ -289,13 +302,17 @@ $(document).ready(function() { /** * AJAX handler for 'Edit User' * - * @uses PMA_ajaxShowMessage() + * @see PMA_ajaxShowMessage() + * */ /** * Step 1: Load Edit User Dialog + * @memberOf jQuery + * @name edit_user_click */ $(".edit_user_anchor").live('click', function(event) { + /** @lends jQuery */ event.preventDefault(); PMA_ajaxShowMessage(); @@ -321,9 +338,12 @@ $(document).ready(function() { /** * Step 2: Submit the Edit User Dialog * - * @uses PMA_ajaxShowMessage() + * @see PMA_ajaxShowMessage() + * @memberOf jQuery + * @name edit_user_submit */ $("#edit_user_dialog").find("form").live('submit', function(event) { + /** @lends jQuery */ event.preventDefault(); PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); @@ -387,9 +407,12 @@ $(document).ready(function() { /** * AJAX handler for 'Export Privileges' * - * @uses PMA_ajaxShowMessage() + * @see PMA_ajaxShowMessage() + * @memberOf jQuery + * @name export_user_click */ $(".export_user_anchor").live('click', function(event) { + /** @lends jQuery */ event.preventDefault(); PMA_ajaxShowMessage(); @@ -413,7 +436,9 @@ $(document).ready(function() { /** * AJAX handler to Paginate the Users Table * - * @uses PMA_ajaxShowMessage() + * @see PMA_ajaxShowMessage() + * @name paginate_users_table_click + * @memberOf jQuery */ $("#initials_table").find("a").live('click', function(event) { event.preventDefault(); @@ -432,4 +457,6 @@ $(document).ready(function() { }) // end $.get })// end of the paginate users table -}, 'top.frame_content'); //end $(document).ready() \ No newline at end of file +}, 'top.frame_content'); //end $(document).ready() + +/**#@- */ \ No newline at end of file diff --git a/js/sql.js b/js/sql.js index ec32b3794..883c3047b 100644 --- a/js/sql.js +++ b/js/sql.js @@ -79,7 +79,6 @@ function appendInlineAnchor(disp_mode) { } /**#@+ - * @memberOf jQuery * @namespace jQuery */ @@ -96,20 +95,24 @@ function appendInlineAnchor(disp_mode) { * * * @name document.ready - * @function - * @augments jQuery.fn + * @memberOf jQuery */ $(document).ready(function() { - /** - * @lends jQuery - */ /** - * @var disp_mode current value of the direction in which the table is displayed + * current value of the direction in which the table is displayed + * @type String + * @fieldOf jQuery + * @name disp_mode */ var disp_mode = $("#top_direction_dropdown").val(); + /** + * Update value of {@link jQuery.disp_mode} everytime the direction dropdown changes value + * @memberOf jQuery + * @name direction_dropdown_change + */ $("#top_direction_dropdown, #bottom_direction_dropdown").live('change', function(event) { disp_mode = $(this).val(); }) @@ -117,17 +120,27 @@ $(document).ready(function() { /** * Attach the {@link appendInlineAnchor} function to a custom event, which * will be triggered manually everytime the table of results is reloaded - * @function - * @name sqlqueryresults_live + * @memberOf jQuery + * @name sqlqueryresults_live */ $("#sqlqueryresults").live('appendAnchor',function() { appendInlineAnchor(disp_mode); }) - // Trigger the appendAnchor event to prepare the first table for inline edit + /** + * Trigger the appendAnchor event to prepare the first table for inline edit + * + * @memberOf jQuery + * @name sqlqueryresults_trigger + */ $("#sqlqueryresults").trigger('appendAnchor'); - // Append the Toggle Query Box message to the query input form + /** + * Append the Toggle Query Box message to the query input form + * + * @memberOf jQuery + * @name appendToggleSpan + */ $('') .html(PMA_messages['strToggleQueryBox']) .appendTo("#sqlqueryform"); @@ -140,8 +153,9 @@ $(document).ready(function() { /** * Ajax Event handler for 'SQL Query Submit' * - * @see PMA_ajaxShowMessage() - * @inner + * @see PMA_ajaxShowMessage() + * @memberOf jQuery + * @name sqlqueryform_submit */ $("#sqlqueryform").live('submit', function(event) { event.preventDefault(); @@ -169,14 +183,16 @@ $(document).ready(function() { /** * Ajax Event handlers for Paginating the results table - * - * @uses PMA_ajaxShowMessage() */ /** * Paginate when we click any of the navigation buttons + * @memberOf jQuery + * @name paginate_nav_button_click + * @uses PMA_ajaxShowMessage() */ $("input[name=navig]").live('click', function(event) { + /** @lends jQuery */ event.preventDefault(); PMA_ajaxShowMessage(); @@ -196,6 +212,8 @@ $(document).ready(function() { /** * Paginate results with Page Selector dropdown + * @memberOf jQuery + * @name paginate_dropdown_change */ $("#pageselector").live('change', function(event) { event.preventDefault(); @@ -210,6 +228,8 @@ $(document).ready(function() { /** * Ajax Event handler for sorting the results table + * @memberOf jQuery + * @name table_results_sort_click */ $("#table_results").find("a[title=Sort]").live('click', function(event) { event.preventDefault(); @@ -224,6 +244,8 @@ $(document).ready(function() { /** * Ajax Event handler for the display options + * @memberOf jQuery + * @name displayOptionsForm_submit */ $("#displayOptionsForm").live('submit', function(event) { event.preventDefault(); @@ -237,15 +259,17 @@ $(document).ready(function() { /** * Ajax Event handlers for Inline Editing - * - * @see PMA_ajaxShowMessage() - * @see getFieldName() */ /** * On click, replace the current field with an input/textarea + * @memberOf jQuery + * @name inline_edit_start + * @see PMA_ajaxShowMessage() + * @see getFieldName() */ $(".edit_row_anchor").live('click', function(event) { + /** @lends jQuery */ event.preventDefault(); $(this).removeClass('edit_row_anchor').addClass('edit_row_anchor_active'); @@ -272,6 +296,7 @@ $(document).ready(function() { } $(input_siblings).each(function() { + /** @lends jQuery */ /** * @var data_value Current value of this field */ @@ -300,6 +325,7 @@ $(document).ready(function() { $(".original_data").hide(); } else if($(this).is('.truncated, .transformed')) { + /** @lends jQuery */ //handle truncated/transformed values values /** @@ -326,6 +352,7 @@ $(document).ready(function() { }) // end $.post() } else if($(this).is('.relation')) { + /** @lends jQuery */ //handle relations /** @@ -353,6 +380,7 @@ $(document).ready(function() { }) // end $.post() } else if($(this).is('.enum')) { + /** @lends jQuery */ //handle enum fields /** * @var curr_value String containing the current value of this relational field @@ -389,8 +417,14 @@ $(document).ready(function() { /** * After editing, clicking again should post data + * + * @memberOf jQuery + * @name inline_edit_save + * @see PMA_ajaxShowMessage() + * @see getFieldName() */ $(".edit_row_anchor_active").live('click', function(event) { + /** @lends jQuery */ event.preventDefault(); /** @@ -448,7 +482,7 @@ $(document).ready(function() { var transformation_fields = false; $(input_siblings).each(function() { - + /** @lends jQuery */ /** * @var this_field Object referring to this field () */ diff --git a/libraries/header.inc.php b/libraries/header.inc.php index a42518a98..5a8e1b1df 100755 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -105,21 +105,14 @@ if (!$GLOBALS['is_ajax_request']) { printf($item, $GLOBALS['cfg']['DefaultTabDatabase'], PMA_generate_common_url($GLOBALS['db']), - htmlspecialchars($GLOBALS['db']), - __('Database'), - 's_db.png'); - - if (isset($GLOBALS['action']) && $GLOBALS['action'] == 'tbl_create.php') { - /* We're creating a new table */ - echo $separator; - printf($item, - $action, - PMA_generate_common_url($GLOBALS['db']), - __('New table'), - '', - 's_tbl.png'); - } elseif (strlen($GLOBALS['table'])) { - require_once './libraries/tbl_info.inc.php'; + __('New table'), + '', + 's_tbl.png'); + // if the table is being dropped, $_REQUEST['purge'] is set + // (it always contains "1") + // so do not display the table name in upper div + } elseif (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) { + require_once './libraries/tbl_info.inc.php'; echo $separator; printf($item, diff --git a/po/en_GB.po b/po/en_GB.po index de177047b..bfc5a3bdf 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-08-06 08:03-0400\n" -"PO-Revision-Date: 2010-07-30 22:24+0200\n" +"PO-Revision-Date: 2010-08-09 22:22+0200\n" "Last-Translator: Robert Readman \n" "Language-Team: english-gb \n" "MIME-Version: 1.0\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 #: libraries/display_tbl.lib.php:415 server_privileges.php:1510 @@ -1564,7 +1564,7 @@ msgstr "Authenticating..." #: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "PBMS error" #: libraries/blobstreaming.lib.php:267 #, fuzzy @@ -1574,11 +1574,11 @@ msgstr "Page creation failed" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" -msgstr "" +msgstr "PBMS get BLOB info failed:" #: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" -msgstr "" +msgstr "get BLOB Content-Type failed" #: libraries/blobstreaming.lib.php:347 msgid "View image" @@ -1599,7 +1599,7 @@ msgstr "Download file" #: libraries/blobstreaming.lib.php:421 #, php-format msgid "Could not open file: %s" -msgstr "" +msgstr "Could not open file: %s" #: libraries/common.inc.php:567 msgid "" diff --git a/po/fr.po b/po/fr.po index 25720f893..cf3cfc0ab 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-08-06 08:03-0400\n" -"PO-Revision-Date: 2010-07-21 14:41+0200\n" +"PO-Revision-Date: 2010-08-06 14:16+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 #: libraries/display_tbl.lib.php:415 server_privileges.php:1510 @@ -92,17 +92,16 @@ msgstr "Utiliser cette valeur" #: bs_disp_as_mime_type.php:29 bs_play_media.php:35 #: libraries/blobstreaming.lib.php:331 msgid "No blob streaming server configured!" -msgstr "" +msgstr "Aucun serveur blob streaming configuré!" #: bs_disp_as_mime_type.php:35 -#, fuzzy #| msgid "Failed to write file to disk." msgid "Failed to fetch headers" -msgstr "Erreur lors de l'écriture du fichier sur disque." +msgstr "Erreur d'accès aux en-têtes" #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" -msgstr "" +msgstr "Échec d'ouverture du URL distant" #: db_create.php:44 #, php-format @@ -250,10 +249,9 @@ msgid "and then" msgstr "et ensuite" #: db_operations.php:379 -#, fuzzy #| msgid "Rename database to" msgid "Remove database" -msgstr "Changer le nom de la base de données pour" +msgstr "Supprimer la base de données" #: db_operations.php:391 #, php-format @@ -261,10 +259,9 @@ msgid "Database %s has been dropped." msgstr "La base de données %s a été effacée." #: db_operations.php:396 -#, fuzzy #| msgid "Go to database" msgid "Drop the database (DROP)" -msgstr "Aller à la base de données" +msgstr "Supprimer la base de données (DROP)" #: db_operations.php:424 msgid "Copy database to" @@ -316,7 +313,7 @@ msgid "Collation" msgstr "Interclassement" #: db_operations.php:498 pdf_schema.php:32 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The additional features for working with linked tables have been " #| "deactivated. To find out why click %shere%s." @@ -324,8 +321,8 @@ msgid "" "The phpMyAdmin configuration storage has been deactivated. To find out why " "click %shere%s." msgstr "" -"Certaines fonctionnalités ayant trait aux tables reliées sont désactivées. " -"Pour une analyse du problème, cliquez %sici%s." +"Le stockage des configurations phpMyAdmin a été désactivé. Pour une analyse " +"du problème, cliquez %sici%s." #: db_operations.php:531 msgid "Edit PDF Pages" @@ -1590,21 +1587,19 @@ msgstr "Authentification en cours..." #: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "Erreur PBMS" #: libraries/blobstreaming.lib.php:267 -#, fuzzy -#| msgid "Page creation failed" msgid "PBMS connection failed:" -msgstr "Échec de création de page" +msgstr "La connexion PBMS a échoué :" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" -msgstr "" +msgstr "L'accès aux informations BLOB de PBMS a échoué :" #: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" -msgstr "" +msgstr "L'accès au Content-Type du BLOB a échoué" #: libraries/blobstreaming.lib.php:347 msgid "View image" @@ -1625,7 +1620,7 @@ msgstr "Télécharger" #: libraries/blobstreaming.lib.php:421 #, php-format msgid "Could not open file: %s" -msgstr "" +msgstr "Échec d'ouverture du fichier %s" #: libraries/common.inc.php:567 msgid "" @@ -1722,10 +1717,9 @@ msgid "MySQL said: " msgstr "MySQL a répondu: " #: libraries/common.lib.php:1129 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "Failed to connect to SQL validator!" -msgstr "Connexion au serveur MySQL impossible" +msgstr "Connexion au validateur SQL impossible" #: libraries/common.lib.php:1167 setup/lib/messages.inc.php:350 msgid "Explain SQL" @@ -2556,21 +2550,18 @@ msgstr "" "ALTER TABLE." #: libraries/engines/pbms.lib.php:31 -#, fuzzy #| msgid "Garbage threshold" msgid "Garbage Threshold" msgstr "Seuil des informations parasites" #: libraries/engines/pbms.lib.php:32 -#, fuzzy #| msgid "" #| "The percentage of garbage in a data log file before it is compacted. This " #| "is a value between 1 and 99. The default is 50." msgid "The percentage of garbage in a repository file before it is compacted." msgstr "" "Le pourcentage d'information parasites dans un journal de données au-delà " -"duquel il est comprimé. Il s'agit d'une valeur entre 1 et 99. La valeur par " -"défaut est 50." +"duquel il est comprimé." #: libraries/engines/pbms.lib.php:36 libraries/replication_gui.lib.php:69 #: server_synchronize.php:1161 @@ -2582,10 +2573,12 @@ msgid "" "The port for the PBMS stream-based communications. Setting this value to 0 " "will disable HTTP communication with the daemon." msgstr "" +"Le port de communication PBMS. La valeur 0 désactivera la communication HTTP " +"avec le serveur." #: libraries/engines/pbms.lib.php:41 msgid "Repository Threshold" -msgstr "" +msgstr "Seuil du dépôt" #: libraries/engines/pbms.lib.php:42 msgid "" @@ -2593,10 +2586,13 @@ msgid "" "indicate the unit of the value. A value in bytes is assumed when no unit is " "specified." msgstr "" +"La taille maximale d'un fichier de dépôt BLOB. Vous pouvez utiliser Kb, MB " +"ou GB pour indiquer l'unité de la valeur. Une valeur en octets est assumée " +"si aucune unité n'est spécifiée." #: libraries/engines/pbms.lib.php:46 msgid "Temp Blob Timeout" -msgstr "" +msgstr "Temps limite du Blob temporaire" #: libraries/engines/pbms.lib.php:47 msgid "" @@ -8553,67 +8549,3 @@ msgstr "Nom de la vue" #: view_operations.php:91 msgid "Rename view to" msgstr "Changer le nom de la vue pour" - -#, fuzzy -#~| msgid "Table name" -#~ msgid "Table removal" -#~ msgstr "Nom de la table" - -#~ msgid "BLOB Repository" -#~ msgstr "Dépôt BLOB" - -#~ msgctxt "BLOB repository" -#~ msgid "Enabled" -#~ msgstr "Activé" - -#~ msgid "Disable" -#~ msgstr "Désactiver" - -#~ msgid "Damaged" -#~ msgstr "Endommagé" - -#~ msgctxt "BLOB repository" -#~ msgid "Repair" -#~ msgstr "Réparer" - -#~ msgctxt "BLOB repository" -#~ msgid "Disabled" -#~ msgstr "Désactivé" - -#~ msgid "Enable" -#~ msgstr "Activer" - -#~ msgid "" -#~ "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] " -#~ "extension. Please check your PHP configuration." -#~ msgstr "" -#~ "PHP ne peut charger l'extension [a@http://php.net/%1$s@Documentation][em]%" -#~ "1$s[/em][/a]. Veuillez vérifier votre configuration de PHP." - -#~ msgid "" -#~ "Couldn't load the iconv or recode extension needed for charset " -#~ "conversion. Either configure PHP to enable these extensions or disable " -#~ "charset conversion in phpMyAdmin." -#~ msgstr "" -#~ "Erreur lors du chargement de l'extension iconv ou recode, utilisée pour " -#~ "convertir le jeu de caractères. Veuillez activer l'une de ces extensions " -#~ "dans PHP, ou désactiver la conversion des jeux de caractères dans " -#~ "phpMyAdmin." - -#~ msgid "" -#~ "Couldn't use the iconv, libiconv, or recode_string functions, although " -#~ "the necessary extensions appear to be loaded. Check your PHP " -#~ "configuration." -#~ msgstr "" -#~ "Erreur lors de l'utilisation de iconv, libiconv et recode_string, alors " -#~ "que ces extensions semblent chargées. Veuillez vérifier votre " -#~ "configuration de PHP." - -#~ msgid "Allow character set conversion" -#~ msgstr "Active la conversion des caractères" - -#~ msgid "Default character set used for conversions" -#~ msgstr "Utilisé pour les conversions" - -#~ msgid "Default character set" -#~ msgstr "Jeu de caractères par défaut" diff --git a/po/sl.po b/po/sl.po index fc8dea00f..32280b224 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-08-06 08:03-0400\n" -"PO-Revision-Date: 2010-07-16 17:14+0200\n" +"PO-Revision-Date: 2010-08-10 10:16+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" -"X-Generator: Pootle 2.0.1\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" +"X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 #: libraries/display_tbl.lib.php:415 server_privileges.php:1510 @@ -92,17 +92,16 @@ msgstr "Uporabi to vrednost" #: bs_disp_as_mime_type.php:29 bs_play_media.php:35 #: libraries/blobstreaming.lib.php:331 msgid "No blob streaming server configured!" -msgstr "" +msgstr "Strežnik za pretakanje blob ni konfiguriran!" #: bs_disp_as_mime_type.php:35 -#, fuzzy #| msgid "Failed to write file to disk." msgid "Failed to fetch headers" -msgstr "Pisanje datoteke na disk je spodletelo." +msgstr "Pridobivanje glav je spodletelo" #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" -msgstr "" +msgstr "Oddaljenega URL ni bilo mogoče doseči" #: db_create.php:44 #, php-format @@ -208,7 +207,7 @@ msgstr "Natisni" #: db_export.php:28 msgid "View dump (schema) of database" -msgstr "Preglej povzetek stanja podatkovne zbirke" +msgstr "Preglej povzetek stanja zbirke podatkov" #: db_export.php:32 db_printview.php:94 db_qbe.php:98 db_structure.php:49 #: db_tracking.php:30 export.php:350 navigation.php:325 @@ -225,7 +224,7 @@ msgstr "Prekliči izbor vsega" #: db_operations.php:33 tbl_create.php:47 msgid "The database name is empty!" -msgstr "Ime podatkovne zbirke je prazno!" +msgstr "Ime zbirke podatkov je prazno!" #: db_operations.php:231 #, php-format @@ -250,10 +249,9 @@ msgid "and then" msgstr "in potem" #: db_operations.php:379 -#, fuzzy #| msgid "Rename database to" msgid "Remove database" -msgstr "Preimenuj zbirko podatkov v" +msgstr "Odstrani zbirko podatkov" #: db_operations.php:391 #, php-format @@ -261,10 +259,9 @@ msgid "Database %s has been dropped." msgstr "Podatkovna zbirka %s je zavržena." #: db_operations.php:396 -#, fuzzy #| msgid "Go to database" msgid "Drop the database (DROP)" -msgstr "Pojdi v zbirko podatkov" +msgstr "Zavrzi zbirko podatkov (DROP)" #: db_operations.php:424 msgid "Copy database to" @@ -316,7 +313,7 @@ msgid "Collation" msgstr "Pravilo za razvrščanje znakov" #: db_operations.php:498 pdf_schema.php:32 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The additional features for working with linked tables have been " #| "deactivated. To find out why click %shere%s." @@ -324,8 +321,8 @@ msgid "" "The phpMyAdmin configuration storage has been deactivated. To find out why " "click %shere%s." msgstr "" -"Dodatne funkcije za delo s povezanimi tabelami so bile izkjučene. Če želite " -"izvedeti zakaj, kliknite %stukaj%s." +"Hramba konfiguracije phpMyAdmin je bila onemogočena. Če želite izvedeti " +"zakaj, kliknite %stukaj%s." #: db_operations.php:531 msgid "Edit PDF Pages" @@ -499,14 +496,14 @@ msgid "Search results for \"%s\" %s:" msgstr "Rezultati iskanja \"%s\" %s:" #: db_search.php:242 -#, fuzzy, php-format +#, php-format #| msgid "%s match(es) inside table %s" msgid "%s match inside table %s" msgid_plural "%s matches inside table %s" -msgstr[0] "%s zadetek(ov) v tabeli %s" -msgstr[1] "%s zadetek(ov) v tabeli %s" -msgstr[2] "%s zadetek(ov) v tabeli %s" -msgstr[3] "%s zadetek(ov) v tabeli %s" +msgstr[0] "%s zadetek v tabeli %s" +msgstr[1] "%s zadetka v tabeli %s" +msgstr[2] "%s zadetki v tabeli %s" +msgstr[3] "%s zadetkov v tabeli %s" #: db_search.php:249 db_structure.php:75 db_structure.php:76 #: db_structure.php:88 db_structure.php:90 db_structure.php:101 @@ -525,14 +522,14 @@ msgid "Delete" msgstr "Izbriši" #: db_search.php:267 -#, fuzzy, php-format +#, php-format #| msgid "Total: %s match(es)" msgid "Total: %s match" msgid_plural "Total: %s matches" -msgstr[0] "Skupaj: %s zadetek(ov)" -msgstr[1] "Skupaj: %s zadetek(ov)" -msgstr[2] "Skupaj: %s zadetek(ov)" -msgstr[3] "Skupaj: %s zadetek(ov)" +msgstr[0] "Skupaj: %s zadetek" +msgstr[1] "Skupaj: %s zadetka" +msgstr[2] "Skupaj: %s zadetki" +msgstr[3] "Skupaj: %s zadetkov" #: db_search.php:281 msgid "Search in database" @@ -784,7 +781,7 @@ msgstr "Sledi tabeli" #: db_tracking.php:195 msgid "Database Log" -msgstr "Dnevnik podatkovne zbirke" +msgstr "Dnevnik zbirke podatkov" #: export.php:61 msgid "Selected export type has to be saved in file!" @@ -1014,7 +1011,6 @@ msgid "Choose column to display" msgstr "Izberite stolpec za prikaz" #: js/messages.php:66 -#, fuzzy #| msgid "Generate Password" msgid "Generate password" msgstr "Ustvari geslo" @@ -1371,7 +1367,7 @@ msgstr "" #: server_databases.php:85 server_privileges.php:1656 #: setup/lib/messages.inc.php:107 test/theme.php:92 msgid "Databases" -msgstr "Podatkovne zbirke" +msgstr "Zbirke podatkov" #: libraries/Message.class.php:210 libraries/blobstreaming.lib.php:308 #: libraries/blobstreaming.lib.php:314 libraries/common.lib.php:574 @@ -1590,21 +1586,19 @@ msgstr "Potrjevanje ..." #: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "Napaka PBMS" #: libraries/blobstreaming.lib.php:267 -#, fuzzy -#| msgid "Page creation failed" msgid "PBMS connection failed:" -msgstr "Ustvarjanje strani je spodletelo" +msgstr "Povezava s PBMS je spodletela:" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" -msgstr "" +msgstr "Pridobivanje informacij BLOB PBMS je spodletelo:" #: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" -msgstr "" +msgstr "pridobivanje Content-Type BLOB je spodletelo" #: libraries/blobstreaming.lib.php:347 msgid "View image" @@ -1625,7 +1619,7 @@ msgstr "Prenesi datoteko" #: libraries/blobstreaming.lib.php:421 #, php-format msgid "Could not open file: %s" -msgstr "" +msgstr "Ne morem odpreti datoteke: %s" #: libraries/common.inc.php:567 msgid "" @@ -1720,10 +1714,9 @@ msgid "MySQL said: " msgstr "MySQL je vrnil: " #: libraries/common.lib.php:1129 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "Failed to connect to SQL validator!" -msgstr "Ne morem se povezati s strežnikom MySQL" +msgstr "Ne morem se povezati s preverjalnikom SQL!" #: libraries/common.lib.php:1167 setup/lib/messages.inc.php:350 msgid "Explain SQL" @@ -1863,7 +1856,7 @@ msgstr "Operacije" #: libraries/core.lib.php:265 libraries/dbg/setup.php:21 #, php-format msgid "The %s extension is missing. Please check your PHP configuration." -msgstr "" +msgstr "Razširitev %s manjka. Prosimo, preverite vašo konfiguracijo PHP." #: libraries/db_events.inc.php:19 libraries/db_events.inc.php:21 #: libraries/export/sql.php:412 @@ -2043,7 +2036,7 @@ msgstr "ime strežnika" #: libraries/display_export.lib.php:148 msgid "database name" -msgstr "ime podatkovne zbirke" +msgstr "ime zbirke podatkov" #: libraries/display_export.lib.php:151 msgid "table name" @@ -2549,20 +2542,16 @@ msgstr "" "ali ustvarjanju indeksov s CREATE INDEX ali ALTER TABLE." #: libraries/engines/pbms.lib.php:31 -#, fuzzy #| msgid "Garbage threshold" msgid "Garbage Threshold" -msgstr "Omejitev smeti" +msgstr "Prag smeti" #: libraries/engines/pbms.lib.php:32 -#, fuzzy #| msgid "" #| "The percentage of garbage in a data log file before it is compacted. This " #| "is a value between 1 and 99. The default is 50." msgid "The percentage of garbage in a repository file before it is compacted." -msgstr "" -"Odstotek smeti v dnevniški datoteki, preden je ta stisnjena. Vrednost je med " -"1 in 99. Privzeto je 50." +msgstr "Odstotek smeti v shrambni datoteki, preden je ta stisnjena." #: libraries/engines/pbms.lib.php:36 libraries/replication_gui.lib.php:69 #: server_synchronize.php:1161 @@ -2574,10 +2563,12 @@ msgid "" "The port for the PBMS stream-based communications. Setting this value to 0 " "will disable HTTP communication with the daemon." msgstr "" +"Vrata za pretočna sporazumevanja s PBMS. Nastavitev te vrednosti na 0 bo " +"onemogočilo sporazumevanje HTTP s procesom." #: libraries/engines/pbms.lib.php:41 msgid "Repository Threshold" -msgstr "" +msgstr "Prag shrambe" #: libraries/engines/pbms.lib.php:42 msgid "" @@ -2585,22 +2576,27 @@ msgid "" "indicate the unit of the value. A value in bytes is assumed when no unit is " "specified." msgstr "" +"Največja velikost shrambne datoteke BLOB. Lahko uporabite Kb, MB ali GB za " +"določitev enote vrednosti. Ko enota ni navedena, se predpostavi vrednost v " +"bajtih." #: libraries/engines/pbms.lib.php:46 msgid "Temp Blob Timeout" -msgstr "" +msgstr "Časovna omejitev začasnega Blob" #: libraries/engines/pbms.lib.php:47 msgid "" "The timeout, in seconds, for temporary BLOBs. Uploaded BLOB data is removed " "after this time, unless they are referenced by a record in the database." msgstr "" +"Časovna omejitev, v sekundah, za začasne BLOB-e. Naloženi podatki BLOB so " +"odstranjeni po tem času, razen če se na njih sklicuje zapis v zbirki " +"podatkov." #: libraries/engines/pbms.lib.php:51 -#, fuzzy #| msgid "Log file threshold" msgid "Temp Log Threshold" -msgstr "Omejitev dnevniške datoetke" +msgstr "Prag začasnega dnevnika" #: libraries/engines/pbms.lib.php:52 msgid "" @@ -2608,26 +2604,34 @@ msgid "" "indicate the unit of the value. A value in bytes is assumed when no unit is " "specified." msgstr "" +"Največja velikost dnevniške datoteke začasnega BLOB. Lahko uporabite Kb, MB " +"ali GB za določitev enote vrednosti. Ko enota ni navedena, se predpostavi " +"vrednost v bajtih." #: libraries/engines/pbms.lib.php:56 msgid "Max Keep Alive" -msgstr "" +msgstr "Najdaljše vzdrževanje povezave" #: libraries/engines/pbms.lib.php:57 msgid "" "The timeout for inactive connection with the keep-alive flag set. After this " "time the connection will be closed. The time-out is in milliseconds (1/1000)." msgstr "" +"Časovna omejitev za nedejavne povezave z določeno zastavico keep-alive. Po " +"tem času bo povezava prekinjena. Časovna omejitev je v milisekundah " +"(1/1000)." #: libraries/engines/pbms.lib.php:61 msgid "Metadata Headers" -msgstr "" +msgstr "Glave metapodatkov" #: libraries/engines/pbms.lib.php:62 msgid "" "A \":\" delimited list of metadata headers to be used to initialize the " "pbms_metadata_header table when a database is created." msgstr "" +"Seznam glav metapodatkov, ločenih z »:«, ki bo uporabljen za pripravo tabele " +"pbms_metadata_header, ko je ustvarjena zbirka podatkov." #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" @@ -2672,7 +2676,7 @@ msgstr "" #: libraries/engines/pbxt.lib.php:37 msgid "Log file threshold" -msgstr "Omejitev dnevniške datoetke" +msgstr "Prag dnevniške datoteke" #: libraries/engines/pbxt.lib.php:38 msgid "" @@ -2708,7 +2712,7 @@ msgstr "" #: libraries/engines/pbxt.lib.php:52 msgid "Data log threshold" -msgstr "Omejitev podatkovnega dnevnika" +msgstr "Prag podatkovnega dnevnika" #: libraries/engines/pbxt.lib.php:53 msgid "" @@ -2724,7 +2728,7 @@ msgstr "" #: libraries/engines/pbxt.lib.php:57 msgid "Garbage threshold" -msgstr "Omejitev smeti" +msgstr "Prag smeti" #: libraries/engines/pbxt.lib.php:58 msgid "" @@ -2861,20 +2865,18 @@ msgid "Table structure for table" msgstr "Struktura tabele" #: libraries/export/latex.php:13 -#, fuzzy #| msgid "Content of table __TABLE__" msgid "Content of table @TABLE@" -msgstr "Vsebina tabele __TABLE__" +msgstr "Vsebina tabele @TABLE@" #: libraries/export/latex.php:14 msgid "(continued)" msgstr "(nadaljevanje)" #: libraries/export/latex.php:15 -#, fuzzy #| msgid "Structure of table __TABLE__" msgid "Structure of table @TABLE@" -msgstr "Struktura tabele __TABLE__" +msgstr "Struktura tabele @TABLE@" #: libraries/export/latex.php:26 msgid "LaTeX" @@ -3986,7 +3988,7 @@ msgstr "" #: libraries/transformations/image_jpeg__link.inc.php:9 msgid "Displays a link to download this image." -msgstr "Pokaže povezavo na grafiko (neposredni BLOB prenos, ipd.)." +msgstr "Pokaže povezavo za prenos slike." #: libraries/transformations/text_plain__dateformat.inc.php:9 msgid "" @@ -4327,7 +4329,7 @@ msgstr "Prosimo, konfigurirajte koordinate za tabelo %s" #: pdf_schema.php:993 #, php-format msgid "Schema of the %s database - Page %s" -msgstr "Shema podatkovne zbirke %s - Stran %s" +msgstr "Shema zbirke podatkov %s - Stran %s" #: pdf_schema.php:1011 msgid "No tables" @@ -4505,7 +4507,7 @@ msgstr "Ni izbranih zbirk podatkov." #: server_databases.php:60 #, php-format msgid "%s databases have been dropped successfully." -msgstr "%s podatkovne zbirke so uspešno zavržene." +msgstr "%s zbirke podatkov so uspešno zavržene." #: server_databases.php:85 msgid "Databases statistics" @@ -4559,7 +4561,7 @@ msgid "" "Note: Enabling the database statistics here might cause heavy traffic " "between the web server and the MySQL server." msgstr "" -"Obvestilo: Omogočitev statistike podatkovne zbirke lahko povzroči močno " +"Obvestilo: Omogočitev statistike zbirke podatkov lahko povzroči močno " "povečan promet med spletnim in podatkovnim strežnikom." #: server_engines.php:47 @@ -4568,7 +4570,7 @@ msgstr "Pogoni skladiščenja" #: server_export.php:18 msgid "View dump (schema) of databases" -msgstr "Pokaži povzetek stanja podatkovnih baz" +msgstr "Pokaži povzetek stanja zbirk podatkov" #: server_privileges.php:23 server_privileges.php:265 msgid "Includes all privileges except GRANT." @@ -4681,7 +4683,7 @@ msgid "" "Limits the number of commands that change any table or database the user may " "execute per hour." msgstr "" -"Omeji število ukazov za spremembo tabel ali podatkovne zbirke, ki jih " +"Omeji število ukazov za spremembo tabel ali zbirke podatkov, ki jih " "uporabnik lahko izvrši v eni uri." #: server_privileges.php:45 server_privileges.php:651 @@ -4893,7 +4895,7 @@ msgstr "Odvzemi uporabnikom aktivne privilegije in jih potem izbriši." #: server_privileges.php:1614 server_privileges.php:1615 #: server_privileges.php:1616 msgid "Drop the databases that have the same names as the users." -msgstr "Izbriši podatkovne zbirke, ki imajo enako ime kot uporabniki." +msgstr "Izbriši zbirke podatkov, ki imajo enako ime kot uporabniki." #: server_privileges.php:1632 #, php-format @@ -4923,8 +4925,8 @@ msgstr "Dodaj privilegije na naslednji podatkovni zbirki" #: server_privileges.php:1939 msgid "Wildcards % and _ should be escaped with a \\ to use them literally" msgstr "" -"Pred nadomestna znaka % in _ je potrebno postaviti \\, če ju želite " -"uporabiti dobesedno." +"Pred nadomestna znaka % in _ je potrebno postaviti \\, če ju želite uporabiti " +"dobesedno" #: server_privileges.php:1942 msgid "Add privileges on the following table" @@ -5353,7 +5355,7 @@ msgstr "Število zahtev za vstavitev vrstice v tabelo." #: server_status.php:60 msgid "The number of pages containing data (dirty or clean)." -msgstr "Število strani, ki vsebujejo podatke (umazane ali čiste)" +msgstr "Število strani, ki vsebujejo podatke (umazane ali čiste)." #: server_status.php:61 msgid "The number of pages currently dirty." @@ -6293,7 +6295,7 @@ msgstr "" #: setup/lib/messages.inc.php:22 msgid "Key is too short, it should have at least 8 characters" -msgstr "Ključ je prekratek, ima naj vsaj 8 znakov." +msgstr "Ključ je prekratek, ima naj vsaj 8 znakov" #: setup/lib/messages.inc.php:23 msgid "" @@ -6404,7 +6406,7 @@ msgid "" msgstr "" "Stisne izvoze gzip/bzip2 med izvajanjem, brez večje porabe spomina; če " "naletite na težave z ustvarjenimi datotekami gzip/bzip2, to funkcijo " -"onemogočite." +"onemogočite" #: setup/lib/messages.inc.php:43 msgid "Compress on the fly" @@ -6424,11 +6426,11 @@ msgstr "Potrjevanje poizvedb DROP" #: setup/lib/messages.inc.php:49 msgid "Tab that is displayed when entering a database" -msgstr "Zavihek, ki se prikaže ob odprtju podatkovne zbirke" +msgstr "Zavihek, ki se prikaže ob odprtju zbirke podatkov" #: setup/lib/messages.inc.php:50 msgid "Default database tab" -msgstr "Privzet zavihek podatkovne zbirke" +msgstr "Privzet zavihek zbirke podatkov" #: setup/lib/messages.inc.php:51 msgid "Tab that is displayed when entering a server" @@ -6538,7 +6540,7 @@ msgstr "Nabor znakov datoteke" #: setup/lib/messages.inc.php:82 msgid "Database name template" -msgstr "Predloga imena podatkovne zbirke" +msgstr "Predloga imena zbirke podatkov" #: setup/lib/messages.inc.php:83 msgid "Server name template" @@ -6705,7 +6707,6 @@ msgid "Signon login options" msgstr "Prijavne možnosti signon" #: setup/lib/messages.inc.php:128 -#, fuzzy #| msgid "" #| "Configure phpMyAdmin database to gain access to additional features, see " #| "[a@../Documentation.html#linked-tables]linked-tables infrastructure[/a] " @@ -6716,8 +6717,8 @@ msgid "" "in documentation" msgstr "" "Konfigurira zbirko podatkov phpMyAdmin za pridobitev dostopa do dodatnih " -"funkcij, glej [a@../Documentation.html#linked-tables]infrastrukturo " -"povezanih tabel[/a] v dokumentaciji" +"funkcij, glej [a@../Documentation.html#linked-tables]hrambo konfiguracije " +"phpMyAdmin[/a] v dokumentaciji" #: setup/lib/messages.inc.php:129 setup/lib/messages.inc.php:290 msgid "PMA database" @@ -7057,8 +7058,8 @@ msgid "" "shown." msgstr "" "Število prikazanih vrstic med brskanjem po množici rezultatov. Če množica " -"rezultatov vsebuje več vrstic, se prikažeta povezavi "Prejšnja" in " -""Naslednja"" +"rezultatov vsebuje več vrstic, se prikažeta povezavi »Prejšnja« " +"in »Naslednja«." #: setup/lib/messages.inc.php:202 msgid "Maximum number of rows to display" @@ -7622,7 +7623,7 @@ msgid "" "compatibility checks and thereby increases performance" msgstr "" "Onemogočite, če veste, da so vaše tabele pma_* ažurirane. To prepreči " -"preverjanja združljivosti in tako poveča zmogljivost." +"preverjanja združljivosti in tako poveča zmogljivost" #: setup/lib/messages.inc.php:322 msgid "Verbose check" @@ -7705,7 +7706,7 @@ msgstr "Pokaži poizvedbe SQL" #: setup/lib/messages.inc.php:340 msgid "Allow to display database and table statistics (eg. space usage)" msgstr "" -"Dovoli prikaz statistike podatkovne zbirke in tabele (npr. poraba prostora)" +"Dovoli prikaz statistike zbirke podatkov in tabele (npr. poraba prostora)" #: setup/lib/messages.inc.php:341 msgid "Show statistics" @@ -7906,10 +7907,9 @@ msgid "Showing SQL query" msgstr "Prikazovanje poizvedbe SQL" #: sql.php:516 -#, fuzzy #| msgid "Validate SQL" msgid "Validated SQL" -msgstr "Preveri pravilnost stavka SQL" +msgstr "Preverjen SQL" #: sql.php:631 #, php-format @@ -8118,20 +8118,18 @@ msgid "Flush the table (FLUSH)" msgstr "Počisti tabelo (FLUSH)" #: tbl_operations.php:642 -#, fuzzy #| msgid "Delete tracking data for this table" msgid "Delete data or table" -msgstr "Izbriši podatke sledenja te tabele" +msgstr "Izbriši podatke ali tabelo" #: tbl_operations.php:657 msgid "Empty the table (TRUNCATE)" -msgstr "" +msgstr "Izprazni tabelo (TRUNCATE)" #: tbl_operations.php:675 -#, fuzzy #| msgid "Go to database" msgid "Delete the table (DROP)" -msgstr "Pojdi v zbirko podatkov" +msgstr "Izbriši tabelo (DROP)" #: tbl_operations.php:696 msgid "Partition maintenance" @@ -8502,66 +8500,3 @@ msgstr "Ime VIEW" #: view_operations.php:91 msgid "Rename view to" msgstr "Preimenuj pogled v" - -#, fuzzy -#~| msgid "Table name" -#~ msgid "Table removal" -#~ msgstr "Ime tabele" - -#~ msgid "BLOB Repository" -#~ msgstr "Shramba BLOB" - -#~ msgctxt "BLOB repository" -#~ msgid "Enabled" -#~ msgstr "Omogočeno" - -#~ msgid "Disable" -#~ msgstr "Onemogoči" - -#~ msgid "Damaged" -#~ msgstr "Poškodovano" - -#~ msgctxt "BLOB repository" -#~ msgid "Repair" -#~ msgstr "Popravi" - -#~ msgctxt "BLOB repository" -#~ msgid "Disabled" -#~ msgstr "Onemogočeno" - -#~ msgid "Enable" -#~ msgstr "Omogoči" - -#~ msgid "" -#~ "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] " -#~ "extension. Please check your PHP configuration." -#~ msgstr "" -#~ "Ne morem naložiti podaljška [a@http://php.net/%1$s@Documentation][em]%1$s" -#~ "[/em][/a]. Prosim, preverite konfiguracijo PHP." - -#~ msgid "" -#~ "Couldn't load the iconv or recode extension needed for charset " -#~ "conversion. Either configure PHP to enable these extensions or disable " -#~ "charset conversion in phpMyAdmin." -#~ msgstr "" -#~ "Ni mogoče naložiti razširitev iconv ali recode, ki so potrebne za " -#~ "pretvorbe kodnih tabel. Konfigurirajte PHP tako, da bo omogočal uporabo " -#~ "teh razširitev, ali onemogočite pretvarjanje kodnih tabel v phpMyAdmin." - -#~ msgid "" -#~ "Couldn't use the iconv, libiconv, or recode_string functions, although " -#~ "the necessary extensions appear to be loaded. Check your PHP " -#~ "configuration." -#~ msgstr "" -#~ "Ni mogoče uporabljati funkcij iconv, libiconv ali recode_string, čeprav " -#~ "so potrebne razširitve normalno naložene. Preverite vašo konfiguracijo " -#~ "PHP." - -#~ msgid "Allow character set conversion" -#~ msgstr "Omogoči pretvarjanje nabora znakov" - -#~ msgid "Default character set used for conversions" -#~ msgstr "Privzet nabor znakov uporabljen za pretvorbe" - -#~ msgid "Default character set" -#~ msgstr "Privzet nabor znakov" diff --git a/po/tr.po b/po/tr.po index b96d28259..7bcb0561e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-08-06 08:03-0400\n" -"PO-Revision-Date: 2010-07-31 21:00+0200\n" +"PO-Revision-Date: 2010-08-08 22:05+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "MIME-Version: 1.0\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 #: libraries/display_tbl.lib.php:415 server_privileges.php:1510 @@ -682,7 +682,7 @@ msgstr "Tabloyu incele" #: pmd_pdf.php:81 pmd_pdf.php:106 server_privileges.php:1376 #: setup/frames/menu.inc.php:22 tbl_row_action.php:58 msgid "Export" -msgstr "Dışarı Aktar" +msgstr "Dışa Aktar" #: db_structure.php:591 libraries/display_pdf_schema.lib.php:44 msgid "Data Dictionary" @@ -770,7 +770,7 @@ msgstr "Veritabanı Günlüğü" #: export.php:61 msgid "Selected export type has to be saved in file!" -msgstr "Seçili dışarı aktarma türü dosyaya kaydedilmelidir!" +msgstr "Seçili dışa aktarma türü dosyaya kaydedilmelidir!" #: export.php:152 export.php:177 export.php:615 #, php-format @@ -826,14 +826,13 @@ msgid "" "file size exceeded the maximum size permitted by your PHP configuration. See " "[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." msgstr "" -"İçeri aktarmak için veri alınmadı. Ya dosya adı gönderilmedi ya da PHP " -"yapılandırmanız tarafından izin verilen en fazla boyut aşıldı. [a@./" -"Documentation.html#faq1_16@Documentation]SSS 1.16[/a]'ya bakın." +"İçe aktarmak için veri alınmadı. Ya dosya adı gönderilmedi ya da PHP " +"yapılandırmanız tarafından izin verilen en fazla boyut aşıldı. " +"[a@./Documentation.html#faq1_16@Documentation]SSS 1.16[/a]'ya bakın." #: import.php:370 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" -msgstr "" -"İçeri aktarma eklentileri yüklenemedi, lütfen kurulumunuzu kontrol edin!" +msgstr "İçe aktarma eklentileri yüklenemedi, lütfen kurulumunuzu kontrol edin!" #: import.php:395 msgid "The bookmark has been deleted." @@ -851,15 +850,15 @@ msgstr "İşaretleme %s oluşturuldu" #: import.php:407 import.php:413 #, php-format msgid "Import has been successfully finished, %d queries executed." -msgstr "İçeri aktarma başarılı olarak bitti, %d sorgu çalıştırıldı." +msgstr "İçe aktarma başarılı olarak bitti, %d sorgu çalıştırıldı." #: import.php:422 msgid "" "Script timeout passed, if you want to finish import, please resubmit same " "file and import will resume." msgstr "" -"Küçük program zaman aşımı geçti, eğer içeri aktarmayı bitirmek istiyorsanız, " -"lütfen aynı dosyayı yeniden gönderin ve içeri aktarma devam edecektir." +"Betik zaman aşımı geçti, eğer içe aktarmayı bitirmek istiyorsanız, lütfen " +"aynı dosyayı yeniden gönderin ve içe aktarma devam edecektir." #: import.php:424 msgid "" @@ -867,7 +866,7 @@ msgid "" "won't be able to finish this import unless you increase php time limits." msgstr "" "Ancak son çalıştırmada hiç veri ayrıştırılmadı, bu genellikle, php zaman " -"sınırlarını arttırmadığınız sürece phpMyAdmin'in bu içeri aktarmayı " +"sınırlarını arttırmadığınız sürece phpMyAdmin'in bu içe aktarmayı " "biteremeyeceği anlamına gelir." #: import_status.php:30 libraries/common.lib.php:660 pdf_schema.php:239 @@ -1566,21 +1565,19 @@ msgstr "Kimlik doğrulanıyor..." #: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "PBMS hatası" #: libraries/blobstreaming.lib.php:267 -#, fuzzy -#| msgid "Page creation failed" msgid "PBMS connection failed:" -msgstr "Sayfa oluşturma başarısız" +msgstr "PBMS bağlantısı başarısız:" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" -msgstr "" +msgstr "PBMS, BLOB bilgisi alması başarısız:" #: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" -msgstr "" +msgstr "BLOB İçerik Türü alma başarısız" #: libraries/blobstreaming.lib.php:347 msgid "View image" @@ -1601,7 +1598,7 @@ msgstr "Dosyayı indir" #: libraries/blobstreaming.lib.php:421 #, php-format msgid "Could not open file: %s" -msgstr "" +msgstr "Açılamayan dosya: %s" #: libraries/common.inc.php:567 msgid "" @@ -1872,7 +1869,7 @@ msgstr "Tasarımcı" #: libraries/tbl_links.inc.php:89 pmd_pdf.php:81 pmd_pdf.php:107 #: setup/frames/menu.inc.php:21 msgid "Import" -msgstr "İçeri Aktar" +msgstr "İçe Aktar" #: libraries/db_links.inc.php:93 libraries/server_links.inc.php:65 #: server_privileges.php:110 server_privileges.php:1718 @@ -1982,8 +1979,7 @@ msgstr "Sütun sayısı" #: libraries/display_export.lib.php:35 msgid "Could not load export plugins, please check your installation!" -msgstr "" -"Dışarı aktarma eklentileri yüklenemedi, lütfen kurulumunuzu kontrol edin!" +msgstr "Dışa aktarma eklentileri yüklenemedi, lütfen kurulumunuzu kontrol edin!" #: libraries/display_export.lib.php:100 #, php-format @@ -2095,7 +2091,7 @@ msgstr "" #: libraries/display_import.lib.php:125 msgid "File to import" -msgstr "İçeri aktarmak için dosya" +msgstr "İçe aktarmak için dosya" #: libraries/display_import.lib.php:136 libraries/sql_query_form.lib.php:484 msgid "Location of the text file" @@ -2119,19 +2115,19 @@ msgstr "web sunucusu gönderme dizini" #, php-format msgid "Imported file compression will be automatically detected from: %s" msgstr "" -"İçeri aktarılmış dosya sıkıştırması otomatik olarak bu dosya türlerinden " +"İçe aktarılmış dosya sıkıştırması otomatik olarak bu dosya türlerinden " "algılanacak: %s" #: libraries/display_import.lib.php:218 msgid "Partial import" -msgstr "Kısmi içeri aktarma" +msgstr "Kısmi içe aktarma" #: libraries/display_import.lib.php:224 #, php-format msgid "" "Previous import timed out, after resubmitting will continue from position %d." msgstr "" -"Önceki içeri aktarma zaman aşımına uğradı, sonradan yeniden gönderim %d " +"Önceki içe aktarma zaman aşımına uğradı, sonradan yeniden gönderim %d " "konumundan devam edecek." #: libraries/display_import.lib.php:231 @@ -2140,9 +2136,9 @@ msgid "" "to the PHP timeout limit. This might be good way to import large files, " "however it can break transactions." msgstr "" -"Küçük programcığın PHP zaman aşımı sınırına yaklaşıldığını algılaması " -"durumunda içeri aktarımı kesmeye izin ver. Bu büyük dosyaların içeri " -"aktarımı için iyi bir yol olabilir, ancak hareketleri kesebilir." +"Betiğin PHP zaman aşımı sınırına yaklaşıldığını algılaması durumunda içe " +"aktarımı kesmeye izin verir. Bu büyük dosyaların içe aktarımı için iyi bir " +"yol olabilir, ancak bu işlemleri bozabilir." #: libraries/display_import.lib.php:238 setup/lib/messages.inc.php:158 msgid "Number of queries to skip from start" @@ -2150,7 +2146,7 @@ msgstr "Başlangıçtan atlanacak sorgu sayısı" #: libraries/display_import.lib.php:254 setup/lib/messages.inc.php:157 msgid "Format of imported file" -msgstr "İçeri aktarılmış dosyanın biçimi" +msgstr "İçe aktarılmış dosyanın biçimi" #: libraries/display_pdf_schema.lib.php:11 msgid "Display PDF schema" @@ -2946,7 +2942,7 @@ msgstr "Başlık içine özel yorum ekle (\\n satırları böler)" #: libraries/export/sql.php:30 msgid "Enclose export in a transaction" -msgstr "İşlem içinde dışarı aktarmayı kapsa" +msgstr "İşlem içinde dışa aktarmayı kapsa" #: libraries/export/sql.php:31 msgid "Disable foreign key checks" @@ -2954,7 +2950,7 @@ msgstr "Dış anahtar kontrolünü etkisizleştir" #: libraries/export/sql.php:49 msgid "Database export options" -msgstr "Veritabanı dışarı aktarma seçenekleri" +msgstr "Veritabanı dışa aktarma seçenekleri" #: libraries/export/sql.php:79 msgid "Enclose table and column names with backquotes" @@ -2994,11 +2990,11 @@ msgstr "BLOB için onaltılık sistem kullan" #: libraries/export/sql.php:119 msgid "Export time in UTC" -msgstr "UTC olarak zamanı dışarı aktar" +msgstr "UTC olarak zamanı dışa aktar" #: libraries/export/sql.php:121 msgid "Export type" -msgstr "Dışarı aktarma türü" +msgstr "Dışa aktarma türü" #: libraries/export/sql.php:384 msgid "Procedures" @@ -3054,31 +3050,31 @@ msgstr "XML" #: libraries/export/xml.php:28 msgid "Export Structure Schemas (recommended)" -msgstr "Yapı Şemalarını dışarı aktar (önerilir)" +msgstr "Yapı Şemalarını dışa aktar (önerilir)" #: libraries/export/xml.php:30 msgid "Export functions" -msgstr "İşlevleri dışarı aktar" +msgstr "İşlevleri dışa aktar" #: libraries/export/xml.php:32 msgid "Export procedures" -msgstr "İşlemleri dışarı aktar" +msgstr "İşlemleri dışa aktar" #: libraries/export/xml.php:34 msgid "Export tables" -msgstr "Tabloları dışarı aktar" +msgstr "Tabloları dışa aktar" #: libraries/export/xml.php:36 msgid "Export triggers" -msgstr "Tetikleyicileri dışarı aktar" +msgstr "Tetikleyicileri dışa aktar" #: libraries/export/xml.php:38 msgid "Export views" -msgstr "Görünümleri dışarı aktar" +msgstr "Görünümleri dışa aktar" #: libraries/export/xml.php:44 msgid "Export contents" -msgstr "İçerikleri dışarı aktar" +msgstr "İçerikleri dışa aktar" #: libraries/footer.inc.php:180 libraries/footer.inc.php:191 #: libraries/footer.inc.php:194 @@ -3164,7 +3160,7 @@ msgstr "Sütun adları" #: libraries/import/csv.php:73 libraries/import/csv.php:77 #, php-format msgid "Invalid parameter for CSV import: %s" -msgstr "CSV girişi için geçersiz parametre: %s" +msgstr "CSV içe aktarma için geçersiz parametre: %s" #: libraries/import/csv.php:118 #, php-format @@ -3200,19 +3196,19 @@ msgstr "YEREL anahtar kelime kullan" #: libraries/import/ldi.php:54 msgid "This plugin does not support compressed imports!" -msgstr "Bu eklenti sıkıştırılmış içeri aktarım dosyalarını desteklemez!" +msgstr "Bu eklenti sıkıştırılmış içe aktarım dosyalarını desteklemez!" #: libraries/import/ods.php:26 msgid "Do not import empty rows" -msgstr "Boş sıraları içeri aktarma" +msgstr "Boş satırları içe aktarma" #: libraries/import/ods.php:27 msgid "Import percentages as proper decimals (12.00% to .12)" -msgstr "Yüzdeleri doğru ondalık olarak içeri aktar (%12.00'dan .12'ye)" +msgstr "Yüzdeleri doğru ondalık olarak içe aktar (%12.00'ı .12'ye)" #: libraries/import/ods.php:28 msgid "Import currencies ($5.00 to 5.00)" -msgstr "Parasalları içeri aktar ($5.00'dan 5.00'a)" +msgstr "Parasalları içe aktar ($5.00'ı 5.00'a)" #: libraries/import/sql.php:41 msgid "Do not use AUTO_INCREMENT for zero values" @@ -3267,7 +3263,7 @@ msgstr "Değişiklik yok" #: libraries/mysql_charsets.lib.php:106 msgid "Charset" -msgstr "Karakter grubu" +msgstr "Karakter Grubu" #: libraries/mysql_charsets.lib.php:202 libraries/mysql_charsets.lib.php:403 #: tbl_change.php:510 @@ -3669,7 +3665,7 @@ msgstr "Değişkenler" #: libraries/server_links.inc.php:56 test/theme.php:108 msgid "Charsets" -msgstr "Karakter grupları" +msgstr "Karakter Grupları" #: libraries/server_links.inc.php:60 test/theme.php:112 msgid "Engines" @@ -4377,7 +4373,7 @@ msgstr "Küçüğü/büyüğü değiştir" #: pmd_general.php:103 msgid "Import/Export coordinates for PDF schema" -msgstr "PDF şeması için düzenlemeleri İçeri/Dışarı Aktar" +msgstr "PDF şeması için düzenlemeleri içe/dışa aktar" #: pmd_general.php:107 msgid "Move Menu" @@ -4423,7 +4419,7 @@ msgstr "Sayfa oluşturma başarısız" #: pmd_pdf.php:82 msgid "Export/Import to scale" -msgstr "Ölçeklemek için İçeri/Dışarı Aktar" +msgstr "Ölçeklemek için içe/dışa aktar" #: pmd_pdf.php:86 msgid "recommended" @@ -4435,7 +4431,7 @@ msgstr "sayfadan/sayfaya" #: querywindow.php:93 msgid "Import files" -msgstr "Dosyaları içeri aktar" +msgstr "Dosyaları içe aktar" #: querywindow.php:104 msgid "All" @@ -4628,7 +4624,7 @@ msgstr "Depolanan yordamların yürütülmesine izin verir." #: server_privileges.php:37 server_privileges.php:188 #: server_privileges.php:508 msgid "Allows importing data from and exporting data into files." -msgstr "Verinin içeri ve dışarı aktarılmasına izin verir." +msgstr "Verinin içe ve dışa aktarılmasına izin verir." #: server_privileges.php:38 server_privileges.php:539 msgid "" @@ -6313,8 +6309,8 @@ msgid "" "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " "import and export operations" msgstr "" -"İçeri ve dışarı aktarma işlemleri için [a@http://en.wikipedia.org/wiki/Bzip2]" -"bzip2[/a] sıkıştırma etkin" +"İçe ve dışa aktarma işlemleri için " +"[a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] sıkıştırma etkin" #: setup/lib/messages.inc.php:30 msgid "Bzip2" @@ -6384,7 +6380,7 @@ msgid "" "Compress gzip/bzip2 exports on the fly without the need for much memory; if " "you encounter problems with created gzip/bzip2 files disable this feature" msgstr "" -"Daha fazla belleğe gerek kalmadan gzip/bzip2 dışarı aktarmalarını anında " +"Daha fazla belleğe gerek kalmadan gzip/bzip2 dışa aktarmalarını anında " "sıkıştırır; eğer gzip/bzip2 dosyalarını oluşturmada sorunlarla " "karşılaşırsanız bu özelliği etkisizleştirin" @@ -6598,29 +6594,27 @@ msgstr "Düzenleme modu" #: setup/lib/messages.inc.php:101 msgid "Customize default export options" -msgstr "Varsayılan dışarı aktarma seçeneklerini özelleştirir" +msgstr "Varsayılan dışa aktarma seçeneklerini özelleştirir" #: setup/lib/messages.inc.php:102 msgid "Export defaults" -msgstr "Dışarı aktarma varsayılanları" +msgstr "Dışa aktarma varsayılanları" #: setup/lib/messages.inc.php:103 msgid "Customize default common import options" -msgstr "Varsayılan genel içeri aktarma seçeneklerini özelleştirir" +msgstr "Varsayılan genel içe aktarma seçeneklerini özelleştirir" #: setup/lib/messages.inc.php:104 msgid "Import defaults" -msgstr "İçeri aktarma varsayılanları" +msgstr "İçe aktarma varsayılanları" #: setup/lib/messages.inc.php:105 msgid "Set import and export directories and compression options" -msgstr "" -"İçeri aktarma ve dışarı aktarma dizinlerini ve sıkıştırma seçeneklerini " -"ayarlar" +msgstr "İçe ve dışa aktarma dizinlerini ve sıkıştırma seçeneklerini ayarlar" #: setup/lib/messages.inc.php:106 msgid "Import / export" -msgstr "İçeri Aktar / Dışarı Aktar" +msgstr "İçe Aktar / Dışa Aktar" #: setup/lib/messages.inc.php:108 msgid "Databases display options" @@ -6720,11 +6714,11 @@ msgstr "Özelleştirme" #: setup/lib/messages.inc.php:133 msgid "Customize export options" -msgstr "Dışarı aktarma seçeneklerini özelleştir" +msgstr "Dışa aktarma seçeneklerini özelleştir" #: setup/lib/messages.inc.php:135 msgid "Customize import defaults" -msgstr "İçeri aktarma varsayılanlarını özelleştir" +msgstr "İçe aktarma varsayılanlarını özelleştir" #: setup/lib/messages.inc.php:136 msgid "Customize navigation frame" @@ -6775,8 +6769,8 @@ msgid "" "Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import " "and export operations" msgstr "" -"İçeri ve dışarı aktarma işlemleri için [a@http://en.wikipedia.org/wiki/Gzip]" -"gzip[/a] sıkıştırma etkin" +"İçe ve dışa aktarma işlemleri için " +"[a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] sıkıştırma etkin" #: setup/lib/messages.inc.php:147 msgid "GZip" @@ -6818,13 +6812,13 @@ msgid "" "This might be good way to import large files, however it can break " "transactions." msgstr "" -"İçeri aktarmayı yarıda kesmeye izin verildiği takdirde betik, kapatma zaman " -"sınırını saptar. Bu büyük dosyaları içeri aktarmak için iyi bir yol " +"Betiğin zaman sınırına yaklaşıldığını algılaması durumunda içe aktarımı " +"kesmeye izin verir. Bu büyük dosyaları içe aktarmak için iyi bir yol " "olabilir, ancak bu işlemleri bozabilir." #: setup/lib/messages.inc.php:155 msgid "Partial import: allow interrupt" -msgstr "Kısmi içeri aktarma: yarıda kesmeye izin ver" +msgstr "Kısmi içe aktarma: yarıda kesmeye izin ver" #: setup/lib/messages.inc.php:156 msgid "" @@ -6836,7 +6830,7 @@ msgstr "" #: setup/lib/messages.inc.php:159 msgid "Partial import: skip queries" -msgstr "Kısmi içeri aktarma: sorguları atla" +msgstr "Kısmi içe aktarma: sorguları atla" #: setup/lib/messages.inc.php:160 msgid "Insecure connection" @@ -7160,7 +7154,7 @@ msgstr "Hatalı alanları varsayılan değerlerine döndürmeyi dene" #: setup/lib/messages.inc.php:233 msgid "Directory where exports can be saved on server" -msgstr "Dışarı aktarmaların sunucu üzerinde kaydedilebileceği dizin" +msgstr "Dışa aktarmaların sunucu üzerinde kaydedilebileceği dizin" #: setup/lib/messages.inc.php:234 msgid "Save directory" @@ -7783,8 +7777,7 @@ msgstr "IP İzin Verme/Reddetme için güvenilir proksi listesi" #: setup/lib/messages.inc.php:359 msgid "Directory on server where you can upload files for import" -msgstr "" -"İçeri aktarmak için dosyaları gönderebileceğiniz sunucu üzerindeki dizin" +msgstr "İçe aktarmak için dosyaları gönderebileceğiniz sunucu üzerindeki dizin" #: setup/lib/messages.inc.php:360 msgid "Upload directory" @@ -7863,8 +7856,8 @@ msgid "" "Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression " "for import and export operations" msgstr "" -"İçeri ve dışarı aktarma işlemleri için [a@http://en.wikipedia.org/wiki/ZIP_" -"(file_format)]ZIP[/a] sıkıştırma etkin" +"İçe ve dışa aktarma işlemleri için " +"[a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] sıkıştırma etkin" #: setup/lib/messages.inc.php:376 #, php-format @@ -8350,7 +8343,7 @@ msgstr "Eğer ihtiyacınız yoksa bu iki satırı yorum dışı bırakın." #: tbl_tracking.php:225 msgid "SQL statements exported. Please copy the dump or execute it." msgstr "" -"SQL ifadeleri dışarı aktarıldı. Lütfen yığını kopyalayın ya da çalıştırın." +"SQL ifadeleri dışa aktarıldı. Lütfen yığını kopyalayın ya da çalıştırın." #: tbl_tracking.php:245 tbl_tracking.php:373 msgid "Close" @@ -8406,7 +8399,7 @@ msgstr "SQL çalıştırma" #: tbl_tracking.php:515 #, php-format msgid "Export as %s" -msgstr "%s olarak dışarı aktar" +msgstr "%s olarak dışa aktar" #: tbl_tracking.php:555 msgid "Show versions" diff --git a/po/zh_CN.po b/po/zh_CN.po index 4c267087d..d0945f8e6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-08-06 08:03-0400\n" -"PO-Revision-Date: 2010-06-04 14:09+0200\n" +"PO-Revision-Date: 2010-08-10 08:13+0200\n" "Last-Translator: shanyan baishui \n" "Language-Team: chinese_simplified \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 #: libraries/display_tbl.lib.php:415 server_privileges.php:1510 @@ -101,7 +101,7 @@ msgstr "将文件写入磁盘失败。" #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" -msgstr "" +msgstr "打开远程 URL 失败" #: db_create.php:44 #, php-format @@ -249,10 +249,9 @@ msgid "and then" msgstr "然后" #: db_operations.php:379 -#, fuzzy #| msgid "Rename database to" msgid "Remove database" -msgstr "将数据库改名为" +msgstr "删除数据库" #: db_operations.php:391 #, php-format @@ -260,10 +259,9 @@ msgid "Database %s has been dropped." msgstr "已被删除数据库 %s 。" #: db_operations.php:396 -#, fuzzy #| msgid "Go to database" msgid "Drop the database (DROP)" -msgstr "转到数据库" +msgstr "删除数据库 (DROP)" #: db_operations.php:424 msgid "Copy database to" @@ -322,7 +320,7 @@ msgstr "整理" msgid "" "The phpMyAdmin configuration storage has been deactivated. To find out why " "click %shere%s." -msgstr "链接表的附加功能尚未激活。要查出原因，请点击%s此处%s。" +msgstr "phpMyAdmin 高级功能尚未激活。要查出原因，请点击%s此处%s。" #: db_operations.php:531 msgid "Edit PDF Pages" @@ -495,11 +493,11 @@ msgid "Search results for \"%s\" %s:" msgstr "“%s”的搜索结果 %s：" #: db_search.php:242 -#, fuzzy, php-format +#, php-format #| msgid "%s match(es) inside table %s" msgid "%s match inside table %s" msgid_plural "%s matches inside table %s" -msgstr[0] "%s 个匹配 - 于表 %s 中" +msgstr[0] "在表 %2$s 中找到 %1$s 个匹配" #: db_search.php:249 db_structure.php:75 db_structure.php:76 #: db_structure.php:88 db_structure.php:90 db_structure.php:101 @@ -518,7 +516,7 @@ msgid "Delete" msgstr "删除" #: db_search.php:267 -#, fuzzy, php-format +#, php-format #| msgid "Total: %s match(es)" msgid "Total: %s match" msgid_plural "Total: %s matches" @@ -545,7 +543,6 @@ msgid "Inside table(s):" msgstr "于以下表：" #: db_search.php:337 -#, fuzzy #| msgid "Inside field:" msgid "Inside column:" msgstr "包含字段：" @@ -994,7 +991,6 @@ msgid "Choose column to display" msgstr "选择要显示的字段" #: js/messages.php:66 -#, fuzzy #| msgid "Generate Password" msgid "Generate password" msgstr "生成密码" @@ -1553,17 +1549,15 @@ msgstr "正在认证..." #: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "PBMS 错误" #: libraries/blobstreaming.lib.php:267 -#, fuzzy -#| msgid "Page creation failed" msgid "PBMS connection failed:" -msgstr "页面创建失败" +msgstr "PBMS 连接失败：" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" -msgstr "" +msgstr "PBMS 获取 BLOB 信息失败：" #: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" @@ -1588,7 +1582,7 @@ msgstr "下载文件" #: libraries/blobstreaming.lib.php:421 #, php-format msgid "Could not open file: %s" -msgstr "" +msgstr "无法打开文件：%s" #: libraries/common.inc.php:567 msgid "" @@ -1677,10 +1671,9 @@ msgid "MySQL said: " msgstr "MySQL 返回：" #: libraries/common.lib.php:1129 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "Failed to connect to SQL validator!" -msgstr "无法连接到 MySQL 服务器" +msgstr "连接到 SQL 校验器失败！" #: libraries/common.lib.php:1167 setup/lib/messages.inc.php:350 msgid "Explain SQL" @@ -1820,7 +1813,7 @@ msgstr "操作" #: libraries/core.lib.php:265 libraries/dbg/setup.php:21 #, php-format msgid "The %s extension is missing. Please check your PHP configuration." -msgstr "" +msgstr "缺少 %s 扩展。请检查 PHP 配置。" #: libraries/db_events.inc.php:19 libraries/db_events.inc.php:21 #: libraries/export/sql.php:412 @@ -2535,17 +2528,16 @@ msgid "" msgstr "" #: libraries/engines/pbms.lib.php:51 -#, fuzzy #| msgid "Log file threshold" msgid "Temp Log Threshold" -msgstr "日志文件阈值" +msgstr "临时日志阈值" #: libraries/engines/pbms.lib.php:52 msgid "" "The maximum size of a temporary BLOB log file. You may use Kb, MB or GB to " "indicate the unit of the value. A value in bytes is assumed when no unit is " "specified." -msgstr "" +msgstr "一个临时 BLOB 日志文件的最大大小。可以使用 Kb、MB 或 GB 作为单位。若不写单位，默认为字节。" #: libraries/engines/pbms.lib.php:56 msgid "Max Keep Alive" @@ -2778,20 +2770,18 @@ msgid "Table structure for table" msgstr "表的结构" #: libraries/export/latex.php:13 -#, fuzzy #| msgid "Content of table __TABLE__" msgid "Content of table @TABLE@" -msgstr "__TABLE__ 表的内容" +msgstr "@TABLE@ 表的内容" #: libraries/export/latex.php:14 msgid "(continued)" msgstr "(延续的)" #: libraries/export/latex.php:15 -#, fuzzy #| msgid "Structure of table __TABLE__" msgid "Structure of table @TABLE@" -msgstr "__TABLE__ 表的结构" +msgstr "@TABLE@ 表的结构" #: libraries/export/latex.php:26 msgid "LaTeX" @@ -4163,16 +4153,14 @@ msgid "Create a page" msgstr "创建新页" #: pdf_pages.php:308 -#, fuzzy #| msgid "Page number:" msgid "Page name" -msgstr "页码：" +msgstr "页面名称" #: pdf_pages.php:312 -#, fuzzy #| msgid "Automatic layout" msgid "Automatic layout based on" -msgstr "自动排版" +msgstr "自动排版，基于" #: pdf_pages.php:314 msgid "Internal relations" @@ -4407,16 +4395,14 @@ msgid "Jump to database" msgstr "转到数据库" #: server_databases.php:264 -#, fuzzy #| msgid "Master replication" msgid "Not replicated" -msgstr "主复制" +msgstr "未复制" #: server_databases.php:270 -#, fuzzy #| msgid "Replication" msgid "Replicated" -msgstr "复制" +msgstr "已复制" #: server_databases.php:286 #, php-format @@ -6481,7 +6467,7 @@ msgid "" "in documentation" msgstr "" "配置 phpMyAdmin 数据库获得更多功能，参见文档[a@../Documentation.html#linked-" -"tables]链接表的附加功能[/a]。" +"tables]phpMyAdmin 高级功能[/a]" #: setup/lib/messages.inc.php:129 setup/lib/messages.inc.php:290 msgid "PMA database" @@ -7600,10 +7586,9 @@ msgid "Showing SQL query" msgstr "显示 SQL 查询" #: sql.php:516 -#, fuzzy #| msgid "Validate SQL" msgid "Validated SQL" -msgstr "校验 SQL" +msgstr "已校验的 SQL" #: sql.php:631 #, php-format @@ -7810,20 +7795,18 @@ msgid "Flush the table (FLUSH)" msgstr "刷新表 (FLUSH)" #: tbl_operations.php:642 -#, fuzzy #| msgid "Delete tracking data for this table" msgid "Delete data or table" -msgstr "删除追踪数据" +msgstr "删除数据或数据表" #: tbl_operations.php:657 msgid "Empty the table (TRUNCATE)" -msgstr "" +msgstr "清空数据表 (TRUNCATE)" #: tbl_operations.php:675 -#, fuzzy #| msgid "Go to database" msgid "Delete the table (DROP)" -msgstr "转到数据库" +msgstr "删除数据表 (DROP)" #: tbl_operations.php:696 msgid "Partition maintenance" @@ -7982,10 +7965,9 @@ msgid "Propose table structure" msgstr "规划表结构" #: tbl_structure.php:537 -#, fuzzy #| msgid "Add column(s)" msgid "Add column" -msgstr "增加字段" +msgstr "添加字段" #: tbl_structure.php:551 msgid "At End of Table" @@ -8189,182 +8171,3 @@ msgstr "视图名" #: view_operations.php:91 msgid "Rename view to" msgstr "将视图改名为" - -#, fuzzy -#~| msgid "Table name" -#~ msgid "Table removal" -#~ msgstr "数据表名" - -#~ msgid "BLOB Repository" -#~ msgstr "BLOB 容器" - -#~ msgctxt "BLOB repository" -#~ msgid "Enabled" -#~ msgstr "已启用" - -#~ msgid "Disable" -#~ msgstr "禁用" - -#~ msgid "Damaged" -#~ msgstr "已损坏" - -#~ msgctxt "BLOB repository" -#~ msgid "Repair" -#~ msgstr "修复" - -#~ msgctxt "BLOB repository" -#~ msgid "Disabled" -#~ msgstr "已禁用" - -#~ msgid "Enable" -#~ msgstr "启用" - -#~ msgid "" -#~ "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] " -#~ "extension. Please check your PHP configuration." -#~ msgstr "" -#~ "无法加载 [a@http://php.net/%1$s@Documentation][em]%1$s (外链，英语)[/em][/" -#~ "a] 扩展，请检查您的 PHP 配置。" - -#~ msgid "" -#~ "Couldn't load the iconv or recode extension needed for charset " -#~ "conversion. Either configure PHP to enable these extensions or disable " -#~ "charset conversion in phpMyAdmin." -#~ msgstr "" -#~ "无法加载 iconv 或可用于转换字符集所需的重编码扩展，请配置 PHP 启用这些扩展" -#~ "或在 phpMyAdmin 中禁用字符集转换功能。" - -#~ msgid "" -#~ "Couldn't use the iconv, libiconv, or recode_string functions, although " -#~ "the necessary extensions appear to be loaded. Check your PHP " -#~ "configuration." -#~ msgstr "" -#~ "虽然必须的扩展已经加载，但还是无法使用 iconv、libiconv 和 recode_string 函" -#~ "数。请检查您的 PHP 配置。" - -#~ msgid "Allow character set conversion" -#~ msgstr "允许转换字符集" - -#~ msgid "Default character set used for conversions" -#~ msgstr "转换时的默认字符集" - -#~ msgid "Default character set" -#~ msgstr "默认字符集" - -#~| msgid "Add new field" -#~ msgid "Add field" -#~ msgstr "添加字段" - -#~ msgid "Field" -#~ msgstr "字段" - -#~ msgid "Records" -#~ msgstr "记录数" - -#~ msgid "Fields terminated by" -#~ msgstr "字段分隔符" - -#~ msgid "Fields" -#~ msgstr "字段数" - -#~ msgid "Add %s field(s)" -#~ msgstr "添加 %s 个字段" - -#~ msgid "Field %s has been dropped" -#~ msgstr "已删除字段 %s " - -#~ msgid "See image/jpeg: inline" -#~ msgstr "参见 image/jpeg: inline" - -#~ msgid "zipped" -#~ msgstr "zip 压缩" - -#~ msgid "gzipped" -#~ msgstr "gzip 压缩" - -#~ msgid "bzipped" -#~ msgstr "bzip 压缩" - -#~ msgid "" -#~ "Add custom comment into header (\n" -#~ " splits lines)" -#~ msgstr "" -#~ "在文件头添加自定义注释 (\n" -#~ " 为换行)" - -#~ msgid "and" -#~ msgstr "和" - -#~ msgctxt "$strBLOBRepositoryDisabled" -#~ msgid "Disabled" -#~ msgstr "已禁用" - -#~ msgctxt "$strBLOBRepositoryEnabled" -#~ msgid "Enabled" -#~ msgstr "已启用" - -#~ msgctxt "$strBLOBRepositoryRepair" -#~ msgid "Repair" -#~ msgstr "修复" - -#~ msgid "Calendar" -#~ msgstr "日历" - -#~ msgid "MySQL 4.0 compatible" -#~ msgstr "兼容 MySQL 4.0" - -#~ msgid "Could not load default configuration from: \"%1$s\"" -#~ msgstr "无法加载默认配置: \"%1$s\"" - -#~ msgid "Create an index on %s columns" -#~ msgstr "在第 %s 个字段创建索引" - -#~ msgctxt "$strCreateTableShort" -#~ msgid "Create table" -#~ msgstr "新建数据表" - -#~ msgctxt "$strCreateUserDatabaseNone" -#~ msgid "None" -#~ msgstr "无" - -#~ msgid "Flush the table (\"FLUSH\")" -#~ msgstr "强制更新表 (\"FLUSH\")" - -#~ msgid "Invalid server index: \"%s\"" -#~ msgstr "无效的服务器索引：“%s”" - -#~ msgctxt "$strMIME_description" -#~ msgid "Description" -#~ msgstr "说明" - -#~ msgctxt "$strNoneDefault" -#~ msgid "None" -#~ msgstr "无" - -#~ msgid "Schema of the \"%s\" database - Page %s" -#~ msgstr "数据库“%s”的大纲 - 第 %s 页" - -#~ msgid "The \"%s\" table doesn't exist!" -#~ msgstr "表“%s”不存在！" - -#~ msgid "" -#~ "This MySQL server works as %s in replication process. For further " -#~ "information about replication status on the server, please visit the replication section." -#~ msgstr "" -#~ "此 MySQL 服务器运行于 %s 复制 进程。要获得更多关于此服务器的复制状" -#~ "态，请浏览 复制状态信息." - -#~ msgid "running on %s" -#~ msgstr "运行于 %s" - -#~ msgid "The scale factor is too small to fit the schema on one page" -#~ msgstr "比例因子太小，无法在一页中显示大纲" - -#~ msgid "" -#~ "Cannot start session without errors, please check errors given in your " -#~ "PHP and/or webserver log file and configure your PHP installation " -#~ "properly." -#~ msgstr "" -#~ "无法在发生错误时创建会话，请检查 PHP 或网站服务器日志，并正确配置 PHP 安" -#~ "装。" diff --git a/sql.php b/sql.php index 2971cd912..54b36b4c0 100755 --- a/sql.php +++ b/sql.php @@ -684,8 +684,12 @@ if (0 == $num_rows || $is_affected) { $goto = PMA_securePath($goto); // Checks for a valid target script $is_db = $is_table = false; - + if (isset($_REQUEST['purge'])) { + $table = ''; + unset($url_params['table']); + } include 'libraries/db_table_exists.lib.php'; + if (strpos($goto, 'tbl_') === 0 && ! $is_table) { if (strlen($table)) { $table = ''; diff --git a/tbl_operations.php b/tbl_operations.php index e2de481cb..666f6f331 100755 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -668,7 +668,9 @@ if (! (isset($db_is_information_schema) && $db_is_information_schema)) { 'reload' => '1', 'purge' => '1', 'zero_rows' => sprintf(($tbl_is_view ? __('View %s has been dropped') : __('Table %s has been dropped')), htmlspecialchars($table)), - 'table' => NULL, + // table name is needed to avoid running + // PMA_relationsCleanupDatabase() on the whole db later + 'table' => $GLOBALS['table'], )); ?>