Git December 2011

git@phpmyadmin.net

5 participants
151 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25426-g25b78be

by Madhura Jayaratne

The branch, master has been updated via 25b78bef1b0595ef37c2855d0f070563d8e80116 (commit) via cd294e5b97c723fa85e29d2b2c43eaa48e60c60a (commit) from 6c608b808ca44e6b504ef099f451a2b1df46e653 (commit) - Log ----------------------------------------------------------------- commit 25b78bef1b0595ef37c2855d0f070563d8e80116 Merge: 6c608b8 cd294e5 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Dec 24 21:33:35 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/import/ods.php | 38 ++++++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index daf4cb4..b5e712a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -70,6 +70,7 @@ phpMyAdmin - ChangeLog 3.4.10.0 (not yet released) - bug #3460090 [interface] TextareaAutoSelect feature broken - patch #3375984 [export] PHP Array export might generate invalid php code +- bug #3049209 [import] Import from ODS ignores cell that is the same as cell before 3.4.9.0 (2011-12-21) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown diff --git a/libraries/import/ods.php b/libraries/import/ods.php index 8af40f4..c9ede1c 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -117,25 +117,31 @@ foreach ($sheets as $sheet) { $cell_attrs = $cell->attributes('office', true); if (count($text) != 0) { - if (! $col_names_in_first_row) { - if ($_REQUEST['ods_recognize_percentages'] && !strcmp('percentage', $cell_attrs['value-type'])) { - $tempRow[] = (double)$cell_attrs['value']; - } elseif ($_REQUEST['ods_recognize_currency'] && !strcmp('currency', $cell_attrs['value-type'])) { - $tempRow[] = (double)$cell_attrs['value']; - } else { - $tempRow[] = (string)$text; - } - } else { - if ($_REQUEST['ods_recognize_percentages'] && !strcmp('percentage', $cell_attrs['value-type'])) { - $col_names[] = (double)$cell_attrs['value']; - } else if ($_REQUEST['ods_recognize_currency'] && !strcmp('currency', $cell_attrs['value-type'])) { - $col_names[] = (double)$cell_attrs['value']; + $attr = $cell->attributes('table', true); + $num_repeat = (int) $attr['number-columns-repeated']; + $num_iterations = $num_repeat ? $num_repeat : 1; + + for ($k = 0; $k < $num_iterations; $k++) { + if (! $col_names_in_first_row) { + if ($_REQUEST['ods_recognize_percentages'] && !strcmp('percentage', $cell_attrs['value-type'])) { + $tempRow[] = (double)$cell_attrs['value']; + } elseif ($_REQUEST['ods_recognize_currency'] && !strcmp('currency', $cell_attrs['value-type'])) { + $tempRow[] = (double)$cell_attrs['value']; + } else { + $tempRow[] = (string)$text; + } } else { - $col_names[] = (string)$text; + if ($_REQUEST['ods_recognize_percentages'] && !strcmp('percentage', $cell_attrs['value-type'])) { + $col_names[] = (double)$cell_attrs['value']; + } else if ($_REQUEST['ods_recognize_currency'] && !strcmp('currency', $cell_attrs['value-type'])) { + $col_names[] = (double)$cell_attrs['value']; + } else { + $col_names[] = (string)$text; + } } - } - ++$col_count; + ++$col_count; + } } else { /* Number of blank columns repeated */ if ($col_count < count($row->children('table', true)) - 1) { hooks/post-receive -- phpMyAdmin

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_9-14-gcd294e5

by Madhura Jayaratne

The branch, QA_3_4 has been updated via cd294e5b97c723fa85e29d2b2c43eaa48e60c60a (commit) from d3207af8af2641fc7e6f6ad7371f8a93f18454a2 (commit) - Log ----------------------------------------------------------------- commit cd294e5b97c723fa85e29d2b2c43eaa48e60c60a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Dec 24 21:31:08 2011 +0530 bug #3049209 [import] Import from ODS ignores cell that is the same as cell before ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/import/ods.php | 38 ++++++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c39a56..8cbd325 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 3.4.10.0 (not yet released) - bug #3460090 [interface] TextareaAutoSelect feature broken - patch #3375984 [export] PHP Array export might generate invalid php code +- bug #3049209 [import] Import from ODS ignores cell that is the same as cell before 3.4.9.0 (2011-12-21) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown diff --git a/libraries/import/ods.php b/libraries/import/ods.php index cd48f68..03736e2 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -118,25 +118,31 @@ foreach ($sheets as $sheet) { $cell_attrs = $cell->attributes('office', true); if (count($text) != 0) { - if (! $col_names_in_first_row) { - if ($_REQUEST['ods_recognize_percentages'] && !strcmp('percentage', $cell_attrs['value-type'])) { - $tempRow[] = (double)$cell_attrs['value']; - } elseif ($_REQUEST['ods_recognize_currency'] && !strcmp('currency', $cell_attrs['value-type'])) { - $tempRow[] = (double)$cell_attrs['value']; - } else { - $tempRow[] = (string)$text; - } - } else { - if ($_REQUEST['ods_recognize_percentages'] && !strcmp('percentage', $cell_attrs['value-type'])) { - $col_names[] = (double)$cell_attrs['value']; - } else if ($_REQUEST['ods_recognize_currency'] && !strcmp('currency', $cell_attrs['value-type'])) { - $col_names[] = (double)$cell_attrs['value']; + $attr = $cell->attributes('table', true); + $num_repeat = (int) $attr['number-columns-repeated']; + $num_iterations = $num_repeat ? $num_repeat : 1; + + for ($k = 0; $k < $num_iterations; $k++) { + if (! $col_names_in_first_row) { + if ($_REQUEST['ods_recognize_percentages'] && !strcmp('percentage', $cell_attrs['value-type'])) { + $tempRow[] = (double)$cell_attrs['value']; + } elseif ($_REQUEST['ods_recognize_currency'] && !strcmp('currency', $cell_attrs['value-type'])) { + $tempRow[] = (double)$cell_attrs['value']; + } else { + $tempRow[] = (string)$text; + } } else { - $col_names[] = (string)$text; + if ($_REQUEST['ods_recognize_percentages'] && !strcmp('percentage', $cell_attrs['value-type'])) { + $col_names[] = (double)$cell_attrs['value']; + } else if ($_REQUEST['ods_recognize_currency'] && !strcmp('currency', $cell_attrs['value-type'])) { + $col_names[] = (double)$cell_attrs['value']; + } else { + $col_names[] = (string)$text; + } } - } - ++$col_count; + ++$col_count; + } } else { /* Number of blank columns repeated */ if ($col_count < count($row->children('table', true)) - 1) { hooks/post-receive -- phpMyAdmin

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25424-g6c608b8

by Michal Čihař

The branch, master has been updated via 6c608b808ca44e6b504ef099f451a2b1df46e653 (commit) via d3207af8af2641fc7e6f6ad7371f8a93f18454a2 (commit) from 5855f612ff98c5d7d3f3fe2396cb6e54da671165 (commit) - Log ----------------------------------------------------------------- commit 6c608b808ca44e6b504ef099f451a2b1df46e653 Merge: 5855f61 d3207af Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Dec 23 10:46:57 2011 +0100 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_9-13-gd3207af

by Michal Čihař

