Git December 2011

git@phpmyadmin.net

5 participants
151 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_8-22-gc93200a

by Michal Čihař

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

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24807-gb093fe9

by Michal Čihař

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

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24788-gcdffe9f

by Michal Čihař

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

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_8-21-g458e015

by Michal Čihař

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

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_8-20-gda62d86

by Michal Čihař

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

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_8-17-g396e571

by Michal Čihař

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

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24780-gde11d39

by Michal Čihař

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 is configured as " "master" msgstr "" -"MySQL サーバが再起動したら、「実行する」ボタンをクリックしてください。その" -"後、このサーバがマスタとして設定されていることを知らせるメッセージが表" -"示されます。" +"MySQL サーバが再起動したら、「実行」ボタンをクリックしてください。その後、このサーバがマスタとして設定されていることを知らせるメッセ" +"ージが表示されます。" #: 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

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24764-g1b24a0e

by Michal Čihař

The branch, master has been updated via 1b24a0e6e01ff0da2de162241bc18fe93bdcc3b2 (commit) via dc2bc389b71f113704b6822bf1dd767059ebe83b (commit) via 834a3ab72d6532c387153a0c8da3a390d75181c1 (commit) via 950114bbc22e3e855db21b34f1ee62536298fc6c (commit) via c875eaa678992229aec6f926fad76d6f1a62a17d (commit) via 0a4604dadccd69a7c8ea4ed43a22ca57e4dfe7f8 (commit) via b7170b49daddae7d131594ec7583c9904fe9f7a1 (commit) via b59cdb079774c810947e7205ee729357bcf6cb53 (commit) via 43f3aaf30cd602ea80d7f262dd5b32670722668e (commit) via 4184c61ea81474e8888473882a57de8dadc9bf69 (commit) via 5ec075e380b7eeed0ddd0bbd4406f220d0244607 (commit) from dc0d60e2fee6dfb33692c003bb01754272d095cf (commit) - Log ----------------------------------------------------------------- commit 1b24a0e6e01ff0da2de162241bc18fe93bdcc3b2 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:29:31 2011 +0200 Translation update done using Pootle. commit dc2bc389b71f113704b6822bf1dd767059ebe83b Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:28:48 2011 +0200 Translation update done using Pootle. commit 834a3ab72d6532c387153a0c8da3a390d75181c1 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:24:11 2011 +0200 Translation update done using Pootle. commit 950114bbc22e3e855db21b34f1ee62536298fc6c Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:23:06 2011 +0200 Translation update done using Pootle. commit c875eaa678992229aec6f926fad76d6f1a62a17d Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:22:13 2011 +0200 Translation update done using Pootle. commit 0a4604dadccd69a7c8ea4ed43a22ca57e4dfe7f8 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:21:58 2011 +0200 Translation update done using Pootle. commit b7170b49daddae7d131594ec7583c9904fe9f7a1 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:21:31 2011 +0200 Translation update done using Pootle. commit b59cdb079774c810947e7205ee729357bcf6cb53 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:19:51 2011 +0200 Translation update done using Pootle. commit 43f3aaf30cd602ea80d7f262dd5b32670722668e Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:19:27 2011 +0200 Translation update done using Pootle. commit 4184c61ea81474e8888473882a57de8dadc9bf69 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:19:10 2011 +0200 Translation update done using Pootle. commit 5ec075e380b7eeed0ddd0bbd4406f220d0244607 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:17:51 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/uk.po | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/po/uk.po b/po/uk.po index 8cceb78..83650ae 100644 --- a/po/uk.po +++ b/po/uk.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 23:09+0200\n" +"PO-Revision-Date: 2011-12-12 23:28+0200\n" "Last-Translator: typim <duke3d(a)ukr.net>\n" "Language-Team: ukrainian <uk(a)li.org>\n" "Language: uk\n" @@ -3988,22 +3988,27 @@ 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:224 msgid "Startup" -msgstr "" +msgstr "Початок" #: libraries/config/messages.inc.php:225 msgid "Customize startup page" -msgstr "" +msgstr "Налаштувати початкову сторінку" #: libraries/config/messages.inc.php:226 msgid "Tabs" -msgstr "" +msgstr "Вкладки" #: libraries/config/messages.inc.php:227 msgid "Choose how you want tabs to work" -msgstr "" +msgstr "Виберіть як би ви хотіли щоб вкладки працювали" #: libraries/config/messages.inc.php:228 msgid "Text fields" @@ -4015,21 +4020,23 @@ msgstr "Налаштувати текстові поля вводу" #: libraries/config/messages.inc.php:230 libraries/export/texytext.php:18 msgid "Texy! text" -msgstr "" +msgstr "Texy! текст" #: libraries/config/messages.inc.php:232 msgid "Warnings" -msgstr "" +msgstr "Попередження" #: libraries/config/messages.inc.php:233 msgid "Disable some of the warnings shown by phpMyAdmin" -msgstr "" +msgstr "Відключити деякі попередження що показуються у phpMyAdmin" #: libraries/config/messages.inc.php:234 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:235 msgid "GZip" @@ -4044,10 +4051,12 @@ msgid "" "If enabled, phpMyAdmin continues computing multiple-statement queries even " "if one of the queries failed" msgstr "" +"Якщо включено, PhpMyAdmin продовжує обчислення декількох запитів навіть якщо " +"один із запитів не вдалий" #: libraries/config/messages.inc.php:238 msgid "Ignore multiple statement errors" -msgstr "" +msgstr "Ігнорувати помилки декількох виразів" #: libraries/config/messages.inc.php:239 msgid "" hooks/post-receive -- phpMyAdmin

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24753-gdc0d60e

