- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4591-g858d430
by Michal Čihař 01 Jun '10

01 Jun '10

The branch, master has been updated via 858d4308349dfd49afbd4b58a7ce2ad160e5f5c7 (commit) via 783412e8fd46c499999bf631984d5d4954919f6f (commit) via be0fd3ea430811d0b818a372aa3c72737f9b798c (commit) via 9296cab69c918f8e836a2adfcaa84faedbfb564f (commit) via 0ebf58ce10f9281c21e1d902c223bb8df2245f09 (commit) via 09616c68e597d6e1b68a7b3d23891e7d2467edbe (commit) via 3892c2df1218068b2d341f72e0068188c5930dcd (commit) via 2749ee9f2114f4df11c0554d7d17db1f1b8d5fc7 (commit) via 2c8253f9fa97effeb52c2d54813e9da8b141983f (commit) via 0a3eb8994c0c1b1e5ac7d0c898f0845c71863dd6 (commit) via d9f1c9da8c1e574dd5d7455fd8b787982f69adbb (commit) via b918fc0d3fac0e3945db9d9f3e62dfc89b12ceef (commit) via 33605050fa63db1bd8180a1404464490469c1d2b (commit) via 8dad71368c2b2b996b6e8b58e2f144e8afa1cacb (commit) via 928e880d80487c7f4c3be1b86a86be8b5f4dcb03 (commit) via b45abad30fd866640eae09be7ccbfd382b7ffac6 (commit) via c398b45e60eedbb68139848cb6fdb29df9a16362 (commit) via ee8284bf16e188eee967817bcbe033c80bdefaa9 (commit) from 17ace8e4bfb10c9ebf104382ef9344151d3f930c (commit) - Log ----------------------------------------------------------------- commit 858d4308349dfd49afbd4b58a7ce2ad160e5f5c7 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:16:08 2010 +0200 Translation update done using Pootle. commit 783412e8fd46c499999bf631984d5d4954919f6f Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:15:45 2010 +0200 Translation update done using Pootle. commit be0fd3ea430811d0b818a372aa3c72737f9b798c Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:15:27 2010 +0200 Translation update done using Pootle. commit 9296cab69c918f8e836a2adfcaa84faedbfb564f Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:15:13 2010 +0200 Translation update done using Pootle. commit 0ebf58ce10f9281c21e1d902c223bb8df2245f09 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:14:55 2010 +0200 Translation update done using Pootle. commit 09616c68e597d6e1b68a7b3d23891e7d2467edbe Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:14:35 2010 +0200 Translation update done using Pootle. commit 3892c2df1218068b2d341f72e0068188c5930dcd Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:14:20 2010 +0200 Translation update done using Pootle. commit 2749ee9f2114f4df11c0554d7d17db1f1b8d5fc7 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:14:03 2010 +0200 Translation update done using Pootle. commit 2c8253f9fa97effeb52c2d54813e9da8b141983f Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:13:51 2010 +0200 Translation update done using Pootle. commit 0a3eb8994c0c1b1e5ac7d0c898f0845c71863dd6 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:13:25 2010 +0200 Translation update done using Pootle. commit d9f1c9da8c1e574dd5d7455fd8b787982f69adbb Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:12:24 2010 +0200 Translation update done using Pootle. commit b918fc0d3fac0e3945db9d9f3e62dfc89b12ceef Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:12:06 2010 +0200 Translation update done using Pootle. commit 33605050fa63db1bd8180a1404464490469c1d2b Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:11:56 2010 +0200 Translation update done using Pootle. commit 8dad71368c2b2b996b6e8b58e2f144e8afa1cacb Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:11:46 2010 +0200 Translation update done using Pootle. commit 928e880d80487c7f4c3be1b86a86be8b5f4dcb03 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:11:28 2010 +0200 Translation update done using Pootle. commit b45abad30fd866640eae09be7ccbfd382b7ffac6 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:11:20 2010 +0200 Translation update done using Pootle. commit c398b45e60eedbb68139848cb6fdb29df9a16362 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:11:11 2010 +0200 Translation update done using Pootle. commit ee8284bf16e188eee967817bcbe033c80bdefaa9 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:10:49 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 59 +++++++++++++++++++++-------------------------------------- 1 files changed, 21 insertions(+), 38 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2b38747..2942d70 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-31 14:33-0400\n" -"PO-Revision-Date: 2010-05-26 16:52+0200\n" +"PO-Revision-Date: 2010-06-01 16:16+0200\n" "Last-Translator: Marc <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\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" @@ -111,10 +111,9 @@ msgstr "Commentaires sur la table" #: tbl_indexes.php:189 tbl_printview.php:142 tbl_relation.php:402 #: tbl_select.php:135 tbl_structure.php:177 tbl_tracking.php:273 #: tbl_tracking.php:324 -#, fuzzy #| msgid "Column names" msgid "Column" -msgstr "Nom des colonnes" +msgstr "Colonne" #: db_datadict.php:175 db_printview.php:106 libraries/Index.class.php:443 #: libraries/db_events.inc.php:31 libraries/db_routines.inc.php:42 @@ -448,16 +447,14 @@ msgid "Modify" msgstr "Modifier" #: db_qbe.php:584 -#, fuzzy #| msgid "Add/Delete Criteria Row" msgid "Add/Delete criteria rows" -msgstr "Ajouter/effacer x lignes" +msgstr "Ajouter/effacer des lignes" #: db_qbe.php:596 -#, fuzzy #| msgid "Add/Delete Field Columns" msgid "Add/Delete columns" -msgstr "Ajouter/effacer x colonnes" +msgstr "Ajouter/effacer des colonnes" #: db_qbe.php:609 db_qbe.php:634 msgid "Update Query" @@ -551,7 +548,6 @@ msgid "Inside table(s):" msgstr "Dans la(les) table(s) :" #: db_search.php:355 -#, fuzzy #| msgid "Inside field:" msgid "Inside column:" msgstr "Dans la colonne:" @@ -1012,10 +1008,9 @@ msgid "Please select the primary key or a unique key" msgstr "Veuillez choisir la clé primaire ou un index unique" #: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 -#, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" -msgstr "Champ descriptif" +msgstr "Colonne descriptive" #. l10n: Display text for calendar close link #: js/messages.php:73 @@ -2002,10 +1997,9 @@ msgid "No Privileges" msgstr "aucun privilège" #: libraries/display_create_table.lib.php:41 -#, fuzzy #| msgid "Table must have at least one field." msgid "Table must have at least one column." -msgstr "La table doit comporter au moins un champ" +msgstr "La table doit comporter au moins une colonne" #: libraries/display_create_table.lib.php:48 #, php-format @@ -2013,20 +2007,19 @@ msgid "Create table on database %s" msgstr "Créer une nouvelle table sur la base %s" #: libraries/display_create_table.lib.php:57 -#, fuzzy #| msgid "Number of fields" msgid "Number of columns" -msgstr "Nombre de champs" +msgstr "Nombre de colonnes" #: libraries/display_export.lib.php:42 msgid "Could not load export plugins, please check your installation!" msgstr "Erreur lors du chargement des modules d'exportation!" #: libraries/display_export.lib.php:107 -#, fuzzy, php-format +#, php-format #| msgid "Dump %s row(s) starting at record # %s" msgid "Dump %s row(s) starting at row # %s" -msgstr "Exporter %s enregistrement(s) à partir du rang n° %s" +msgstr "Exporter %s ligne(s) à partir du rang n° %s" #: libraries/display_export.lib.php:115 msgid "Dump all rows" @@ -2181,10 +2174,9 @@ msgstr "" "volumineux, au détriment du respect des transactions." #: libraries/display_import.lib.php:239 setup/lib/messages.inc.php:161 -#, fuzzy #| msgid "Number of records (queries) to skip from start" msgid "Number of queries to skip from start" -msgstr "... relatif au début du fichier" +msgstr "Nombre de requêtes à sauter à partir du début" #: libraries/display_import.lib.php:255 setup/lib/messages.inc.php:160 msgid "Format of imported file" @@ -2241,10 +2233,9 @@ msgid "%d is not valid row number." msgstr "%d n'est pas un numéro d'enregistrement valable." #: libraries/display_tbl.lib.php:310 -#, fuzzy #| msgid "row(s) starting from record #" msgid "row(s) starting from row #" -msgstr "enregistrement(s) à partir de l'enregistrement n°" +msgstr "ligne(s) à partir de la ligne n°" #: libraries/display_tbl.lib.php:316 msgid "horizontal" @@ -2301,10 +2292,9 @@ msgid "Relational key" msgstr "Relations : clés" #: libraries/display_tbl.lib.php:588 -#, fuzzy #| msgid "Relational display field" msgid "Relational display column" -msgstr "Relations : champs descriptifs" +msgstr "Relations : colonnes descriptives" #: libraries/display_tbl.lib.php:595 msgid "Show binary contents" @@ -2734,24 +2724,21 @@ msgstr "CSV" #: libraries/export/csv.php:21 libraries/import/csv.php:27 #: libraries/import/csv.php:59 libraries/import/ldi.php:40 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns terminated by" -msgstr "Lignes terminées par" +msgstr "Colonnes terminées par" #: libraries/export/csv.php:22 libraries/import/csv.php:28 #: libraries/import/csv.php:71 libraries/import/ldi.php:41 -#, fuzzy #| msgid "Fields enclosed by" msgid "Columns enclosed by" -msgstr "Champs entourés par" +msgstr "Colonnes entourées par" #: libraries/export/csv.php:23 libraries/import/csv.php:29 #: libraries/import/csv.php:75 libraries/import/ldi.php:42 -#, fuzzy #| msgid "Fields escaped by" msgid "Columns escaped by" -msgstr "Caractère spécial" +msgstr "Caractère d'échappement" #: libraries/export/csv.php:24 libraries/import/csv.php:30 #: libraries/import/csv.php:79 libraries/import/ldi.php:43 @@ -2767,21 +2754,18 @@ msgid "Replace NULL by" msgstr "Remplacer NULL par" #: libraries/export/csv.php:26 libraries/export/excel.php:23 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove CRLF characters within columns" -msgstr "" -"Enlève les caractères de fin de ligne (CRLF) à l'intérieur des colonnes" +msgstr "Enlève les caractères de fin de ligne à l'intérieur des colonnes" #: libraries/export/csv.php:27 libraries/export/excel.php:24 #: libraries/export/htmlword.php:26 libraries/export/latex.php:57 #: libraries/export/ods.php:24 libraries/export/odt.php:50 #: libraries/export/texytext.php:34 libraries/export/xls.php:24 #: libraries/export/xlsx.php:24 -#, fuzzy #| msgid "Put fields names in the first row" msgid "Put columns names in the first row" -msgstr "Afficher les noms de champ en première ligne" +msgstr "Afficher les noms de colonnes en première ligne" #: libraries/export/excel.php:18 msgid "CSV for MS Excel" @@ -2916,11 +2900,10 @@ msgid "Database export options" msgstr "Options d'exportation" #: libraries/export/sql.php:80 -#, fuzzy #| msgid "Enclose table and field names with backquotes" msgid "Enclose table and column names with backquotes" msgstr "" -"Protéger les noms des tables et des champs par des guillemets obliques (`)" +"Protéger les noms des tables et des colonnes par des guillemets obliques (`)" #: libraries/export/sql.php:86 msgid "Add into comments" @@ -3139,10 +3122,10 @@ msgid "Invalid format of CSV input on line %d." msgstr "Format invalide pour les données CSV à la ligne %d." #: libraries/import/csv.php:312 -#, fuzzy, php-format +#, php-format #| msgid "Invalid field count in CSV input on line %d." msgid "Invalid column count in CSV input on line %d." -msgstr "Nombre de champs invalide dans les données CSV à la ligne %d" +msgstr "Nombre de colonnes invalide dans les données CSV à la ligne %d" #: libraries/import/docsql.php:29 msgid "DocSQL" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 8765b0d5c24239df9c1d7872d83a309510cddb9a
by Michal Čihař 01 Jun '10

01 Jun '10

The branch, master has been updated via 8765b0d5c24239df9c1d7872d83a309510cddb9a (commit) via 7df085a03fe5404ca533fd930a57bb03f3576ad5 (commit) via fd8863867a82718764aecef104f6fa53102e4918 (commit) from fbe57a674c107d228209f85336ef83570f7ffa27 (commit) - Log ----------------------------------------------------------------- commit 8765b0d5c24239df9c1d7872d83a309510cddb9a Merge: 7df085a03fe5404ca533fd930a57bb03f3576ad5 fbe57a674c107d228209f85336ef83570f7ffa27 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jun 1 14:14:37 2010 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/localized_docs commit 7df085a03fe5404ca533fd930a57bb03f3576ad5 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jun 1 14:14:20 2010 +0200 Fix some errors in translations. commit fd8863867a82718764aecef104f6fa53102e4918 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jun 1 14:14:01 2010 +0200 Add script for showing summary. ----------------------------------------------------------------------- Summary of changes: locales-stats | 2 +- po/hy.po | 4 ++-- po/sk.po | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/locales-stats b/locales-stats index c191442..b918850 100755 --- a/locales-stats +++ b/locales-stats @@ -1,6 +1,6 @@ #!/bin/sh for x in po/*.po ; do - lang=`echo $x | sed 's@po/$.*$\.po@\1@'` + lang=`basename $x` echo -n "$lang: " msgfmt --statistics --check -o - $x > /dev/null done diff --git a/po/hy.po b/po/hy.po index fa19037..49d8be1 100644 --- a/po/hy.po +++ b/po/hy.po @@ -523,7 +523,7 @@ msgid "" "?>\n" msgstr "" "<?php\n" -"$cfg['blowfish_secret'] = 'ba17c1ec07d65003'; // օգտագործեք այստեղ Ձեր ընտրության արժեքը$i=0;$i++;$cfg['Servers'][$i]['auth_type'] = 'cookie';?>" +"$cfg['blowfish_secret'] = 'ba17c1ec07d65003'; // օգտագործեք այստեղ Ձեր ընտրության արժեքը$i=0;$i++;$cfg['Servers'][$i]['auth_type'] = 'cookie';?>\n" #. type: Content of: <html><body><div><ol><li><ul><li> #: ../phpmyadmin/Documentation.html:238 @@ -544,7 +544,7 @@ msgid "" "?>\n" msgstr "" "<?php\n" -"$i=0;$i++;$cfg['Servers'][$i]['user'] = 'root';$cfg['Servers'][$i]['password'] = 'cbb74bc'; // օգտագործեք այստեղ Ձեր ծածկագիրը$cfg['Servers'][$i]['auth_type'] = 'config';?>" +"$i=0;$i++;$cfg['Servers'][$i]['user'] = 'root';$cfg['Servers'][$i]['password'] = 'cbb74bc'; // օգտագործեք այստեղ Ձեր ծածկագիրը$cfg['Servers'][$i]['auth_type'] = 'config';?>\n" #. type: Content of: <html><body><div><ol><li><ul><li> #: ../phpmyadmin/Documentation.html:249 diff --git a/po/sk.po b/po/sk.po index 5e822c0..38684d6 100644 --- a/po/sk.po +++ b/po/sk.po @@ -10,11 +10,11 @@ msgstr "" "POT-Creation-Date: 2010-05-25 14:42+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"Language: \n" +"Language-Team: Slovak <sk(a)li.org>\n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: ENCODING\n" +"Content-Transfer-Encoding: 8-bit\n" "#-#-#-#-# sk-html.pot (phpMyAdmin documentation VERSION) #-#-#-#-#\n" "#-#-#-#-# sk-txt.pot (phpMyAdmin documentation VERSION) #-#-#-#-#\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4573-g17ace8e
by Michal Čihař 01 Jun '10

01 Jun '10