The branch, QA_3_4 has been updated via d3207af8af2641fc7e6f6ad7371f8a93f18454a2 (commit) from 2b5056326227cf5e63d2f74cced9fd45929bfdfe (commit) - Log ----------------------------------------------------------------- commit d3207af8af2641fc7e6f6ad7371f8a93f18454a2 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Dec 23 10:44:49 2011 +0100 Update translations from master ----------------------------------------------------------------------- Summary of changes: po/th.po | 10 ++++-- po/uk.po | 121 +++++++++++++++++++++++++++++++++----------------------------- 2 files changed, 71 insertions(+), 60 deletions(-) diff --git a/po/th.po b/po/th.po index 661ac44..ce942ce 100644 --- a/po/th.po +++ b/po/th.po @@ -6799,7 +6799,7 @@ msgstr "" #: main.php:119 msgid "Appearance Settings" -msgstr "" +msgstr "ตั้งค่าลักษณะที่ปรากฏ" #: main.php:147 prefs_manage.php:274 #, fuzzy @@ -6809,7 +6809,7 @@ msgstr "ความสามารถด้านรีเลชันทั่ #: main.php:165 msgid "Protocol version" -msgstr "" +msgstr "รุ่นของโพรโทคอล" #: main.php:167 server_privileges.php:1452 server_privileges.php:1606 #: server_privileges.php:1730 server_privileges.php:2149 @@ -6823,7 +6823,7 @@ msgstr "ชุดตัวอักษร (charset) ของ MySQL" #: main.php:183 msgid "Web server" -msgstr "" +msgstr "เว็บเซิร์ฟเวอร์" #: main.php:189 msgid "MySQL client version" @@ -6879,6 +6879,8 @@ msgid "" "option is incompatible with phpMyAdmin and might cause some data to be " "corrupted!" msgstr "" +"คุณได้เปิดใช้งาน mbstring.func_overload ในการกำหนดค่าของ PHP ตัวเลือกนี้ไม่เข้ากันกับ " +"phpMyAdmin และอาจทำให้ข้อมูลบางอย่างจะเสียหายได้" #: main.php:261 msgid "" @@ -6886,6 +6888,8 @@ msgid "" "multibyte charset. Without the mbstring extension phpMyAdmin is unable to " "split strings correctly and it may result in unexpected results." msgstr "" +"ไม่พบส่วนขยาย mbstring ของ PHP และดูเหมือนคุณต้องใช้ชุดอักขระโดยไม่มีส่วนขยาย mbstring " +"ของ phpMyAdmin ซึ่งไม่สามารถแยกอักขระได้อย่างถูกต้อง และอาจทำให้ผลลัพธ์ที่ไม่คาดคิดได้" #: main.php:269 msgid "" diff --git a/po/uk.po b/po/uk.po index 642931e..f751196 100644 --- a/po/uk.po +++ b/po/uk.po @@ -6883,7 +6883,7 @@ msgstr "" #: pmd_general.php:78 msgid "Save position" -msgstr "" +msgstr "Зберегти позицію" #: pmd_general.php:81 server_synchronize.php:424 server_synchronize.php:867 msgid "Create table" @@ -6891,39 +6891,40 @@ msgstr "" #: pmd_general.php:84 pmd_general.php:352 msgid "Create relation" -msgstr "" +msgstr "Створити зв'язок" #: pmd_general.php:90 msgid "Reload" -msgstr "" +msgstr "Перезавантажити" #: pmd_general.php:93 msgid "Help" -msgstr "" +msgstr "Допомога" #: pmd_general.php:97 +#, fuzzy msgid "Angular links" -msgstr "" +msgstr "Кутове посилання" #: pmd_general.php:97 msgid "Direct links" -msgstr "" +msgstr "Пряме посилання" #: pmd_general.php:101 msgid "Snap to grid" -msgstr "" +msgstr "Прив'язати до сітки" #: pmd_general.php:105 msgid "Small/Big All" -msgstr "" +msgstr "Маленькі/Великі Всі" #: pmd_general.php:109 msgid "Toggle small/big" -msgstr "" +msgstr "Переключити маленькі/великі" #: pmd_general.php:114 pmd_pdf.php:80 msgid "Import/Export coordinates for PDF schema" -msgstr "" +msgstr "Імпортувати/Експортувати координати для PDF схеми" #: pmd_general.php:120 #, fuzzy @@ -6933,23 +6934,23 @@ msgstr "Виконати запит" #: pmd_general.php:125 msgid "Move Menu" -msgstr "" +msgstr "Посунути меню" #: pmd_general.php:137 msgid "Hide/Show all" -msgstr "" +msgstr "Сховати/Показати все" #: pmd_general.php:141 msgid "Hide/Show Tables with no relation" -msgstr "" +msgstr "Сховати/Показати Таблиці які не мають зв'язків" #: pmd_general.php:181 msgid "Number of tables" -msgstr "" +msgstr "Число таблиць" #: pmd_general.php:418 msgid "Delete relation" -msgstr "" +msgstr "Видалити зв'язок" #: pmd_general.php:460 pmd_general.php:519 #, fuzzy @@ -7014,11 +7015,11 @@ msgstr "" #: pmd_pdf.php:34 msgid "Page has been created" -msgstr "" +msgstr "Сторінка була створена" #: pmd_pdf.php:37 msgid "Page creation failed" -msgstr "" +msgstr "Створення сторінки обламалось" #: pmd_pdf.php:89 #, fuzzy @@ -7034,7 +7035,7 @@ msgstr "Імпорт файлів" #: pmd_pdf.php:100 msgid "Export to selected page" -msgstr "" +msgstr "Експорт у вибрану сторінку" #: pmd_pdf.php:102 #, fuzzy @@ -7050,35 +7051,35 @@ msgstr "Ім'я користувача" #: pmd_pdf.php:114 msgid "Export/Import to scale" -msgstr "" +msgstr "Експорт/Імпорт у масштабі" #: pmd_pdf.php:119 msgid "recommended" -msgstr "" +msgstr "рекомендовано" #: pmd_relation_new.php:29 msgid "Error: relation already exists." -msgstr "" +msgstr "Помилка: зв'язок вже існує." #: pmd_relation_new.php:61 pmd_relation_new.php:86 msgid "Error: Relation not added." -msgstr "" +msgstr "Помилка: Зв'язок не доданий." #: pmd_relation_new.php:62 msgid "FOREIGN KEY relation added" -msgstr "" +msgstr "FOREIGN KEY зв'язок доданий" #: pmd_relation_new.php:84 msgid "Internal relation added" -msgstr "" +msgstr "Внутрішній зв'язок доданий" #: pmd_relation_upd.php:55 msgid "Relation deleted" -msgstr "" +msgstr "Зв'язок видалений" #: pmd_save_pos.php:44 msgid "Error saving coordinates for Designer." -msgstr "" +msgstr "Помилка збереження координат Дизайнера." #: pmd_save_pos.php:52 msgid "Modifications have been saved" @@ -7086,23 +7087,23 @@ msgstr "Модифікації було збережено" #: prefs_forms.php:78 msgid "Cannot save settings, submitted form contains errors" -msgstr "" +msgstr "Неможливо зберегти налаштування, відправлена форма містить помилки" #: prefs_manage.php:80 msgid "Could not import configuration" -msgstr "" +msgstr "Не вдається імпортувати конфігурацію" #: prefs_manage.php:112 msgid "Configuration contains incorrect data for some fields." -msgstr "" +msgstr "Конфігурація містить некоректні дані для деяких полів." #: prefs_manage.php:128 msgid "Do you want to import remaining settings?" -msgstr "" +msgstr "Ви хочете імпортувати параметри які залишились?" #: prefs_manage.php:225 prefs_manage.php:251 msgid "Saved on: @DATE@" -msgstr "" +msgstr "Збережено у: @DATE@" #: prefs_manage.php:239 #, fuzzy @@ -7112,23 +7113,23 @@ msgstr "Імпорт файлів" #: prefs_manage.php:245 msgid "Import from browser's storage" -msgstr "" +msgstr "Імпортувати з браузера" #: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." -msgstr "" +msgstr "Налаштування будуть імпортовані з локальних даних браузера." #: prefs_manage.php:254 msgid "You have no saved settings!" -msgstr "" +msgstr "У вас немає збережених налаштувань!" #: prefs_manage.php:258 prefs_manage.php:312 msgid "This feature is not supported by your web browser" -msgstr "" +msgstr "Ця властивість не підтримується вашим веб-браузером" #: prefs_manage.php:263 msgid "Merge with current configuration" -msgstr "" +msgstr "Злити з поточною конфігурацією" #: prefs_manage.php:277 #, php-format @@ -7136,22 +7137,26 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" +"Ви можете встановити більше налаштувань змінюючи файл config.inc.php, " +"наприклад використовуючи %sSetup script%s." #: prefs_manage.php:302 msgid "Save to browser's storage" -msgstr "" +msgstr "Зберегти у браузері" #: prefs_manage.php:306 msgid "Settings will be saved in your browser's local storage." -msgstr "" +msgstr "Налаштування будуть збережені у вашому браузері." #: prefs_manage.php:308 msgid "Existing settings will be overwritten!" -msgstr "" +msgstr "Існуючі налаштування будуть перезаписані!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." msgstr "" +"Ви можете скинути всі ваші налаштування і відновити їх до значень по " +"замовчуванню." #: querywindow.php:93 msgid "Import files" @@ -7174,11 +7179,11 @@ msgstr "Таблиці \"%s\" не існує!" #: server_binlog.php:106 msgid "Select binary log to view" -msgstr "" +msgstr "Вибрати двійковий журнал для перегляду" #: server_binlog.php:122 server_status.php:387 msgid "Files" -msgstr "" +msgstr "Файли" #: server_binlog.php:169 server_binlog.php:171 server_processlist.php:58 #: server_processlist.php:60 @@ -7192,11 +7197,11 @@ msgstr "Показати повні запити" #: server_binlog.php:199 msgid "Log name" -msgstr "" +msgstr "Назва журналу" #: server_binlog.php:200 msgid "Position" -msgstr "" +msgstr "Позиція" #: server_binlog.php:201 msgid "Event type" @@ -7204,11 +7209,11 @@ msgstr "Тип події" #: server_binlog.php:203 msgid "Original position" -msgstr "" +msgstr "Початкова позиція" #: server_binlog.php:204 msgid "Information" -msgstr "" +msgstr "Інформація" #: server_collations.php:39 msgid "Character Sets and Collations" @@ -7230,11 +7235,11 @@ msgstr "Статистика баз даних" #: server_databases.php:183 server_replication.php:180 #: server_replication.php:208 msgid "Master replication" -msgstr "" +msgstr "Головна реплікація" #: server_databases.php:185 server_replication.php:247 msgid "Slave replication" -msgstr "" +msgstr "Похідна реплікація" #: server_databases.php:268 server_databases.php:269 msgid "Enable Statistics" @@ -7268,7 +7273,7 @@ msgstr "Дозволити змінювати структуру наявних #: server_privileges.php:34 server_privileges.php:218 #: server_privileges.php:535 msgid "Allows altering and dropping stored routines." -msgstr "" +msgstr "Дозволяє зміну та видалення збережених процедур." #: server_privileges.php:35 server_privileges.php:194 #: server_privileges.php:528 @@ -7278,7 +7283,7 @@ msgstr "Дозволити створювати нові бази даних т #: server_privileges.php:36 server_privileges.php:217 #: server_privileges.php:534 msgid "Allows creating stored routines." -msgstr "" +msgstr "Дозволяє створення збережених процедур." #: server_privileges.php:37 server_privileges.php:528 msgid "Allows creating new tables." @@ -7293,6 +7298,8 @@ msgstr "Дозволити створювати тимчасові таблиц #: server_privileges.php:568 msgid "Allows creating, dropping and renaming user accounts." msgstr "" +"Дозволяє створення, видалення та перейменування облікових записів " +"користувачів." #: server_privileges.php:40 server_privileges.php:209 #: server_privileges.php:213 server_privileges.php:540 @@ -7317,12 +7324,12 @@ msgstr "Дозволити знищувати таблиці." #: server_privileges.php:44 server_privileges.php:210 #: server_privileges.php:548 msgid "Allows to set up events for the event scheduler" -msgstr "" +msgstr "Дозволяє встановлювати події у планувальник подій" #: server_privileges.php:45 server_privileges.php:220 #: server_privileges.php:536 msgid "Allows executing stored routines." -msgstr "" +msgstr "Дозволяє виконання збережених процедур." #: server_privileges.php:46 server_privileges.php:199 #: server_privileges.php:523 @@ -7376,12 +7383,12 @@ msgstr "" #: server_privileges.php:54 server_privileges.php:634 #: server_privileges.php:636 msgid "Limits the number of simultaneous connections the user may have." -msgstr "" +msgstr "Обмежити кількість одночасних підключень, які користувач може мати." #: server_privileges.php:55 server_privileges.php:198 #: server_privileges.php:558 msgid "Allows viewing processes of all users" -msgstr "" +msgstr "Дозволяє перегляд процесів усіх користувачів" #: server_privileges.php:56 server_privileges.php:200 #: server_privileges.php:460 server_privileges.php:564 @@ -7416,7 +7423,7 @@ msgstr "Надати доступ до повного списку баз дан #: server_privileges.php:62 server_privileges.php:214 #: server_privileges.php:216 server_privileges.php:533 msgid "Allows performing SHOW CREATE VIEW queries." -msgstr "" +msgstr "Дозволяє виконувати SHOW CREATE VIEW запити." #: server_privileges.php:63 server_privileges.php:197 #: server_privileges.php:560 @@ -7437,7 +7444,7 @@ msgstr "" #: server_privileges.php:65 server_privileges.php:211 #: server_privileges.php:549 msgid "Allows creating and dropping triggers" -msgstr "" +msgstr "Дозволяє створення та видалення тригерів" #: server_privileges.php:66 server_privileges.php:192 #: server_privileges.php:457 server_privileges.php:519 @@ -7530,7 +7537,7 @@ msgstr "Усунути %s" #: server_privileges.php:1270 msgid "No users selected for deleting!" -msgstr "" +msgstr "Не вибрано користувачів для видалення!" #: server_privileges.php:1273 msgid "Reloading the privileges" @@ -9609,7 +9616,7 @@ msgstr "" #: tbl_tracking.php:588 msgid "Version" -msgstr "" +msgstr "Версія" #: tbl_tracking.php:640 #, php-format hooks/post-receive -- phpMyAdmin

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. be87aa6df079dd252a9d5d7c89494e41803eec74

