Merge branch 'MAINT_3_4_0' into QA_3_4

Conflicts:
	ChangeLog

ChangeLog

@@ -122,6 +122,7 @@
 - bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character.
 + rfe #3111455 [interface] Column highlighting and marking in table view
 + Visual query builder
+- bug #3115519 [interface] Prevent long queries from being shown in confirmation popup
 - patch #3112792 [navi] Left panel table grouping incorrect,
   thanks to garas - garas
 

db_search.php

@@ -257,7 +257,7 @@ if (isset($_REQUEST['submit_search'])) {
             $this_url_params['sql_query'] = $newsearchsqls['delete'];
             echo '<td>' . PMA_linkOrButton(
                     'sql.php' . PMA_generate_common_url($this_url_params),
-                    __('Delete'), $newsearchsqls['delete']) .  "</td>\n";
+                    __('Delete'), sprintf(__('Delete the matches for the %s table?'), htmlspecialchars($each_table))) .  "</td>\n";
 
         } else {
             echo '<td>&nbsp;</td>' . "\n"

js/functions.js

@@ -80,7 +80,7 @@ function selectContent( element, lock, only_once ) {
 }
 
 /**
- * Displays an confirmation box before to submit a "DROP DATABASE" query.
+ * Displays a confirmation box before submitting a "DROP DATABASE" query.
  * This function is called while clicking links
  *
  * @param   object   the link
@@ -105,7 +105,7 @@ function confirmLinkDropDB(theLink, theSqlQuery)
 } // end of the 'confirmLinkDropDB()' function
 
 /**
- * Displays an confirmation box before to submit a "DROP/DELETE/ALTER" query.
+ * Displays a confirmation box before to submit a "DROP/DELETE/ALTER" query.
  * This function is called while clicking links
  *
  * @param   object   the link
@@ -135,7 +135,7 @@ function confirmLink(theLink, theSqlQuery)
 
 
 /**
- * Displays an confirmation box before doing some action
+ * Displays a confirmation box before doing some action
  *
  * @param   object   the message to display
  *
@@ -540,7 +540,6 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem
  * @param   img_obj   the image object whose source needs to be changed
  *
  */
-
 function change_Image(img_obj)
 {
      var relative_path = (img_obj.src).split("themes/");
@@ -571,7 +570,6 @@ function change_Image(img_obj)
  * @param   token   the token generated for each PMA form
  *
  */
-
 function ApplySelectedChanges(token)
 {
     var div =  document.getElementById("list");
@@ -604,8 +602,8 @@ function ApplySelectedChanges(token)
 }
 
 /**
-* Displays error message if any text field
+* Displays an error message if any text field
-* is left empty other than port field.
+* is left empty other than the port field.
 *
 * @param  string   the form name
 * @param  object   the form
@@ -650,8 +648,8 @@ function validateConnection(form_name, form_obj)
 }
 
 /**
- * Check if a form's element is empty
+ * Check if a form's element is empty.
- * should be
+ * An element containing only spaces is also considered empty
  *
  * @param   object   the form
  * @param   string   the name of the form field to put the focus on
@@ -677,6 +675,7 @@ function emptyCheckTheField(theForm, theFieldName)
 
 
 /**
+ * Check whether a form field is empty or not
  *
  * @param   object   the form
  * @param   string   the name of the form field to put the focus on

po/fr.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-11-20 07:34-0500\n"
-"PO-Revision-Date: 2010-11-23 19:43+0200\n"
+"PO-Revision-Date: 2010-11-26 19:23+0200\n"
 "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
 "Language-Team: french <fr@li.org>\n"
 "Language: fr\n"
@@ -359,7 +359,7 @@ msgstr "Table"
 #: tbl_printview.php:391 tbl_structure.php:388 tbl_structure.php:475
 #: tbl_structure.php:869
 msgid "Rows"
-msgstr "Enregistrements"
+msgstr "Lignes"
 
 #: db_printview.php:107 libraries/db_structure.lib.php:58 tbl_indexes.php:188
 msgid "Size"
@@ -610,7 +610,7 @@ msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation%"
 "s."
 msgstr ""
-"Cette vue contient au moins ce nombre d'enregistrements. Veuillez référer à %"
+"Cette vue contient au moins ce nombre de lignes. Veuillez référer à %"
 "sdocumentation%s."
 
 #: db_structure.php:386 db_structure.php:400 libraries/header.inc.php:138
@@ -1494,22 +1494,22 @@ msgstr "Erreur"
 #, php-format
 msgid "%1$d row affected."
 msgid_plural "%1$d rows affected."
-msgstr[0] "%1$d enregistrement affecté."
+msgstr[0] "%1$d ligne affectée."
-msgstr[1] "%1$d enregistrements affectés."
+msgstr[1] "%1$d lignes affectées."
 
 #: libraries/Message.class.php:300
 #, php-format
 msgid "%1$d row deleted."
 msgid_plural "%1$d rows deleted."
-msgstr[0] "%1$d enregistrement supprimé."
+msgstr[0] "%1$d ligne supprimée."
-msgstr[1] "%1$d enregistrements supprimés."
+msgstr[1] "%1$d lignes supprimées."
 
 #: libraries/Message.class.php:319
 #, php-format
 msgid "%1$d row inserted."
 msgid_plural "%1$d rows inserted."
-msgstr[0] "%1$d enregistrement inséré."
+msgstr[0] "%1$d ligne insérée."
-msgstr[1] "%1$d enregistrements insérés."
+msgstr[1] "%1$d lignes insérées."
 
 #: libraries/StorageEngine.class.php:194
 msgid ""
@@ -2274,11 +2274,11 @@ msgstr "Utilisé quand on clique sur une ligne"
 
 #: libraries/config/messages.inc.php:25
 msgid "Row marker"
-msgstr "Activer le marqueur d'enregistrements"
+msgstr "Activer le marqueur de lignes"
 
 #: libraries/config/messages.inc.php:26
 msgid "Highlight row pointed by the mouse cursor"
-msgstr "Mettre en surbrillance l'enregistrement sur lequel pointe la souris"
+msgstr "Mettre en surbrillance la ligne sur laquelle pointe la souris"
 
 #: libraries/config/messages.inc.php:27
 msgid "Highlight pointer"
@@ -3093,11 +3093,11 @@ msgstr "Valeur initiale des zones de glissement"
 
 #: libraries/config/messages.inc.php:260
 msgid "How many rows can be inserted at one time"
-msgstr "Le nombre d'enregistrements qui peuvent être insérés à la fois."
+msgstr "Le nombre de lignes qui peuvent être insérées à la fois."
 
 #: libraries/config/messages.inc.php:261
 msgid "Number of inserted rows"
-msgstr "Nombre d'enregistrements à insérer"
+msgstr "Nombre de lignes à insérer"
 
 #: libraries/config/messages.inc.php:262
 msgid "Target for quick access icon"
@@ -3307,7 +3307,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:304
 msgid "Maximum number of rows to display"
-msgstr "Nombre maximum d'enregistrements à afficher"
+msgstr "Nombre maximum de lignes à afficher"
 
 #: libraries/config/messages.inc.php:306
 msgid "Maximum number of tables displayed in table list"
@@ -3946,7 +3946,7 @@ msgstr "Devrait-on afficher un bouton «Tout afficher»"
 
 #: libraries/config/messages.inc.php:436
 msgid "Allow to display all the rows"
-msgstr "Permettre l'affichage de tous les enregistrements"
+msgstr "Permettre l'affichage de toutes les lignes"
 
 #: libraries/config/messages.inc.php:437
 msgid ""
@@ -4219,7 +4219,7 @@ msgid ""
 "libraries/import.lib.php for defaults on how many queries a statement may "
 "contain."
 msgstr ""
-"Montre le nombre d'enregistrements affectés par chaque énoncé. Voir "
+"Montre le nombre de lignes affectées par chaque énoncé. Voir "
 "libraries/import.lib.php pour le nombre d'énoncés qu'une requête peut "
 "comporter."
 
@@ -4518,7 +4518,7 @@ msgstr "Ligne de début:"
 
 #: libraries/display_export.lib.php:173
 msgid "Dump all rows"
-msgstr "Exporter tous les enregistrements"
+msgstr "Exporter toutes les lignes"
 
 #: libraries/display_export.lib.php:181 libraries/display_export.lib.php:202
 msgid "Output:"
@@ -4696,7 +4696,7 @@ msgstr "Langue"
 #: libraries/display_tbl.lib.php:302
 #, php-format
 msgid "%d is not valid row number."
-msgstr "%d n'est pas un numéro d'enregistrement valable."
+msgstr "%d n'est pas un numéro de ligne valable."
 
 #: libraries/display_tbl.lib.php:308
 msgid "row(s) starting from row #"
@@ -4777,7 +4777,7 @@ msgstr "Transformation"
 
 #: libraries/display_tbl.lib.php:1170 libraries/display_tbl.lib.php:1182
 msgid "The row has been deleted"
-msgstr "L'enregistrement a été effacé"
+msgstr "La ligne a été effacée"
 
 #: libraries/display_tbl.lib.php:1209 libraries/display_tbl.lib.php:2052
 #: server_processlist.php:70 tbl_row_action.php:63
@@ -4790,7 +4790,7 @@ msgstr "dans la requête"
 
 #: libraries/display_tbl.lib.php:1948
 msgid "Showing rows"
-msgstr "Affichage des enregistrements"
+msgstr "Affichage des lignes"
 
 #: libraries/display_tbl.lib.php:1958
 msgid "total"
@@ -5574,7 +5574,7 @@ msgstr "Généré par"
 #: libraries/import.lib.php:153 sql.php:593 tbl_change.php:176
 #: tbl_get_field.php:34
 msgid "MySQL returned an empty result set (i.e. zero rows)."
-msgstr "MySQL n'a retourné aucun enregistrement."
+msgstr "MySQL a retourné un résultat vide (aucune ligne)."
 
 #: libraries/import.lib.php:1141
 msgid ""
@@ -6913,7 +6913,7 @@ msgstr ""
 
 #: navigation.php:60 navigation.php:61 navigation.php:64
 msgid "Reload navigation frame"
-msgstr "Recharger le cadre de navigation"
+msgstr "Actualiser"
 
 #: navigation.php:203 server_databases.php:270 server_synchronize.php:1189
 msgid "No databases"
@@ -7979,8 +7979,8 @@ msgid ""
 "The number of rows written with INSERT DELAYED for which some error occurred "
 "(probably duplicate key)."
 msgstr ""
-"Le nombre d'enregistrements écrits avec INSERT DELAYED pour lesquels une "
+"Le nombre de lignes écrites avec INSERT DELAYED pour lesquels une erreur est "
-"erreur est survenue (probablement un doublon sur la clé)."
+"survenue (probablement un doublon sur la clé)."
 
 #: server_status.php:52
 msgid ""
@@ -7992,7 +7992,7 @@ msgstr ""
 
 #: server_status.php:53
 msgid "The number of INSERT DELAYED rows written."
-msgstr "Le nombre d'enregistrements écrits via INSERT DELAYED."
+msgstr "Le nombre de lignes écrites via INSERT DELAYED."
 
 #: server_status.php:54
 msgid "The number of executed FLUSH statements."
@@ -8004,7 +8004,7 @@ msgstr "Le nombre de commandes COMMIT internes."
 
 #: server_status.php:56
 msgid "The number of times a row was deleted from a table."
-msgstr "Le nombre de fois qu'un enregistrement a été supprimé d'une table."
+msgstr "Le nombre de fois qu'une ligne a été supprimée d'une table."
 
 #: server_status.php:57
 msgid ""
@@ -8032,8 +8032,8 @@ msgid ""
 "The number of requests to read a row based on a key. If this is high, it is "
 "a good indication that your queries and tables are properly indexed."
 msgstr ""
-"Le nombre de requêtes pour lire un enregistrement via une clé. Si élevé, "
+"Le nombre de requêtes pour lire une ligne via une clé. Si élevé, c'est une "
-"c'est une bonne indication que vos tables sont correctement indexées."
+"bonne indication que vos tables sont correctement indexées."
 
 #: server_status.php:60
 msgid ""
@@ -8041,17 +8041,17 @@ msgid ""
 "incremented if you are querying an index column with a range constraint or "
 "if you are doing an index scan."
 msgstr ""
-"Le nombre de requêtes de lecture du prochain enregistrement, en ordre de "
+"Le nombre de requêtes de lecture de la prochaine ligne, en ordre de clé. "
-"clé. Ceci est augmenté si vous interrogez une colonne indexée avec un "
+"Ceci est augmenté si vous interrogez une colonne indexée avec un critère de "
-"critère de fourchette ou si vous parcourez l'index."
+"fourchette ou si vous parcourez l'index."
 
 #: server_status.php:61
 msgid ""
 "The number of requests to read the previous row in key order. This read "
 "method is mainly used to optimize ORDER BY ... DESC."
 msgstr ""
-"Le nombre de requêtes de lecture de l'enregistrement précédent, en ordre de "
+"Le nombre de requêtes de lecture de la ligne précédente, en ordre de clé. "
-"clé. Utilisé surtout pour optimiser ORDER BY ... DESC."
+"Utilisé surtout pour optimiser ORDER BY ... DESC."
 
 #: server_status.php:62
 msgid ""
@@ -8060,11 +8060,11 @@ msgid ""
 "probably have a lot of queries that require MySQL to scan whole tables or "
 "you have joins that don't use keys properly."
 msgstr ""
-"Le nombre de requêtes de lecture d'un enregistrement basée sur une position "
+"Le nombre de requêtes de lecture d'une ligne basée sur une position fixe. Ce "
-"fixe. Ce nombre est élevé si vous faites de nombreuses requêtes qui "
+"nombre est élevé si vous faites de nombreuses requêtes qui nécessitent de "
-"nécessitent de trier les résultats. Vous avez probablement un grand nombre "
+"trier les résultats. Vous avez probablement un grand nombre de requêtes qui "
-"de requêtes qui demandent à MySQL de parcourir des tables en entier, ou vous "
+"demandent à MySQL de parcourir des tables en entier, ou vous avez des "
-"avez des jointures qui n'utilisent pas correctement les clés."
+"jointures qui n'utilisent pas correctement les clés."
 
 #: server_status.php:63
 msgid ""
@@ -8073,9 +8073,9 @@ msgid ""
 "tables are not properly indexed or that your queries are not written to take "
 "advantage of the indexes you have."
 msgstr ""
-"Le nombre de requêtes de lecture du prochaine enregistrement dans le "
+"Le nombre de requêtes de lecture de la prochaine ligne dans le fichier. "
-"fichier. Élevé si vous faites plusieurs parcours de tables. Ceci suggère que "
+"Élevé si vous faites plusieurs parcours de tables. Ceci suggère que vos "
-"vos tables ne sont pas correctement indexées ou que vos requêtes ne sont pas "
+"tables ne sont pas correctement indexées ou que vos requêtes ne sont pas "
 "écrites de façon à tirer parti des index que vous avez définis."
 
 #: server_status.php:64
@@ -8084,11 +8084,11 @@ msgstr "Le nombre d'énoncés ROLLBACK internes."
 
 #: server_status.php:65
 msgid "The number of requests to update a row in a table."
-msgstr "Le nombre de requêtes de mise à jour d'enregistrements."
+msgstr "Le nombre de requêtes de mise à jour de lignes dans une table."
 
 #: server_status.php:66
 msgid "The number of requests to insert a row in a table."
-msgstr "Le nombre de requêtes d'insertion d'enregistrements."
+msgstr "Le nombre de requêtes d'insertion de lignes dans une table."
 
 #: server_status.php:67
 msgid "The number of pages containing data (dirty or clean)."
@@ -8294,19 +8294,19 @@ msgstr "Le nombre de fois qu'on a dû attendre pour un verrou."
 
 #: server_status.php:106
 msgid "The number of rows deleted from InnoDB tables."
-msgstr "Le nombre d'enregistrements supprimés des tables InnoDB."
+msgstr "Le nombre de lignes supprimées des tables InnoDB."
 
 #: server_status.php:107
 msgid "The number of rows inserted in InnoDB tables."
-msgstr "Le nombre d'enregistrements insérés dans des tables InnoDB."
+msgstr "Le nombre de lignes insérées dans des tables InnoDB."
 
 #: server_status.php:108
 msgid "The number of rows read from InnoDB tables."
-msgstr "Le nombre d'enregistrements lus dans des tables InnoDB."
+msgstr "Le nombre de lignes lues dans des tables InnoDB."
 
 #: server_status.php:109
 msgid "The number of rows updated in InnoDB tables."
-msgstr "Le nombre d'enregistrements mis à jour dans des tables InnoDB."
+msgstr "Le nombre de lignes mises à jour dans des tables InnoDB."
 
 #: server_status.php:110
 msgid ""
@@ -8372,7 +8372,7 @@ msgstr ""
 
 #: server_status.php:118
 msgid "The number of rows waiting to be written in INSERT DELAYED queues."
-msgstr "Le nombre d'enregistrements en attente d'écriture (INSERT DELAYED)."
+msgstr "Le nombre de lignes en attente d'écriture (INSERT DELAYED)."
 
 #: server_status.php:119
 msgid ""
@@ -8467,8 +8467,8 @@ msgid ""
 "(If this is not 0, you should carefully check the indexes of your tables.)"
 msgstr ""
 "Le nombre de jointures sans clés qui vérifient l'utilisation de clé à chaque "
-"enregistrement. (Si ceci est supérieur à 0, vérifiez soigneusement les "
+"ligne. (Si ceci est supérieur à 0, vérifiez soigneusement les indexes de "
-"indexes de vos tables.)"
+"vos tables.)"
 
 #: server_status.php:136
 msgid ""
@@ -8532,7 +8532,7 @@ msgstr "Le nombre de tri effectués avec des plages."
 
 #: server_status.php:145
 msgid "The number of sorted rows."
-msgstr "Le nombre d'enregistrements triés."
+msgstr "Le nombre de lignes triées."
 
 #: server_status.php:146
 msgid "The number of sorts that were done by scanning the table."
@@ -8818,15 +8818,15 @@ msgstr "Appliquer des index"
 
 #: server_synchronize.php:433 server_synchronize.php:876
 msgid "Update row(s)"
-msgstr "Modifier des enregistrements"
+msgstr "Modifier des lignes"
 
 #: server_synchronize.php:434 server_synchronize.php:877
 msgid "Insert row(s)"
-msgstr "Insérer des enregistrements"
+msgstr "Insérer des lignes"
 
 #: server_synchronize.php:444 server_synchronize.php:888
 msgid "Would you like to delete all the previous rows from target tables?"
-msgstr "Voulez-vous supprimer tous les enregistrements des tables cible ?"
+msgstr "Voulez-vous supprimer toutes les lignes des tables cible ?"
 
 #: server_synchronize.php:447 server_synchronize.php:892
 msgid "Apply Selected Changes"
@@ -9212,7 +9212,7 @@ msgstr ""
 #: sql.php:569 tbl_replace.php:380
 #, php-format
 msgid "Inserted row id: %1$d"
-msgstr "Identifiant de l'enregistrement inséré : %1$d"
+msgstr "Identifiant de la ligne insérée : %1$d"
 
 #: sql.php:586
 msgid "Showing as PHP code"
@@ -9269,11 +9269,11 @@ msgstr "Télécharger vers le dépôt BLOB"
 
 #: tbl_change.php:1033
 msgid "Insert as new row"
-msgstr "Sauvegarder un nouvel enregistrement"
+msgstr "Sauvegarder une nouvelle ligne"
 
 #: tbl_change.php:1034
 msgid "Insert as new row and ignore errors"
-msgstr "Sauvegarder un nouvel enregistrement (ignorer les erreurs)"
+msgstr "Sauvegarder une nouvelle ligne en ignorant les erreurs"
 
 #: tbl_change.php:1035
 msgid "Show insert query"
@@ -9289,7 +9289,7 @@ msgstr "Retourner à la page précédente"
 
 #: tbl_change.php:1051
 msgid "Insert another new row"
-msgstr "Insérer un nouvel enregistrement"
+msgstr "Insérer une nouvelle ligne"
 
 #: tbl_change.php:1055
 msgid "Go back to this page"
@@ -9297,7 +9297,7 @@ msgstr "Demeurer sur cette page"
 
 #: tbl_change.php:1063
 msgid "Edit next row"
-msgstr "Modifier l'enregistrement suivant"
+msgstr "Modifier la ligne suivante"
 
 #: tbl_change.php:1074
 msgid ""
@@ -9647,7 +9647,7 @@ msgstr "Contrainte de clé étrangère"
 
 #: tbl_row_action.php:28
 msgid "No rows selected"
-msgstr "Aucun enregistrement n'a été sélectionné"
+msgstr "Aucune ligne n'a été sélectionnée"
 
 #: tbl_select.php:129
 msgid "Do a \"query by example\" (wildcard: \"%\")"
@@ -9663,7 +9663,7 @@ msgstr "Critères de recherche (pour l'énoncé «where») :"
 
 #: tbl_select.php:291
 msgid "Number of rows per page"
-msgstr "Nombre d'enregistrements par page"
+msgstr "Nombre de lignes par page"
 
 #: tbl_select.php:297
 msgid "Display order:"

po/lt.po

@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-11-20 07:34-0500\n"
-"PO-Revision-Date: 2010-11-25 21:33+0200\n"
+"PO-Revision-Date: 2010-11-27 22:17+0200\n"
-"Last-Translator:  <edgaras.janusauskas@gmail.com>\n"
+"Last-Translator: Rytis Slatkevičius <rytis.s@gmail.com>\n"
 "Language-Team: lithuanian <lt@li.org>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
@@ -410,7 +410,7 @@ msgstr "Pasirinkite bent vieną stulpelį išvedimui"
 
 #: db_qbe.php:182
 msgid "Switch to"
-msgstr ""
+msgstr "Pereiti į"
 
 #: db_qbe.php:186
 msgid "visual builder"
@@ -1608,6 +1608,7 @@ msgstr ""
 "skriptu%2$s, kad sukurtumėte failą."
 
 #: libraries/auth/config.auth.lib.php:115
+#, fuzzy
 msgid ""
 "phpMyAdmin tried to connect to the MySQL server, and the server rejected the "
 "connection. You should check the host, username and password in your "
@@ -2560,10 +2561,9 @@ msgid "Table caption"
 msgstr "Lentelės antraštė"
 
 #: libraries/config/messages.inc.php:92 libraries/config/messages.inc.php:98
-#, fuzzy
 #| msgid "Include table caption"
 msgid "Continued table caption"
-msgstr "Įterpti lentelės antraštę"
+msgstr "Pratęsta lentelės antraštė"
 
 #: libraries/config/messages.inc.php:93 libraries/config/messages.inc.php:99
 #: libraries/export/latex.php:53 libraries/export/latex.php:77
@@ -2600,7 +2600,7 @@ msgstr "Atsiminti failo vardo šabloną"
 
 #: libraries/config/messages.inc.php:116
 msgid "Enclose table and column names with backquotes"
-msgstr ""
+msgstr "Įdėti lentelių ir laukų pavadinimus į kabutes"
 
 #: libraries/config/messages.inc.php:117 libraries/config/messages.inc.php:255
 #: libraries/display_export.lib.php:351
@@ -2727,7 +2727,7 @@ msgstr "Galimybės"
 
 #: libraries/config/messages.inc.php:163
 msgid "General"
-msgstr "Bendrinis"
+msgstr "Bendra"
 
 #: libraries/config/messages.inc.php:164
 msgid "Set some commonly used options"
@@ -2807,10 +2807,9 @@ msgid "Settings that didn't fit enywhere else"
 msgstr "Kiti nustatymai"
 
 #: libraries/config/messages.inc.php:187
-#, fuzzy
 #| msgid "Page number:"
 msgid "Page titles"
-msgstr "Puslapis:"
+msgstr "Puslapių pavadinimai"
 
 #: libraries/config/messages.inc.php:188
 msgid ""
@@ -2818,6 +2817,9 @@ msgid ""
 "html#cfg_TitleTable]documentation[/a] for magic strings that can be used to "
 "get special values."
 msgstr ""
+"Nurodykite naršyklės pavadinimo juostos tekstą. Pasinaudokite "
+"[a@Documentation.html#cfg_TitleTable]dokumentacija[/a] magiškiesiems "
+"tekstams, kurie bus paversti specialiomis reikšmėmis."
 
 #: libraries/config/messages.inc.php:189
 #: libraries/navigation_header.inc.php:83
@@ -2886,13 +2888,15 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:201
 msgid "Changes tracking"
-msgstr ""
+msgstr "Pakeitimų sekimas"
 
 #: libraries/config/messages.inc.php:202
 msgid ""
 "Tracking of changes made in database. Requires the phpMyAdmin configuration "
 "storage."
 msgstr ""
+"Sekti duomenų bazėje atliktus pakeitimus. Reikia phpMyAdmin nustatymų "
+"saugyklos."
 
 #: libraries/config/messages.inc.php:203
 msgid "Customize export options"
@@ -3021,7 +3025,7 @@ msgstr "Dalinis importas: leisti pertrauktis"
 #: libraries/config/messages.inc.php:238 libraries/config/messages.inc.php:245
 #: libraries/import/csv.php:26 libraries/import/ldi.php:39
 msgid "Do not abort on INSERT error"
-msgstr ""
+msgstr "Nenutraukti įvykus INSERT klaidai"
 
 #: libraries/config/messages.inc.php:239 libraries/config/messages.inc.php:247
 #: libraries/import/csv.php:25 libraries/import/ldi.php:38
@@ -3111,10 +3115,9 @@ msgid "Display servers selection"
 msgstr "Rodyti serverių pasirinkimą"
 
 #: libraries/config/messages.inc.php:267
-#, fuzzy
 #| msgid "Display databases in a tree"
 msgid "Display table filter"
-msgstr "Rodyti duombazes medyje"
+msgstr "Rodyti lentelių filtrą"
 
 #: libraries/config/messages.inc.php:268
 msgid "String that separates databases into different tree levels"
@@ -3192,12 +3195,10 @@ msgid "Light tabs"
 msgstr "Lengvos kortelės"
 
 #: libraries/config/messages.inc.php:285
-#, fuzzy
 #| msgid "Maximum number of characters used when a SQL query is displayed"
 msgid ""
 "Maximum number of characters shown in any non-numeric column on browse view"
-msgstr ""
+msgstr "Didžiausias rodomas simbolių kiekis ne skaitiniuose stulpeliuose"
-"Didžiausias leistinas simbolių kiekis naudojamas SQL užklausai parodyti"
 
 #: libraries/config/messages.inc.php:286
 msgid "Limit column characters"
@@ -3253,10 +3254,9 @@ msgid "Login cookie validity"
 msgstr "Prisijungimo slapuko galiojimas"
 
 #: libraries/config/messages.inc.php:295
-#, fuzzy
 #| msgid "Double size of textarea for LONGTEXT fields"
 msgid "Double size of textarea for LONGTEXT columns"
-msgstr "Padvigubinti dydį LONGTEXT'o textarea laukelių"
+msgstr "Padvigubinti LONGTEXT laukelių dydį"
 
 #: libraries/config/messages.inc.php:296
 msgid "Bigger textarea for LONGTEXT"
@@ -3392,6 +3392,9 @@ msgid ""
 "Structure page if any of the required tables for the phpMyAdmin "
 "configuration storage could not be found"
 msgstr ""
+"Išjungti standartinį perspėjimą kuris rodomas duomenų bazės struktūros "
+"puslapyje, kai neįmanoma rasti phpMyAdmin nustatytų saugyklai reikalingų "
+"lentelių"
 
 #: libraries/config/messages.inc.php:325
 msgid "Missing phpMyAdmin configuration storage tables"
@@ -3410,7 +3413,6 @@ msgid "Protect binary columns"
 msgstr "Apsaugoti dvejetainius stulpelius"
 
 #: libraries/config/messages.inc.php:330
-#, fuzzy
 #| msgid ""
 #| "Enable if you want DB-based query history (requires pmadb). If disabled, "
 #| "this utilizes JS-routines to display query history (lost by window close)."
@@ -3419,9 +3421,9 @@ msgid ""
 "storage). If disabled, this utilizes JS-routines to display query history "
 "(lost by window close)."
 msgstr ""
-"Įjungti jeigu norite DB-paremtą užklausų istoriją (reikalauja pmadb). Jeigu "
+"Įjunkite, jeigu norite naudoti duomenų baze paremtą užklausų istoriją "
-"išjungta, naudoja JS-programas rodyti užklausų istoriją (prarandamos "
+"(reikalinga phpMyAdmin nustatymų saugykla). Jeigu išjungta, naudoja "
-"uždarius langą)."
+"JavaScript užklausų istorijai rodyti (prarandama uždarius langą)."
 
 #: libraries/config/messages.inc.php:331
 msgid "Permanent query history"
@@ -3542,7 +3544,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:361 setup/frames/index.inc.php:114
 msgid "Authentication type"
-msgstr ""
+msgstr "Autentifikacijos tipas"
 
 #: libraries/config/messages.inc.php:362
 msgid ""
@@ -3565,14 +3567,12 @@ msgid "Column information table"
 msgstr ""
 
 #: libraries/config/messages.inc.php:366
-#, fuzzy
 msgid "Compress connection to MySQL server"
-msgstr "Nepavyko prisijungti prie MySQL serverio"
+msgstr "Naudoti suspaudimą jungiantis prie MySQL serverio"
 
 #: libraries/config/messages.inc.php:367
-#, fuzzy
 msgid "Compress connection"
-msgstr "Naudoti SSL susijungimą"
+msgstr "Naudoti suspaustą susijungimą"
 
 #: libraries/config/messages.inc.php:368
 msgid "How to connect to server, keep [kbd]tcp[/kbd] if unsure"
@@ -3637,7 +3637,7 @@ msgstr "Naudoti PHP išplėtimą"
 
 #: libraries/config/messages.inc.php:381
 msgid "Hide databases matching regular expression (PCRE)"
-msgstr ""
+msgstr "Slėpti duomenų bazės, atitinkančias standartines išraiškas (PCRE)"
 
 #: libraries/config/messages.inc.php:382
 msgid "Hide databases"
@@ -3648,14 +3648,16 @@ msgid ""
 "Leave blank for no SQL query history support, suggested: [kbd]pma_history[/"
 "kbd]"
 msgstr ""
+"Palikite tuščią, jei nenorite SQL užklausų žurnalo, siūlome: "
+"[kbd]pma_history[/kbd]"
 
 #: libraries/config/messages.inc.php:384
 msgid "SQL query history table"
-msgstr "SQL užklausų istorijos lentelė"
+msgstr "SQL užklausų žurnalo lentelė"
 
 #: libraries/config/messages.inc.php:385
 msgid "Hostname where MySQL server is running"
-msgstr ""
+msgstr "Kompiuterio, kuriame veikia MySQL serveris, pavadinimas"
 
 #: libraries/config/messages.inc.php:386
 msgid "Server hostname"
@@ -3681,14 +3683,20 @@ msgid ""
 "their names in order and use [kbd]*[/kbd] at the end to show the rest in "
 "alphabetical order."
 msgstr ""
+"Jūs galite naudoti MySQL pakaitos simbolius (% ir _), naudokite \\, jei "
+"norite juos naudoti, tokius kokie yra, pvz. naudokite [kbd]'mano\\_db'[/kbd], "
+"bet ne [kbd]'mano_db'[/kbd]. Naudodami šį nustatymą, jis taip pat galite "
+"surikiuoti duomenų bazių sąrašą, tiesiog nurodykite jas norima tvarka ir "
+"pabaigoje nurodykite [kbd]*[/kbd], kad parodytumėte likusias abėcėlės "
+"tvarka."
 
 #: libraries/config/messages.inc.php:391
 msgid "Show only listed databases"
-msgstr ""
+msgstr "Rodyti tik šias duomenų bazes"
 
 #: libraries/config/messages.inc.php:392 libraries/config/messages.inc.php:429
 msgid "Leave empty if not using config auth"
-msgstr ""
+msgstr "Palikite tuščią, jei nenaudojate autentifikacijos pagal nustatymus"
 
 #: libraries/config/messages.inc.php:393
 msgid "Password for config auth"
@@ -3711,10 +3719,9 @@ msgid ""
 msgstr ""
 
 #: libraries/config/messages.inc.php:397
-#, fuzzy
 #| msgid "database name"
 msgid "Database name"
-msgstr "duomenų bazės vardas"
+msgstr "Duomenų bazės vardas"
 
 #: libraries/config/messages.inc.php:398
 msgid "Port on which MySQL server is listening, leave empty for default"
@@ -3747,6 +3754,9 @@ msgid ""
 "See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types"
 "[/a] for an example"
 msgstr ""
+"Žiūrėkite "
+"[a@http://wiki.phpmyadmin.net/pma/auth_types#signon]autentifikacijos "
+"tipus[/a] dėl pavyzdžių"
 
 #: libraries/config/messages.inc.php:405
 msgid "Signon session name"
@@ -3758,7 +3768,7 @@ msgstr "Prisijungimo adresas"
 
 #: libraries/config/messages.inc.php:407
 msgid "Socket on which MySQL server is listening, leave empty for default"
-msgstr ""
+msgstr "Prievadas, kurio klausosi MySQL serveris, palikite tuščią įprastiniam"
 
 #: libraries/config/messages.inc.php:408
 msgid "Server socket"
@@ -3826,10 +3836,9 @@ msgid "Defines the list of statements the auto-creation uses for new versions."
 msgstr ""
 
 #: libraries/config/messages.inc.php:422
-#, fuzzy
 #| msgid "Statements"
 msgid "Statements to track"
-msgstr "Parametrai"
+msgstr "Sekamos užklausos"
 
 #: libraries/config/messages.inc.php:423
 msgid ""
@@ -3872,9 +3881,8 @@ msgid ""
 msgstr ""
 
 #: libraries/config/messages.inc.php:432
-#, fuzzy
 msgid "Verbose check"
-msgstr "Versijos patikrinimas"
+msgstr "Išplėstinis patikrinimas"
 
 #: libraries/config/messages.inc.php:433
 msgid ""
@@ -4089,7 +4097,7 @@ msgstr "Naršyklės lango pavadinimas kai serveris yra pasirinktas"
 
 #: libraries/config/messages.inc.php:483
 msgid "Title of browser window when a table is selected"
-msgstr "Naršyklės lango pavadinimas kai lentelė yra pasirinkta"
+msgstr "Naršyklės lango pavadinimas, kai pasirinkta lentelė"
 
 #: libraries/config/messages.inc.php:485
 msgid ""
@@ -4155,28 +4163,24 @@ msgid "ZIP"
 msgstr "ZIP"
 
 #: libraries/config/setup.forms.php:41
-#, fuzzy
 #| msgid "Authenticating..."
 msgid "Config authentication"
-msgstr "Nustatomas tapatumas..."
+msgstr ""
 
 #: libraries/config/setup.forms.php:45
-#, fuzzy
 #| msgid "Authenticating..."
 msgid "Cookie authentication"
-msgstr "Nustatomas tapatumas..."
+msgstr "Autentifikavimas slapukais"
 
 #: libraries/config/setup.forms.php:48
-#, fuzzy
 #| msgid "Authenticating..."
 msgid "HTTP authentication"
-msgstr "Nustatomas tapatumas..."
+msgstr "HTTP autentifikacija"
 
 #: libraries/config/setup.forms.php:51
-#, fuzzy
 #| msgid "Authenticating..."
 msgid "Signon authentication"
-msgstr "Nustatomas tapatumas..."
+msgstr ""
 
 #: libraries/config/setup.forms.php:238
 #: libraries/config/user_preferences.forms.php:142 libraries/import/ldi.php:34
@@ -4211,10 +4215,9 @@ msgstr ""
 
 #: libraries/config/setup.forms.php:264
 #: libraries/config/user_preferences.forms.php:167
-#, fuzzy
 #| msgid "Customization"
 msgid "Custom"
-msgstr "Adaptavimas"
+msgstr ""
 
 #: libraries/config/setup.forms.php:285
 #: libraries/config/user_preferences.forms.php:187
@@ -4589,7 +4592,6 @@ msgstr ""
 "išsiuntimo bus tęsiama nuo %d."
 
 #: libraries/display_import.lib.php:221
-#, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
 #| "close to the PHP timeout limit. This might be good way to import large "
@@ -4599,9 +4601,9 @@ msgid ""
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
-"Leisti sustabdyti importavimą jei skriptas nustato, kad priartėta prie laiko "
+"Leisti sustabdyti importavimą jei skriptas nustato, kad priartėta prie PHP "
-"limito. Gali būti naudinga importuojant didelius failus, tačiau gali "
+"laiko limito. <i>Gali būti naudinga importuojant didelius failus, tačiau "
-"sugadinti transakcijas."
+"gali sugadinti transakcijas.</i>"
 
 #: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
@@ -4661,13 +4663,11 @@ msgid "Options"
 msgstr "Nustatymai"
 
 #: libraries/display_tbl.lib.php:558 libraries/display_tbl.lib.php:568
-#, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial texts"
 msgstr "Tekstus rodyti dalinai"
 
 #: libraries/display_tbl.lib.php:559 libraries/display_tbl.lib.php:572
-#, fuzzy
 #| msgid "Full Texts"
 msgid "Full texts"
 msgstr "Tekstus rodyti pilnai"
@@ -5258,13 +5258,13 @@ msgid ""
 "Display comments <i>(includes info such as export timestamp, PHP version, "
 "and server version)</i>"
 msgstr ""
-"Išvesti detales <i>(įtraukiant tokią info kaip eksporto timestamp, PHP "
+"Išvesti detales <i>(įtraukiant tokią info kaip eksporto eksportavimo laiką, "
-"versiją ir serverio versiją)</i>"
+"PHP versiją ir serverio versiją)</i>"
 
 #: libraries/export/sql.php:35
 msgid "Additional custom header comment (\\n splits lines):"
 msgstr ""
-"Įterpti savo komentarą į antraštės sritį (eilutėms atskirti naudokite \n"
+"Įterpti komentarą į antraštės sritį (eilutėms atskirti naudokite \n"
 "):"
 
 #: libraries/export/sql.php:37
@@ -5899,8 +5899,9 @@ msgid ""
 "Make sure, you have unique server-id in your configuration file (my.cnf). If "
 "not, please add the following line into [mysqld] section:"
 msgstr ""
-"Įsitikinkite, kad server-id yra unikalus Jūsų konfigūraciniame faile (my."
+"Įsitikinkite, kad serverio identifikacinis numeris yra unikalus jūsų "
-"cnf). Jei ne tada prašome įdėti sekančią eilutę į [mysqld] skiltį:"
+"nustatymų faile (my.cnf). Jei ne, tada įterpkite šią eilutę į [mysqld] "
+"skiltį:"
 
 #: libraries/replication_gui.lib.php:57 libraries/replication_gui.lib.php:58
 #: libraries/replication_gui.lib.php:251 libraries/replication_gui.lib.php:254
@@ -6586,10 +6587,9 @@ msgstr ""
 "(nutylint: ...)."
 
 #: libraries/user_preferences.inc.php:32
-#, fuzzy
 #| msgid "Other core settings"
 msgid "Manage your settings"
-msgstr "Kiti branduolio nustatymai"
+msgstr "Keiskite savo nustatymus"
 
 #: libraries/user_preferences.inc.php:47 prefs_manage.php:291
 msgid "Configuration has been saved"
@@ -7715,8 +7715,8 @@ msgid ""
 "should see a message informing you, that this server <b>is</b> configured as "
 "master"
 msgstr ""
-"Kai tik paleisite iš naujo MySQL serverį, prašome paspausi mygtuką Eiti. Po "
+"Kai iš naujo paleisite MySQL serverį, prašome paspausti mygtuką Vykdyti. Po "
-"to, Jūs turite pamatyti informacinę žinutę, kad šis serveris <b>yra</b> "
+"to turėtumėte pamatyti informacinę žinutę, kad šis serveris <b>yra</b> "
 "sukonfigūruotas kaip pagrindinis (master)."
 
 #: server_replication.php:291

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-11-20 07:34-0500\n"
-"PO-Revision-Date: 2010-11-21 20:13+0200\n"
+"PO-Revision-Date: 2010-11-27 10:24+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
 "Language-Team: turkish <tr@li.org>\n"
 "Language: tr\n"
@@ -2222,7 +2222,7 @@ msgid ""
 "cross-frame scripting attacks"
 msgstr ""
 "Bunu etkinleştirmek phpMyAdmin'i çerçeve içinde çağırmak için farklı alan "
-"isimlerine yerleşmiş sayfalara izin verir ve çapraz çerçeve betik yazım "
+"adlarına yerleşmiş sayfalara izin verir ve çapraz çerçeve betik yazım "
 "saldırılarına izin veren olası [strong]güvenlik açığıdır[/strong]"
 
 #: libraries/config/messages.inc.php:20
@@ -7185,7 +7185,7 @@ msgstr "Tüm Sorguları Göster"
 
 #: server_binlog.php:201
 msgid "Log name"
-msgstr "Günlük ismi"
+msgstr "Günlük adı"
 
 #: server_binlog.php:202
 msgid "Position"
@@ -9352,7 +9352,7 @@ msgstr "Tablonun dökümünü (şemasını) göster"
 
 #: tbl_indexes.php:66
 msgid "The name of the primary key must be \"PRIMARY\"!"
-msgstr "Birincil anahtarın ismi \"PRIMARY\" olmalıdır!"
+msgstr "Birincil anahtarın adı \"PRIMARY\" olmalıdır!"
 
 #: tbl_indexes.php:74
 msgid "Can't rename index to PRIMARY!"
@@ -9382,7 +9382,7 @@ msgstr "İndeks türü:"
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
-"(\"PRIMARY\" <b>sadece ve sadece</b> bir birincil anahtarın ismi "
+"(\"PRIMARY\" <b>sadece ve sadece</b> bir birincil anahtarın adı "
 "<b>olmalıdır!</b>)"
 
 #: tbl_indexes.php:249