by Michal Čihař

The branch, master has been updated via dc0d60e2fee6dfb33692c003bb01754272d095cf (commit) via 3503ab04d7adc1ec238fbd0c9f7d06a97174ce96 (commit) via dd48431a8f98652c9b2aa793de6bd004b7ea63cf (commit) via f224cc5bb22d5250039826f781f970b755b1e39f (commit) via 7581b6c4cd2f297c92376c3c21ebe1a04c2c175a (commit) via f31a97d2482f34047102eb8ea3a6daf718bd4ff9 (commit) via f455062e44e06a63c90810c46a92316c07de624e (commit) via 4f4ce01f6e113547fd9358722a56ec371e5a4d28 (commit) via c0f310c0457e99953b3c6c9793cd9c16da885f83 (commit) via 2bfd38f040bba34654efe80fcbe8455466751a8c (commit) via 1e7a4bdda1fe38ac0ace095d1284e742f679096e (commit) via df5656e497ad28aa0fb8cba0cbfd15fac77f72f5 (commit) via 961b0c8984d00320e3ba05c48e384dbb6f1fccf2 (commit) via d2b9ce34274f59652d81c9dc3a483de6a8bab2b0 (commit) via eddaae7428b098d440a557c464fd58485190046f (commit) via e05e6cfb05e4a629679dd4ee384a13666839d07c (commit) via 2cab153738273fd2aa9bc41a14ea7ec7c5e671af (commit) via 514255ba3aa08f0b0bbf87cc93eb612b0ab1b23b (commit) via d53a4aeee4196c576fdec6dfe8652ef7daf98325 (commit) via 4627d66484acc988a7c308057270521d0eaa061f (commit) via beb17e71ee3ef432d333639c2c9f9e47d3dbf327 (commit) via aca8b981b27ed29bd391ee788e89b87c5006a1c8 (commit) via 69e1c124a63c2c4b7198dc0486f6f84032a6af73 (commit) via f3bffe02549746654ea50b361d6b53dcc29689cd (commit) via db50a3883eafb4f1875d08e348ebe243b0b159d3 (commit) via 40ed7866d74e7d9c9f96eb53df246ee545508bb0 (commit) via 53e26f80b2dfd41a301c16b14227d6c148e6572e (commit) via 64141bf9a20bb51f60991933e97a7f2cec40bda2 (commit) via 6ad757b31f356e8b56dd7aa1dce788f783a3326e (commit) via 4b4c9e9b11bc26589e179b0e0814c7a214a96ee6 (commit) via a34b21380c2c271f5ac5348d6776ab04d6916fc2 (commit) via 148d0d6dea4d418cd2e4e857f30d2eec5aa4f2ae (commit) via c0cf93e49d2ced20932bb03c49d8c02ef6c83376 (commit) via 40bbafe01a70ab7862c18bcc918af5fe53444af3 (commit) via 8595b3b859a2ffc6ae90ddcd0105299b2b1b9798 (commit) via 03abc3cd910515e9a837e5b40708791144b3df71 (commit) via 2729e1020760dff7730e22997e31f37cabbbbb15 (commit) via d0756966fcd173ae08ad36edb8dcfaa8608db035 (commit) via 1dd5f0115ae66fce9e815b203c1ca542c3bbaeb6 (commit) via 01f25c66a73d3abbd5b07c7919a3d5e1b31c8fbe (commit) via 8b626af8296e49853c24b9dfc4fc214d0578c93f (commit) via bdd0280bb9c81978e98756966d59ea92912ea1bf (commit) via 2bf24b4689c806a781a9b35988d84e8a0b38397e (commit) via 7867b1b493375c85a7bbadb03f391d3edc2541fa (commit) via ade2de552a3c292580efdb933c7f4b14776ce6b3 (commit) via bbca5d4f12da2df71875fda672684df23bd16603 (commit) via 1072ea289e82fbc3ed0df5dcb23b64d502a7e60d (commit) via 6571d7a5e2707875a526d1958be9b092054326d9 (commit) via d37d6cdba0259ed33cd5ae273be6659e2d9e6fc9 (commit) via af1b0d4947b41d655387241e9545f1f4397156f6 (commit) via 48a4ba62e9106026864466b5ec9c1d3264fd28db (commit) via bfdfe4fbb6c7c87a8075adf7fdf24ba4c13f7a4f (commit) via 296d0beb19b5ab3901e604204ee6351c59b98d70 (commit) via 9d0d2a4fe83a859149cffbd1e79a1311ccb9a2f6 (commit) via 3c52b9c8283bb8e406c741bf015ef8ec2eb4e323 (commit) via 40b275c59930479a5ddc932630ac50f7cf24e626 (commit) via 2fac9680177949ef488e124788131537a4e74d64 (commit) via c0219710d364d0c114ff7c2b0abc28181745b8fd (commit) via f8f89ab777056dfe3e68908c285df7d81042a436 (commit) via 0ebc48a68e0be8d0f02b945a954b4a9334851d96 (commit) via a513a056d256872147ffc8c7760baccb004d3e88 (commit) via 297cbe9ce457d9b66d56b0ba8b159c43f3737cee (commit) via de5f204532237590cc5c7c601368d38c04ce221d (commit) from a822895df6892e8a91653fba75cbe6898c041396 (commit) - Log ----------------------------------------------------------------- commit dc0d60e2fee6dfb33692c003bb01754272d095cf Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:10:22 2011 +0200 Translation update done using Pootle. commit 3503ab04d7adc1ec238fbd0c9f7d06a97174ce96 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:09:36 2011 +0200 Translation update done using Pootle. commit dd48431a8f98652c9b2aa793de6bd004b7ea63cf Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:09:23 2011 +0200 Translation update done using Pootle. commit f224cc5bb22d5250039826f781f970b755b1e39f Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:09:06 2011 +0200 Translation update done using Pootle. commit 7581b6c4cd2f297c92376c3c21ebe1a04c2c175a Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:08:50 2011 +0200 Translation update done using Pootle. commit f31a97d2482f34047102eb8ea3a6daf718bd4ff9 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:07:06 2011 +0200 Translation update done using Pootle. commit f455062e44e06a63c90810c46a92316c07de624e Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:05:42 2011 +0200 Translation update done using Pootle. commit 4f4ce01f6e113547fd9358722a56ec371e5a4d28 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:04:57 2011 +0200 Translation update done using Pootle. commit c0f310c0457e99953b3c6c9793cd9c16da885f83 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:04:45 2011 +0200 Translation update done using Pootle. commit 2bfd38f040bba34654efe80fcbe8455466751a8c Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:02:13 2011 +0200 Translation update done using Pootle. commit 1e7a4bdda1fe38ac0ace095d1284e742f679096e Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 23:01:32 2011 +0200 Translation update done using Pootle. commit df5656e497ad28aa0fb8cba0cbfd15fac77f72f5 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:54:57 2011 +0200 Translation update done using Pootle. commit 961b0c8984d00320e3ba05c48e384dbb6f1fccf2 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:53:11 2011 +0200 Translation update done using Pootle. commit d2b9ce34274f59652d81c9dc3a483de6a8bab2b0 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:52:34 2011 +0200 Translation update done using Pootle. commit eddaae7428b098d440a557c464fd58485190046f Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:51:07 2011 +0200 Translation update done using Pootle. commit e05e6cfb05e4a629679dd4ee384a13666839d07c Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:50:44 2011 +0200 Translation update done using Pootle. commit 2cab153738273fd2aa9bc41a14ea7ec7c5e671af Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:49:20 2011 +0200 Translation update done using Pootle. commit 514255ba3aa08f0b0bbf87cc93eb612b0ab1b23b Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:46:52 2011 +0200 Translation update done using Pootle. commit d53a4aeee4196c576fdec6dfe8652ef7daf98325 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:46:20 2011 +0200 Translation update done using Pootle. commit 4627d66484acc988a7c308057270521d0eaa061f Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:43:43 2011 +0200 Translation update done using Pootle. commit beb17e71ee3ef432d333639c2c9f9e47d3dbf327 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:41:39 2011 +0200 Translation update done using Pootle. commit aca8b981b27ed29bd391ee788e89b87c5006a1c8 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:41:27 2011 +0200 Translation update done using Pootle. commit 69e1c124a63c2c4b7198dc0486f6f84032a6af73 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:41:02 2011 +0200 Translation update done using Pootle. commit f3bffe02549746654ea50b361d6b53dcc29689cd Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:40:06 2011 +0200 Translation update done using Pootle. commit db50a3883eafb4f1875d08e348ebe243b0b159d3 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:39:11 2011 +0200 Translation update done using Pootle. commit 40ed7866d74e7d9c9f96eb53df246ee545508bb0 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:38:14 2011 +0200 Translation update done using Pootle. commit 53e26f80b2dfd41a301c16b14227d6c148e6572e Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:37:37 2011 +0200 Translation update done using Pootle. commit 64141bf9a20bb51f60991933e97a7f2cec40bda2 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:36:29 2011 +0200 Translation update done using Pootle. commit 6ad757b31f356e8b56dd7aa1dce788f783a3326e Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:36:16 2011 +0200 Translation update done using Pootle. commit 4b4c9e9b11bc26589e179b0e0814c7a214a96ee6 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:34:39 2011 +0200 Translation update done using Pootle. commit a34b21380c2c271f5ac5348d6776ab04d6916fc2 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:32:53 2011 +0200 Translation update done using Pootle. commit 148d0d6dea4d418cd2e4e857f30d2eec5aa4f2ae Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:32:08 2011 +0200 Translation update done using Pootle. commit c0cf93e49d2ced20932bb03c49d8c02ef6c83376 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:31:23 2011 +0200 Translation update done using Pootle. commit 40bbafe01a70ab7862c18bcc918af5fe53444af3 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:29:34 2011 +0200 Translation update done using Pootle. commit 8595b3b859a2ffc6ae90ddcd0105299b2b1b9798 Author: typim <duke3d(a)ukr.net> Date: Mon Dec 12 22:28:45 2011 +0200 Translation update done using Pootle. commit 03abc3cd910515e9a837e5b40708791144b3df71 Merge: 2729e10 a822895 Author: Pootle server <pootle(a)cihar.com> Date: Mon Dec 12 20:40:10 2011 +0100 Merge remote-tracking branch 'origin/master' commit 2729e1020760dff7730e22997e31f37cabbbbb15 Merge: d075696 6a6b844 Author: Pootle server <pootle(a)cihar.com> Date: Mon Dec 12 18:40:14 2011 +0100 Merge remote-tracking branch 'origin/master' commit d0756966fcd173ae08ad36edb8dcfaa8608db035 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 12 19:21:51 2011 +0200 Translation update done using Pootle. commit 1dd5f0115ae66fce9e815b203c1ca542c3bbaeb6 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 12 19:21:15 2011 +0200 Translation update done using Pootle. commit 01f25c66a73d3abbd5b07c7919a3d5e1b31c8fbe Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 12 19:21:09 2011 +0200 Translation update done using Pootle. commit 8b626af8296e49853c24b9dfc4fc214d0578c93f Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 12 19:20:55 2011 +0200 Translation update done using Pootle. commit bdd0280bb9c81978e98756966d59ea92912ea1bf Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 12 19:20:39 2011 +0200 Translation update done using Pootle. commit 2bf24b4689c806a781a9b35988d84e8a0b38397e Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 12 19:20:30 2011 +0200 Translation update done using Pootle. commit 7867b1b493375c85a7bbadb03f391d3edc2541fa Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 12 19:20:11 2011 +0200 Translation update done using Pootle. commit ade2de552a3c292580efdb933c7f4b14776ce6b3 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Dec 12 19:19:50 2011 +0200 Translation update done using Pootle. commit bbca5d4f12da2df71875fda672684df23bd16603 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 12 18:34:46 2011 +0200 Translation update done using Pootle. commit 1072ea289e82fbc3ed0df5dcb23b64d502a7e60d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 12 18:34:35 2011 +0200 Translation update done using Pootle. commit 6571d7a5e2707875a526d1958be9b092054326d9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 12 18:34:18 2011 +0200 Translation update done using Pootle. commit d37d6cdba0259ed33cd5ae273be6659e2d9e6fc9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 12 18:33:11 2011 +0200 Translation update done using Pootle. commit af1b0d4947b41d655387241e9545f1f4397156f6 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 12 18:33:01 2011 +0200 Translation update done using Pootle. commit 48a4ba62e9106026864466b5ec9c1d3264fd28db Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 12 18:32:40 2011 +0200 Translation update done using Pootle. commit bfdfe4fbb6c7c87a8075adf7fdf24ba4c13f7a4f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Dec 12 18:32:30 2011 +0200 Translation update done using Pootle. commit 296d0beb19b5ab3901e604204ee6351c59b98d70 Author: Pootle server <noreply(a)l10n.cihar.com> Date: Mon Dec 12 16:15:37 2011 +0200 Translation update done using Pootle. commit 9d0d2a4fe83a859149cffbd1e79a1311ccb9a2f6 Author: Domen <dbc334(a)gmail.com> Date: Mon Dec 12 15:52:08 2011 +0200 Translation update done using Pootle. commit 3c52b9c8283bb8e406c741bf015ef8ec2eb4e323 Author: Domen <dbc334(a)gmail.com> Date: Mon Dec 12 15:51:53 2011 +0200 Translation update done using Pootle. commit 40b275c59930479a5ddc932630ac50f7cf24e626 Author: Domen <dbc334(a)gmail.com> Date: Mon Dec 12 15:51:45 2011 +0200 Translation update done using Pootle. commit 2fac9680177949ef488e124788131537a4e74d64 Author: Domen <dbc334(a)gmail.com> Date: Mon Dec 12 15:51:42 2011 +0200 Translation update done using Pootle. commit c0219710d364d0c114ff7c2b0abc28181745b8fd Author: Domen <dbc334(a)gmail.com> Date: Mon Dec 12 15:51:36 2011 +0200 Translation update done using Pootle. commit f8f89ab777056dfe3e68908c285df7d81042a436 Author: Domen <dbc334(a)gmail.com> Date: Mon Dec 12 15:51:30 2011 +0200 Translation update done using Pootle. commit 0ebc48a68e0be8d0f02b945a954b4a9334851d96 Author: Domen <dbc334(a)gmail.com> Date: Mon Dec 12 15:51:25 2011 +0200 Translation update done using Pootle. commit a513a056d256872147ffc8c7760baccb004d3e88 Author: Domen <dbc334(a)gmail.com> Date: Mon Dec 12 15:51:17 2011 +0200 Translation update done using Pootle. commit 297cbe9ce457d9b66d56b0ba8b159c43f3737cee Author: Domen <dbc334(a)gmail.com> Date: Mon Dec 12 15:51:12 2011 +0200 Translation update done using Pootle. commit de5f204532237590cc5c7c601368d38c04ce221d Author: Domen <dbc334(a)gmail.com> Date: Mon Dec 12 15:50:37 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 27 ++++++++-------------- po/sk.po | 8 +++--- po/sl.po | 30 +++++++++---------------- po/tr.po | 22 ++++++----------- po/uk.po | 74 ++++++++++++++++++++++++++++++++++++-------------------------- 5 files changed, 76 insertions(+), 85 deletions(-) diff --git a/po/fr.po b/po/fr.po index 63ff695..28bfc0f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,8 +4,8 @@ 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 10:26+0200\n" -"Last-Translator: Michal Čihař <michal(a)cihar.com>\n" +"PO-Revision-Date: 2011-12-12 19:21+0200\n" +"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -1541,10 +1541,9 @@ msgstr "" "temps." #: js/messages.php:176 -#, fuzzy #| msgid "Read requests" msgid "Cancel request" -msgstr "Requêtes de lecture" +msgstr "Annuler la requête" #: js/messages.php:177 msgid "" @@ -1579,16 +1578,14 @@ msgid "Log analysed, but no data found in this time span." msgstr "Journal analysé, mais aucune donnée trouvée pour ce laps de temps." #: js/messages.php:184 -#, fuzzy #| msgid "Analyze" msgid "Analyzing..." -msgstr "Analyser" +msgstr "Analyse en cours..." #: js/messages.php:185 -#, fuzzy #| msgid "Explain SQL" msgid "Explain output" -msgstr "Expliquer SQL" +msgstr "Expliquer les résultats" #: 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 @@ -1596,16 +1593,14 @@ msgid "Time" msgstr "Moment" #: js/messages.php:188 -#, fuzzy #| msgid "Total:" msgid "Total time:" -msgstr "Total :" +msgstr "Temps total :" #: js/messages.php:189 -#, fuzzy #| msgid "Profiling" msgid "Profiling results" -msgstr "Profilage" +msgstr "Profilage des résultats" #: js/messages.php:190 #, fuzzy @@ -1615,10 +1610,9 @@ msgid "Table" msgstr "Table" #: js/messages.php:191 -#, fuzzy #| msgid "Charts" msgid "Chart" -msgstr "Tableaux" +msgstr "Tableau" #. l10n: A collection of available filters #: js/messages.php:194 @@ -2315,7 +2309,7 @@ msgstr "par heure" #: libraries/Advisor.class.php:335 msgid "per day" -msgstr "" +msgstr "par jour" #: libraries/Config.class.php:703 msgid "Remove \"./config\" directory before using phpMyAdmin!" @@ -8712,10 +8706,9 @@ msgid "Toggle small/big" msgstr "Bascule agrandir/réduire" #: pmd_general.php:99 -#, fuzzy #| msgid "To select relation, click :" msgid "Toggle relation lines" -msgstr "Pour sélectionner un lien, cliquez : " +msgstr "Basculement des lignes de relations" #: pmd_general.php:104 pmd_pdf.php:76 msgid "Import/Export coordinates for PDF schema" diff --git a/po/sk.po b/po/sk.po index e414778..ee7f252 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,15 +4,15 @@ 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-07-27 15:32+0200\n" -"Last-Translator: Martin Lacina <martin(a)whistler.sk>\n" +"PO-Revision-Date: 2011-12-12 15:28+0200\n" +"Last-Translator: Anonymous Pootle User\n" "Language-Team: slovak <sk(a)li.org>\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Pootle 2.0.5\n" +"X-Generator: Pootle 2.1.6\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:349 #: libraries/display_tbl.lib.php:358 server_privileges.php:1677 @@ -1721,7 +1721,7 @@ msgstr "Znovu načítať" #: js/messages.php:207 msgid "Affected rows:" -msgstr "" +msgstr "Ovplyvnené záznamy:" #: js/messages.php:209 msgid "Failed parsing config file. It doesn't seem to be valid JSON code." diff --git a/po/sl.po b/po/sl.po index e6b316c..55f9567 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ 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-05 00:07+0200\n" +"PO-Revision-Date: 2011-12-12 15:51+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.1.6\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:349 @@ -1537,10 +1537,9 @@ msgid "Analysing & loading logs. This may take a while." msgstr "Analiziranje in nalaganje dnevnikov. To lahko traja nekaj časa." #: js/messages.php:176 -#, fuzzy #| msgid "Read requests" msgid "Cancel request" -msgstr "Zahtev branja" +msgstr "Prekliči zahtevo" #: js/messages.php:177 msgid "" @@ -1576,16 +1575,14 @@ msgstr "" "Dnevnik je analiziran, vendar v tem časovnem razponu nisem našel podatkov." #: js/messages.php:184 -#, fuzzy #| msgid "Analyze" msgid "Analyzing..." -msgstr "Analiziraj" +msgstr "Analiziranje ..." #: js/messages.php:185 -#, fuzzy #| msgid "Explain SQL" msgid "Explain output" -msgstr "Razloži stavek SQL" +msgstr "Razloži izhod" #: 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 @@ -1593,29 +1590,25 @@ msgid "Time" msgstr "Čas" #: js/messages.php:188 -#, fuzzy #| msgid "Total:" msgid "Total time:" -msgstr "Skupaj:" +msgstr "Skupni čas:" #: js/messages.php:189 -#, fuzzy #| msgid "Profiling" msgid "Profiling results" -msgstr "Profiliranje" +msgstr "Profiliranje rezultatov" #: js/messages.php:190 -#, fuzzy #| msgid "Table" msgctxt "Display format" msgid "Table" msgstr "Tabela" #: js/messages.php:191 -#, fuzzy #| msgid "Charts" msgid "Chart" -msgstr "Grafi" +msgstr "Grafikon" #. l10n: A collection of available filters #: js/messages.php:194 @@ -2308,7 +2301,7 @@ msgstr "na uro" #: libraries/Advisor.class.php:335 msgid "per day" -msgstr "" +msgstr "na dan" #: libraries/Config.class.php:703 msgid "Remove \"./config\" directory before using phpMyAdmin!" @@ -8655,10 +8648,9 @@ msgid "Toggle small/big" msgstr "Preklopi majhno/veliko" #: pmd_general.php:99 -#, fuzzy #| msgid "To select relation, click :" msgid "Toggle relation lines" -msgstr "Za izbiro relacije kliknite:" +msgstr "Preklopi relacijske črte" #: pmd_general.php:104 pmd_pdf.php:76 msgid "Import/Export coordinates for PDF schema" diff --git a/po/tr.po b/po/tr.po index 9ea1f37..a8917f2 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 12:48+0200\n" +"PO-Revision-Date: 2011-12-12 18:34+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -1530,10 +1530,9 @@ msgid "Analysing & loading logs. This may take a while." msgstr "Günlükler çözümleniyor ve yükleniyor. Bu biraz zaman alabilir." #: js/messages.php:176 -#, fuzzy #| msgid "Read requests" msgid "Cancel request" -msgstr "İstekleri oku" +msgstr "İsteği iptal et" #: js/messages.php:177 msgid "" @@ -1568,16 +1567,14 @@ msgid "Log analysed, but no data found in this time span." msgstr "Günlük çözümlendi, ama bu zaman aralığı içinde bulunan veri yok." #: js/messages.php:184 -#, fuzzy #| msgid "Analyze" msgid "Analyzing..." -msgstr "Çözümle" +msgstr "Çözümleniyor..." #: js/messages.php:185 -#, fuzzy #| msgid "Explain SQL" msgid "Explain output" -msgstr "SQL'i açıkla" +msgstr "Çıktıyı açıkla" #: 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 @@ -1585,16 +1582,14 @@ msgid "Time" msgstr "Süre" #: js/messages.php:188 -#, fuzzy #| msgid "Total:" msgid "Total time:" -msgstr "Toplam:" +msgstr "Toplam süre:" #: js/messages.php:189 -#, fuzzy #| msgid "Profiling" msgid "Profiling results" -msgstr "Profil çıkart" +msgstr "Sonuçların profili çıkarılıyor" #: js/messages.php:190 #, fuzzy @@ -1604,10 +1599,9 @@ msgid "Table" msgstr "Tablo" #: js/messages.php:191 -#, fuzzy #| msgid "Charts" msgid "Chart" -msgstr "Çizelgeler" +msgstr "Çizelge" #. l10n: A collection of available filters #: js/messages.php:194 @@ -2307,7 +2301,7 @@ msgstr "saat başına" #: libraries/Advisor.class.php:335 msgid "per day" -msgstr "" +msgstr "gün başına" #: libraries/Config.class.php:703 msgid "Remove \"./config\" directory before using phpMyAdmin!" diff --git a/po/uk.po b/po/uk.po index 8ee2122..8cceb78 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,15 +4,15 @@ 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 09:17+0200\n" +"PO-Revision-Date: 2011-12-12 23:09+0200\n" "Last-Translator: typim <duke3d(a)ukr.net>\n" "Language-Team: ukrainian <uk(a)li.org>\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.1.6\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:349 @@ -3765,20 +3765,20 @@ msgstr "Режим редагування" #: libraries/config/messages.inc.php:165 msgid "Customize edit mode" -msgstr "" +msgstr "Налаштувати режим редагування" #: libraries/config/messages.inc.php:167 msgid "Export defaults" -msgstr "" +msgstr "Експортувати налаштування по замовчуванню" #: libraries/config/messages.inc.php:168 msgid "Customize default export options" -msgstr "" +msgstr "Налаштувати параметри експорту за замовчуванням" #: libraries/config/messages.inc.php:169 libraries/config/messages.inc.php:211 #: setup/frames/menu.inc.php:16 msgid "Features" -msgstr "" +msgstr "Особливості" #: libraries/config/messages.inc.php:170 msgid "General" @@ -3786,23 +3786,23 @@ msgstr "Загальний" #: libraries/config/messages.inc.php:171 msgid "Set some commonly used options" -msgstr "" +msgstr "Встановити деякі загальновживані властивості" #: libraries/config/messages.inc.php:173 msgid "Import defaults" -msgstr "" +msgstr "Імпортувати властивості по замовчуванню" #: libraries/config/messages.inc.php:174 msgid "Customize default common import options" -msgstr "" +msgstr "Налаштувати за замовчуванням деяких параметрів імпорту" #: libraries/config/messages.inc.php:175 msgid "Import / export" -msgstr "Імпорт / Експорт" +msgstr "Імпорт / експорт" #: libraries/config/messages.inc.php:176 msgid "Set import and export directories and compression options" -msgstr "" +msgstr "Встанови теки імпорту та експорту та параметри стискання" #: libraries/config/messages.inc.php:177 libraries/export/latex.php:27 msgid "LaTeX" @@ -3810,15 +3810,15 @@ msgstr "LaTeX" #: libraries/config/messages.inc.php:180 msgid "Databases display options" -msgstr "" +msgstr "Параметри відображення баз даних" #: libraries/config/messages.inc.php:181 setup/frames/menu.inc.php:18 msgid "Navigation frame" -msgstr "" +msgstr "Оболочка навігації" #: libraries/config/messages.inc.php:182 msgid "Customize appearance of the navigation frame" -msgstr "" +msgstr "Налаштувати вигляд оболочки навігації" #: libraries/config/messages.inc.php:183 libraries/select_server.lib.php:35 #: setup/frames/index.inc.php:111 @@ -3827,15 +3827,15 @@ msgstr "Сервери" #: libraries/config/messages.inc.php:184 msgid "Servers display options" -msgstr "" +msgstr "Параметри відображення серверів" #: libraries/config/messages.inc.php:186 msgid "Tables display options" -msgstr "" +msgstr "Параметри відображення таблиць" #: libraries/config/messages.inc.php:187 setup/frames/menu.inc.php:19 msgid "Main frame" -msgstr "" +msgstr "Головна оболочка" #: libraries/config/messages.inc.php:188 msgid "Microsoft Office" @@ -3851,7 +3851,7 @@ msgstr "Інші параметри ядра" #: libraries/config/messages.inc.php:193 msgid "Settings that didn't fit enywhere else" -msgstr "" +msgstr "Налаштування які не вписуються більш ніґде" #: libraries/config/messages.inc.php:194 msgid "Page titles" @@ -3863,6 +3863,9 @@ msgid "" "html#cfg_TitleTable]documentation[/a] for magic strings that can be used to " "get special values." msgstr "" +"Вкажіть рядку заголовка браузера текст. Відповідно до " +"[a(a)Documentation.xn--html#cfg_titletable]documentation[/-801a] для магічних рядків, " +"які можуть використовуватися для отримання спеціальних значень." #: libraries/config/messages.inc.php:196 #: libraries/navigation_header.inc.php:79 @@ -3873,7 +3876,7 @@ msgstr "Вікно запиту" #: libraries/config/messages.inc.php:197 msgid "Customize query window options" -msgstr "" +msgstr "Встановіть параметри вікна запиту" #: libraries/config/messages.inc.php:198 msgid "Security" @@ -3884,10 +3887,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:200 msgid "Basic settings" -msgstr "" +msgstr "Базові налаштування" #: libraries/config/messages.inc.php:201 msgid "Authentication" @@ -3906,14 +3911,16 @@ msgid "" "Advanced server configuration, do not change these options unless you know " "what they are for" msgstr "" +"Розширена конфігурація сервера, не змінюйте ці параметри, якщо не знаєте для " +"чого вони потрібні" #: libraries/config/messages.inc.php:205 msgid "Enter server connection parameters" -msgstr "" +msgstr "Введіть параметри з'єднання сервера" #: libraries/config/messages.inc.php:206 msgid "Configuration storage" -msgstr "" +msgstr "Конфігурація збереження даних" #: libraries/config/messages.inc.php:207 msgid "" @@ -3921,45 +3928,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:208 msgid "Changes tracking" -msgstr "" +msgstr "Відстеження змін" #: libraries/config/messages.inc.php:209 msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." msgstr "" +"Відстеження змін, зроблених у базі даних. Вимагає PhpMyAdmin конфігурації " +"збереження даних." #: libraries/config/messages.inc.php:210 msgid "Customize export options" -msgstr "" +msgstr "Налаштувати опції експорту" #: libraries/config/messages.inc.php:212 msgid "Customize import defaults" -msgstr "" +msgstr "Налаштувати імпорт властивостей по замовчуванню" #: libraries/config/messages.inc.php:213 msgid "Customize navigation frame" -msgstr "" +msgstr "Налаштувати оболонку навігації" #: libraries/config/messages.inc.php:214 msgid "Customize main frame" -msgstr "" +msgstr "Налаштувати головну оболонку" #: libraries/config/messages.inc.php:215 libraries/config/messages.inc.php:220 #: setup/frames/menu.inc.php:17 msgid "SQL queries" -msgstr "" +msgstr "SQL запити" #: libraries/config/messages.inc.php:217 msgid "SQL Query box" -msgstr "" +msgstr "SQL Query box" #: libraries/config/messages.inc.php:218 msgid "Customize links shown in SQL Query boxes" -msgstr "" +msgstr "Налаштувати посилання що показуються у SQL Query boxes" #: libraries/config/messages.inc.php:221 msgid "SQL queries settings" hooks/post-receive -- phpMyAdmin

