- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4661-gfd74529
by Michal Čihař 03 Jun '10

03 Jun '10

The branch, master has been updated via fd7452915c8617e9eecf71dffd0b5293cd754674 (commit) via aec0d63ffe5b45e41f76d483bf88db52e396b835 (commit) via 15c6f93a26d203b51613fc2efcff9dadb3852a0f (commit) via 8d8e0c1da9284577677e04962498a4e0215e8a2c (commit) via 5d90fecafc5f6f96460a57ae7f5173d273a5fe9d (commit) via 8110a07e14dd3c5ee06846e9b569df903534fe95 (commit) via e71ad002115ed4d662202f4ec28626c31bf250cf (commit) via 43a4f8b87797190bbe1900a6627c3d2a2b342dfe (commit) via 88a69aadf3c57a2b7e80f50598c336ab8496dd81 (commit) via b9db5c1c5927a2db7926084fa8fd88d221fe684e (commit) via 7d0371cd5eac825e1b177bbac69f11c371dd2b3c (commit) via 1ea7f28d75bd1b4fee3df4a71e52e0fa490da454 (commit) via be87f6c7f2df7c5566355d2bbf73707e36f44c69 (commit) via 919e7e1f0e614212d3d791e3258be12dd971a5ac (commit) via 2d3574773269527c0dff47037fc2f8adfb81c4ac (commit) via d19159b89d1f6a714be23e7e3e7c1556459a2426 (commit) via 8c0b0da285cbbfca6b9cba368c0563ce49a265a1 (commit) via df0a09ecc882c0abcb4ad90501339fa114dfb201 (commit) via 3575d8aa9e922418bb05c88f6abd3c384158f042 (commit) via 8121fb959728125042a269198487fdbce43ca574 (commit) via d3fbab82b592ff330bc77b08570f2e0a6c99ad6e (commit) via 972b724823114db65144fb031eefce5f010636e6 (commit) via 2d6513a328c5d99c3abe49ca056e8a46613070ae (commit) via deddd8d7c3ee3d6ce1427e2aec222694ae6ef2bb (commit) via 14195f42a070814b1746b60269fbee7b07cb8eed (commit) via df7cd4202e181a7aaf2d7cbdc1e074a1756af0ff (commit) via 83fc95c278a58efd00e1e5f239a4ef0a3c222337 (commit) via c3b578ef5d8c1d6c97c592e5e5d8d0ad17d29bb3 (commit) via 7be4f478437c0c2d2fd4356e7ba4546841988f19 (commit) via 8e254c23852ecff83f9849c7d8d3d7c8611844ad (commit) via 310ea29691d620f21ee7e808c977ff2f4f0c9f1d (commit) via 18d1fc4fa4502b744a27696663a900ffbffa4a04 (commit) via dee866c7ea1ea11fa8d251a395c9df9a23dcc41f (commit) from 5dfe98a3786c7aaf55c9dd677da81bfe509c8612 (commit) - Log ----------------------------------------------------------------- commit fd7452915c8617e9eecf71dffd0b5293cd754674 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:49:59 2010 +0200 Translation update done using Pootle. commit aec0d63ffe5b45e41f76d483bf88db52e396b835 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:49:43 2010 +0200 Translation update done using Pootle. commit 15c6f93a26d203b51613fc2efcff9dadb3852a0f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:49:28 2010 +0200 Translation update done using Pootle. commit 8d8e0c1da9284577677e04962498a4e0215e8a2c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:49:02 2010 +0200 Translation update done using Pootle. commit 5d90fecafc5f6f96460a57ae7f5173d273a5fe9d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:48:46 2010 +0200 Translation update done using Pootle. commit 8110a07e14dd3c5ee06846e9b569df903534fe95 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:47:37 2010 +0200 Translation update done using Pootle. commit e71ad002115ed4d662202f4ec28626c31bf250cf Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:47:19 2010 +0200 Translation update done using Pootle. commit 43a4f8b87797190bbe1900a6627c3d2a2b342dfe Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:46:43 2010 +0200 Translation update done using Pootle. commit 88a69aadf3c57a2b7e80f50598c336ab8496dd81 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:44:47 2010 +0200 Translation update done using Pootle. commit b9db5c1c5927a2db7926084fa8fd88d221fe684e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:41:18 2010 +0200 Translation update done using Pootle. commit 7d0371cd5eac825e1b177bbac69f11c371dd2b3c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:40:18 2010 +0200 Translation update done using Pootle. commit 1ea7f28d75bd1b4fee3df4a71e52e0fa490da454 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:39:47 2010 +0200 Translation update done using Pootle. commit be87f6c7f2df7c5566355d2bbf73707e36f44c69 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:39:05 2010 +0200 Translation update done using Pootle. commit 919e7e1f0e614212d3d791e3258be12dd971a5ac Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:39:02 2010 +0200 Translation update done using Pootle. commit 2d3574773269527c0dff47037fc2f8adfb81c4ac Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:37:02 2010 +0200 Translation update done using Pootle. commit d19159b89d1f6a714be23e7e3e7c1556459a2426 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:35:09 2010 +0200 Translation update done using Pootle. commit 8c0b0da285cbbfca6b9cba368c0563ce49a265a1 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:34:43 2010 +0200 Translation update done using Pootle. commit df0a09ecc882c0abcb4ad90501339fa114dfb201 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:33:18 2010 +0200 Translation update done using Pootle. commit 3575d8aa9e922418bb05c88f6abd3c384158f042 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:32:37 2010 +0200 Translation update done using Pootle. commit 8121fb959728125042a269198487fdbce43ca574 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:32:03 2010 +0200 Translation update done using Pootle. commit d3fbab82b592ff330bc77b08570f2e0a6c99ad6e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:31:41 2010 +0200 Translation update done using Pootle. commit 972b724823114db65144fb031eefce5f010636e6 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:30:12 2010 +0200 Translation update done using Pootle. commit 2d6513a328c5d99c3abe49ca056e8a46613070ae Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:29:38 2010 +0200 Translation update done using Pootle. commit deddd8d7c3ee3d6ce1427e2aec222694ae6ef2bb Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:29:23 2010 +0200 Translation update done using Pootle. commit 14195f42a070814b1746b60269fbee7b07cb8eed Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:28:13 2010 +0200 Translation update done using Pootle. commit df7cd4202e181a7aaf2d7cbdc1e074a1756af0ff Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:27:45 2010 +0200 Translation update done using Pootle. commit 83fc95c278a58efd00e1e5f239a4ef0a3c222337 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:26:14 2010 +0200 Translation update done using Pootle. commit c3b578ef5d8c1d6c97c592e5e5d8d0ad17d29bb3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:25:45 2010 +0200 Translation update done using Pootle. commit 7be4f478437c0c2d2fd4356e7ba4546841988f19 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:25:23 2010 +0200 Translation update done using Pootle. commit 8e254c23852ecff83f9849c7d8d3d7c8611844ad Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:23:47 2010 +0200 Translation update done using Pootle. commit 310ea29691d620f21ee7e808c977ff2f4f0c9f1d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:23:34 2010 +0200 Translation update done using Pootle. commit 18d1fc4fa4502b744a27696663a900ffbffa4a04 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:23:10 2010 +0200 Translation update done using Pootle. commit dee866c7ea1ea11fa8d251a395c9df9a23dcc41f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jun 3 03:19:41 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/zh_CN.po | 103 ++++++++++++++++------------------------------------------ 1 files changed, 29 insertions(+), 74 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 742c9bf..68ad257 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.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-17 04:57+0200\n" +"PO-Revision-Date: 2010-06-03 03:49+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -376,7 +376,7 @@ msgid "Last check" msgstr "最后检查" #: db_printview.php:222 db_structure.php:480 -#, fuzzy, php-format +#, php-format #| msgid "%s table(s)" msgid "%s table" msgid_plural "%s tables" @@ -451,10 +451,9 @@ msgid "Add/Delete criteria rows" msgstr "添加/删除条件行" #: db_qbe.php:596 -#, fuzzy #| msgid "Add/Delete Field Columns" msgid "Add/Delete columns" -msgstr "添加/删除字段列" +msgstr "添加/删除字段" #: db_qbe.php:609 db_qbe.php:634 msgid "Update Query" @@ -988,7 +987,6 @@ msgid "Please select the primary key or a unique key" msgstr "请选择主键或唯一键" #: js/messages.php:63 pmd_general.php:77 tbl_relation.php:548 -#, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "选择要显示的字段" @@ -1946,7 +1944,6 @@ msgid "No Privileges" msgstr "无权限" #: 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 "数据表至少要有一个字段。" @@ -1957,7 +1954,6 @@ msgid "Create table on database %s" msgstr "在数据库 %s 中新建一张数据表" #: libraries/display_create_table.lib.php:57 -#, fuzzy #| msgid "Number of fields" msgid "Number of columns" msgstr "字段数" @@ -1967,10 +1963,10 @@ msgid "Could not load export plugins, please check your installation!" msgstr "无法加载导出插件，请检查安装！" #: 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 "转存 %s 行，从记录 # %s 开始。" +msgstr "从 # %2$s 行开始转储 %1$s 行" #: libraries/display_export.lib.php:115 msgid "Dump all rows" @@ -2118,7 +2114,6 @@ msgstr "" "入大文件时是个很好的方法。" #: 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 "跳过查询的数量" @@ -2238,7 +2233,6 @@ msgid "Relational key" msgstr "关联键" #: libraries/display_tbl.lib.php:588 -#, fuzzy #| msgid "Relational display field" msgid "Relational display column" msgstr "关联显示字段" @@ -2638,24 +2632,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 "换行符" +msgstr "字段分隔符" #: 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 "文字分隔符" +msgstr "内容分隔符" #: 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 "字段转义符" +msgstr "内容转义符" #: libraries/export/csv.php:24 libraries/import/csv.php:30 #: libraries/import/csv.php:79 libraries/import/ldi.php:43 @@ -2671,20 +2662,18 @@ msgid "Replace NULL by" msgstr "将 NULL 替换为" #: libraries/export/csv.php:26 libraries/export/excel.php:23 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove CRLF characters within columns" -msgstr "删除字段中的换行符" +msgstr "删除字段中的回车换行符" #: 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 "将字段名放在第一行" +msgstr "首行保存字段名" #: libraries/export/excel.php:18 msgid "CSV for MS Excel" @@ -2819,7 +2808,6 @@ msgid "Database export options" msgstr "数据库导出选项" #: libraries/export/sql.php:80 -#, fuzzy #| msgid "Enclose table and field names with backquotes" msgid "Enclose table and column names with backquotes" msgstr "给数据表名及字段名加上反引号" @@ -3039,7 +3027,7 @@ msgid "Invalid format of CSV input on line %d." msgstr "CSV 输入的第 %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 "CSV 输入的第 %d 行字段数有错。" @@ -4358,10 +4346,9 @@ msgid "Run SQL query/queries on database %s" msgstr "在数据库 %s 运行 SQL 查询" #: libraries/sql_query_form.lib.php:317 -#, fuzzy #| msgid "Column names" msgid "Columns" -msgstr "字段名" +msgstr "字段" #: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" @@ -4473,7 +4460,6 @@ msgid "Length/Values" msgstr "长度/值" #: 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'... If you ever need to put a backslash (\"\\\") " @@ -4485,9 +4471,8 @@ msgid "" "a single quote (\"'\") amongst those values, precede it with a backslash " "(for example '\\\\xyz' or 'a\\'b')." msgstr "" -"如字段类型是“enum”或“set”，请使用以下的格式输入：'a','b','c'... 如果您需" -"要在值中输入反斜线(“\\”)或者单引号(“'”)，请在前面加上反斜线(如 '\\\\xyz' 或 " -"'a\\'b')。" +"如字段类型是“enum”或“set”，请使用以下格式输入：'a','b','c'... 如果需要输入反斜杠(“\\”)或单引号(“'”)，请在前面加上反斜杠(如 '\\\\xyz' 或 'a\\'b')。" #: libraries/tbl_properties.inc.php:106 msgid "" @@ -4560,7 +4545,6 @@ msgid "Add %s column(s)" msgstr "增加字段" #: 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 "至少要添加一个字段。" @@ -4570,7 +4554,6 @@ msgid "Event" msgstr "事件" #: 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 " @@ -4582,8 +4565,7 @@ 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 "" -"字段中显示一个二进制数据的下载连接。第一个选项是文件名，或使用第二个选项，用" -"表中的一个字段作为文件名。如果你使用第二个选项那么第一个选项必须留空。" +"字段中显示一个二进制数据的下载连接。第一个选项是文件名，或使用第二个选项，用表中的一个字段值作为文件名。如果想使用字段值作为文件名，第一个选项必须留空。" #: libraries/transformations/application_octetstream__hex.inc.php:10 msgid "" @@ -4631,7 +4613,6 @@ msgstr "" "档)所到的结果是不一样的。" #: 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 " @@ -4655,27 +4636,21 @@ msgid "" "will prevent wrapping and ensure that the output appears all on one line " "(Default 1)." msgstr "" -"仅 LINUX：调用外部程序并通过标准输入填充字段数据。返回此应用程序的标准输出。" -"默认为 Tidy，可以很好的打印 HTML 代码。为了安全起见，您需要手动编辑文件 " -"libraries/transformations/text_plain__external.inc.php 然后插入允许您运行的工" -"具。第一个选项是您想要使用的程序编号，而第二个选项是程序的参数。第三个参数如" -"果设为 1 的话将会用 htmlspecialchars() 转换其输出 (默认为 1)。第四个参数如果" -"设为 1 的话，将禁止换行，确保所有内容显示在一行中 (默认为 1)" +"仅 LINUX：调用外部程序并通过标准输入传入字段数据。返回此应用程序的标准输出。默认为 Tidy，可以很好的打印 HTML " +"代码。为了安全起见，您需要手动编辑 libraries/transformations/text_plain__external.inc.php " +"文件来加入可以运行的工具。第一个选项是您想要使用的程序编号，第二个选项是程序的参数。第三个参数如果设为 1 的话将会用 " +"htmlspecialchars() 处理输出 (默认为 1)。第四个参数如果设为 1 的话，将禁止换行，确保所有内容显示在一行中 (默认为 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 "" -"显示字段的原始内容，不使用 htmlspecialchars() 处理。即假定内容为合法的 HTML " -"代码。" +msgstr "显示字段的原始内容，不使用 htmlspecialchars() 处理。即假定内容为合法的 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 " @@ -4685,11 +4660,10 @@ 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 "" -"显示图像和链接，字段内包含文件名。第一个选项是类似“http://www.example.com/”这" -"样的 URL 前缀，第二和第三个选项是以像素为单位的宽度和高度。" +"显示图像和链接，字段内包含文件名。第一个选项是类似“http://www.example.com/”这样的 URL " +"前缀。第二和第三个选项是以像素为单位的宽度和高度。" #: 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 " @@ -4698,9 +4672,7 @@ msgid "" "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." -msgstr "" -"显示链接，字段内包含文件名。第一个选项是类似“http://www.example.com/”这样的 " -"URL 前缀，第二个选项是链接的标题 (title)。" +msgstr "显示链接，字段内包含文件名。第一个选项是类似“http://www.example.com/”这样的 URL 前缀。第二个选项是链接的标题。" #: libraries/transformations/text_plain__longToIpv4.inc.php:10 msgid "" @@ -5045,7 +5017,6 @@ msgid "To select relation, click :" msgstr "要选择关系，点击：" #: 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 " @@ -5054,9 +5025,7 @@ msgid "" "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." -msgstr "" -"显示的字段为粉红色。要设置或取消显示的字段，点击“选择显示字段”图标，然后选择" -"需要的字段名字。" +msgstr "显示的字段为粉红色。要设置/取消显示的字段，点击“选择显示字段”图标，然后选择需要的字段名。" #: pmd_pdf.php:63 msgid "Page has been created" @@ -5235,10 +5204,9 @@ msgid "Do not change the password" msgstr "保持原密码" #: server_privileges.php:804 server_privileges.php:2166 -#, fuzzy #| msgid "No user(s) found." msgid "No user found." -msgstr "找不到用户。" +msgstr "未找到用户。" #: server_privileges.php:848 #, php-format @@ -5583,7 +5551,6 @@ msgid "Error management:" msgstr "错误管理:" #: server_replication.php:334 -#, fuzzy #| msgid "Skipping error(s) might lead into unsynchronized master and slave!" msgid "Skipping errors might lead into unsynchronized master and slave!" msgstr "忽略错误可能导致主从服务器间不同步！" @@ -6117,7 +6084,6 @@ msgstr "" "Documentation.html#setup_script]文档[/a]中有说明。否则你只能下载或显示配置。" #: 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]" @@ -6127,11 +6093,10 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" -"定义编辑 CHAR 和 VARCHAR 类型字段时应使用何种控件，[kbd]输入框 (input)[/kbd] " -"- 允许限制输入长度，[kbd]文本框 (textarea)[/kbd] - 允许输入多行数据" +"定义编辑 CHAR 和 VARCHAR 类型字段时应使用何种控件，[kbd]输入框 (input)[/kbd] - 可以限制输入长度，[kbd]文本框 " +"(textarea)[/kbd] - 可以输入多行数据" #: setup/lib/messages.inc.php:36 -#, fuzzy #| msgid "CHAR fields editing" msgid "CHAR columns editing" msgstr "编辑 CHAR 类型字段" @@ -6831,16 +6796,13 @@ msgid "GZip output buffering" msgstr "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" msgid "" "[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, " "DATETIME and TIMESTAMP, ascending order otherwise" -msgstr "" -"[kbd]SMART[/kbd] - 如：对 TIME、DATE、DATETIME 和 TIMESTAMP 类型的字段递减排" -"序，其他字段递增" +msgstr "[kbd]SMART[/kbd] - 如：对 TIME、DATE、DATETIME 和 TIMESTAMP 类型的字段递减排序，其他字段递增" #: setup/lib/messages.inc.php:218 msgid "Default sorting order" @@ -6859,13 +6821,11 @@ msgid "Iconic table operations" msgstr "数据表操作显示" #: setup/lib/messages.inc.php:224 -#, fuzzy #| msgid "Disallow BLOB and BINARY fields from editing" msgid "Disallow BLOB and BINARY columns from editing" msgstr "禁止编辑 BLOB 和 BINARY 类型字段" #: setup/lib/messages.inc.php:225 -#, fuzzy #| msgid "Protect binary fields" msgid "Protect binary columns" msgstr "保护二进制字段" @@ -8292,8 +8252,3 @@ msgstr "将视图改名为" #~ msgstr "" #~ "无法在发生错误时创建会话，请检查 PHP 或网站服务器日志，并正确配置 PHP 安" #~ "装。" - -#, fuzzy -#~| msgid "Import currencies ($5.00 to 5.00)" -#~ msgid "Import currencies (.00 to 5.00)" -#~ msgstr "转换货币 (如: $5.00 将被转换为 5.00)" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4628-g5dfe98a
by Marc Delisle 02 Jun '10