The branch, master has been updated via 17ace8e4bfb10c9ebf104382ef9344151d3f930c (commit) via 0eeb125612836d4decfca5395306507f0388d0a3 (commit) via 238da91a8f9ffdd542868773f99c57203b2a71cb (commit) via ac9eda6e328122b6649bd0745fd61ba84d77b92e (commit) via ec2cf8571665534caeab1d07bff961d24c1abd4e (commit) via d2660d3dc22266c6d507e4cda017d4460bf4d8d8 (commit) via e1f81479c2814a758a4e2ffd27982bc4d2577183 (commit) via e025a7d46f242d5d9b4759922391b37c56b7b0ff (commit) via b7c0e1e6d34aa978606fd2d6a2488a89af4e2a03 (commit) via f6ac45642a8b4fe22205ba10aae8979a8a66b304 (commit) via cac53a79e6425a05847da3389dbe2b6e2617e991 (commit) via 71288903f81b77fa68ae914a3ff63f2dda98cb30 (commit) via 7922eba6ff7e35904e1cb04c744f2d3083cec17a (commit) via bb2e06776e98574618db8f0d09c49acabb4a483f (commit) via 0ee132552780262a779d6a79be8debd1051eacda (commit) via ac06976024273daa36c811a9fa92dd7ea5daa6d5 (commit) via 130383d45ee6b930acb7dd2fe013fe91612a80cc (commit) via 056abf55b3f1769b4303094ae7a52424c7ff4b58 (commit) via 19838e53754230c61b592b4c31712968f35fe14c (commit) via 8682630106486448d0915d56c461fd70229ab082 (commit) via efce259ac13f7b6035a7899e23ecdd22853d2d43 (commit) via 747d59792374310c1dedf63f2516a4b1d7c1f630 (commit) via 5b23c1f1b344174ba04d613ec8137e960c7bb226 (commit) via 94b02ae117602adb7476e11c8d6285a460753506 (commit) via 54879d82e88851b62dc51d40920b2da25ce93ed9 (commit) via 49b0cf29029da94833883f106ccbb0ebdbc37965 (commit) via 8ea1d0d629d9cd10ec62cfc448973498362ef060 (commit) via 3234f14d9fe785b02a9ead2d2f6079041d2e448b (commit) via 56e4c89b811c0850a109a4926e381f74d84c7b86 (commit) via f9e28345c2b9908e8d8969765d3f6cac275ac88a (commit) via b9f2d0fc7ed4dab3a7a586b8b4990a1317d0eb77 (commit) via 18f3e0d5597cc881af336235026826e5703c654e (commit) via 90e40a581038d859edd5d96ad466172e42e6ff09 (commit) via f63a2a12e7b6cfbbd3651f30cdfab8c60aa72660 (commit) via fc1b6efb91f608f13427a1cc56adeb314324722f (commit) via 76e68d179cd275ea5dbd86000b41063002e64f60 (commit) via 28baddc0e7b7db40d4b74884a802bfa6e923f4db (commit) via ed60a714b39cca1678ea70a5d9a80b99d6ddc788 (commit) via 20499b2f5382f93b702fd69d4a01f31356f80d0f (commit) via a2633a152430f6849b74c8dec37351390dfdb8d8 (commit) via f36875e058fd2716433d7826d514b6985aad63a9 (commit) via 76b12cc3ad778257d66747dcdf6a9ae8f7d984cf (commit) via 8dc8d1a477fac5ea5ac608a88683fcf805fecee6 (commit) from 1fa03caf63121499e04df2086ea9eaf0a89aa9f2 (commit) - Log ----------------------------------------------------------------- commit 17ace8e4bfb10c9ebf104382ef9344151d3f930c Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:52:40 2010 +0200 Translation update done using Pootle. commit 0eeb125612836d4decfca5395306507f0388d0a3 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:52:34 2010 +0200 Translation update done using Pootle. commit 238da91a8f9ffdd542868773f99c57203b2a71cb Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:52:19 2010 +0200 Translation update done using Pootle. commit ac9eda6e328122b6649bd0745fd61ba84d77b92e Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:52:04 2010 +0200 Translation update done using Pootle. commit ec2cf8571665534caeab1d07bff961d24c1abd4e Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:51:40 2010 +0200 Translation update done using Pootle. commit d2660d3dc22266c6d507e4cda017d4460bf4d8d8 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:51:21 2010 +0200 Translation update done using Pootle. commit e1f81479c2814a758a4e2ffd27982bc4d2577183 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:50:44 2010 +0200 Translation update done using Pootle. commit e025a7d46f242d5d9b4759922391b37c56b7b0ff Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:50:20 2010 +0200 Translation update done using Pootle. commit b7c0e1e6d34aa978606fd2d6a2488a89af4e2a03 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:50:09 2010 +0200 Translation update done using Pootle. commit f6ac45642a8b4fe22205ba10aae8979a8a66b304 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:49:30 2010 +0200 Translation update done using Pootle. commit cac53a79e6425a05847da3389dbe2b6e2617e991 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:49:17 2010 +0200 Translation update done using Pootle. commit 71288903f81b77fa68ae914a3ff63f2dda98cb30 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:49:04 2010 +0200 Translation update done using Pootle. commit 7922eba6ff7e35904e1cb04c744f2d3083cec17a Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:48:32 2010 +0200 Translation update done using Pootle. commit bb2e06776e98574618db8f0d09c49acabb4a483f Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:48:00 2010 +0200 Translation update done using Pootle. commit 0ee132552780262a779d6a79be8debd1051eacda Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:47:48 2010 +0200 Translation update done using Pootle. commit ac06976024273daa36c811a9fa92dd7ea5daa6d5 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:47:40 2010 +0200 Translation update done using Pootle. commit 130383d45ee6b930acb7dd2fe013fe91612a80cc Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:47:22 2010 +0200 Translation update done using Pootle. commit 056abf55b3f1769b4303094ae7a52424c7ff4b58 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:46:41 2010 +0200 Translation update done using Pootle. commit 19838e53754230c61b592b4c31712968f35fe14c Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:45:25 2010 +0200 Translation update done using Pootle. commit 8682630106486448d0915d56c461fd70229ab082 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:44:34 2010 +0200 Translation update done using Pootle. commit efce259ac13f7b6035a7899e23ecdd22853d2d43 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:43:57 2010 +0200 Translation update done using Pootle. commit 747d59792374310c1dedf63f2516a4b1d7c1f630 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:43:16 2010 +0200 Translation update done using Pootle. commit 5b23c1f1b344174ba04d613ec8137e960c7bb226 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:43:03 2010 +0200 Translation update done using Pootle. commit 94b02ae117602adb7476e11c8d6285a460753506 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:42:46 2010 +0200 Translation update done using Pootle. commit 54879d82e88851b62dc51d40920b2da25ce93ed9 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:42:19 2010 +0200 Translation update done using Pootle. commit 49b0cf29029da94833883f106ccbb0ebdbc37965 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:42:09 2010 +0200 Translation update done using Pootle. commit 8ea1d0d629d9cd10ec62cfc448973498362ef060 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:41:42 2010 +0200 Translation update done using Pootle. commit 3234f14d9fe785b02a9ead2d2f6079041d2e448b Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:41:26 2010 +0200 Translation update done using Pootle. commit 56e4c89b811c0850a109a4926e381f74d84c7b86 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:41:15 2010 +0200 Translation update done using Pootle. commit f9e28345c2b9908e8d8969765d3f6cac275ac88a Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:41:05 2010 +0200 Translation update done using Pootle. commit b9f2d0fc7ed4dab3a7a586b8b4990a1317d0eb77 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:40:49 2010 +0200 Translation update done using Pootle. commit 18f3e0d5597cc881af336235026826e5703c654e Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:40:36 2010 +0200 Translation update done using Pootle. commit 90e40a581038d859edd5d96ad466172e42e6ff09 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:40:25 2010 +0200 Translation update done using Pootle. commit f63a2a12e7b6cfbbd3651f30cdfab8c60aa72660 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:40:15 2010 +0200 Translation update done using Pootle. commit fc1b6efb91f608f13427a1cc56adeb314324722f Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:39:54 2010 +0200 Translation update done using Pootle. commit 76e68d179cd275ea5dbd86000b41063002e64f60 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:39:43 2010 +0200 Translation update done using Pootle. commit 28baddc0e7b7db40d4b74884a802bfa6e923f4db Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:39:23 2010 +0200 Translation update done using Pootle. commit ed60a714b39cca1678ea70a5d9a80b99d6ddc788 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:39:16 2010 +0200 Translation update done using Pootle. commit 20499b2f5382f93b702fd69d4a01f31356f80d0f Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:39:03 2010 +0200 Translation update done using Pootle. commit a2633a152430f6849b74c8dec37351390dfdb8d8 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:38:54 2010 +0200 Translation update done using Pootle. commit f36875e058fd2716433d7826d514b6985aad63a9 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:38:42 2010 +0200 Translation update done using Pootle. commit 76b12cc3ad778257d66747dcdf6a9ae8f7d984cf Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:38:34 2010 +0200 Translation update done using Pootle. commit 8dc8d1a477fac5ea5ac608a88683fcf805fecee6 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Tue Jun 1 09:38:18 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/nb.po | 157 ++++++++++++++++++++++++-------------------------------------- 1 files changed, 60 insertions(+), 97 deletions(-) diff --git a/po/nb.po b/po/nb.po index bfe1ed5..efc41cc 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-31 14:33-0400\n" -"PO-Revision-Date: 2010-05-31 08:25+0200\n" +"PO-Revision-Date: 2010-06-01 09:52+0200\n" "Last-Translator: <sven.erik.andersen(a)gmail.com>\n" "Language-Team: norwegian <no(a)li.org>\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -110,10 +110,9 @@ msgstr "Tabellkommentarer" #: tbl_indexes.php:189 tbl_printview.php:142 tbl_relation.php:402 #: tbl_select.php:135 tbl_structure.php:177 tbl_tracking.php:273 #: tbl_tracking.php:324 -#, fuzzy #| msgid "Column names" msgid "Column" -msgstr "Kolonnenavn" +msgstr "Kolonne" #: db_datadict.php:175 db_printview.php:106 libraries/Index.class.php:443 #: libraries/db_events.inc.php:31 libraries/db_routines.inc.php:42 @@ -447,16 +446,14 @@ msgid "Modify" msgstr "Endre" #: db_qbe.php:584 -#, fuzzy #| msgid "Add/Delete Criteria Row" msgid "Add/Delete criteria rows" msgstr "Legg til/Slett kriterierad" #: db_qbe.php:596 -#, fuzzy #| msgid "Add/Delete Field Columns" msgid "Add/Delete columns" -msgstr "Legg til/Slett kolonne" +msgstr "Legg til/Slett kolonner" #: db_qbe.php:609 db_qbe.php:634 msgid "Update Query" @@ -550,10 +547,9 @@ msgid "Inside table(s):" msgstr "I tabell(ene):" #: db_search.php:355 -#, fuzzy #| msgid "Inside field:" msgid "Inside column:" -msgstr "I felt:" +msgstr "I kolonne:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 @@ -1001,10 +997,9 @@ msgid "Please select the primary key or a unique key" msgstr "Velg primærnøkkelen eller en unik nøkkel" #: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 -#, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" -msgstr "Velg felt for visning" +msgstr "Velg kolonne for visning" #. l10n: Display text for calendar close link #: js/messages.php:73 @@ -1975,10 +1970,9 @@ msgid "No Privileges" msgstr "Ingen privilegier" #: libraries/display_create_table.lib.php:41 -#, fuzzy #| msgid "Table must have at least one field." msgid "Table must have at least one column." -msgstr "Tabellen må ha minst ett felt." +msgstr "Tabellen må ha minst en kolonne." #: libraries/display_create_table.lib.php:48 #, php-format @@ -1986,17 +1980,16 @@ msgid "Create table on database %s" msgstr "Opprett ny tabell i database %s" #: libraries/display_create_table.lib.php:57 -#, fuzzy #| msgid "Number of fields" msgid "Number of columns" -msgstr "Antall felter" +msgstr "Antall kolonner" #: libraries/display_export.lib.php:42 msgid "Could not load export plugins, please check your installation!" msgstr "Kunne ikke laste eksporttillegg, kontroller din innstallasjon!" #: libraries/display_export.lib.php:107 -#, fuzzy, php-format +#, php-format #| msgid "Dump %s row(s) starting at record # %s" msgid "Dump %s row(s) starting at row # %s" msgstr "Dumpe %s rader fra rad %s." @@ -2153,7 +2146,6 @@ msgstr "" "på, men det kan knekke transaksjoner." #: libraries/display_import.lib.php:239 setup/lib/messages.inc.php:161 -#, fuzzy #| msgid "Number of records (queries) to skip from start" msgid "Number of queries to skip from start" msgstr "Antall poster(spørringer) å hoppe over fra start" @@ -2213,10 +2205,9 @@ msgid "%d is not valid row number." msgstr "%d er ikke et gyldig radnummer." #: libraries/display_tbl.lib.php:310 -#, fuzzy #| msgid "row(s) starting from record #" msgid "row(s) starting from row #" -msgstr "rader fra" +msgstr "rader fra rad" #: libraries/display_tbl.lib.php:316 msgid "horizontal" @@ -2273,10 +2264,9 @@ msgid "Relational key" msgstr "Relasjonsnøkkel" #: libraries/display_tbl.lib.php:588 -#, fuzzy #| msgid "Relational display field" msgid "Relational display column" -msgstr "Relasjonsvisningsfelt" +msgstr "Relasjonsvisningskolonne" #: libraries/display_tbl.lib.php:595 msgid "Show binary contents" @@ -2698,24 +2688,21 @@ msgstr "CSV-data" #: libraries/export/csv.php:21 libraries/import/csv.php:27 #: libraries/import/csv.php:59 libraries/import/ldi.php:40 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns terminated by" -msgstr "Linker avsluttet med" +msgstr "Kolonner avsluttet med" #: libraries/export/csv.php:22 libraries/import/csv.php:28 #: libraries/import/csv.php:71 libraries/import/ldi.php:41 -#, fuzzy #| msgid "Fields enclosed by" msgid "Columns enclosed by" -msgstr "Felter omsluttet av" +msgstr "Kolonner omsluttet av" #: libraries/export/csv.php:23 libraries/import/csv.php:29 #: libraries/import/csv.php:75 libraries/import/ldi.php:42 -#, fuzzy #| msgid "Fields escaped by" msgid "Columns escaped by" -msgstr "Felter beskyttet med" +msgstr "Kolonner beskyttet med" #: libraries/export/csv.php:24 libraries/import/csv.php:30 #: libraries/import/csv.php:79 libraries/import/ldi.php:43 @@ -2731,20 +2718,18 @@ msgid "Replace NULL by" msgstr "Erstatt NULL med" #: libraries/export/csv.php:26 libraries/export/excel.php:23 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove CRLF characters within columns" -msgstr "Fjern CRLF tegn i felter" +msgstr "Fjern CRLF tegn i kolonner" #: libraries/export/csv.php:27 libraries/export/excel.php:24 #: libraries/export/htmlword.php:26 libraries/export/latex.php:57 #: libraries/export/ods.php:24 libraries/export/odt.php:50 #: libraries/export/texytext.php:34 libraries/export/xls.php:24 #: libraries/export/xlsx.php:24 -#, fuzzy #| msgid "Put fields names in the first row" msgid "Put columns names in the first row" -msgstr "Sett inn feltnavn i første rad" +msgstr "Sett inn kolonnenavn i første rad" #: libraries/export/excel.php:18 msgid "CSV for MS Excel" @@ -2879,10 +2864,9 @@ msgid "Database export options" msgstr "Databaseeksportinnstillinger" #: libraries/export/sql.php:80 -#, fuzzy #| msgid "Enclose table and field names with backquotes" msgid "Enclose table and column names with backquotes" -msgstr "Bruk venstre anførselstegn med tabell og feltnavn" +msgstr "Bruk venstre anførselstegn med tabell og kolonnenavn" #: libraries/export/sql.php:86 msgid "Add into comments" @@ -3102,10 +3086,10 @@ msgid "Invalid format of CSV input on line %d." msgstr "Ugyldig format i CSV importen i linje %d." #: libraries/import/csv.php:312 -#, fuzzy, php-format +#, php-format #| msgid "Invalid field count in CSV input on line %d." msgid "Invalid column count in CSV input on line %d." -msgstr "Ugyldig antall felt i CSV importen i linje %d." +msgstr "Ugyldig antall kolonner i CSV importen i linje %d." #: libraries/import/docsql.php:29 msgid "DocSQL" @@ -4492,10 +4476,9 @@ msgid "Run SQL query/queries on database %s" msgstr "Kjør SQL spørring/spørringer mot databasen %s" #: libraries/sql_query_form.lib.php:317 -#, fuzzy #| msgid "Column names" msgid "Columns" -msgstr "Kolonnenavn" +msgstr "Kolonner" #: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" @@ -4613,7 +4596,6 @@ msgid "Length/Values" msgstr "Lengde/Sett*" #: libraries/tbl_properties.inc.php:105 -#, fuzzy #| msgid "" #| "If field type is \"enum\" or \"set\", please enter the values using this " #| "format: 'a','b','c'...<br />If you ever need to put a backslash (\"\\\") " @@ -4625,10 +4607,10 @@ msgid "" "a single quote (\"'\") amongst those values, precede it with a backslash " "(for example '\\\\xyz' or 'a\\'b')." msgstr "" -"Hvis felttypen er \"enum\" eller \"set\", skriv inn verdien med dette " -"formatet: 'a','b','c'...<br />Hvis du skulle trenge å ha en skråstrek (\"\\" -"\") eller en enkel apostrof (\"'\") blant disse verdiene, skriv en skråstrek " -"foran (eks. '\\\\xyz' eller 'a\\'b')." +"Hvis kolonnetypen er \"enum\" eller \"set\", skriv inn verdien med dette " +"formatet: 'a','b','c'...<br />Hvis du skulle trenge å ha en skråstrek (\"\\\") " +"eller en enkel apostrof (\"'\") blant disse verdiene, skriv en skråstrek foran " +"(eks. '\\\\xyz' eller 'a\\'b')." #: libraries/tbl_properties.inc.php:106 msgid "" @@ -4703,23 +4685,21 @@ msgid "Save" msgstr "Lagre" #: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 -#, fuzzy, php-format +#, php-format #| msgid "Add column(s)" msgid "Add %s column(s)" -msgstr "Legg til kolonne(r)" +msgstr "Legg til %s kolonne(r)" #: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 -#, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." -msgstr "Du må sette inn minst ett felt." +msgstr "Du må sette inn minst en kolonne." #: libraries/tbl_triggers.lib.php:29 msgid "Event" msgstr "Hendelse" #: libraries/transformations/application_octetstream__download.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a link to download the binary data of the field. You can use the " #| "first option to specify the filename, or use the second option as the " @@ -4731,10 +4711,10 @@ msgid "" "of a column which contains the filename. If you use the second option, you " "need to set the first option to the empty string." msgstr "" -"Vis en link for å kunne laste ned de binære dataene til et felt. Den første " -"opsjonen er filnavnet til den binære fila. Den andre opsjonen er et " -"potensielt feltnavn i en tabell som inneholder filnavnet. Hvis du velger den " -"andre opsjonen så må den første være satt til en tom strengverdi" +"Vis en link for å kunne laste ned de binære dataene til en kolonne. Den " +"første opsjonen er filnavnet til den binære fila. Den andre opsjonen er et " +"potensielt kolonnenavn i en tabell som inneholder filnavnet. Hvis du velger " +"den andre opsjonen så må den første være satt til en tom strengverdi." #: libraries/transformations/application_octetstream__hex.inc.php:10 msgid "" @@ -4758,7 +4738,6 @@ msgid "Displays a link to download this image." msgstr "Viser en link til dette bildet (m.a.o. direkte blob-nedlasting)." #: libraries/transformations/text_plain__dateformat.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a TIME, TIMESTAMP, DATETIME or numeric unix timestamp field as " #| "formatted date. The first option is the offset (in hours) which will be " @@ -4778,7 +4757,7 @@ msgid "" "documentation for PHP's strftime() function and for \"utc\" it is done using " "gmdate() function." msgstr "" -"Vi en TIME, TIMESTAMP, DATETIME eller et numerisk Unix tidsmerke som en " +"Vis en TIME, TIMESTAMP, DATETIME eller et numerisk Unix tidsmerke som en " "formatert dato. Den første innstillingen er differansen (i timer) som vil " "bli lagt til tidsmerket (Standard: 0). Bruk den andre innstillingen til å " "spesifiser en alternativ datoformatstreng. Den tredje innstillingen avgjør " @@ -4788,7 +4767,6 @@ msgstr "" "\"utc\" se gmdate() funksjonen." #: libraries/transformations/text_plain__external.inc.php:10 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the field data " #| "via standard input. Returns the standard output of the application. The " @@ -4812,29 +4790,29 @@ msgid "" "will prevent wrapping and ensure that the output appears all on one line " "(Default 1)." msgstr "" -"BARE LINUX: Starter et eksternt program og gir den feltdataene via standard " -"input. Returnerer standart output fra programmet. Standard er Tidy, for å " -"skrive ut pen HTML kode. Av sikkerhetsgrunner så må du redigere fila " +"BARE LINUX: Starter et eksternt program og gir den kolonnedataene via " +"standard input. Returnerer standard output fra programmet. Standard er Tidy, " +"for å skrive ut pen HTML kode. Av sikkerhetsgrunner så må du redigere fila " "libraries/transformations/text_plain__external.inc.php og skrive inn de " "verktøyene du tillater å kjøres. Den første verdien er antall programmer du " "ønsker å bruke og den andre verdien er parameterene for programmet. Den " "tredje verdien, hvis den er satt til 1 vil konvertere utskriften med " "htmlspecialchars() (Standard er 1). En fjerde verdi vil, viss satt til 1 " "sette en NOWRAP i innholdscellen slik at hele resultatet blir vist uten " -"reformatering (Standard er 1)" +"reformatering (Standard er 1)." #: libraries/transformations/text_plain__formatted.inc.php:10 -#, fuzzy #| msgid "" #| "Displays the contents of the field as-is, without running it through " #| "htmlspecialchars(). That is, the field is assumed to contain valid HTML." msgid "" "Displays the contents of the column as-is, without running it through " "htmlspecialchars(). That is, the column is assumed to contain valid HTML." -msgstr "Bevarer original formatering av feltet. Ingen 'escaping' blir utført." +msgstr "" +"Bevarer original formatering av kolonnen uten å kjøre den gjennom " +"htmlspecialchars(). Kolonnen blir betraktet som å inneholde gyldig HTML." #: libraries/transformations/text_plain__imagelink.inc.php:10 -#, fuzzy #| msgid "" #| "Displays an image and a link; the field contains the filename. The first " #| "option is a URL prefix like \"http://www.example.com/\". The second and " @@ -4844,12 +4822,11 @@ msgid "" "option is a URL prefix like \"http://www.example.com/\". The second and " "third options are the width and the height in pixels." msgstr "" -"Viser et bilde og en link, feltet inneholder filnavnet; første verdi er et " -"prefiks slik som \"http://domain.com/\", andre verdien er bredden i piksler, " -"tredje er høyden." +"Viser et bilde og en link, kolonnen inneholder filnavnet; første verdi er et " +"prefiks slik som \"http://www.example.com/\", andre verdien er bredden i " +"piksler, tredje er høyden." #: libraries/transformations/text_plain__link.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a link; the field contains the filename. The first option is a " #| "URL prefix like \"http://www.example.com/\". The second option is a title " @@ -4859,8 +4836,8 @@ msgid "" "prefix like \"http://www.example.com/\". The second option is a title for " "the link." msgstr "" -"Viser en link, feltet inneholder filnavnet, ; første verdi er et prefiks " -"slik som \"http://domain.com/\", andre verdien er en tittel for linken." +"Viser en link, kolonnen inneholder filnavnet, ; første verdi er et prefiks " +"slik som \"http://www.example.com/\", andre verdien er en tittel for linken." #: libraries/transformations/text_plain__longToIpv4.inc.php:10 msgid "" @@ -5082,13 +5059,11 @@ msgid "Create a page" msgstr "Lag en ny side" #: pdf_pages.php:310 -#, fuzzy #| msgid "Page number:" msgid "Page name" -msgstr "Sidenummer:" +msgstr "Sidenummer" #: pdf_pages.php:314 -#, fuzzy #| msgid "Automatic layout" msgid "Automatic layout based on" msgstr "Automatisk disposisjon" @@ -5218,7 +5193,6 @@ msgid "To select relation, click :" msgstr "For å velge relasjon, klikk :" #: pmd_help.php:29 -#, fuzzy #| msgid "" #| "The display field is shown in pink. To set/unset a field as the display " #| "field, click the \"Choose field to display\" icon, then click on the " @@ -5228,9 +5202,9 @@ msgid "" "column, click the \"Choose column to display\" icon, then click on the " "appropriate column name." msgstr "" -"Visningsfeltet er markert i rosa. For å slå på/av et felt som visningsfelt, " -"klikk på \"Velg felt for visning\" ikonet, klikk så på det aktuelle " -"feltnavnet." +"Visningskolonnen er markert i rosa. For å slå på/av et felt som " +"visningskolonne, klikk på \"Velg kolonne for visning\" ikonet, klikk så på det " +"aktuelle kolonnenavnet." #: pmd_pdf.php:63 msgid "Page has been created" @@ -6322,7 +6296,6 @@ msgstr "" "eller fremvise den." #: setup/lib/messages.inc.php:35 -#, fuzzy #| msgid "" #| "Defines which type of editing controls should be used for CHAR and " #| "VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]" @@ -6333,14 +6306,13 @@ msgid "" "kbd] - allows newlines in columns" msgstr "" "Definerer hvilken type redigeringskontroll som skal brukes for CHAR og " -"VARCHAR felter; [kbd]input[/kbd] - tillater begrensning av lengde, [kbd]" -"textarea[/kbd] - tillater linjeskift i felter" +"VARCHAR kolonner; [kbd]input[/kbd] - tillater begrensning av lengde, " +"[kbd]textarea[/kbd] - tillater linjeskift i kolonner" #: setup/lib/messages.inc.php:36 -#, fuzzy #| msgid "CHAR fields editing" msgid "CHAR columns editing" -msgstr "CHAR felt redigering" +msgstr "CHAR kolonneredigering" #: setup/lib/messages.inc.php:37 msgid "Number of columns for CHAR/VARCHAR textareas" @@ -7067,7 +7039,6 @@ msgid "GZip output buffering" msgstr "GZip utbuffring" #: setup/lib/messages.inc.php:217 -#, fuzzy #| msgid "" #| "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, " #| "DATETIME and TIMESTAMP, ascending order otherwise" @@ -7095,16 +7066,14 @@ msgid "Iconic table operations" msgstr "Ikoniske tabelloperasjoner" #: setup/lib/messages.inc.php:224 -#, fuzzy #| msgid "Disallow BLOB and BINARY fields from editing" msgid "Disallow BLOB and BINARY columns from editing" -msgstr "Ikke tillat BLOB eller BLOB og BINARY felter fra redigering" +msgstr "Ikke tillat BLOB eller BLOB og BINARY kolonner å bli redigert" #: setup/lib/messages.inc.php:225 -#, fuzzy #| msgid "Protect binary fields" msgid "Protect binary columns" -msgstr "Beskytt binære felter" +msgstr "Beskytt binære kolonner" #: setup/lib/messages.inc.php:226 msgid "" @@ -7566,7 +7535,6 @@ msgid "PDF schema: table coordinates" msgstr "PDF schema: tabellkoordinater" #: setup/lib/messages.inc.php:320 -#, fuzzy #| msgid "" #| "Table to describe the display fields, leave blank for no support; " #| "suggested: [kbd]pma_table_info[/kbd]" @@ -7574,14 +7542,13 @@ msgid "" "Table to describe the display columns, leave blank for no support; " "suggested: [kbd]pma_table_info[/kbd]" msgstr "" -"Tabell for beskrivelse av visningsfelter, la stå tom for ingen støtte; " +"Tabell for beskrivelse av visningskolonner, la stå tom for ingen støtte; " "anbefalt: [kbd]pma_table_info[/kbd]" #: setup/lib/messages.inc.php:321 -#, fuzzy #| msgid "Display fields table" msgid "Display columns table" -msgstr "Visningsfelttabell" +msgstr "Visningskolonnetabell" #: setup/lib/messages.inc.php:323 msgid "User for config auth" @@ -7612,7 +7579,6 @@ msgid "Verbose name of this server" msgstr "Fult navn for denne tjeneren" #: setup/lib/messages.inc.php:329 -#, fuzzy #| msgid "" #| "Whether a user should be displayed a "show all (records)" button" msgid "Whether a user should be displayed a "show all (rows)" button" @@ -7908,12 +7874,11 @@ msgid "Ignore" msgstr "Ignorer" #: tbl_change.php:728 -#, fuzzy #| msgid " Because of its length,<br /> this field might not be editable " msgid " Because of its length,<br /> this column might not be editable " msgstr "" -" På grunn av sin lengde,<br /> så vil muligens dette feltet ikke være " -"redigerbart " +" På grunn av sin lengde,<br /> så vil muligens denne kolonnen ikke være " +"redigerbar" #: tbl_change.php:888 msgid "Remove BLOB Repository Reference" @@ -8204,10 +8169,9 @@ msgid "Operator" msgstr "Operator" #: tbl_select.php:270 -#, fuzzy #| msgid "Select fields (at least one):" msgid "Select columns (at least one):" -msgstr "Velg felt (minst ett):" +msgstr "Velg kolonner (minst ett):" #: tbl_select.php:288 msgid "Add search conditions (body of the \"where\" clause):" @@ -8231,10 +8195,10 @@ msgid "None" msgstr "Ingen" #: tbl_structure.php:374 -#, fuzzy, php-format +#, php-format #| msgid "Table %s has been dropped" msgid "Column %s has been dropped" -msgstr "Tabellen %s har blitt slettet" +msgstr "Kolonne %s har blitt slettet" #: tbl_structure.php:385 #, php-format @@ -8255,7 +8219,6 @@ msgid "Propose table structure" msgstr "Foreslå tabellstruktur" #: tbl_structure.php:540 -#, fuzzy #| msgid "Add new field" msgid "Add field" msgstr "Legg til felt" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4530-g1fa03ca
by Michal Čihař 01 Jun '10

01 Jun '10