by Michal Čihař

The branch, master has been updated via be87aa6df079dd252a9d5d7c89494e41803eec74 (commit) via fc253c207ef451e789dbcdf69bd1bad6546e68f3 (commit) via 938c270b58ea6e8ce2f55e947c2333a629ca3316 (commit) via 4f3dddda9cb9ffcee87a175c476d10acbc940f4b (commit) via d21435afae1b4a8bc58d03ee5177bbfc2e7c5d33 (commit) via 2126dabdaea2e818e9b5a626f1b1be099f7a07b4 (commit) via 5c2f33cdbdf783147b1104a637224cb0f2e8cc97 (commit) via ebea537b2e834fb4b73b711489467846239799dd (commit) via e80c9ea8878cb05270456ceaced15651c06348be (commit) via 29a334407cef628716816be93273954eb0196588 (commit) via 49e646d627acff311ac9c3966fb5d91612cfaf61 (commit) via 515021894cf31383af4f39715134becf309f16d6 (commit) via 455dcebc1be11958705cf5105d5f44b0c4266d1b (commit) via 7451542ab1bae37dc7238d68f87a32d9f9464230 (commit) via 5f4bc3104c043549bda6a18523a36bd77f843f01 (commit) via 0c7f57351040a1cf66000d5cd0ad4f6b0a638420 (commit) via db5e3c83b3c0f616548ffed3b591d1ec8bed9a9c (commit) via 0ab51411494940804c34c1790cf89df109f446cc (commit) via 51e778d1e0f6db9d2162d5e889e2ab6d8aebcf51 (commit) via 35682b12776db35e2c371bca508f90e4703bbc65 (commit) via a0d3b2806389438e4700651af98d1f858bf923ff (commit) via 78c07e4e88ddbbe7c7a039c0b2891b0634d947d9 (commit) via abe0c35075e670e058e562acc255fa51d4647b93 (commit) via fd248dd42348c4bf0afeb6c472004b6b1b4da88e (commit) via 213bfed522393aa885c58db5265e244ed651c864 (commit) via 8a005530f11a99acfe0a6b7bfb2d2a44ae586a46 (commit) via 222f678ebb3bd50981fb5d4aa420cef7b52ee49e (commit) from a3288386a7c62e4e761ed761851945e5fbf9b4e5 (commit) - Log ----------------------------------------------------------------- commit be87aa6df079dd252a9d5d7c89494e41803eec74 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Dec 23 10:41:22 2011 +0100 Update generated docs commit fc253c207ef451e789dbcdf69bd1bad6546e68f3 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 16:45:15 2011 +0200 Translation update done using Pootle. commit 938c270b58ea6e8ce2f55e947c2333a629ca3316 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 16:43:22 2011 +0200 Translation update done using Pootle. commit 4f3dddda9cb9ffcee87a175c476d10acbc940f4b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 14:15:22 2011 +0200 Translation update done using Pootle. commit d21435afae1b4a8bc58d03ee5177bbfc2e7c5d33 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 14:10:49 2011 +0200 Translation update done using Pootle. commit 2126dabdaea2e818e9b5a626f1b1be099f7a07b4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 14:00:51 2011 +0200 Translation update done using Pootle. commit 5c2f33cdbdf783147b1104a637224cb0f2e8cc97 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 14:00:33 2011 +0200 Translation update done using Pootle. commit ebea537b2e834fb4b73b711489467846239799dd Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 13:59:27 2011 +0200 Translation update done using Pootle. commit e80c9ea8878cb05270456ceaced15651c06348be Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 13:58:23 2011 +0200 Translation update done using Pootle. commit 29a334407cef628716816be93273954eb0196588 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 13:55:35 2011 +0200 Translation update done using Pootle. commit 49e646d627acff311ac9c3966fb5d91612cfaf61 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 13:54:16 2011 +0200 Translation update done using Pootle. commit 515021894cf31383af4f39715134becf309f16d6 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 13:52:06 2011 +0200 Translation update done using Pootle. commit 455dcebc1be11958705cf5105d5f44b0c4266d1b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 13:47:56 2011 +0200 Translation update done using Pootle. commit 7451542ab1bae37dc7238d68f87a32d9f9464230 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 13:47:28 2011 +0200 Translation update done using Pootle. commit 5f4bc3104c043549bda6a18523a36bd77f843f01 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 13:46:51 2011 +0200 Translation update done using Pootle. commit 0c7f57351040a1cf66000d5cd0ad4f6b0a638420 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 13:45:24 2011 +0200 Translation update done using Pootle. commit db5e3c83b3c0f616548ffed3b591d1ec8bed9a9c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 13:43:44 2011 +0200 Translation update done using Pootle. commit 0ab51411494940804c34c1790cf89df109f446cc Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 13:37:04 2011 +0200 Translation update done using Pootle. commit 51e778d1e0f6db9d2162d5e889e2ab6d8aebcf51 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 13:30:31 2011 +0200 Translation update done using Pootle. commit 35682b12776db35e2c371bca508f90e4703bbc65 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 22 13:29:31 2011 +0200 Translation update done using Pootle. commit a0d3b2806389438e4700651af98d1f858bf923ff Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 21 19:25:40 2011 +0200 Translation update done using Pootle. commit 78c07e4e88ddbbe7c7a039c0b2891b0634d947d9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 21 19:24:41 2011 +0200 Translation update done using Pootle. commit abe0c35075e670e058e562acc255fa51d4647b93 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 21 19:22:29 2011 +0200 Translation update done using Pootle. commit fd248dd42348c4bf0afeb6c472004b6b1b4da88e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 21 19:21:19 2011 +0200 Translation update done using Pootle. commit 213bfed522393aa885c58db5265e244ed651c864 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 21 18:01:06 2011 +0200 Translation update done using Pootle. commit 8a005530f11a99acfe0a6b7bfb2d2a44ae586a46 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 21 18:00:31 2011 +0200 Translation update done using Pootle. commit 222f678ebb3bd50981fb5d4aa420cef7b52ee49e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Dec 21 18:00:19 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/tr/Documentation.html | 103 +++++++++++++++++++++-------------------- po/tr.po | 66 +++++++++++++++++++++++---- 2 files changed, 110 insertions(+), 59 deletions(-) diff --git a/output/tr/Documentation.html b/output/tr/Documentation.html index a69c81f..52b6921 100644 --- a/output/tr/Documentation.html +++ b/output/tr/Documentation.html @@ -196,7 +196,7 @@ izin verir); tüm kullanıcılar geçerli MySQL kullanıcısı olmak zorundadır <h2 id="setup">Kurulum</h2> <ol><li><a href="#quick_install">Hızlı Kurma</a></li> - <li><a href="#setup_script">Betik kur kullanımı</a></li> + <li><a href="#setup_script">Kur betiği kullanımı</a></li> <li><a href="#linked-tables">phpMyAdmin yapılandırma depolaması</a></li> <li><a href="#upgrading">Eski sürümden yükseltme</a></li> <li><a href="#authentication_modes">Kimlik doğrulama kipleri kullanımı</a></li> @@ -3379,9 +3379,10 @@ ProxyPassReverseCookieDomain backend.example.com public.example.com ProxyPassReverseCookiePath / /mirror/foo/ </pre> -<p>Note: if the backend url looks like http://host/~user/phpmyadmin, the tilde -(~) must be url encoded as %7E in the ProxyPassReverse* lines. This is not -specific to phpmyadmin, it's just the behavior of Apache. +<p>Not: eğer arka uç url http://anamakine/~kullanici/phpmyadmin gibi +görünüyorsa, ProxyPassReverse* satırlarındaki tilda (~), %7E olarak +kodlanmış url olmak zorundadır. Bu phpmyadmin'e özgü değildir, sadece +Apache'nin davranışıdır. </p> <pre> @@ -3391,80 +3392,82 @@ http://backend.example.com/%7Euser/phpmyadmin ProxyPassReverseCookiePath /%7Euser/phpmyadmin /mirror/foo </pre> - <p>See <a + <p>Daha fazla ayrıntı için <a href="http://httpd.apache.org/docs/2.2/mod/mod_proxy.html">http://httpd.apache.org/docs/2.2/mod/mod_proxy.html</a> -for more details.</p> +adresine bakın.</p> <h4 id="faq1_41"> - <a href="#faq1_41">1.41 When I view a database and ask to see its -privileges, I get an error about an unknown column.</a></h4> + <a href="#faq1_41">1.41 Veritabanını görüntülediğimde ve yetkilerini görmek +için sorduğumda, bilinmeyen bir sütunla ilgili hata alıyorum.</a></h4> -<p> The MySQL server's privilege tables are not up to date, you need to run the -<tt>mysql_upgrade</tt> command on the server.</p> +<p> MySQL sunucusunun yetki tabloları güncel değil, sunucuda +<tt>mysql_upgrade</tt> komutunu çalıştırmanız gerekir.</p> <h3 id="faqconfig">Yapılandırma</h3> <h4 id="faq2_1"> - <a href="#faq2_1">2.1 The error message "Warning: Cannot add header -information - headers already sent by ..." is displayed, what's the -problem?</a></h4> - -<p> Edit your <i>config.inc.php</i> file and ensure there is nothing (I.E. no -blank lines, no spaces, no characters...) neither before the -<tt><?php</tt> tag at the beginning, neither after the <tt>?></tt> tag -at the end. We also got a report from a user under IIS, that used a zipped -distribution kit: the file <tt>libraries/Config.class.php</tt> contained an -end-of-line character (hex 0A) at the end; removing this character cleared -his errors.</p> + <a href="#faq2_1">2.1 "Uyarı: Başlık bilgisi eklenemiyor - +... tarafından başlıklar zaten gönderildi" hata mesajı görüntüleniyor, +sorun nedir?</a></h4> + +<p> <i>config.inc.php</i> dosyanızı düzenleyin ve <tt><?php</tt> etiketinden +önce ne başında ve <tt>?></tt> etiketinden sonra ne de sonunda hiçbir şey +(örn. boş satırlar, boşluklar, karakterler olmasın...) olmadığından emin +olun. Ayrıca IIS altında zip'li dağıtım paketi kullanan kullanıcılardan +raporlar alıyoruz: <tt>libraries/Config.class.php</tt> dosyasının sonundaki +en son satır karakter (hex 0A) içermekte, bu karakteri kaldırmak hatalarını +ortadan kaldırıyor.</p> <h4 id="faq2_2"> - <a href="#faq2_2">2.2 phpMyAdmin can't connect to MySQL. What's wrong?</a></h4> + <a href="#faq2_2">2.2 phpMyAdmin, MySQL'e bağlanamıyor. Yanlış olan +nedir?</a></h4> -<p> Either there is an error with your PHP setup or your username/password is -wrong. Try to make a small script which uses mysql_connect and see if it -works. If it doesn't, it may be you haven't even compiled MySQL support into -PHP.</p> +<p> Ya PHP ayarınızla ile ilgili bir hata vardır ya da kullanıcı +adınız/parolanız yanlıştır. mysql_connect kullanan küçük bir betik yapmayı +deneyin ve eğer çalışırsa görürsünüz. Eğer çalışmazsa, PHP içinde MySQL +desteğini bile derlememiş olabilirsiniz.</p> <h4 id="faq2_3"> - <a href="#faq2_3">2.3 The error message "Warning: MySQL Connection -Failed: Can't connect to local MySQL server through socket '/tmp/mysql.sock' -(111) ..." is displayed. What can I do?</a></h4> + <a href="#faq2_3">2.3 "Uyarı: MySQL Bağlantısı Başarısız: Yerel MySQL +sunucusuna '/tmp/mysql.sock' (111) soketi aracılığıyla +bağlanılamıyor..." hata mesajı görüntüleniyor. Ne yapabilirim?</a></h4> -<p> For RedHat users, Harald Legner suggests this on the mailing list:</p> +<p> RedHat kullanıcıları için Harald Legner posta listesinde şunu öneriyor:</p> -<p> On my RedHat-Box the socket of MySQL is <i>/var/lib/mysql/mysql.sock</i>. -In your <i>php.ini</i> you will find a line</p> +<p> RedHat-Box'ımda MySQL soketi +<i>/var/lib/mysql/mysql.sock</i>. <i>php.ini</i> dosyanızın içinde bir satır +bulacaksınız</p> <pre>mysql.default_socket = /tmp/mysql.sock</pre> -<p> change it to</p> +<p> şuna değiştirin</p> <pre>mysql.default_socket = /var/lib/mysql/mysql.sock</pre> -<p> Then restart apache and it will work.</p> +<p> Sonra apache'yi yeniden başlatın ve çalışacaktır.</p> -<p> Here is a fix suggested by Brad Ummer:</p> +<p> İşte Brad Ummer tarafından önerilen düzeltme:</p> -<ul><li>First, you need to determine what socket is being used by MySQL.<br /> - To do this, telnet to your server and go to the MySQL bin directory. In this -directory there should be a file named <i>mysqladmin</i>. Type -<tt>./mysqladmin variables</tt>, and this should give you a bunch of info -about your MySQL server, including the socket (<i>/tmp/mysql.sock</i>, for -example).</li> - <li>Then, you need to tell PHP to use this socket.<br /> To do this in phpMyAdmin, you need to complete the socket information in the -<i>config.inc.php</i>.<br /> - For example: <a href="#cfg_Servers_socket" class="configrule"> +<ul><li>Önce, MySQL tarafından kullanılan sokete karar vermeniz gerekli.<br /> + Bunu yapmak için sunucunuza telnet ile bağlanın ve MySQL bin dizinine +gidin. Bu dizinde <i>mysqladmin</i> adında bir dosya +olmalı. <tt>./mysqladmin variables</tt> yazın ve bu size MySQL sunucunuz +hakkında bir takım bilgi vermeli, soket dahil (<i>/tmp/mysql.sock</i>, +örneğin).</li> + <li>Sonra PHP'ye bu soketi kullanmasını söylemeniz gerekli.<br /> Bunu phpMyAdmin içinde yapmanız için <i>config.inc.php</i> içindeki soket +bilgisini tamamlamanız gerekli.<br /> + Örneğin: <a href="#cfg_Servers_socket" class="configrule"> $cfg['Servers'][$i]['socket'] = '/tmp/mysql.sock';</a> <br /><br /> - Please also make sure that the permissions of this file allow to be readable -by your webserver (i.e. '0755').</li> + Lütfen aynı zamanda bu dosyanın izinlerinin web sunucusu tarafından +okunabilirliğine izin verildiğine emin olun (örn. '0755').</li> </ul> -<p> Have also a look at the <a -href="http://dev.mysql.com/doc/en/can-not-connect-to-server.html"> -corresponding section of the MySQL documentation</a>.</p> +<p> Ayrıca <a +href="http://dev.mysql.com/doc/en/can-not-connect-to-server.html">MySQL +belgelemesinin ilgili bölümüne</a> bir gözatın.</p> <h4 id="faq2_4"> <a href="#faq2_4">2.4 Nothing is displayed by my browser when I try to run @@ -5037,7 +5040,7 @@ Franklin St, Fifth Floor, Boston, MA 02110-1301 USA <li>Olivier Müller <om_at_omnis.ch> <ul> - <li>SourceForge phpMyAdmin projesi Mart 2001'de başladı</li> + <li>SourceForge phpMyAdmin projesine Mart 2001'de başladı</li> <li>sync'ed different existing CVS trees with new features and bugfixes</li> <li>multi-language improvements, dynamic language selection</li> <li>many bugfixes and improvements</li> diff --git a/po/tr.po b/po/tr.po index 23ef8cb..043f42b 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-11-22 13:50+0100\n" -"PO-Revision-Date: 2011-12-20 21:20+0200\n" +"PO-Revision-Date: 2011-12-22 16:43+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -492,7 +492,7 @@ msgstr "<a href=\"#quick_install\">Hızlı Kurma</a>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:172 msgid "<a href=\"#setup_script\">Setup script usage</a>" -msgstr "<a href=\"#setup_script\">Betik kur kullanımı</a>" +msgstr "<a href=\"#setup_script\">Kur betiği kullanımı</a>" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:173 @@ -8887,6 +8887,10 @@ msgid "" "(~) must be url encoded as %7E in the ProxyPassReverse* lines. This is not " "specific to phpmyadmin, it's just the behavior of Apache." msgstr "" +"Not: eğer arka uç url http://anamakine/~kullanici/phpmyadmin gibi " +"görünüyorsa, ProxyPassReverse* satırlarındaki tilda (~), %7E olarak " +"kodlanmış url olmak zorundadır. Bu phpmyadmin'e özgü değildir, sadece " +"Apache'nin davranışıdır." #. type: Content of: <html><body><div><pre> #: orig-docs/Documentation.html:3162 @@ -8897,6 +8901,10 @@ msgid "" "http://backend.example.com/%7Euser/phpmyadmin\n" "ProxyPassReverseCookiePath /%7Euser/phpmyadmin /mirror/foo\n" msgstr "" +"ProxyPass /mirror/foo/ http://backend.example.com/~user/phpmyadmin\n" +"ProxyPassReverse /mirror/foo/\n" +"http://backend.example.com/%7Euser/phpmyadmin\n" +"ProxyPassReverseCookiePath /%7Euser/phpmyadmin /mirror/foo\n" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3168 @@ -8904,6 +8912,9 @@ msgid "" "See <a href=\"http://httpd.apache.org/docs/2.2/mod/mod_proxy.html\">http://" "httpd.apache.org/docs/2.2/mod/mod_proxy.html</a> for more details." msgstr "" +"Daha fazla ayrıntı için <a href=\"http://httpd.apache.org/docs/2.2/mod/mod_pr" +"oxy.html\">http://httpd.apache.org/docs/2.2/mod/mod_proxy.html</a> adresine " +"bakın." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3172 @@ -8911,6 +8922,8 @@ msgid "" "<a href=\"#faq1_41\">1.41 When I view a database and ask to see its " "privileges, I get an error about an unknown column.</a>" msgstr "" +"<a href=\"#faq1_41\">1.41 Veritabanını görüntülediğimde ve yetkilerini görmek " +"için sorduğumda, bilinmeyen bir sütunla ilgili hata alıyorum.</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3175 @@ -8918,6 +8931,8 @@ msgid "" "The MySQL server's privilege tables are not up to date, you need to run the " "<tt>mysql_upgrade</tt> command on the server." msgstr "" +"MySQL sunucusunun yetki tabloları güncel değil, sunucuda " +"<tt>mysql_upgrade</tt> komutunu çalıştırmanız gerekir." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3182 @@ -8926,6 +8941,9 @@ msgid "" "information - headers already sent by ..." is displayed, what's the " "problem?</a>" msgstr "" +"<a href=\"#faq2_1\">2.1 "Uyarı: Başlık bilgisi eklenemiyor - ... " +"tarafından başlıklar zaten gönderildi" hata mesajı görüntüleniyor, " +"sorun nedir?</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3185 @@ -8937,12 +8955,21 @@ msgid "" "kit: the file <tt>libraries/Config.class.php</tt> contained an end-of-line " "character (hex 0A) at the end; removing this character cleared his errors." msgstr "" +"<i>config.inc.php</i> dosyanızı düzenleyin ve <tt><?php</tt> etiketinden " +"önce ne başında ve <tt>?></tt> etiketinden sonra ne de sonunda hiçbir şey " +"(örn. boş satırlar, boşluklar, karakterler olmasın...) olmadığından emin " +"olun. Ayrıca IIS altında zip'li dağıtım paketi kullanan kullanıcılardan " +"raporlar alıyoruz: <tt>libraries/Config.class.php</tt> dosyasının sonundaki " +"en son satır karakter (hex 0A) içermekte, bu karakteri kaldırmak hatalarını " +"ortadan kaldırıyor." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3194 msgid "" "<a href=\"#faq2_2\">2.2 phpMyAdmin can't connect to MySQL. What's wrong?</a>" msgstr "" +"<a href=\"#faq2_2\">2.2 phpMyAdmin, MySQL'e bağlanamıyor. Yanlış olan " +"nedir?</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3196 @@ -8952,6 +8979,10 @@ msgid "" "works. If it doesn't, it may be you haven't even compiled MySQL support into " "PHP." msgstr "" +"Ya PHP ayarınızla ile ilgili bir hata vardır ya da kullanıcı " +"adınız/parolanız yanlıştır. mysql_connect kullanan küçük bir betik yapmayı " +"deneyin ve eğer çalışırsa görürsünüz. Eğer çalışmazsa, PHP içinde MySQL " +"desteğini bile derlememiş olabilirsiniz." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3202 @@ -8960,11 +8991,14 @@ msgid "" "Failed: Can't connect to local MySQL server through socket '/tmp/mysql." "sock' (111) ..." is displayed. What can I do?</a>" msgstr "" +"<a href=\"#faq2_3\">2.3 "Uyarı: MySQL Bağlantısı Başarısız: Yerel MySQL " +"sunucusuna '/tmp/mysql.sock' (111) soketi aracılığıyla " +"bağlanılamıyor..." hata mesajı görüntüleniyor. Ne yapabilirim?</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3206 msgid "For RedHat users, Harald Legner suggests this on the mailing list:" -msgstr "" +msgstr "RedHat kullanıcıları için Harald Legner posta listesinde şunu öneriyor:" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3208 @@ -8972,6 +9006,8 @@ msgid "" "On my RedHat-Box the socket of MySQL is <i>/var/lib/mysql/mysql.sock</i>. " "In your <i>php.ini</i> you will find a line" msgstr "" +"RedHat-Box'ımda MySQL soketi <i>/var/lib/mysql/mysql.sock</i>. " +"<i>php.ini</i> dosyanızın içinde bir satır bulacaksınız" #. type: Content of: <html><body><div><pre> #: orig-docs/Documentation.html:3211 @@ -8982,7 +9018,7 @@ msgstr "mysql.default_socket = /tmp/mysql.sock" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3213 msgid "change it to" -msgstr "" +msgstr "şuna değiştirin" #. type: Content of: <html><body><div><pre> #: orig-docs/Documentation.html:3215 @@ -8993,17 +9029,17 @@ msgstr "mysql.default_socket = /var/lib/mysql/mysql.sock" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3217 msgid "Then restart apache and it will work." -msgstr "" +msgstr "Sonra apache'yi yeniden başlatın ve çalışacaktır." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3219 msgid "Here is a fix suggested by Brad Ummer:" -msgstr "" +msgstr "İşte Brad Ummer tarafından önerilen düzeltme:" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3221 msgid "First, you need to determine what socket is being used by MySQL." -msgstr "" +msgstr "Önce, MySQL tarafından kullanılan sokete karar vermeniz gerekli." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3222 @@ -9014,11 +9050,15 @@ msgid "" "your MySQL server, including the socket (<i>/tmp/mysql.sock</i>, for " "example)." msgstr "" +"Bunu yapmak için sunucunuza telnet ile bağlanın ve MySQL bin dizinine gidin. " +"Bu dizinde <i>mysqladmin</i> adında bir dosya olmalı. <tt>./mysqladmin " +"variables</tt> yazın ve bu size MySQL sunucunuz hakkında bir takım bilgi " +"vermeli, soket dahil (<i>/tmp/mysql.sock</i>, örneğin)." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3227 msgid "Then, you need to tell PHP to use this socket." -msgstr "" +msgstr "Sonra PHP'ye bu soketi kullanmasını söylemeniz gerekli." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3227 @@ -9026,6 +9066,8 @@ msgid "" "To do this in phpMyAdmin, you need to complete the socket information in the " "<i>config.inc.php</i>." msgstr "" +"Bunu phpMyAdmin içinde yapmanız için <i>config.inc.php</i> içindeki soket " +"bilgisini tamamlamanız gerekli." #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3230 @@ -9033,6 +9075,8 @@ msgid "" "For example: <a href=\"#cfg_Servers_socket\" class=\"configrule\"> $cfg" "['Servers'][$i]['socket'] = '/tmp/mysql.sock';</a>" msgstr "" +"Örneğin: <a href=\"#cfg_Servers_socket\" class=\"configrule\"> " +"$cfg['Servers'][$i]['socket'] = '/tmp/mysql.sock';</a>" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3235 @@ -9040,6 +9084,8 @@ msgid "" "Please also make sure that the permissions of this file allow to be readable " "by your webserver (i.e. '0755')." msgstr "" +"Lütfen aynı zamanda bu dosyanın izinlerinin web sunucusu tarafından " +"okunabilirliğine izin verildiğine emin olun (örn. '0755')." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3239 @@ -9048,6 +9094,8 @@ msgid "" "connect-to-server.html\"> corresponding section of the MySQL documentation</" "a>." msgstr "" +"Ayrıca <a href=\"http://dev.mysql.com/doc/en/can-not-connect-to-" +"server.html\">MySQL belgelemesinin ilgili bölümüne</a> bir gözatın." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3244 @@ -11992,7 +12040,7 @@ msgstr "Olivier Müller <om_at_omnis.ch>" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4750 msgid "started SourceForge phpMyAdmin project in March 2001" -msgstr "SourceForge phpMyAdmin projesi Mart 2001'de başladı" +msgstr "SourceForge phpMyAdmin projesine Mart 2001'de başladı" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4751 hooks/post-receive -- phpMyAdmin localized documentation

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9-25422-g5855f61

