- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24813-gc555fc1
by Marc Delisle 14 Dec '11

14 Dec '11

The branch, master has been updated via c555fc1b347dd25b02ce2e586d2d76c7c6b3d216 (commit) via ba255de1b263ca9b86014414b131ec79e621b28c (commit) via 0e707906e69ce90c4852a0fce2a0fac7db86a3cd (commit) via bd3735ba584e7a49aee78813845245354b061f61 (commit) from 9bf4527ab422d1594bb77a2eed5773dafbbfb3bd (commit) - Log ----------------------------------------------------------------- commit c555fc1b347dd25b02ce2e586d2d76c7c6b3d216 Merge: 9bf4527 ba255de Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 14 08:00:51 2011 -0500 Fix merge conflicts ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/config/ConfigFile.class.php | 2 +- libraries/display_export.lib.php | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f9d873..d3b47a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,8 @@ phpMyAdmin - ChangeLog - bug #3449659 [navi] Fast filter broken with table tree - bug #3448485 [GUI] Firefox favicon frameset regression - [core] Better compatibility with mysql extension +- [security] Self-XSS on export options (export server/database/table), see PMASA-2011-20 +- [security] Self-XSS in setup (host parameter), see PMASA-2011-19 3.4.8.0 (2011-12-01) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php index dfe2235..dffa62d 100644 --- a/libraries/config/ConfigFile.class.php +++ b/libraries/config/ConfigFile.class.php @@ -417,7 +417,7 @@ class ConfigFile return htmlspecialchars($verbose); } $host = $this->get("Servers/$id/host"); - return empty($host) ? 'localhost' : $host; + return empty($host) ? 'localhost' : htmlspecialchars($host); } /** diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 7a5824e..db87a99 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -152,10 +152,10 @@ if (isset($_GET['sql_query'])) { echo '<label for ="radio_allrows_0">' . __('Dump some row(s)') . '</label>'; ?> <ul> <li><label for="limit_to"><?php echo __('Number of rows:') . '</label> <input type="text" id="limit_to" name="limit_to" size="5" value="' - . ((isset($_GET['limit_to'])) ? $_GET['limit_to'] : ((isset($unlim_num_rows) ? $unlim_num_rows : PMA_Table::countRecords($db, $table)))) + . ((isset($_GET['limit_to'])) ? htmlspecialchars($_GET['limit_to']) : ((isset($unlim_num_rows) ? $unlim_num_rows : PMA_Table::countRecords($db, $table)))) . '" onfocus="this.select()" />' ?></li> <li><label for="limit_from"><?php echo __('Row to begin at:') . '</label> <input type="text" id="limit_from" name="limit_from" value="' - . ((isset($_GET['limit_from'])) ? $_GET['limit_from'] : '0') + . ((isset($_GET['limit_from'])) ? htmlspecialchars($_GET['limit_from']) : '0') . '" size="5" onfocus="this.select()" />'; ?></li> </ul> </li> @@ -244,7 +244,7 @@ if (isset($_GET['sql_query'])) { <?php echo ' value="'; if (isset($_GET['filename_template'])) { - echo $_GET['filename_template']; + echo htmlspecialchars($_GET['filename_template']); } else { if ($export_type == 'database') { echo htmlspecialchars($GLOBALS['PMA_Config']->getUserValue( hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_8-25-gba255de
by Marc Delisle 14 Dec '11

14 Dec '11

The branch, QA_3_4 has been updated via ba255de1b263ca9b86014414b131ec79e621b28c (commit) via 0e707906e69ce90c4852a0fce2a0fac7db86a3cd (commit) via bd3735ba584e7a49aee78813845245354b061f61 (commit) from c93200a5bca1e8eefb07ed7420fe5ba12a57ed3b (commit) - Log ----------------------------------------------------------------- commit ba255de1b263ca9b86014414b131ec79e621b28c Merge: c93200a 0e70790 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 14 07:54:50 2011 -0500 Fix merge conflicts commit 0e707906e69ce90c4852a0fce2a0fac7db86a3cd Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Dec 13 12:42:39 2011 -0500 [security] Self-XSS in setup (host parameter), see PMASA-2011-19 commit bd3735ba584e7a49aee78813845245354b061f61 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Sat Dec 10 17:10:41 2011 +0100 [security] Self-XSS on export options (export server/database/table), see PMASA-2011-20 ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/config/ConfigFile.class.php | 2 +- libraries/display_export.lib.php | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5eb0138..bcb8ddb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,8 @@ phpMyAdmin - ChangeLog - bug #3449659 [navi] Fast filter broken with table tree - bug #3448485 [GUI] Firefox favicon frameset regression - [core] Better compatibility with mysql extension +- [security] Self-XSS on export options (export server/database/table), see PMASA-2011-20 +- [security] Self-XSS in setup (host parameter), see PMASA-2011-19 3.4.8.0 (2011-12-01) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php index 9e1690c..178a184 100644 --- a/libraries/config/ConfigFile.class.php +++ b/libraries/config/ConfigFile.class.php @@ -425,7 +425,7 @@ class ConfigFile return htmlspecialchars($verbose); } $host = $this->get("Servers/$id/host"); - return empty($host) ? 'localhost' : $host; + return empty($host) ? 'localhost' : htmlspecialchars($host); } /** diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index a58a441..e740c2e 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -150,10 +150,10 @@ if(isset($_GET['sql_query'])) { echo '<label for ="radio_allrows_0">' . __('Dump some row(s)') . '</label>'; ?> <ul> <li><label for="limit_to"><?php echo __('Number of rows:') . '</label> <input type="text" id="limit_to" name="limit_to" size="5" value="' - . ((isset($_GET['limit_to'])) ? $_GET['limit_to'] : ((isset($unlim_num_rows) ? $unlim_num_rows : PMA_Table::countRecords($db, $table)))) + . ((isset($_GET['limit_to'])) ? htmlspecialchars($_GET['limit_to']) : ((isset($unlim_num_rows) ? $unlim_num_rows : PMA_Table::countRecords($db, $table)))) . '" onfocus="this.select()" />' ?></li> <li><label for="limit_from"><?php echo __('Row to begin at:') . '</label> <input type="text" id="limit_from" name="limit_from" value="' - . ((isset($_GET['limit_from'])) ? $_GET['limit_from'] : '0') + . ((isset($_GET['limit_from'])) ? htmlspecialchars($_GET['limit_from']) : '0') . '" size="5" onfocus="this.select()" />'; ?></li> </ul> </li> @@ -242,7 +242,7 @@ if(isset($_GET['sql_query'])) { <?php echo ' value="'; if(isset($_GET['filename_template'])) { - echo $_GET['filename_template']; + echo htmlspecialchars($_GET['filename_template']); } else { if ($export_type == 'database') { echo htmlspecialchars($GLOBALS['PMA_Config']->getUserValue( hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24809-g9bf4527
by Michal Čihař 14 Dec '11

