From 964c2df819e9d0c1fb4e85f80217044f5abecb97 Mon Sep 17 00:00:00 2001 From: dingo thirteen Date: Thu, 1 Oct 2015 18:23:18 +0200 Subject: [PATCH 01/10] Translated using Weblate (Dutch) Currently translated at 100.0% (3217 of 3217 strings) [CI skip] --- po/nl.po | 92 ++++++++++++++++++++------------------------------------ 1 file changed, 33 insertions(+), 59 deletions(-) diff --git a/po/nl.po b/po/nl.po index 0936f345d2..8954f0bc54 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-01 07:36-0400\n" -"PO-Revision-Date: 2015-09-06 16:42+0200\n" +"PO-Revision-Date: 2015-10-01 18:23+0200\n" "Last-Translator: dingo thirteen \n" -"Language-Team: Dutch \n" +"Language-Team: Dutch " +"\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.4-dev\n" +"X-Generator: Weblate 2.5-dev\n" #: changelog.php:37 license.php:30 #, php-format @@ -960,10 +960,9 @@ msgid "Do you really want to TRUNCATE the selected partition(s)?" msgstr "Weet u zeker dat u de geselecteerde partitiie(s) wilt afbreken?" #: js/messages.php:66 -#, fuzzy #| msgid "Do you really want to TRUNCATE the selected partition(s)?" msgid "Do you really want to remove partitioning?" -msgstr "Weet u zeker dat u de geselecteerde partitiie(s) wilt afbreken?" +msgstr "Weet u zeker dat u de partitionering wilt verwijderen?" #: js/messages.php:68 msgid "" @@ -4682,6 +4681,8 @@ msgid "" "Stores and enables efficient access to data in JSON (JavaScript Object " "Notation) documents" msgstr "" +"Maakt efficiënte datatoegang beschikbaar en slaat het op in JSON (JavaScript " +"Object Notation) documenten" #: libraries/Types.class.php:769 msgctxt "numeric types" @@ -4743,16 +4744,14 @@ msgid "Analyze Explain at %s" msgstr "Analyseer uitleg op %s" #: libraries/Util.class.php:1222 -#, fuzzy #| msgid "Without PHP Code" msgid "Without PHP code" -msgstr "zonder PHP-code" +msgstr "Zonder PHP-code" #: libraries/Util.class.php:1234 -#, fuzzy #| msgid "Submit Query" msgid "Submit query" -msgstr "Query uitvoeren" +msgstr "Query verzenden" #: libraries/Util.class.php:1245 libraries/config/messages.inc.php:898 msgid "Create PHP code" @@ -12388,10 +12387,9 @@ msgid "User group" msgstr "Gebruikersgroep" #: libraries/server_privileges.lib.php:730 -#, fuzzy #| msgid "Requires SSL-encrypted connections." msgid "Does not require SSL-encrypted connections." -msgstr "Verbinding met SSL encryptie vereist." +msgstr "Verbindingen zonder SSL encryptie toegestaan." #: libraries/server_privileges.lib.php:751 msgid "Requires SSL-encrypted connections." @@ -12462,10 +12460,9 @@ msgstr "" #: libraries/server_privileges.lib.php:3179 #: libraries/server_privileges.lib.php:4437 #: templates/privileges/edit_routine_privileges.phtml:11 -#, fuzzy #| msgid "Routines" msgid "Routine" -msgstr "Routines" +msgstr "Routine" #: libraries/server_privileges.lib.php:1035 #: libraries/server_privileges.lib.php:1409 server_privileges.php:71 @@ -12476,17 +12473,14 @@ msgstr "" "rechtentabel opnieuw op te vragen." #: libraries/server_privileges.lib.php:1042 -#, fuzzy #| msgid "Allows altering and dropping stored routines." msgid "Allows altering and dropping this routine." -msgstr "" -"Maakt het mogelijk om opgeslagen routines te bewerken en te verwijderen." +msgstr "Staat het toe om deze routine te bewerken en te verwijderen." #: libraries/server_privileges.lib.php:1047 -#, fuzzy #| msgid "Allows executing stored routines." msgid "Allows executing this routine." -msgstr "Maakt het mogelijk om opgeslagen routines uit te voeren." +msgstr "Staat het toe deze routine uit te voeren." #: libraries/server_privileges.lib.php:1097 #: libraries/server_privileges.lib.php:1266 @@ -12693,10 +12687,9 @@ msgstr "Een nieuwe gebruikersaccount aanmaken met dezelfde rechten en …" #: libraries/server_privileges.lib.php:3178 #: templates/privileges/edit_routine_privileges.phtml:12 -#, fuzzy #| msgid "Column-specific privileges" msgid "Routine-specific privileges" -msgstr "Kolom-specifieke rechten" +msgstr "Routine-specifieke rechten" #: libraries/server_privileges.lib.php:3561 msgid "Remove selected user accounts" @@ -14909,95 +14902,80 @@ msgid "after %s" msgstr "na %s" #: templates/columns_definitions/partitions.phtml:9 -#, fuzzy #| msgid "Partitioned by:" msgid "Partition by:" -msgstr "Gepartitioneerd op:" +msgstr "Partitie op:" #: templates/columns_definitions/partitions.phtml:25 #: templates/columns_definitions/partitions.phtml:54 -#, fuzzy #| msgid "Values for column %s" msgid "Expression or column list" -msgstr "Waarden voor kolom %s" +msgstr "Expressie of kolom lijst" #: templates/columns_definitions/partitions.phtml:30 -#, fuzzy #| msgid "Partitions" msgid "Partitions:" -msgstr "Partities %s" +msgstr "Partities:" #: templates/columns_definitions/partitions.phtml:38 -#, fuzzy #| msgid "Sub partitioned by:" msgid "Subpartition by:" -msgstr "Onderverdeling op:" +msgstr "Onderpartitionering op:" #: templates/columns_definitions/partitions.phtml:59 -#, fuzzy #| msgid "Sub partitioned by:" msgid "Subpartitions:" -msgstr "Onderverdeling op:" +msgstr "Onderpartitionering:" #: templates/columns_definitions/partitions.phtml:71 -#, fuzzy #| msgid "Partitions" msgid "Partition" -msgstr "Partities %s" +msgstr "Partitie" #: templates/columns_definitions/partitions.phtml:73 -#, fuzzy #| msgid "Value" msgid "Values" -msgstr "Waarde" +msgstr "Waarden" #: templates/columns_definitions/partitions.phtml:76 -#, fuzzy #| msgid "partitioned" msgid "Subpartition" -msgstr "gepartitioneerd" +msgstr "Ondergepartitioneerd" #: templates/columns_definitions/partitions.phtml:78 -#, fuzzy #| msgid "Engines" msgid "Engine" -msgstr "Engines" +msgstr "Engine" #: templates/columns_definitions/partitions.phtml:80 -#, fuzzy #| msgid "Data home directory" msgid "Data directory" -msgstr "Data homemap" +msgstr "Data map" #: templates/columns_definitions/partitions.phtml:81 -#, fuzzy #| msgid "Save directory" msgid "Index directory" -msgstr "Opslagmap" +msgstr "Index map" #: templates/columns_definitions/partitions.phtml:82 -#, fuzzy #| msgid "Matched rows:" msgid "Max rows" -msgstr "Overeenkomende rijen:" +msgstr "Maximaal aantal rijen" #: templates/columns_definitions/partitions.phtml:83 -#, fuzzy #| msgid "rows" msgid "Min rows" -msgstr "Verkennen" +msgstr "Minimaal aantal rijen" #: templates/columns_definitions/partitions.phtml:84 -#, fuzzy #| msgid "Table search" msgid "Table space" -msgstr "Tabel zoeken" +msgstr "Tabel ruimte" #: templates/columns_definitions/partitions.phtml:85 -#, fuzzy #| msgid "User group" msgid "Node group" -msgstr "Gebruikersgroep" +msgstr "Node groep" #: templates/columns_definitions/table_fields_definitions.phtml:16 msgid "" @@ -15402,10 +15380,9 @@ msgstr "" "gebruiken." #: templates/privileges/add_privileges_routine.phtml:3 -#, fuzzy #| msgid "Add privileges on the following table:" msgid "Add privileges on the following routine:" -msgstr "Rechten toevoegen op de volgende tabel:" +msgstr "Rechten toevoegen op de volgende routine:" #: templates/privileges/add_privileges_table.phtml:3 msgid "Add privileges on the following table:" @@ -15732,10 +15709,9 @@ msgid "Partitions" msgstr "Partities %s" #: templates/table/structure/display_partitions.phtml:7 -#, fuzzy #| msgid "No index defined!" msgid "No partitioning defined!" -msgstr "Geen index gedefinieerd!" +msgstr "Geen partitionering gedefinieerd!" #: templates/table/structure/display_partitions.phtml:10 msgid "Partitioned by:" @@ -15754,17 +15730,15 @@ msgid "Index length" msgstr "Lengte van de index" #: templates/table/structure/display_partitions.phtml:134 -#, fuzzy #| msgid "Partitioned by:" msgid "Partition table" -msgstr "Gepartitioneerd op:" +msgstr "Partitietabel" #: templates/table/structure/display_partitions.phtml:137 #: templates/table/structure/partition_definition_form.phtml:7 -#, fuzzy #| msgid "Remove partitioning" msgid "Edit partitioning" -msgstr "Partitionering verwijderen" +msgstr "Partitionering bewerken" #: templates/table/structure/display_structure.phtml:140 view_create.php:181 msgid "Edit view" From 82ecaf7f591fd32d02195dbb1b26a3d110105444 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 1 Oct 2015 21:01:55 +0200 Subject: [PATCH 02/10] Translated using Weblate (Slovenian) Currently translated at 100.0% (3217 of 3217 strings) [CI skip] --- po/sl.po | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/po/sl.po b/po/sl.po index 6a7930354a..7e50a84448 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,17 +4,17 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-01 07:36-0400\n" -"PO-Revision-Date: 2015-09-29 16:36+0200\n" +"PO-Revision-Date: 2015-10-01 21:01+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" -"X-Generator: Weblate 2.5\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.5-dev\n" #: changelog.php:37 license.php:30 #, php-format @@ -953,10 +953,9 @@ msgid "Do you really want to TRUNCATE the selected partition(s)?" msgstr "Ali res želite IZPRAZNITI izbrane razdelke?" #: js/messages.php:66 -#, fuzzy #| msgid "Do you really want to TRUNCATE the selected partition(s)?" msgid "Do you really want to remove partitioning?" -msgstr "Ali res želite IZPRAZNITI izbrane razdelke?" +msgstr "Ali res želite odstraniti razdelitev?" #: js/messages.php:68 msgid "" @@ -4662,6 +4661,8 @@ msgid "" "Stores and enables efficient access to data in JSON (JavaScript Object " "Notation) documents" msgstr "" +"Shrani in omogoča učinkovit dostop do podatkov v dokumentih JSON (JavaScript " +"Object Notation)" #: libraries/Types.class.php:769 msgctxt "numeric types" @@ -15525,10 +15526,9 @@ msgid "Partitions" msgstr "Particije" #: templates/table/structure/display_partitions.phtml:7 -#, fuzzy #| msgid "No index defined!" msgid "No partitioning defined!" -msgstr "Ni definiranega indeksa!" +msgstr "Opredeljena ni nobena razdelitev!" #: templates/table/structure/display_partitions.phtml:10 msgid "Partitioned by:" @@ -15547,17 +15547,15 @@ msgid "Index length" msgstr "Dolžina indeksa" #: templates/table/structure/display_partitions.phtml:134 -#, fuzzy #| msgid "Partition by:" msgid "Partition table" -msgstr "Razdeli po:" +msgstr "Tabela razdelitve" #: templates/table/structure/display_partitions.phtml:137 #: templates/table/structure/partition_definition_form.phtml:7 -#, fuzzy #| msgid "Remove partitioning" msgid "Edit partitioning" -msgstr "Odstrani particioniranje" +msgstr "Uredi razdelitev" #: templates/table/structure/display_structure.phtml:140 view_create.php:181 msgid "Edit view" From 41a59578c193dcbfb6548644bb58e7de4cb27427 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 2 Oct 2015 13:34:30 +0200 Subject: [PATCH 03/10] Translated using Weblate (Turkish) Currently translated at 100.0% (3217 of 3217 strings) [CI skip] --- po/tr.po | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/po/tr.po b/po/tr.po index 7a5be4306d..8c06b0c744 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-01 07:36-0400\n" -"PO-Revision-Date: 2015-09-29 07:19+0200\n" +"PO-Revision-Date: 2015-10-02 13:34+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" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.5\n" +"X-Generator: Weblate 2.5-dev\n" #: changelog.php:37 license.php:30 #, php-format @@ -954,10 +954,9 @@ msgid "Do you really want to TRUNCATE the selected partition(s)?" msgstr "Seçilen bölüm(leri)ü gerçekten KESMEK istiyor musunuz?" #: js/messages.php:66 -#, fuzzy #| msgid "Do you really want to TRUNCATE the selected partition(s)?" msgid "Do you really want to remove partitioning?" -msgstr "Seçilen bölüm(leri)ü gerçekten KESMEK istiyor musunuz?" +msgstr "Bölümlemeyi gerçekten kaldırmak istiyor musunuz?" #: js/messages.php:68 msgid "" @@ -4653,6 +4652,8 @@ msgid "" "Stores and enables efficient access to data in JSON (JavaScript Object " "Notation) documents" msgstr "" +"JSON (JavaScript Nesne Gösterimi) belgelerindeki verilere verimli erişimi " +"etkinleştirir ve saklar" #: libraries/Types.class.php:769 msgctxt "numeric types" @@ -10010,7 +10011,7 @@ msgstr "Bölüm %s" #: libraries/operations.lib.php:1641 #: templates/table/structure/display_partitions.phtml:136 msgid "Remove partitioning" -msgstr "Bölümlendirmeyi kaldır" +msgstr "Bölümlemeyi kaldır" #: libraries/operations.lib.php:1667 msgid "Check referential integrity:" @@ -15547,10 +15548,9 @@ msgid "Partitions" msgstr "Bölümler" #: templates/table/structure/display_partitions.phtml:7 -#, fuzzy #| msgid "No index defined!" msgid "No partitioning defined!" -msgstr "Tanımlı indeks yok!" +msgstr "Tanımlı bölümleme yok!" #: templates/table/structure/display_partitions.phtml:10 msgid "Partitioned by:" @@ -15569,17 +15569,15 @@ msgid "Index length" msgstr "İndeks uzunluğu" #: templates/table/structure/display_partitions.phtml:134 -#, fuzzy #| msgid "Partition by:" msgid "Partition table" -msgstr "Bölümleyen:" +msgstr "Bölüm tablosu" #: templates/table/structure/display_partitions.phtml:137 #: templates/table/structure/partition_definition_form.phtml:7 -#, fuzzy #| msgid "Remove partitioning" msgid "Edit partitioning" -msgstr "Bölümlendirmeyi kaldır" +msgstr "Bölümlemeyi düzenle" #: templates/table/structure/display_structure.phtml:140 view_create.php:181 msgid "Edit view" From 4e668051eeb9f6d5a377d4f0e0a7c938f6727d14 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 2 Oct 2015 18:16:33 +0300 Subject: [PATCH 04/10] Fix #11531. Invalid SQL in table definition when exporting table. Cherry-picked udan11/sql-parser@e5b1cd830d2156127ba090d0d173e344db5fcfd1. Signed-off-by: Dan Ungureanu --- libraries/sql-parser/src/Components/OptionsArray.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/sql-parser/src/Components/OptionsArray.php b/libraries/sql-parser/src/Components/OptionsArray.php index a7fbf41249..a68df8ec63 100644 --- a/libraries/sql-parser/src/Components/OptionsArray.php +++ b/libraries/sql-parser/src/Components/OptionsArray.php @@ -197,7 +197,7 @@ class OptionsArray extends Component } } elseif ($state === 1) { $state = 2; - if ($token->value === '=') { + if ($token->token === '=') { $ret->options[$lastOptionId]['equals'] = true; continue; } From 381dea3be2a86fcc68c319f9520909ab4a567df4 Mon Sep 17 00:00:00 2001 From: Andrey Aleksanyants Date: Thu, 1 Oct 2015 20:31:42 +0200 Subject: [PATCH 05/10] Translated using Weblate (Armenian) Currently translated at 67.4% (2171 of 3217 strings) [CI skip] --- po/hy.po | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/po/hy.po b/po/hy.po index 234430dedf..ebf4d28684 100644 --- a/po/hy.po +++ b/po/hy.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-01 07:36-0400\n" -"PO-Revision-Date: 2015-09-30 05:36+0200\n" +"PO-Revision-Date: 2015-10-01 20:31+0200\n" "Last-Translator: Andrey Aleksanyants \n" -"Language-Team: Armenian \n" +"Language-Team: Armenian " +"\n" "Language: hy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Weblate 2.5\n" +"X-Generator: Weblate 2.5-dev\n" #: changelog.php:37 license.php:30 #, php-format @@ -961,10 +961,9 @@ msgid "Do you really want to TRUNCATE the selected partition(s)?" msgstr "Իսկապե՞ս եք ցանկանում ԴԱՏԱՐԿԵԼ ընտրած մասնաբաժին(ներ)ը։" #: js/messages.php:66 -#, fuzzy #| msgid "Do you really want to TRUNCATE the selected partition(s)?" msgid "Do you really want to remove partitioning?" -msgstr "Իսկապե՞ս եք ցանկանում ԴԱՏԱՐԿԵԼ ընտրած մասնաբաժին(ներ)ը։" +msgstr "Իսկապե՞ս եք ցանկանում վերացնել մասնաբաժանումը։" #: js/messages.php:68 msgid "" @@ -9621,7 +9620,7 @@ msgstr "Մասնաբաժին %s" #: libraries/operations.lib.php:1641 #: templates/table/structure/display_partitions.phtml:136 msgid "Remove partitioning" -msgstr "Հեռացնել մասնահատումը" +msgstr "Հեռացնել մասնաբաժանումը" #: libraries/operations.lib.php:1667 msgid "Check referential integrity:" @@ -14811,10 +14810,9 @@ msgid "Partitions" msgstr "Մասնաբաժիններ" #: templates/table/structure/display_partitions.phtml:7 -#, fuzzy #| msgid "No index defined!" msgid "No partitioning defined!" -msgstr "Ցուցակագիրը սահմանված չէ։" +msgstr "Մասնաբաժանումը սահմանված չէ։" #: templates/table/structure/display_partitions.phtml:10 msgid "Partitioned by:" @@ -14833,17 +14831,15 @@ msgid "Index length" msgstr "Ցուցակագրի երկարությունը" #: templates/table/structure/display_partitions.phtml:134 -#, fuzzy #| msgid "Partition by:" msgid "Partition table" -msgstr "Մասնաբաժին ըստ՝" +msgstr "Մասնաբաժինների աղյուսակ" #: templates/table/structure/display_partitions.phtml:137 #: templates/table/structure/partition_definition_form.phtml:7 -#, fuzzy #| msgid "Remove partitioning" msgid "Edit partitioning" -msgstr "Հեռացնել մասնահատումը" +msgstr "Խմբագրել մասնաբաժանումը" #: templates/table/structure/display_structure.phtml:140 view_create.php:181 msgid "Edit view" From 29c53b232de1e98d7a20765635fa1112b18311d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?= =?UTF-8?q?=CF=82=20=CE=A0=CE=B1=CF=80=CE=AC=CE=B6=CE=BF=CE=B3=CE=BB=CE=BF?= =?UTF-8?q?=CF=85?= Date: Fri, 2 Oct 2015 17:31:39 +0200 Subject: [PATCH 06/10] Translated using Weblate (Greek) Currently translated at 100.0% (3217 of 3217 strings) [CI skip] --- po/el.po | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/po/el.po b/po/el.po index 400957c329..eee93ad65a 100644 --- a/po/el.po +++ b/po/el.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-01 07:36-0400\n" -"PO-Revision-Date: 2015-09-29 10:35+0200\n" +"PO-Revision-Date: 2015-10-02 17:31+0200\n" "Last-Translator: Παναγιώτης Παπάζογλου \n" -"Language-Team: Greek \n" +"Language-Team: Greek " +"\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5\n" +"X-Generator: Weblate 2.5-dev\n" #: changelog.php:37 license.php:30 #, php-format @@ -961,10 +961,9 @@ msgid "Do you really want to TRUNCATE the selected partition(s)?" msgstr "Θέλετε πραγματικά να ΠΕΡΙΚΟΨΕΤΕ τη(ις) επιλεγμένη(ες) κατάτμηση(εις);" #: js/messages.php:66 -#, fuzzy #| msgid "Do you really want to TRUNCATE the selected partition(s)?" msgid "Do you really want to remove partitioning?" -msgstr "Θέλετε πραγματικά να ΠΕΡΙΚΟΨΕΤΕ τη(ις) επιλεγμένη(ες) κατάτμηση(εις);" +msgstr "Θέλετε πραγματικά να απομακρύνετε τη(ις) κατάτμηση(εις);" #: js/messages.php:68 msgid "" @@ -4680,6 +4679,8 @@ msgid "" "Stores and enables efficient access to data in JSON (JavaScript Object " "Notation) documents" msgstr "" +"Αποθηκεύει και ενεργοποιεί επαρκή πρόσβαση σε δεδομένα σε έγγραφα JSON (" +"JavaScript Object Notation)" #: libraries/Types.class.php:769 msgctxt "numeric types" @@ -15719,10 +15720,9 @@ msgid "Partitions" msgstr "Κατατμήσεις" #: templates/table/structure/display_partitions.phtml:7 -#, fuzzy #| msgid "No index defined!" msgid "No partitioning defined!" -msgstr "Δεν ορίστηκε ευρετήριο!" +msgstr "Δεν ορίστηκε κατάτμηση!" #: templates/table/structure/display_partitions.phtml:10 msgid "Partitioned by:" @@ -15741,17 +15741,15 @@ msgid "Index length" msgstr "Μέγεθος ευρετηρίου" #: templates/table/structure/display_partitions.phtml:134 -#, fuzzy #| msgid "Partition by:" msgid "Partition table" -msgstr "Κατάτμηση κατά:" +msgstr "Πίνακας κατάτμησης" #: templates/table/structure/display_partitions.phtml:137 #: templates/table/structure/partition_definition_form.phtml:7 -#, fuzzy #| msgid "Remove partitioning" msgid "Edit partitioning" -msgstr "Απομάκρυνση κατάτμησης" +msgstr "Επεξεργασία κατάτμησης" #: templates/table/structure/display_structure.phtml:140 view_create.php:181 msgid "Edit view" From 8ca9d0d7518908eb42b41d2dcb18902793caa631 Mon Sep 17 00:00:00 2001 From: Stefano Martinelli Date: Thu, 1 Oct 2015 18:11:26 +0200 Subject: [PATCH 07/10] Translated using Weblate (Italian) Currently translated at 99.9% (3216 of 3217 strings) [CI skip] --- po/it.po | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/po/it.po b/po/it.po index 1ba2240d00..0c91ce2ba2 100644 --- a/po/it.po +++ b/po/it.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-01 07:36-0400\n" -"PO-Revision-Date: 2015-09-29 07:52+0200\n" +"PO-Revision-Date: 2015-10-01 18:11+0200\n" "Last-Translator: Stefano Martinelli \n" -"Language-Team: Italian \n" +"Language-Team: Italian " +"\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5\n" +"X-Generator: Weblate 2.5-dev\n" #: changelog.php:37 license.php:30 #, php-format @@ -964,10 +964,9 @@ msgid "Do you really want to TRUNCATE the selected partition(s)?" msgstr "Sei sicuro di voler TRONCARE la partizione selezionata?" #: js/messages.php:66 -#, fuzzy #| msgid "Do you really want to TRUNCATE the selected partition(s)?" msgid "Do you really want to remove partitioning?" -msgstr "Sei sicuro di voler TRONCARE la partizione selezionata?" +msgstr "Sei sicuro di voler rimuovere il partizionamento?" #: js/messages.php:68 msgid "" @@ -15705,10 +15704,9 @@ msgid "Partitions" msgstr "Partizioni" #: templates/table/structure/display_partitions.phtml:7 -#, fuzzy #| msgid "No index defined!" msgid "No partitioning defined!" -msgstr "Nessun indice definito!" +msgstr "Nessun partizionamento definito!" #: templates/table/structure/display_partitions.phtml:10 msgid "Partitioned by:" @@ -15727,17 +15725,15 @@ msgid "Index length" msgstr "Lunghezza indice" #: templates/table/structure/display_partitions.phtml:134 -#, fuzzy #| msgid "Partition by:" msgid "Partition table" -msgstr "Partizione da:" +msgstr "Tabella partizioni" #: templates/table/structure/display_partitions.phtml:137 #: templates/table/structure/partition_definition_form.phtml:7 -#, fuzzy #| msgid "Remove partitioning" msgid "Edit partitioning" -msgstr "Rimuove partizionamento" +msgstr "Modifica partizionamento" #: templates/table/structure/display_structure.phtml:140 view_create.php:181 msgid "Edit view" From a8cd36cd9c8ba8b1609a02609af5d4e9d40ff184 Mon Sep 17 00:00:00 2001 From: Luis Date: Fri, 2 Oct 2015 09:13:55 +0200 Subject: [PATCH 08/10] Translated using Weblate (Portuguese (Brazil)) Currently translated at 91.9% (2957 of 3217 strings) [CI skip] --- po/pt_BR.po | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index cf162ac169..e21e1830fc 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-01 07:36-0400\n" -"PO-Revision-Date: 2015-09-23 17:13+0200\n" -"Last-Translator: Victor Laureano \n" -"Language-Team: Portuguese (Brazil) \n" +"PO-Revision-Date: 2015-10-02 09:13+0200\n" +"Last-Translator: Luis \n" +"Language-Team: Portuguese (Brazil) " +"\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5\n" +"X-Generator: Weblate 2.5-dev\n" #: changelog.php:37 license.php:30 #, php-format @@ -973,14 +973,19 @@ msgid "" "collation; in this case we suggest you revert to the original collation and " "refer to the tips at " msgstr "" +"Esta operação tentará converter seus dados para a nova collation. Em casos " +"raros, especialmente onde um caractere não existe na nova collation, este " +"processo poderia fazer com que os dados aparecessem incorretamente na nova " +"collation; neste caso, sugerimos que você reverta à collation original e " +"siga as dicas em " #: js/messages.php:74 msgid "Garbled Data" -msgstr "" +msgstr "Dados Ilegíveis" #: js/messages.php:76 msgid "Are you sure you wish to change the collation and convert the data?" -msgstr "" +msgstr "Tem certeza de que deseja mudar a collatin e converter os dados?" #: js/messages.php:78 msgid "" @@ -991,6 +996,12 @@ msgid "" "column(s) editing feature (the \"Change\" Link) on the table structure page. " "" msgstr "" +"Por meio desta operação, o MySQL tenta mapear os valores dos dados entre " +"collations. Se os conjuntos de caracteres são incompatíveis, poderá haver " +"perda de dados e esses dados NÃO poderão ser recuperados somente com " +"a reversão de collation da coluna. Para converter dados existentes, é " +"sugerido que se use a funcionalidade de edição de coluna(s) (o link \"" +"Alterar\") na página de estrutura da tabela. " #: js/messages.php:86 msgid "" @@ -999,10 +1010,9 @@ msgid "" msgstr "" #: js/messages.php:89 -#, fuzzy #| msgid "Save & Close" msgid "Save & close" -msgstr "Salvar & Fechar" +msgstr "Salvar & fechar" #: js/messages.php:90 libraries/config/FormDisplay.tpl.php:423 #: libraries/insert_edit.lib.php:1548 prefs_manage.php:361 @@ -1011,10 +1021,9 @@ msgid "Reset" msgstr "Resetar" #: js/messages.php:91 -#, fuzzy #| msgid "Reset All" msgid "Reset all" -msgstr "Redefinir Tudo" +msgstr "Redefinir tudo" #: js/messages.php:94 msgid "Missing value in the form!" @@ -1037,7 +1046,6 @@ msgid "Add index" msgstr "Adicionar índice" #: js/messages.php:99 -#, fuzzy #| msgid "Edit Index" msgid "Edit index" msgstr "Editar índice" @@ -1088,7 +1096,6 @@ msgstr "Query SQL:" #. l10n: Default label for the y-Axis of Charts #: js/messages.php:119 -#, fuzzy #| msgid "Y Values" msgid "Y values" msgstr "Valores Y" @@ -1128,7 +1135,7 @@ msgstr "O número de páginas criadas." #: js/messages.php:131 msgid "Template was loaded." -msgstr "" +msgstr "O template foi carregado." #: js/messages.php:132 #, fuzzy @@ -1754,10 +1761,9 @@ msgid "Request failed!!" msgstr "Pedido Falhou!!" #: js/messages.php:305 -#, fuzzy #| msgid "Error in processing request:" msgid "Error in processing request" -msgstr "Erro no processamento do request:" +msgstr "Erro no processamento da requisição" #: js/messages.php:306 #, php-format From 238e00b5d93a7a8ead47ce197e33e746419e2890 Mon Sep 17 00:00:00 2001 From: Dan Ungureanu Date: Fri, 2 Oct 2015 18:16:33 +0300 Subject: [PATCH 09/10] Fix #11531. Invalid SQL in table definition when exporting table. Cherry-picked udan11/sql-parser@e5b1cd830d2156127ba090d0d173e344db5fcfd1. Signed-off-by: Dan Ungureanu --- libraries/sql-parser/src/Components/OptionsArray.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/sql-parser/src/Components/OptionsArray.php b/libraries/sql-parser/src/Components/OptionsArray.php index a7fbf41249..a68df8ec63 100644 --- a/libraries/sql-parser/src/Components/OptionsArray.php +++ b/libraries/sql-parser/src/Components/OptionsArray.php @@ -197,7 +197,7 @@ class OptionsArray extends Component } } elseif ($state === 1) { $state = 2; - if ($token->value === '=') { + if ($token->token === '=') { $ret->options[$lastOptionId]['equals'] = true; continue; } From 33f1fe5bd929ce8036f6d9c65201a595ed94a67d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 2 Oct 2015 13:26:03 -0400 Subject: [PATCH 10/10] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index cd006aa3a4..2071613cf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog - issue #11512 SQL editing window does not recognise 'OUTER' keyword in 'LEFT OUTER JOIN' - issue #11518 "NOT IN" clause not recognized (MySQL 5.6 and 5.7) - issue #11524 Yellow star does not change in database Structure after add/remove from favorites +- issue #11531 Invalid SQL in table definition when exporting table 4.5.0.2 (2015-09-25) - issue #11497 Incorrect indexes when exporting