by Michal Čihař

The branch, master has been updated via 5855f612ff98c5d7d3f3fe2396cb6e54da671165 (commit) via 2b5056326227cf5e63d2f74cced9fd45929bfdfe (commit) via bc8735efa325d2f24510dbbda57dbb7398e25fd0 (commit) via 2506fbfac68115e54632bc065a292d59b922fe59 (commit) from 1615a25610e20f1ca2073226220c6ebdb2adfdf0 (commit) - Log ----------------------------------------------------------------- commit 5855f612ff98c5d7d3f3fe2396cb6e54da671165 Merge: 1615a25 2b50563 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Dec 23 10:38:59 2011 +0100 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_9-12-g2b50563

by Michal Čihař

The branch, QA_3_4 has been updated via 2b5056326227cf5e63d2f74cced9fd45929bfdfe (commit) via 2506fbfac68115e54632bc065a292d59b922fe59 (commit) from bc8735efa325d2f24510dbbda57dbb7398e25fd0 (commit) - Log ----------------------------------------------------------------- commit 2b5056326227cf5e63d2f74cced9fd45929bfdfe Merge: bc8735e 2506fbf Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Dec 23 10:25:04 2011 +0100 Merge remote-tracking branch 'origin/MAINT_3_4_9' into QA_3_4 ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-25419-g1615a25