14 Dec '11

The branch, master has been updated via 9bf4527ab422d1594bb77a2eed5773dafbbfb3bd (commit) via c93200a5bca1e8eefb07ed7420fe5ba12a57ed3b (commit) from b093fe9a13a53cc1f85f6babe50ad9f843430488 (commit) - Log ----------------------------------------------------------------- commit 9bf4527ab422d1594bb77a2eed5773dafbbfb3bd Merge: b093fe9 c93200a Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Dec 14 11:18:49 2011 +0100 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_8-22-gc93200a
by Michal Čihař 14 Dec '11

14 Dec '11

The branch, QA_3_4 has been updated via c93200a5bca1e8eefb07ed7420fe5ba12a57ed3b (commit) from 458e015ec2bd5f887b3240faef0ca36f8474d3bf (commit) - Log ----------------------------------------------------------------- commit c93200a5bca1e8eefb07ed7420fe5ba12a57ed3b Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Dec 14 11:17:09 2011 +0100 Update po files from master ----------------------------------------------------------------------- Summary of changes: po/uk.po | 90 ++++++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 55 insertions(+), 35 deletions(-) diff --git a/po/uk.po b/po/uk.po index 901ed87..f316229 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2774,20 +2774,20 @@ msgstr "Режим редагування" #: libraries/config/messages.inc.php:161 msgid "Customize edit mode" -msgstr "" +msgstr "Налаштувати режим редагування" #: libraries/config/messages.inc.php:163 msgid "Export defaults" -msgstr "" +msgstr "Експортувати налаштування по замовчуванню" #: libraries/config/messages.inc.php:164 msgid "Customize default export options" -msgstr "" +msgstr "Налаштувати параметри експорту за замовчуванням" #: libraries/config/messages.inc.php:165 libraries/config/messages.inc.php:207 #: setup/frames/menu.inc.php:16 msgid "Features" -msgstr "" +msgstr "Особливості" #: libraries/config/messages.inc.php:166 msgid "General" @@ -2795,7 +2795,7 @@ msgstr "Загальний" #: libraries/config/messages.inc.php:167 msgid "Set some commonly used options" -msgstr "" +msgstr "Встановити деякі загальновживані властивості" #: libraries/config/messages.inc.php:168 libraries/db_links.inc.php:83 #: libraries/server_links.inc.php:73 libraries/tbl_links.inc.php:82 @@ -2805,11 +2805,11 @@ msgstr "Імпорт" #: libraries/config/messages.inc.php:169 msgid "Import defaults" -msgstr "" +msgstr "Імпортувати властивості по замовчуванню" #: libraries/config/messages.inc.php:170 msgid "Customize default common import options" -msgstr "" +msgstr "Налаштувати за замовчуванням деяких параметрів імпорту" #: libraries/config/messages.inc.php:171 msgid "Import / export" @@ -2817,7 +2817,7 @@ msgstr "Імпорт / Експорт" #: libraries/config/messages.inc.php:172 msgid "Set import and export directories and compression options" -msgstr "" +msgstr "Встанови теки імпорту та експорту та параметри стискання" #: libraries/config/messages.inc.php:173 libraries/export/latex.php:26 msgid "LaTeX" @@ -2825,15 +2825,15 @@ msgstr "LaTeX" #: libraries/config/messages.inc.php:176 msgid "Databases display options" -msgstr "" +msgstr "Параметри відображення баз даних" #: libraries/config/messages.inc.php:177 setup/frames/menu.inc.php:18 msgid "Navigation frame" -msgstr "" +msgstr "Оболочка навігації" #: libraries/config/messages.inc.php:178 msgid "Customize appearance of the navigation frame" -msgstr "" +msgstr "Налаштувати вигляд оболочки навігації" #: libraries/config/messages.inc.php:179 libraries/select_server.lib.php:42 #: setup/frames/index.inc.php:98 @@ -2842,15 +2842,15 @@ msgstr "Сервери" #: libraries/config/messages.inc.php:180 msgid "Servers display options" -msgstr "" +msgstr "Параметри відображення серверів" #: libraries/config/messages.inc.php:182 msgid "Tables display options" -msgstr "" +msgstr "Параметри відображення таблиць" #: libraries/config/messages.inc.php:183 setup/frames/menu.inc.php:19 msgid "Main frame" -msgstr "" +msgstr "Головна оболочка" #: libraries/config/messages.inc.php:184 msgid "Microsoft Office" @@ -2866,7 +2866,7 @@ msgstr "Інші параметри ядра" #: libraries/config/messages.inc.php:189 msgid "Settings that didn't fit enywhere else" -msgstr "" +msgstr "Налаштування які не вписуються більш ніґде" #: libraries/config/messages.inc.php:190 msgid "Page titles" @@ -2878,6 +2878,9 @@ msgid "" "html#cfg_TitleTable]documentation[/a] for magic strings that can be used to " "get special values." msgstr "" +"Вкажіть рядку заголовка браузера текст. Відповідно до [a@Documentation." +"html#cfg_TitleTable]documentation[/а] для магічних рядків, які можуть " +"використовуватися для отримання спеціальних значень." #: libraries/config/messages.inc.php:192 #: libraries/navigation_header.inc.php:83 @@ -2888,7 +2891,7 @@ msgstr "Вікно запиту" #: libraries/config/messages.inc.php:193 msgid "Customize query window options" -msgstr "" +msgstr "Встановіть параметри вікна запиту" #: libraries/config/messages.inc.php:194 msgid "Security" @@ -2899,10 +2902,12 @@ msgid "" "Please note that phpMyAdmin is just a user interface and its features do not " "limit MySQL" msgstr "" +"Будь ласка зверніть увагу, що phpMyAdmin лише інтерфейс і його можливості не " +"обмежують MySQL" #: libraries/config/messages.inc.php:196 msgid "Basic settings" -msgstr "" +msgstr "Базові налаштування" #: libraries/config/messages.inc.php:197 msgid "Authentication" @@ -2921,14 +2926,16 @@ msgid "" "Advanced server configuration, do not change these options unless you know " "what they are for" msgstr "" +"Розширена конфігурація сервера, не змінюйте ці параметри, якщо не знаєте для " +"чого вони потрібні" #: libraries/config/messages.inc.php:201 msgid "Enter server connection parameters" -msgstr "" +msgstr "Введіть параметри з'єднання сервера" #: libraries/config/messages.inc.php:202 msgid "Configuration storage" -msgstr "" +msgstr "Конфігурація збереження даних" #: libraries/config/messages.inc.php:203 msgid "" @@ -2936,45 +2943,50 @@ msgid "" "features, see [a(a)Documentation.html#linked-tables]phpMyAdmin configuration " "storage[/a] in documentation" msgstr "" +"Налаштуйте у PhpMyAdmin конфігурацію зберігання даних, щоб отримати доступ " +"до додаткових властивостей, дивись [a(a)Documentation.html#linked-tables]" +"PhpMyAdmin конфігурація пам'яті[/а] в документації" #: libraries/config/messages.inc.php:204 msgid "Changes tracking" -msgstr "" +msgstr "Відстеження змін" #: libraries/config/messages.inc.php:205 msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." msgstr "" +"Відстеження змін, зроблених у базі даних. Вимагає PhpMyAdmin конфігурації " +"збереження даних." #: libraries/config/messages.inc.php:206 msgid "Customize export options" -msgstr "" +msgstr "Налаштувати опції експорту" #: libraries/config/messages.inc.php:208 msgid "Customize import defaults" -msgstr "" +msgstr "Налаштувати імпорт властивостей по замовчуванню" #: libraries/config/messages.inc.php:209 msgid "Customize navigation frame" -msgstr "" +msgstr "Налаштувати оболонку навігації" #: libraries/config/messages.inc.php:210 msgid "Customize main frame" -msgstr "" +msgstr "Налаштувати головну оболонку" #: libraries/config/messages.inc.php:211 libraries/config/messages.inc.php:216 #: setup/frames/menu.inc.php:17 msgid "SQL queries" -msgstr "" +msgstr "SQL запити" #: libraries/config/messages.inc.php:213 msgid "SQL Query box" -msgstr "" +msgstr "SQL Query box" #: libraries/config/messages.inc.php:214 msgid "Customize links shown in SQL Query boxes" -msgstr "" +msgstr "Налаштувати посилання що показуються у SQL Query boxes" #: libraries/config/messages.inc.php:217 msgid "SQL queries settings" @@ -2991,22 +3003,26 @@ msgid "" "strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], " "Copyright 2002 Upright Database Technology. All rights reserved.[/em]" msgstr "" +"Якщо ви хочете використовувати сервіс SQL Validator, ви повинні знати, що " +"[strong]всі SQL вирази зберігаються анонімно для статистичних цілей[/strong]." +"[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], Copyright " +"2002 Upright Database Technology. Всі права захищені.[/em]" #: libraries/config/messages.inc.php:220 msgid "Startup" -msgstr "" +msgstr "Початок" #: libraries/config/messages.inc.php:221 msgid "Customize startup page" -msgstr "" +msgstr "Налаштувати початкову сторінку" #: libraries/config/messages.inc.php:222 msgid "Tabs" -msgstr "" +msgstr "Вкладки" #: libraries/config/messages.inc.php:223 msgid "Choose how you want tabs to work" -msgstr "" +msgstr "Виберіть як би ви хотіли щоб вкладки працювали" #: libraries/config/messages.inc.php:224 msgid "Text fields" @@ -3018,21 +3034,23 @@ msgstr "Налаштувати текстові поля вводу" #: libraries/config/messages.inc.php:226 libraries/export/texytext.php:17 msgid "Texy! text" -msgstr "" +msgstr "Texy! текст" #: libraries/config/messages.inc.php:228 msgid "Warnings" -msgstr "" +msgstr "Попередження" #: libraries/config/messages.inc.php:229 msgid "Disable some of the warnings shown by phpMyAdmin" -msgstr "" +msgstr "Відключити деякі попередження що показуються у phpMyAdmin" #: libraries/config/messages.inc.php:230 msgid "" "Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import " "and export operations" msgstr "" +"Включити [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] стискання для " +"операцій імпорту та експорту" #: libraries/config/messages.inc.php:231 msgid "GZip" @@ -3047,10 +3065,12 @@ msgid "" "If enabled, phpMyAdmin continues computing multiple-statement queries even " "if one of the queries failed" msgstr "" +"Якщо включено, PhpMyAdmin продовжує обчислення декількох запитів навіть якщо " +"один із запитів не вдалий" #: libraries/config/messages.inc.php:234 msgid "Ignore multiple statement errors" -msgstr "" +msgstr "Ігнорувати помилки декількох виразів" #: libraries/config/messages.inc.php:235 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24807-gb093fe9
by Michal Čihař 14 Dec '11

