The branch, master has been updated via 89833a0603dde65f31138ba534a58e6841c767d9 (commit) via bf3da02992a0894e8f3f81be0938b45763f19965 (commit) via 981066955222575ec031b199d44cb0387cf120cf (commit) via df97b1d2c075a0db4241b8494e36fa85eb231dcf (commit) via aa441c488450e65b00a5b693c552d13a8f5446c6 (commit) from d6d79aedbae33719c82813081a641b0377a97418 (commit)

- Log ----------------------------------------------------------------- commit 89833a0603dde65f31138ba534a58e6841c767d9 Merge: bf3da02992a0894e8f3f81be0938b45763f19965 981066955222575ec031b199d44cb0387cf120cf Author: Michal Čihař mcihar@novell.com Date: Thu Jan 13 13:29:26 2011 +0100

Merge remote branch 'pootle/master'

commit bf3da02992a0894e8f3f81be0938b45763f19965 Merge: d6d79aedbae33719c82813081a641b0377a97418 df97b1d2c075a0db4241b8494e36fa85eb231dcf Author: Michal Čihař mcihar@novell.com Date: Thu Jan 13 13:28:07 2011 +0100

Merge branch 'QA_3_3'

commit 981066955222575ec031b199d44cb0387cf120cf Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 13 14:27:25 2011 +0200

Translation update done using Pootle.

commit aa441c488450e65b00a5b693c552d13a8f5446c6 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Jan 13 14:25:27 2011 +0200

Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes: libraries/export/yaml.php | 7 ++----- po/ru.po | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php index bcf404e..550eb1d 100644 --- a/libraries/export/yaml.php +++ b/libraries/export/yaml.php @@ -168,11 +168,8 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) continue; }

- $record[$i] = preg_replace('/\r\n|\r|\n/', $crlf.' ', $record[$i]); - if (strstr($record[$i], $crlf)) - $record[$i] = '|-' . $crlf . ' '.$record[$i]; - - $buffer .= ' ' . $column . ': ' . $record[$i] . $crlf; + $record[$i] = str_replace(array('\', '"', "\n", "\r"), array('\\', '"', '\n', '\r'), $record[$i]); + $buffer .= ' ' . $column . ': "' . $record[$i] . '"' . $crlf; }

if (! PMA_exportOutputHandler($buffer)) { diff --git a/po/ru.po b/po/ru.po index 282ab12..d0fecef 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2011-01-13 14:22+0200\n" +"PO-Revision-Date: 2011-01-13 14:27+0200\n" "Last-Translator: Victor Volkov hanut@php-myadmin.ru\n" "Language-Team: russian ru@li.org\n" "Language: ru\n" @@ -2713,10 +2713,9 @@ msgid "Relations" msgstr "Связи"

#: libraries/config/messages.inc.php:101 -#, fuzzy #| msgid "Export type" msgid "Export method" -msgstr "Тип экспорта" +msgstr "Метод экспорта"

#: libraries/config/messages.inc.php:110 libraries/config/messages.inc.php:112 msgid "Save on server" @@ -2732,7 +2731,6 @@ msgid "Remember file name template" msgstr "Запомнить шаблон имени файла"

#: libraries/config/messages.inc.php:116 -#, fuzzy #| msgid "Enclose table and field names with backquotes" msgid "Enclose table and column names with backquotes" msgstr "Заключить названия таблиц и полей в косые кавычки"

hooks/post-receive