The branch, master has been updated via 1fa03caf63121499e04df2086ea9eaf0a89aa9f2 (commit) from 573a4ef3100d37bc35406bc177f2ddfe6ad15019 (commit) - Log ----------------------------------------------------------------- commit 1fa03caf63121499e04df2086ea9eaf0a89aa9f2 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jun 1 08:05:49 2010 +0200 Unify Czech terminology for relational databases as well. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 194 +++++++++++++++++++++++++------------------------------------- 1 files changed, 79 insertions(+), 115 deletions(-) diff --git a/po/cs.po b/po/cs.po index 2fdd3dd..046c09b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-31 14:33-0400\n" -"PO-Revision-Date: 2010-05-31 14:14+0200\n" +"PO-Revision-Date: 2010-06-01 08:05+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "MIME-Version: 1.0\n" @@ -113,10 +113,9 @@ msgstr "Komentář k tabulce" #: tbl_indexes.php:189 tbl_printview.php:142 tbl_relation.php:402 #: tbl_select.php:135 tbl_structure.php:177 tbl_tracking.php:273 #: tbl_tracking.php:324 -#, fuzzy #| msgid "Column names" msgid "Column" -msgstr "Názvy sloupců" +msgstr "Pole" #: db_datadict.php:175 db_printview.php:106 libraries/Index.class.php:443 #: libraries/db_events.inc.php:31 libraries/db_routines.inc.php:42 @@ -397,7 +396,7 @@ msgstr "Váš SQL-dotaz byl úspěšně vykonán" #: db_qbe.php:42 msgid "You have to choose at least one column to display" -msgstr "Musíte zvolit alespoň jeden sloupec, který chcete zobrazit" +msgstr "Musíte zvolit alespoň jedno pole, které chcete zobrazit" #: db_qbe.php:200 libraries/db_structure.lib.php:104 #: libraries/display_tbl.lib.php:866 @@ -451,16 +450,14 @@ msgid "Modify" msgstr "Úpravy" #: db_qbe.php:584 -#, fuzzy #| msgid "Add/Delete Criteria Row" msgid "Add/Delete criteria rows" msgstr "Přidat nebo odebrat řádek" #: db_qbe.php:596 -#, fuzzy #| msgid "Add/Delete Field Columns" msgid "Add/Delete columns" -msgstr "Přidat nebo odebrat sloupec" +msgstr "Přidat nebo odebrat pole" #: db_qbe.php:609 db_qbe.php:634 msgid "Update Query" @@ -554,7 +551,6 @@ msgid "Inside table(s):" msgstr "V tabulkách:" #: db_search.php:355 -#, fuzzy #| msgid "Inside field:" msgid "Inside column:" msgstr "Uvnitř pole:" @@ -621,8 +617,8 @@ msgstr "Sledování není zapnuté." #: db_structure.php:420 libraries/display_tbl.lib.php:1944 #, php-format msgid "" -"This view has at least this number of rows. Please refer to %sdocumentation%" -"s." +"This view has at least this number of rows. Please refer to %sdocumentation" +"%s." msgstr "" "Tento pohled má alespoň tolik řádek. Podrobnosti naleznete v %sdokumentaci%s." @@ -813,8 +809,8 @@ msgstr "Výpis byl uložen do souboru %s." #: import.php:60 #, php-format msgid "" -"You probably tried to upload too large file. Please refer to %sdocumentation%" -"s for ways to workaround this limit." +"You probably tried to upload too large file. Please refer to %sdocumentation" +"%s for ways to workaround this limit." msgstr "" "Pravděpodobně jste se pokusili nahrát příliš velký soubor. Přečtěte si " "prosím %sdokumentaci%s, jak toto omezení obejít." @@ -1005,10 +1001,9 @@ msgid "Please select the primary key or a unique key" msgstr "Zvolte, prosím, primární nebo unikátní klíč" #: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 -#, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" -msgstr "Zvolte které sloupce zobrazit" +msgstr "Zvolte která pole zobrazit" #. l10n: Display text for calendar close link #: js/messages.php:73 @@ -1478,8 +1473,8 @@ msgstr "Vítejte v %s" #: libraries/auth/config.auth.lib.php:107 #, php-format msgid "" -"You probably did not create a configuration file. You might want to use the %" -"1$ssetup script%2$s to create one." +"You probably did not create a configuration file. You might want to use the " +"%1$ssetup script%2$s to create one." msgstr "" "Pravděpodobná příčina je, že nemáte vytvořený konfigurační soubor. Pro jeho " "vytvoření by se vám mohl hodit %1$snastavovací skript%2$s." @@ -1986,10 +1981,9 @@ msgid "No Privileges" msgstr "Nemáte oprávnění" #: libraries/display_create_table.lib.php:41 -#, fuzzy #| msgid "Table must have at least one field." msgid "Table must have at least one column." -msgstr "Tabulka musí mít alespoň jeden sloupec." +msgstr "Tabulka musí mít alespoň jedno pole." #: libraries/display_create_table.lib.php:48 #, php-format @@ -1997,10 +1991,9 @@ msgid "Create table on database %s" msgstr "Vytvořit novou tabulku v databázi %s" #: libraries/display_create_table.lib.php:57 -#, fuzzy #| msgid "Number of fields" msgid "Number of columns" -msgstr "Počet sloupců" +msgstr "Počet polí" #: libraries/display_export.lib.php:42 msgid "Could not load export plugins, please check your installation!" @@ -2008,7 +2001,7 @@ msgstr "" "Nepodařilo se nahrát pluginy pro export, zkontrolujte prosím vaší instalaci!" #: libraries/display_export.lib.php:107 -#, fuzzy, php-format +#, php-format #| msgid "Dump %s row(s) starting at record # %s" msgid "Dump %s row(s) starting at row # %s" msgstr "Vypsat %s řádků od %s" @@ -2050,8 +2043,8 @@ msgstr "jméno tabulky" #, php-format msgid "" "This value is interpreted using %1$sstrftime%2$s, so you can use time " -"formatting strings. Additionally the following transformations will happen: %" -"3$s. Other text will be kept as is." +"formatting strings. Additionally the following transformations will happen: " +"%3$s. Other text will be kept as is." msgstr "" "Tato hodnota je interpretována pomocí %1$sstrftime%2$s, takže můžete použít " "libovolné řetězce pro formátování data a času. Dále budou provedena " @@ -2168,10 +2161,9 @@ msgstr "" "může to způsobit problémy s transakcemi." #: libraries/display_import.lib.php:239 setup/lib/messages.inc.php:161 -#, fuzzy #| msgid "Number of records (queries) to skip from start" msgid "Number of queries to skip from start" -msgstr "Počet záznamů (dotazů) od začátku, které se mají přeskočit" +msgstr "Počet dotazů od začátku, které se mají přeskočit" #: libraries/display_import.lib.php:255 setup/lib/messages.inc.php:160 msgid "Format of imported file" @@ -2228,7 +2220,6 @@ msgid "%d is not valid row number." msgstr "%d není platné číslo řádku." #: libraries/display_tbl.lib.php:310 -#, fuzzy #| msgid "row(s) starting from record #" msgid "row(s) starting from row #" msgstr "řádků začínající od" @@ -2288,10 +2279,9 @@ msgid "Relational key" msgstr "Relační klíč" #: libraries/display_tbl.lib.php:588 -#, fuzzy #| msgid "Relational display field" msgid "Relational display column" -msgstr "Položka k zobrazení v relacích" +msgstr "Pole pro zobrazení v relacích" #: libraries/display_tbl.lib.php:595 msgid "Show binary contents" @@ -2710,24 +2700,21 @@ msgstr "CSV" #: libraries/export/csv.php:21 libraries/import/csv.php:27 #: libraries/import/csv.php:59 libraries/import/ldi.php:40 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns terminated by" -msgstr "Řádky ukončené" +msgstr "Pole oddělené" #: libraries/export/csv.php:22 libraries/import/csv.php:28 #: libraries/import/csv.php:71 libraries/import/ldi.php:41 -#, fuzzy #| msgid "Fields enclosed by" msgid "Columns enclosed by" -msgstr "Názvy sloupců uzavřené" +msgstr "Pole uzavřené do" #: libraries/export/csv.php:23 libraries/import/csv.php:29 #: libraries/import/csv.php:75 libraries/import/ldi.php:42 -#, fuzzy #| msgid "Fields escaped by" msgid "Columns escaped by" -msgstr "Názvy sloupců escapovány" +msgstr "Pole escapována" #: libraries/export/csv.php:24 libraries/import/csv.php:30 #: libraries/import/csv.php:79 libraries/import/ldi.php:43 @@ -2743,20 +2730,18 @@ msgid "Replace NULL by" msgstr "Nahradit NULL hodnoty" #: libraries/export/csv.php:26 libraries/export/excel.php:23 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove CRLF characters within columns" -msgstr "Odstranit znaky CRLF z položek" +msgstr "Odstranit znaky CRLF z polí" #: libraries/export/csv.php:27 libraries/export/excel.php:24 #: libraries/export/htmlword.php:26 libraries/export/latex.php:57 #: libraries/export/ods.php:24 libraries/export/odt.php:50 #: libraries/export/texytext.php:34 libraries/export/xls.php:24 #: libraries/export/xlsx.php:24 -#, fuzzy #| msgid "Put fields names in the first row" msgid "Put columns names in the first row" -msgstr "Přidat jména sloupců na první řádek" +msgstr "Přidat jména polí na první řádek" #: libraries/export/excel.php:18 msgid "CSV for MS Excel" @@ -2891,10 +2876,9 @@ msgid "Database export options" msgstr "Nastavení exportu databází" #: libraries/export/sql.php:80 -#, fuzzy #| msgid "Enclose table and field names with backquotes" msgid "Enclose table and column names with backquotes" -msgstr "Použít zpětné uvozovky u jmen tabulek a sloupců" +msgstr "Použít zpětné uvozovky u jmen tabulek a polí" #: libraries/export/sql.php:86 msgid "Add into comments" @@ -3087,12 +3071,12 @@ msgstr "Ignorovat duplicitní řádky" #: libraries/import/csv.php:37 libraries/import/ods.php:25 #: libraries/import/xls.php:24 libraries/import/xlsx.php:24 msgid "Column names in first row" -msgstr "Jména sloupců na prvním řádku" +msgstr "Jména polí na prvním řádku" #: libraries/import/csv.php:40 libraries/import/ldi.php:44 pdf_pages.php:502 #: view_create.php:148 msgid "Column names" -msgstr "Názvy sloupců" +msgstr "Názvy polí" #: libraries/import/csv.php:58 libraries/import/csv.php:70 #: libraries/import/csv.php:74 libraries/import/csv.php:78 @@ -3103,7 +3087,7 @@ msgstr "Neznámý parametr pro import CSV: %s" #: libraries/import/csv.php:119 #, php-format msgid "Invalid column (%s) specified!" -msgstr "Byl zadán chybný sloupec (%s)!" +msgstr "Byl zadáno chybné pole (%s)!" #: libraries/import/csv.php:177 libraries/import/csv.php:424 #, php-format @@ -3111,10 +3095,10 @@ msgid "Invalid format of CSV input on line %d." msgstr "Chybný formát CSV dat na řádku %d." #: libraries/import/csv.php:312 -#, fuzzy, php-format +#, php-format #| msgid "Invalid field count in CSV input on line %d." msgid "Invalid column count in CSV input on line %d." -msgstr "Chybný počet položek v CSV datech na řádku %d." +msgstr "Chybný počet polí v CSV datech na řádku %d." #: libraries/import/docsql.php:29 msgid "DocSQL" @@ -3488,7 +3472,7 @@ msgid "" "if you are doing an index scan." msgstr "" "Počet požadavků na přečtení dalšího řádku podle indexu. Tato hodnota se " -"zvětšuje pokud provádíte dotaz na indexovaný sloupec s omezením rozsahu nebo " +"zvětšuje pokud provádíte dotaz na indexované pole s omezením rozsahu nebo " "prohledáváte index." #: libraries/messages.inc.php:77 @@ -4269,14 +4253,14 @@ msgstr "Vytváření PDF" #: libraries/relation.lib.php:133 msgid "Displaying Column Comments" -msgstr "Zobrazuji komentáře sloupců" +msgstr "Zobrazuji komentáře polí" #: libraries/relation.lib.php:138 msgid "" "Please see the documentation on how to update your column_comments table" msgstr "" "Podívejte se prosím do dokumentace, jak aktualizovat tabulku s informacemi " -"o sloupcích (tabulka column_comments)" +"o polích (tabulka column_comments)" #: libraries/relation.lib.php:143 libraries/sql_query_form.lib.php:433 msgid "Bookmarked SQL query" @@ -4487,10 +4471,9 @@ msgid "Run SQL query/queries on database %s" msgstr "Spustit SQL dotaz(y) na databázi %s" #: libraries/sql_query_form.lib.php:317 -#, fuzzy #| msgid "Column names" msgid "Columns" -msgstr "Názvy sloupců" +msgstr "Pole" #: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" @@ -4606,7 +4589,6 @@ msgid "Length/Values" msgstr "Délka/Množina" #: libraries/tbl_properties.inc.php:105 -#, fuzzy #| msgid "" #| "If field type is \"enum\" or \"set\", please enter the values using this " #| "format: 'a','b','c'...<br />If you ever need to put a backslash (\"\\\") " @@ -4618,7 +4600,7 @@ msgid "" "a single quote (\"'\") amongst those values, precede it with a backslash " "(for example '\\\\xyz' or 'a\\'b')." msgstr "" -"Pokud je sloupec typu „enum“ nebo „set“, zadávejte hodnoty v následujícím " +"Pokud je pole typu „enum“ nebo „set“, zadávejte hodnoty v následujícím " "formátu: 'a','b','c'...<br />Pokud potřebujete zadat zpětné lomítko („\\“) " "nebo jednoduché uvozovky („'“) mezi těmito hodnotami, napište před ně zpětné " "lomítko (příklad: '\\\\xyz' nebo 'a\\'b')." @@ -4642,8 +4624,8 @@ msgid "" "For a list of available transformation options and their MIME type " "transformations, click on %stransformation descriptions%s" msgstr "" -"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na %" -"spopisy transformací%s" +"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na " +"%spopisy transformací%s" #: libraries/tbl_properties.inc.php:145 msgid "Transformation options" @@ -4676,8 +4658,8 @@ msgid "" "No description is available for this transformation.<br />Please ask the " "author what %s does." msgstr "" -"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co %" -"s dělá." +"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co " +"%s dělá." #: libraries/tbl_properties.inc.php:726 server_engines.php:58 #: tbl_operations.php:355 @@ -4696,23 +4678,21 @@ msgid "Save" msgstr "Uložit" #: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 -#, fuzzy, php-format +#, php-format #| msgid "Add column(s)" msgid "Add %s column(s)" -msgstr "Přidat sloupce" +msgstr "Přidat %s polí" #: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 -#, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." -msgstr "Musíte přidat alespoň jeden sloupec." +msgstr "Musíte přidat alespoň jedno pole." #: libraries/tbl_triggers.lib.php:29 msgid "Event" msgstr "Událost" #: libraries/transformations/application_octetstream__download.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a link to download the binary data of the field. You can use the " #| "first option to specify the filename, or use the second option as the " @@ -4725,8 +4705,8 @@ msgid "" "need to set the first option to the empty string." msgstr "" "Zobrazí odkaz na stáhnutí dat. První parametr je jméno souboru, druhý jméno " -"sloupce v tabulce obsahující jméno souboru. Pokud zadáte druhý parametr, " -"první musí být prázdný." +"pole v tabulce obsahující jméno souboru. Pokud zadáte druhý parametr, první " +"musí být prázdný." #: libraries/transformations/application_octetstream__hex.inc.php:10 msgid "" @@ -4750,7 +4730,6 @@ msgid "Displays a link to download this image." msgstr "Zobrazí odkaz na obrázek (například stáhnutí pole blob)." #: libraries/transformations/text_plain__dateformat.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a TIME, TIMESTAMP, DATETIME or numeric unix timestamp field as " #| "formatted date. The first option is the offset (in hours) which will be " @@ -4771,7 +4750,7 @@ msgid "" "gmdate() function." msgstr "" "Zobrazí datum nebo čas (TIME, TIMESTAMP, DATETIME nebo unixový timestamp v " -"numerickém sloupci). První parametr je posun (v hodinách), který bude přidán " +"numerickém poli). První parametr je posun (v hodinách), který bude přidán " "k času (výchozí je 0). Druhý parametr je formátovací řetězec. Třetí určuje " "jestli chcete zobrazit datum podle místního nastavení nebo UTC čas (použijte " "text „local“ nebo „utc“). Podle tohoto nastavení, formát má buďto syntaxi " @@ -4779,7 +4758,6 @@ msgstr "" "„utc“." #: libraries/transformations/text_plain__external.inc.php:10 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the field data " #| "via standard input. Returns the standard output of the application. The " @@ -4815,7 +4793,6 @@ msgstr "" "(výchozí je 1)." #: libraries/transformations/text_plain__formatted.inc.php:10 -#, fuzzy #| msgid "" #| "Displays the contents of the field as-is, without running it through " #| "htmlspecialchars(). That is, the field is assumed to contain valid HTML." @@ -4823,11 +4800,10 @@ msgid "" "Displays the contents of the column as-is, without running it through " "htmlspecialchars(). That is, the column is assumed to contain valid HTML." msgstr "" -"Zachová původní formátování sloupce, tak jak je uložen v databázi, bez " -"použití htmlspecialchars(). Předpokládá se, že sloupec obsahuje platné HTML." +"Zachová původní formátování pole, tak jak je uloženo v databázi, bez použití " +"htmlspecialchars(). Předpokládá se, že pole obsahuje platné HTML." #: libraries/transformations/text_plain__imagelink.inc.php:10 -#, fuzzy #| msgid "" #| "Displays an image and a link; the field contains the filename. The first " #| "option is a URL prefix like \"http://www.example.com/\". The second and " @@ -4837,12 +4813,11 @@ msgid "" "option is a URL prefix like \"http://www.example.com/\". The second and " "third options are the width and the height in pixels." msgstr "" -"Zobrazí obrázek a odkaz z pole obsahujícího odkaz na obrázek. První parametr " -"je prefix URL (například „http://mojedomena.cz/“), druhý a třetí určuje " +"Zobrazí obrázek a odkaz z pole obsahujícího odkaz na obrázek. První parametr " +"je prefix URL (například „http://www.example.com/“), druhý a třetí určuje " "šířku a výšku obrázku." #: libraries/transformations/text_plain__link.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a link; the field contains the filename. The first option is a " #| "URL prefix like \"http://www.example.com/\". The second option is a title " @@ -4852,8 +4827,8 @@ msgid "" "prefix like \"http://www.example.com/\". The second option is a title for " "the link." msgstr "" -"Zobrazí odkaz z pole obsahujícího odkaz. První parametr je prefix URL " -"(například „http://mojedomena.cz/“), druhý text odkazu." +"Zobrazí odkaz z pole obsahujícího odkaz. První parametr je prefix URL " +"(například „http://www.example.com/“), druhý text odkazu." #: libraries/transformations/text_plain__longToIpv4.inc.php:10 msgid "" @@ -5205,7 +5180,6 @@ msgid "To select relation, click :" msgstr "Pro výběr relace klikněte :" #: pmd_help.php:29 -#, fuzzy #| msgid "" #| "The display field is shown in pink. To set/unset a field as the display " #| "field, click the \"Choose field to display\" icon, then click on the " @@ -5215,8 +5189,8 @@ msgid "" "column, click the \"Choose column to display\" icon, then click on the " "appropriate column name." msgstr "" -"Zobrazované pole je označeno růžovou barvou. Pro jeho změnu klikněte na " -"ikonu „Zvolte které sloupce zobrazit“ a poté zvolte odpovídající sloupec." +"Zobrazované pole je zvýrazněno růžovou barvou. Pro jeho změnu klikněte na " +"ikonu „Zvolte které pole zobrazit“ a poté zvolte odpovídající pole." #: pmd_pdf.php:63 msgid "Page has been created" @@ -5488,8 +5462,8 @@ msgstr "Odstranit databáze se stejnými jmény jako uživatelé." msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " "tables. The content of these tables may differ from the privileges the " -"server uses, if they have been changed manually. In this case, you should %" -"sreload the privileges%s before you continue." +"server uses, if they have been changed manually. In this case, you should " +"%sreload the privileges%s before you continue." msgstr "" "Poznámka: phpMyAdmin získává oprávnění přímo z tabulek MySQL. Obsah těchto " "tabulek se může lišit od oprávnění, která server právě používá, pokud byly " @@ -5502,7 +5476,7 @@ msgstr "Zvolený uživatel nebyl nalezen v tabulce oprávnění." #: server_privileges.php:1685 msgid "Column-specific privileges" -msgstr "Oprávnění pro jednotlivé sloupce" +msgstr "Oprávnění pro jednotlivá pole" #: server_privileges.php:1886 msgid "Add privileges on the following database" @@ -5987,15 +5961,15 @@ msgstr "Rozdíl mezi daty" #: server_synchronize.php:430 server_synchronize.php:873 msgid "Add column(s)" -msgstr "Přidat sloupce" +msgstr "Přidat pole" #: server_synchronize.php:431 server_synchronize.php:874 msgid "Remove column(s)" -msgstr "Odstranit sloupce" +msgstr "Odstranit pole" #: server_synchronize.php:432 server_synchronize.php:875 msgid "Alter column(s)" -msgstr "Změnit sloupce" +msgstr "Změnit pole" #: server_synchronize.php:433 server_synchronize.php:876 msgid "Remove index(s)" @@ -6306,7 +6280,6 @@ msgstr "" "stáhnout nebo zobrazit." #: setup/lib/messages.inc.php:35 -#, fuzzy #| msgid "" #| "Defines which type of editing controls should be used for CHAR and " #| "VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]" @@ -6321,7 +6294,6 @@ msgstr "" "textová oblast[/kbd] - umožní použít odřádkování" #: setup/lib/messages.inc.php:36 -#, fuzzy #| msgid "CHAR fields editing" msgid "CHAR columns editing" msgstr "Editace polí typu CHAR" @@ -7053,7 +7025,6 @@ msgid "GZip output buffering" msgstr "Mezipaměť pro GZip výstup" #: setup/lib/messages.inc.php:217 -#, fuzzy #| msgid "" #| "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, " #| "DATETIME and TIMESTAMP, ascending order otherwise" @@ -7061,8 +7032,8 @@ msgid "" "[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, " "DATETIME and TIMESTAMP, ascending order otherwise" msgstr "" -"[kbd]SMART[/kbd] - t.j. řazení sestupně pro políčka typu TIME, DATE, " -"DATETIME a TIMESTAMP, v ostatních případech se použije vzestupné řazení" +"[kbd]SMART[/kbd] - t.j. řazení sestupně pro pole typu TIME, DATE, DATETIME a " +"TIMESTAMP, v ostatních případech se použije vzestupné řazení" #: setup/lib/messages.inc.php:218 msgid "Default sorting order" @@ -7081,16 +7052,14 @@ msgid "Iconic table operations" msgstr "Zobrazení ikon pro operace s tabulkami" #: setup/lib/messages.inc.php:224 -#, fuzzy #| msgid "Disallow BLOB and BINARY fields from editing" msgid "Disallow BLOB and BINARY columns from editing" -msgstr "Zakáže úpravu políček BLOB a BINARY" +msgstr "Zakáže úpravu polí BLOB a BINARY" #: setup/lib/messages.inc.php:225 -#, fuzzy #| msgid "Protect binary fields" msgid "Protect binary columns" -msgstr "Chránit binární políčka" +msgstr "Chránit binární pole" #: setup/lib/messages.inc.php:226 msgid "" @@ -7153,8 +7122,9 @@ msgstr "" "Nastavil jste typ autentizace [kbd]config[/kbd] a zadal jste uživatelské " "jméno a heslo pro automatické přihlášení, což není doporučená volba pro " "produkční servery. Kdokoli kdo zná URL phpMyAdminu může přímo přistoupit k " -"Vašemu phpMyAdmin panelu. Nastavte [a@?page=servers&mode=edit&id=%1" -"$d#tab_Server]typ autentizace[/a] na [kbd]cookie[/kbd] nebo [kbd]http[/kbd]." +"Vašemu phpMyAdmin panelu. Nastavte [a@?page=servers&mode=edit&id=" +"%1$d#tab_Server]typ autentizace[/a] na [kbd]cookie[/kbd] nebo [kbd]http[/" +"kbd]." #: setup/lib/messages.inc.php:239 msgid "You should use mysqli for performance reasons" @@ -7236,12 +7206,12 @@ msgid "" "Leave blank for no column comments/mime types, suggested: [kbd]" "pma_column_info[/kbd]" msgstr "" -"Nechte prázdné pro žádné komentáře či mime typy sloupců, výchozí nastavení: " +"Nechte prázdné pro žádné komentáře či mime typy polí, výchozí nastavení: " "[kbd]pma_column_info[/kbd]" #: setup/lib/messages.inc.php:257 msgid "Column information table" -msgstr "Tabulka informací o sloupcích" +msgstr "Tabulka informací o polích" #: setup/lib/messages.inc.php:258 msgid "Compress connection to MySQL server" @@ -7559,7 +7529,6 @@ msgid "PDF schema: table coordinates" msgstr "PDF schéma: tabulka souřadnic" #: setup/lib/messages.inc.php:320 -#, fuzzy #| msgid "" #| "Table to describe the display fields, leave blank for no support; " #| "suggested: [kbd]pma_table_info[/kbd]" @@ -7567,14 +7536,13 @@ msgid "" "Table to describe the display columns, leave blank for no support; " "suggested: [kbd]pma_table_info[/kbd]" msgstr "" -"Tabulka obsahující popisy sloupců, nechte prázdnou pro vypnutí této funkce. " +"Tabulka obsahující popisy polí, nechte prázdnou pro vypnutí této funkce. " "Výchozí hodnota: [kbd]pma_table_info[/kbd]" #: setup/lib/messages.inc.php:321 -#, fuzzy #| msgid "Display fields table" msgid "Display columns table" -msgstr "Tabulka s popisem sloupců" +msgstr "Tabulka s popisem polí" #: setup/lib/messages.inc.php:323 msgid "User for config auth" @@ -7604,7 +7572,6 @@ msgid "Verbose name of this server" msgstr "Dlouhé jméno tohoto serveru" #: setup/lib/messages.inc.php:329 -#, fuzzy #| msgid "" #| "Whether a user should be displayed a "show all (records)" button" msgid "Whether a user should be displayed a "show all (rows)" button" @@ -7900,10 +7867,9 @@ msgid "Ignore" msgstr "Ignorovat" #: tbl_change.php:728 -#, fuzzy #| msgid " Because of its length,<br /> this field might not be editable " msgid " Because of its length,<br /> this column might not be editable " -msgstr " Tento sloupec možná nepůjde <br />kvůli délce upravit " +msgstr " Toto pole možná nepůjde <br />kvůli délce upravit " #: tbl_change.php:888 msgid "Remove BLOB Repository Reference" @@ -8007,11 +7973,11 @@ msgstr "(„PRIMARY“ <b>musí</b> být jméno <b>pouze</b> primárního klíč #: tbl_indexes.php:251 #, php-format msgid "Add to index  %s column(s)" -msgstr "Přidat %s sloupců do indexu" +msgstr "Přidat %s polí do indexu" #: tbl_indexes.php:256 tbl_structure.php:589 tbl_structure.php:600 msgid "Column count has to be larger than zero." -msgstr "Počet sloupců musí být větší než nula." +msgstr "Počet polí musí být větší než nula." #: tbl_move_copy.php:46 msgid "Can't move table to same one!" @@ -8160,7 +8126,7 @@ msgstr " Velikost řádku " #: tbl_relation.php:279 #, php-format msgid "Error creating foreign key on %1$s (check data types)" -msgstr "Chyba při vytváření cizího klíče na %1$s (zkotrolujte typ sloupce)" +msgstr "Chyba při vytváření cizího klíče na %1$s (zkotrolujte typ pole)" #: tbl_relation.php:405 msgid "Internal relation" @@ -8190,10 +8156,9 @@ msgid "Operator" msgstr "Operátor" #: tbl_select.php:270 -#, fuzzy #| msgid "Select fields (at least one):" msgid "Select columns (at least one):" -msgstr "Zvolte sloupec (alespoň jeden):" +msgstr "Zvolte pole (alespoň jedno):" #: tbl_select.php:288 msgid "Add search conditions (body of the \"where\" clause):" @@ -8217,10 +8182,10 @@ msgid "None" msgstr "Žádná" #: tbl_structure.php:374 -#, fuzzy, php-format +#, php-format #| msgid "Table %s has been dropped" msgid "Column %s has been dropped" -msgstr "Tabulka %s byla odstraněna" +msgstr "Pole %s byla odstraněno" #: tbl_structure.php:385 #, php-format @@ -8230,7 +8195,7 @@ msgstr "V tabulce %s byl vytvořen primární klíč" #: tbl_structure.php:400 tbl_structure.php:414 tbl_structure.php:428 #, php-format msgid "An index has been added on %s" -msgstr "Na sloupci %s byl vytvořen index" +msgstr "Na poli %s byl vytvořen index" #: tbl_structure.php:506 tbl_structure.php:508 msgid "Relation view" @@ -8241,10 +8206,9 @@ msgid "Propose table structure" msgstr "Navrhnout strukturu tabulky" #: tbl_structure.php:540 -#, fuzzy #| msgid "Add new field" msgid "Add field" -msgstr "Přidat sloupec" +msgstr "Přidat pole" #: tbl_structure.php:554 msgid "At End of Table" @@ -8262,7 +8226,7 @@ msgstr "Po %s" #: tbl_structure.php:594 #, php-format msgid "Create an index on  %s columns" -msgstr "Vytvořit index na  %s sloupcích" +msgstr "Vytvořit index na  %s polích" #: tbl_structure.php:756 msgid "partitioned" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4529-g573a4ef
by Michal Čihař 01 Jun '10

01 Jun '10

