Merge remote-tracking branch 'origin/master' into useNamespaces_master

This commit is contained in:
Hugues Peccatte 2015-10-03 08:23:49 +02:00
commit bd8fbb49be
9 changed files with 107 additions and 140 deletions

View File

@ -28,6 +28,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

View File

@ -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;
}

View File

@ -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: Παναγιώτης Παπάζογλου <papaz_p@yahoo.com>\n"
"Language-Team: Greek <https://hosted.weblate.org/projects/phpmyadmin/master/"
"el/>\n"
"Language-Team: Greek "
"<https://hosted.weblate.org/projects/phpmyadmin/master/el/>\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"

View File

@ -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 <aaleksanyants@yahoo.com>\n"
"Language-Team: Armenian <https://hosted.weblate.org/projects/phpmyadmin/"
"master/hy/>\n"
"Language-Team: Armenian "
"<https://hosted.weblate.org/projects/phpmyadmin/master/hy/>\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"

View File

@ -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 <stefano.ste.martinelli@gmail.com>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/phpmyadmin/"
"master/it/>\n"
"Language-Team: Italian "
"<https://hosted.weblate.org/projects/phpmyadmin/master/it/>\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"

View File

@ -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 <dingo13@gmail.com>\n"
"Language-Team: Dutch <https://hosted.weblate.org/projects/phpmyadmin/master/"
"nl/>\n"
"Language-Team: Dutch "
"<https://hosted.weblate.org/projects/phpmyadmin/master/nl/>\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"

View File

@ -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 <victor.laureano@gmail.com>\n"
"Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
"phpmyadmin/master/pt_BR/>\n"
"PO-Revision-Date: 2015-10-02 09:13+0200\n"
"Last-Translator: Luis <luis.eduardo.braschi@outlook.com>\n"
"Language-Team: Portuguese (Brazil) "
"<https://hosted.weblate.org/projects/phpmyadmin/master/pt_BR/>\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. "
"</b>"
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 <b>NÃO</b> poderão ser recuperados somente com "
"a reversão de collation da coluna.<b> 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. </b>"
#: 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

View File

@ -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 <mitenem@outlook.com>\n"
"Language-Team: Slovenian <https://hosted.weblate.org/projects/phpmyadmin/"
"master/sl/>\n"
"Language-Team: Slovenian "
"<https://hosted.weblate.org/projects/phpmyadmin/master/sl/>\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"

View File

@ -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 <hitowerdigit@hotmail.com>\n"
"Language-Team: Turkish <https://hosted.weblate.org/projects/phpmyadmin/"
"master/tr/>\n"
"Language-Team: Turkish "
"<https://hosted.weblate.org/projects/phpmyadmin/master/tr/>\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"