02 Jun '10

The branch, master has been updated via 5dfe98a3786c7aaf55c9dd677da81bfe509c8612 (commit) via 5d525e89ebc32eb19fc6266b96988d8df0d22ff4 (commit) from 345f6d21d09c727980630a460251beb86f84170f (commit) - Log ----------------------------------------------------------------- commit 5dfe98a3786c7aaf55c9dd677da81bfe509c8612 Merge: 345f6d21d09c727980630a460251beb86f84170f 5d525e89ebc32eb19fc6266b96988d8df0d22ff4 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 2 12:37:19 2010 -0400 bug [privileges] List of tables not shown when the db name has a wildcard ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_privileges.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e186f92..1c34496 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ $Id$ - bug #2986383 [parser] Not all data being shown / counted - bug [synchronize] Rows were deleted in target table regardless of the "Would you like to delete..." option +- bug [privileges] List of tables not shown when the db name has a wildcard 3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/server_privileges.php b/server_privileges.php index 3340206..87c71b8 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1905,7 +1905,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs } else { echo ' <input type="hidden" name="dbname" value="' . htmlspecialchars($dbname) . '"/>' . "\n" . ' <label for="text_tablename">' . __('Add privileges on the following table') . ':</label>' . "\n"; - if ($res = @PMA_DBI_try_query('SHOW TABLES FROM ' . PMA_backquote($dbname) . ';', null, PMA_DBI_QUERY_STORE)) { + if ($res = @PMA_DBI_try_query('SHOW TABLES FROM ' . PMA_backquote(PMA_unescape_mysql_wildcards($dbname)) . ';', null, PMA_DBI_QUERY_STORE)) { $pred_tbl_array = array(); while ($row = PMA_DBI_fetch_row($res)) { if (!isset($found_rows) || !in_array($row[0], $found_rows)) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_3-31-g5d525e8
by Marc Delisle 02 Jun '10