The branch, master has been updated via 573a4ef3100d37bc35406bc177f2ddfe6ad15019 (commit) via 82617641d9d9569eb7f76f978a12b4f95384af1f (commit) via ed1ddacc8ed22225c9f6002b99ed51724c7e20e3 (commit) via f37d7197876d236de515876b84b86460a01518b5 (commit) via 41d8f5ca032e1070aad770a4d7bbb74af2e127d4 (commit) via c18d71bf2c620b615bffec3a15186a63b33ef020 (commit) via 514f616e2c5aea04f7e5cdbc2b8dc6dd5936fc22 (commit) via 147b3c7f8cab8e7721a659fbc022538f8ec89581 (commit) via 17716294272bb1ec34125a955cd216a540dc6fc8 (commit) via cbe83b9e7a1a90d0a483cbc60dbb8adf6818df31 (commit) via 6c8b97b8d475158c257905314441736fd6d10064 (commit) via 60ec9ddbcde794af6d6f9e350c033628433d89d2 (commit) via 1de467e4776a66f2de1f6e3c9347f803dccd3e8e (commit) via 54cbc0cf345ed41f0e201f91025d90b731dcdeed (commit) via a39803235f4fd27dde3c7432921d19921b75d9e3 (commit) via 9c4a4ff3f3639698b2ce6685c62b45bf91a73a26 (commit) via 2b40013c36c34cd964b4955a1d8abf15b3c5ae38 (commit) via 2f3fa6268d6df058c3f91204fdd24ff8e2d17639 (commit) via 33ef9911626a89c85977da6384495b087f626b0b (commit) via 2ee8aad04e13f85533ca156c9770b1363511df1f (commit) via 1654b7591c29aabd336e623a2cec15720bd03aec (commit) via 5428cb84eeebf4df76cb2031cd285902adef16d2 (commit) via 190b6b761dc6e0e3f1c7cefc8f25da489a82f2e8 (commit) via 2826e0d257afef0241e7e0e0f488ca2a1e9104bc (commit) via 6d5688c926361dce6b591c9ddf7044b0ce62a88c (commit) via c0726ec15c8a1abf29d9d5cd18438660f5950a7f (commit) via e13fe11f4cc94a7be0a0230284a8368de3b84e09 (commit) via 7dd8009b3ab1c6ae5b0d713eeee223e08740faae (commit) via e66e73ab84322ca9792ba62263e210c28ca1a3e6 (commit) via ef4a64a84807d8244b619784b7b743ceaa69f6e3 (commit) via 550b631464a2d5542aa2775eb003f23f15d3ab6f (commit) via 91b0a785962d267da454fff6e2b7b39fddb7a736 (commit) via 6811f2e80b91ee002d0adfc1da2858214931675d (commit) via bdb8e47aff8c3ef55fdf955d1493a1464f945681 (commit) via 1b21e16a13b8dc1b85b0a7fd4ee9fb3383819b44 (commit) via 240fa69c2aa583989b6cc32779d5074a4eeae710 (commit) via 078330c1c34a685cfc840a4e4db5c3276a0acc7a (commit) via 803df564cb937384dc2c1a7816dcd02b29c616c0 (commit) via 02cdea30ed8abb0bb9c9e593d30b379f342401cd (commit) from cb453c98f8bc18d454b2c9d292f0699a3f48b453 (commit) - Log ----------------------------------------------------------------- commit 573a4ef3100d37bc35406bc177f2ddfe6ad15019 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 01:03:09 2010 +0200 Translation update done using Pootle. commit 82617641d9d9569eb7f76f978a12b4f95384af1f Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:53:06 2010 +0200 Translation update done using Pootle. commit ed1ddacc8ed22225c9f6002b99ed51724c7e20e3 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:52:56 2010 +0200 Translation update done using Pootle. commit f37d7197876d236de515876b84b86460a01518b5 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:52:27 2010 +0200 Translation update done using Pootle. commit 41d8f5ca032e1070aad770a4d7bbb74af2e127d4 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:52:14 2010 +0200 Translation update done using Pootle. commit c18d71bf2c620b615bffec3a15186a63b33ef020 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:52:05 2010 +0200 Translation update done using Pootle. commit 514f616e2c5aea04f7e5cdbc2b8dc6dd5936fc22 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:51:39 2010 +0200 Translation update done using Pootle. commit 147b3c7f8cab8e7721a659fbc022538f8ec89581 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:51:07 2010 +0200 Translation update done using Pootle. commit 17716294272bb1ec34125a955cd216a540dc6fc8 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:51:00 2010 +0200 Translation update done using Pootle. commit cbe83b9e7a1a90d0a483cbc60dbb8adf6818df31 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:50:52 2010 +0200 Translation update done using Pootle. commit 6c8b97b8d475158c257905314441736fd6d10064 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:50:34 2010 +0200 Translation update done using Pootle. commit 60ec9ddbcde794af6d6f9e350c033628433d89d2 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:49:58 2010 +0200 Translation update done using Pootle. commit 1de467e4776a66f2de1f6e3c9347f803dccd3e8e Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:49:43 2010 +0200 Translation update done using Pootle. commit 54cbc0cf345ed41f0e201f91025d90b731dcdeed Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:48:56 2010 +0200 Translation update done using Pootle. commit a39803235f4fd27dde3c7432921d19921b75d9e3 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:48:29 2010 +0200 Translation update done using Pootle. commit 9c4a4ff3f3639698b2ce6685c62b45bf91a73a26 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:46:34 2010 +0200 Translation update done using Pootle. commit 2b40013c36c34cd964b4955a1d8abf15b3c5ae38 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:46:26 2010 +0200 Translation update done using Pootle. commit 2f3fa6268d6df058c3f91204fdd24ff8e2d17639 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:46:14 2010 +0200 Translation update done using Pootle. commit 33ef9911626a89c85977da6384495b087f626b0b Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:45:43 2010 +0200 Translation update done using Pootle. commit 2ee8aad04e13f85533ca156c9770b1363511df1f Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:45:15 2010 +0200 Translation update done using Pootle. commit 1654b7591c29aabd336e623a2cec15720bd03aec Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:44:49 2010 +0200 Translation update done using Pootle. commit 5428cb84eeebf4df76cb2031cd285902adef16d2 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:44:42 2010 +0200 Translation update done using Pootle. commit 190b6b761dc6e0e3f1c7cefc8f25da489a82f2e8 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:44:34 2010 +0200 Translation update done using Pootle. commit 2826e0d257afef0241e7e0e0f488ca2a1e9104bc Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:44:18 2010 +0200 Translation update done using Pootle. commit 6d5688c926361dce6b591c9ddf7044b0ce62a88c Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:44:08 2010 +0200 Translation update done using Pootle. commit c0726ec15c8a1abf29d9d5cd18438660f5950a7f Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:44:01 2010 +0200 Translation update done using Pootle. commit e13fe11f4cc94a7be0a0230284a8368de3b84e09 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:43:53 2010 +0200 Translation update done using Pootle. commit 7dd8009b3ab1c6ae5b0d713eeee223e08740faae Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:43:44 2010 +0200 Translation update done using Pootle. commit e66e73ab84322ca9792ba62263e210c28ca1a3e6 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:43:33 2010 +0200 Translation update done using Pootle. commit ef4a64a84807d8244b619784b7b743ceaa69f6e3 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:43:17 2010 +0200 Translation update done using Pootle. commit 550b631464a2d5542aa2775eb003f23f15d3ab6f Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:43:08 2010 +0200 Translation update done using Pootle. commit 91b0a785962d267da454fff6e2b7b39fddb7a736 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:42:54 2010 +0200 Translation update done using Pootle. commit 6811f2e80b91ee002d0adfc1da2858214931675d Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:42:32 2010 +0200 Translation update done using Pootle. commit bdb8e47aff8c3ef55fdf955d1493a1464f945681 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:42:25 2010 +0200 Translation update done using Pootle. commit 1b21e16a13b8dc1b85b0a7fd4ee9fb3383819b44 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:42:16 2010 +0200 Translation update done using Pootle. commit 240fa69c2aa583989b6cc32779d5074a4eeae710 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:40:08 2010 +0200 Translation update done using Pootle. commit 078330c1c34a685cfc840a4e4db5c3276a0acc7a Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:39:59 2010 +0200 Translation update done using Pootle. commit 803df564cb937384dc2c1a7816dcd02b29c616c0 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:39:52 2010 +0200 Translation update done using Pootle. commit 02cdea30ed8abb0bb9c9e593d30b379f342401cd Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 00:33:14 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sl.po | 164 ++++++++++++++++++++++++------------------------------------- 1 files changed, 65 insertions(+), 99 deletions(-) diff --git a/po/sl.po b/po/sl.po index a4fe354..6fb2b53 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-31 14:33-0400\n" -"PO-Revision-Date: 2010-05-31 01:57+0200\n" +"PO-Revision-Date: 2010-06-01 01:03+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\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" +"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" #: browse_foreigners.php:38 browse_foreigners.php:59 @@ -111,10 +111,9 @@ msgstr "Komentar tabele" #: tbl_indexes.php:189 tbl_printview.php:142 tbl_relation.php:402 #: tbl_select.php:135 tbl_structure.php:177 tbl_tracking.php:273 #: tbl_tracking.php:324 -#, fuzzy #| msgid "Column names" msgid "Column" -msgstr "Imena stolpcev" +msgstr "Stolpec" #: db_datadict.php:175 db_printview.php:106 libraries/Index.class.php:443 #: libraries/db_events.inc.php:31 libraries/db_routines.inc.php:42 @@ -450,16 +449,14 @@ msgid "Modify" msgstr "Spremeni" #: db_qbe.php:584 -#, fuzzy #| msgid "Add/Delete Criteria Row" msgid "Add/Delete criteria rows" -msgstr "Dodaj/Odstrani vrstico kriterij" +msgstr "Dodaj/Odstrani vrstice meril" #: db_qbe.php:596 -#, fuzzy #| msgid "Add/Delete Field Columns" msgid "Add/Delete columns" -msgstr "Dodaj/Odstrani stolpce polj" +msgstr "Dodaj/Odstrani stolpce" #: db_qbe.php:609 db_qbe.php:634 msgid "Update Query" @@ -553,10 +550,9 @@ msgid "Inside table(s):" msgstr "V tabelah:" #: db_search.php:355 -#, fuzzy #| msgid "Inside field:" msgid "Inside column:" -msgstr "V polju:" +msgstr "V stolpcu:" #: db_structure.php:81 db_structure.php:82 db_structure.php:94 #: db_structure.php:95 db_structure.php:107 db_structure.php:108 @@ -1005,10 +1001,9 @@ msgid "Please select the primary key or a unique key" msgstr "Prosimo, izberite primarni ključ ali unikatni ključ" #: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 -#, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" -msgstr "Izberite polje za prikaz" +msgstr "Izberite stolpec za prikaz" #. l10n: Display text for calendar close link #: js/messages.php:73 @@ -1990,10 +1985,9 @@ msgid "No Privileges" msgstr "Brez privilegijev" #: libraries/display_create_table.lib.php:41 -#, fuzzy #| msgid "Table must have at least one field." msgid "Table must have at least one column." -msgstr "Tabele morajo imeti vsaj eno polje." +msgstr "Tabele morajo imeti vsaj en stolpec." #: libraries/display_create_table.lib.php:48 #, php-format @@ -2001,10 +1995,9 @@ msgid "Create table on database %s" msgstr "Ustvari novo tabelo v podatkovni zbirki %s" #: libraries/display_create_table.lib.php:57 -#, fuzzy #| msgid "Number of fields" msgid "Number of columns" -msgstr "Število polj" +msgstr "Število stolpcev" #: libraries/display_export.lib.php:42 msgid "Could not load export plugins, please check your installation!" @@ -2012,10 +2005,10 @@ msgstr "" "Ne morem naložiti vtičnikov za izvoz, prosimo, preverite vašo namestitev!" #: libraries/display_export.lib.php:107 -#, fuzzy, php-format +#, php-format #| msgid "Dump %s row(s) starting at record # %s" msgid "Dump %s row(s) starting at row # %s" -msgstr "Odloži %s vrstic, začni z zapisom # %s" +msgstr "Odloži %s vrstic, začni pri vrstici # %s" #: libraries/display_export.lib.php:115 msgid "Dump all rows" @@ -2170,10 +2163,9 @@ msgstr "" "prekine transakcije." #: libraries/display_import.lib.php:239 setup/lib/messages.inc.php:161 -#, fuzzy #| msgid "Number of records (queries) to skip from start" msgid "Number of queries to skip from start" -msgstr "Število zapisov (poizvedb), ki jih naj preskočim od začetka" +msgstr "Število poizvedb, ki jih naj preskočim od začetka" #: libraries/display_import.lib.php:255 setup/lib/messages.inc.php:160 msgid "Format of imported file" @@ -2230,10 +2222,9 @@ msgid "%d is not valid row number." msgstr "%d ni veljavna številka vrstice." #: libraries/display_tbl.lib.php:310 -#, fuzzy #| msgid "row(s) starting from record #" msgid "row(s) starting from row #" -msgstr "vrstic naprej od zapisa #" +msgstr "vrstic naprej od vrstice #" #: libraries/display_tbl.lib.php:316 msgid "horizontal" @@ -2290,10 +2281,9 @@ msgid "Relational key" msgstr "Relacijski ključ" #: libraries/display_tbl.lib.php:588 -#, fuzzy #| msgid "Relational display field" msgid "Relational display column" -msgstr "Relacijsko prikazno polje" +msgstr "Relacijski prikazni stolpec" #: libraries/display_tbl.lib.php:595 msgid "Show binary contents" @@ -2717,24 +2707,21 @@ msgstr "CSV-podatki" #: libraries/export/csv.php:21 libraries/import/csv.php:27 #: libraries/import/csv.php:59 libraries/import/ldi.php:40 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns terminated by" -msgstr "Vrstice zaključene z" +msgstr "Stolpci zaključeni z" #: libraries/export/csv.php:22 libraries/import/csv.php:28 #: libraries/import/csv.php:71 libraries/import/ldi.php:41 -#, fuzzy #| msgid "Fields enclosed by" msgid "Columns enclosed by" -msgstr "Polja obdana z" +msgstr "Stolpci obdani z" #: libraries/export/csv.php:23 libraries/import/csv.php:29 #: libraries/import/csv.php:75 libraries/import/ldi.php:42 -#, fuzzy #| msgid "Fields escaped by" msgid "Columns escaped by" -msgstr "Polja izognjena z" +msgstr "Stolpci izognjeni z" #: libraries/export/csv.php:24 libraries/import/csv.php:30 #: libraries/import/csv.php:79 libraries/import/ldi.php:43 @@ -2750,20 +2737,18 @@ msgid "Replace NULL by" msgstr "Zamenjaj NULL z" #: libraries/export/csv.php:26 libraries/export/excel.php:23 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove CRLF characters within columns" -msgstr "Odstrani znake CRLF znotraj polj" +msgstr "Odstrani znake CRLF znotraj stolpcev" #: libraries/export/csv.php:27 libraries/export/excel.php:24 #: libraries/export/htmlword.php:26 libraries/export/latex.php:57 #: libraries/export/ods.php:24 libraries/export/odt.php:50 #: libraries/export/texytext.php:34 libraries/export/xls.php:24 #: libraries/export/xlsx.php:24 -#, fuzzy #| msgid "Put fields names in the first row" msgid "Put columns names in the first row" -msgstr "Postavi imena polj v prvo vrstico" +msgstr "Postavi imena stolpcev v prvo vrstico" #: libraries/export/excel.php:18 msgid "CSV for MS Excel" @@ -2898,10 +2883,9 @@ msgid "Database export options" msgstr "Možnosti za izvoz zbirke podatkov" #: libraries/export/sql.php:80 -#, fuzzy #| msgid "Enclose table and field names with backquotes" msgid "Enclose table and column names with backquotes" -msgstr "Obdaj imena tabel in polj z enojnimi poševnimi narekovaji" +msgstr "Obdaj imena tabel in stolpcev z enojnimi poševnimi narekovaji" #: libraries/export/sql.php:86 msgid "Add into comments" @@ -3121,10 +3105,10 @@ msgid "Invalid format of CSV input on line %d." msgstr "Neveljavna oblika vnosa CSV v vrstici %d." #: libraries/import/csv.php:312 -#, fuzzy, php-format +#, php-format #| msgid "Invalid field count in CSV input on line %d." msgid "Invalid column count in CSV input on line %d." -msgstr "Neveljavno število polj v vnosu CSV v vrstici %d." +msgstr "Neveljavno število stolpcev v vnosu CSV v vrstici %d." #: libraries/import/docsql.php:29 msgid "DocSQL" @@ -4421,10 +4405,9 @@ msgid "Run SQL query/queries on database %s" msgstr "Izvedi poizvedbo/poizvedbe SQL na podatkovni zbirki %s" #: libraries/sql_query_form.lib.php:317 -#, fuzzy #| msgid "Column names" msgid "Columns" -msgstr "Imena stolpcev" +msgstr "Stolpci" #: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" @@ -4537,10 +4520,9 @@ msgstr "Sledenje %s.%s je aktivirano." #: libraries/tbl_properties.inc.php:105 msgid "Length/Values" -msgstr "Dolžina/Vrednosti*" +msgstr "Dolžina/Vrednosti" #: libraries/tbl_properties.inc.php:105 -#, fuzzy #| msgid "" #| "If field type is \"enum\" or \"set\", please enter the values using this " #| "format: 'a','b','c'...<br />If you ever need to put a backslash (\"\\\") " @@ -4552,10 +4534,10 @@ msgid "" "a single quote (\"'\") amongst those values, precede it with a backslash " "(for example '\\\\xyz' or 'a\\'b')." msgstr "" -"Če je polje vrste \"enum\" ali \"set\", navedite vrednosti v obliki: " -"'a','b','c' ...<br />Če želite med vrednostmi uporabiti poševnico (\"\\\") " -"ali enojni narekovaj (\"'\"), pred tem znakom vnesite poševnico (npr. '\\" -"\\xyz' ali 'a\\'b')." +"Če je stolpec vrste \"enum\" ali \"set\", navedite vrednosti v obliki: " +"'a','b','c' ...<br />Če želite med vrednostmi uporabiti poševnico (\"\\\") ali " +"enojni narekovaj (\"'\"), pred tem znakom vnesite poševnico (npr. '\\\\xyz' ali " +"'a\\'b')." #: libraries/tbl_properties.inc.php:106 msgid "" @@ -4630,23 +4612,21 @@ msgid "Save" msgstr "Shrani" #: libraries/tbl_properties.inc.php:780 tbl_structure.php:542 -#, fuzzy, php-format +#, php-format #| msgid "Add column(s)" msgid "Add %s column(s)" -msgstr "Dodaj stolpec(-ce)" +msgstr "Dodaj %s stolpec(-cev)" #: libraries/tbl_properties.inc.php:784 tbl_structure.php:536 -#, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." -msgstr "Dodati morate vsaj eno polje." +msgstr "Dodati morate vsaj en stolpec." #: libraries/tbl_triggers.lib.php:29 msgid "Event" msgstr "Dogodek" #: libraries/transformations/application_octetstream__download.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a link to download the binary data of the field. You can use the " #| "first option to specify the filename, or use the second option as the " @@ -4658,10 +4638,10 @@ msgid "" "of a column which contains the filename. If you use the second option, you " "need to set the first option to the empty string." msgstr "" -"Prikaži povezavo za prenos dvojiških podatkov polja. Prva možnost je ime " -"dvojiške datoteke. Druga možnost je možno ime polja v vrstici tabele, ki " -"vsebuje to ime datoteke. Če vnesete drugo možnost, mora biti prva možnost " -"prazna." +"Prikaže povezavo za prenos dvojiških podatkov stolpca. Uporabite lahko prvo " +"možnost za določitev imena datoteke ali uporabite drugo možnost kot ime " +"stolpca, ki vsebuje ime datoteke. Če uporabite drugo možnost, mora biti prva " +"možnost prazna." #: libraries/transformations/application_octetstream__hex.inc.php:10 msgid "" @@ -4685,7 +4665,6 @@ msgid "Displays a link to download this image." msgstr "Pokaže povezavo na grafiko (neposredni BLOB prenos, ipd.)." #: libraries/transformations/text_plain__dateformat.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a TIME, TIMESTAMP, DATETIME or numeric unix timestamp field as " #| "formatted date. The first option is the offset (in hours) which will be " @@ -4705,7 +4684,7 @@ msgid "" "documentation for PHP's strftime() function and for \"utc\" it is done using " "gmdate() function." msgstr "" -"Prikaže polje TIME, TIMESTAMP, DATETIME ali številski časovni žig unix kot " +"Prikaže stolpec TIME, TIMESTAMP, DATETIME ali številski časovni žig unix kot " "oblikovan datum. Prva možnost je odmik (v urah), ki bo dodan časovnemu žigu " "(privzeto: 0). Uporabite drugo možnost za določitev različnega niza oblike " "datuma/časa. Tretja možnost določa, ali želite videti lokalni datum ali UTC " @@ -4714,7 +4693,6 @@ msgstr "" "funkcijo strftime() in za \"utc\" se uporablja funkcija gmdate()." #: libraries/transformations/text_plain__external.inc.php:10 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the field data " #| "via standard input. Returns the standard output of the application. The " @@ -4738,18 +4716,17 @@ msgid "" "will prevent wrapping and ensure that the output appears all on one line " "(Default 1)." msgstr "" -"SAMO ZA LINUX: Zažene zunanjo aplikacijo in podaja podatke za fielddata " -"preko standardnega vhoda. Vrne standardni izhod aplikacije. Privzeto je " -"Tidy, za tiskanje HTML-kode. Zaradi varnostnih razlogov morate ročno urediti " -"datoteko libraries/transformations/text_plain__external.inc.php in vstaviti " -"orodja za zaganjanje. Prva možnost je številka programa, ki ga želite " -"uporabiti, druga možnost pa so parametri za program. Če tretji parameter " -"nastavite na 1, bo s pomočjo htmlspecialchars() pretvoril izhod (Privzeto " -"1). Če nastavite četrti parameter na 1, bi preprečil prelamljanje in " -"zagotovil, da se celotni izhod prikaže v eni vrstici (Privzeto 1)." +"SAMO ZA LINUX: Zažene zunanjo aplikacijo in podaja podatke stopcev preko " +"standardnega vhoda. Vrne standardni izhod aplikacije. Privzeto je Tidy, za " +"tiskanje HTML-kode. Zaradi varnostnih razlogov morate ročno urediti datoteko " +"libraries/transformations/text_plain__external.inc.php in vstaviti orodja " +"za zaganjanje. Prva možnost je številka programa, ki ga želite uporabiti, " +"druga možnost pa so parametri za program. Če tretji parameter nastavite na " +"1, bo s pomočjo htmlspecialchars() pretvoril izhod (Privzeto 1). Če " +"nastavite četrti parameter na 1, bi preprečil prelamljanje in zagotovil, da " +"se celotni izhod prikaže v eni vrstici (Privzeto 1)." #: libraries/transformations/text_plain__formatted.inc.php:10 -#, fuzzy #| msgid "" #| "Displays the contents of the field as-is, without running it through " #| "htmlspecialchars(). That is, the field is assumed to contain valid HTML." @@ -4757,11 +4734,10 @@ msgid "" "Displays the contents of the column as-is, without running it through " "htmlspecialchars(). That is, the column is assumed to contain valid HTML." msgstr "" -"Prikaže vsebino polja takšno, kot je, brez obdelave s htmlspecialchars(). " +"Prikaže vsebino stolpca takšno, kot je, brez obdelave s htmlspecialchars(). " "Zatorej se za polje predvideva, da vsebuje veljaven HTML." #: libraries/transformations/text_plain__imagelink.inc.php:10 -#, fuzzy #| msgid "" #| "Displays an image and a link; the field contains the filename. The first " #| "option is a URL prefix like \"http://www.example.com/\". The second and " @@ -4771,12 +4747,11 @@ msgid "" "option is a URL prefix like \"http://www.example.com/\". The second and " "third options are the width and the height in pixels." msgstr "" -"Prikaže sliko in povezavo; polje vsebuje ime datoteke. Prva možnost je " -"predpona URL, kot je \"http://www.domena.com/\". Druga in tretja možnost sta " +"Prikaže sliko in povezavo; stolpec vsebuje ime datoteke. Prva možnost je " +"predpona URL, kot je \"http://www.example.com/\". Druga in tretja možnost sta " "širina in višina v slikovnih pikah." #: libraries/transformations/text_plain__link.inc.php:10 -#, fuzzy #| msgid "" #| "Displays a link; the field contains the filename. The first option is a " #| "URL prefix like \"http://www.example.com/\". The second option is a title " @@ -4786,8 +4761,8 @@ msgid "" "prefix like \"http://www.example.com/\". The second option is a title for " "the link." msgstr "" -"Prikaže povezavo; polje vsebuje ime datoteke. Prva možnost je predpona URL, " -"kot je \"http://www.domena.com/\". Druga možnost je ime povezave." +"Prikaže povezavo; stolpec vsebuje ime datoteke. Prva možnost je predpona " +"URL, kot je \"http://www.example.com/\". Druga možnost je ime povezave." #: libraries/transformations/text_plain__longToIpv4.inc.php:10 msgid "" @@ -5010,16 +4985,14 @@ msgid "Create a page" msgstr "Ustvari novo stran" #: pdf_pages.php:310 -#, fuzzy #| msgid "Page number:" msgid "Page name" -msgstr "Številka strani:" +msgstr "Ime strani" #: pdf_pages.php:314 -#, fuzzy #| msgid "Automatic layout" msgid "Automatic layout based on" -msgstr "Samodejna postavitev" +msgstr "Samodejna postavitev temelječa na" #: pdf_pages.php:316 msgid "Internal relations" @@ -5146,7 +5119,6 @@ msgid "To select relation, click :" msgstr "Za izbiro relacije, kliknite:" #: pmd_help.php:29 -#, fuzzy #| msgid "" #| "The display field is shown in pink. To set/unset a field as the display " #| "field, click the \"Choose field to display\" icon, then click on the " @@ -5156,9 +5128,9 @@ msgid "" "column, click the \"Choose column to display\" icon, then click on the " "appropriate column name." msgstr "" -"Prikazno polje je obarvano pink. Da določite/odstranite polje kot prikazno " -"polje, kliknite ikono \"Izberite polje za prikaz\", nato pa kliknite na " -"ustrezno ime polja." +"Prikazni stolpec je obarvan pink. Da določite/odstranite stolpec kot " +"prikazni stolpec, kliknite ikono \"Izberite stolpec za prikaz\", nato pa " +"kliknite na ustrezno ime stolpca." #: pmd_pdf.php:63 msgid "Page has been created" @@ -6259,7 +6231,6 @@ msgstr "" "prenesli ali jo prikazali." #: setup/lib/messages.inc.php:35 -#, fuzzy #| msgid "" #| "Defines which type of editing controls should be used for CHAR and " #| "VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]" @@ -6269,15 +6240,14 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" -"Določa, katera vrsta urejevalnih kontrolnikov naj se uporablja za polja CHAR " -"in VARCHAR; [kbd]input[/kbd] – omogoča omejevanje dolžine vnosa, [kbd]" -"textarea[/kbd] – omogoča nove vrstice v polju" +"Določa, katera vrsta urejevalnih kontrolnikov naj se uporablja za stolpce " +"CHAR in VARCHAR; [kbd]input[/kbd] – omogoča omejevanje dolžine vnosa, " +"[kbd]textarea[/kbd] – omogoča nove vrstice v stolpcu" #: setup/lib/messages.inc.php:36 -#, fuzzy #| msgid "CHAR fields editing" msgid "CHAR columns editing" -msgstr "Urejanje polj CHAR" +msgstr "Urejanje stolpcev CHAR" #: setup/lib/messages.inc.php:37 msgid "Number of columns for CHAR/VARCHAR textareas" @@ -7006,7 +6976,6 @@ msgid "GZip output buffering" msgstr "Izhod medpomnjenja GZip" #: setup/lib/messages.inc.php:217 -#, fuzzy #| msgid "" #| "[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, " #| "DATETIME and TIMESTAMP, ascending order otherwise" @@ -7014,7 +6983,7 @@ msgid "" "[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, " "DATETIME and TIMESTAMP, ascending order otherwise" msgstr "" -"[kbd]SMART[/kbd] – tj. padajoči vrstni red za polja vrste TIME, DATE, " +"[kbd]SMART[/kbd] – tj. padajoči vrstni red za stolpce vrste TIME, DATE, " "DATETIME in TIMESTAMP, v naprotnem primeru naraščajoči vrstni red" #: setup/lib/messages.inc.php:218 @@ -7034,16 +7003,14 @@ msgid "Iconic table operations" msgstr "Ikonski posegi tabel" #: setup/lib/messages.inc.php:224 -#, fuzzy #| msgid "Disallow BLOB and BINARY fields from editing" msgid "Disallow BLOB and BINARY columns from editing" -msgstr "Prepeči urejanje polj BLOB in BINARY" +msgstr "Prepreči urejanje stolpcev BLOB in BINARY" #: setup/lib/messages.inc.php:225 -#, fuzzy #| msgid "Protect binary fields" msgid "Protect binary columns" -msgstr "Zaščiti dvojiška polja" +msgstr "Zaščiti dvojiške stolpce" #: setup/lib/messages.inc.php:226 msgid "" @@ -7514,7 +7481,6 @@ msgid "PDF schema: table coordinates" msgstr "PDF-shema: koordinate tabel" #: setup/lib/messages.inc.php:320 -#, fuzzy #| msgid "" #| "Table to describe the display fields, leave blank for no support; " #| "suggested: [kbd]pma_table_info[/kbd]" @@ -7522,7 +7488,7 @@ msgid "" "Table to describe the display columns, leave blank for no support; " "suggested: [kbd]pma_table_info[/kbd]" msgstr "" -"Tabela za opisovanje prikaznih ključev; pustite prazno, če ne želite " +"Tabela za opisovanje prikaznih stolpcev; pustite prazno, če ne želite " "podpore; predlagano: [kbd]pma_table_info[/kbd]" #: setup/lib/messages.inc.php:321 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4489-gcaa9844
by Marc Delisle 31 May '10

31 May '10