by Michal Čihař

The branch, master has been updated via 1615a25610e20f1ca2073226220c6ebdb2adfdf0 (commit) via 561d0999c6886e91ef917aa715579200d61acc63 (commit) via 27f2166fe1cdb49893cd0a823ac6b1cb9c24b1d4 (commit) via ba3eacc1d0fad41837ffc7a9a480e2d51163884f (commit) via bef2e3daebfdfb3090a9bb5599f4eb07e8ca39cb (commit) via ae9d23c071cf9aca21cf2f757d1dec7e3f3096bf (commit) via 1f5e99678260f6c9e87a14e29fe3d635bf8535ff (commit) via 7b01ff7e2fa5b919e62b620a7d8681ef482d43f8 (commit) via cbde33064b1b914add0048b4e7348040746dfb00 (commit) via 1de1aa6f2bc81969a44c24219d6b9f7a02ddee38 (commit) via c1e497d2cdadaaba2b46225756e642824b457042 (commit) via 19990db10b123ecfd56f5a0db8ae35c4aed6cb73 (commit) via f3d736d7c3322296b48f17ad0167c0e07809ea0c (commit) via 9bf91ab7d86b16b1e173575d36afa5eeb653d10f (commit) via 3c7169bd2b26ee53f394f04fc6b1deb2ec31665b (commit) via 968062c976412f63dce7c5e75ac82e2dd7b2be4d (commit) via 40b5198504f25fed2a68cd02b025fc4cec7e7a80 (commit) via 5bf709dadfc6d2e34ef152c31680105909f164d7 (commit) via 385faafddb7b58847e2428ad632f9c381b9dfef8 (commit) via 0cd58600d82765bfc7bbbde4f183abf309773c76 (commit) via 2470c3614912890791b69b162afda96e41497b9d (commit) via 9e0ef1d371228ab6a6f5c1d2f06025fd9b1d41c9 (commit) via 27d1a8bb2049bad50f083f0a9e698673a87d766a (commit) via 9a984c11a6d5f61b703e3d0e5b244cb12e8e3b35 (commit) via a3a5b34b7305629c4162ffe41a5aedb84da27551 (commit) via 15189690ecbc91303ecd36c87e6b0b73a5f2a6b8 (commit) from 34e1b1c3da1492e0c595cbff7dfc2885372fa7ea (commit) - Log ----------------------------------------------------------------- commit 1615a25610e20f1ca2073226220c6ebdb2adfdf0 Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:22:32 2011 +0200 Translation update done using Pootle. commit 561d0999c6886e91ef917aa715579200d61acc63 Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:19:07 2011 +0200 Translation update done using Pootle. commit 27f2166fe1cdb49893cd0a823ac6b1cb9c24b1d4 Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:15:31 2011 +0200 Translation update done using Pootle. commit ba3eacc1d0fad41837ffc7a9a480e2d51163884f Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:14:55 2011 +0200 Translation update done using Pootle. commit bef2e3daebfdfb3090a9bb5599f4eb07e8ca39cb Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:14:10 2011 +0200 Translation update done using Pootle. commit ae9d23c071cf9aca21cf2f757d1dec7e3f3096bf Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:13:52 2011 +0200 Translation update done using Pootle. commit 1f5e99678260f6c9e87a14e29fe3d635bf8535ff Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:13:40 2011 +0200 Translation update done using Pootle. commit 7b01ff7e2fa5b919e62b620a7d8681ef482d43f8 Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:13:08 2011 +0200 Translation update done using Pootle. commit cbde33064b1b914add0048b4e7348040746dfb00 Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:12:45 2011 +0200 Translation update done using Pootle. commit 1de1aa6f2bc81969a44c24219d6b9f7a02ddee38 Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:11:06 2011 +0200 Translation update done using Pootle. commit c1e497d2cdadaaba2b46225756e642824b457042 Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:10:48 2011 +0200 Translation update done using Pootle. commit 19990db10b123ecfd56f5a0db8ae35c4aed6cb73 Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:10:35 2011 +0200 Translation update done using Pootle. commit f3d736d7c3322296b48f17ad0167c0e07809ea0c Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:10:07 2011 +0200 Translation update done using Pootle. commit 9bf91ab7d86b16b1e173575d36afa5eeb653d10f Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:09:43 2011 +0200 Translation update done using Pootle. commit 3c7169bd2b26ee53f394f04fc6b1deb2ec31665b Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:08:27 2011 +0200 Translation update done using Pootle. commit 968062c976412f63dce7c5e75ac82e2dd7b2be4d Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:06:25 2011 +0200 Translation update done using Pootle. commit 40b5198504f25fed2a68cd02b025fc4cec7e7a80 Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:04:42 2011 +0200 Translation update done using Pootle. commit 5bf709dadfc6d2e34ef152c31680105909f164d7 Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:03:51 2011 +0200 Translation update done using Pootle. commit 385faafddb7b58847e2428ad632f9c381b9dfef8 Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:02:25 2011 +0200 Translation update done using Pootle. commit 0cd58600d82765bfc7bbbde4f183abf309773c76 Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 05:00:35 2011 +0200 Translation update done using Pootle. commit 2470c3614912890791b69b162afda96e41497b9d Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 04:52:31 2011 +0200 Translation update done using Pootle. commit 9e0ef1d371228ab6a6f5c1d2f06025fd9b1d41c9 Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 04:02:42 2011 +0200 Translation update done using Pootle. commit 27d1a8bb2049bad50f083f0a9e698673a87d766a Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 04:01:59 2011 +0200 Translation update done using Pootle. commit 9a984c11a6d5f61b703e3d0e5b244cb12e8e3b35 Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 03:58:58 2011 +0200 Translation update done using Pootle. commit a3a5b34b7305629c4162ffe41a5aedb84da27551 Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 03:48:30 2011 +0200 Translation update done using Pootle. commit 15189690ecbc91303ecd36c87e6b0b73a5f2a6b8 Author: jaideejung007 <jaideejung007(a)gmail.com> Date: Fri Dec 23 03:47:24 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/th.po | 85 ++++++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 61 insertions(+), 24 deletions(-) diff --git a/po/th.po b/po/th.po index 30f80d2..1a2428d 100644 --- a/po/th.po +++ b/po/th.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-19 14:44+0100\n" -"PO-Revision-Date: 2011-11-17 07:53+0200\n" +"PO-Revision-Date: 2011-12-23 05:19+0200\n" "Last-Translator: jaideejung007 <jaideejung007(a)gmail.com>\n" "Language-Team: thai <th(a)li.org>\n" "Language: th\n" @@ -8386,7 +8386,7 @@ msgstr "" #: libraries/transformations/image_jpeg__link.inc.php:10 msgid "Displays a link to download this image." -msgstr "แสดงลิงก์ไปยังรูป (ดาวน์โหลดข้อมูลไบนารีโดยตรง/blob)." +msgstr "แสดงการเชื่อมโยงเพื่อดาวน์โหลดรูปภาพนี้" #: libraries/transformations/text_plain__dateformat.inc.php:10 msgid "" @@ -8496,34 +8496,31 @@ msgid "Error in ZIP archive:" msgstr "" #: main.php:65 -#, fuzzy #| msgid "General relation features" msgid "General Settings" -msgstr "ความสามารถด้านรีเลชันทั่วไป" +msgstr "ตั้งค่าทั่วไป" #: main.php:109 msgid "Server connection collation" -msgstr "" +msgstr "เปรียบเทียบการเชื่อมต่อเซิร์ฟเวอร์" #: main.php:124 msgid "Appearance Settings" -msgstr "" +msgstr "ตั้งค่าลักษณะที่ปรากฏ" #: main.php:153 prefs_manage.php:272 -#, fuzzy #| msgid "General relation features" msgid "More settings" -msgstr "ความสามารถด้านรีเลชันทั่วไป" +msgstr "ตั้งค่าเพิ่มเติม" #: main.php:169 -#, fuzzy #| msgid "Databases" msgid "Database server" -msgstr "ฐานข้อมูล" +msgstr "เซิร์ฟเวอร์ฐานข้อมูล" #: main.php:172 msgid "Software" -msgstr "" +msgstr "ซอฟต์แวร์" #: main.php:173 #, fuzzy @@ -8533,7 +8530,7 @@ msgstr "รุ่นของเซิร์ฟเวอร์" #: main.php:175 msgid "Protocol version" -msgstr "" +msgstr "รุ่นของโพรโทคอล" #: main.php:179 server_privileges.php:1545 server_privileges.php:1700 #: server_privileges.php:1824 server_privileges.php:2254 @@ -8542,24 +8539,21 @@ msgid "User" msgstr "ผู้ใช้" #: main.php:184 -#, fuzzy msgid "Server charset" -msgstr "ตัวเลือกเซิร์ฟเวอร์" +msgstr "ชุดอักขระเซิร์ฟเวอร์" #: main.php:196 msgid "Web server" -msgstr "" +msgstr "เว็บเซิร์ฟเวอร์" #: main.php:209 -#, fuzzy #| msgid "Database comment: " msgid "Database client version" -msgstr "หมายเหตุของฐานข้อมูล: " +msgstr "รุ่นไคลเอนต์ฐานข้อมูล" #: main.php:213 -#, fuzzy msgid "PHP extension" -msgstr "รุ่นของ PHP" +msgstr "ส่วนขยาย PHP" #: main.php:221 msgid "Show PHP information" @@ -8583,7 +8577,7 @@ msgstr "" #, fuzzy #| msgid "No change" msgid "List of changes" -msgstr "ไม่มีการเปลี่ยนแปลง" +msgstr "รายการเปลี่ยนแปลง" #: main.php:269 msgid "" @@ -8602,6 +8596,8 @@ msgid "" "option is incompatible with phpMyAdmin and might cause some data to be " "corrupted!" msgstr "" +"คุณได้เปิดใช้งาน mbstring.func_overload ในการกำหนดค่าของ PHP " +"ตัวเลือกนี้ไม่เข้ากันกับ phpMyAdmin และอาจทำให้ข้อมูลบางอย่างจะเสียหายได้" #: main.php:285 msgid "" @@ -8609,6 +8605,9 @@ msgid "" "multibyte charset. Without the mbstring extension phpMyAdmin is unable to " "split strings correctly and it may result in unexpected results." msgstr "" +"ไม่พบส่วนขยาย mbstring ของ PHP " +"และดูเหมือนคุณต้องใช้ชุดอักขระโดยไม่มีส่วนขยาย mbstring ของ phpMyAdmin " +"ซึ่งไม่สามารถแยกอักขระได้อย่างถูกต้อง และอาจทำให้ผลลัพธ์ที่ไม่คาดคิดได้" #: main.php:293 msgid "" @@ -12885,13 +12884,15 @@ msgstr "" #: po/advisory_rules.php:255 msgid "InnoDB log size" -msgstr "" +msgstr "ขนาดไฟล์บันทึกของ InnoDB" #: po/advisory_rules.php:256 msgid "" "The InnoDB log file size is not an appropriate size, in relation to the " "InnoDB buffer pool." msgstr "" +"ขนาดไฟล์บันทึกของ InnoDB ไม่ได้เป็นขนาดที่เหมาะสม " +"ที่มีความสัมพันธ์กับขนาดบัฟเฟอร์ของ InnoDB" #: po/advisory_rules.php:257 #, php-format @@ -12906,6 +12907,16 @@ msgid "" "fine. See also <a href=\"http://mysqldatabaseadministration.blogspot." "com/2007/01/increase-innodblogfilesize-proper-way.html\">this blog entry</a>" msgstr "" +"โดยเฉพาะอย่างยิ่ง ในระบบที่มีจำนวนมากได้เขียนไปยังตารางของ InnoDB " +"คุณควรตั้งค่า innodb_log_file_size เป็น 25%% ของ{innodb_buffer_pool_size} " +"อย่างไรก็ตามค่าเหล่านี้จะได้รับการกู้คืนเมื่อระบบฐานข้อมูลมีปัญหา " +"โดยไม่ควรตั้งค่าสูงกว่า 256 เมกะไบต์ " +"และอย่างไรก็ดีโปรดทราบไว้ว่าคุณไม่เพียงแค่เปลี่ยนแปลงค่าเหล่านี้ได้ " +"แต่คุณจำเป็นต้องปิดระบบเซิร์ฟเวอร์แล้วทำการเอาไฟล์บันทึกของInnoDB ออก " +"และตั้งค่าใหม่ในไฟล์ my.cnf แล้วเริ่มต้นเซิร์ฟเวอร์อีกครั้ง " +"เพื่อตรวจสอบไฟล์บันทึกข้อผิดพลาด หากทุกอย่างดำเนินการไปได้ด้วยดี ดู <a " +"href=\"http://mysqldatabaseadministration.blogspot.com/2007/01/increase-" +"innodblogfilesize-proper-way.html\">รายการบล็อก</a> นี้ได้" #: po/advisory_rules.php:258 #, php-format @@ -12913,10 +12924,12 @@ msgid "" "Your InnoDB log size is at %s%% in relation to the InnoDB buffer pool size, " "it should not be below 20%%" msgstr "" +"ขนาดบันทึกของ InnoDB เป็น %s%% ในความสัมพันธ์กับขนาดของบัฟเฟอร์ของ InnoDB " +"ซึ่งไม่ควรจะต่ำกว่า 20%%" #: po/advisory_rules.php:260 msgid "Max InnoDB log size" -msgstr "" +msgstr "ขนาดข้อมูลบันทึกสูงสุดของ InnoDB" #: po/advisory_rules.php:261 msgid "The InnoDB log file size is inadequately large." @@ -12949,6 +12962,9 @@ msgstr "ขนาดบัฟเฟอร์ของ InnoDB" msgid "Your InnoDB buffer pool is fairly small." msgstr "ขนาดบัฟเฟอร์ InnoDB ของคุณมีขนาดเล็ก" +# buffer pool แปลเป็น บัฟเฟอร์ +# non-InnoDB-Tables ใช้คำทับศัพท์ +# #: po/advisory_rules.php:267 #, php-format msgid "" @@ -12963,6 +12979,17 @@ msgid "" "\"http://www.mysqlperformanceblog.com/2007/11/03/choosing-" "innodb_buffer_pool_size/\">this article</a>" msgstr "" +"บัฟเฟอร์ของ InnoDB มีผลกระทบอย่างยิ่งในการปฏิบัติงานสำหรับตารางของ InnoDB " +"กำหนดการจำส่วนที่เหลือทั้งหมดของคุณกับบัฟเฟอร์นี้ " +"สำหรับเซิร์ฟเวอร์ฐานข้อมูลที่ใช้ InnoDB แต่เพียงผู้เดียวเป็นการเก็บโปรแกรม " +"และมีไม่มีบริการอื่น ๆ (เช่นเว็บเซิร์ฟเวอร์) ทำงานอยู่ " +"คุณอาจตั้งค่านี้ได้สูงถึง 80%% ของหน่วยความจำของคุณพร้อมใช้งานได้ " +"ถ้าไม่ใช่กรณี คุณจำเป็นต้องประเมินปริมาณการใช้หน่วยความจำของบริการและ non-" +"InnoDB-Tables อื่นๆ ของคุณอย่างระมัดระวัง และตั้งค่าตัวแปรนี้ตามลำดับ " +"หากตั้งสูงเกินไป ระบบของคุณจะเริ่มต้นการเปลี่ยน " +"ซึ่งลดประสิทธิภาพการทำงานอย่างมาก ดูเพิ่มเติม<a " +"href=\"http://www.mysqlperformanceblog.com/2007/11/03/choosing-" +"innodb_buffer_pool_size/\">บทความนี้</a>" #: po/advisory_rules.php:268 #, php-format @@ -12972,21 +12999,31 @@ msgid "" "perfectly adequate for your system if you don't have much InnoDB tables or " "other services running on the same machine." msgstr "" +"คุณกำลังใช้ %s%% ของหน่วยความจำของคุณสำหรับการบัฟเฟอร์ InnoDB " +"ถ้าคุณกำลังกำหนดน้อยกว่า 60%% อย่างไรก็ตาม " +"ที่นี้อาจไม่สมบูรณ์เพียงพอสำหรับระบบของคุณ ถ้าคุณไม่มีตาราง InnoDB " +"มากหรือบริการอื่นๆ ที่ทำงานบนเครื่องเดียวกัน" #: po/advisory_rules.php:270 msgid "MyISAM concurrent inserts" -msgstr "" +msgstr "MyISAM พร้อมแทรก" #: po/advisory_rules.php:271 +#, fuzzy msgid "Enable concurrent_insert by setting it to 1" -msgstr "เปิดใช้งาน concurrent_insert โดยการตั้งค่าไว้ที่ 1" +msgstr "เปิดใช้งานการ concurrent_insert โดยการตั้งค่าเป็น 1" #: po/advisory_rules.php:272 +#, fuzzy msgid "" "Setting {concurrent_insert} to 1 reduces contention between readers and " "writers for a given table. See also <a href=\"http://dev.mysql.com/doc/" "refman/5.5/en/concurrent-inserts.html\">MySQL Documentation</a>" msgstr "" +"การตั้งค่า {concurrent_insert} เป็น 1 " +"เพื่อลดการใช้งานระหว่างผู้อ่านและผู้เขียนสำหรับตารางที่กำหนด ดูเพิ่มเติม<a " +"href=\"http://dev.mysql.com/doc/refman/5.5/en/concurrent-inserts.html\">เอกสาร " +"MySQL</a>" #: po/advisory_rules.php:273 msgid "concurrent_insert is set to 0" hooks/post-receive -- phpMyAdmin

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 5b7fa0538813d55eb5ff980a6461e1ef23f0c52d