02 Jun '10

The branch, QA_3_3 has been updated via 5d525e89ebc32eb19fc6266b96988d8df0d22ff4 (commit) from 432379c87d6cb06a330c1928b3ec676da886a5f4 (commit) - Log ----------------------------------------------------------------- commit 5d525e89ebc32eb19fc6266b96988d8df0d22ff4 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jun 2 12:32:54 2010 -0400 bug [privileges] List of tables not shown when the db name has a wildcard ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_privileges.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f4d9fb5..dca8ffe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2986383 [parser] Not all data being shown / counted - bug [synchronize] Rows were deleted in target table regardless of the "Would you like to delete..." option +- bug [privileges] List of tables not shown when the db name has a wildcard 3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/server_privileges.php b/server_privileges.php index 0470ffe..fd2796f 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1883,7 +1883,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs } else { echo ' <input type="hidden" name="dbname" value="' . htmlspecialchars($dbname) . '"/>' . "\n" . ' <label for="text_tablename">' . $GLOBALS['strAddPrivilegesOnTbl'] . ':</label>' . "\n"; - if ($res = @PMA_DBI_try_query('SHOW TABLES FROM ' . PMA_backquote($dbname) . ';', null, PMA_DBI_QUERY_STORE)) { + if ($res = @PMA_DBI_try_query('SHOW TABLES FROM ' . PMA_backquote(PMA_unescape_mysql_wildcards($dbname)) . ';', null, PMA_DBI_QUERY_STORE)) { $pred_tbl_array = array(); while ($row = PMA_DBI_fetch_row($res)) { if (!isset($found_rows) || !in_array($row[0], $found_rows)) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4626-g345f6d2
by Michal Čihař 02 Jun '10

02 Jun '10

The branch, master has been updated via 345f6d21d09c727980630a460251beb86f84170f (commit) via 146aaa8e73e4477c7963f99922aff4f224a9f980 (commit) via b5e6c9f8aac6a2ed8a502e06c1ff5d39db706260 (commit) via 69a99d86712fdc515bc31e40080b20586e05ff36 (commit) via 41da184967ef7d99703642fce4e62bd32300ca9e (commit) via e5aa9b36731e30bde59fc630570634dde75e32ef (commit) via 22626e8499521921fc5aed1e8930f55ace7b4c0a (commit) from 39c73a94ee45790fd39190e412d7a007fcca1c2a (commit) - Log ----------------------------------------------------------------- commit 345f6d21d09c727980630a460251beb86f84170f Merge: 146aaa8e73e4477c7963f99922aff4f224a9f980 39c73a94ee45790fd39190e412d7a007fcca1c2a Author: Pootle server <pootle(a)cihar.com> Date: Tue Jun 1 20:40:14 2010 +0200 Merge remote branch 'origin/master' commit 146aaa8e73e4477c7963f99922aff4f224a9f980 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 18:58:09 2010 +0200 Translation update done using Pootle. commit b5e6c9f8aac6a2ed8a502e06c1ff5d39db706260 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 18:58:03 2010 +0200 Translation update done using Pootle. commit 69a99d86712fdc515bc31e40080b20586e05ff36 Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 18:57:53 2010 +0200 Translation update done using Pootle. commit 41da184967ef7d99703642fce4e62bd32300ca9e Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 18:57:42 2010 +0200 Translation update done using Pootle. commit e5aa9b36731e30bde59fc630570634dde75e32ef Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 18:57:17 2010 +0200 Translation update done using Pootle. commit 22626e8499521921fc5aed1e8930f55ace7b4c0a Author: Domen <dbc334(a)gmail.com> Date: Tue Jun 1 18:57:00 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sl.po | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/po/sl.po b/po/sl.po index 6fb2b53..5f2e589 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,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-06-01 01:03+0200\n" +"PO-Revision-Date: 2010-06-01 18:58+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" "Language: sl\n" @@ -7492,10 +7492,9 @@ msgstr "" "podpore; predlagano: [kbd]pma_table_info[/kbd]" #: setup/lib/messages.inc.php:321 -#, fuzzy #| msgid "Display fields table" msgid "Display columns table" -msgstr "Tabela prikaznih polj" +msgstr "Tabela prikaznih stolpcev" #: setup/lib/messages.inc.php:323 msgid "User for config auth" @@ -7526,11 +7525,10 @@ msgid "Verbose name of this server" msgstr "Razširjeno ime tega strežnika" #: 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" -msgstr "Ali se naj uporabniku prikaže gumb "prikaži vse (zapise)"" +msgstr "Ali se naj uporabniku prikaže gumb "prikaži vse (vrstice)"" #: setup/lib/messages.inc.php:330 msgid "Allow to display all the rows" @@ -7821,10 +7819,9 @@ msgid "Ignore" msgstr "Prezri" #: tbl_change.php:728 -#, fuzzy #| msgid " Because of its length, this field might not be editable " msgid " Because of its length, this column might not be editable " -msgstr " Zaradi njegove dolžine polja morda ne bo mogoče urejati " +msgstr " Zaradi njegove dolžine stolpca morda ne bo mogoče urejati " #: tbl_change.php:888 msgid "Remove BLOB Repository Reference" @@ -8111,10 +8108,9 @@ msgid "Operator" msgstr "Operator" #: tbl_select.php:270 -#, fuzzy #| msgid "Select fields (at least one):" msgid "Select columns (at least one):" -msgstr "Izberite polja (vsaj eno):" +msgstr "Izberite stolpce (vsaj enega):" #: tbl_select.php:288 msgid "Add search conditions (body of the \"where\" clause):" @@ -8138,10 +8134,10 @@ msgid "None" msgstr "Brez" #: tbl_structure.php:374 -#, fuzzy, php-format +#, php-format #| msgid "Table %s has been dropped" msgid "Column %s has been dropped" -msgstr "Tabela %s je zavržena" +msgstr "Stolpec %s je zavržen" #: tbl_structure.php:385 #, php-format @@ -8162,10 +8158,9 @@ msgid "Propose table structure" msgstr "Predlagaj strukturo tabele" #: tbl_structure.php:540 -#, fuzzy #| msgid "Add new field" msgid "Add field" -msgstr "Dodaj novo polje" +msgstr "Dodaj polje" #: tbl_structure.php:554 msgid "At End of Table" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3-4619-g39c73a9
by Marc Delisle 01 Jun '10

01 Jun '10

The branch, master has been updated via 39c73a94ee45790fd39190e412d7a007fcca1c2a (commit) via 432379c87d6cb06a330c1928b3ec676da886a5f4 (commit) via 153515c7f56f45bd21e2dd4081ba18efe19b991b (commit) from 1e155e3a32e976c0294d522a255ad2a9bea7ea65 (commit) - Log ----------------------------------------------------------------- commit 39c73a94ee45790fd39190e412d7a007fcca1c2a Merge: 1e155e3a32e976c0294d522a255ad2a9bea7ea65 432379c87d6cb06a330c1928b3ec676da886a5f4 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 12:43:46 2010 -0400 bug [synchronize] Rows were deleted in target table regardless of the "Would you like to delete..." option ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ server_synchronize.php | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 832f8ad..e186f92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,8 @@ $Id$ + [lang] Updated lot of translation based on work done in master branch. - bug #3008411 [databases] Last dropped database remains active in navi - bug #2986383 [parser] Not all data being shown / counted +- bug [synchronize] Rows were deleted in target table regardless of the + "Would you like to delete..." option 3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/server_synchronize.php b/server_synchronize.php index b609d34..c5d8077 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -1023,9 +1023,9 @@ if (isset($_REQUEST['synchronize_db'])) { if (isset($alter_str_array[$p])) { PMA_alterTargetTableStructure($trg_db, $trg_link, $matching_tables, $source_columns, $alter_str_array, $matching_tables_fields, $criteria, $matching_tables_keys, $target_tables_keys, $p, true); - unset($alter_str_array[$p]); - } - if (isset($add_column_array[$p])) { + unset($alter_str_array[$p]); + } + if (! empty($add_column_array[$p])) { PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $p, $target_tables_keys, $matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_3-30-g432379c
by Marc Delisle 01 Jun '10

01 Jun '10

The branch, QA_3_3 has been updated via 432379c87d6cb06a330c1928b3ec676da886a5f4 (commit) from 153515c7f56f45bd21e2dd4081ba18efe19b991b (commit) - Log ----------------------------------------------------------------- commit 432379c87d6cb06a330c1928b3ec676da886a5f4 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 12:34:57 2010 -0400 bug [synchronize] Rows were deleted in target table regardless of the "Would you like to delete..." option ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ server_synchronize.php | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23a8c38..f4d9fb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + [lang] Updated lot of translation based on work done in master branch. - bug #3008411 [databases] Last dropped database remains active in navi - bug #2986383 [parser] Not all data being shown / counted +- bug [synchronize] Rows were deleted in target table regardless of the + "Would you like to delete..." option 3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/server_synchronize.php b/server_synchronize.php index 7d84ce7..8e4a701 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -1037,7 +1037,7 @@ if (isset($_REQUEST['synchronize_db'])) { $criteria, $matching_tables_keys, $target_tables_keys, $p, true); unset($alter_str_array[$p]); } - if (isset($add_column_array[$p])) { + if (! empty($add_column_array[$p])) { PMA_findDeleteRowsFromTargetTables($delete_array, $matching_tables, $p, $target_tables_keys, $matching_tables_keys, $trg_db, $trg_link, $src_db, $src_link); hooks/post-receive -- phpMyAdmin

1 0

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

01 Jun '10

The branch, master has been updated via 1e155e3a32e976c0294d522a255ad2a9bea7ea65 (commit) via 06fa40807796324b6e13fc4d54a043f65dd4c4aa (commit) via 73e60cd44b350c66bec39ca4d24cf4c9dc3210b6 (commit) via c830e16199aad253443f2130854b14b278f8b2fb (commit) via 159dcb7b27e5e14a6fe65978d5e86e03acfb0a2d (commit) via 0998e8a865fdfdf01f8574bc01da1d007838a348 (commit) via 80594018b474c20f6340e11e476e90ed3ef5837d (commit) via 0b13e0e9aaa9012bec34a2e8c09fddec861fd79d (commit) via edc3e6bb684a9b7b3958fd4c78b5ec97fb2c41db (commit) via a22d0bbc468df6741aa04590c4c36eefc7bccd50 (commit) via 1aa54ff904af1f61efdd6fb093116d5d24b9b6b4 (commit) via 9703228158e50bcdd4adbd2e30b1f2431d7c0fc2 (commit) via 1a31dc40b29f5cc05b6bb041bf7df6d1abcdea0b (commit) via a0f854508f31886ab149d7b522f50d82393a4010 (commit) via 66dd74336e5d86e316370a2cea2d8ada5e1426ea (commit) via 26a17f5751e6112958603d3eff344849b91421bf (commit) via db6d3123a32d43ca083f450309ba13ff5bba4b60 (commit) via c1d780045266bd753c3d87d6aa281b38b0e83960 (commit) via 013f8af2b465a3e9e8b9b631d3eee6136876f58e (commit) via dd04b6fa0d351e2087c58697d171e0d14ad43461 (commit) via c83f187958680fc43fa89ba335c221293e961db3 (commit) via 738ff728ccb80fff079282acc8a78e92116c19e9 (commit) via 04acaef4acf22cd658faab503f7a40d129e4d292 (commit) via ed55f34d9ff884ed298914c576851741d36f2015 (commit) via 6eba260cc7949cc6c041f255b303ff30521aff76 (commit) from 858d4308349dfd49afbd4b58a7ce2ad160e5f5c7 (commit) - Log ----------------------------------------------------------------- commit 1e155e3a32e976c0294d522a255ad2a9bea7ea65 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:27:21 2010 +0200 Translation update done using Pootle. commit 06fa40807796324b6e13fc4d54a043f65dd4c4aa Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:27:11 2010 +0200 Translation update done using Pootle. commit 73e60cd44b350c66bec39ca4d24cf4c9dc3210b6 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:26:56 2010 +0200 Translation update done using Pootle. commit c830e16199aad253443f2130854b14b278f8b2fb Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:26:35 2010 +0200 Translation update done using Pootle. commit 159dcb7b27e5e14a6fe65978d5e86e03acfb0a2d Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:26:20 2010 +0200 Translation update done using Pootle. commit 0998e8a865fdfdf01f8574bc01da1d007838a348 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:25:26 2010 +0200 Translation update done using Pootle. commit 80594018b474c20f6340e11e476e90ed3ef5837d Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:25:11 2010 +0200 Translation update done using Pootle. commit 0b13e0e9aaa9012bec34a2e8c09fddec861fd79d Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:24:52 2010 +0200 Translation update done using Pootle. commit edc3e6bb684a9b7b3958fd4c78b5ec97fb2c41db Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:24:36 2010 +0200 Translation update done using Pootle. commit a22d0bbc468df6741aa04590c4c36eefc7bccd50 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:24:25 2010 +0200 Translation update done using Pootle. commit 1aa54ff904af1f61efdd6fb093116d5d24b9b6b4 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:24:13 2010 +0200 Translation update done using Pootle. commit 9703228158e50bcdd4adbd2e30b1f2431d7c0fc2 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:24:07 2010 +0200 Translation update done using Pootle. commit 1a31dc40b29f5cc05b6bb041bf7df6d1abcdea0b Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:23:53 2010 +0200 Translation update done using Pootle. commit a0f854508f31886ab149d7b522f50d82393a4010 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:22:45 2010 +0200 Translation update done using Pootle. commit 66dd74336e5d86e316370a2cea2d8ada5e1426ea Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:22:37 2010 +0200 Translation update done using Pootle. commit 26a17f5751e6112958603d3eff344849b91421bf Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:22:19 2010 +0200 Translation update done using Pootle. commit db6d3123a32d43ca083f450309ba13ff5bba4b60 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:22:04 2010 +0200 Translation update done using Pootle. commit c1d780045266bd753c3d87d6aa281b38b0e83960 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:21:44 2010 +0200 Translation update done using Pootle. commit 013f8af2b465a3e9e8b9b631d3eee6136876f58e Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:21:19 2010 +0200 Translation update done using Pootle. commit dd04b6fa0d351e2087c58697d171e0d14ad43461 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:20:41 2010 +0200 Translation update done using Pootle. commit c83f187958680fc43fa89ba335c221293e961db3 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:19:59 2010 +0200 Translation update done using Pootle. commit 738ff728ccb80fff079282acc8a78e92116c19e9 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:17:18 2010 +0200 Translation update done using Pootle. commit 04acaef4acf22cd658faab503f7a40d129e4d292 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:17:04 2010 +0200 Translation update done using Pootle. commit ed55f34d9ff884ed298914c576851741d36f2015 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:16:43 2010 +0200 Translation update done using Pootle. commit 6eba260cc7949cc6c041f255b303ff30521aff76 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 1 16:16:18 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 122 +++++++++++++++++++++++++------------------------------------ 1 files changed, 50 insertions(+), 72 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2942d70..db0a838 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,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-06-01 16:16+0200\n" +"PO-Revision-Date: 2010-06-01 16:27+0200\n" "Last-Translator: Marc <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "Language: fr\n" @@ -4538,10 +4538,9 @@ msgid "Run SQL query/queries on database %s" msgstr "Exécuter une ou des requêtes sur la base %s" #: libraries/sql_query_form.lib.php:317 -#, fuzzy #| msgid "Column names" msgid "Columns" -msgstr "Nom des colonnes" +msgstr "Colonnes" #: libraries/sql_query_form.lib.php:352 sql.php:665 sql.php:666 sql.php:683 msgid "Bookmark this SQL query" @@ -4657,7 +4656,6 @@ msgid "Length/Values" msgstr "Taille/Valeurs*" #: 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'... If you ever need to put a backslash (\"\\\") " @@ -4669,8 +4667,8 @@ msgid "" "a single quote (\"'\") amongst those values, precede it with a backslash " "(for example '\\\\xyz' or 'a\\'b')." msgstr "" -"Les différentes valeurs des champs de type enum/set sont à spécifier sous la " -"forme 'a','b','c'... Pour utiliser un antislash(\"\\\") ou une " +"Les différentes valeurs des colonnes de type enum/set sont à spécifier sous " +"la forme 'a','b','c'... Pour utiliser un antislash(\"\\\") ou une " "apostrophe (\"'\") dans l'une de ces valeurs, faites-le précéder d'un " "antislash (par exemple '\\\\xyz' ou 'a\\'b')." @@ -4747,23 +4745,21 @@ msgid "Save" msgstr "Sauvegarder" #: 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 "Ajouter des colonnes" +msgstr "Ajouter %s colonne(s)" #: 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 "Vous devez ajouter au moins un champ" +msgstr "Vous devez ajouter au moins une colonne." #: libraries/tbl_triggers.lib.php:29 msgid "Event" msgstr "Événement" #: 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 " @@ -4803,7 +4799,6 @@ msgid "Displays a link to download this image." msgstr "Affiche un lien vers cette image" #: 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 " @@ -4823,16 +4818,15 @@ msgid "" "documentation for PHP's strftime() function and for \"utc\" it is done using " "gmdate() function." msgstr "" -"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()." +"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()." #: 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 " @@ -4856,19 +4850,19 @@ msgid "" "will prevent wrapping and ensure that the output appears all on one line " "(Default 1)." msgstr "" -"(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)." +"(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)." #: 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." @@ -4876,12 +4870,11 @@ 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 "" -"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." +"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." #: 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 " @@ -4891,13 +4884,12 @@ 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 "" -"Affiche une image et un lien, le champ contient le nom du fichier. La " +"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." #: 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 " @@ -4907,9 +4899,9 @@ msgid "" "prefix like \"http://www.example.com/\". The second option is a title for " "the link." msgstr "" -"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." +"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." #: libraries/transformations/text_plain__longToIpv4.inc.php:10 msgid "" @@ -5134,13 +5126,11 @@ msgid "Create a page" msgstr "Créer une page" #: pdf_pages.php:310 -#, fuzzy #| msgid "Page number:" msgid "Page name" -msgstr "Page n°:" +msgstr "Nom de la page" #: pdf_pages.php:314 -#, fuzzy #| msgid "Automatic layout" msgid "Automatic layout based on" msgstr "Mise en page automatique" @@ -5270,7 +5260,6 @@ msgid "To select relation, click :" msgstr "Pour sélectionner un lien, cliquez :" #: 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 " @@ -5280,9 +5269,9 @@ msgid "" "column, click the \"Choose column to display\" icon, then click on the " "appropriate column name." msgstr "" -"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é." +"La colonne descriptive est montrée en rose. Pour indiquer qu'une colonne est " +"ou n'est plus la colonne descriptive, cliquer l'icône «Colonne " +"descriptive», puis cliquer sur le nom de colonne approprié." #: pmd_pdf.php:63 msgid "Page has been created" @@ -6384,7 +6373,6 @@ msgstr "" "vous ne pourrez que télécharger ou afficher la configuration." #: 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]" @@ -6394,12 +6382,11 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" -"Déterminer la méthode d'édition pour les colonnes CHAR et VARCHAR; [kbd]input" -"[/kbd] - permet de limiter la taille, [kbd]textarea[/kbd] - permet la saisie " -"de sauts de lignes" +"Déterminer la méthode d'édition pour les colonnes CHAR et VARCHAR; " +"[kbd]input[/kbd] - permet de limiter la taille, [kbd]textarea[/kbd] - permet " +"la saisie de sauts de lignes" #: setup/lib/messages.inc.php:36 -#, fuzzy #| msgid "CHAR fields editing" msgid "CHAR columns editing" msgstr "Édition des colonnes CHAR" @@ -7132,7 +7119,6 @@ msgid "GZip output buffering" msgstr "Tampon de sortie 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" @@ -7160,16 +7146,14 @@ msgid "Iconic table operations" msgstr "Icônes pour les actions sur les tables" #: setup/lib/messages.inc.php:224 -#, fuzzy #| msgid "Disallow BLOB and BINARY fields from editing" msgid "Disallow BLOB and BINARY columns from editing" -msgstr "Empêche l'édition des champs BLOB et BINARY" +msgstr "Empêche l'édition des colonnes BLOB et BINARY" #: setup/lib/messages.inc.php:225 -#, fuzzy #| msgid "Protect binary fields" msgid "Protect binary columns" -msgstr "Protéger les champs binaires" +msgstr "Protéger les colonnes avec contenu binaire" #: setup/lib/messages.inc.php:226 msgid "" @@ -7640,7 +7624,6 @@ msgid "PDF schema: table coordinates" msgstr "Table pour coordonnées du schéma en PDF" #: 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]" @@ -7648,14 +7631,13 @@ msgid "" "Table to describe the display columns, leave blank for no support; " "suggested: [kbd]pma_table_info[/kbd]" msgstr "" -"Sert à définir les champs descriptifs, laisser vide pour désactiver; " +"Sert à définir les colonnes descriptives, laisser vide pour désactiver; " "suggéré : [kbd]pma_table_info[/kbd]" #: setup/lib/messages.inc.php:321 -#, fuzzy #| msgid "Display fields table" msgid "Display columns table" -msgstr "Table pour champs descriptifs" +msgstr "Table pour colonnes descriptives" #: setup/lib/messages.inc.php:323 msgid "User for config auth" @@ -7686,11 +7668,10 @@ msgid "Verbose name of this server" msgstr "Nom à afficher pour ce serveur" #: 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" -msgstr "...via le bouton Tout afficher" +msgstr "Devrait-on afficher un bouton "Tout afficher"" #: setup/lib/messages.inc.php:330 msgid "Allow to display all the rows" @@ -7981,12 +7962,11 @@ msgid "Ignore" msgstr "Ignorer" #: tbl_change.php:728 -#, fuzzy #| msgid " Because of its length, this field might not be editable " msgid " Because of its length, this column might not be editable " msgstr "" -"Il est possible que ce champ ne soit pas éditable en raison de sa " -"longueur" +"Il est possible que cette colonne ne soit pas éditable en raison " +"de sa longueur" #: tbl_change.php:888 msgid "Remove BLOB Repository Reference" @@ -8276,10 +8256,9 @@ msgid "Operator" msgstr "Opérateur" #: tbl_select.php:270 -#, fuzzy #| msgid "Select fields (at least one):" msgid "Select columns (at least one):" -msgstr "Choisir les champs à afficher (au moins un)" +msgstr "Choisir les colonnes (au moins une)" #: tbl_select.php:288 msgid "Add search conditions (body of the \"where\" clause):" @@ -8303,10 +8282,10 @@ msgid "None" msgstr "aucune" #: tbl_structure.php:374 -#, fuzzy, php-format +#, php-format #| msgid "Table %s has been dropped" msgid "Column %s has been dropped" -msgstr "La table %s a été effacée" +msgstr "La colonne %s a été effacée" #: tbl_structure.php:385 #, php-format @@ -8327,10 +8306,9 @@ msgid "Propose table structure" msgstr "Suggérer des optimisations quant à la structure de la table" #: tbl_structure.php:540 -#, fuzzy #| msgid "Add new field" msgid "Add field" -msgstr "Ajouter un champ" +msgstr "Ajouter une colonne" #: tbl_structure.php:554 msgid "At End of Table" hooks/post-receive -- phpMyAdmin

1 0

[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'... 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'... 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'... 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, this field might not be editable " msgid " Because of its length, this column might not be editable " msgstr "" -" På grunn av sin lengde, så vil muligens dette feltet ikke være " -"redigerbart " +" På grunn av sin lengde, 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