The branch, master has been updated via caa98445d818b85f0fbec0e76c64b5774b32ca22 (commit) from 5a3ebdec93d2c363f65a20b5db13e7d64e8eb861 (commit) - Log ----------------------------------------------------------------- commit caa98445d818b85f0fbec0e76c64b5774b32ca22 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon May 31 14:33:21 2010 -0400 conform to relational terminology regarding columns and rows ----------------------------------------------------------------------- Summary of changes: Documentation.html | 170 ++++++++++---------- db_datadict.php | 6 +- db_printview.php | 2 +- db_qbe.php | 6 +- db_search.php | 2 +- js/messages.php | 2 +- libraries/Index.class.php | 2 +- libraries/db_structure.lib.php | 4 +- libraries/display_create_table.lib.php | 4 +- libraries/display_export.lib.php | 2 +- libraries/display_import.lib.php | 2 +- libraries/display_tbl.lib.php | 4 +- libraries/export/csv.php | 10 +- libraries/export/excel.php | 4 +- libraries/export/htmlword.php | 4 +- libraries/export/latex.php | 4 +- libraries/export/ods.php | 2 +- libraries/export/odt.php | 4 +- libraries/export/sql.php | 2 +- libraries/export/texytext.php | 4 +- libraries/export/xls.php | 2 +- libraries/export/xlsx.php | 2 +- libraries/import/csv.php | 14 +- libraries/import/ldi.php | 6 +- libraries/sql_query_form.lib.php | 2 +- libraries/tbl_properties.inc.php | 10 +- .../application_octetstream__download.inc.php | 2 +- .../transformations/text_plain__dateformat.inc.php | 2 +- .../transformations/text_plain__external.inc.php | 2 +- .../transformations/text_plain__formatted.inc.php | 2 +- .../transformations/text_plain__imagelink.inc.php | 2 +- libraries/transformations/text_plain__link.inc.php | 2 +- pdf_schema.php | 4 +- pmd_general.php | 2 +- pmd_help.php | 2 +- setup/lib/messages.inc.php | 18 +- tbl_alter.php | 4 +- tbl_change.php | 4 +- tbl_indexes.php | 2 +- tbl_printview.php | 2 +- tbl_relation.php | 4 +- tbl_select.php | 4 +- tbl_structure.php | 10 +- tbl_tracking.php | 4 +- 44 files changed, 176 insertions(+), 172 deletions(-) diff --git a/Documentation.html b/Documentation.html index 3a97d27..659cd68 100644 --- a/Documentation.html +++ b/Documentation.html @@ -101,8 +101,8 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <h3>Currently phpMyAdmin can:</h3> -<ul><li>browse and drop databases, tables, views, fields and indexes</li> - <li>create, copy, drop, rename and alter databases, tables, fields and +<ul><li>browse and drop databases, tables, views, columns and indexes</li> + <li>create, copy, drop, rename and alter databases, tables, columns and indexes</li> <li>maintenance server, databases and tables, with proposals on server configuration</li> @@ -328,7 +328,7 @@ rm -rf config # remove not needed directory <p> For a whole set of new features (bookmarks, comments, <abbr title="structured query language">SQL</abbr>-history, tracking mechanism, - <abbr title="Portable Document Format">PDF</abbr>-generation, field contents + <abbr title="Portable Document Format">PDF</abbr>-generation, column contents transformation, etc.) you need to create a set of special tables. Those tables can be located in your own database, or in a central database for a multi-user installation (this database would then be accessed by the @@ -893,17 +893,17 @@ since this link provides funding for phpMyAdmin. <span id="cfg_Servers_relation">$cfg['Servers'][$i]['relation']</span> string </dt> <dd>Since release 2.2.4 you can describe, in a special 'relation' table, - which field is a key in another table (a foreign key). phpMyAdmin + which column is a key in another table (a foreign key). phpMyAdmin currently uses this to <ul><li>make clickable, when you browse the master table, the data values that point to the foreign table;</li> - <li>display in an optional tool-tip the "display field" + <li>display in an optional tool-tip the "display column" when browsing the master table, if you move the mouse to a column containing a foreign key (use also the 'table_info' table);<br /> (see <a href="#faqdisplay"><abbr title="Frequently Asked Questions"> FAQ</abbr> 6.7</a>)</li> <li>in edit/insert mode, display a drop-down list of possible foreign - keys (key value and "display field" are shown)<br /> + keys (key value and "display column" are shown)<br /> (see <a href="#faq6_21"><abbr title="Frequently Asked Questions"> FAQ</abbr> 6.21</a>)</li> <li>display links on the table properties page, to check referential @@ -925,12 +925,13 @@ since this link provides funding for phpMyAdmin. <tt>$cfg['Servers'][$i]['relation']</tt></li> <li>now as normal user open phpMyAdmin and for each one of your tables where you want to use this feature, click - "Structure/Relation view/" and choose foreign fields. + "Structure/Relation view/" and choose foreign + columns. </li> </ul> Please note that in the current version, <tt>master_db</tt> - must be the same as <tt>foreign_db</tt>. Those fields have been put in + must be the same as <tt>foreign_db</tt>. Those columns have been put in future development of the cross-db relations. </dd> @@ -939,7 +940,7 @@ since this link provides funding for phpMyAdmin. </dt> <dd> Since release 2.3.0 you can describe, in a special 'table_info' - table, which field is to be displayed as a tool-tip when moving the + table, which column is to be displayed as a tool-tip when moving the cursor over the corresponding key.<br /> This configuration variable will hold the name of this special table. To allow the usage of this functionality: @@ -947,10 +948,10 @@ since this link provides funding for phpMyAdmin. <li>put the table name in <tt>$cfg['Servers'][$i]['table_info']</tt></li> <li>then for each table where you want to use this feature, - click "Structure/Relation view/Choose field to display" - to choose the field.</li> + click "Structure/Relation view/Choose column to display" + to choose the column.</li> </ul> - Usage tip: <a href="#faqdisplay">Display field</a>. + Usage tip: <a href="#faqdisplay">Display column</a>. </dd> <dt id="table_coords"> <span id="cfg_Servers_table_coords">$cfg['Servers'][$i]['table_coords']</span> string<br /> @@ -997,7 +998,7 @@ since this link provides funding for phpMyAdmin. based on the following table structure. See <a href="#transformations"> Transformations</a> for further information. To use the MIME-transformation system, your column_info table has to have the three - new fields 'mimetype', 'transformation', 'transformation_options'. + new columns 'mimetype', 'transformation', 'transformation_options'. <br /><br /> To allow the usage of this functionality: @@ -1154,7 +1155,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <dt><span id="cfg_Servers_verbose_check">$cfg['Servers'][$i]['verbose_check']</span> boolean </dt> <dd>Because release 2.5.0 introduced the new MIME-transformation support, the - column_info table got enhanced with three new fields. If the above variable + column_info table got enhanced with three new columns. If the above variable is set to <tt>TRUE</tt> (default) phpMyAdmin will check if you have the latest table structure available. If not, it will emit a warning to the superuser.<br /><br /> @@ -1531,9 +1532,9 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> contains more rows, "Previous" and "Next" links will be shown.</dd> <dt id="cfg_Order">$cfg['Order'] string [<tt>DESC</tt>|<tt>ASC</tt>|<tt>SMART</tt>]</dt> - <dd>Defines whether fields are displayed in ascending (<tt>ASC</tt>) order, + <dd>Defines whether columns are displayed in ascending (<tt>ASC</tt>) order, in descending (<tt>DESC</tt>) order or in a "smart" - (<tt>SMART</tt>) order - I.E. descending order for fields of type TIME, + (<tt>SMART</tt>) order - I.E. descending order for columns of type TIME, DATE, DATETIME and TIMESTAMP, ascending order else- by default.</dd> <dt id="cfg_DisplayBinaryAsHex">$cfg['DisplayBinaryAsHex'] boolean </dt> @@ -1541,12 +1542,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> option is ticked by default.</dd> <dt id="cfg_ProtectBinary">$cfg['ProtectBinary'] boolean or string</dt> - <dd>Defines whether <tt>BLOB</tt> or <tt>BINARY</tt> fields are protected + <dd>Defines whether <tt>BLOB</tt> or <tt>BINARY</tt> columns are protected from editing when browsing a table's content. Valid values are: - <ul><li><tt>FALSE</tt> to allow editing of all fields;</li> - <li><tt>'blob'</tt> to allow editing of all fields except <tt>BLOBS</tt>;</li> + <ul><li><tt>FALSE</tt> to allow editing of all columns;</li> + <li><tt>'blob'</tt> to allow editing of all columns except <tt>BLOBS</tt>;</li> <li><tt>'all'</tt> to disallow editing of all <tt>BINARY</tt> or - <tt>BLOB</tt> fields.</li> + <tt>BLOB</tt> columns.</li> </ul> </dd> @@ -1564,10 +1565,10 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <dt id="cfg_CharEditing">$cfg['CharEditing'] string</dt> <dd>Defines which type of editing controls should be used for CHAR and - VARCHAR fields. Possible values are: - <ul><li>input - this allows to limit size of text to size of field in - MySQL, but has problems with newlines in fields</li> - <li>textarea - no problems with newlines in fields, but also no + VARCHAR columns. Possible values are: + <ul><li>input - this allows to limit size of text to size of columns in + MySQL, but has problems with newlines in columns</li> + <li>textarea - no problems with newlines in columns, but also no length limitations</li> </ul> Default is old behavior so input.</dd> @@ -1850,7 +1851,7 @@ $cfg['TrustedProxies'] = <dt><span id="cfg_LongtextDoubleTextarea">$cfg['LongtextDoubleTextarea'] </span>boolean </dt> - <dd>Defines whether textarea for LONGTEXT fields should have double size.</dd> + <dd>Defines whether textarea for LONGTEXT columns should have double size.</dd> <dt><span id="cfg_TextareaAutoSelect">$cfg['TextareaAutoSelect'] </span>boolean </dt> @@ -1863,7 +1864,7 @@ $cfg['TrustedProxies'] = editing.</dd> <dt id="cfg_LimitChars">$cfg['LimitChars'] integer</dt> - <dd>Maximum number of characters showen in any non-numeric field on browse view. + <dd>Maximum number of characters showen in any non-numeric column on browse view. Can be turned off by a toggle button on the browse page.</dd> <dt><span id="cfg_ModifyDeleteAtLeft">$cfg['ModifyDeleteAtLeft'] </span>boolean @@ -1879,7 +1880,7 @@ $cfg['TrustedProxies'] = <dd>There are 3 display modes: horizontal, horizontalflipped and vertical. Define which one is displayed by default. The first mode displays each row on a horizontal line, the second rotates the headers by 90 - degrees, so you can use descriptive headers even though fields only + degrees, so you can use descriptive headers even though columns only contain small values and still print them out. The vertical mode sorts each row on a vertical lineup. </dd> @@ -1903,9 +1904,9 @@ $cfg['TrustedProxies'] = 'vertical' you can have each field lined up vertically beneath each other. You can save up a lot of place on the horizontal direction and no longer have to scroll. If you set this to integer, editing of fewer - columns will appear in 'vertical' mode, while editing of more fields + columns will appear in 'vertical' mode, while editing of more columns still in 'horizontal' mode. This way you can still effectively edit - large number of fields, while having full view on few of them.</dd> + large number of columns, while having full view on few of them.</dd> <dt id="cfg_ShowBrowseComments">$cfg['ShowBrowseComments'] boolean<br /> <span id="cfg_ShowPropertyComments">$cfg['ShowPropertyComments'] </span>boolean @@ -1914,7 +1915,7 @@ $cfg['TrustedProxies'] = display of column comments in Browse or Property display. In browse mode, the comments are shown inside the header. In property mode, comments are displayed using a CSS-formatted dashed-line below the - name of the field. The comment is shown as a tool-tip for that field. + name of the column. The comment is shown as a tool-tip for that column. </dd> <dt id ="cfg_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt> @@ -2208,7 +2209,7 @@ setfacl -d -m "g:www-data:rwx" tmp </dt> <dd>Default queries that will be displayed in query boxes when user didn't specify any. Use %d for database name, %t for table name and %f for a - comma separated list of field names. Note that %t and %f are only + comma separated list of column names. Note that %t and %f are only applicable to <tt>$cfg['DefaultQueryTable']</tt>.</dd> <dt id="cfg_SQP_fmtType">$cfg['SQP']['fmtType'] string [<tt>html</tt>|<tt>none</tt>]</dt> @@ -2319,7 +2320,7 @@ setfacl -d -m "g:www-data:rwx" tmp edit this.</dd> <dt id="cfg_AttributeTypes">$cfg['AttributeTypes'] array</dt> - <dd>Possible attributes for fields. In most cases you don't need to edit + <dd>Possible attributes for columns. In most cases you don't need to edit this.</dd> <dt id="cfg_Functions">$cfg['Functions'] array</dt> @@ -2343,21 +2344,21 @@ setfacl -d -m "g:www-data:rwx" tmp in table.</dd> <dt id="cfg_NumOperators">$cfg['NumOperators'] array</dt> - <dd>Operators available for search operations on numeric and date fields. + <dd>Operators available for search operations on numeric and date columns. </dd> <dt id="cfg_TextOperators">$cfg['TextOperators'] array</dt> - <dd>Operators available for search operations on character fields. + <dd>Operators available for search operations on character columns. Note that we put <code>LIKE</code> by default instead of <code>LIKE %...%</code>, to avoid unintended performance problems in case of huge tables.</dd> <dt id="cfg_EnumOperators">$cfg['EnumOperators'] array</dt> - <dd>Operators available for search operations on enum fields.</dd> + <dd>Operators available for search operations on ENUM columns.</dd> <dt id="cfg_NullOperators">$cfg['NullOperators'] array</dt> <dd>Additional operators available for search operations when the - field can be null.</dd> + column can be null.</dd> </dl> @@ -2375,14 +2376,14 @@ setfacl -d -m "g:www-data:rwx" tmp and the proper directives. Please see the <a href="#config">Configuration section</a> on how to do so.</p> -<p> You can apply different transformations to the contents of each field. The - transformation will take the content of each field and transform it with +<p> You can apply different transformations to the contents of each column. The + transformation will take the content of each column and transform it with certain rules defined in the selected transformation.</p> -<p> Say you have a field 'filename' which contains a filename. Normally you would +<p> Say you have a column 'filename' which contains a filename. Normally you would see in phpMyAdmin only this filename. Using transformations you can transform that filename into a HTML link, so you can click inside of the phpMyAdmin - structure on the field's link and will see the file displayed in a new browser + structure on the column's link and will see the file displayed in a new browser window. Using transformation options you can also specify strings to append/prepend to a string or the format you want the output stored in.</p> @@ -2399,7 +2400,8 @@ setfacl -d -m "g:www-data:rwx" tmp <p> Go to your <i>tbl_structure.php</i> page (i.e. reached through clicking on the 'Structure' link for a table). There click on - "Change" (or change icon) and there you will see three new fields at + "Change" (or change icon) and there you will see three new + fields at the end of the line. They are called 'MIME-type', 'Browser transformation' and 'Transformation options'.</p> @@ -2455,7 +2457,7 @@ setfacl -d -m "g:www-data:rwx" tmp <p> One can, however, use empty mime-types and global transformations which should work for many mimetypes. You can also use transforms on a different mimetype they where built for, but pay attention to option usage as well as what the transformation does to your - field.</p> + column.</p> <p> There is a basic file called '<i>global.inc.php</i>'. This function can be included by any other transform function and provides some basic functions.</p> @@ -2560,15 +2562,15 @@ setfacl -d -m "g:www-data:rwx" tmp you want to transform.</li> <li><b>$options</b> - Contains any user-passed options to a transform function as an array.</li> - <li><b>$meta</b> - Contains an object with field information to your column. + <li><b>$meta</b> - Contains an object with information about your column. The data is drawn from the output of the <a href="http://www.php.net/mysql_fetch_field">mysql_fetch_field()</a> function. This means, all object properties described on the <a href="http://www.php.net/mysql_fetch_field">manual page</a> are - available in this variable and can be used to transform a field accordingly + available in this variable and can be used to transform a column accordingly to unsigned/zerofill/not_null/... properties.<br /> The $meta->mimetype variable contains the original MIME-type of the - field (i.e. 'text/plain', 'image/jpeg' etc.)</li> + column (i.e. 'text/plain', 'image/jpeg' etc.)</li> </ol> <p> Additionally you should also provide additional function to provide @@ -2768,11 +2770,11 @@ setfacl -d -m "g:www-data:rwx" tmp and try to increase it.</p> <h4 id="faq1_15"> - <a href="#faq1_15">1.15 I have problems with <i>mysql.user</i> field names.</a> + <a href="#faq1_15">1.15 I have problems with <i>mysql.user</i> column names.</a> </h4> -<p> In previous MySQL versions, the <tt>User</tt> and <tt>Password</tt> fields - were named <tt>user</tt> and <tt>password</tt>. Please modify your field +<p> In previous MySQL versions, the <tt>User</tt> and <tt>Password</tt>columns + were named <tt>user</tt> and <tt>password</tt>. Please modify your column names to align with current standards.</p> <h4 id="faq1_16"> @@ -2900,7 +2902,7 @@ setfacl -d -m "g:www-data:rwx" tmp <h4 id="faq1_23"> <a href="#faq1_23">1.23 I'm running MySQL on a Win32 machine. Each time I create - a new table the table and field names are changed to lowercase!</a></h4> + a new table the table and column names are changed to lowercase!</a></h4> <p> This happens because the MySQL directive <tt>lower_case_table_names</tt> defaults to 1 (<tt>ON</tt>) in the Win32 version of MySQL. You can change @@ -2970,8 +2972,8 @@ setfacl -d -m "g:www-data:rwx" tmp available starting with MySQL 3.23.56 / 4.0.11-gamma.</p> <h4 id="faq1_29"> - <a href="#faq1_29">1.29 When I create a table or modify a field, I get an error - and the fields are duplicated.</a></h4> + <a href="#faq1_29">1.29 When I create a table or modify a column, I get an error + and the columns are duplicated.</a></h4> <p> It is possible to configure Apache in such a way that PHP has problems interpreting .php files.</p> @@ -3101,7 +3103,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L] <p> Suhosin configuration might lead to malfunction in some cases and it can not be fully avoided as phpMyAdmin is kind of application which needs to - transfer big amounts of fields in single HTTP request, what is something + transfer big amounts of columns in single HTTP request, what is something what Suhosin tries to prevent. Generally all <code>suhosin.request.*</code>, <code>suhosin.post.*</code> and <code>suhosin.get.*</code> directives can have negative effect on @@ -3430,13 +3432,13 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension <a href="#faq3_6">3.6 What is currently not supported in phpMyAdmin about InnoDB?</a></h4> <p> In Relation view, being able to choose a table in another database, - or having more than one index field in the foreign key.<br /><br/> + or having more than one index column in the foreign key.<br /><br/> In Query-by-example (Query), automatic generation of the query LEFT JOIN from the foreign table.<br /><br/> </p> <h4 id="faq3_7"> - <a href="#faq3_7">3.7 I have table with many (100+) fields and when I try to browse table + <a href="#faq3_7">3.7 I have table with many (100+) columns and when I try to browse table I get series of errors like "Warning: unable to parse url". How can this be fixed?</a></h4> <p> @@ -3447,7 +3449,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension </p> <h4 id="faq3_8"> - <a href="#faq3_8">3.8 I cannot use (clickable) HTML-forms in fields where I put + <a href="#faq3_8">3.8 I cannot use (clickable) HTML-forms in columns where I put a MIME-Transformation onto!</a></h4> <p> Due to a surrounding form-container (for multi-row delete checkboxes), no @@ -3696,14 +3698,14 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array( <h4 id="faq5_1"> <a href="#faq5_1">5.1 I get an out of memory error, and my controls are non-functional, - when trying to create a table with more than 14 fields. + when trying to create a table with more than 14 columns. </a></h4> <p> We could reproduce this problem only under Win98/98SE. Testing under - WinNT4 or Win2K, we could easily create more than 60 fields. + WinNT4 or Win2K, we could easily create more than 60 columns. <br /> - A workaround is to create a smaller number of fields, then come back to - your table properties and add the other fields. + A workaround is to create a smaller number of columns, then come back to + your table properties and add the other columns. </p> <h4 id="faq5_2"> @@ -3751,7 +3753,8 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array( <h4 id="faq5_6"> <a href="#faq5_6">5.6 In Internet Explorer 5.0, 5.5 or 6.0, I get an error (like "Page not found") - when trying to modify a row in a table with many fields, or with a text field + when trying to modify a row in a table with many columns, or with a text + column </a></h4> <p> Your table neither have a primary key nor an unique one, so we must use a @@ -3871,7 +3874,7 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array( </a></h4> <p> Examine the <abbr title="structured query language">SQL</abbr> error with care. Often the problem is caused by - specifying a wrong field-type.<br /> + specifying a wrong column-type.<br /> Common errors include: </p> <ul> @@ -3884,11 +3887,12 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array( </p> <h4 id="faq6_2"> - <a href="#faq6_2">6.2 When I create a table, I set an index for two fields and - phpMyAdmin generates only one index with those two fields. + <a href="#faq6_2">6.2 When I create a table, I set an index for two + columns and + phpMyAdmin generates only one index with those two columns. </a></h4> <p> - This is the way to create a multi-fields + This is the way to create a multi-columns index. If you want two indexes, create the first one when creating the table, save, then display the table properties and click the Index link to create the other index. @@ -3897,11 +3901,11 @@ $cfg['Servers'][$i]['AllowDeny']['rules'] = array( <h4 id="faq6_3"> <a href="#faq6_3">6.3 How can I insert a null value into my table?</a></h4> <p> - Since version 2.2.3, you have a checkbox for each field that can be null. + Since version 2.2.3, you have a checkbox for each column that can be null. Before 2.2.3, you had to enter "null", without the quotes, as the - field's value. Since version 2.5.5, you have to use the checkbox to get + column's value. Since version 2.5.5, you have to use the checkbox to get a real NULL value, so if you enter "NULL" this means you want - a literal NULL in the field, and not a NULL value (this works in PHP4). + a literal NULL in the column, and not a NULL value (this works in PHP4). </p> <h4 id="faq6_4"> @@ -3983,7 +3987,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal'); <li>in Links, for "town_code" choose "REL_towns->code"</li> <li>in Links, for "country_code" choose "REL_countries->country_code"</li> <li>on table "REL_towns" click Structure, then Relation view</li> - <li>in "Choose field to display", choose "description"</li> + <li>in "Choose column to display", choose "description"</li> <li>repeat the two previous steps for table "REL_countries"</li> </ul> @@ -3993,7 +3997,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal'); <li>Choose "Query"</li> <li>Use tables: persons, towns, countries</li> <li>Click "Update query"</li> - <li>In the fields row, choose persons.person_name and click the + <li>In the columns row, choose persons.person_name and click the "Show" tickbox </li> <li>Do the same for towns.description and countries.descriptions in the other 2 columns</li> @@ -4003,13 +4007,13 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal'); </ul> <h4 id="faqdisplay"> - <a href="#faqdisplay">6.7 How can I use the "display field" feature?</a></h4> + <a href="#faqdisplay">6.7 How can I use the "display column" feature?</a></h4> <p> Starting from the previous example, create the pma_table_info as explained in the configuration section, then browse your persons table, and move the mouse over a town code or country code. <br /><br /> - See also <a href="#faq6_21"><abbr title="Frequently Asked Questions">FAQ</abbr> 6.21</a> for an additional feature that "display field" + See also <a href="#faq6_21"><abbr title="Frequently Asked Questions">FAQ</abbr> 6.21</a> for an additional feature that "display column" enables: drop-down list of possible values. </p> @@ -4093,8 +4097,8 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal'); different structure.</li> <li>"Add AUTO_INCREMENT value" ensures that AUTO_INCREMENT value (if any) will be included in backup.</li> - <li>"Enclose table and field names with backquotes" ensures that - field and table names formed with special characters are protected.</li> + <li>"Enclose table and column names with backquotes" ensures that + column and table names formed with special characters are protected.</li> <li>"Add into comments" includes column comments, relations, and MIME types set in the pmadb in the dump as <abbr title="structured query language">SQL</abbr> comments (<i>/* xxx */</i>). @@ -4151,15 +4155,15 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal'); We utilize it as free SOAP service.</p> <h4 id="faq6_15"> - <a href="#faq6_15">6.15 I want to add a BLOB field and put an index on + <a href="#faq6_15">6.15 I want to add a BLOB column and put an index on it, but MySQL says "BLOB column '...' used in key specification without a key length".</a></h4> -<p> The right way to do this, is to create the field without any indexes, +<p> The right way to do this, is to create the column without any indexes, then display the table structure and use the "Create an index" - dialog. On this page, you will be able to choose your BLOB field, and + dialog. On this page, you will be able to choose your BLOB column, and set a size to the index, which is the condition to create an index on - a BLOB field.</p> + a BLOB column.</p> <h4 id="faq6_16"> <a href="#faq6_16">6.16 How can I simply move in page with plenty @@ -4178,7 +4182,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal'); WTF is this feature then useful for?</a></h4> <p> Slow down :). Defining mimetypes is of no use, if you can't put transformations - on them. Otherwise you could just put a comment on the field. Because entering + on them. Otherwise you could just put a comment on the column. Because entering your own mimetype will cause serious syntax checking issues and validation, this introduces a high-risk false-user-input situation. Instead you have to initialize mimetypes using functions or empty mimetype definitions.<br /> @@ -4268,17 +4272,17 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal'); <h4 id="faq6_21"> <a href="#faq6_21">6.21 In edit/insert mode, how can I see a list of - possible values for a field, based on some foreign table?</a></h4> + possible values for a column, based on some foreign table?</a></h4> <p> You have to setup appropriate links between the tables, and also - setup the "display field" in the foreign table. See + setup the "display column" in the foreign table. See <a href="#faq6_6"><abbr title="Frequently Asked Questions">FAQ</abbr> 6.6</a> for an example. Then, if there are 100 values or less in the foreign table, a drop-down list of values will be available. You will see two lists of values, the first list containing the key - and the display field, the second list containing the display field + and the display column, the second list containing the display column and the key. The reason for this is to be able to type the first - letter of either the key or the display field.<br /><br /> + letter of either the key or the display column.<br /><br /> For 100 values or more, a distinct window will appear, to browse foreign key values and choose one. To change the default limit of 100, see @@ -4862,7 +4866,7 @@ Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, "Manuzhai". also contributed the French translation. </li> <li>Alexandr Bravo <abravo_at_hq.admiral.ru> who contributed - tbl_select.php3, a feature to display only some fields from a table. + tbl_select.php3, a feature to display only some columns from a table. </li> <li>Chris Jackson <chrisj_at_ctel.net> added support for MySQL functions in tbl_change.php3. He also added the diff --git a/db_datadict.php b/db_datadict.php index a38b35b..7af533c 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -125,9 +125,9 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { /** - * Gets fields properties + * Gets columns properties */ - $result = PMA_DBI_query('SHOW FIELDS FROM ' . PMA_backquote($table) . ';', null, PMA_DBI_QUERY_STORE); + $result = PMA_DBI_query('SHOW COLUMNS FROM ' . PMA_backquote($table) . ';', null, PMA_DBI_QUERY_STORE); $fields_cnt = PMA_DBI_num_rows($result); if (PMA_MYSQL_INT_VERSION < 50025) { @@ -171,7 +171,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { ?> <table width="100%" class="print"> -<tr><th width="50"><?php echo __('Field'); ?></th> +<tr><th width="50"><?php echo __('Column'); ?></th> <th width="80"><?php echo __('Type'); ?></th> <?php /* <th width="50"><?php echo __('Attributes'); ?></th>*/ ?> <th width="40"><?php echo __('Null'); ?></th> diff --git a/db_printview.php b/db_printview.php index e91c04c..a6d66f7 100644 --- a/db_printview.php +++ b/db_printview.php @@ -102,7 +102,7 @@ else { <thead> <tr> <th><?php echo __('Table'); ?></th> - <th><?php echo __('Records'); ?></th> + <th><?php echo __('Rows'); ?></th> <th><?php echo __('Type'); ?></th> <?php if ($cfg['ShowStats']) { diff --git a/db_qbe.php b/db_qbe.php index dce1c67..0b661c9 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -171,7 +171,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '') <fieldset> <table class="data" style="width: 100%;"> <tr class="odd noclick"> - <th><?php echo __('Field'); ?>:</th> + <th><?php echo __('Column'); ?>:</th> <?php $z = 0; for ($x = 0; $x < $col; $x++) { @@ -581,7 +581,7 @@ echo PMA_generate_common_hidden_inputs($url_params); <table border="0" cellpadding="2" cellspacing="1"> <tr> <td nowrap="nowrap"> - <?php echo __('Add/Delete Criteria Row'); ?>: + <?php echo __('Add/Delete criteria rows'); ?>: <select size="1" name="add_row"> <option value="-3">-3</option> <option value="-2">-2</option> @@ -593,7 +593,7 @@ echo PMA_generate_common_hidden_inputs($url_params); </select> </td> <td width="10"> </td> - <td nowrap="nowrap"><?php echo __('Add/Delete Field Columns'); ?>: + <td nowrap="nowrap"><?php echo __('Add/Delete columns'); ?>: <select size="1" name="add_col"> <option value="-3">-3</option> <option value="-2">-2</option> diff --git a/db_search.php b/db_search.php index fece7d0..627ac25 100644 --- a/db_search.php +++ b/db_search.php @@ -352,7 +352,7 @@ $alter_select = <?php echo $alter_select; ?></td> </tr> <tr><td align="right"> - <?php echo __('Inside field:'); ?></td> + <?php echo __('Inside column:'); ?></td> <td><input type="text" name="field_str" size="60" value="<?php echo ! empty($field_str) ? $field_str : ''; ?>" /></td> </tr> diff --git a/js/messages.php b/js/messages.php index 30969d6..8eb745a 100644 --- a/js/messages.php +++ b/js/messages.php @@ -60,7 +60,7 @@ $js_messages['strGeneralRelationFeat:strDisabled'] = __('General relation featur $js_messages['strSelectReferencedKey'] = __('Select referenced key'); $js_messages['strSelectForeignKey'] = __('Select Foreign Key'); $js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the primary key or a unique key'); -$js_messages['strChangeDisplay'] = __('Choose field to display'); +$js_messages['strChangeDisplay'] = __('Choose column to display'); echo "var PMA_messages = new Array();\n"; foreach ($js_messages as $name => $js_message) { diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 2330642..66a2114 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -443,7 +443,7 @@ class PMA_Index $r .= '<th>' . __('Type') . '</th>'; $r .= '<th>' . __('Unique') . '</th>'; $r .= '<th>' . __('Packed') . '</th>'; - $r .= '<th>' . __('Field') . '</th>'; + $r .= '<th>' . __('Column') . '</th>'; $r .= '<th>' . __('Cardinality') . '</th>'; $r .= '<th>' . __('Collation') . '</th>'; $r .= '<th>' . __('Null') . '</th>'; diff --git a/libraries/db_structure.lib.php b/libraries/db_structure.lib.php index 7a6dff7..2b6f420 100644 --- a/libraries/db_structure.lib.php +++ b/libraries/db_structure.lib.php @@ -19,7 +19,7 @@ if (! defined('PHPMYADMIN')) { * @uses $GLOBALS['is_show_stats'] * @uses __('Table') * @uses __('Action') - * @uses __('Records') + * @uses __('Rows') * @uses __('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]') * @uses __('Type') * @uses __('Collation') @@ -53,7 +53,7 @@ function PMA_TableHeader($db_is_information_schema = false, $replication = false .' ' . __('Action') . "\n" .' </th>' // larger values are more interesting so default sort order is DESC - .' <th>' . PMA_SortableTableHeader(__('Records'), 'records', 'DESC') + .' <th>' . PMA_SortableTableHeader(__('Rows'), 'records', 'DESC') .PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]'))) . "\n" .' </th>' . "\n"; if (!($GLOBALS['cfg']['PropertiesNumColumns'] > 1)) { diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php index 19512b1..8f1b740 100644 --- a/libraries/display_create_table.lib.php +++ b/libraries/display_create_table.lib.php @@ -38,7 +38,7 @@ $is_create_table_priv = true; ?> <form method="post" action="tbl_create.php" - onsubmit="return (emptyFormElements(this, 'table') && checkFormElementInRange(this, 'num_fields', '<?php echo str_replace('\'', '\\\'', __('Table must have at least one field.')); ?>', 1))"> + onsubmit="return (emptyFormElements(this, 'table') && checkFormElementInRange(this, 'num_fields', '<?php echo str_replace('\'', '\\\'', __('Table must have at least one column.')); ?>', 1))"> <fieldset> <legend> <?php @@ -54,7 +54,7 @@ echo sprintf(__('Create table on database %s'), PMA_getDbLink()); <input type="text" name="table" maxlength="64" size="30" /> </div> <div class="formelement"> - <?php echo __('Number of fields'); ?>: + <?php echo __('Number of columns'); ?>: <input type="text" name="num_fields" size="2" /> </div> <div class="clearfloat"></div> diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index ec7affc..54867f5 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -104,7 +104,7 @@ echo PMA_pluginGetJavascript($export_list); <?php echo '<input type="radio" name="allrows" value="0" id="radio_allrows_0" checked="checked" />'; - echo sprintf(__('Dump %s row(s) starting at record # %s'), + echo sprintf(__('Dump %s row(s) starting at row # %s'), '<input type="text" name="limit_to" size="5" value="' . (isset($unlim_num_rows) ? $unlim_num_rows : PMA_Table::countRecords($db, $table)) . '" onfocus="this.select()" />', diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index d30619d..923d962 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -236,7 +236,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { if (! (isset($timeout_passed) && $timeout_passed)) { ?> <div class="formelementrow"> - <label for="text_skip_queries"><?php echo __('Number of records (queries) to skip from start'); ?></label> + <label for="text_skip_queries"><?php echo __('Number of queries to skip from start'); ?></label> <input type="text" name="skip_queries" value="<?php echo PMA_pluginGetDefault('Import', 'skip_queries');?>" id="text_skip_queries" /> </div> <?php diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 538409f..5238d93 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -307,7 +307,7 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo <input type="hidden" name="goto" value="<?php echo $goto; ?>" /> <input type="submit" name="navig" value="<?php echo __('Show'); ?> :" /> <input type="text" name="session_max_rows" size="3" value="<?php echo (($_SESSION['tmp_user_values']['max_rows'] != 'all') ? $_SESSION['tmp_user_values']['max_rows'] : $GLOBALS['cfg']['MaxRows']); ?>" class="textfield" onfocus="this.select()" /> - <?php echo __('row(s) starting from record #') . "\n"; ?> + <?php echo __('row(s) starting from row #') . "\n"; ?> <input type="text" name="pos" size="6" value="<?php echo (($pos_next >= $unlim_num_rows) ? 0 : $pos_next); ?>" class="textfield" onfocus="this.select()" /> <br /> <?php @@ -585,7 +585,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ echo '<div class="formelement">'; $choices = array( 'K' => __('Relational key'), - 'D' => __('Relational display field') + 'D' => __('Relational display column') ); PMA_display_html_radio('relational_display', $choices, $_SESSION['tmp_user_values']['relational_display']); echo '</div>'; diff --git a/libraries/export/csv.php b/libraries/export/csv.php index 5bc490d..e3d78f2 100644 --- a/libraries/export/csv.php +++ b/libraries/export/csv.php @@ -18,13 +18,13 @@ if (isset($plugin_list)) { 'extension' => 'csv', 'mime_type' => 'text/comma-separated-values', 'options' => array( - array('type' => 'text', 'name' => 'separator', 'text' => __('Fields terminated by')), - array('type' => 'text', 'name' => 'enclosed', 'text' => __('Fields enclosed by')), - array('type' => 'text', 'name' => 'escaped', 'text' => __('Fields escaped by')), + array('type' => 'text', 'name' => 'separator', 'text' => __('Columns terminated by')), + array('type' => 'text', 'name' => 'enclosed', 'text' => __('Columns enclosed by')), + array('type' => 'text', 'name' => 'escaped', 'text' => __('Columns escaped by')), array('type' => 'text', 'name' => 'terminated', 'text' => __('Lines terminated by')), array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')), - array('type' => 'bool', 'name' => 'removeCRLF', 'text' => __('Remove CRLF characters within fields')), - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')), + array('type' => 'bool', 'name' => 'removeCRLF', 'text' => __('Remove CRLF characters within columns')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')), array('type' => 'hidden', 'name' => 'data'), ), 'options_text' => __('Options'), diff --git a/libraries/export/excel.php b/libraries/export/excel.php index 92d0bce..768fa3d 100644 --- a/libraries/export/excel.php +++ b/libraries/export/excel.php @@ -20,8 +20,8 @@ if (isset($plugin_list)) { 'mime_type' => 'text/comma-separated-values', 'options' => array( array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')), - array('type' => 'bool', 'name' => 'removeCRLF', 'text' => __('Remove CRLF characters within fields')), - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')), + array('type' => 'bool', 'name' => 'removeCRLF', 'text' => __('Remove CRLF characters within columns')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')), array( 'type' => 'select', 'name' => 'edition', diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index 2f4441a..5f36dc9 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -23,7 +23,7 @@ if (isset($plugin_list)) { array('type' => 'bool', 'name' => 'structure', 'text' => __('Structure'), 'force' => 'data'), array('type' => 'bgroup', 'name' => 'data', 'text' => __('Data'), 'force' => 'structure'), array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')), - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')), array('type' => 'egroup'), ), 'options_text' => __('Options'), @@ -241,7 +241,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals } $schema_insert = '<tr class="print-category">'; - $schema_insert .= '<th class="print">' . htmlspecialchars(__('Field')) . '</th>'; + $schema_insert .= '<th class="print">' . htmlspecialchars(__('Column')) . '</th>'; $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Type')) . '</b></td>'; $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Null')) . '</b></td>'; $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Default')) . '</b></td>'; diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 232d378..cba335a 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -54,7 +54,7 @@ if (isset($plugin_list)) { $plugin_list['latex']['options'][] = array('type' => 'bgroup', 'name' => 'data', 'text' => __('Data'), 'force' => 'structure'); $plugin_list['latex']['options'][] = - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')); + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')); $plugin_list['latex']['options'][] = array('type' => 'text', 'name' => 'data_caption', 'text' => __('Table caption')); $plugin_list['latex']['options'][] = @@ -357,7 +357,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $buffer = $alignment . '} ' . $crlf ; $header = ' \\hline '; - $header .= '\\multicolumn{1}{|c|}{\\textbf{' . __('Field') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Type') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Null') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Default') . '}}'; + $header .= '\\multicolumn{1}{|c|}{\\textbf{' . __('Column') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Type') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Null') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Default') . '}}'; if ($do_relation && $have_rel) { $header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . __('Links to') . '}}'; } diff --git a/libraries/export/ods.php b/libraries/export/ods.php index c8dee56..78fd6f2 100644 --- a/libraries/export/ods.php +++ b/libraries/export/ods.php @@ -21,7 +21,7 @@ if (isset($plugin_list)) { 'force_file' => true, 'options' => array( array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')), - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')), array('type' => 'hidden', 'name' => 'data'), ), 'options_text' => __('Options'), diff --git a/libraries/export/odt.php b/libraries/export/odt.php index 9b3239b..157fc43 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -47,7 +47,7 @@ if (isset($plugin_list)) { $plugin_list['odt']['options'][] = array('type' => 'bgroup', 'name' => 'data', 'text' => __('Data'), 'force' => 'structure'); $plugin_list['odt']['options'][] = - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')); + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')); $plugin_list['odt']['options'][] = array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')); $plugin_list['odt']['options'][] = @@ -291,7 +291,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals /* Header */ $GLOBALS['odt_buffer'] .= '<table:table-row>'; $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">' - . '<text:p>' . htmlspecialchars(__('Field')) . '</text:p>' + . '<text:p>' . htmlspecialchars(__('Column')) . '</text:p>' . '</table:table-cell>'; $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">' . '<text:p>' . htmlspecialchars(__('Type')) . '</text:p>' diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 31f35c4..4c42a91 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -77,7 +77,7 @@ if (isset($plugin_list)) { $plugin_list['sql']['options'][] = array('type' => 'bool', 'name' => 'auto_increment', 'text' => __('Add AUTO_INCREMENT value')); $plugin_list['sql']['options'][] = - array('type' => 'bool', 'name' => 'backquotes', 'text' => __('Enclose table and field names with backquotes')); + array('type' => 'bool', 'name' => 'backquotes', 'text' => __('Enclose table and column names with backquotes')); $plugin_list['sql']['options'][] = array('type' => 'bool', 'name' => 'procedure_function', 'text' => sprintf(__('Add %s'), 'CREATE PROCEDURE / FUNCTION' . (PMA_MYSQL_INT_VERSION > 50100 ? ' / EVENT' : ''))); diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index 4eeba65..eeb1615 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -31,7 +31,7 @@ if (isset($plugin_list)) { 'text' => __('Replace NULL by')), array('type' => 'bool', 'name' => 'columns', - 'text' => __('Put fields names in the first row')), + 'text' => __('Put columns names in the first row')), array('type' => 'egroup'), ), 'options_text' => __('Options'), @@ -230,7 +230,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals } $text_output = "|------\n"; - $text_output .= '|' . htmlspecialchars(__('Field')); + $text_output .= '|' . htmlspecialchars(__('Column')); $text_output .= '|' . htmlspecialchars(__('Type')); $text_output .= '|' . htmlspecialchars(__('Null')); $text_output .= '|' . htmlspecialchars(__('Default')); diff --git a/libraries/export/xls.php b/libraries/export/xls.php index ed13c15..d238903 100644 --- a/libraries/export/xls.php +++ b/libraries/export/xls.php @@ -21,7 +21,7 @@ if (isset($plugin_list)) { 'force_file' => true, 'options' => array( array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')), - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')), array('type' => 'hidden', 'name' => 'data'), ), 'options_text' => __('Options'), diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php index fb323bf..b59c78c 100644 --- a/libraries/export/xlsx.php +++ b/libraries/export/xlsx.php @@ -21,7 +21,7 @@ if (isset($plugin_list)) { 'force_file' => true, 'options' => array( array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')), - array('type' => 'bool', 'name' => 'columns', 'text' => __('Put fields names in the first row')), + array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')), array('type' => 'hidden', 'name' => 'data'), ), 'options_text' => __('Options'), diff --git a/libraries/import/csv.php b/libraries/import/csv.php index d10d6df..170fb96 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -24,9 +24,9 @@ if (isset($plugin_list)) { 'options' => array( array('type' => 'bool', 'name' => 'replace', 'text' => __('Replace table data with file')), array('type' => 'bool', 'name' => 'ignore', 'text' => __('Ignore duplicate rows')), - array('type' => 'text', 'name' => 'terminated', 'text' => __('Fields terminated by'), 'size' => 2, 'len' => 2), - array('type' => 'text', 'name' => 'enclosed', 'text' => __('Fields enclosed by'), 'size' => 2, 'len' => 2), - array('type' => 'text', 'name' => 'escaped', 'text' => __('Fields escaped by'), 'size' => 2, 'len' => 2), + array('type' => 'text', 'name' => 'terminated', 'text' => __('Columns terminated by'), 'size' => 2, 'len' => 2), + array('type' => 'text', 'name' => 'enclosed', 'text' => __('Columns enclosed by'), 'size' => 2, 'len' => 2), + array('type' => 'text', 'name' => 'escaped', 'text' => __('Columns escaped by'), 'size' => 2, 'len' => 2), array('type' => 'text', 'name' => 'new_line', 'text' => __('Lines terminated by'), 'size' => 2), ), 'options_text' => __('Options'), @@ -56,7 +56,7 @@ $csv_new_line = strtr($csv_new_line, $replacements); if (strlen($csv_terminated) != 1) { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); - $message->addParam(__('Fields terminated by'), false); + $message->addParam(__('Columns terminated by'), false); $error = TRUE; // The default dialog of MS Excel when generating a CSV produces a // semi-colon-separated file with no chance of specifying the @@ -68,11 +68,11 @@ if (strlen($csv_terminated) != 1) { // one character. } elseif (strlen($csv_enclosed) > 1) { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); - $message->addParam(__('Fields enclosed by'), false); + $message->addParam(__('Columns enclosed by'), false); $error = TRUE; } elseif (strlen($csv_escaped) != 1) { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); - $message->addParam(__('Fields escaped by'), false); + $message->addParam(__('Columns escaped by'), false); $error = TRUE; } elseif (strlen($csv_new_line) != 1 && $csv_new_line != 'auto') { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); @@ -309,7 +309,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { if ($values[count($values) - 1] == ';') { unset($values[count($values) - 1]); } else { - $message = PMA_Message::error(__('Invalid field count in CSV input on line %d.')); + $message = PMA_Message::error(__('Invalid column count in CSV input on line %d.')); $message->addParam($line); $error = TRUE; break; diff --git a/libraries/import/ldi.php b/libraries/import/ldi.php index 47516aa..2c8702a 100644 --- a/libraries/import/ldi.php +++ b/libraries/import/ldi.php @@ -37,9 +37,9 @@ if (isset($plugin_list)) { 'options' => array( array('type' => 'bool', 'name' => 'replace', 'text' => __('Replace table data with file')), array('type' => 'bool', 'name' => 'ignore', 'text' => __('Ignore duplicate rows')), - array('type' => 'text', 'name' => 'terminated', 'text' => __('Fields terminated by'), 'size' => 2, 'len' => 2), - array('type' => 'text', 'name' => 'enclosed', 'text' => __('Fields enclosed by'), 'size' => 2, 'len' => 2), - array('type' => 'text', 'name' => 'escaped', 'text' => __('Fields escaped by'), 'size' => 2, 'len' => 2), + array('type' => 'text', 'name' => 'terminated', 'text' => __('Columns terminated by'), 'size' => 2, 'len' => 2), + array('type' => 'text', 'name' => 'enclosed', 'text' => __('Columns enclosed by'), 'size' => 2, 'len' => 2), + array('type' => 'text', 'name' => 'escaped', 'text' => __('Columns escaped by'), 'size' => 2, 'len' => 2), array('type' => 'text', 'name' => 'new_line', 'text' => __('Lines terminated by'), 'size' => 2), array('type' => 'text', 'name' => 'columns', 'text' => __('Column names')), array('type' => 'bool', 'name' => 'local_option', 'text' => __('Use LOCAL keyword')), diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index eeee671..6a4b6e9 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -314,7 +314,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter if (count($fields_list)) { echo '<div id="tablefieldscontainer">' . "\n" - .'<label>' . __('Fields') . '</label>' . "\n" + .'<label>' . __('Columns') . '</label>' . "\n" .'<select id="tablefields" name="dummy" ' .'size="' . ($GLOBALS['cfg']['TextareaRows'] - 2) . '" ' .'multiple="multiple" ondblclick="insertValueQuery()">' . "\n"; diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 7cce097..0d00d17 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -96,13 +96,13 @@ $is_backup = ($action != 'tbl_create.php' && $action != 'tbl_addfield.php'); $header_cells = array(); $content_cells = array(); -$header_cells[] = __('Field'); +$header_cells[] = __('Column'); $header_cells[] = __('Type') . ($GLOBALS['cfg']['ReplaceHelpImg'] ? PMA_showMySQLDocu('SQL-Syntax', 'data-types') : '<br /><span style="font-weight: normal">' . PMA_showMySQLDocu('SQL-Syntax', 'data-types') . '</span>'); -$header_cells[] = __('Length/Values') . PMA_showHint(__('If field type is "enum" or "set", please enter the values using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').')); +$header_cells[] = __('Length/Values') . PMA_showHint(__('If column type is "enum" or "set", please enter the values using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').')); $header_cells[] = __('Default') . PMA_showHint(__('For default values, please enter just a single value, without backslash escaping or quotes, using this format: a')); $header_cells[] = __('Collation'); $header_cells[] = __('Attributes'); @@ -272,7 +272,7 @@ for ($i = 0; $i < $num_fields; $i++) { // column name $content_cells[$i][$ci] = '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '"' . ' type="text" name="field_name[' . $i . ']"' - . ' maxlength="64" class="textfield" title="' . __('Field') . '"' + . ' maxlength="64" class="textfield" title="' . __('Column') . '"' . ' size="' . ($GLOBALS['cfg']['DefaultPropDisplay'] == 'horizontal' ? '10' : '30') . '"' . ' value="' . (isset($row['Field']) ? htmlspecialchars($row['Field']) : '') . '"' . ' />'; @@ -777,11 +777,11 @@ if ($action == 'tbl_create.php') { onclick="return checkTableEditForm(this.form, <?php echo $num_fields; ?>)" /> <?php if ($action == 'tbl_create.php' || $action == 'tbl_addfield.php') { ?> <?php echo __('Or'); ?> - <?php echo sprintf(__('Add %s field(s)'), '<input type="text" id="added_fields" name="added_fields" size="2" value="1" onfocus="this.select()" />'); ?> + <?php echo sprintf(__('Add %s column(s)'), '<input type="text" id="added_fields" name="added_fields" size="2" value="1" onfocus="this.select()" />'); ?> <input type="submit" name="submit_num_fields" value="<?php echo __('Go'); ?>" <?php /* onclick="if (addField()) return false;" */ ?> - onclick="return checkFormElementInRange(this.form, 'added_fields', '<?php echo str_replace('\'', '\\\'', __('You have to add at least one field.')); ?>', 1)" + onclick="return checkFormElementInRange(this.form, 'added_fields', '<?php echo str_replace('\'', '\\\'', __('You have to add at least one column.')); ?>', 1)" /> <?php } ?> </fieldset> diff --git a/libraries/transformations/application_octetstream__download.inc.php b/libraries/transformations/application_octetstream__download.inc.php index 369126d..4fbc24d 100644 --- a/libraries/transformations/application_octetstream__download.inc.php +++ b/libraries/transformations/application_octetstream__download.inc.php @@ -7,7 +7,7 @@ function PMA_transformation_application_octetstream__download_info() { return array( - 'info' => __('Displays a link to download the binary data of the field. You can use the first option to specify the filename, or use the second option as the name of a field which contains the filename. If you use the second option, you need to set the first option to the empty string.'), + 'info' => __('Displays a link to download the binary data of the column. You can use the first option to specify the filename, or use the second option as the name of a column which contains the filename. If you use the second option, you need to set the first option to the empty string.'), ); } diff --git a/libraries/transformations/text_plain__dateformat.inc.php b/libraries/transformations/text_plain__dateformat.inc.php index 3f11fa9..cf3c2b0 100644 --- a/libraries/transformations/text_plain__dateformat.inc.php +++ b/libraries/transformations/text_plain__dateformat.inc.php @@ -7,7 +7,7 @@ function PMA_transformation_text_plain__dateformat_info() { return array( - 'info' => __('Displays a TIME, TIMESTAMP, DATETIME or numeric unix timestamp field as formatted date. The first option is the offset (in hours) which will be added to the timestamp (Default: 0). Use second option to specify a different date/time format string. Third option determines whether you want to see local date or UTC one (use "local" or "utc" strings) for that. According to that, date format has different value - for "local" see the documentation for PHP\'s strftime() function and for "utc" it is done using gmdate() function.'), + 'info' => __('Displays a TIME, TIMESTAMP, DATETIME or numeric unix timestamp column as formatted date. The first option is the offset (in hours) which will be added to the timestamp (Default: 0). Use second option to specify a different date/time format string. Third option determines whether you want to see local date or UTC one (use "local" or "utc" strings) for that. According to that, date format has different value - for "local" see the documentation for PHP\'s strftime() function and for "utc" it is done using gmdate() function.'), ); } diff --git a/libraries/transformations/text_plain__external.inc.php b/libraries/transformations/text_plain__external.inc.php index 981faec..8c35a4e 100644 --- a/libraries/transformations/text_plain__external.inc.php +++ b/libraries/transformations/text_plain__external.inc.php @@ -7,7 +7,7 @@ function PMA_transformation_text_plain__external_info() { return array( - 'info' => __('LINUX ONLY: Launches an external application and feeds it the field data via standard input. Returns the standard output of the application. The default is Tidy, to pretty-print HTML code. For security reasons, you have to manually edit the file libraries/transformations/text_plain__external.inc.php and list the tools you want to make available. The first option is then the number of the program you want to use and the second option is the parameters for the program. The third option, if set to 1, will convert the output using htmlspecialchars() (Default 1). The fourth option, if set to 1, will prevent wrapping and ensure that the output appears all on one line (Default 1).'), + 'info' => __('LINUX ONLY: Launches an external application and feeds it the column data via standard input. Returns the standard output of the application. The default is Tidy, to pretty-print HTML code. For security reasons, you have to manually edit the file libraries/transformations/text_plain__external.inc.php and list the tools you want to make available. The first option is then the number of the program you want to use and the second option is the parameters for the program. The third option, if set to 1, will convert the output using htmlspecialchars() (Default 1). The fourth option, if set to 1, will prevent wrapping and ensure that the output appears all on one line (Default 1).'), ); } diff --git a/libraries/transformations/text_plain__formatted.inc.php b/libraries/transformations/text_plain__formatted.inc.php index 7a1e8f8..add22e1 100644 --- a/libraries/transformations/text_plain__formatted.inc.php +++ b/libraries/transformations/text_plain__formatted.inc.php @@ -7,7 +7,7 @@ function PMA_transformation_text_plain__formatted_info() { return array( - 'info' => __('Displays the contents of the field as-is, without running it through htmlspecialchars(). That is, the field is assumed to contain valid HTML.'), + 'info' => __('Displays the contents of the column as-is, without running it through htmlspecialchars(). That is, the column is assumed to contain valid HTML.'), ); } diff --git a/libraries/transformations/text_plain__imagelink.inc.php b/libraries/transformations/text_plain__imagelink.inc.php index d743a16..cb62067 100644 --- a/libraries/transformations/text_plain__imagelink.inc.php +++ b/libraries/transformations/text_plain__imagelink.inc.php @@ -7,7 +7,7 @@ function PMA_transformation_text_plain__imagelink_info() { return array( - 'info' => __('Displays an image and a link; the field contains the filename. The first option is a URL prefix like "http://www.example.com/". The second and third options are the width and the height in pixels.'), + 'info' => __('Displays an image and a link; the column contains the filename. The first option is a URL prefix like "http://www.example.com/". The second and third options are the width and the height in pixels.'), ); } diff --git a/libraries/transformations/text_plain__link.inc.php b/libraries/transformations/text_plain__link.inc.php index f9e2bf1..579deda 100644 --- a/libraries/transformations/text_plain__link.inc.php +++ b/libraries/transformations/text_plain__link.inc.php @@ -7,7 +7,7 @@ function PMA_transformation_text_plain__link_info() { return array( - 'info' => __('Displays a link; the field contains the filename. The first option is a URL prefix like "http://www.example.com/". The second option is a title for the link.'), + 'info' => __('Displays a link; the column contains the filename. The first option is a URL prefix like "http://www.example.com/". The second option is a title for the link.'), ); } diff --git a/pdf_schema.php b/pdf_schema.php index 3156d21..598c9a4 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -1259,7 +1259,7 @@ function PMA_RT_DOC($alltables) $pdf->SetFont('', 'B'); if (isset($orientation) && $orientation == 'L') { - $pdf->Cell(25, 8, ucfirst(__('Field')), 1, 0, 'C'); + $pdf->Cell(25, 8, ucfirst(__('Column')), 1, 0, 'C'); $pdf->Cell(20, 8, ucfirst(__('Type')), 1, 0, 'C'); $pdf->Cell(20, 8, ucfirst(__('Attributes')), 1, 0, 'C'); $pdf->Cell(10, 8, ucfirst(__('Null')), 1, 0, 'C'); @@ -1280,7 +1280,7 @@ function PMA_RT_DOC($alltables) $pdf->Cell(45, 8, 'MIME', 1, 1, 'C'); $pdf->SetWidths(array(25, 20, 20, 10, 20, 25, 45, $comments_width, 45)); } else { - $pdf->Cell(20, 8, ucfirst(__('Field')), 1, 0, 'C'); + $pdf->Cell(20, 8, ucfirst(__('Column')), 1, 0, 'C'); $pdf->Cell(20, 8, ucfirst(__('Type')), 1, 0, 'C'); $pdf->Cell(20, 8, ucfirst(__('Attributes')), 1, 0, 'C'); $pdf->Cell(10, 8, ucfirst(__('Null')), 1, 0, 'C'); diff --git a/pmd_general.php b/pmd_general.p hp index 5a4e9d9..89988dd 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -74,7 +74,7 @@ echo $script_tabs . $script_contr . $script_display_field; ><img title="<?php echo __('Create relation') ?>" src="pmd/images/relation.png" alt="" /></a><a href="javascript:Start_display_field();" onmousedown="return false;" class="M_butt" id="display_field_button" target="_self" - ><img title="<?php echo __('Choose field to display') ?>" src="pmd/images/display_field.png" alt="" + ><img title="<?php echo __('Choose column to display') ?>" src="pmd/images/display_field.png" alt="" /></a><a href="javascript:location.reload();" onmousedown="return false;" class="M_butt" target="_self" ><img title="<?php echo __('Reload'); ?>" src="pmd/images/reload.png" alt="" diff --git a/pmd_help.php b/pmd_help.php index 328645b..e538a48 100644 --- a/pmd_help.php +++ b/pmd_help.php @@ -26,7 +26,7 @@ require_once 'pmd_common.php'; <?php echo '<p>' . __('To select relation, click :') . '<br />'; echo '<img src="pmd/images/help_relation.png" border="1"></p>'; - echo '<p>' . __('The display field is shown in pink. To set/unset a field as the display field, click the "Choose field to display" icon, then click on the appropriate field name.') . '</p>'; + echo '<p>' . __('The display column is shown in pink. To set/unset a column as the display column, click the "Choose column to display" icon, then click on the appropriate column name.') . '</p>'; ?> </body> </html> diff --git a/setup/lib/messages.inc.php b/setup/lib/messages.inc.php index b9ec8b3..1defa2d 100644 --- a/setup/lib/messages.inc.php +++ b/setup/lib/messages.inc.php @@ -32,8 +32,8 @@ $strSetupBZipDump_name = __('Bzip2'); $strSetupBZipDumpWarning = __('[a@?page=form&formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.'); $strSetupCannotLoadConfig = __('Cannot load or save configuration'); $strSetupCannotLoadConfigMsg = __('Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@../Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.'); -$strSetupCharEditing_desc = __('Defines which type of editing controls should be used for CHAR and VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in fields'); -$strSetupCharEditing_name = __('CHAR fields editing'); +$strSetupCharEditing_desc = __('Defines which type of editing controls should be used for CHAR and VARCHAR columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in columns'); +$strSetupCharEditing_name = __('CHAR columns editing'); $strSetupCharTextareaCols_desc = __('Number of columns for CHAR/VARCHAR textareas'); $strSetupCharTextareaCols_name = __('CHAR textarea columns'); $strSetupCharTextareaRows_desc = __('Number of rows for CHAR/VARCHAR textareas'); @@ -158,7 +158,7 @@ $strSetupImport_allow_interrupt_desc = __('Allow interrupt of import in case scr $strSetupImport_allow_interrupt_name = __('Partial import: allow interrupt'); $strSetupImport_format_desc = __('Default format; be aware that this list depends on location (database, table) and only SQL is always available'); $strSetupImport_format_name = __('Format of imported file'); -$strSetupImport_skip_queries_desc = __('Number of records (queries) to skip from start'); +$strSetupImport_skip_queries_desc = __('Number of queries to skip from start'); $strSetupImport_skip_queries_name = __('Partial import: skip queries'); $strSetupInsecureConnection = __('Insecure connection'); $strSetupInsecureConnectionMsg1 = __('You are not using a secure connection; all data (including potentially sensitive information, like passwords) is transferred unencrypted!'); @@ -214,15 +214,15 @@ $strSetupNoServers = __('There are no configured servers'); $strSetupOBGzip_desc = __('use GZip output buffering for increased speed in HTTP transfers'); $strSetupOBGzip_name = __('GZip output buffering'); $strSetupOptionNone = __('- none -'); -$strSetupOrder_desc = __('[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, DATETIME and TIMESTAMP, ascending order otherwise'); +$strSetupOrder_desc = __('[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, DATETIME and TIMESTAMP, ascending order otherwise'); $strSetupOrder_name = __('Default sorting order'); $strSetupOverview = __('Overview'); $strSetupPersistentConnections_desc = __('Use persistent connections to MySQL databases'); $strSetupPersistentConnections_name = __('Persistent connections'); $strSetupPropertiesIconic_desc = __('Use only icons, only text or both'); $strSetupPropertiesIconic_name = __('Iconic table operations'); -$strSetupProtectBinary_desc = __('Disallow BLOB and BINARY fields from editing'); -$strSetupProtectBinary_name = __('Protect binary fields'); +$strSetupProtectBinary_desc = __('Disallow BLOB and BINARY columns from editing'); +$strSetupProtectBinary_name = __('Protect binary columns'); $strSetupQueryHistoryDB_desc = __('Enable if you want DB-based query history (requires pmadb). If disabled, this utilizes JS-routines to display query history (lost by window close).'); $strSetupQueryHistoryDB_name = __('Permanent query history'); $strSetupQueryHistoryMax_desc = __('How many queries are kept in history'); @@ -317,8 +317,8 @@ $strSetupServers_ssl_desc = __('Enable SSL for connection to MySQL server'); $strSetupServers_ssl_name = __('Use SSL'); $strSetupServers_table_coords_desc = __('Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]'); $strSetupServers_table_coords_name = __('PDF schema: table coordinates'); -$strSetupServers_table_info_desc = __('Table to describe the display fields, leave blank for no support; suggested: [kbd]pma_table_info[/kbd]'); -$strSetupServers_table_info_name = __('Display fields table'); +$strSetupServers_table_info_desc = __('Table to describe the display columns, leave blank for no support; suggested: [kbd]pma_table_info[/kbd]'); +$strSetupServers_table_info_name = __('Display columns table'); $strSetupServers_user_desc = __('Leave empty if not using config auth'); $strSetupServers_user_name = __('User for config auth'); $strSetupServers_verbose_check_desc = __('Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance'); @@ -326,7 +326,7 @@ $strSetupServers_verbose_check_name = __('Verbose check'); $strSetupServers_verbose_desc = __('A user-friendly description of this server. Leave blank to display the hostname instead.'); $strSetupServers_verbose_name = __('Verbose name of this server'); $strSetupSetValue = __('Set value: %s'); -$strSetupShowAll_desc = __('Whether a user should be displayed a "show all (records)" button'); +$strSetupShowAll_desc = __('Whether a user should be displayed a "show all (rows)" button'); $strSetupShowAll_name = __('Allow to display all the rows'); $strSetupShowChgPassword_desc = __('Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly'); $strSetupShowChgPassword_name = __('Show password change form'); diff --git a/tbl_alter.php b/tbl_alter.php index 4a2a208..92c9fed 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * Alter one or more table columns/fields + * Alter one or more table columns * * linked from table_structure, uses libraries/tbl_properties.inc.php to display * form and handles this form data @@ -169,7 +169,7 @@ if ($abort == false) { */ for ($i = 0; $i < $selected_cnt; $i++) { $_REQUEST['field'] = PMA_sqlAddslashes($selected[$i], true); - $result = PMA_DBI_query('SHOW FULL FIELDS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ' LIKE \'' . $_REQUEST['field'] . '\';'); + $result = PMA_DBI_query('SHOW FULL COLUMNS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ' LIKE \'' . $_REQUEST['field'] . '\';'); $fields_meta[] = PMA_DBI_fetch_assoc($result); PMA_DBI_free_result($result); } diff --git a/tbl_change.php b/tbl_change.php index 62fbbf1..7e32e9b 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -305,7 +305,7 @@ foreach ($rows as $row_id => $vrow) { <table> <thead> <tr> - <th><?php echo __('Field'); ?></th> + <th><?php echo __('Column'); ?></th> <?php if ($cfg['ShowFieldTypesInDataEditView']) { @@ -725,7 +725,7 @@ foreach ($rows as $row_id => $vrow) { echo "\n"; if (strlen($special_chars) > 32000) { echo " </td>\n"; - echo ' <td>' . __(' Because of its length,<br /> this field might not be editable '); + echo ' <td>' . __(' Because of its length,<br /> this column might not be editable '); } } elseif ($field['pma_type'] == 'enum') { if (! isset($table_fields[$i]['values'])) { diff --git a/tbl_indexes.php b/tbl_indexes.php index 1d05e20..470cd04 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -186,7 +186,7 @@ PMA_Message::warning(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b <table> <thead> -<tr><th><?php echo __('Field'); ?></th> +<tr><th><?php echo __('Column'); ?></th> <th><?php echo __('Size'); ?></th> </tr> </thead> diff --git a/tbl_printview.php b/tbl_printview.php index fc1c2bb..88c9a6b 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -139,7 +139,7 @@ foreach ($the_tables as $key => $table) { <table style="width: 100%;"> <thead> <tr> - <th><?php echo __('Field'); ?></th> + <th><?php echo __('Column'); ?></th> <th><?php echo __('Type'); ?></th>  <th><?php echo __('Null'); ?></th> diff --git a/tbl_relation.php b/tbl_relation.php index c9dbc43..5ca5ed5 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -399,7 +399,7 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) { <legend><?php echo __('Relations'); ?></legend> <table> - <tr><th><?php echo __('Field'); ?></th> + <tr><th><?php echo __('Column'); ?></th> <?php if ($cfgRelation['relwork']) { echo '<th>' . __('Internal relation'); @@ -545,7 +545,7 @@ if ($col_rs && PMA_DBI_num_rows($col_rs) > 0) { $disp = PMA_getDisplayField($db, $table); ?> <fieldset> - <label><?php echo __('Choose field to display') . ': '; ?></label> + <label><?php echo __('Choose column to display') . ': '; ?></label> <select name="display_field"> <option value="">---</option> <?php diff --git a/tbl_select.php b/tbl_select.php index 67ff8a8..e965c50 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -132,7 +132,7 @@ while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) { <legend><?php echo __('Do a "query by example" (wildcard: "%")') ?></legend> <table class="data"> <thead> - <tr><th><?php echo __('Field'); ?></th> + <tr><th><?php echo __('Column'); ?></th> <th><?php echo __('Type'); ?></th> <th><?php echo __('Collation'); ?></th> <th><?php echo __('Operator'); ?></th> @@ -267,7 +267,7 @@ $(function() { PMA_generate_slider_effect('searchoptions', __('Options')); ?> <fieldset id="fieldset_select_fields"> - <legend><?php echo __('Select fields (at least one):'); ?></legend> + <legend><?php echo __('Select columns (at least one):'); ?></legend> <select name="param[]" size="<?php echo min($fields_cnt, 10); ?>" multiple="multiple"> <?php diff --git a/tbl_structure.php b/tbl_structure.php index c255cde..f35032e 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -174,7 +174,7 @@ $i = 0; <tr> <th id="th<?php echo ++$i; ?>"></th> <th id="th<?php echo ++$i; ?>">#</th> - <th id="th<?php echo ++$i; ?>"><?php echo __('Field'); ?></th> + <th id="th<?php echo ++$i; ?>"><?php echo __('Column'); ?></th> <th id="th<?php echo ++$i; ?>"><?php echo __('Type'); ?></th> <th id="th<?php echo ++$i; ?>"><?php echo __('Collation'); ?></th> <th id="th<?php echo ++$i; ?>"><?php echo __('Attributes'); ?></th> @@ -371,7 +371,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { <?php echo $titles['Change']; ?></a> </td> <td align="center"> - <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&cpurge=1&purgekey=<?php echo urlencode($row['Field']); ?>&zero_rows=<?php echo urlencode(sprintf(__('Field %s has been dropped'), htmlspecialchars($row['Field']))); ?>" + <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&cpurge=1&purgekey=<?php echo urlencode($row['Field']); ?>&zero_rows=<?php echo urlencode(sprintf(__('Column %s has been dropped'), htmlspecialchars($row['Field']))); ?>" onclick="return confirmLink(this, 'ALTER TABLE <?php echo PMA_jsFormat($table); ?> DROP <?php echo PMA_jsFormat($row['Field']); ?>')"> <?php echo $titles['Drop']; ?></a> </td> @@ -533,13 +533,13 @@ if (! $tbl_is_view && ! $db_is_information_schema) { <br /> <form method="post" action="tbl_addfield.php" - onsubmit="return checkFormElementInRange(this, 'num_fields', '<?php echo str_replace('\'', '\\\'', __('You have to add at least one field.')); ?>', 1)"> + onsubmit="return checkFormElementInRange(this, 'num_fields', '<?php echo str_replace('\'', '\\\'', __('You have to add at least one column.')); ?>', 1)"> <?php echo PMA_generate_common_hidden_inputs($db, $table); if ($cfg['PropertiesIconic']) { - echo '<img class="icon" src="' . $pmaThemeImage . 'b_insrow.png" width="16" height="16" alt="' . __('Add new field') . '"/>'; + echo '<img class="icon" src="' . $pmaThemeImage . 'b_insrow.png" width="16" height="16" alt="' . __('Add field') . '"/>'; } - echo sprintf(__('Add %s field(s)'), '<input type="text" name="num_fields" size="2" maxlength="2" value="1" onfocus="this.select()" />'); + echo sprintf(__('Add %s column(s)'), '<input type="text" name="num_fields" size="2" maxlength="2" value="1" onfocus="this.select()" />'); // I tried displaying the drop-down inside the label but with Firefox // the drop-down was blinking diff --git a/tbl_tracking.php b/tbl_tracking.php index 5f2b905..3e761f8 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -270,7 +270,7 @@ if (isset($_REQUEST['snapshot'])) { <table id="tablestructure" class="data"> <thead> <tr> - <th><?php echo __('Field'); ?></th> + <th><?php echo __('Column'); ?></th> <th><?php echo __('Type'); ?></th> <th><?php echo __('Collation'); ?></th> <th><?php echo __('Null'); ?></th> @@ -321,7 +321,7 @@ if (isset($_REQUEST['snapshot'])) { <th><?php echo __('Type');?></th> <th><?php echo __('Unique');?></th> <th><?php echo __('Packed');?></th> - <th><?php echo __('Field');?></th> + <th><?php echo __('Column');?></th> <th><?php echo __('Cardinality');?></th> <th><?php echo __('Collation');?></th> <th><?php echo __('Null');?></th> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_3-29-g153515c
by Marc Delisle 31 May '10

