From 408ea68f84ab727a2534f4110dcc7e4d4d47df00 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 14 Apr 2015 13:11:13 +0530 Subject: [PATCH 1/5] #4853 Relation view between 1600 and 1780 px Signed-off-by: Madhura Jayaratne --- themes/original/css/common.css.php | 13 ------------- themes/pmahomme/css/common.css.php | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php index a1bb85ff93..8bf7a6cb4d 100644 --- a/themes/original/css/common.css.php +++ b/themes/original/css/common.css.php @@ -247,19 +247,6 @@ fieldset .formelement { white-space: nowrap; } -@media all and (min-width: 1600px) { - fieldset .formelement { - clear: none; - } - #foreign_keys.relationalTable td:first-child + td select { - width: auto; - margin-right: 1%; - } - #foreign_keys.relationalTable { - width: 100%; - } -} - /* revert for Gecko */ fieldset div[class=formelement] { white-space: normal; diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index 37b9aa9931..2c8e915148 100644 --- a/themes/pmahomme/css/common.css.php +++ b/themes/pmahomme/css/common.css.php @@ -531,19 +531,6 @@ fieldset .formelement { white-space: nowrap; } -@media all and (min-width: 1600px) { - fieldset .formelement { - clear: none; - } - #foreign_keys.relationalTable td:first-child + td select { - width: auto; - margin-right: 1%; - } - #foreign_keys.relationalTable { - width: 100%; - } -} - /* revert for Gecko */ fieldset div[class=formelement] { white-space: normal; From 9a04e80561a11f6c04e7765e857915905bd696fe Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 15 Apr 2015 16:58:11 +0530 Subject: [PATCH 2/5] Make the layout responsive Signed-off-by: Madhura Jayaratne --- libraries/tbl_relation.lib.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/tbl_relation.lib.php b/libraries/tbl_relation.lib.php index 44faf5c94e..400ddf2e4e 100644 --- a/libraries/tbl_relation.lib.php +++ b/libraries/tbl_relation.lib.php @@ -463,7 +463,8 @@ function PMA_getHtmlForForeignKeyRow($one_key, $odd_row, $columns, $i, . ' placeholder="' . __('Constraint name') . '" />'; $html_output .= '' . "\n"; - $html_output .= ''; + $html_output .= '
'; + $html_output .= ''; // For ON DELETE and ON UPDATE, the default action // is RESTRICT as per MySQL doc; however, a SHOW CREATE TABLE // won't display the clause if it's set as RESTRICT. @@ -477,7 +478,7 @@ function PMA_getHtmlForForeignKeyRow($one_key, $odd_row, $columns, $i, ); $html_output .= '' . "\n"; - $html_output .= '' . "\n"; + $html_output .= '' . "\n"; $on_update = isset($one_key['on_update']) ? $one_key['on_update'] : 'RESTRICT'; $html_output .= PMA_generateDropdown( @@ -487,6 +488,7 @@ function PMA_getHtmlForForeignKeyRow($one_key, $odd_row, $columns, $i, $on_update ); $html_output .= ''; + $html_output .= '
'; $column_array = array(); $column_array[''] = ''; From 9553647c627aa4e5f772971c854b07063790c89c Mon Sep 17 00:00:00 2001 From: Stefano Martinelli Date: Wed, 15 Apr 2015 09:43:06 +0200 Subject: [PATCH 3/5] Translated using Weblate (Italian) Currently translated at 100.0% (3035 of 3035 strings) [CI skip] --- po/it.po | 61 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/po/it.po b/po/it.po index 62fb590708..e0fb62a6db 100644 --- a/po/it.po +++ b/po/it.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-30 08:55-0400\n" -"PO-Revision-Date: 2015-04-14 22:48+0200\n" +"PO-Revision-Date: 2015-04-15 09:43+0200\n" "Last-Translator: Stefano Martinelli \n" "Language-Team: Italian " "\n" @@ -12540,7 +12540,7 @@ msgstr "Grant" #: libraries/server_privileges.lib.php:2275 msgid "Not enough privilege to view users." -msgstr "" +msgstr "Non hai sufficienti privilegi per visualizzare gli utenti." #: libraries/server_privileges.lib.php:2295 #: libraries/server_privileges.lib.php:3672 @@ -12698,6 +12698,8 @@ msgid "" "Note: You are attempting to edit privileges of the user with which you are " "currently logged in." msgstr "" +"Nota: Stai cercando di modificare i privilegi dell'utente con cui sei " +"collegato attualmente." #: libraries/server_privileges.lib.php:4176 libraries/server_users.lib.php:25 msgid "Users overview" @@ -13526,7 +13528,7 @@ msgstr "Percentuale di cache delle chiavi utilizzata (valore calcolato)" #: libraries/server_status_variables.lib.php:598 msgid "The number of requests to read a key block from the cache." -msgstr "Il numero di richieste per le ggere un blocco chiave dalla cache." +msgstr "Il numero di richieste per leggere un blocco chiave dalla cache." #: libraries/server_status_variables.lib.php:601 msgid "" @@ -13535,15 +13537,17 @@ msgid "" "can be calculated as Key_reads/Key_read_requests." msgstr "" "Il numero di letture fisiche dal disco di un blocco chiave. Se Key_reads è " -"grande allora il valore key_buffer_size è probabilmente troppo piccolo. IIl " -"rapporto di cache miss rate può essere calcolato come Key_reads/" -"Key_read_requests." +"grande allora il valore key_buffer_size è probabilmente troppo piccolo. II " +"rapporto di mancate letture dalla cache delle chivi può essere calcolato " +"come Key_reads/Key_read_requests." #: libraries/server_status_variables.lib.php:607 msgid "" "Key cache miss calculated as rate of physical reads compared to read " "requests (calculated value)" msgstr "" +"La mancata lettura dalla cache delle chiavi viene calcolato come rapporto " +"tra le letture fisiche e le richieste di lettura (valore calcolato)" #: libraries/server_status_variables.lib.php:611 msgid "The number of requests to write a key block to the cache." @@ -13557,6 +13561,8 @@ msgstr "Il numero di scritture fisiche di un blocco chiave sul disco." msgid "" "Percentage of physical writes compared to write requests (calculated value)" msgstr "" +"Percentuale di scritture fisiche in rapporto alle scritture richieste (" +"valore calcolato)" #: libraries/server_status_variables.lib.php:621 msgid "" @@ -13801,11 +13807,11 @@ msgstr "Il numero di processi non in attesa." #: libraries/server_user_groups.lib.php:23 #, php-format msgid "Users of '%s' user group" -msgstr "" +msgstr "Utenti del gruppo utenti '%s'" #: libraries/server_user_groups.lib.php:35 msgid "No users were found belonging to this user group." -msgstr "" +msgstr "Non sono stati trovati utenti appartenenti a questo gruppo." #: libraries/server_user_groups.lib.php:64 libraries/server_users.lib.php:33 #| msgid "Users" @@ -13841,7 +13847,7 @@ msgstr "Aggiungi gruppo utente" #: libraries/server_user_groups.lib.php:212 #, php-format msgid "Edit user group: '%s'" -msgstr "" +msgstr "Modifica il gruppo utenti: '%s'" #: libraries/server_user_groups.lib.php:228 #| msgid "No privileges." @@ -13908,7 +13914,7 @@ msgstr "Stato" #: libraries/sql.lib.php:354 msgid "Summary by state" -msgstr "" +msgstr "Sommario per stato" #: libraries/sql.lib.php:360 #| msgid "Total time:" @@ -13985,7 +13991,7 @@ msgstr "Esegui la/e query SQL sul database %s" #: libraries/sql_query_form.lib.php:240 msgid "Get auto-saved query" -msgstr "" +msgstr "Ottieni la query auto-memorizzata" #: libraries/sql_query_form.lib.php:284 #| msgid "Bookmark this SQL query" @@ -14006,7 +14012,7 @@ msgstr "Mostra di nuovo questa query" #: libraries/sql_query_form.lib.php:333 msgid "Rollback when finished" -msgstr "" +msgstr "Annulla le modifiche quando hai finito" #: libraries/sql_query_form.lib.php:386 msgid "View only" @@ -14130,7 +14136,7 @@ msgstr "Aggiungi campi alla lista centrale" #: libraries/structure.lib.php:351 msgid "Remove columns from central list" -msgstr "" +msgstr "Rimuove campi dalla lista centrale" #: libraries/structure.lib.php:353 #| msgid "CHAR textarea columns" @@ -14196,7 +14202,7 @@ msgstr "Muovi campi" #: libraries/structure.lib.php:1552 msgid "Move the columns by dragging them up and down." -msgstr "" +msgstr "Sposta i campi trascinandoli su e giù." #: libraries/structure.lib.php:1601 view_create.php:182 msgid "Edit view" @@ -14358,7 +14364,7 @@ msgstr "Spline" #: libraries/tbl_chart.lib.php:50 msgctxt "Chart type" msgid "Area" -msgstr "" +msgstr "Area" #: libraries/tbl_chart.lib.php:53 msgctxt "Chart type" @@ -14374,7 +14380,7 @@ msgstr "Timeline" #: libraries/tbl_chart.lib.php:64 msgctxt "Chart type" msgid "Scatter" -msgstr "" +msgstr "Distribuzione" #: libraries/tbl_chart.lib.php:82 msgid "Stacked" @@ -14402,7 +14408,7 @@ msgstr "Etichetta per l'asse Y:" #: libraries/tbl_chart.lib.php:237 msgid "Series names are in a column" -msgstr "" +msgstr "I nomi delle serie sono i un campo" #: libraries/tbl_chart.lib.php:240 #| msgid "Inside column:" @@ -14534,11 +14540,11 @@ msgstr "Scegli dai Campi Centrali" #: libraries/tbl_columns_definition_form.lib.php:818 msgid "first" -msgstr "" +msgstr "primo" #: libraries/tbl_columns_definition_form.lib.php:1099 msgid "Edit ENUM/SET values" -msgstr "" +msgstr "Modifica i valori ENUM/SET" #: libraries/tbl_columns_definition_form.lib.php:1124 msgctxt "for default" @@ -14598,7 +14604,7 @@ msgstr "Scelta dell'indice:" #: libraries/tbl_indexes.lib.php:321 msgid "Key block size:" -msgstr "" +msgstr "Dimensione del key block:" #: libraries/tbl_indexes.lib.php:334 msgid "Index type:" @@ -14669,6 +14675,8 @@ msgstr "Proprietà del vincolo" msgid "" "Only columns with index will be displayed. You can define an index below." msgstr "" +"Saranno visualizzati solo campi con indice. Puoi definire un indice qui " +"sotto." #: libraries/tbl_relation.lib.php:381 msgid "Foreign key constraint" @@ -14912,7 +14920,7 @@ msgstr "Non sono stati trovati file ZIP all'interno dell'archivio!" #: navigation.php:20 msgid "Fatal error: The navigation can only be accessed via AJAX" -msgstr "" +msgstr "Errore fatale: si può accedere ala navigazione solo tramite AJAX" #: prefs_forms.php:86 #| msgid "Cannot save settings, submitted form contains errors" @@ -14997,7 +15005,7 @@ msgstr "Visualizza il dump (schema) dei databases" #: server_privileges.php:141 msgid "Username and hostname didn't change." -msgstr "" +msgstr "Username e hostname non sono cambiati." #: server_status_processes.php:36 #, php-format @@ -15196,11 +15204,12 @@ msgstr "Nessun dato da visualizzare" #: tbl_chart.php:61 tbl_gis_visualization.php:24 msgid "No SQL query was set to fetch data." -msgstr "" +msgstr "Nessuna query SQL era impostata per estrarre dati." #: tbl_chart.php:119 msgid "No numeric columns present in the table to plot." msgstr "" +"Nella tabella non sono presenti campi numerici da visualizzare graficamente." #: tbl_create.php:33 tbl_get_field.php:25 #, php-format @@ -15223,14 +15232,14 @@ msgstr "Nome tabella non valido" #: tbl_replace.php:236 #, php-format msgid "Row: %1$s, Column: %2$s, Error: %3$s" -msgstr "" +msgstr "Riga: %1$s, Campo: %2$s, Errore: %3$s" #: tbl_structure.php:63 #, php-format msgid "The name '%s' is a MySQL reserved keyword." msgid_plural "The names '%s' are MySQL reserved keywords." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Il nome '%s' è un termine riservato MySQL." +msgstr[1] "I nomi '%s' sono termini riservati MySQL." #: tbl_structure.php:114 msgid "No column selected." From 01b0bfd36c227e6b194496583cf4a146845a14d0 Mon Sep 17 00:00:00 2001 From: Bao trinh minh Date: Wed, 15 Apr 2015 09:55:21 +0200 Subject: [PATCH 4/5] Translated using Weblate (Vietnamese) Currently translated at 2.3% (70 of 3035 strings) [CI skip] --- po/vi.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/po/vi.po b/po/vi.po index 937ebdfdfd..6d36f80f4b 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-30 08:55-0400\n" -"PO-Revision-Date: 2015-03-09 10:33+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Vietnamese \n" +"PO-Revision-Date: 2015-04-15 09:55+0200\n" +"Last-Translator: Bao trinh minh \n" +"Language-Team: Vietnamese " +"\n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Weblate 2.3-dev\n" @@ -407,12 +407,12 @@ msgstr "Cấu trúc ảnh chụp" #: db_tracking.php:184 libraries/tracking.lib.php:418 #: libraries/tracking.lib.php:1436 msgid "not active" -msgstr "" +msgstr "Chưa kích hoạt" #: db_tracking.php:189 libraries/tracking.lib.php:416 #: libraries/tracking.lib.php:1434 msgid "active" -msgstr "" +msgstr "Kích hoạt" #: db_tracking.php:277 msgid "Untracked tables" From 603f93d168f11265271e8f4dd4434b1b96ba0058 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 15 Apr 2015 08:01:01 -0400 Subject: [PATCH 5/5] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index b6842f6ad8..48ffd13132 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - bug #4207 json_encode error due to strftime returning non utf8 chars in Windows 8.1 Chinese version - bug #4794 Server error viewing table content - bug Fix issues related to number of decimal places in time +- bug #4853 Relation view between 1600 and 1780 px 4.4.2.0 (2015-04-13) - bug #4835 PMA_hideShowConnection not called after submit_num_fields