14 Dec '11

The branch, master has been updated via b093fe9a13a53cc1f85f6babe50ad9f843430488 (commit) via deff97339b972449b11cd22db20953b57229a724 (commit) via cedb97400a5f174d0e628d540bcc5bde8bf844f6 (commit) via 49f74d1c3dcceacd9d37956899a33af0d1ee88d8 (commit) via 8a2ac93cec71c8948a973afed813c1264109d979 (commit) via 4a8411f6136a1b751b96d5e1e92454922c20ac4c (commit) via 09a465a34bb4b43839e2498ac0b16e5c8b58a970 (commit) via 0671e446490e0bb9dabb1f8253cb0d85d4601e48 (commit) via 207c75256009fbfdbf0ef15ec44b4421793ea0c6 (commit) via 3b639b6926915575e060390b1aa5a3ddbc545465 (commit) via bca04712c226bad051b2ab0d9d6e339aba56469c (commit) via 72cced808beae579d314fcbb1cadc5c4b337f7ac (commit) via 26d75661e7277256fe5b711562d8d39b690312c4 (commit) via 34a1691ab55e7275429d8afe7f6dfdfef8b4d4ac (commit) via 8f2956e6a7bdff7a47dd0696065cc590510aab61 (commit) via 4822f677a927dd12532e1f8e0cdea345e812776b (commit) via 7b3603d55339f7455f12b77e33a094761a10c63e (commit) via d8b5b8307b878d3ba054f19d4842aff919319398 (commit) via 0c8f8df64c3e01bad8dea9a99c8fa0e1ff7fe57a (commit) from cdffe9fb978ce108274ac414910b2eec7a1e224a (commit) - Log ----------------------------------------------------------------- commit b093fe9a13a53cc1f85f6babe50ad9f843430488 Merge: deff973 cdffe9f Author: Pootle server <pootle(a)cihar.com> Date: Wed Dec 14 10:40:21 2011 +0100 Merge remote-tracking branch 'origin/master' commit deff97339b972449b11cd22db20953b57229a724 Author: Sukma Budi <kanjengdemank(a)yahoo.com> Date: Tue Dec 13 22:38:42 2011 +0200 Translation update done using Pootle. commit cedb97400a5f174d0e628d540bcc5bde8bf844f6 Author: Sukma Budi <kanjengdemank(a)yahoo.com> Date: Tue Dec 13 22:36:20 2011 +0200 Translation update done using Pootle. commit 49f74d1c3dcceacd9d37956899a33af0d1ee88d8 Author: Sukma Budi <kanjengdemank(a)yahoo.com> Date: Tue Dec 13 22:33:05 2011 +0200 Translation update done using Pootle. commit 8a2ac93cec71c8948a973afed813c1264109d979 Author: Sukma Budi <kanjengdemank(a)yahoo.com> Date: Tue Dec 13 22:32:25 2011 +0200 Translation update done using Pootle. commit 4a8411f6136a1b751b96d5e1e92454922c20ac4c Author: Sukma Budi <kanjengdemank(a)yahoo.com> Date: Tue Dec 13 22:32:06 2011 +0200 Translation update done using Pootle. commit 09a465a34bb4b43839e2498ac0b16e5c8b58a970 Author: Ivan Lanin <ivan(a)lanin.org> Date: Tue Dec 13 22:31:15 2011 +0200 Translation update done using Pootle. commit 0671e446490e0bb9dabb1f8253cb0d85d4601e48 Author: ProUser <stefan(a)inkopsforum.se> Date: Tue Dec 13 20:13:57 2011 +0200 Translation update done using Pootle. commit 207c75256009fbfdbf0ef15ec44b4421793ea0c6 Author: ProUser <stefan(a)inkopsforum.se> Date: Tue Dec 13 20:12:33 2011 +0200 Translation update done using Pootle. commit 3b639b6926915575e060390b1aa5a3ddbc545465 Author: ProUser <stefan(a)inkopsforum.se> Date: Tue Dec 13 20:11:13 2011 +0200 Translation update done using Pootle. commit bca04712c226bad051b2ab0d9d6e339aba56469c Author: ProUser <stefan(a)inkopsforum.se> Date: Tue Dec 13 20:09:02 2011 +0200 Translation update done using Pootle. commit 72cced808beae579d314fcbb1cadc5c4b337f7ac Author: ProUser <stefan(a)inkopsforum.se> Date: Tue Dec 13 20:07:43 2011 +0200 Translation update done using Pootle. commit 26d75661e7277256fe5b711562d8d39b690312c4 Author: ProUser <stefan(a)inkopsforum.se> Date: Tue Dec 13 20:07:20 2011 +0200 Translation update done using Pootle. commit 34a1691ab55e7275429d8afe7f6dfdfef8b4d4ac Author: ProUser <stefan(a)inkopsforum.se> Date: Tue Dec 13 20:04:52 2011 +0200 Translation update done using Pootle. commit 8f2956e6a7bdff7a47dd0696065cc590510aab61 Author: ProUser <stefan(a)inkopsforum.se> Date: Tue Dec 13 20:03:56 2011 +0200 Translation update done using Pootle. commit 4822f677a927dd12532e1f8e0cdea345e812776b Author: ProUser <stefan(a)inkopsforum.se> Date: Tue Dec 13 19:45:32 2011 +0200 Translation update done using Pootle. commit 7b3603d55339f7455f12b77e33a094761a10c63e Author: ProUser <stefan(a)inkopsforum.se> Date: Tue Dec 13 19:45:13 2011 +0200 Translation update done using Pootle. commit d8b5b8307b878d3ba054f19d4842aff919319398 Author: ProUser <stefan(a)inkopsforum.se> Date: Tue Dec 13 19:44:52 2011 +0200 Translation update done using Pootle. commit 0c8f8df64c3e01bad8dea9a99c8fa0e1ff7fe57a Author: ProUser <stefan(a)inkopsforum.se> Date: Tue Dec 13 19:44:38 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/id.po | 23 +++++++++++------------ po/sv.po | 37 +++++++++++++++---------------------- 2 files changed, 26 insertions(+), 34 deletions(-) diff --git a/po/id.po b/po/id.po index f3b7694..25b806f 100644 --- a/po/id.po +++ b/po/id.po @@ -4,17 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-12 14:04+0100\n" -"PO-Revision-Date: 2011-11-19 09:54+0700\n" -"Last-Translator: Ivan Lanin <ivan(a)lanin.org>\n" +"PO-Revision-Date: 2011-12-13 22:36+0200\n" +"Last-Translator: Sukma Budi <kanjengdemank(a)yahoo.com>\n" "Language-Team: indonesian <id(a)li.org>\n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.5\n" +"X-Generator: Pootle 2.1.6\n" "X-Poedit-Basepath: ../../..\n" -"X-Poedit-Language: Indonesian\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:349 #: libraries/display_tbl.lib.php:358 server_privileges.php:1677 @@ -87,7 +86,7 @@ msgstr "Kirim" #: browse_foreigners.php:174 browse_foreigners.php:178 #: libraries/Index.class.php:440 tbl_tracking.php:304 msgid "Keyname" -msgstr "Nama Kunci" +msgstr "Nama kunci" #: browse_foreigners.php:175 browse_foreigners.php:177 #: server_collations.php:54 server_collations.php:66 server_engines.php:55 @@ -1200,12 +1199,12 @@ msgstr "Lainnya" #. l10n: Thousands separator #: js/messages.php:76 libraries/common.lib.php:1449 msgid "," -msgstr "." +msgstr "," #. l10n: Decimal separator #: js/messages.php:78 libraries/common.lib.php:1451 msgid "." -msgstr "," +msgstr "." #: js/messages.php:80 msgid "KiB sent since last refresh" @@ -3226,7 +3225,7 @@ msgstr "Reset" #: libraries/config/messages.inc.php:17 msgid "Improves efficiency of screen refresh" -msgstr "Meningkatkan efisiensi refresh layar" +msgstr "Meningkatkan efisiensi refresh layar" #: libraries/config/messages.inc.php:18 msgid "Enable Ajax" @@ -9564,10 +9563,10 @@ msgid "" "to increase the tmp_table_size value to cause temporary tables to be memory-" "based instead of disk-based." msgstr "" -"Jumlah tabel temporer pada diska yang dibuat otomatis oleh server sewaktu " -"mengeksekusi perintah. Kalau Created_tmp_disk_tables besar, Anda mungkin " -"perlu meningkatkan nilai tmp_table_size agar tabel temporer disimpan di " -"memori, alih-alih di diska." +"Jumlah tabel temporer pada diska yang dibuat otomatis oleh server saat " +"mengeksekusi perintah. Bila Created_tmp_disk_tables ukurannya besar, anda " +"mungkin perlu meningkatkan nilai tmp_table_size agar tabel temporer disimpan " +"di yang berbasis memori daripada yang berbasis diska." #: server_status.php:1303 msgid "How many temporary files mysqld has created." diff --git a/po/sv.po b/po/sv.po index 68746ef..bf8c5d4 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-12 14:04+0100\n" -"PO-Revision-Date: 2011-12-06 23:13+0200\n" +"PO-Revision-Date: 2011-12-13 20:12+0200\n" "Last-Translator: ProUser <stefan(a)inkopsforum.se>\n" "Language-Team: swedish <sv(a)li.org>\n" "Language: sv\n" @@ -1527,10 +1527,9 @@ msgid "Analysing & loading logs. This may take a while." msgstr "Analyserar och laddar loggar. Detta kan ta lite tid." #: js/messages.php:176 -#, fuzzy #| msgid "Read requests" msgid "Cancel request" -msgstr "Läsförfrågningar" +msgstr "Avbryt begäran" #: js/messages.php:177 msgid "" @@ -1564,16 +1563,14 @@ msgid "Log analysed, but no data found in this time span." msgstr "Loggdata laddad. Frågorna exekverade under denna tidsperiod:" #: js/messages.php:184 -#, fuzzy #| msgid "Analyze" msgid "Analyzing..." -msgstr "Analysera" +msgstr "Analyserar..." #: js/messages.php:185 -#, fuzzy #| msgid "Explain SQL" msgid "Explain output" -msgstr "Förklara SQL-kod" +msgstr "Förklara utdata" #: js/messages.php:187 js/messages.php:487 libraries/rte/rte_list.lib.php:62 #: libraries/rte/rte_triggers.lib.php:326 server_status.php:1236 sql.php:893 @@ -1581,16 +1578,14 @@ msgid "Time" msgstr "Tid" #: js/messages.php:188 -#, fuzzy #| msgid "Total:" msgid "Total time:" -msgstr "Totalt:" +msgstr "Total tid:" #: js/messages.php:189 -#, fuzzy #| msgid "Profiling" msgid "Profiling results" -msgstr "Profilering" +msgstr "Profilering av resultat" #: js/messages.php:190 #, fuzzy @@ -1600,19 +1595,18 @@ msgid "Table" msgstr "Tabell" #: js/messages.php:191 -#, fuzzy msgid "Chart" -msgstr "Teckenuppsättningar" +msgstr "Diagram" #. l10n: A collection of available filters #: js/messages.php:194 msgid "Log table filter options" -msgstr "Logga filteralternativ" +msgstr "Logga tabellfilter alternativ" #. l10n: Filter as in "Start Filtering" #: js/messages.php:196 msgid "Filter" -msgstr "Filter" +msgstr "Filtrera" #: js/messages.php:197 msgid "Filter queries by word/regexp:" @@ -1620,7 +1614,7 @@ msgstr "Filtrera frågor med ord/regexp:" #: js/messages.php:198 msgid "Group queries, ignoring variable data in WHERE clauses" -msgstr "Gruppfrågor, ignorera variabeldata i WHERE kommandon" +msgstr "Gruppfrågor, ignorera variabeldata i WHERE klausuler" #: js/messages.php:199 msgid "Sum of grouped rows:" @@ -1644,9 +1638,9 @@ msgid "" "This is most likely because your session expired. Reloading the page and " "reentering your credentials should help." msgstr "" -"När ny diagramdata begärdes returnerade servern returnerade ett ett ogiltigt " -"svar. Detta beror troligen på att din session upphört. Ladda om sidan och " -"mata in dina inloggningsuppgifter igen bör lösa problemet." +"När ny diagramdata begärdes, returnerade servern ett ett ogiltigt svar. " +"Detta beror troligen på att din session har upphört. Ladda om sidan och mata " +"in dina inloggningsuppgifter igen bör lösa problemet." #: js/messages.php:205 msgid "Reload page" @@ -2297,7 +2291,7 @@ msgstr "per timme" #: libraries/Advisor.class.php:335 msgid "per day" -msgstr "" +msgstr "per dag" #: libraries/Config.class.php:703 msgid "Remove \"./config\" directory before using phpMyAdmin!" @@ -8621,10 +8615,9 @@ msgid "Toggle small/big" msgstr "Växla liten/stor" #: pmd_general.php:99 -#, fuzzy #| msgid "To select relation, click :" msgid "Toggle relation lines" -msgstr "För att välja relation, klicka :" +msgstr "Växla mellan relaterade linjer" #: pmd_general.php:104 pmd_pdf.php:76 msgid "Import/Export coordinates for PDF schema" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24788-gcdffe9f
by Michal Čihař 14 Dec '11