31 May '10

The branch, QA_3_3 has been updated via 153515c7f56f45bd21e2dd4081ba18efe19b991b (commit) from cfcec687faaacc74a5318273450c1f14d98bb7e5 (commit) - Log ----------------------------------------------------------------- commit 153515c7f56f45bd21e2dd4081ba18efe19b991b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon May 31 10:55:49 2010 -0400 French update ----------------------------------------------------------------------- Summary of changes: lang/french-utf-8.inc.php | 170 ++++++++++++++++++++++---------------------- 1 files changed, 85 insertions(+), 85 deletions(-) diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index f21938a..09f19f4 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -29,10 +29,10 @@ $strAddClause = 'Ajouter %s'; $strAddConstraints = 'Inclure les contraintes de clés étrangères'; $strAddDeleteColumn = 'Ajouter/effacer x colonnes'; $strAddDeleteRow = 'Ajouter/effacer x lignes'; -$strAddFields = 'Ajouter %s champ(s)'; +$strAddFields = 'Ajouter %s colonne(s)'; $strAddHeaderComment = 'Commentaires mis en en-tête (\\n sépare les lignes)'; $strAddIntoComments = 'Inclure sous forme de commentaires'; -$strAddNewField = 'Ajouter un champ'; +$strAddNewField = 'Ajouter une colonne'; $strAddPrivilegesOnDb = 'Ajouter des privilèges sur cette base de données'; $strAddPrivilegesOnTbl = 'Ajouter des privilèges sur cette table'; $strAddSearchConditions = 'Critères de recherche (pour l\'énoncé «where») :'; @@ -42,8 +42,8 @@ $strAddUserMessage = 'Vous avez ajouté un utilisateur'; $strAdministration = 'Administration'; $strAfter = 'Après %s'; $strAfterInsertBack = 'Retourner à la page précédente'; -$strAfterInsertNewInsert = 'Insérer un nouvel enregistrement'; -$strAfterInsertNext = 'Modifier l\'enregistrement suivant'; +$strAfterInsertNewInsert = 'Insérer une nouvelle ligne'; +$strAfterInsertNext = 'Modifier la ligne suivante'; $strAfterInsertSame = 'Demeurer sur cette page'; $strAllowInterrupt = 'Permettre l\'interruption de l\'importation si la limite de temps est sur le point d\'être atteinte. Ceci pourrait aider à importer des fichiers volumineux, au détriment du respect des transactions.'; $strAllTableSameWidth = 'Afficher toutes les tables avec une largeur identique'; @@ -191,7 +191,7 @@ $strChangeCopyModeDeleteAndReload = ' ... supprimer l\'ancien utilisateur, puis $strChangeCopyModeJustDelete = ' ... supprimer l\'ancien utilisateur.'; $strChangeCopyModeRevoke = ' ... effacer tous les privilèges de l\'ancien utilisateur, puis l\'effacer.'; $strChangeCopyUser = 'Changement des informations de connexion / Copie d\'utilisateur'; -$strChangeDisplay = 'Champ descriptif'; +$strChangeDisplay = 'Colonne descriptive'; $strChange = 'Modifier'; $strChangePassword = 'Modifier le mot de passe'; $strCharset = 'Jeu de caractères'; @@ -240,7 +240,7 @@ $strDefragment = 'Défragmenter la table'; $strDelayedInserts = 'Insertions avec délais (DELAYED)'; $strDeleteAndFlushDescr = 'Ceci est la méthode la plus directe, mais le fait de recharger les privilèges pourrait prendre du temps.'; $strDeleteAndFlush = 'Effacer les utilisateurs, puis recharger les privilèges.'; -$strDeleted = 'L\'enregistrement a été effacé'; +$strDeleted = 'La ligne a été effacée'; $strDelete = 'Effacer'; $strDeleteNoUsersSelected = 'Aucun utilisateur n\'a été choisi en vue de le détruire!'; $strDeleteRelation = 'Effacer la relation'; @@ -251,7 +251,7 @@ $strDelOld = 'Cette page fait référence à des tables qui n\'existent plus. Vo $strDescending = 'Décroissant'; $strDescription = 'Description'; $strDesigner = 'Concepteur'; -$strDesignerHelpDisplayField = 'Le champ à afficher est montré en rose. Pour indiquer qu\'un champ est ou n\'est plus le champ à afficher, cliquer l\'icône «Champ à afficher», puis cliquer sur le nom de champ approprié.'; +$strDesignerHelpDisplayField = 'La colonne à afficher est montrée en rose. Pour indiquer qu\'une colonne est ou n\'est plus la colonne à afficher, cliquer l\'icône «Colonne à afficher», puis cliquer sur le nom de colonne approprié.'; $strDetails = 'Détails...'; $strDictionary = 'dictionnaire'; $strDifference = 'Différence'; @@ -271,17 +271,17 @@ $strDoYouReally = 'Voulez-vous vraiment effectuer '; $strDropDatabaseStrongWarning = 'Vous êtes sur le point de DÉTRUIRE une base de données!'; $strDrop = 'Supprimer'; $strDropUsersDb = 'Supprimer les bases de données portant le même nom que les utilisateurs'; -$strDumpAllRows = 'Exporter tous les enregistrements'; +$strDumpAllRows = 'Exporter toutes les lignes'; $strDumpingData = 'Contenu de la table'; $strDumpSaved = 'Le fichier d\'exportation a été sauvegardé sous %s.'; -$strDumpXRows = 'Exporter %s enregistrement(s) à partir du rang n° %s'; +$strDumpXRows = 'Exporter %s ligne(s) à partir du rang n° %s'; $strDynamic = 'dynamique'; $strEdit = 'Modifier'; $strEditPDFPages = 'Préparer le schéma en PDF'; $strEditPrivileges = 'Changer les privilèges'; $strEffective = 'effectif'; -$strEmptyResultSet = 'MySQL n\'a retourné aucun enregistrement.'; +$strEmptyResultSet = 'MySQL n\'a retourné aucune ligne.'; $strEmpty = 'Vider'; $strEnabled = 'activé'; $strEncloseInTransaction = 'Utiliser le mode transactionnel'; @@ -315,13 +315,13 @@ $strExtendedInserts = 'Insertions étendues'; $strExtra = 'Extra'; $strFailedAttempts = 'Tentatives échouées'; -$strFieldHasBeenDropped = 'Le champ %s a été effacé'; -$strField = 'Champ'; +$strFieldHasBeenDropped = 'La colonne %s a été effacée'; +$strField = 'Colonne'; $strFieldInsertFromFileTempDirNotExists = 'Erreur lors du déplacement du fichier téléchargé, voir [a@./Documentation.html#faq1_11@Documentation]FAQ 1.11[/a]'; -$strFieldsEnclosedBy = 'Champs entourés par'; +$strFieldsEnclosedBy = 'Colonnes entourées par'; $strFieldsEscapedBy = 'Caractère spécial'; -$strFields = 'Champs'; -$strFieldsTerminatedBy = 'Champs terminés par'; +$strFields = 'Colonnes'; +$strFieldsTerminatedBy = 'Colonnes terminées par'; $strFileAlreadyExists = 'Le fichier %s existe déjà sur le serveur, veuillez changer le nom, ou cocher l\'option Écraser'; $strFileCouldNotBeRead = 'Le fichier n\'a pu être lu'; $strFileNameTemplateDescription = 'Cette valeur est interprétée avec %1$sstrftime%2$s, vous pouvez donc utiliser des chaînes de format d\'heure. Ces transformations additionnelles vont se produire: %3$s. Tout autre texte sera conservé tel quel.'; @@ -381,7 +381,7 @@ $strHome = 'Accueil'; $strHomepageOfficial = 'Site officiel'; $strHostEmpty = 'Le nom de serveur est vide'; $strHost = 'Serveur'; -$strHostTableExplanation = 'Quand la table Host est utilisée, ce champ est ignoré et les valeurs de la table Host sont utilisées à la place.'; +$strHostTableExplanation = 'Quand la table Host est utilisée, cette colonne est ignorée et les valeurs de la table Host sont utilisées à la place.'; $strHTMLExcel = 'Microsoft Excel 2000'; $strHTMLWord = 'Microsoft Word 2000'; $strHungarian = 'hongrois'; @@ -429,8 +429,8 @@ $strInnoDBDataHomeDir = 'Répertoire des données'; $strInnoDBPages = 'pages'; $strInnodbStat = 'État InnoDB'; $strInsecureMySQL = 'Votre fichier de configuration fait référence à l\'utilisateur «root » sans mot de passe, ce qui correspond à la valeur par défaut de MySQL. Votre serveur MySQL est donc ouvert aux intrusions, et vous devriez corriger ce problème de sécurité.'; -$strInsertAsNewRow = 'Sauvegarder un nouvel enregistrement'; -$strInsertedRowId = 'Identifiant de l\'enregistrement inséré : %1$d'; +$strInsertAsNewRow = 'Sauvegarder une nouvelle ligne'; +$strInsertedRowId = 'Identifiant de la ligne insérée : %1$d'; $strInsert = 'Insérer'; $strInterface = 'Interface'; $strInternalAndForeign = 'Une relation interne n\'est pas nécessaire lorsqu\'une clé correspondante de type FOREIGN KEY existe'; @@ -438,16 +438,16 @@ $strInternalRelationAdded = 'Relation interne ajoutée'; $strInternalRelations = 'Relations internes'; $strInUse = 'utilisé'; $strInvalidAuthMethod = 'Le fichier de configuration contient un type d\'authentification invalide :'; -$strInvalidColumnCount = 'Le nombre de champs doit être plus grand que zéro.'; +$strInvalidColumnCount = 'Le nombre de colonnes doit être plus grand que zéro.'; $strInvalidColumn = 'La colonne %s est invalide!'; -$strInvalidCSVFieldCount = 'Nombre de champs invalide dans les données CSV à la ligne %d'; +$strInvalidCSVFieldCount = 'Nombre de colonnes invalide dans les données CSV à la ligne %d'; $strInvalidCSVFormat = 'Format invalide pour les données CSV à la ligne %d.'; $strInvalidCSVParameter = 'Paramètres invalides pour l\'importation CSV: %s'; $strInvalidDatabase = 'Nom de base de données invalide'; -$strInvalidFieldAddCount = 'Vous devez ajouter au moins un champ'; -$strInvalidFieldCount = 'La table doit comporter au moins un champ'; +$strInvalidFieldAddCount = 'Vous devez ajouter au moins une colonne'; +$strInvalidFieldCount = 'La table doit comporter au moins une colonne'; $strInvalidLDIImport = 'Ce greffon ne supporte pas les importations en format comprimé!'; -$strInvalidRowNumber = '%d n\'est pas un numéro d\'enregistrement valable.'; +$strInvalidRowNumber = '%d n\'est pas un numéro de ligne valable.'; $strInvalidServerHostname = 'Nom d\'hôte (hostname) invalide pour le serveur %1$s. Veuillez vérifier votre configuration.'; $strInvalidServerIndex = 'Indice de serveur invalide: "%s"'; $strInvalidTableName = 'Nom de table invalide'; @@ -481,7 +481,7 @@ $strLatvian = 'letton'; $strLDI = 'CSV via LOAD DATA'; $strLDILocal = 'Utiliser l\'option LOCAL'; $strLengthSet = 'Taille/Valeurs*'; -$strLimitNumRows = 'Nombre d\'enregistrements par page'; +$strLimitNumRows = 'Nombre de lignes par page'; $strLinesTerminatedBy = 'Lignes terminées par'; $strLinkNotFound = 'Lien absent'; $strLinksTo = 'Relié à'; @@ -567,7 +567,7 @@ $strNoPermission = 'Le serveur web n\'a pas les permissions nécessaires pour en $strNoPhp = 'Sans source PHP'; $strNoPrivileges = 'aucun privilège'; $strNoRights = 'Vous n\'êtes pas autorisé à accéder à cette page'; -$strNoRowsSelected = 'Aucun enregistrement n\'a été sélectionné'; +$strNoRowsSelected = 'Aucune ligne n\'a été sélectionnée'; $strNoSpace = 'Espace-disque insuffisant pour enregistrer le fichier %s.'; $strNoTablesFound = 'Aucune table n\'a été trouvée dans cette base.'; $strNoThemeSupport = 'Les thèmes ne sont pas supportés, veuillez vérifier votre configuration et/ou vos thèmes dans le répertoire %s.'; @@ -578,7 +578,7 @@ $strNotSet = 'La table <b>%s</b> est absente ou non définie dans %s'; $strNoUsersFound = 'Il n\'y a aucun utilisateur'; $strNoValidateSQL = 'Ne pas valider SQL'; $strNull = 'Null'; -$strNumberOfFields = 'Nombre de champs'; +$strNumberOfFields = 'Nombre de colonnes'; $strNumberOfTables = 'Nombre de tables'; $strNumSearchResultsInTable = '%s occurence(s) dans la table <i>%s</i>'; $strNumSearchResultsTotal = '<b>Total :</b> <i>%s</i> occurence(s)'; @@ -612,7 +612,7 @@ $strPasswordHashing = 'Hachage du mot de passe'; $strPasswordChanged = 'Le mot de passe de %s a été changé.'; $strPassword = 'Mot de passe'; $strPasswordNotSame = 'Les mots de passe doivent être identiques'; -$strPBXTDataFileGrowSizeDesc = 'La taille de l\'augmentation des fichiers pointeurs d\'enregistrements (.xtd).'; +$strPBXTDataFileGrowSizeDesc = 'La taille de l\'augmentation des fichiers pointeurs de lignes (.xtd).'; $strPBXTDataFileGrowSize = 'Taille de l\'augmentation du fichier des données'; $strPBXTDataLogThresholdDesc = 'La taille maximale d\'un fichier journal de données. Sa valeur par défaut est de 64 Mio. PBXT peut créer un maximum de 32000 journaux de données, utilisés par toutes les tables. Par conséquent cette variable peut être augmentée pour augmenter la quantité totale de données pouvant être stockée dans la base de données.'; $strPBXTDataLogThreshold = 'Seuil du journal des données'; @@ -630,10 +630,10 @@ $strPBXTLogFileCountDesc = 'Le nombre de journaux de transactions (pbxt/system/x $strPBXTLogFileCount = 'Nombre de fichiers journal'; $strPBXTLogFileThresholdDesc = 'La taille d\'un journal de transactions au-delà de laquelle un nouveau journal est créé. La valeur par défaut est de 16 Mio.'; $strPBXTLogFileThreshold = 'Seuil du fichier journal'; -$strPBXTRecordCacheSizeDesc = 'La quantité de mémoire allouée au cache des enregistrements. La valeur par défaut est de 32 Mio. Cette mémoire est utilisée pour le cache des changements aux fichiers de données (.xtd) et pointeurs (.xtr).'; -$strPBXTRecordCacheSize = 'Taille du cache des enregistrements'; -$strPBXTRowFileGrowSizeDesc = 'La taille de l\'augmentation des fichiers pointeurs d\'enregistrements (.xtr).'; -$strPBXTRowFileGrowSize = 'Taille d\'augmentation du fichier des enregistrements'; +$strPBXTRecordCacheSizeDesc = 'La quantité de mémoire allouée au cache des lignes. La valeur par défaut est de 32 Mio. Cette mémoire est utilisée pour le cache des changements aux fichiers de données (.xtd) et pointeurs (.xtr).'; +$strPBXTRecordCacheSize = 'Taille du cache des lignes'; +$strPBXTRowFileGrowSizeDesc = 'La taille de l\'augmentation des fichiers pointeurs de lignes (.xtr).'; +$strPBXTRowFileGrowSize = 'Taille d\'augmentation du fichier des lignes'; $strPBXTTransactionBufferSizeDesc = 'La taille du tampon du journal global des transactions (deux tampons sont alloués). La valeur par défaut est de 1 Mio.'; $strPBXTTransactionBufferSize = 'Taille du tampon des transactions'; $strPdfDbSchema = 'Schema de la base "%s" - Page %s'; @@ -686,7 +686,7 @@ $strPrivDescFile = 'Permission d\'importer et d\'exporter des données à partir $strPrivDescGrant = 'Permission d\'ajouter des utilisateurs et des privilèges sans avoir besoin de recharger les privilèges.'; $strPrivDescIndex = 'Permission de créer et d\'effacer des index.'; $strPrivDescInsert = 'Permission d\'ajouter et de remplacer des données'; -$strPrivDescLockTables = 'Permission de verrouiller des enregistrements dans le fil courant (unité d\'exécution).'; +$strPrivDescLockTables = 'Permission de verrouiller des lignes dans le fil courant (unité d\'exécution).'; $strPrivDescMaxConnections = 'Limite du nombre de nouvelles connexions qu\'un utilisateur peut démarrer, par heure.'; $strPrivDescMaxQuestions = 'Limite du nombre de requêtes qu\'un utilisateur peut envoyer au serveur, par heure.'; $strPrivDescMaxUpdates = 'Limite du nombre de commandes changeant une table ou base de données, qu\'un utilisateur peut exécuter, par heure.'; @@ -711,7 +711,7 @@ $strProcesses = 'Processus'; $strProcesslist = 'Liste des processus'; $strProfiling = 'Profilage'; $strProtocolVersion = 'Version du protocole'; -$strPutColNames = 'Afficher les noms de champ en première ligne'; +$strPutColNames = 'Afficher les noms de colonnes en première ligne'; $strQBEDel = 'Effacer'; $strQBEIns = 'Ajouter'; @@ -731,10 +731,10 @@ $strReadRequests = 'Requêtes de lecture'; $strRebuild = 'Reconstruire'; $strReceived = 'Reçu'; $strRecommended = 'recommandé'; -$strRecords = 'Enregistrements'; +$strRecords = 'Lignes'; $strReferentialIntegrity = 'Vérifier l\'intégrité référentielle'; $strRefresh = 'Actualiser'; -$strRelationalDisplayField = 'Relations : champs descriptifs'; +$strRelationalDisplayField = 'Relations : colonnes descriptives'; $strRelationalKey = 'Relations : clés'; $strRelationalSchema = 'Schéma relationnel'; $strRelationDeleted = 'Relation supprimée'; @@ -810,11 +810,11 @@ $strRomanian = 'roumain'; $strRoutineReturnType = 'Type retourné'; $strRoutines = 'Procédures stockées'; $strRowLength = 'Longueur enr.'; -$strRowsAffected = '%1$d enregistrement(s) affecté(s).'; -$strRowsDeleted = '%1$d enregistrement(s) supprimé(s).'; -$strRows = 'Enregistrements'; -$strRowsFrom = 'enregistrement(s) à partir de l\'enregistrement n°'; -$strRowsInserted = '%1$d enregistrement(s) inséré(s).'; +$strRowsAffected = '%1$d ligne(s) affectée(s).'; +$strRowsDeleted = '%1$d ligne(s) supprimée(s).'; +$strRows = 'Lignes'; +$strRowsFrom = 'ligne(s) à partir de la ligne n°'; +$strRowsInserted = '%1$d ligne(s) insérée(s).'; $strRowSize = ' Taille enr. '; $strRowsModeFlippedHorizontal = 'horizontal (en-têtes pivotés)'; $strRowsModeHorizontal = 'horizontal'; @@ -846,7 +846,7 @@ $strSecretRequired = 'Vous devez ajouter dans le fichier de configuration une ph $strSelectADb = 'Choisissez une base de données'; $strSelectAll = 'Tout sélectionner'; $strSelectBinaryLog = 'Sélectionnez le log binaire à consulter'; -$strSelectFields = 'Choisir les champs à afficher (au moins un)'; +$strSelectFields = 'Choisir les colonnes à afficher (au moins une)'; $strSelectForeignKey = 'Choisissez la clé étrangère'; $strSelectNumRows = 'dans la requête'; $strSelectReferencedKey = 'Sélectionnez la clé référencée'; @@ -867,7 +867,7 @@ $strServerVersion = 'Version du serveur'; $strSessionGCWarning = 'La valeur du paramètre PHP [a@http://php.net/manual/fr/session.configuration.php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] est plus petite que la durée du cookie configurée dans phpMyAdmin; donc, votre session de travail expirera plus tôt.'; $strSessionStartupErrorGeneral = 'Erreur lors du démarrage de la session, veuillez vérifier les erreurs indiquées par PHP ou dans le fichier témoin du serveur web, et configurer PHP correctement.'; $strSessionValue = 'Valeur pour la session'; -$strSetEnumVal = 'Les différentes valeurs des champs de type enum/set sont à spécifier sous la forme \'a\',\'b\',\'c\'...<br />Pour utiliser un caractère "\\" ou "\'" dans l\'une de ces valeurs, faites-le précéder du caractère d\'échappement "\\" (par exemple \'\\\\xyz\' ou \'a\\\'b\').'; +$strSetEnumVal = 'Les différentes valeurs des colonnes de type enum/set sont à spécifier sous la forme \'a\',\'b\',\'c\'...<br />Pour utiliser un caractère "\\" ou "\'" dans l\'une de ces valeurs, faites-le précéder du caractère d\'échappement "\\" (par exemple \'\\\\xyz\' ou \'a\\\'b\').'; $strSettings = 'réglages'; $strSetupAllowAnywhereRecoding_name = 'Active la conversion des caractères'; $strSetupAllowArbitraryServer_desc = 'Si activé, permet d\'entrer un nom de serveur MySQL sur le panneau de connexion (mode cookie)'; @@ -880,8 +880,8 @@ $strSetupBlowfishSecretLengthMsg = 'La clé doit avoir un minimum de 8 caractèr $strSetupBlowfishSecretMsg = 'Vous n\'aviez pas configuré un secret Blowfish et utilisez l\'authentification cookie , alors une clé secrète a été générée pour vous. Elle sert à encrypter les cookies, vous n\'avez pas à vous en souvenir.'; $strSetupblowfish_secret_name = 'Secret Blowfish'; $strSetupBrowseMarkerEnable_desc = '(utilisé quand on clique sur une ligne)'; -$strSetupBrowseMarkerEnable_name = 'Activer le marqueur d\'enregistrements'; -$strSetupBrowsePointerEnable_desc = 'Mettre en surbrillance l\'enregistrement sur lequel pointe la souris'; +$strSetupBrowseMarkerEnable_name = 'Activer le marqueur de ligne'; +$strSetupBrowsePointerEnable_desc = 'Mettre en surbrillance la ligne sur laquelle pointe la souris'; $strSetupBrowsePointerEnable_name = 'Activer le pointeur de surbrillance'; $strSetupBZipDump_desc = 'Active la compression [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] pour les opérations d\'importation et d\'exportation'; $strSetupBZipDump_name = 'Bzip2'; @@ -1017,8 +1017,8 @@ $strSetupImport_skip_queries_name = 'Nombre de requêtes à ignorer'; $strSetupInsecureConnection = 'Connexion non sécurisée'; $strSetupInsecureConnectionMsg1 = 'Votre connexion n\'est pas sécurisée; toutes les données sont transférées non-encryptées!'; $strSetupInsecureConnectionMsg2 = 'Si votre serveur accepte les requêtes HTTPS, utilisez une [a@%s]connexion sécurisée[/a].'; -$strSetupInsertRows_desc = 'Le nombre d\'enregistrements qui peuvent être insérés à la fois.'; -$strSetupInsertRows_name = 'Nombre d\'enregistrements à insérer'; +$strSetupInsertRows_desc = 'Le nombre de lignes qui peuvent être insérées à la fois.'; +$strSetupInsertRows_name = 'Nombre de lignes à insérer'; $strSetupLeftDefaultTabTable_name = 'Cible de l\'icône d\'accès rapide'; $strSetupLeftDisplayLogo_desc = '...dans le panneau de navigation'; $strSetupLeftDisplayLogo_name = 'Affichage du logo'; @@ -1056,7 +1056,7 @@ $strSetupMaxDbList_name = 'Nombre maximum de bases de données'; $strSetupMaxCharactersInDisplayedSQL_desc = '...en nombre de caractères'; $strSetupMaxCharactersInDisplayedSQL_name = 'Taille maximum des requêtes SQL affichées'; $strSetupMaxRows_desc = 'Nombre de colonnes affichées lors de la navigation sur un ensemble de résultats. Si le nombre des colonnes est supérieur, des liens « Suivant » et « Précédent » seront affichés.'; -$strSetupMaxRows_name = 'Nombre maximum d\'enregistrements à afficher'; +$strSetupMaxRows_name = 'Nombre maximum de lignes à afficher'; $strSetupMaxTableList_desc = '...affichées dans la liste des tables'; $strSetupMaxTableList_name = 'Nombre maximum de tables'; $strSetupMemoryLimit_desc = 'Le nombre d\'octets qu\'un script peut allouer, par exemple [kbd]32M[/kbd] ([kbd]0[/kbd] signifie illimité)'; @@ -1075,8 +1075,8 @@ $strSetupPersistentConnections_desc = '...au serveur MySQL'; $strSetupPersistentConnections_name = 'Connexions persistentes'; $strSetupPropertiesIconic_desc = 'Utiliser les icônes (true), du texte (false) ou les deux (both)'; $strSetupPropertiesIconic_name = 'Icônes pour les actions sur les tables'; -$strSetupProtectBinary_desc = 'Empêche l\'édition des champs BLOB et BINARY'; -$strSetupProtectBinary_name = 'Protéger les champs binaires'; +$strSetupProtectBinary_desc = 'Empêche l\'édition des colonnes BLOB et BINARY'; +$strSetupProtectBinary_name = 'Protéger les colonnes binaires'; $strSetupQueryHistoryDB_desc = 'Activer si vous désirez un historique permanent (nécessite pmadb). Si désactivé, utilise JS pour afficher un historique temporaire'; $strSetupQueryHistoryDB_name = 'Historique permanent des requêtes'; $strSetupQueryHistoryMax_desc = 'Le nombre de requêtes à conserver dans l\'historique'; @@ -1157,8 +1157,8 @@ $strSetupServers_ssl_desc = 'Utiliser SSL pour la connexion au serveur MySQL'; $strSetupServers_ssl_name = 'Utiliser SSL'; $strSetupServers_table_coords_desc = 'Laisser vider pour désactiver, suggéré : [kbd]pma_table_coords[/kbd]'; $strSetupServers_table_coords_name = 'Table pour coordonnées du schéma en PDF'; -$strSetupServers_table_info_desc = 'Sert à définir les champs descriptifs, laisser vide pour désactiver; suggéré : [kbd]pma_table_info[/kbd]'; -$strSetupServers_table_info_name = 'Table pour champs descriptifs'; +$strSetupServers_table_info_desc = 'Sert à définir les colonnes descriptives, laisser vide pour désactiver; suggéré : [kbd]pma_table_info[/kbd]'; +$strSetupServers_table_info_name = 'Table pour colonnes descriptives'; $strSetupServers_user_desc = 'Laisser vide si vous n\'utilisez pas la méthode d\'authentification config'; $strSetupServers_user_name = 'Utilisateur pour méthode config'; $strSetupServers_verbose_desc = 'Une description conviviale de ce serveur. Laisser vide pour utiliser à la place le nom du serveur.'; @@ -1167,7 +1167,7 @@ $strSetupServers_verbose_check_name = 'Vérification détaillée'; $strSetupServers_verbose_name = 'Nom à afficher pour ce serveur'; $strSetupSetValue = 'Assigner la valeur: %s'; $strSetupShowAll_desc = '...via le bouton Tout afficher'; -$strSetupShowAll_name = 'Permettre l\'affichage de tous les enregistrements'; +$strSetupShowAll_name = 'Permettre l\'affichage de toutes les lignes'; $strSetupShowCreateDb_name = 'Afficher le formulaire de création de base de données'; $strSetupShowForm = 'Afficher le formulaire'; $strSetupShowFunctionFields_desc = 'En insertion/édition, montrer la colonne contenant les fonctions'; @@ -1203,7 +1203,7 @@ $strSetupUploadDir_desc = 'Répertoire sur le serveur, dans lequel vous téléch $strSetupUploadDir_name = 'Répertoire de téléchargement'; $strSetupUseDbSearch_desc = 'Permet la recherche dans la base de données au complet'; $strSetupUseDbSearch_name = 'Permet une recherche dans toute la base de données'; -$strSetupVerboseMultiSubmit_desc = 'Montre le nombre d\'enregistrements affectés par chaque énoncé. Voir libraries/import.lib.php pour le nombre d\'énoncés qu\'une requête peut comporter.'; +$strSetupVerboseMultiSubmit_desc = '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.'; $strSetupVerboseMultiSubmit_name = 'Détails pour les requêtes multi-énoncés'; $strSetupVersionCheckDataError = 'Échec lors de la vérification de version.'; $strSetupVersionCheckInvalid = 'Un numéro de version invalide a été reçu du serveur.'; @@ -1231,7 +1231,7 @@ $strShowGrid = 'Grille'; $strShowHideLeftMenu = 'Montrer/cacher le menu de gauche'; $strShowingBookmark = 'Affichage du signet'; $strShowingPhp = 'Affichage du code PHP'; -$strShowingRecords = 'Affichage des enregistrements'; +$strShowingRecords = 'Affichage des lignes'; $strShowingSQL = 'Affichage de la requête SQL'; $strShowKeys = 'Ne montrer que les clés.'; $strShowMasterStatus = 'Montrer l\'état du maître'; @@ -1244,28 +1244,28 @@ $strShowStatusBinlog_cache_useDescr = 'Le nombre de transactions qui ont utilis $strShowStatusCreated_tmp_disk_tablesDescr = 'Le nombre de tables temporaires sur disque créées automatiquement par le serveur lors de l\'exécution d\'énoncés. Si la valeur du paramètre Created_tmp_disk_tables est trop grande, augmentez la valeur de tmp_table_size afin que les tables temporaires soient maintenues en mémoire au lieu d\'être sur disque.'; $strShowStatusCreated_tmp_filesDescr = 'Le nombre de fichiers temporaires créés par mysqld.'; $strShowStatusCreated_tmp_tablesDescr = 'Le nombre de tables temporaires en mémoire créées automatiquement par le serveur lors de l\'exécution d\'énoncés.'; -$strShowStatusDelayed_errorsDescr = 'Le nombre d\'enregistrements écrits avec INSERT DELAYED pour lesquels une erreur est survenue (probablement un doublon sur la clé).'; +$strShowStatusDelayed_errorsDescr = 'Le nombre de lignes écrites avec INSERT DELAYED pour lesquels une erreur est survenue (probablement un doublon sur la clé).'; $strShowStatusDelayed_insert_threadsDescr = 'Le nombre de fils d\'exécution utilisés pour INSERT DELAYED. Un fil est utilisé pour chacune des tables sur lesquelles un INSERT DELAYED a lieu.'; -$strShowStatusDelayed_writesDescr = 'Le nombre d\'enregistrements écrits via INSERT DELAYED.'; +$strShowStatusDelayed_writesDescr = 'Le nombre de lignes écrites via INSERT DELAYED.'; $strShowStatusFlush_commandsDescr = 'Le nombre de commandes FLUSH exécutées.'; $strShowStatusHandler_commitDescr = 'Le nombre de commandes COMMIT internes.'; -$strShowStatusHandler_deleteDescr = 'Le nombre de fois qu\'un enregistrement a été supprimé d\'une table.'; +$strShowStatusHandler_deleteDescr = 'Le nombre de fois qu\'une ligne a été supprimée d\'une table.'; $strShowStatusHandler_discoverDescr = 'Le serveur MySQL peut demander au moteur de données NDB Cluster s\'il connaît une table portant un certain nom. Ceci est appelé "découverte". Ce paramètre indique le nombre de fois que des tables ont été découvertes.'; $strShowStatusHandler_read_firstDescr = 'Le nombre de fois que la première entrée a été lue depuis un index. Si c\'est élevé, ceci suggère que le serveur effectue beaucoup de parcours complets d\'un index; par exemple, SELECT col1 FROM foo, en assumant que col1 est une colonne indexée.'; -$strShowStatusHandler_read_keyDescr = 'Le nombre de requêtes pour lire un enregistrement via une clé. Si élevé, c\'est une bonne indication que vos tables sont correctement indexées.'; -$strShowStatusHandler_read_nextDescr = 'Le nombre de requêtes de lecture du prochain enregistrement, en ordre de clé. Ceci est augmenté si vous interrogez une colonne indexée avec un critère de fourchette ou si vous parcourez l\'index.'; -$strShowStatusHandler_read_prevDescr = 'Le nombre de requêtes de lecture de l\'enregistrement précédent, en ordre de clé. Utilisé surtout pour optimiser ORDER BY ... DESC'; -$strShowStatusHandler_read_rndDescr = 'Le nombre de requêtes de lecture d\'un enregistrement basée sur une position fixe. Ce nombre est élevé si vous faites de nombreuses requêtes qui nécessitent de trier les résultats. Vous avez probablement un grand nombre de requêtes qui demandent à MySQL de parcourir des tables en entier, ou vous avez des jointures qui n\'utilisent pas correctement les clés.'; -$strShowStatusHandler_read_rnd_nextDescr = 'Le nombre de requêtes de lecture du prochaine enregistrement dans le fichier. Élevé si vous faites plusieurs parcours de tables. Ceci suggère que vos 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.'; +$strShowStatusHandler_read_keyDescr = 'Le nombre de requêtes pour lire une ligne via une clé. Si élevé, c\'est une bonne indication que vos tables sont correctement indexées.'; +$strShowStatusHandler_read_nextDescr = 'Le nombre de requêtes de lecture de la prochaine ligne, en ordre de clé. Ceci est augmenté si vous interrogez une colonne indexée avec un critère de fourchette ou si vous parcourez l\'index.'; +$strShowStatusHandler_read_prevDescr = 'Le nombre de requêtes de lecture de la ligne précédente, en ordre de clé. Utilisé surtout pour optimiser ORDER BY ... DESC'; +$strShowStatusHandler_read_rndDescr = 'Le nombre de requêtes de lecture d\'une ligne basée sur une position fixe. Ce nombre est élevé si vous faites de nombreuses requêtes qui nécessitent de trier les résultats. Vous avez probablement un grand nombre de requêtes qui demandent à MySQL de parcourir des tables en entier, ou vous avez des jointures qui n\'utilisent pas correctement les clés.'; +$strShowStatusHandler_read_rnd_nextDescr = 'Le nombre de requêtes de lecture de la prochaine ligne dans le fichier. Élevé si vous faites plusieurs parcours de tables. Ceci suggère que vos 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.'; $strShowStatusHandler_rollbackDescr = 'Le nombre d\'énoncés ROLLBACK internes.'; -$strShowStatusHandler_updateDescr = 'Le nombre de requêtes de mise à jour d\'enregistrements.'; -$strShowStatusHandler_writeDescr = 'Le nombre de requêtes d\'insertion d\'enregistrements.'; +$strShowStatusHandler_updateDescr = 'Le nombre de requêtes de mise à jour de lignes.'; +$strShowStatusHandler_writeDescr = 'Le nombre de requêtes d\'insertion de lignes.'; $strShowStatusInnodb_buffer_pool_pages_dataDescr = 'Le nombre de pages contenant des données.'; $strShowStatusInnodb_buffer_pool_pages_dirtyDescr = 'Le nombre de pages contenant des données «dirty»'; $strShowStatusInnodb_buffer_pool_pages_flushedDescr = 'Le nombre de pages de mémoire-tampon qui ont été effacées.'; $strShowStatusInnodb_buffer_pool_pages_freeDescr = 'Le nombre de pages libres'; $strShowStatusInnodb_buffer_pool_pages_latchedDescr = 'Le nombre de pages dans la réserve InnoDB. Ce sont des pages actuellement en train d\'être lues ou écrites, ou qui ne peuvent être supprimées pour une autre raison.'; -$strShowStatusInnodb_buffer_pool_pages_miscDescr = 'Le nombre de pages occupées car elles ont été déallouées en raison de verrous sur les enregistrements. Cette valeur peut également être calculée comme suit: Innodb_buffer_pool_pages_total - Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_data.'; +$strShowStatusInnodb_buffer_pool_pages_miscDescr = 'Le nombre de pages occupées car elles ont été déallouées en raison de verrous sur les lignes. Cette valeur peut également être calculée comme suit: Innodb_buffer_pool_pages_total - Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_data.'; $strShowStatusInnodb_buffer_pool_pages_totalDescr = 'Taille totale de la réserve, en pages.'; $strShowStatusInnodb_buffer_pool_read_ahead_rndDescr = 'Le nombre de lectures «discontinues» effectuées par InnoDB. Ceci survient lorsqu\'une requête doit balayer une large portion de table en ordre discontinu.'; $strShowStatusInnodb_buffer_pool_read_ahead_seqDescr = 'Le nombre de lectures séquentielles effectuées par InnoDB. Ceci survient quand InnoDB fait un parcours séquentiel intégral de la table.'; @@ -1294,15 +1294,15 @@ $strShowStatusInnodb_pages_createdDescr = 'Le nombre de pages créées.'; $strShowStatusInnodb_page_sizeDescr = 'La taille de page InnoDB telle que compilée (16 Ko par défaut). Plusieurs valeurs sont comptées par page; la taille de page leur permet d\'être facilement converties en octets.'; $strShowStatusInnodb_pages_readDescr = 'Le nombre de pages lues.'; $strShowStatusInnodb_pages_writtenDescr = 'Le nombre de pages écrites.'; -$strShowStatusInnodb_row_lock_current_waitsDescr = 'Le nombre de verrous d\'enregistrements actuellement en attente.'; +$strShowStatusInnodb_row_lock_current_waitsDescr = 'Le nombre de verrous de lignes actuellement en attente.'; $strShowStatusInnodb_row_lock_time_avgDescr = 'Le temps d\'attente moyen pour acquérir un verrou, en millisecondes.'; $strShowStatusInnodb_row_lock_timeDescr = 'Le temps total utilisé pour acquérir un verrou, en millisecondes.'; $strShowStatusInnodb_row_lock_time_maxDescr = 'Le temps d\'attente maximum pour acquérir un verrou, en millisecondes.'; $strShowStatusInnodb_row_lock_waitsDescr = 'Le nombre de fois qu\'on a dû attendre pour un verrou.'; -$strShowStatusInnodb_rows_deletedDescr = 'Le nombre d\'enregistrements supprimés des tables InnoDB.'; -$strShowStatusInnodb_rows_insertedDescr = 'Le nombre d\'enregistrements insérés dans des tables InnoDB.'; -$strShowStatusInnodb_rows_readDescr = 'Le nombre d\'enregistrements lus dans des tables InnoDB.'; -$strShowStatusInnodb_rows_updatedDescr = 'Le nombre d\'enregistrements mis à jour dans des tables InnoDB.'; +$strShowStatusInnodb_rows_deletedDescr = 'Le nombre de lignes supprimées des tables InnoDB.'; +$strShowStatusInnodb_rows_insertedDescr = 'Le nombre de lignes insérées dans des tables InnoDB.'; +$strShowStatusInnodb_rows_readDescr = 'Le nombre de lignes lues dans des tables InnoDB.'; +$strShowStatusInnodb_rows_updatedDescr = 'Le nombre de lignes mises à jour dans des tables InnoDB.'; $strShowStatusKey_blocks_not_flushedDescr = 'Le nombre de blocs de clés dans la cache de clés qui ont été modifiés mais pas encore transférés sur disque. Anciennement connu sous le nom Not_flushed_key_blocks.'; $strShowStatusKey_blocks_unusedDescr = 'Le nombre de blocs inutilisés dans la cache de clés. Vous pouvez utiliser cette valeur pour déterminer la proportion de la cache de clés qui est utilisée.'; $strShowStatusKey_blocks_usedDescr = 'Le nombre maximum de blocs utilisés dans le cache. Il s\'agit de la valeur maximum du nombre de blocs qui ont été utilisés en même temps dans le cache de clés.'; @@ -1311,7 +1311,7 @@ $strShowStatusKey_readsDescr = 'Le nombre de lectures physiques d\'un bloc de cl $strShowStatusKey_write_requestsDescr = 'Le nombre de requêtes en vue d\'écrire un bloc de clé dans la cache.'; $strShowStatusKey_writesDescr = 'Le nombre d\'écritures physiques d\'un bloc de clés vers le disque.'; $strShowStatusLast_query_costDescr = 'Le coût total de la dernière requête compilée, tel que calculé par l\'optimiseur de requêtes. Utile pour comparer le coût de diverses stratégies pour une même requête. La valeur de 0 indique qu\'aucune requête n\'a encore été compilée.'; -$strShowStatusNot_flushed_delayed_rowsDescr = 'Le nombre d\'enregistrements en attente d\'écriture (INSERT DELAYED).'; +$strShowStatusNot_flushed_delayed_rowsDescr = 'Le nombre de lignes en attente d\'écriture (INSERT DELAYED).'; $strShowStatusOpened_tablesDescr = 'Le nombre tables qui ont été ouvertes. Si trop élevé, votre cache de table est probablement trop petite.'; $strShowStatusOpen_filesDescr = 'Le nombre de fichiers qui sont ouverts.'; $strShowStatusOpen_streamsDescr = 'Le nombre de flux de données qui sont ouverts.'; @@ -1329,7 +1329,7 @@ $strShowStatusRpl_statusDescr = 'L\'état de la réplication sans échec (pas en $strShowStatusSelect_full_joinDescr = 'Le nombre de jointures qui n\'ont pas utilisé d\'index. Si cette valeur est supérieure à 0, vérifiez soigneusement les indexes de vos tables.'; $strShowStatusSelect_full_range_joinDescr = 'Le nombre de jointures qui ont utilisé une recherche par plage sur une table de référence.'; $strShowStatusSelect_rangeDescr = 'Le nombre de jointures qui ont utilisé des plages sur la première table. (Normalement non critique même si cette valeur est élevée.)'; -$strShowStatusSelect_range_checkDescr = '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 indexes de vos tables.)'; +$strShowStatusSelect_range_checkDescr = 'Le nombre de jointures sans clés qui vérifient l\'utilisation de clé à chaque ligne. (Si ceci est supérieur à 0, vérifiez soigneusement les indexes de vos tables.)'; $strShowStatusSelect_scanDescr = 'Le nombre de jointures qui ont nécessité le parcours complet de la première table.'; $strShowStatusSlave_open_temp_tablesDescr = 'Le nombre de tables temporaires actuellement ouvertes par le fil d\'exécution SQL de l\'esclave.'; $strShowStatusSlave_retried_transactionsDescr = 'Nombre de fois (depuis le démarrage) que le fil d\'exécution SQL de l\'esclave a envoyé à nouveau des transactions.'; @@ -1338,7 +1338,7 @@ $strShowStatusSlow_launch_threadsDescr = 'Le nombre de fils d\'exécution dont l $strShowStatusSlow_queriesDescr = 'Le nombre de requêtes dont le temps d\'exécution a excédé long_query_time secondes.'; $strShowStatusSort_merge_passesDescr = 'Le nombre d\'opérations de fusion effectuées par l\'algorithme de tri. Si ce nombre est élevé, augmentez la valeur du paramètre sort_buffer_size.'; $strShowStatusSort_rangeDescr = 'Le nombre de tri effectués avec des plages.'; -$strShowStatusSort_rowsDescr = 'Le nombre d\'enregistrements triés.'; +$strShowStatusSort_rowsDescr = 'Le nombre de lignes triées.'; $strShowStatusSort_scanDescr = 'Le nombre de tri effectués via un parcours de la table.'; $strShowStatusTable_locks_immediateDescr = 'Le nombre de fois qu\'un verrou de table a été acquis immédiatement.'; $strShowStatusTable_locks_waitedDescr = 'Le nombre de fois qu\'un verrou de table n\'a pu être acquis immédiatement, induisant un temps d\'attente. Si ce nombre est élevé et que vous éprouvez des problèmes de performance, commencez par optimiser vos requêtes, puis subdivisez vos tables ou encore utiliser la réplication.'; @@ -1420,13 +1420,13 @@ $strTableAlteredSuccessfully = 'La table %1$s a été modifiée avec succès.'; $strTableAlterIndex = 'Modifier des index'; $strTableApplyIndex = 'Appliquer des index'; $strTableComments = 'Commentaires sur la table'; -$strTableDeleteRows = 'Voulez-vous supprimer tous les enregistrements des tables cible?'; +$strTableDeleteRows = 'Voulez-vous supprimer toutes les lignes des tables cible?'; $strTableEmpty = 'Le nom de la table est vide'; $strTableHasBeenCreated = 'La table %1$s a été créée.'; $strTableHasBeenDropped = 'La table %s a été effacée'; $strTableHasBeenEmptied = 'La table %s a été vidée'; $strTableHasBeenFlushed = 'La table %s a été rechargée'; -$strTableInsertRow = 'Insérer des enregistrements'; +$strTableInsertRow = 'Insérer des lignes'; $strTableIsEmpty = 'La table semble vide!'; $strTableMaintenance = '<b>Maintenance</b> de la table'; $strTableName = 'Nom de la table'; @@ -1437,12 +1437,12 @@ $strTableRemoveIndex = 'Supprimer des index'; $strTables = '%s table(s)'; $strTableStructure = 'Structure de la table'; $strTable = 'Table'; -$strTableUpdateRow = 'Modifier des enregistrements'; +$strTableUpdateRow = 'Modifier des lignes'; $strTakeIt = 'utiliser celui-ci'; $strTargetDatabaseHasBeenSynchronized = 'La base cible a été synchronizée avec la base source'; $strTblPrivileges = 'Privilèges spécifiques à une table'; $strTempData = 'Données temporaires'; -$strTextAreaLength = 'Il est possible que ce champ<br />ne soit pas éditable<br />en raison de sa longueur'; +$strTextAreaLength = 'Il est possible que cette colonne<br />ne soit pas éditable<br />en raison de sa longueur'; $strTexyText = 'Texte Texy!'; $strThai = 'thaï'; $strThemeDefaultNotFound = 'Thème par défaut %s inexistant!'; @@ -1521,13 +1521,13 @@ $strTransformation_application_octetstream__hex = 'Affiche une représentation h $strTransformation_image_jpeg__inline = 'Affiche une image timbre-poste cliquable. Les options sont: largeur,hauteur en pixels. Le rapport original de l\'image est préservé.'; $strTransformation_image_jpeg__link = 'Affiche un lien vers cette image'; $strTransformation_image_png__inline = 'Voir image/jpeg: inline'; -$strTransformation_text_plain__dateformat = 'Affiche un champ TIME, TIMESTAMP, DATETIME ou un champ numérique contenant une valeur TIMESTAMP UNIX en tant que date formatée. La première option est le décalage (en heures) à ajouter (par défaut, 0). La seconde option sert à indiquer le format de date ou d\'heure. La troisième option détermine si vous voulez la date locale («local») ou UTC («utc»). Pour le format «local», le second paramètre utilise le format de la fonction PHP strftime() et pour le format «utc», il utilise la fonction gmdate().'; -$strTransformation_text_plain__external = '(Linux seulement) Exécute un programme externe et lui envoie le contenu du champ via l\'entrée standard. Puis capture la sortie standard de ce programme externe. Le programme par défaut est tidy, pour un affichage embelli du code HTML. Pour des raisons de sécurité, vous devez éditer le script libraries/transformations/text_plain__external.inc.php et y insérer les noms de programme externe possibles. La première option est le numéro du programme que vous voulez utiliser, la seconde option contient les paramètres pour ce programme. En troisième option, une valeur de 1 va convertir le résultat avec la fonction htmlspecialchars() (par défaut, 1). En option 4, une valeur de 1 va ajouter NOWRAP à la cellule affichée (par défaut, 1).'; -$strTransformation_text_plain__formatted = 'Préserve le contenu original du champ, sans ajout de caractères d\'échappement avec la fonction htmlspecialchars(). Donc il est assumé que le champ contient du HTML valide.'; -$strTransformation_text_plain__imagelink = 'Affiche une image et un lien, le champ contient le nom du fichier. La première option est un préfixe URL tel que «http://www.example.com/». La seconde option est la largeur en pixels et la troisième option est la hauteur en pixels.'; -$strTransformation_text_plain__link = 'Affiche un lien, le champ contient le nom du fichier; en première option, un préfixe comme «http://www.example.com/», en seconde option, un titre pour le lien.'; +$strTransformation_text_plain__dateformat = 'Affiche une colonne TIME, TIMESTAMP, DATETIME ou une colonne numérique contenant une valeur TIMESTAMP UNIX en tant que date formatée. La première option est le décalage (en heures) à ajouter (par défaut, 0). La seconde option sert à indiquer le format de date ou d\'heure. La troisième option détermine si vous voulez la date locale («local») ou UTC («utc»). Pour le format «local», le second paramètre utilise le format de la fonction PHP strftime() et pour le format «utc», il utilise la fonction gmdate().'; +$strTransformation_text_plain__external = '(Linux seulement) Exécute un programme externe et lui envoie le contenu de la colonne via l\'entrée standard. Puis capture la sortie standard de ce programme externe. Le programme par défaut est tidy, pour un affichage embelli du code HTML. Pour des raisons de sécurité, vous devez éditer le script libraries/transformations/text_plain__external.inc.php et y insérer les noms de programme externe possibles. La première option est le numéro du programme que vous voulez utiliser, la seconde option contient les paramètres pour ce programme. En troisième option, une valeur de 1 va convertir le résultat avec la fonction htmlspecialchars() (par défaut, 1). En option 4, une valeur de 1 va ajouter NOWRAP à la cellule affichée (par défaut, 1).'; +$strTransformation_text_plain__formatted = 'Préserve le contenu original de la colonne, sans ajout de caractères d\'échappement avec la fonction htmlspecialchars(). Donc il est assumé que la colonne contient du HTML valide.'; +$strTransformation_text_plain__imagelink = 'Affiche une image et un lien, la colonne contient le nom du fichier. La première option est un préfixe URL tel que «http://www.example.com/». La seconde option est la largeur en pixels et la troisième option est la hauteur en pixels.'; +$strTransformation_text_plain__link = 'Affiche un lien, la colonne contient le nom du fichier; en première option, un préfixe comme «http://www.example.com/», en seconde option, un titre pour le lien.'; $strTransformation_text_plain__sql = 'Affiche le texte comme une requête SQL avec embellissement de la syntaxe.'; -$strTransformation_text_plain__substr = 'N\'affiche qu\'une partie du champ. En première option, la position de départ (par défaut, 0). En seconde option, le nombre de caractères à afficher (par défaut, le reste). En troisième option, des caractères à afficher à la fin du texte (par défaut: «...»).'; +$strTransformation_text_plain__substr = 'N\'affiche qu\'une partie de la colonne. En première option, la position de départ (par défaut, 0). En seconde option, le nombre de caractères à afficher (par défaut, le reste). En troisième option, des caractères à afficher à la fin du texte (par défaut: «...»).'; $strTriggers = 'Déclencheurs'; $strTruncateQueries = 'Afficher les requêtes tronquées'; $strTurkish = 'turc'; @@ -1555,7 +1555,7 @@ $strUploadErrorUnknown = 'Erreur inconnue durant le téléchargement.'; $strUploadLimit = 'Vous avez probablement tenté de télécharger un fichier trop volumineux. Veuillez vous référer à la %sdocumentation%s pour des façons de contourner cette limite.'; $strUploadsNotAllowed = 'Les téléchargements vers ce serveur ne sont pas permis.'; $strUsage = 'Espace'; -$strUseBackquotes = 'Protéger les noms des tables et des champs par des guillemets obliques (`)'; +$strUseBackquotes = 'Protéger les noms des tables et des colonnes par des guillemets obliques (`)'; $strUseHostTable = 'Utiliser la table Host'; $strUserAlreadyExists = 'L\'utilisateur %s existe déjà!'; $strUserEmpty = 'Le nom d\'utilisateur est vide'; @@ -1578,7 +1578,7 @@ $strVersionInformation = 'Version'; $strViewDump = '<b>Afficher le schéma</b> de la table'; $strViewDumpDatabases = 'Schéma et/ou contenu des bases de données'; $strViewDumpDB = 'Schéma et données de la base'; -$strViewHasAtLeast = 'Cette vue contient au moins ce nombre d\'enregistrements. Veuillez référer à %sdocumentation%s.'; +$strViewHasAtLeast = 'Cette vue contient au moins ce nombre de lignes. Veuillez référer à %sdocumentation%s.'; $strViewHasBeenDropped = 'La vue %s a été supprimée'; $strViewImage = 'Afficher l\'image'; $strViewName = 'Nom de la vue'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4488-g5a3ebde
by Michal Čihař 31 May '10

31 May '10

The branch, master has been updated via 5a3ebdec93d2c363f65a20b5db13e7d64e8eb861 (commit) from 45a8909a082d37a1d051ae5342d32e648533f8c2 (commit) - Log ----------------------------------------------------------------- commit 5a3ebdec93d2c363f65a20b5db13e7d64e8eb861 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 31 14:25:58 2010 +0200 Place link into fieldset to have consistent look with other pages. ----------------------------------------------------------------------- Summary of changes: db_operations.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db_operations.php b/db_operations.php index e879f06..40ec652 100644 --- a/db_operations.php +++ b/db_operations.php @@ -640,12 +640,12 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { ?> if ($test_rs && PMA_DBI_num_rows($test_rs) > 0) { include('./libraries/display_pdf_schema.lib.php'); } // end if - echo '<br /><a href="pdf_pages.php?' . $url_query . '">'; + echo '<fieldset><a href="pdf_pages.php?' . $url_query . '">'; if ($cfg['PropertiesIconic']) { echo '<img class="icon" src="' . $pmaThemeImage . 'b_edit.png"' .' alt="" width="16" height="16" />'; } - echo __('Edit PDF Pages') . '</a>'; + echo __('Edit PDF Pages') . '</a></fieldset>'; } // end if /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4487-g45a8909
by Michal Čihař 31 May '10

31 May '10

The branch, master has been updated via 45a8909a082d37a1d051ae5342d32e648533f8c2 (commit) from ad71c5b0ce324d15e0ec238150b01ba18aa2151a (commit) - Log ----------------------------------------------------------------- commit 45a8909a082d37a1d051ae5342d32e648533f8c2 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 31 14:24:36 2010 +0200 Show tabs when editing PDF pages. ----------------------------------------------------------------------- Summary of changes: pdf_pages.php | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/pdf_pages.php b/pdf_pages.php index 8cd04dd..2e907b8 100644 --- a/pdf_pages.php +++ b/pdf_pages.php @@ -13,6 +13,11 @@ require_once './libraries/common.inc.php'; require_once './libraries/db_common.inc.php'; require './libraries/StorageEngine.class.php'; +$active_page = 'db_operations.php'; +require_once './libraries/db_common.inc.php'; +$url_query .= '&goto=pdf_pages.php'; +require_once './libraries/db_info.inc.php'; + /** * Settings for relation stuff */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4486-gad71c5b
by Michal Čihař 31 May '10

31 May '10

The branch, master has been updated via ad71c5b0ce324d15e0ec238150b01ba18aa2151a (commit) via 168824b38fe7654cbe6bb8850d80c3f598d77e48 (commit) from 9d0b7a0987e362d5b7cfca48cd54a2b76dc8c911 (commit) - Log ----------------------------------------------------------------- commit ad71c5b0ce324d15e0ec238150b01ba18aa2151a Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 31 14:18:37 2010 +0200 Standard look to forms on table operations page. commit 168824b38fe7654cbe6bb8850d80c3f598d77e48 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 31 14:17:50 2010 +0200 Standard look to all forms on database properties page. ----------------------------------------------------------------------- Summary of changes: db_operations.php | 6 ++++++ tbl_operations.php | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/db_operations.php b/db_operations.php index 44e93b2..e879f06 100644 --- a/db_operations.php +++ b/db_operations.php @@ -380,6 +380,8 @@ if (!$is_information_schema) { <input type="text" name="comment" class="textfield" size="30" value="<?php echo htmlspecialchars(PMA_getDBComment($db)); ?>" /> + </fieldset> + <fieldset class="tblFooters"> <input type="submit" value="<?php echo __('Go'); ?>" /> </fieldset> </form> @@ -422,6 +424,8 @@ if (!$is_information_schema) { echo 'INSERT INTO ... SELECT'; //} echo ')'; ?> + </fieldset> + <fieldset class="tblFooters"> <input type="submit" value="<?php echo __('Go'); ?>" onclick="return confirmLink(this, 'CREATE DATABASE ... <?php echo __('and then'); ?> DROP DATABASE <?php echo PMA_jsFormat($db); ?>')" /> </fieldset> </form> @@ -599,6 +603,8 @@ if (!$is_information_schema) { . ' </legend>' . "\n" . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', 'select_db_collation', $db_collation, false, 3) + . '</fieldset>' + . '<fieldset class="tblFooters">' . ' <input type="submit" name="submitcollation"' . ' value="' . __('Go') . '" />' . "\n" . '</fieldset>' . "\n" diff --git a/tbl_operations.php b/tbl_operations.php index a5b1357..4e0738a 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -157,7 +157,7 @@ if (isset($_REQUEST['submitoptions'])) { $reread_info = true; unset($table_alters); foreach (PMA_DBI_get_warnings() as $warning) { - // In MariaDB 5.1.44, when altering a table from Maria to MyISAM + // In MariaDB 5.1.44, when altering a table from Maria to MyISAM // and if TRANSACTIONAL was set, the system reports an error; // I discussed with a Maria developer and he agrees that this // should not be reported with a Level of Error, so here @@ -194,7 +194,7 @@ if (isset($_REQUEST['submit_partition']) && ! empty($_REQUEST['partition_operati if ($reread_info) { // to avoid showing the old value (for example the AUTO_INCREMENT) after // a change, clear the cache - PMA_Table::$cache = array(); + PMA_Table::$cache = array(); $page_checksum = $checksum = $delay_key_write = 0; require './libraries/tbl_info.inc.php'; } @@ -260,6 +260,8 @@ unset($columns); <option value="asc"><?php echo __('Ascending'); ?></option> <option value="desc"><?php echo __('Descending'); ?></option> </select> +</fieldset> +<fieldset class="tblFooters"> <input type="submit" name="submitorderby" value="<?php echo __('Go'); ?>" /> </fieldset> </form> hooks/post-receive -- phpMyAdmin

1 0