by Marc Delisle

The branch, master has been updated via 5b7fa0538813d55eb5ff980a6461e1ef23f0c52d (commit) via 016be749df737089e59e3c8152d491d50e34c559 (commit) via 0d8171b33aefc983404036b39dbea74919325ddd (commit) from 0f8b2603b5a9b1d6765804deee11d056e549404b (commit) - Log ----------------------------------------------------------------- commit 5b7fa0538813d55eb5ff980a6461e1ef23f0c52d Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 21 15:38:00 2011 -0500 Announcement date commit 016be749df737089e59e3c8152d491d50e34c559 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 19 12:42:44 2011 -0500 PMASA-2011-19 commit 0d8171b33aefc983404036b39dbea74919325ddd Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Mon Dec 19 16:59:42 2011 +0100 PMASA-2011-20 ----------------------------------------------------------------------- Summary of changes: .../security/{PMASA-2011-16 => PMASA-2011-19} | 13 ++--- templates/security/PMASA-2011-20 | 50 ++++++++++++++++++++ 2 files changed, 56 insertions(+), 7 deletions(-) copy templates/security/{PMASA-2011-16 => PMASA-2011-19} (76%) create mode 100644 templates/security/PMASA-2011-20 diff --git a/templates/security/PMASA-2011-16 b/templates/security/PMASA-2011-19 similarity index 76% copy from templates/security/PMASA-2011-16 copy to templates/security/PMASA-2011-19 index ae8b644..c474d90 100644 --- a/templates/security/PMASA-2011-16 +++ b/templates/security/PMASA-2011-19 @@ -1,11 +1,11 @@ <html xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude" py:strip=""> <py:def function="announcement_id"> -PMASA-2011-16 +PMASA-2011-19 </py:def> <py:def function="announcement_date"> -2011-10-17 +2011-12-21 </py:def> <py:def function="announcement_summary"> @@ -33,20 +33,19 @@ Versions 3.4.x are affected. </py:def> <py:def function="announcement_solution"> -Upgrade to phpMyAdmin 3.4.6 or newer or apply the related patch listed below. +Upgrade to phpMyAdmin 3.4.9 or newer or apply the related patch listed below. </py:def> <py:def function="announcement_references"> -Thanks to Jakub Gałczyk (<a href="http://hauntit.blogspot.com">http://hauntit.blogspot.com</a>) for reporting this issue. +Thanks to Jason Leyrer of Trustwave SpiderLabs for finding this issue and to Robert Foggia (same company) for contacting us. </py:def> -<py:def function="announcement_cve">CVE-2011-4064</py:def> +<py:def function="announcement_cve">CVE-2011-4782</py:def> <py:def function="announcement_cwe">661 79</py:def> <py:def function="announcement_commits"> -ca597dc423f3eebcca95ff33b088a03e39109115 -1af420e22367ae72ff4091adb1620e59ddad5ba6 +0e707906e69ce90c4852a0fce2a0fac7db86a3cd </py:def> <xi:include href="_page.tpl" /> diff --git a/templates/security/PMASA-2011-20 b/templates/security/PMASA-2011-20 new file mode 100644 index 0000000..2f51623 --- /dev/null +++ b/templates/security/PMASA-2011-20 @@ -0,0 +1,50 @@ +<html xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude" py:strip=""> + +<py:def function="announcement_id"> +PMASA-2011-20 +</py:def> + +<py:def function="announcement_date"> +2011-12-21 +</py:def> + +<py:def function="announcement_summary"> +XSS in export. +</py:def> + +<py:def function="announcement_description"> +Using crafted url parameters, it was possible to produce XSS on the export panels in the server, database and table sections. +</py:def> + +<py:def function="announcement_mitigation"> +These attacks are unlikely to succeed on a victim. Moreover, all these attacks require that the user be already logged in and that a valid token be part of the request. +</py:def> + +<py:def function="announcement_severity"> +We consider these vulnerabilities to be non critical. +</py:def> + +<py:def function="announcement_affected"> +Versions 3.4.x are affected. +</py:def> + +<py:def function="announcement_solution"> +Upgrade to phpMyAdmin 3.4.9 or newer or apply the related patches listed below. +</py:def> + +<py:def function="announcement_references"> +Thanks to <a href="https://twitter.com/totally_unknown">Nils Juenemann</a> for reporting a vulnerable url parameter. +</py:def> + +<py:def function="announcement_cve">CVE-2011-4780</py:def> + +<py:def function="announcement_cwe">661 79</py:def> + +<py:def function="announcement_commits"> +bd3735ba584e7a49aee78813845245354b061f61 +</py:def> + +<xi:include href="_page.tpl" /> +</html> + + hooks/post-receive -- phpMyAdmin website