14 Dec '11

The branch, master has been updated via cdffe9fb978ce108274ac414910b2eec7a1e224a (commit) via 458e015ec2bd5f887b3240faef0ca36f8474d3bf (commit) via da62d86238949a5dbb42f64dcdfed81a4fc5b36a (commit) via 91241f71d329d6692c9761ded0b19d6f75730fec (commit) via cec8f1b0941595ea7673fa990b3291fd564220c0 (commit) via 396e5716f89d291f366266e639c26e2ed8391dd2 (commit) via a074b4c6e28b044670d21dec791ad0f909eba251 (commit) via ea64f8f731928cfed87f7149a39dc797af8ce08a (commit) from de11d39fd6f8c055aef5042212c1e42092a4d159 (commit) - Log ----------------------------------------------------------------- commit cdffe9fb978ce108274ac414910b2eec7a1e224a Merge: de11d39 458e015 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Dec 14 10:06:36 2011 +0100 Merge remote-tracking branch 'origin/QA_3_4' Conflicts: libraries/dbi/mysql.dbi.lib.php ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + config.sample.inc.php | 4 ++-- libraries/dbi/mysql.dbi.lib.php | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77ebdcf..7f9d873 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,7 @@ phpMyAdmin - ChangeLog - bug #3452506 [edit] Unable to move tables with triggers - bug #3449659 [navi] Fast filter broken with table tree - bug #3448485 [GUI] Firefox favicon frameset regression +- [core] Better compatibility with mysql extension 3.4.8.0 (2011-12-01) - bug #3425230 [interface] enum data split at space char (more space to edit) diff --git a/config.sample.inc.php b/config.sample.inc.php index 0eab148..d392003 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -31,8 +31,8 @@ $cfg['Servers'][$i]['auth_type'] = 'cookie'; $cfg['Servers'][$i]['host'] = 'localhost'; $cfg['Servers'][$i]['connect_type'] = 'tcp'; $cfg['Servers'][$i]['compress'] = false; -/* Select mysqli if your server has it */ -$cfg['Servers'][$i]['extension'] = 'mysql'; +/* Select mysql if your server does not have mysqli */ +$cfg['Servers'][$i]['extension'] = 'mysqli'; $cfg['Servers'][$i]['AllowNoPassword'] = false; /* diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 4e41149..6e6b7e2 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -408,7 +408,7 @@ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) /** * returns metainfo for fields in $result * - * @todo add missing keys like in mysqli_query (orgname, orgtable, flags, decimals) + * @todo add missing keys like in mysqli_query (decimals) * @param resource $result * @return array meta info for fields in $result */ @@ -417,7 +417,11 @@ function PMA_DBI_get_fields_meta($result) $fields = array(); $num_fields = mysql_num_fields($result); for ($i = 0; $i < $num_fields; $i++) { - $fields[] = mysql_fetch_field($result, $i); + $field = mysql_fetch_field($result, $i); + $field->flags = mysql_field_flags($result, $i); + $field->orgtable = mysql_field_table($result, $i); + $field->orgname = mysql_field_name($result, $i); + $fields[] = $field; } return $fields; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_8-21-g458e015
by Michal Čihař 14 Dec '11

