January 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-62-g7411f7c
by Michal Čihař 12 Jan '11

12 Jan '11

The branch, master has been updated via 7411f7cca83af4e763fb6bf1eb08e67800bda770 (commit) via 21ce09b7dec784ce6ba0413b607e93f5b0f22d35 (commit) via c69d0172a83fdc2b766bdbd012ab38f696b08456 (commit) via 0c5f554f968b1715e18e89d1733b0e1a62ef153a (commit) via 8eb4375a50bb8a2b936ea1ea1a1653ec7bf53636 (commit) via 9d39d58bbdfa2133967883edf46ad5db9dc36b64 (commit) via b9c1763b5515dfdfb4906bd657bb9937cd6124b1 (commit) via 59071a5dc125e6a76d9d617c1abf041404c98ea3 (commit) via fa77fd18cb5603c020bbcd1d974afe39405950de (commit) via c82a636fa50475c73e55a8579b16c5d198507e12 (commit) via 48fd710564027c3a035083ea2781d547f9923143 (commit) via df159c36fd0c43272e3fcb9813cbaea78c2d7274 (commit) via 08d181a2a4ca2ceb44b25eadec5f504441bfbd6e (commit) via e8669723464e3e508615ecf2eb31c1d3e1e0259d (commit) from 0081c444fef388282382415563a5c819d418b986 (commit) - Log ----------------------------------------------------------------- commit 7411f7cca83af4e763fb6bf1eb08e67800bda770 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Wed Jan 12 00:01:50 2011 +0200 Translation update done using Pootle. commit 21ce09b7dec784ce6ba0413b607e93f5b0f22d35 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 23:59:27 2011 +0200 Translation update done using Pootle. commit c69d0172a83fdc2b766bdbd012ab38f696b08456 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 23:58:45 2011 +0200 Translation update done using Pootle. commit 0c5f554f968b1715e18e89d1733b0e1a62ef153a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 23:46:20 2011 +0200 Translation update done using Pootle. commit 8eb4375a50bb8a2b936ea1ea1a1653ec7bf53636 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 23:42:15 2011 +0200 Translation update done using Pootle. commit 9d39d58bbdfa2133967883edf46ad5db9dc36b64 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 23:37:45 2011 +0200 Translation update done using Pootle. commit b9c1763b5515dfdfb4906bd657bb9937cd6124b1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 23:35:13 2011 +0200 Translation update done using Pootle. commit 59071a5dc125e6a76d9d617c1abf041404c98ea3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 23:32:25 2011 +0200 Translation update done using Pootle. commit fa77fd18cb5603c020bbcd1d974afe39405950de Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 23:30:30 2011 +0200 Translation update done using Pootle. commit c82a636fa50475c73e55a8579b16c5d198507e12 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 23:21:30 2011 +0200 Translation update done using Pootle. commit 48fd710564027c3a035083ea2781d547f9923143 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 23:10:07 2011 +0200 Translation update done using Pootle. commit df159c36fd0c43272e3fcb9813cbaea78c2d7274 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 23:06:43 2011 +0200 Translation update done using Pootle. commit 08d181a2a4ca2ceb44b25eadec5f504441bfbd6e Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 22:53:29 2011 +0200 Translation update done using Pootle. commit e8669723464e3e508615ecf2eb31c1d3e1e0259d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 22:44:04 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ru.po | 48 ++++++++++++++++++++++-------------------------- 1 files changed, 22 insertions(+), 26 deletions(-) diff --git a/po/ru.po b/po/ru.po index 002e1cd..4677a1e 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(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2011-01-11 14:54+0200\n" +"PO-Revision-Date: 2011-01-12 00:01+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "Language: ru\n" @@ -422,11 +422,11 @@ msgstr "" #: db_qbe.php:182 msgid "Switch to" -msgstr "" +msgstr "Переключиться на" #: db_qbe.php:186 msgid "visual builder" -msgstr "" +msgstr "визуальный составитель запросов" #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 @@ -479,16 +479,14 @@ msgid "Modify" msgstr "Изменить" #: db_qbe.php:603 -#, fuzzy #| msgid "Add/Delete Criteria Row" msgid "Add/Delete criteria rows" -msgstr "Добавить/удалить ряд критерия" +msgstr "Добавить/удалить строки критериея" #: db_qbe.php:615 -#, fuzzy #| msgid "Add/Delete Field Columns" msgid "Add/Delete columns" -msgstr "Добавить/удалить столбец критерия" +msgstr "Добавить/удалить столбцы" #: db_qbe.php:628 db_qbe.php:653 msgid "Update Query" @@ -536,13 +534,13 @@ msgid "Search results for \"%s\" %s:" msgstr "Результаты поиска по "%s" %s:" #: db_search.php:248 -#, fuzzy, php-format +#, php-format #| msgid "%s match(es) inside table %s" msgid "%s match inside table %s" msgid_plural "%s matches inside table %s" -msgstr[0] "%s вхождения(ий) в таблице %s" -msgstr[1] "%s вхождения(ий) в таблице %s" -msgstr[2] "%s вхождения(ий) в таблице %s" +msgstr[0] "%s соответствие в таблице %s" +msgstr[1] "%s соответствия в таблице %s" +msgstr[2] "%s соответствий в таблице %s" #: db_search.php:255 libraries/common.lib.php:2819 #: libraries/common.lib.php:2997 libraries/common.lib.php:2998 @@ -564,19 +562,19 @@ msgid "Delete" msgstr "Удалить" #: db_search.php:260 -#, fuzzy, php-format +#, php-format #| msgid "Delete tracking data for this table" msgid "Delete the matches for the %s table?" -msgstr "Удалить данные слежения за таблицей" +msgstr "Удалить соответствия для таблицы %s?" #: db_search.php:273 -#, fuzzy, php-format +#, php-format #| msgid "Total: %s match(es)" msgid "Total: %s match" msgid_plural "Total: %s matches" -msgstr[0] "Итого: %s вхождения(ий)" -msgstr[1] "Итого: %s вхождения(ий)" -msgstr[2] "Итого: %s вхождения(ий)" +msgstr[0] "Итого: %s соответствие" +msgstr[1] "Итого: %s соответствия" +msgstr[2] "Итого: %s соответствий" #: db_search.php:296 msgid "Search in database" @@ -599,16 +597,14 @@ msgid "Inside table(s):" msgstr "В таблице/таблицах:" #: db_search.php:352 -#, fuzzy #| msgid "Inside field:" msgid "Inside column:" -msgstr "Внутри поля:" +msgstr "В поле:" #: db_structure.php:59 -#, fuzzy #| msgid "No tables found in database." msgid "No tables found in database" -msgstr "Таблиц в базе данных не обнаружено." +msgstr "Таблиц в базе данных не найдено" #: db_structure.php:272 tbl_operations.php:658 #, php-format @@ -824,23 +820,23 @@ msgstr "Журнал базы данных" #: enum_editor.php:21 libraries/tbl_properties.inc.php:794 #, php-format msgid "Values for the column \"%s\"" -msgstr "" +msgstr "Значения для поля \"%s\"" #: enum_editor.php:22 libraries/tbl_properties.inc.php:795 msgid "Enter each value in a separate field." -msgstr "" +msgstr "Добавьте каждое значение в отдельное поле." #: enum_editor.php:57 msgid "+ Restart insertion and add a new value" -msgstr "" +msgstr "Обновить вставку и добавить новое значение" #: enum_editor.php:67 msgid "Output" -msgstr "" +msgstr "Вывод" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "" +msgstr "Скопируйте и вставьте объединенные значения в поле \"Длина/значения\"" #: export.php:73 msgid "Selected export type has to be saved in file!" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-48-g0081c44
by Michal Čihař 11 Jan '11

11 Jan '11

The branch, master has been updated via 0081c444fef388282382415563a5c819d418b986 (commit) via c9db4644e3ed5c5cfbc61c760619abb96ea0547d (commit) via 29d0264b38bb3e6f698abfe25a5688b56981b4a8 (commit) via 0f6cea65a4218230b3376bb86b2b1a635f3500cf (commit) via 9f081a8f52406de7de41f0d87043a10e047fc3b2 (commit) via 37f589cc7f6904b440d49a9cce38567b2f7137a2 (commit) via 649128ea5325c379c3f56526442986fcb9a7c415 (commit) via 392a3def11c688ce4e7c817d23f53695964b9db4 (commit) via ceb101fdebab545626965f6a6fd2fbd5d6fe40c0 (commit) via 68b2ccc4a240ca5c97ae7835f8fed2f4bdc33fe8 (commit) from 871a474a9765b26dcce99249d692f0efef16c7c0 (commit) - Log ----------------------------------------------------------------- commit 0081c444fef388282382415563a5c819d418b986 Merge: c9db4644e3ed5c5cfbc61c760619abb96ea0547d 871a474a9765b26dcce99249d692f0efef16c7c0 Author: Pootle server <pootle(a)cihar.com> Date: Tue Jan 11 14:40:25 2011 +0100 Merge remote branch 'origin/master' commit c9db4644e3ed5c5cfbc61c760619abb96ea0547d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 14:54:12 2011 +0200 Translation update done using Pootle. commit 29d0264b38bb3e6f698abfe25a5688b56981b4a8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 13:27:16 2011 +0200 Translation update done using Pootle. commit 0f6cea65a4218230b3376bb86b2b1a635f3500cf Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 13:21:57 2011 +0200 Translation update done using Pootle. commit 9f081a8f52406de7de41f0d87043a10e047fc3b2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 13:17:13 2011 +0200 Translation update done using Pootle. commit 37f589cc7f6904b440d49a9cce38567b2f7137a2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 13:14:13 2011 +0200 Translation update done using Pootle. commit 649128ea5325c379c3f56526442986fcb9a7c415 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 13:12:05 2011 +0200 Translation update done using Pootle. commit 392a3def11c688ce4e7c817d23f53695964b9db4 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 13:07:45 2011 +0200 Translation update done using Pootle. commit ceb101fdebab545626965f6a6fd2fbd5d6fe40c0 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 13:04:55 2011 +0200 Translation update done using Pootle. commit 68b2ccc4a240ca5c97ae7835f8fed2f4bdc33fe8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Jan 11 12:57:34 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ru.po | 266 ++++--------------------------------------------------------- 1 files changed, 18 insertions(+), 248 deletions(-) diff --git a/po/ru.po b/po/ru.po index f8b4313..002e1cd 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2010-07-22 02:27+0200\n" -"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" +"PO-Revision-Date: 2011-01-11 14:54+0200\n" +"Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 #: libraries/display_tbl.lib.php:415 server_privileges.php:1594 @@ -97,17 +97,16 @@ msgstr "Использовать это значение" #: bs_disp_as_mime_type.php:29 bs_play_media.php:35 #: libraries/blobstreaming.lib.php:331 msgid "No blob streaming server configured!" -msgstr "" +msgstr "Сервер для работы с потоковыми данными не настроен!" #: bs_disp_as_mime_type.php:35 -#, fuzzy #| msgid "Failed to write file to disk." msgid "Failed to fetch headers" -msgstr "Ошибка при попытке записи файла на диск." +msgstr "Ошибка при считывании заголовков" #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" -msgstr "" +msgstr "Не удалось открыть удаленный URL" #: db_create.php:58 #, php-format @@ -133,10 +132,9 @@ msgstr "Комментарий к таблице" #: tbl_change.php:300 tbl_indexes.php:187 tbl_printview.php:139 #: tbl_relation.php:399 tbl_select.php:112 tbl_structure.php:197 #: tbl_tracking.php:267 tbl_tracking.php:318 -#, fuzzy #| msgid "Column names" msgid "Column" -msgstr "Названия столбцов" +msgstr "Поле" #: db_datadict.php:170 db_printview.php:104 libraries/Index.class.php:442 #: libraries/db_events.inc.php:25 libraries/db_routines.inc.php:36 @@ -272,10 +270,9 @@ msgid "Command" msgstr "Команда" #: db_operations.php:429 -#, fuzzy #| msgid "Rename database to" msgid "Remove database" -msgstr "Переименовать базу данных в" +msgstr "Удалить базу данных" #: db_operations.php:441 #, php-format @@ -283,10 +280,9 @@ msgid "Database %s has been dropped." msgstr "База данных %s была удалена." #: db_operations.php:446 -#, fuzzy #| msgid "Go to database" msgid "Drop the database (DROP)" -msgstr "Перейти к базе данных" +msgstr "Удалить базу данных (DROP)" #: db_operations.php:474 msgid "Copy database to" @@ -339,7 +335,7 @@ msgid "Collation" msgstr "Сравнение" #: db_operations.php:548 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The additional features for working with linked tables have been " #| "deactivated. To find out why click %shere%s." @@ -347,14 +343,13 @@ msgid "" "The phpMyAdmin configuration storage has been deactivated. To find out why " "click %shere%s." msgstr "" -"Дополнительные возможности для работы со связанными таблицами недоступны. " -"Для определения причины нажмите %sздесь%s." +"Некоторые из расширенных возможностей phpMyAdmin недоступны. Для определения " +"причины нажмите %sздесь%s." #: db_operations.php:581 -#, fuzzy #| msgid "Relational schema" msgid "Edit or export relational schema" -msgstr "Cхема связей" +msgstr "Редакция или экспорт схемы связей" #: db_printview.php:102 db_tracking.php:84 db_tracking.php:169 #: libraries/config/messages.inc.php:484 libraries/db_structure.lib.php:37 @@ -405,13 +400,13 @@ msgid "Last check" msgstr "Последняя проверка" #: db_printview.php:220 db_structure.php:434 -#, fuzzy, php-format +#, php-format #| msgid "%s table(s)" msgid "%s table" msgid_plural "%s tables" -msgstr[0] "Таблиц: %s" -msgstr[1] "Таблиц: %s" -msgstr[2] "Таблиц: %s" +msgstr[0] "%s таблица" +msgstr[1] "%s таблицы" +msgstr[2] "%s таблиц" #: db_qbe.php:25 import.php:452 libraries/Message.class.php:190 #: libraries/display_tbl.lib.php:1979 libraries/sql_query_form.lib.php:136 @@ -10594,228 +10589,3 @@ msgstr "Переименовать таблицу в" #~ msgid "Stop" #~ msgstr "Стоп" - -#, fuzzy -#~| msgid "Display databases in a tree" -#~ msgid "Display table filter" -#~ msgstr "Отображать базы данных в виде дерева" - -#~ msgid "" -#~ "The additional features for working with linked tables have been " -#~ "deactivated. To find out why click %shere%s." -#~ msgstr "" -#~ "Дополнительные возможности для работы со связанными таблицами недоступны. " -#~ "Для определения причины нажмите %sздесь%s." - -#~ msgid "Ignore duplicate rows" -#~ msgstr "Игнорировать повторяющиеся строки" - -#~ msgid "Execute bookmarked query" -#~ msgstr "Выполнить отмеченный запрос" - -#~ msgid "No tables" -#~ msgstr "Нет таблиц" - -#, fuzzy -#~| msgid "CSV" -#~ msgid "SVG" -#~ msgstr "CSV" - -#~ msgid "" -#~ "This [a@?page=form&formset=features#tab_Security]option[/a] should be " -#~ "enabled if your web server supports it" -#~ msgstr "" -#~ "Данный [a@?page=form&formset=features#tab_Security]параметр[/a] " -#~ "должен быть включен, если ваш сервер его поддерживает" - -#, fuzzy -#~| msgid "" -#~| "Please enter the values for transformation options using this format: " -#~| "'a', 100, b,'c'... If you ever need to put a backslash (\"\\\") or " -#~| "a single quote (\"'\") amongst those values, precede it with a backslash " -#~| "(for example '\\\\xyz' or 'a\\'b')." -#~ msgid "" -#~ "Enter each value in a separate field, enclosed in single quotes. If you " -#~ "ever need to put a backslash (\"\\\") or a single quote (\"'\") amongst " -#~ "those values, precede it with a backslash (for example '\\\\xyz' or 'a" -#~ "\\'b')." -#~ msgstr "" -#~ "Значения параметров преобразований должны иметь формат: 'a', 100, 'b', " -#~ "'c'... Символы обратной косой черты (\\) и одинарной кавычки (') " -#~ "необходимо экранировать (предварять) символом обратной косой черты, " -#~ "например: '\\\\xyz' или 'a\\'b'." - -#, fuzzy -#~| msgid "" -#~| "Please enter the values for transformation options using this format: " -#~| "'a', 100, b,'c'... If you ever need to put a backslash (\"\\\") or " -#~| "a single quote (\"'\") amongst those values, precede it with a backslash " -#~| "(for example '\\\\xyz' or 'a\\'b')." -#~ msgid "" -#~ "Enter each value in a separate field. If you ever need to put a backslash " -#~ "(\"\\\") or a single quote (\"'\") amongst those values, precede it with " -#~ "a backslash (for example '\\\\xyz' or 'a\\'b')." -#~ msgstr "" -#~ "Значения параметров преобразований должны иметь формат: 'a', 100, 'b', " -#~ "'c'... Символы обратной косой черты (\\) и одинарной кавычки (') " -#~ "необходимо экранировать (предварять) символом обратной косой черты, " -#~ "например: '\\\\xyz' или 'a\\'b'." - -#, fuzzy -#~ msgid "New table" -#~ msgstr "Нет таблиц" - -#~ msgid "server name" -#~ msgstr "имя сервера" - -#~ msgid "database name" -#~ msgstr "имя базы данных" - -#~ msgid "Edit PDF Pages" -#~ msgstr "Редактирование PDF-страниц" - -#~ msgid "Data Dictionary Format" -#~ msgstr "Ориентация страниц словаря данных" - -#~ msgid "no" -#~ msgstr "нет" - -#~ msgid "Enter login options for signon authentication" -#~ msgstr "Введите параметры входа для единого метода идентификации" - -#~ msgid "Signon login options" -#~ msgstr "Параметры Signon входа" - -#~ msgid "PMA database" -#~ msgstr "Расширения PMA" - -#~ msgid "Customization" -#~ msgstr "Модификация" - -#~ msgid "" -#~ "SQL queries settings, for SQL Query box options see [a@?page=form&" -#~ "formset=main_frame#tab_Sql_box]Navigation frame[/a] settings" -#~ msgstr "" -#~ "Настройки SQL запросов. Для установки параметров всплывающего окна SQL " -#~ "запросов смотрите настройки [a@?page=form&" -#~ "formset=main_frame#tab_Sql_box]фрейма Навигации[/a]" - -#~ msgid "yes" -#~ msgstr "да" - -#, fuzzy -#~| msgid "Remove CRLF characters within fields" -#~ msgid "Remove carriage return/line field characters within columns" -#~ msgstr "Удалите из полей символы CRLF" - -#, fuzzy -#~| msgid "Add AUTO_INCREMENT value" -#~ msgid "<code>AUTO_INCREMENT</code>" -#~ msgstr "Добавить AUTO_INCREMENT" - -#, fuzzy -#~| msgid "Dump %s row(s) starting at record # %s" -#~ msgid "Dump %s row(s) starting at row # %s" -#~ msgstr "Дамп из %s строк, начиная с записи # %s." - -#~ msgid "remember template" -#~ msgstr "запомнить шаблон" - -#~ msgid "Imported file compression will be automatically detected from: %s" -#~ msgstr "Автоматическое определение типа сжатия, варианты: %s" - -#~ msgid "Add into comments" -#~ msgstr "Добавить в комментарии" - -#~ msgid "Export Structure Schemas (recommended)" -#~ msgstr "Экспортировать структуру (рекомендуется)" - -#~ msgid "Export functions" -#~ msgstr "Экспортировать функции" - -#~ msgid "Export procedures" -#~ msgstr "Экспортировать процедуры" - -#~ msgid "Export triggers" -#~ msgstr "Экспортировать триггеры" - -#~ msgid "Export views" -#~ msgstr "Экспортировать отображения (VIEW)" - -#~ msgid "Invalid column (%s) specified!" -#~ msgstr "Выбран неверный столбец (%s)!" - -#~ msgid "Actions" -#~ msgstr "Действия" - -#~ msgid "Interface" -#~ msgstr "Отображение" - -#, fuzzy -#~| msgid "Table name" -#~ msgid "Table removal" -#~ msgstr "Имя таблицы" - -#~ msgid "BLOB Repository" -#~ msgstr "Хранилище данных типа BLOB" - -#, fuzzy -#~| msgid "Enabled" -#~ msgctxt "BLOB repository" -#~ msgid "Enabled" -#~ msgstr "Доступно" - -#~ msgid "Disable" -#~ msgstr "Отключить" - -#~ msgid "Damaged" -#~ msgstr "Повреждено" - -#, fuzzy -#~| msgid "Repair" -#~ msgctxt "BLOB repository" -#~ msgid "Repair" -#~ msgstr "Исправление" - -#, fuzzy -#~| msgid "Disabled" -#~ msgctxt "BLOB repository" -#~ msgid "Disabled" -#~ msgstr "Недоступно" - -#~ msgid "Enable" -#~ msgstr "Включить" - -#~ msgid "" -#~ "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] " -#~ "extension. Please check your PHP configuration." -#~ msgstr "" -#~ "Невозможно загрузить расширение [a@http://php.net/%1$s@Documentation][em]%" -#~ "1$s[/em][/a]! Проверьте настройки PHP." - -#~ msgid "" -#~ "Couldn't load the iconv or recode extension needed for charset " -#~ "conversion. Either configure PHP to enable these extensions or disable " -#~ "charset conversion in phpMyAdmin." -#~ msgstr "" -#~ "Не подключены расширения iconv или recode, необходимые для конвертации " -#~ "кодировок. Необходимо настроить PHP, включив данные расширения, или " -#~ "отключить возможность конвертации кодировок в настройках phpMyAdmin." - -#~ msgid "" -#~ "Couldn't use the iconv, libiconv, or recode_string functions, although " -#~ "the necessary extensions appear to be loaded. Check your PHP " -#~ "configuration." -#~ msgstr "" -#~ "Несмотря на то что необходимые расширения загружены, использование " -#~ "функций iconv, libiconv или recode_string - невозможно. Проверьте " -#~ "настройки PHP." - -#~ msgid "Allow character set conversion" -#~ msgstr "Разрешить перекодирование" - -#~ msgid "Default character set used for conversions" -#~ msgstr "Кодировка по умолчанию используемая при перекодировании" - -#~ msgid "Default character set" -#~ msgstr "Кодировка по умолчанию" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-38-g871a474
by Marc Delisle 11 Jan '11

11 Jan '11

The branch, master has been updated via 871a474a9765b26dcce99249d692f0efef16c7c0 (commit) from 5ea6683d0e80ef4022c6509dcf6b1ad206b0c859 (commit) - Log ----------------------------------------------------------------- commit 871a474a9765b26dcce99249d692f0efef16c7c0 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jan 11 08:03:06 2011 -0500 Avoid notice for undefined global ----------------------------------------------------------------------- Summary of changes: db_operations.php | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/db_operations.php b/db_operations.php index 94120d9..b4a4263 100644 --- a/db_operations.php +++ b/db_operations.php @@ -103,9 +103,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { // go back to current db, just in case PMA_DBI_select_db($db); - if (isset($GLOBALS['add_constraints']) || $move) { - $GLOBALS['sql_constraints_query_full_db'] = array(); - } + $GLOBALS['sql_constraints_query_full_db'] = array(); $tables_full = PMA_DBI_get_tables_full($db); $views = array(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-37-g5ea6683
by Marc Delisle 11 Jan '11

11 Jan '11

The branch, master has been updated via 5ea6683d0e80ef4022c6509dcf6b1ad206b0c859 (commit) from 54a37aee2d93f72513a6ac9d07b8afd14d66d6dd (commit) - Log ----------------------------------------------------------------- commit 5ea6683d0e80ef4022c6509dcf6b1ad206b0c859 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jan 11 07:53:30 2011 -0500 Avoid notice for undefined global ----------------------------------------------------------------------- Summary of changes: db_operations.php | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/db_operations.php b/db_operations.php index 36b479c..94120d9 100644 --- a/db_operations.php +++ b/db_operations.php @@ -196,7 +196,9 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { if (! $_error) { // temporarily force to add DROP IF EXIST to CREATE VIEW query, // to remove stand-in VIEW that was created earlier - $temp_drop_if_exists = $GLOBALS['drop_if_exists']; + if (isset($GLOBALS['drop_if_exists'])) { + $temp_drop_if_exists = $GLOBALS['drop_if_exists']; + } $GLOBALS['drop_if_exists'] = 'true'; foreach ($views as $view) { @@ -205,8 +207,12 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { break; } } - // restore previous value - $GLOBALS['drop_if_exists'] = $temp_drop_if_exists; + unset($GLOBALS['drop_if_exists']); + if (isset($temp_drop_if_exists)) { + // restore previous value + $GLOBALS['drop_if_exists'] = $temp_drop_if_exists; + unset($temp_drop_if_exists); + } } unset($view, $views); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-36-g54a37ae
by Marc Delisle 11 Jan '11

11 Jan '11

The branch, master has been updated via 54a37aee2d93f72513a6ac9d07b8afd14d66d6dd (commit) from 51684a83627eb9675c7185db938a468a94b8657f (commit) - Log ----------------------------------------------------------------- commit 54a37aee2d93f72513a6ac9d07b8afd14d66d6dd Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jan 11 07:48:12 2011 -0500 Tab characters should be 4 spaces ----------------------------------------------------------------------- Summary of changes: db_operations.php | 72 ++++++++++++++++++++++++++-------------------------- 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/db_operations.php b/db_operations.php index c9aa565..36b479c 100644 --- a/db_operations.php +++ b/db_operations.php @@ -133,10 +133,10 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { // the real views are created after the tables if (PMA_Table::isView($db, $each_table)) { $views[] = $each_table; - // Create stand-in definition to resolve view dependencies - $sql_view_standin = PMA_getTableDefStandIn($db, $each_table, "\n"); - PMA_DBI_query($sql_view_standin); - $GLOBALS['sql_query'] .= "\n" . $sql_view_standin . ';'; + // Create stand-in definition to resolve view dependencies + $sql_view_standin = PMA_getTableDefStandIn($db, $each_table, "\n"); + PMA_DBI_query($sql_view_standin); + $GLOBALS['sql_query'] .= "\n" . $sql_view_standin . ';'; continue; } @@ -194,19 +194,19 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { // handle the views if (! $_error) { - // temporarily force to add DROP IF EXIST to CREATE VIEW query, - // to remove stand-in VIEW that was created earlier - $temp_drop_if_exists = $GLOBALS['drop_if_exists']; - $GLOBALS['drop_if_exists'] = 'true'; - - foreach ($views as $view) { - if (! PMA_Table::moveCopy($db, $view, $newname, $view, 'structure', $move, 'db_copy')) { - $_error = true; - break; - } - } - // restore previous value - $GLOBALS['drop_if_exists'] = $temp_drop_if_exists; + // temporarily force to add DROP IF EXIST to CREATE VIEW query, + // to remove stand-in VIEW that was created earlier + $temp_drop_if_exists = $GLOBALS['drop_if_exists']; + $GLOBALS['drop_if_exists'] = 'true'; + + foreach ($views as $view) { + if (! PMA_Table::moveCopy($db, $view, $newname, $view, 'structure', $move, 'db_copy')) { + $_error = true; + break; + } + } + // restore previous value + $GLOBALS['drop_if_exists'] = $temp_drop_if_exists; } unset($view, $views); @@ -222,27 +222,27 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) { unset($GLOBALS['sql_constraints_query_full_db'], $one_query); } - if (PMA_MYSQL_INT_VERSION >= 50100) { - // here DELIMITER is not used because it's not part of the - // language; each statement is sent one by one - - // to avoid selecting alternatively the current and new db - // we would need to modify the CREATE definitions to qualify - // the db name - $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';'); - if ($event_names) { - foreach($event_names as $event_name) { - PMA_DBI_select_db($db); - $tmp_query = PMA_DBI_get_definition($db, 'EVENT', $event_name); - // collect for later display - $GLOBALS['sql_query'] .= "\n" . $tmp_query; - PMA_DBI_select_db($newname); - PMA_DBI_query($tmp_query); - } - } - } - // go back to current db, just in case - PMA_DBI_select_db($db); + if (PMA_MYSQL_INT_VERSION >= 50100) { + // here DELIMITER is not used because it's not part of the + // language; each statement is sent one by one + + // to avoid selecting alternatively the current and new db + // we would need to modify the CREATE definitions to qualify + // the db name + $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';'); + if ($event_names) { + foreach($event_names as $event_name) { + PMA_DBI_select_db($db); + $tmp_query = PMA_DBI_get_definition($db, 'EVENT', $event_name); + // collect for later display + $GLOBALS['sql_query'] .= "\n" . $tmp_query; + PMA_DBI_select_db($newname); + PMA_DBI_query($tmp_query); + } + } + } + // go back to current db, just in case + PMA_DBI_select_db($db); // Duplicate the bookmarks for this db (done once for each db) if (! $_error && $db != $newname) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. a8b1106d98103273eb90d6e693fa1dc4fa861cce
by Michal Čihař 11 Jan '11

11 Jan '11

The branch, master has been updated via a8b1106d98103273eb90d6e693fa1dc4fa861cce (commit) from e01ab98084e1f32f9660e44fcee7a9aa7b005703 (commit) - Log ----------------------------------------------------------------- commit a8b1106d98103273eb90d6e693fa1dc4fa861cce Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Jan 11 12:51:45 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/po/tr.po b/po/tr.po index 35fcbb3..36410f9 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-08 10:12+0100\n" -"PO-Revision-Date: 2011-01-10 21:25+0200\n" +"PO-Revision-Date: 2011-01-11 12:51+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -971,6 +971,9 @@ msgid "" "over <tt>config.inc.php</tt> because the default configuration file is " "version-specific." msgstr "" +"<tt>Libraries/config.default.php</tt> dosyasını <tt>config.inc.php</tt> " +"üzerine kopyalamamalısınız çünkü varsayılan yapılandırma " +"dosyası sürüme özgüdür." #. type: Content of: <html><body><div> #: orig-docs/Documentation.html:370 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. e01ab98084e1f32f9660e44fcee7a9aa7b005703
by Michal Čihař 11 Jan '11

11 Jan '11

The branch, master has been updated via e01ab98084e1f32f9660e44fcee7a9aa7b005703 (commit) via 1c61611ee24d50f1fc71f1c79d0deb0cead91e5a (commit) via 9bac5b7c5e28dfc34a8e5a535bc8bc7055294790 (commit) from 389f910613b29f5d89f8e8781ca96a40ae17ba93 (commit) - Log ----------------------------------------------------------------- commit e01ab98084e1f32f9660e44fcee7a9aa7b005703 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Jan 11 09:24:59 2011 +0100 Update generated docs commit 1c61611ee24d50f1fc71f1c79d0deb0cead91e5a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Jan 10 21:25:00 2011 +0200 Translation update done using Pootle. commit 9bac5b7c5e28dfc34a8e5a535bc8bc7055294790 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Jan 10 20:53:16 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/tr/README | 4 ++-- po/tr.po | 14 +++++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/output/tr/README b/output/tr/README index 88d635e..8773009 100644 --- a/output/tr/README +++ b/output/tr/README @@ -13,7 +13,7 @@ Copyright Telif Hakkı (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> -Copyright (C) 2001-2011 +Telif Hakkı (C) 2001-2011 Marc Delisle <marc_at_infomarc.info> Olivier Müller <om_at_omnis.ch> Robin Johnson <robbat2_at_users.sourceforge.net> @@ -22,7 +22,7 @@ Copyright (C) 2001-2011 Garvin Hicking <me_at_supergarv.de> Michael Keck <mkkeck_at_users.sourceforge.net> Sebastian Mendel <cybot_tm_at_users.sourceforge.net> - [check Documentation.txt/.html file for more details] + [daha fazla ayrıntı için Documentation.txt/.html dosyasını kontrol edin] Lisans ------ diff --git a/po/tr.po b/po/tr.po index efad702..35fcbb3 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-08 10:12+0100\n" -"PO-Revision-Date: 2011-01-06 23:42+0200\n" +"PO-Revision-Date: 2011-01-10 21:25+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -955,6 +955,14 @@ msgid "" "with PHP 6, remove a <tt>set_magic_quotes_runtime(0);</tt> statement that " "you might find near the end of your configuration file." msgstr "" +"Yeni paketi açılmış olanın içine önceki kurulumunuzdan " +"./config.inc.php dosyasını basitçe kopyalayın. Eski sürümden alınan " +"yapılandırma dosyası, bazı değişmiş veya kaldırılmış seçeneklerinden dolayı " +"bazı ince ayarlar gerektirebilir; özellikle <tt>$cfg['AttributeTypes']</tt> " +"tanımı değişmiştir bu yüzden en iyisi dosyanızdan bunu kaldırmak ve sadece " +"varsayılanı kullanmaktır. PHP 6 ile uyumluluk için yapılandırma dosyanızın " +"en sonunda bulabileceğiniz <tt>set_magic_quotes_runtime(0);</tt> ifadesini " +"kaldırın." #. type: Content of: <html><body><div> #: orig-docs/Documentation.html:366 @@ -11297,7 +11305,7 @@ msgstr "" #. type: Plain text #: orig-docs/README:26 -#, fuzzy, no-wrap +#, no-wrap msgid "" "Copyright (C) 2001-2011\n" " Marc Delisle <marc_at_infomarc.info>\n" @@ -11310,7 +11318,7 @@ msgid "" " Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n" " [check Documentation.txt/.html file for more details]\n" msgstr "" -"Telif Hakkı (C) 2001-2010\n" +"Telif Hakkı (C) 2001-2011\n" " Marc Delisle <marc_at_infomarc.info>\n" " Olivier Müller <om_at_omnis.ch>\n" " Robin Johnson <robbat2_at_users.sourceforge.net>\n" hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-35-g51684a83
by Piotr Przybylski 10 Jan '11

10 Jan '11

The branch, master has been updated via 51684a83627eb9675c7185db938a468a94b8657f (commit) from 9f8c3c8e606d431cda86ad25190f68e077d197e1 (commit) - Log ----------------------------------------------------------------- commit 51684a83627eb9675c7185db938a468a94b8657f Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Tue Jan 11 00:12:47 2011 +0100 Upper bounds for user prefs were read from already modified settings ----------------------------------------------------------------------- Summary of changes: libraries/config/validate.lib.php | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php index 60aa33b..4b591f2 100644 --- a/libraries/config/validate.lib.php +++ b/libraries/config/validate.lib.php @@ -30,6 +30,10 @@ function PMA_config_get_validators() $cf = ConfigFile::getInstance(); $validators = $cf->getDbEntry('_validators', array()); if (!defined('PMA_SETUP')) { + // not in setup script: load additional validators for user preferences + // we need oryginal config values not overwritten by user preferences, creating a new PMA_Config + // instance is a better idea than hacking into its code + $org_cfg = new PMA_Config(CONFIG_FILE); $uvs = $cf->getDbEntry('_userValidators', array()); foreach ($uvs as $field => $uv_list) { $uv_list = (array)$uv_list; @@ -39,7 +43,7 @@ function PMA_config_get_validators() } for ($i = 1; $i < count($uv); $i++) { if (substr($uv[$i], 0, 6) == 'value:') { - $uv[$i] = PMA_array_read(substr($uv[$i], 6), $GLOBALS['cfg']); + $uv[$i] = PMA_array_read(substr($uv[$i], 6), $org_cfg->settings); } } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-34-g9f8c3c8
by Marc Delisle 10 Jan '11

10 Jan '11

The branch, master has been updated via 9f8c3c8e606d431cda86ad25190f68e077d197e1 (commit) from cc36378f0878df318b60401e1967bc8f6cf34137 (commit) - Log ----------------------------------------------------------------- commit 9f8c3c8e606d431cda86ad25190f68e077d197e1 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 10 13:57:54 2011 -0500 Update FAQ entry with MySQL 5.1 ----------------------------------------------------------------------- Summary of changes: Documentation.html | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 67272ae..64ddbcb 100644 --- a/Documentation.html +++ b/Documentation.html @@ -3406,10 +3406,8 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension containing an hyphen. </a></h4> - The tests I have made with current MySQL 4.1.11 API shows that the - API does not accept this syntax for the USE command. Enclosing the - db name with backquotes works. For further confusion, no backquotes - are needed with command-line mysql. + The tests I have made with MySQL 5.1.49 shows that the + API does not accept this syntax for the USE command. <h4 id="faq3_14"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-33-gcc36378
by Marc Delisle 10 Jan '11

10 Jan '11

The branch, master has been updated via cc36378f0878df318b60401e1967bc8f6cf34137 (commit) from 7e1cdb9980188081764ee321bca822b1321f62ef (commit) - Log ----------------------------------------------------------------- commit cc36378f0878df318b60401e1967bc8f6cf34137 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jan 10 13:52:00 2011 -0500 Withdraw outdated FAQ entry ----------------------------------------------------------------------- Summary of changes: Documentation.html | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/Documentation.html b/Documentation.html index 4612561..67272ae 100644 --- a/Documentation.html +++ b/Documentation.html @@ -3399,11 +3399,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension this could have a serious impact on performance. <h4 id="faq3_12"> - <a href="#faq3_12">3.12 What are the phpMyAdmin limitations for MySQL 3?</a></h4> - - The number of records in queries containing COUNT and GROUP BY is - not correctly calculated. Also, sorting results of a query like - "SELECT * from table GROUP BY" ... is problematic. + <a href="#faq3_12">3.12 (withdrawn).</a></h4> <h4 id="faq3_13"> <a href="#faq3_13">3.13 I get an error when entering <tt>USE</tt> followed by a db name hooks/post-receive -- phpMyAdmin

1 0