From 3ddc4600f7b4e264c175bfac1f92d5d705d7fc64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=C3=A4hk=C3=B6nen?= Date: Sat, 6 Apr 2013 13:51:52 +0200 Subject: [PATCH 1/8] Translated using Weblate (Finnish) Currently translated at 70.1% (1826 of 2605) --- po/fi.po | 48 ++++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/po/fi.po b/po/fi.po index 37782e38df..db35ea3233 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-04-03 10:24+0200\n" -"PO-Revision-Date: 2013-04-03 09:44+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2013-04-06 13:51+0200\n" +"Last-Translator: Jouni Kähkönen \n" "Language-Team: Finnish \n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -607,7 +607,6 @@ msgid "Output" msgstr "Tulos" #: gis_data_editor.php:402 -#, fuzzy #| msgid "" #| "Chose \"GeomFromText\" from the \"Function\" column and paste the below " #| "string into the \"Value\" field" @@ -615,11 +614,11 @@ msgid "" "Choose \"GeomFromText\" from the \"Function\" column and paste the string " "below into the \"Value\" field" msgstr "" -"Valitse \"Toiminto\"-sarakkeesta \"GeomFromText\" ja liitä alla oleva " -"merkkijono \"Arvo\"-kenttään" +"Valitse \"Toiminto\"-sarakkeesta \"GeomFromText\" ja liitä alla oleva merkkijono " +"\"Arvo\"-kenttään" #: import.php:105 -#, fuzzy, php-format +#, php-format #| msgid "" #| "You probably tried to upload too large file. Please refer to " #| "%sdocumentation%s for ways to workaround this limit." @@ -627,8 +626,8 @@ msgid "" "You probably tried to upload a file that is too large. Please refer to " "%sdocumentation%s for a workaround for this limit." msgstr "" -"Yritit todennäköisesti lähettää palvelimelle liian suurta tiedostoa. Katso " -"tämän rajoituksen muuttamisesta lisätietoja %sohjeista%s." +"Yritit ehkä lähettää palvelimelle liian suurta tiedostoa. Katso %sohjeista%" +"s, kuinka tämän rajoituksen voi poistaa." #: import.php:248 import.php:513 msgid "Showing bookmark" @@ -713,10 +712,9 @@ msgid "Back" msgstr "Takaisin" #: index.php:114 -#, fuzzy #| msgid "General relation features" msgid "General Settings" -msgstr "Yleiset relaatio-ominaisuudet" +msgstr "Yleiset asetukset" #: index.php:140 libraries/display_change_password.lib.php:46 #: user_password.php:233 @@ -724,28 +722,24 @@ msgid "Change password" msgstr "Vaihda salasana" #: index.php:156 -#, fuzzy #| msgid "MySQL connection collation" msgid "Server connection collation" -msgstr "MySQL-yhteyden aakkosjärjestys" +msgstr "Palvelinyhteyden aakkosjärjestys" #: index.php:182 -#, fuzzy #| msgid "Other core settings" msgid "Appearance Settings" -msgstr "Muut ydinasetukset" +msgstr "Näkymäasetukset" #: index.php:212 prefs_manage.php:275 -#, fuzzy #| msgid "settings" msgid "More settings" -msgstr "asetukset" +msgstr "Lisäasetukset" #: index.php:233 -#, fuzzy #| msgid "Database for user" msgid "Database server" -msgstr "Tietokanta käyttäjälle" +msgstr "Tietokantapalvelin" #: index.php:236 libraries/Menu.class.php:150 #: libraries/ServerStatusData.class.php:339 libraries/common.inc.php:654 @@ -754,10 +748,9 @@ msgid "Server" msgstr "Palvelin" #: index.php:240 -#, fuzzy #| msgid "Server port" msgid "Server type" -msgstr "Palvelinportti" +msgstr "Palvelintyyppi" #: index.php:244 libraries/plugins/export/ExportLatex.class.php:225 #: libraries/plugins/export/ExportSql.class.php:612 @@ -777,20 +770,18 @@ msgid "User" msgstr "Käyttäjä" #: index.php:257 -#, fuzzy #| msgid "Server socket" msgid "Server charset" -msgstr "Palvelinpistoke" +msgstr "Palvelimen merkistö" #: index.php:269 msgid "Web server" msgstr "Verkkopalvelin" #: index.php:282 -#, fuzzy #| msgid "Use light version" msgid "Database client version" -msgstr "Käytä kevyttä versiota" +msgstr "Tietokannan asiakasohjelman versio" #: index.php:286 msgid "PHP extension" @@ -4801,6 +4792,11 @@ msgid "" "strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], " "Copyright 2002 Upright Database Technology. All rights reserved.[/em]" msgstr "" +"Jos haluat käyttää SQL Validator -palvelua, sinun tulisi tietää, että " +"[strong]kaikki SQL-lauseet tallennetaan nimettömästi tilastointia " +"varten[/strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL " +"Validator[/a], Copyright 2002 Upright Database Technology. All rights " +"reserved.[/em]" #: libraries/config/messages.inc.php:220 msgid "Startup" @@ -6573,10 +6569,10 @@ msgid "Git revision" msgstr "" #: libraries/display_git_revision.lib.php:67 -#, fuzzy, php-format +#, php-format #| msgid "Create version %s of %s.%s" msgid "committed on %1$s by %2$s" -msgstr "Luo versio %s kohteesta %s.%s" +msgstr "Lisännyt %2$s %1$s" #: libraries/display_git_revision.lib.php:75 #, fuzzy, php-format From 629fc383dd6c84a2feb97c65be2389ac41f2804d Mon Sep 17 00:00:00 2001 From: "J. M" Date: Fri, 5 Apr 2013 14:02:06 +0200 Subject: [PATCH 2/8] Translated using Weblate (German) Currently translated at 100.0% (2605 of 2605) --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index c8168e3714..f589281fda 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-04-03 10:24+0200\n" -"PO-Revision-Date: 2013-04-05 14:00+0200\n" +"PO-Revision-Date: 2013-04-05 14:02+0200\n" "Last-Translator: J. M. \n" "Language-Team: German \n" "Language: de\n" @@ -1891,7 +1891,7 @@ msgstr "Zur Umsortierung ziehen" #: js/messages.php:340 msgid "Click to sort" -msgstr "Zum Sortieren anklicken" +msgstr "Zum Sortieren klicken" #: js/messages.php:341 msgid "Click to mark/unmark" From b5bbda0fc171ed97c93b15589f60fd09837e4fc8 Mon Sep 17 00:00:00 2001 From: Yungu Kim Date: Sat, 6 Apr 2013 16:30:55 +0200 Subject: [PATCH 3/8] Translated using Weblate (Korean) Currently translated at 50.1% (1306 of 2605) --- po/ko.po | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/po/ko.po b/po/ko.po index b7d42e8aa6..af91e79cb3 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-04-03 10:24+0200\n" -"PO-Revision-Date: 2013-04-03 18:11+0200\n" +"PO-Revision-Date: 2013-04-06 16:30+0200\n" "Last-Translator: Yungu Kim \n" "Language-Team: Korean \n" "Language: ko\n" @@ -3439,6 +3439,8 @@ msgid "" "A BLOB column with a maximum length of 16,777,215 (2^24 - 1) bytes, stored " "with a three-byte prefix indicating the length of the value" msgstr "" +"최대 크기가 16,777,215 (2^24 - 1) 바이트인 BLOB 컬럼은, 데이터의 현재 크기를 나타내는 3바이트의 값이 데이터 앞에 " +"붙습니다" #: libraries/Types.class.php:350 libraries/Types.class.php:736 msgid "" @@ -5078,7 +5080,7 @@ msgstr "테이블 트리 구분자" #: libraries/config/messages.inc.php:315 msgid "Maximum table tree depth" -msgstr "" +msgstr "테이블 트리의 최대 깊이(depth)" #: libraries/config/messages.inc.php:316 msgid "Highlight server under the mouse cursor" @@ -5922,7 +5924,7 @@ msgstr "" #: libraries/config/messages.inc.php:509 msgid "Title of browser window when a table is selected" -msgstr "" +msgstr "테이블이 선택되었을 때 브라우저 윈도우의 제목" #: libraries/config/messages.inc.php:511 msgid "" @@ -7418,9 +7420,8 @@ msgid "Repair" msgstr "복구" #: libraries/operations.lib.php:1306 -#, fuzzy msgid "Partition maintenance" -msgstr "테이블 유지보수" +msgstr "파티션 유지 보수" #: libraries/operations.lib.php:1315 #, php-format @@ -8244,7 +8245,7 @@ msgstr "" #: libraries/replication_gui.lib.php:264 server_replication.php:183 msgid "Add slave replication user" -msgstr "" +msgstr "슬레이브 리플리케이션 사용자 추가" #: libraries/replication_gui.lib.php:278 #: libraries/server_privileges.lib.php:1046 @@ -8813,9 +8814,8 @@ msgid "Please choose a page to edit" msgstr "편집할 페이지를 선택하세요" #: libraries/schema/User_Schema.class.php:198 -#, fuzzy msgid "Select page" -msgstr "모두 선택" +msgstr "페이지를 선택하세요" #: libraries/schema/User_Schema.class.php:265 #, fuzzy @@ -10211,10 +10211,10 @@ msgid "Unable to change master" msgstr "" #: server_replication.php:108 -#, fuzzy, php-format +#, php-format #| msgid "The privileges were reloaded successfully." msgid "Master server changed successfully to %s" -msgstr "권한을 다시 로딩했습니다." +msgstr "마스터 서버가 성공적으로 %s로 변경되었습니다" #: server_replication.php:168 msgid "This server is configured as master in a replication process." @@ -12155,10 +12155,9 @@ msgid "Slow query logging" msgstr "지연 쿼리 로깅" #: libraries/advisory_rules.txt:87 libraries/advisory_rules.txt:94 -#, fuzzy #| msgid "The server is not responding" msgid "The slow query log is disabled." -msgstr "서버 응답이 없습니다" +msgstr "느린 쿼리에 대한 로깅이 비활성화 상태입니다." #: libraries/advisory_rules.txt:88 msgid "" From a0f45416d4e890fd9c974f341b129be95005907a Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 7 Apr 2013 15:09:34 +0200 Subject: [PATCH 4/8] Translated using Weblate (Slovenian) Currently translated at 100.0% (2605 of 2605) --- po/sl.po | 58 ++++++++++++++++++++------------------------------------ 1 file changed, 21 insertions(+), 37 deletions(-) diff --git a/po/sl.po b/po/sl.po index 461b7632b5..1b2f6be852 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,10 +4,9 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-04-03 10:24+0200\n" -"PO-Revision-Date: 2013-02-15 21:31+0200\n" +"PO-Revision-Date: 2013-04-07 15:09+0200\n" "Last-Translator: Domen \n" -"Language-Team: Slovenian \n" +"Language-Team: Slovenian \n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5308,7 +5307,6 @@ msgid "Server/library difference warning" msgstr "Opozorilo razlike med strežnikom in knjižnico" #: libraries/config/messages.inc.php:336 -#, fuzzy #| msgid "" #| "Disable the default warning that is displayed on the database details " #| "Structure page if any of the required tables for the phpMyAdmin " @@ -5317,13 +5315,12 @@ msgid "" "Disable the default warning that is displayed on the Structure page if " "column names in a table are reserved MySQL words" msgstr "" -"Onemogoči privzeto opozorilo, ki se prikaže na strani o podrobnostih zbirke " -"podatkov Struktura, če katera od tabel, potrebnih za hrambo konfiguracije " -"phpMyAdmin, ni bila najdena" +"Onemogoči privzeto opozorilo, ki se prikaže na strani Struktura, če so imena " +"stolpcev v tabeli rezervirane besede MySQL" #: libraries/config/messages.inc.php:337 msgid "MySQL reserved word warning" -msgstr "" +msgstr "Opozorilo rezerviranih besed MySQL" #: libraries/config/messages.inc.php:339 msgid "Iconic table operations" @@ -5639,7 +5636,6 @@ msgid "Connect without password" msgstr "Poveži se brez gesla" #: libraries/config/messages.inc.php:408 -#, fuzzy #| msgid "" #| "You can use MySQL wildcard characters (% and _), escape them if you want " #| "to use their literal instances, i.e. use [kbd]'my\\_db'[/kbd] and not " @@ -5652,10 +5648,8 @@ msgid "" "[kbd]'my_db'[/kbd]." msgstr "" "Uporabite lahko nadomestne znake MySQL (% in _); ubežite jih, če jih želite " -"uporabiti dobesedno, npr. uporabite [kbd]'my\\_db'[/kbd] in ne [kbd]'my_db'[/" -"kbd]. Z uporabo te možnosti lahko razvrstite seznam zbirk podatkov; samo " -"vnesite njihova imena v vrstnem redu in na koncu uporabite [kbd]*[/kbd] za " -"prikaz preostalih v abecednem vrstnem redu." +"uporabiti dobesedno, npr. uporabite [kbd]'my\\_db'[/kbd] in ne " +"[kbd]'my_db'[/kbd]." #: libraries/config/messages.inc.php:409 msgid "Show only listed databases" @@ -12257,21 +12251,19 @@ msgid "Foreign key constraint" msgstr "Omejitev tujih ključev" #: tbl_relation.php:498 -#, fuzzy #| msgid "Constraints for table" msgid "Constraint name" -msgstr "Omejitve za tabelo" +msgstr "Ime omejitve" #: tbl_relation.php:529 -#, fuzzy #| msgid "No index defined!" msgid "No index defined! Create one below" -msgstr "Ni definiranega indeksa!" +msgstr "Ni definiranega indeksa! Ustvarite ga spodaj" #: tbl_structure.php:144 #, php-format msgid "The column name '%s' is a MySQL reserved keyword." -msgstr "" +msgstr "Ime stolpca '%s' je rezervirana beseda MySQL." #: tbl_tracking.php:135 #, php-format @@ -12545,7 +12537,6 @@ msgid "Long query time" msgstr "Čas dolgih poizvedb" #: libraries/advisory_rules.txt:80 -#, fuzzy #| msgid "" #| "long_query_time is set to 10 seconds or more, thus only slow queries that " #| "take above 10 seconds are logged." @@ -12553,8 +12544,8 @@ msgid "" "{long_query_time} is set to 10 seconds or more, thus only slow queries that " "take above 10 seconds are logged." msgstr "" -"long_query_time je nastavljen na 10 sekund ali več, zato so zabeležene samo " -"počasne poizvedbe, ki trajajo več kot 10 sekund." +"{long_query_time} je nastavljen na 10 sekund ali več, zato so zabeležene " +"samo počasne poizvedbe, ki trajajo več kot 10 sekund." #: libraries/advisory_rules.txt:81 msgid "" @@ -12956,7 +12947,6 @@ msgid "Too many sorts are causing temporary tables." msgstr "Preveč razvrščanj povzroča začasne tabele." #: libraries/advisory_rules.txt:215 libraries/advisory_rules.txt:222 -#, fuzzy #| msgid "" #| "Consider increasing sort_buffer_size and/or read_rnd_buffer_size, " #| "depending on your system memory limits" @@ -12964,8 +12954,8 @@ msgid "" "Consider increasing {sort_buffer_size} and/or {read_rnd_buffer_size}, " "depending on your system memory limits" msgstr "" -"Razmislite o povečanju sort_buffer_size in/ali read_rnd_buffer_size, odvisno " -"od omejitev vašega sistemskega pomnilnika" +"Razmislite o povečanju {sort_buffer_size} in/ali {read_rnd_buffer_size}, " +"odvisno od omejitev vašega sistemskega pomnilnika" #: libraries/advisory_rules.txt:216 #, php-format @@ -13120,10 +13110,9 @@ msgid "tmp_table_size vs. max_heap_table_size" msgstr "tmp_table_size proti max_heap_table_size" #: libraries/advisory_rules.txt:265 -#, fuzzy #| msgid "tmp_table_size and max_heap_table_size are not the same." msgid "{tmp_table_size} and {max_heap_table_size} are not the same." -msgstr "tmp_table_size in max_heap_table_size nista enaki." +msgstr "{tmp_table_size} in {max_heap_table_size} nista enaki." #: libraries/advisory_rules.txt:266 msgid "" @@ -13325,7 +13314,6 @@ msgstr "" "Morda boste prejeli napako \"Preveč odprtih datotek\"." #: libraries/advisory_rules.txt:338 libraries/advisory_rules.txt:345 -#, fuzzy #| msgid "" #| "Consider increasing {open_files_limit}, and check the error log when " #| "restarting after changing open_files_limit." @@ -13334,7 +13322,7 @@ msgid "" "restarting after changing {open_files_limit}." msgstr "" "Razmislite o povečanju {open_files_limit} in preverite dnevnik napak po " -"ponovnem zagonu, ko spremenite open_files_limit." +"ponovnem zagonu, ko spremenite {open_files_limit}." #: libraries/advisory_rules.txt:339 #, php-format @@ -13457,7 +13445,6 @@ msgid "Slow_launch_threads is above 2s" msgstr "Slow_launch_threads je nad 2 s" #: libraries/advisory_rules.txt:387 -#, fuzzy #| msgid "" #| "Set slow_launch_time to 1s or 2s to correctly count threads that are slow " #| "to launch" @@ -13465,7 +13452,7 @@ msgid "" "Set {slow_launch_time} to 1s or 2s to correctly count threads that are slow " "to launch" msgstr "" -"Nastavite slow_launch_time na 1 s ali 2 s za pravilno preštevanje niti, ki " +"Nastavite {slow_launch_time} na 1 s ali 2 s za pravilno preštevanje niti, ki " "se zaganjajo počasi" #: libraries/advisory_rules.txt:388 @@ -13478,7 +13465,6 @@ msgid "Percentage of used connections" msgstr "Odstotek uporabljenih povezav" #: libraries/advisory_rules.txt:395 -#, fuzzy #| msgid "" #| "The maximum amount of used connections is getting close to the value of " #| "max_connections." @@ -13486,10 +13472,9 @@ msgid "" "The maximum amount of used connections is getting close to the value of " "{max_connections}." msgstr "" -"Največje število uporabljenih povezav se bliža vrednosti max_connections." +"Največje število uporabljenih povezav se bliža vrednosti {max_connections}." #: libraries/advisory_rules.txt:396 -#, fuzzy #| msgid "" #| "Increase max_connections, or decrease wait_timeout so that connections " #| "that do not close database handlers properly get killed sooner. Make sure " @@ -13499,8 +13484,8 @@ msgid "" "that do not close database handlers properly get killed sooner. Make sure " "the code closes database handlers properly." msgstr "" -"Povečajte max_connections ali zmanjšajte wait_timeout, da bodo povezave, ki " -"ne zaprejo upravljavca zbirk podatkov pravilno, hitreje prekinjene. " +"Povečajte {max_connections} ali zmanjšajte {wait_timeout}, da bodo povezave, " +"ki ne zaprejo upravljavca zbirk podatkov pravilno, prekinjene hitreje. " "Prepričajte se, da koda pravilno zapira upravljavce zbirk podatkov." #: libraries/advisory_rules.txt:397 @@ -13728,10 +13713,9 @@ msgid "MyISAM concurrent inserts" msgstr "Sočasna vstavljanja MyISAM" #: libraries/advisory_rules.txt:462 -#, fuzzy #| msgid "Enable concurrent_insert by setting it to 1" msgid "Enable {concurrent_insert} by setting it to 1" -msgstr "Omogočite concurrent_insert z nastavitvijo na 1" +msgstr "Omogočite {concurrent_insert} z nastavitvijo na 1" #: libraries/advisory_rules.txt:463 msgid "" From 9ea6eb4139a1fce7450bdebaab778a951a094655 Mon Sep 17 00:00:00 2001 From: "J. M" Date: Fri, 5 Apr 2013 14:02:08 +0200 Subject: [PATCH 5/8] Translated using Weblate (German) Currently translated at 100.0% (2562 of 2562) --- po/de.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index c490ef986d..6b64652aa0 100644 --- a/po/de.po +++ b/po/de.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 3.5.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-10-16 14:37+0200\n" -"PO-Revision-Date: 2013-04-04 13:16+0200\n" -"Last-Translator: Carsten Nielsen \n" +"PO-Revision-Date: 2013-04-05 14:02+0200\n" +"Last-Translator: J. M. \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -2011,7 +2011,7 @@ msgstr "Zur Umsortierung ziehen" #: js/messages.php:350 msgid "Click to sort" -msgstr "Zum Sortieren anklicken" +msgstr "Zum Sortieren klicken" #: js/messages.php:351 msgid "Click to mark/unmark" From 8dbce7e4a0e725202c3ae8d97929895bec7d5112 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 8 Apr 2013 07:58:07 -0400 Subject: [PATCH 6/8] 3.5.8 release --- 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 8646cf8535..3f3e8511cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -3.5.8.0 (not yet released) +3.5.8.0 (2013-04-08) - bug #3828 MariaDB reported as MySQL - bug #3854 Incorrect header for Safari 6.0 - bug #3705 Attempt to open trigger for edit gives NULL diff --git a/Documentation.html b/Documentation.html index 51f96a0c41..4ad73f2c9f 100644 --- a/Documentation.html +++ b/Documentation.html @@ -8,7 +8,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.5.8-rc1 - Documentation + phpMyAdmin 3.5.8 - Documentation @@ -16,7 +16,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 61d57bb078..ff9a5f59b3 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.5.8-rc1 +Version 3.5.8 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index d6f11c24d9..3db7ee6eec 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -98,7 +98,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.5.8-rc1'); + $this->set('PMA_VERSION', '3.5.8'); /** * @deprecated */ From 25748dbad95a2fd4724762441680975a4db1306a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 8 Apr 2013 07:59:38 -0400 Subject: [PATCH 7/8] Fix merge conflicts --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bb95349649..6d21bae074 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,7 @@ phpMyAdmin - ChangeLog 3.5.9.0 (not yet released) -3.5.8.0 (not yet released) +3.5.8.0 (2013-04-08) - bug #3828 MariaDB reported as MySQL - bug #3854 Incorrect header for Safari 6.0 - bug #3705 Attempt to open trigger for edit gives NULL From f508c9ba1b5eccfa18b3c77e5f94d32a273454b3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 8 Apr 2013 08:00:26 -0400 Subject: [PATCH 8/8] Fix merge conflicts --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 104c24b2a3..0f44b2b627 100644 --- a/ChangeLog +++ b/ChangeLog @@ -105,7 +105,7 @@ underscore 3.5.9.0 (not yet released) -3.5.8.0 (not yet released) +3.5.8.0 (2013-04-08) - bug #3828 MariaDB reported as MySQL - bug #3854 Incorrect header for Safari 6.0 - bug #3705 Attempt to open trigger for edit gives NULL