14 Dec '11

The branch, QA_3_4 has been updated via 458e015ec2bd5f887b3240faef0ca36f8474d3bf (commit) from da62d86238949a5dbb42f64dcdfed81a4fc5b36a (commit) - Log ----------------------------------------------------------------- commit 458e015ec2bd5f887b3240faef0ca36f8474d3bf Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Dec 14 10:03:20 2011 +0100 Changelog entry ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2cdf5d..5eb0138 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - bug #3452506 [edit] Unable to move tables with triggers - bug #3449659 [navi] Fast filter broken with table tree - bug #3448485 [GUI] Firefox favicon frameset regression +- [core] Better compatibility with mysql extension 3.4.8.0 (2011-12-01) - bug #3425230 [interface] enum data split at space char (more space to edit) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_8-20-gda62d86
by Michal Čihař 14 Dec '11

14 Dec '11

The branch, QA_3_4 has been updated via da62d86238949a5dbb42f64dcdfed81a4fc5b36a (commit) via 91241f71d329d6692c9761ded0b19d6f75730fec (commit) via cec8f1b0941595ea7673fa990b3291fd564220c0 (commit) from 396e5716f89d291f366266e639c26e2ed8391dd2 (commit) - Log ----------------------------------------------------------------- commit da62d86238949a5dbb42f64dcdfed81a4fc5b36a Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Dec 14 10:00:01 2011 +0100 These are done and we do not seem to use decimals commit 91241f71d329d6692c9761ded0b19d6f75730fec Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Dec 14 09:58:47 2011 +0100 Fill orgtable and orgname attributes commit cec8f1b0941595ea7673fa990b3291fd564220c0 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Dec 14 09:56:02 2011 +0100 Add actually some sane value to field flags ----------------------------------------------------------------------- Summary of changes: libraries/dbi/mysql.dbi.lib.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 96b6933..f959539 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -427,7 +427,7 @@ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) } /** - * @todo add missing keys like in from mysqli_query (orgname, orgtable, flags, decimals) + * @todo add missing keys like in from mysqli_query (decimals) */ function PMA_DBI_get_fields_meta($result) { @@ -435,7 +435,9 @@ function PMA_DBI_get_fields_meta($result) $num_fields = mysql_num_fields($result); for ($i = 0; $i < $num_fields; $i++) { $field = mysql_fetch_field($result, $i); - $field->flags = ''; + $field->flags = mysql_field_flags($result, $i); + $field->orgtable = mysql_field_table($result, $i); + $field->orgname = mysql_field_name($result, $i); $fields[] = $field; } return $fields; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_8-17-g396e571
by Michal Čihař 14 Dec '11

14 Dec '11

The branch, QA_3_4 has been updated via 396e5716f89d291f366266e639c26e2ed8391dd2 (commit) via a074b4c6e28b044670d21dec791ad0f909eba251 (commit) via ea64f8f731928cfed87f7149a39dc797af8ce08a (commit) from 629c5cbc3458ff6190bcada0080f1d065bb124ca (commit) - Log ----------------------------------------------------------------- commit 396e5716f89d291f366266e639c26e2ed8391dd2 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Dec 14 09:51:18 2011 +0100 Use mysqli in example configuration The mysql extension does not support some features we use and I think it is safe to assume nearly everybody has mysqli. commit a074b4c6e28b044670d21dec791ad0f909eba251 Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Dec 14 09:49:49 2011 +0100 Create fake flags field The content is empty for now, but at least the code will not emit warnings on every access to it (which is quite often). The proper value calculation should be added later. commit ea64f8f731928cfed87f7149a39dc797af8ce08a Author: Michal Čihař <mcihar(a)suse.cz> Date: Wed Dec 14 09:49:35 2011 +0100 Whitespace cleanup ----------------------------------------------------------------------- Summary of changes: config.sample.inc.php | 4 ++-- libraries/dbi/mysql.dbi.lib.php | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/config.sample.inc.php b/config.sample.inc.php index 0ea16d5..1a22fc3 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -31,8 +31,8 @@ $cfg['Servers'][$i]['auth_type'] = 'cookie'; $cfg['Servers'][$i]['host'] = 'localhost'; $cfg['Servers'][$i]['connect_type'] = 'tcp'; $cfg['Servers'][$i]['compress'] = false; -/* Select mysqli if your server has it */ -$cfg['Servers'][$i]['extension'] = 'mysql'; +/* Select mysql if your server does not have mysqli */ +$cfg['Servers'][$i]['extension'] = 'mysqli'; $cfg['Servers'][$i]['AllowNoPassword'] = false; /* diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index c4f22fb..96b6933 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -175,8 +175,8 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r $r = mysql_query($query, $link); } - if ($cache_affected_rows) { - $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); + if ($cache_affected_rows) { + $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); } if ($GLOBALS['cfg']['DBG']['sql']) { @@ -406,7 +406,7 @@ function PMA_DBI_insert_id($link = null) * @uses $GLOBALS['userlink'] * @uses mysql_affected_rows() * @param object mysql $link the mysql object - * @param boolean $get_from_cache + * @param boolean $get_from_cache * @return string integer */ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) @@ -434,7 +434,9 @@ function PMA_DBI_get_fields_meta($result) $fields = array(); $num_fields = mysql_num_fields($result); for ($i = 0; $i < $num_fields; $i++) { - $fields[] = mysql_fetch_field($result, $i); + $field = mysql_fetch_field($result, $i); + $field->flags = ''; + $fields[] = $field; } return $fields; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24780-gde11d39
by Michal Čihař 13 Dec '11