12 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_4_9-53-g91f03f1

by Marc Delisle

The branch, TESTING has been updated via 91f03f1ceca67bec7b7a4b2cca9ab699b71c59cb (commit) via 2506fbfac68115e54632bc065a292d59b922fe59 (commit) from 0117e0adf423f9f28d5f21ff79e442bc39dad68f (commit) - Log ----------------------------------------------------------------- commit 91f03f1ceca67bec7b7a4b2cca9ab699b71c59cb Merge: 0117e0a 2506fbf Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 21 15:08:24 2011 -0500 Merge branch 'MAINT_3_4_9' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb729a0..219fb8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -3.4.9.0 (not yet released) +3.4.9.0 (2011-12-21) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown - bug #3442004 [interface] DB suggestion not correct for user with underscore - bug #3438420 [core] Magic quotes removed in PHP 5.4 diff --git a/Documentation.html b/Documentation.html index 60c1ca1..87cf85c 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.9-rc1 - Documentation</title> + <title>phpMyAdmin 3.4.9 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.9-rc1 + 3.4.9 Documentation </h1> </div> diff --git a/README b/README index 9eae673..5cb1a6a 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.9-rc1 +Version 3.4.9 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index e5e171a..7749020 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.9-rc1'); + $this->set('PMA_VERSION', '3.4.9'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

12 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git December 2011