12 years, 9 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24690-ga822895

by Marc Delisle

The branch, master has been updated via a822895df6892e8a91653fba75cbe6898c041396 (commit) from 6a6b844525a782b148f235a11b77712e1d256280 (commit) - Log ----------------------------------------------------------------- commit a822895df6892e8a91653fba75cbe6898c041396 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Dec 12 12:44:12 2011 -0500 bug #3455021 Fatal error: Cannot redeclare PMA_extract_db_or_table() ----------------------------------------------------------------------- Summary of changes: db_create.php | 2 +- db_structure.php | 2 +- server_databases.php | 2 +- server_status.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/db_create.php b/db_create.php index 2402705..2bebe0e 100644 --- a/db_create.php +++ b/db_create.php @@ -14,7 +14,7 @@ $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js'; require_once './libraries/mysql_charsets.lib.php'; if (!PMA_DRIZZLE) { - include './libraries/replication.inc.php'; + include_once './libraries/replication.inc.php'; } require './libraries/build_html_for_db.lib.php'; diff --git a/db_structure.php b/db_structure.php index 3baad46..9120f9b 100644 --- a/db_structure.php +++ b/db_structure.php @@ -47,7 +47,7 @@ if (empty($is_info)) { include './libraries/db_info.inc.php'; if (!PMA_DRIZZLE) { - include './libraries/replication.inc.php'; + include_once './libraries/replication.inc.php'; } else { $server_slave_status = false; } diff --git a/server_databases.php b/server_databases.php index 0b01f4c..ddab0d4 100644 --- a/server_databases.php +++ b/server_databases.php @@ -12,7 +12,7 @@ require_once './libraries/common.inc.php'; require './libraries/server_common.inc.php'; if (!PMA_DRIZZLE) { - include './libraries/replication.inc.php'; + include_once './libraries/replication.inc.php'; } else { $replication_types = array(); $replication_info = null; diff --git a/server_status.php b/server_status.php index 6037038..3a891ba 100644 --- a/server_status.php +++ b/server_status.php @@ -407,7 +407,7 @@ if (PMA_DRIZZLE) { $server_master_status = false; $server_slave_status = false; } else { - include './libraries/replication.inc.php'; + include_once './libraries/replication.inc.php'; include_once './libraries/replication_gui.lib.php'; } hooks/post-receive -- phpMyAdmin

12 years, 9 months

← Newer
1
...
5
6
7
8
9
10
11
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git December 2011