13 Dec '11

The branch, master has been updated via de11d39fd6f8c055aef5042212c1e42092a4d159 (commit) via 8c70de5af18fc98b47d8bc3d4ffa9f1187250a82 (commit) via 9c7ec808ac250e4d534ce8cb9d9144c47edaa551 (commit) via d18022ee90247a073d63a0d982f1b3acdefd280b (commit) via c1e11879c7ad37eab46e4b2aa12ff61778b74558 (commit) via d124130a0ec40a29f2a400afcfd02cbe88c47dfa (commit) via 62a63de8e6e63479e092b892a91daaded96ed97a (commit) via c93ba9357869107e6e555a6578246c54671d09ab (commit) via e3fe09b2202a1c21c1161367a7b1c08a622a853d (commit) via b480cfe8e98d006138942a6b1bd178c89412caf2 (commit) via b49c2f307bb57333cad92ce315f1109f5d7bb368 (commit) via bc89d200b43f88bb3ae56217c1b1ec808a1fb6b9 (commit) via 698e008be25c3e05d80943aa0a7afb14d6dbf5dc (commit) via 065d0b11674749378fe19fc1eb97afaf50fa38fc (commit) via 7d23ef2efa4387d5e990dd36647866cd5160810e (commit) via e852d75f43e66100d7e5a249811716f51b05b404 (commit) from 1b24a0e6e01ff0da2de162241bc18fe93bdcc3b2 (commit) - Log ----------------------------------------------------------------- commit de11d39fd6f8c055aef5042212c1e42092a4d159 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Dec 13 11:34:07 2011 +0200 Translation update done using Pootle. commit 8c70de5af18fc98b47d8bc3d4ffa9f1187250a82 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Dec 13 11:32:57 2011 +0200 Translation update done using Pootle. commit 9c7ec808ac250e4d534ce8cb9d9144c47edaa551 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Dec 13 11:32:32 2011 +0200 Translation update done using Pootle. commit d18022ee90247a073d63a0d982f1b3acdefd280b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 13 11:32:03 2011 +0200 Translation update done using Pootle. commit c1e11879c7ad37eab46e4b2aa12ff61778b74558 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Tue Dec 13 11:31:54 2011 +0200 Translation update done using Pootle. commit d124130a0ec40a29f2a400afcfd02cbe88c47dfa Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Dec 13 11:31:50 2011 +0200 Translation update done using Pootle. commit 62a63de8e6e63479e092b892a91daaded96ed97a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Dec 13 11:31:23 2011 +0200 Translation update done using Pootle. commit c93ba9357869107e6e555a6578246c54671d09ab Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Dec 13 11:30:45 2011 +0200 Translation update done using Pootle. commit e3fe09b2202a1c21c1161367a7b1c08a622a853d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Dec 13 11:29:35 2011 +0200 Translation update done using Pootle. commit b480cfe8e98d006138942a6b1bd178c89412caf2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Dec 13 11:27:47 2011 +0200 Translation update done using Pootle. commit b49c2f307bb57333cad92ce315f1109f5d7bb368 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Dec 13 11:27:11 2011 +0200 Translation update done using Pootle. commit bc89d200b43f88bb3ae56217c1b1ec808a1fb6b9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Dec 13 11:26:29 2011 +0200 Translation update done using Pootle. commit 698e008be25c3e05d80943aa0a7afb14d6dbf5dc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Dec 13 11:26:19 2011 +0200 Translation update done using Pootle. commit 065d0b11674749378fe19fc1eb97afaf50fa38fc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Dec 13 11:26:06 2011 +0200 Translation update done using Pootle. commit 7d23ef2efa4387d5e990dd36647866cd5160810e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Dec 13 11:25:50 2011 +0200 Translation update done using Pootle. commit e852d75f43e66100d7e5a249811716f51b05b404 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Dec 13 11:25:24 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 45 +++++++++++++++++---------------------------- po/tr.po | 3 +-- 2 files changed, 18 insertions(+), 30 deletions(-) diff --git a/po/ja.po b/po/ja.po index ca3f27c..4996dfb 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-12 14:04+0100\n" -"PO-Revision-Date: 2011-12-10 08:24+0200\n" +"PO-Revision-Date: 2011-12-13 11:32+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -1531,10 +1531,9 @@ msgstr "" "ログの解析および読み込みを行っています。少し時間がかかることがあります。" #: js/messages.php:176 -#, fuzzy #| msgid "Read requests" msgid "Cancel request" -msgstr "読み込みリクエスト数" +msgstr "キャンセル" #: js/messages.php:177 msgid "" @@ -1569,16 +1568,14 @@ msgid "Log analysed, but no data found in this time span." msgstr "ログの解析を行いましたが、この期間のデータは見つかりませんでした。" #: js/messages.php:184 -#, fuzzy #| msgid "Analyze" msgid "Analyzing..." -msgstr "分析" +msgstr "解析しています..." #: js/messages.php:185 -#, fuzzy #| msgid "Explain SQL" msgid "Explain output" -msgstr "EXPLAIN で確認" +msgstr "EXPLAIN の結果" #: js/messages.php:187 js/messages.php:487 libraries/rte/rte_list.lib.php:62 #: libraries/rte/rte_triggers.lib.php:326 server_status.php:1236 sql.php:893 @@ -1586,29 +1583,25 @@ msgid "Time" msgstr "時間" #: js/messages.php:188 -#, fuzzy #| msgid "Total:" msgid "Total time:" -msgstr "合計:" +msgstr "合計時間:" #: js/messages.php:189 -#, fuzzy #| msgid "Profiling" msgid "Profiling results" -msgstr "プロファイリング" +msgstr "プロファイリングの結果" #: js/messages.php:190 -#, fuzzy #| msgid "Table" msgctxt "Display format" msgid "Table" -msgstr "テーブル" +msgstr "表" #: js/messages.php:191 -#, fuzzy #| msgid "Charts" msgid "Chart" -msgstr "グラフ機能" +msgstr "グラフ" #. l10n: A collection of available filters #: js/messages.php:194 @@ -2304,7 +2297,7 @@ msgstr "/ 時" #: libraries/Advisor.class.php:335 msgid "per day" -msgstr "" +msgstr "/ 日" #: libraries/Config.class.php:703 msgid "Remove \"./config\" directory before using phpMyAdmin!" @@ -3906,9 +3899,8 @@ msgid "" "features, see [a(a)Documentation.html#linked-tables]phpMyAdmin configuration " "storage[/a] in documentation" msgstr "" -"追加された機能にアクセスするには phpMyAdmin 環境保管領域を設定してください。" -"ドキュメントの[a(a)Documentation.html#linked-tables]phpMyAdmin 環境保管領域[/a]" -"参照。" +"追加された機能にアクセスするには phpMyAdmin 環境保管領域を設定してください。ドキュメントの [a(a)Documentation.html" +"#linked-tables]phpMyAdmin 環境保管領域[/a]参照。" #: libraries/config/messages.inc.php:208 msgid "Changes tracking" @@ -5035,7 +5027,7 @@ msgstr "" #: libraries/config/messages.inc.php:458 msgid "Show password change form" -msgstr "パスワード変更フォームの表示" +msgstr "パスワード変更フォームを表示する" #: libraries/config/messages.inc.php:459 msgid "Show create database form" @@ -5089,7 +5081,7 @@ msgstr "" #: libraries/config/messages.inc.php:469 msgid "Show phpinfo() link" -msgstr "phpinfo() リンクの表示する" +msgstr "phpinfo() リンクを表示する" #: libraries/config/messages.inc.php:470 msgid "Show detailed MySQL server information" @@ -7156,7 +7148,7 @@ msgstr "この書式にはオプションはありません" #: libraries/relation.lib.php:76 msgid "not OK" -msgstr "Not OK" +msgstr "NG" #: libraries/relation.lib.php:81 msgid "Enabled" @@ -9448,9 +9440,7 @@ msgstr "データベースを選択してください:" msgid "" "Now, add the following lines at the end of [mysqld] section in your my.cnf " "and please restart the MySQL server afterwards." -msgstr "" -"すぐに、my.cnf の [mysqld] セクションの最後に以下の行を追加し、その後、MySQL " -"サーバを再起動してください。" +msgstr "my.cnf の [mysqld] セクションの最後に以下の行を追加し、その後、MySQL サーバを再起動してください。" #: server_replication.php:228 msgid "" @@ -9458,9 +9448,8 @@ msgid "" "should see a message informing you, that this server <b>is</b> configured as " "master" msgstr "" -"MySQL サーバが再起動したら、「実行する」ボタンをクリックしてください。その" -"後、このサーバ<b>が</b>マスタとして設定されていることを知らせるメッセージが表" -"示されます。" +"MySQL サーバが再起動したら、「実行」ボタンをクリックしてください。その後、このサーバ<b>が</b>マスタとして設定されていることを知らせるメッセ" +"ージが表示されます。" #: server_replication.php:291 msgid "Slave SQL Thread not running!" diff --git a/po/tr.po b/po/tr.po index a8917f2..edddd86 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-12-12 14:04+0100\n" -"PO-Revision-Date: 2011-12-12 18:34+0200\n" +"PO-Revision-Date: 2011-12-13 11:31+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -1592,7 +1592,6 @@ msgid "Profiling results" msgstr "Sonuçların profili çıkarılıyor" #: js/messages.php:190 -#, fuzzy #| msgid "Table" msgctxt "Display format" msgid "Table" hooks/post-receive -- phpMyAdmin

1 0