From 117f36c8da9b9bedb477cd49d2a84e3e0578b4a4 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 1 Jan 2015 17:15:43 +0100 Subject: [PATCH 1/5] Translated using Weblate (Slovenian) Currently translated at 100.0% (2978 of 2978 strings) [CI skip] --- po/sl.po | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/po/sl.po b/po/sl.po index 93dd767e40..1327655552 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2014-12-15 22:49+0200\n" +"PO-Revision-Date: 2015-01-01 17:15+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" "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: Weblate 2.2-dev\n" #: changelog.php:36 license.php:28 @@ -6742,13 +6742,11 @@ msgstr "" "pma__savedsearches[/kbd]." #: libraries/config/messages.inc.php:607 -#, fuzzy #| msgid "Central columns" msgid "Central columns table" -msgstr "Osrednji stolpci" +msgstr "Tabela osrednjih stolpcev" #: libraries/config/messages.inc.php:609 -#, fuzzy #| msgid "" #| "Leave blank for no PDF schema support, suggested: [kbd]pma__table_coords[/" #| "kbd]." @@ -6756,8 +6754,8 @@ msgid "" "Leave blank for no central columns support, suggested: [kbd]" "pma__central_columns[/kbd]." msgstr "" -"Pustite prazno, če ne želite podpore sheme PDF; predlagano: [kbd]" -"pma__table_coords[/kbd]." +"Pustite prazno, če ne želite podpore osrednjih stolpcev; predlagano: " +"[kbd]pma__central_columns[/kbd]." #: libraries/config/messages.inc.php:612 msgid "Try to connect without password." @@ -6838,7 +6836,6 @@ msgid "Recently used table" msgstr "Nedavno uporabljena tabela" #: libraries/config/messages.inc.php:641 -#, fuzzy #| msgid "" #| "Leave blank for no \"persistent\" recently used tables across sessions, " #| "suggested: [kbd]pma__recent[/kbd]." @@ -6846,8 +6843,8 @@ msgid "" "Leave blank for no \"persistent\" favorite tables across sessions, " "suggested: [kbd]pma__favorite[/kbd]." msgstr "" -"Pustite prazno, če ne želite »vztrajnih« nedavno uporabljenih tabel skozi " -"seje; predlagano: [kbd]pma__recent[/kbd]." +"Pustite prazno, če ne želite »vztrajnih« priljubljenih tabel skozi seje; " +"predlagano: [kbd]pma__favorite[/kbd]." #: libraries/config/messages.inc.php:644 #, fuzzy From d26bffd0ae44354c4f47e6852368c48166e1ab1f Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 1 Jan 2015 19:06:32 +0100 Subject: [PATCH 2/5] Translated using Weblate (Turkish) Currently translated at 100.0% (2982 of 2982 strings) [CI skip] --- po/tr.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/po/tr.po b/po/tr.po index f9ce6203ce..0789e66937 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2015-01-01 13:45+0200\n" +"PO-Revision-Date: 2015-01-01 19:06+0200\n" "Last-Translator: Burak Yavuz \n" -"Language-Team: Turkish \n" +"Language-Team: Turkish " +"\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -6753,8 +6753,8 @@ msgid "" "Leave blank for no central columns support, suggested: [kbd]" "pma__central_columns[/kbd]." msgstr "" -"Merkezi sütunlar desteği istenmiyorsa boş bırakın, önerilen: [kbd]" -"pma__central_columns[/kbd]." +"Merkezi sütunlar desteği istenmiyorsa boş bırakın, önerilen: " +"[kbd]pma__central_columns[/kbd]." #: libraries/config/messages.inc.php:612 msgid "Try to connect without password." @@ -9193,7 +9193,7 @@ msgstr "" "bir sütuna sahiptir." #: libraries/normalization.lib.php:381 -#, fuzzy, php-format +#, php-format #| msgid "" #| "As per above partial dependencies, in order to put the original table " #| "'%1$s' into Second normal form we need to create the following tables:" @@ -9201,8 +9201,8 @@ msgid "" "In order to put the original table '%1$s' into Second normal form we need to " "create the following tables:" msgstr "" -"Yukarıdaki kısmi bağımlılıklara göre, İkinci normal biçim içine orijinal " -"'%1$s' tablosunu koymak için aşağıdaki tabloları oluşturmamız gerekli:" +"İkinci normal biçim içine orijinal '%1$s' tablosunu koymak için aşağıdaki " +"tabloları oluşturmamız gerekli:" #: libraries/normalization.lib.php:417 #, php-format @@ -9215,7 +9215,7 @@ msgid "Error in processing!" msgstr "İşlemede hata!" #: libraries/normalization.lib.php:501 -#, fuzzy, php-format +#, php-format #| msgid "" #| "As per above dependencies, in order to put the original table '%1$s' into " #| "Third normal form we need to create the following tables:" @@ -9223,8 +9223,8 @@ msgid "" "In order to put the original table '%1$s' into Third normal form we need to " "create the following tables:" msgstr "" -"Yukarıdaki bağımlılıklara göre, Üçüncü normal biçim içine orijinal '%1$s' " -"tablosunu koymak için aşağıdaki tabloları oluşturmamız gerekli:" +"Üçüncü normal biçim içine orijinal '%1$s' tablosunu koymak için aşağıdaki " +"tabloları oluşturmamız gerekli:" #: libraries/normalization.lib.php:548 msgid "The third step of normalization is complete." From 530c04d14a9de6ba9b287b2a98306a09d04ee055 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Thu, 1 Jan 2015 19:07:05 +0100 Subject: [PATCH 3/5] Translated using Weblate (Turkish) Currently translated at 100.0% (2982 of 2982 strings) [CI skip] --- po/tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 0789e66937..c6d6252aef 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2015-01-01 19:06+0200\n" +"PO-Revision-Date: 2015-01-01 19:07+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: Turkish " "\n" From 6b85f72604b9fe5dcff3915d582ca6fda6252626 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 2 Jan 2015 15:35:42 +0530 Subject: [PATCH 4/5] bug #4683 Relational data is not properly updated on table rename Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/relation.lib.php | 52 ++++++++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef0a5551b8..53a8ee3e58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug #4679 Setup does not allow providing a name for favorites table - bug #4680 Number of favorite table are not configurable in setup - bug #4681 'Central columns table' field in setup does not have a description +- bug #4683 Relational data is not properly updated on table rename 4.3.4.0 (2014-12-29) - bug #4653 Always connection error was shown, on /setup at tab "configuration storage" diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 328d0bba61..8d1023e339 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -1613,21 +1613,57 @@ function PMA_REL_renameTable($source_db, $target_db, $source_table, $target_tabl ); } - /** - * @todo Can't get moving PDFs the right way. The page numbers - * always get screwed up independently from duplication because the - * numbers do not seem to be stored on a per-database basis. Would - * the author of pdf support please have a look at it? - */ - if ($GLOBALS['cfgRelation']['pdfwork']) { + if ($source_db == $target_db) { + // rename within the database can be handled + PMA_REL_renameSingleTable( + 'table_coords', + $source_db, $target_db, + $source_table, $target_table, + 'db_name', 'table_name' + ); + } else { + // if the table is moved out of the database we can no loger keep the + // record for table coordinate + $remove_query = "DELETE FROM " + . PMA_Util::backquote($GLOBALS['cfgRelation']['db']) . "." + . PMA_Util::backquote($GLOBALS['cfgRelation']['table_coords']) + . " WHERE db_name = '" . PMA_Util::sqlAddSlashes($source_db) . "'" + . " AND table_name = '" . PMA_Util::sqlAddSlashes($source_table) + . "'"; + PMA_queryAsControlUser($remove_query); + } + } + + if ($GLOBALS['cfgRelation']['uiprefswork']) { PMA_REL_renameSingleTable( - 'table_coords', + 'table_uiprefs', $source_db, $target_db, $source_table, $target_table, 'db_name', 'table_name' ); } + + if ($GLOBALS['cfgRelation']['navwork']) { + // update hidden items inside table + PMA_REL_renameSingleTable( + 'navigationhiding', + $source_db, $target_db, + $source_table, $target_table, + 'db_name', 'table_name' + ); + + // update data for hidden table + $query = "UPDATE " + . PMA_Util::backquote($GLOBALS['cfgRelation']['db']) . "." + . PMA_Util::backquote($GLOBALS['cfgRelation']['navigationhiding']) + . " SET db_name = '" . PMA_Util::sqlAddSlashes($target_db) . "'," + . " item_name = '" . PMA_Util::sqlAddSlashes($target_table) . "'" + . " WHERE db_name = '" . PMA_Util::sqlAddSlashes($source_db) . "'" + . " AND item_name = '" . PMA_Util::sqlAddSlashes($source_table) . "'" + . " AND item_type = 'table'"; + PMA_queryAsControlUser($query); + } } /** From 035595ff23535cb0bed8adf02ec218346912f019 Mon Sep 17 00:00:00 2001 From: dingo thirteen Date: Fri, 2 Jan 2015 11:17:10 +0100 Subject: [PATCH 5/5] Translated using Weblate (Dutch) Currently translated at 100.0% (2981 of 2981 strings) [CI skip] --- po/nl.po | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/po/nl.po b/po/nl.po index 89841762fb..6463bd0104 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2014-12-24 23:01+0200\n" -"Last-Translator: Robin van der Vliet \n" -"Language-Team: Dutch \n" +"PO-Revision-Date: 2015-01-02 11:17+0200\n" +"Last-Translator: dingo thirteen \n" +"Language-Team: Dutch " +"\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -6780,13 +6780,11 @@ msgstr "" "opzoekingen uit te schakelen, suggestie: [kbd]pma__savedsearches[/kbd]." #: libraries/config/messages.inc.php:607 -#, fuzzy #| msgid "Central columns" msgid "Central columns table" -msgstr "Centrale kolommen" +msgstr "Centrale kolommen tabel" #: libraries/config/messages.inc.php:609 -#, fuzzy #| msgid "" #| "Leave blank for no PDF schema support, suggested: [kbd]pma__table_coords[/" #| "kbd]." @@ -6794,8 +6792,8 @@ msgid "" "Leave blank for no central columns support, suggested: [kbd]" "pma__central_columns[/kbd]." msgstr "" -"Laat dit veld leeg om geen PDF-schema te ondersteunen, suggestie: [kbd]" -"pma__table_coords[/kbd]." +"Laat dit veld leeg om centrale kolommen tabel niet te ondersteunen, " +"suggestie: [kbd]pma__table_coords[/kbd]." #: libraries/config/messages.inc.php:612 msgid "Try to connect without password." @@ -6890,10 +6888,9 @@ msgstr "" "sessies heen, voorstel: [kbd]pma__recent[/kbd]." #: libraries/config/messages.inc.php:644 -#, fuzzy #| msgid "Favorite tables" msgid "Favorites table" -msgstr "Favoriete tabellen" +msgstr "Favorieten tabel" #: libraries/config/messages.inc.php:646 msgid "" @@ -9272,7 +9269,7 @@ msgstr "" "(%1$s) maar één kolom heeft." #: libraries/normalization.lib.php:381 -#, fuzzy, php-format +#, php-format #| msgid "" #| "As per above partial dependencies, in order to put the original table " #| "'%1$s' into Second normal form we need to create the following tables:" @@ -9280,9 +9277,8 @@ msgid "" "In order to put the original table '%1$s' into Second normal form we need to " "create the following tables:" msgstr "" -"Door de hierboven genoemde gedeeltelijke afhankelijkheden, moeten we om de " -"originele tabel '%1$s' in de tweede normaal vorm te plaatsen de volgende " -"tabellen aanmaken:" +"Om de originele tabel '%1$s' in de tweede normaal vorm te plaatsen, moeten " +"we de volgende tabellen aanmaken:" #: libraries/normalization.lib.php:417 #, php-format @@ -9295,7 +9291,7 @@ msgid "Error in processing!" msgstr "Verwerkingsfout!" #: libraries/normalization.lib.php:501 -#, fuzzy, php-format +#, php-format #| msgid "" #| "As per above dependencies, in order to put the original table '%1$s' into " #| "Third normal form we need to create the following tables:" @@ -9303,9 +9299,8 @@ msgid "" "In order to put the original table '%1$s' into Third normal form we need to " "create the following tables:" msgstr "" -"Door de hierboven genoemde gedeeltelijke afhankelijkheden, moeten we om de " -"originele tabel '%1$s' in de derde normaal vorm te plaatsen, de volgende " -"tabellen aanmaken:" +"Om de originele tabel '%1$s' in de derde normaal vorm te plaatsen, moeten we " +"de volgende tabellen aanmaken:" #: libraries/normalization.lib.php:548 msgid "The third step of normalization is complete." @@ -10596,10 +10591,9 @@ msgid "Persistent recently used tables" msgstr "Persistente recent gebruikte tabellen" #: libraries/relation.lib.php:224 -#, fuzzy #| msgid "Persistent recently used tables" msgid "Persistent favorite tables" -msgstr "Persistente recent gebruikte tabellen" +msgstr "Persistente veel gebruikte tabellen" #: libraries/relation.lib.php:235 msgid "Persistent tables' UI preferences"