From 18bccea2915d770a67812e0be9e5fded9166b159 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Mon, 16 Mar 2015 04:31:21 +0530 Subject: [PATCH 01/13] Fixes bug #4803 Signed-off-by: Deven Bansod --- libraries/navigation/NavigationTree.class.php | 7 +++++++ libraries/navigation/Nodes/Node_Database.class.php | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index fc6acd0e07..d6f47f68ab 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -733,6 +733,13 @@ class PMA_NavigationTree $keySeparatorLength ) ); + + if ($new_child instanceof Node_Database + && $child->getHiddenCount() > 0 + ) { + $new_child->setHiddenCount($child->getHiddenCount()); + } + $new_child->real_name = $child->real_name; $new_child->icon = $child->icon; $new_child->links = $child->links; diff --git a/libraries/navigation/Nodes/Node_Database.class.php b/libraries/navigation/Nodes/Node_Database.class.php index 7fca56c110..e8151d93da 100644 --- a/libraries/navigation/Nodes/Node_Database.class.php +++ b/libraries/navigation/Nodes/Node_Database.class.php @@ -652,6 +652,16 @@ class Node_Database extends Node { $this->_hiddenCount = $count; } + + /** + * Returns the number of hidden items in this database + * + * @return int hidden item count + */ + public function getHiddenCount() + { + return $this->_hiddenCount; + } } ?> From 31cbe20756077c74455ca42aa98fd64773dddf5b Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Sun, 15 Mar 2015 22:07:56 +0100 Subject: [PATCH 02/13] Translated using Weblate (Interlingua) Currently translated at 68.8% (2087 of 3032 strings) [CI skip] --- po/ia.po | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/po/ia.po b/po/ia.po index d4d3849b4f..71b33df353 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.0-alpha1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-06 08:15-0500\n" -"PO-Revision-Date: 2015-03-09 15:46+0200\n" +"PO-Revision-Date: 2015-03-15 22:07+0200\n" "Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua " "\n" @@ -4914,6 +4914,10 @@ msgid "" "setting for [em]$cfg['Servers'][%3$d]['SessionTimeZone'][/em]. phpMyAdmin is " "currently using the default time zone of the database server." msgstr "" +"Incapace a usar fuso horari %1$s pro servitor %2$d. Pro verifica tu " +"preferentias de configuration per " +"[em]$cfg['Servers'][%3$d]['SessionTimeZone'][/em]. phpMyAdmin es " +"currentemente usante le fuso horari predefinite de servitor de base de datos." #: libraries/common.inc.php:1020 #, php-format @@ -5378,6 +5382,9 @@ msgid "" "MySQL server is enabled by matching the IP or hostname of the MySQL server " "to the given regular expression." msgstr "" +"Il restringe le servitores de MySQL que le usator pote insertar quando un " +"accesso a un servitor MySQL arbitrari es habilitate per equalar le IP o le " +"nomine de hospite del servitor MySQL a le date expression regular." #: libraries/config/messages.inc.php:25 msgid "Restrict login to MySQL server" From 12e8654df065a7d395f5c159c27485320fe9004e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 16 Mar 2015 07:59:26 -0400 Subject: [PATCH 03/13] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index c0e198e255..98d2072d80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.3.13.0 (not yet released) +- bug #4803 "Show hidden items" is sometimes hidden 4.3.12.0 (2015-03-14) - bug #4746 Right-aligned columns have left-aligned header From 14ef13024ecaaa259794a9f2be93088ea0cd7044 Mon Sep 17 00:00:00 2001 From: Xavier Navarro Date: Mon, 16 Mar 2015 07:13:26 +0100 Subject: [PATCH 04/13] Translated using Weblate (Catalan) Currently translated at 95.9% (2908 of 3032 strings) [CI skip] --- po/ca.po | 82 +++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 27 deletions(-) diff --git a/po/ca.po b/po/ca.po index 27d910d377..1b6e1ab4f4 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.0-alpha1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-06 08:15-0500\n" -"PO-Revision-Date: 2015-03-13 18:57+0200\n" +"PO-Revision-Date: 2015-03-16 07:13+0200\n" "Last-Translator: Xavier Navarro \n" "Language-Team: Catalan " "\n" @@ -1877,6 +1877,9 @@ msgid "" "No columns in the central list. Make sure the Central columns list for " "database %s has columns that are not present in the current table." msgstr "" +"No hi ha columnes a la llista central. Assegura't que la llista central de " +"columnes per a la base de dades %s tingui columnes que no estiguin a la " +"taula actual." #: js/messages.php:315 msgid "See more" @@ -1884,13 +1887,15 @@ msgstr "Veure més" #: js/messages.php:316 msgid "Are you sure?" -msgstr "" +msgstr "Estàs segur?" #: js/messages.php:317 msgid "" "This action may change some of the columns definition.
Are you sure you " "want to continue?" msgstr "" +"Aquesta acció pot canviar la definició d'algunes columnes.
Estàs segur " +"de voler continuar?" #: js/messages.php:318 msgid "Continue" @@ -1912,7 +1917,7 @@ msgstr "Portant-te al següent pas…" #: js/messages.php:324 #, php-format msgid "The first step of normalization is complete for table '%s'." -msgstr "" +msgstr "S'ha completat el primer pas de la normalització per a la taula '%s'." #: js/messages.php:325 libraries/normalization.lib.php:422 #: libraries/normalization.lib.php:469 libraries/normalization.lib.php:552 @@ -1922,7 +1927,7 @@ msgstr "Fi de pas" #: js/messages.php:326 msgid "Second step of normalization (2NF)" -msgstr "" +msgstr "Segon pas de normalització (2NF)" #. l10n: Display text for calendar close link #: js/messages.php:327 js/messages.php:573 libraries/normalization.lib.php:264 @@ -1931,17 +1936,19 @@ msgstr "Fet" #: js/messages.php:328 msgid "Confirm partial dependencies" -msgstr "" +msgstr "Confirmar dependències parcials" #: js/messages.php:329 msgid "Selected partial dependencies are as follows:" -msgstr "" +msgstr "Les dependències parcials seleccionades són:" #: js/messages.php:330 msgid "" "Note: a, b -> d,f implies values of columns a and b combined together can " "determine values of column d and column f." msgstr "" +"Nota: a, b -> d, f implica que els valors combinats de les columnes a i b " +"poden determinar el valor de les columnes d i f." #: js/messages.php:331 msgid "No partial dependencies selected!" @@ -1950,20 +1957,23 @@ msgstr "No s'han triat dependències parcials!" #: js/messages.php:333 msgid "Show me the possible partial dependencies based on data in the table" msgstr "" +"Mostra'm les possibles dependències parcials basades en les dades de la taula" #: js/messages.php:334 msgid "Hide partial dependencies list" -msgstr "" +msgstr "Amaga la llista de dependències parcials" #: js/messages.php:335 msgid "" "Sit tight! It may take few seconds depending on data size and column count " "of the table." msgstr "" +"Paciència! Pot tardar uns segons, depenent de la mida de les dades i de la " +"quantitat de columnes de la taula." #: js/messages.php:336 msgid "Step" -msgstr "" +msgstr "Pas" #: js/messages.php:337 msgid "The following actions will be performed:" @@ -1972,7 +1982,7 @@ msgstr "Les següents accions es faràn:" #: js/messages.php:338 #, php-format msgid "DROP columns %s from the table %s" -msgstr "" +msgstr "Eliminar columnes %s de la taula %s" #: js/messages.php:339 msgid "Create the following table" @@ -1980,15 +1990,15 @@ msgstr "Crea la següent taula" #: js/messages.php:342 msgid "Third step of normalization (3NF)" -msgstr "" +msgstr "Tercer pas de la normalització (3NF)" #: js/messages.php:343 msgid "Confirm transitive dependencies" -msgstr "" +msgstr "Confirmar dependències transitives" #: js/messages.php:344 msgid "Selected dependencies are as follows:" -msgstr "" +msgstr "Les dependències seleccionades són:" #: js/messages.php:345 msgid "No dependencies selected!" @@ -2130,6 +2140,8 @@ msgid "" "Indicates that you have made changes to this page; you will be prompted for " "confirmation before abandoning changes" msgstr "" +"Indica que has fet canvis en aquesta pàgina; se't preguntarà per la teva " +"confirmació abans d'abandonar els canvis" #: js/messages.php:409 msgid "Select referenced key" @@ -2187,11 +2199,11 @@ msgstr "Entra un nom de pàgina vàlid" #: js/messages.php:424 msgid "Do you want to save the changes to the current page?" -msgstr "" +msgstr "Vols desar els canvis a la pàgina actual?" #: js/messages.php:425 msgid "Successfully deleted the page" -msgstr "" +msgstr "Pàgina esborrada correctament" #: js/messages.php:426 msgid "Export relational schema" @@ -2275,12 +2287,16 @@ msgstr "" #: js/messages.php:446 msgid "Please enter a valid hexadecimal string. Valid characters are 0-9, A-F." msgstr "" +"Introdueix una cadena hexadecimal correcta. Els caracters vàlids són 0-9 i " +"A-F." #: js/messages.php:447 msgid "" "Do you really want to see all of the rows? For a big table this could crash " "the browser." msgstr "" +"De veritat vols veure totes les files? Una taula gran pot fer fallar el " +"navegador." #: js/messages.php:450 msgid "cancel" @@ -2292,7 +2308,7 @@ msgstr "Avortat" #: js/messages.php:453 msgid "Success" -msgstr "" +msgstr "Correcte" #: js/messages.php:454 msgid "Import status" @@ -2369,11 +2385,14 @@ msgstr "Desenllaça amb el panell principal" #: js/messages.php:487 msgid "To filter all databases on server, press Enter after a search term" msgstr "" +"Per a filtrar totes les bases de dades al servidor, prem Enter després d'un " +"terme de la cerca" #: js/messages.php:488 #, php-format msgid "To filter all %s in database, press Enter after a search term" msgstr "" +"Per a filtrar %s a la base de dades, prem Enter després d'un terme de cerca" #: js/messages.php:489 #| msgid "Tables" @@ -2469,11 +2488,11 @@ msgstr "" #: js/messages.php:526 js/messages.php:538 msgid "Some errors have been detected on the server!" -msgstr "" +msgstr "Detectats alguns errors al servidor!" #: js/messages.php:528 msgid "Please look at the bottom of this window." -msgstr "" +msgstr "Mira al peu d'aquesta finestra." #: js/messages.php:533 libraries/Error_Handler.class.php:353 msgid "Ignore All" @@ -2483,6 +2502,7 @@ msgstr "Ignora tot" msgid "" "As per your settings, they are being submitted currently, please be patient." msgstr "" +"Un moment, s'estan enviant en aquest moment degut a la teva configuració." #: js/messages.php:547 msgid "Execute this query again?" @@ -2498,6 +2518,10 @@ msgid "" "limit has been reached, some features may not work properly for you. In " "Safari, such problem is commonly caused by \"Private Mode Browsing\"." msgstr "" +"El teu navegador no soporta el desat local de preferències o bé s'ha assolit " +"el límit de la quota, algunes característiques no et funcionaràn " +"correctament. En Safari, aixó pot estar causat pel \"Mode de Navegació " +"Privada\"." #: js/messages.php:577 msgctxt "Previous month" @@ -2836,11 +2860,11 @@ msgstr "Tamany de lletra" #: libraries/Console.class.php:93 libraries/Console.class.php:175 msgid "Collapse" -msgstr "" +msgstr "Col·lapsar" #: libraries/Console.class.php:94 libraries/Console.class.php:177 msgid "Expand" -msgstr "" +msgstr "Expandir" #: libraries/Console.class.php:95 libraries/Console.class.php:178 msgid "Requery" @@ -2881,7 +2905,7 @@ msgstr[1] "Total %d desats" #: libraries/Console.class.php:116 msgid "private" -msgstr "" +msgstr "privat" #: libraries/Console.class.php:120 libraries/bookmark.lib.php:87 msgid "shared" @@ -2924,7 +2948,7 @@ msgstr "Consola de consultes SQL" #: libraries/Console.class.php:196 msgid "Console" -msgstr "" +msgstr "Consola" #: libraries/Console.class.php:199 libraries/sql_query_form.lib.php:234 #: setup/frames/index.inc.php:298 @@ -3009,7 +3033,7 @@ msgstr "Establir el valor per defecte" #: libraries/Console.class.php:308 msgid "Always expand query messages" -msgstr "" +msgstr "Sempre expandir missatges de consultes" #: libraries/Console.class.php:310 msgid "Show query history at start" @@ -3017,7 +3041,7 @@ msgstr "Mostrar l'historial de consultes a l'inici" #: libraries/Console.class.php:312 msgid "Show current browsing query" -msgstr "" +msgstr "Mostrar la consulta actual" #: libraries/DBQbe.class.php:391 libraries/DisplayResults.class.php:1352 #: libraries/DisplayResults.class.php:2139 @@ -4740,11 +4764,13 @@ msgid "" "The configuration storage is not ready for the central list of columns " "feature." msgstr "" +"L'emmagatzematge de configuració no està preparat per a la funcionalitat de " +"la llista central de columnes." #: libraries/central_columns.lib.php:275 #, php-format msgid "Could not add %1$s as they already exist in central list!" -msgstr "" +msgstr "No s'ha pogut afegir %1$s perqué ja existeix a la llista central!" #: libraries/central_columns.lib.php:290 msgid "Could not add columns!" @@ -4755,6 +4781,8 @@ msgstr "No es poden afegir columnes!" msgid "" "Couldn't remove Column(s) %1$s as they don't exist in central columns list!" msgstr "" +"No s'ha(n) pogut treure la/les columna(es) %1$s perqué no existeix(en) a la " +"llista central de columnes!" #: libraries/central_columns.lib.php:377 msgid "Could not remove columns!" @@ -4762,11 +4790,11 @@ msgstr "No es poden treure columnes!" #: libraries/central_columns.lib.php:541 msgid "YES" -msgstr "" +msgstr "SI" #: libraries/central_columns.lib.php:541 msgid "NO" -msgstr "" +msgstr "NO" #: libraries/central_columns.lib.php:662 #: libraries/display_create_table.lib.php:60 @@ -4821,7 +4849,7 @@ msgstr "Afegir una nova columna" #: libraries/central_columns.lib.php:966 msgid "on update CURRENT_TIMESTAMP" -msgstr "" +msgstr "a l'actualitzar usa CURRENT_TIMESTAMP" #: libraries/common.inc.php:579 msgid "Failed to read configuration file!" From e12582acdb3254df2ee46d9acff3456518c8ac8e Mon Sep 17 00:00:00 2001 From: Nisarg Jhaveri Date: Mon, 16 Mar 2015 19:04:42 +0530 Subject: [PATCH 05/13] Fix bug#4807 Don't add `.` if table name is not set when trying to get column in sort expression. Signed-off-by: Nisarg Jhaveri --- libraries/DisplayResults.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 48035a2546..6b321951b5 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -2022,7 +2022,10 @@ class PMA_DisplayResults if (/*overload*/mb_strpos($name_to_use_in_sort, '(') !== false) { $sort_order .= $query_head . $name_to_use_in_sort . ' ' ; } else { - $sort_order .= $query_head . $sort_tbl_new . "." + if (/*overload*/mb_strlen($sort_tbl_new) > 0) { + $sort_tbl_new .= "."; + } + $sort_order .= $query_head . $sort_tbl_new . PMA_Util::backquote( $name_to_use_in_sort ) . ' ' ; From d7e68f6fac9895eeee29f30bed820088219afcd1 Mon Sep 17 00:00:00 2001 From: dingo thirteen Date: Mon, 16 Mar 2015 17:37:07 +0100 Subject: [PATCH 06/13] Translated using Weblate (Dutch) Currently translated at 100.0% (3032 of 3032 strings) [CI skip] --- po/nl.po | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/po/nl.po b/po/nl.po index 4d8ad4b121..8ab33b1a8d 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.0-alpha1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-06 08:15-0500\n" -"PO-Revision-Date: 2015-03-05 21:47+0200\n" -"Last-Translator: Dieter Adriaenssens \n" -"Language-Team: Dutch \n" +"PO-Revision-Date: 2015-03-16 17:37+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" "Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 2.3-dev\n" @@ -826,7 +826,6 @@ msgid "List of changes" msgstr "Lijst met wijzigingen" #: index.php:447 -#, fuzzy #| msgid "" #| "Your configuration file contains settings (root with no password) that " #| "correspond to the default MySQL privileged account. Your MySQL server is " @@ -838,10 +837,10 @@ msgid "" "default, is open to intrusion, and you really should fix this security hole " "by setting a password for user 'root'." msgstr "" -"Uw configuratiebestand bevat instellingen (root zonder wachtwoord) die " -"betrekking hebben tot het standaard MySQL-account. Uw MySQL-server draait " -"met deze standaardwaarden, en is open voor ongewilde toegang. Het wordt " -"aangeraden dit op te lossen." +"U bent verbonden als 'root' zonder wachtwoord dit is het standaard MySQL " +"beheerdersaccount. Uw MySQL-server draait met deze standaard instellingen en " +"is open voor ongewilde toegang. U moet dit beveiligingslek echt dichten door " +"een wachtwoord in te stellen voor gebruiker 'root'." #: index.php:464 msgid "" @@ -11890,11 +11889,10 @@ msgstr "Vereist SSL" #: libraries/server_privileges.lib.php:759 #: libraries/server_privileges.lib.php:768 -#, fuzzy #| msgid "Requires that a specific cipher method be used for a connection." msgid "Requires that a specific cipher method be used for a connection." msgstr "" -"Vereist dat een specifieke versleutel methode wordt gebruikt voor een " +"Vereist dat een specifieke versleutelmethode wordt gebruikt voor een " "connectie." #: libraries/server_privileges.lib.php:778 From da656d7f5d51956508257e5f53761732915f85f2 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 17 Mar 2015 08:43:48 -0400 Subject: [PATCH 07/13] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 98d2072d80..59d7aa94a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.3.13.0 (not yet released) - bug #4803 "Show hidden items" is sometimes hidden +- bug #4807 Breaks when sorting by multiple columns while using UNION 4.3.12.0 (2015-03-14) - bug #4746 Right-aligned columns have left-aligned header From 9fcfcd8d19e8e89747187a0cfbec10983d3dd4ac Mon Sep 17 00:00:00 2001 From: Xavier Navarro Date: Tue, 17 Mar 2015 07:12:02 +0100 Subject: [PATCH 08/13] Translated using Weblate (Catalan) Currently translated at 97.9% (2969 of 3032 strings) [CI skip] --- po/ca.po | 134 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 101 insertions(+), 33 deletions(-) diff --git a/po/ca.po b/po/ca.po index 1b6e1ab4f4..ec44b6c469 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.0-alpha1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-06 08:15-0500\n" -"PO-Revision-Date: 2015-03-16 07:13+0200\n" +"PO-Revision-Date: 2015-03-17 07:12+0200\n" "Last-Translator: Xavier Navarro \n" "Language-Team: Catalan " "\n" @@ -4903,6 +4903,10 @@ msgid "" "setting for [em]$cfg['Servers'][%3$d]['SessionTimeZone'][/em]. phpMyAdmin is " "currently using the default time zone of the database server." msgstr "" +"No és possible usar el fus horari %1$s per al servidor %2$d. Comprova la " +"teva configuració per a [em]$cfg['Servers'][%3$d]['SessionTimeZone'][/em]. " +"phpMyAdmin fa servir actualment el fus horari per defecte del servidor de " +"base de dades." #: libraries/common.inc.php:1020 #, php-format @@ -4968,7 +4972,7 @@ msgstr "Desactivat" #: libraries/config.values.php:98 msgid "key" -msgstr "" +msgstr "clau" #: libraries/config.values.php:99 #| msgid "Display columns table" @@ -5359,6 +5363,9 @@ msgid "" "MySQL server is enabled by matching the IP or hostname of the MySQL server " "to the given regular expression." msgstr "" +"Restringeix els servidors MySQL als que l'usuari pot entrar quan s'activa " +"una connexió a un servidor MySQL arbitrari fent coincidir l'adreça IP o el " +"nom de l'equip del servidor MySQL mitjançant una expressió regular." #: libraries/config/messages.inc.php:25 #| msgid "Cannot log in to the MySQL server" @@ -6409,6 +6416,7 @@ msgstr "Límit de memoria" #: libraries/config/messages.inc.php:424 msgid "In the navigation panel, replaces the database tree with a selector" msgstr "" +"Al panell de navegació, substitueix l'arbre de bases de dades amb un selector" #: libraries/config/messages.inc.php:426 #| msgid "Show hidden navigation tree items." @@ -6418,6 +6426,7 @@ msgstr "Mostra a navegació de les bases de dades com un arbre" #: libraries/config/messages.inc.php:428 msgid "Link with main panel by highlighting the current database or table." msgstr "" +"Enllaç amb el panell principal destacant l'actual base de dades o taula." #: libraries/config/messages.inc.php:430 msgid "Show logo in navigation panel." @@ -6524,6 +6533,7 @@ msgstr "Activa resaltat" msgid "" "Whether to offer the possibility of tree expansion in the navigation panel." msgstr "" +"Quan s'ofereix la possibilitat d'expandir l'arbre al panell de navegació." #: libraries/config/messages.inc.php:472 #| msgid "Iconic navigation bar" @@ -6658,7 +6668,7 @@ msgstr "Còm mostrar les pestanyes del menù" #: libraries/config/messages.inc.php:518 msgid "How to display various action links" -msgstr "" +msgstr "Cóm mostrar diversos enllaços d'accions" #: libraries/config/messages.inc.php:519 #| msgid "Disallow BLOB and BINARY columns from editing" @@ -6714,7 +6724,7 @@ msgstr "Recordar l'ordenació de les taules" #: libraries/config/messages.inc.php:536 msgid "Default sort order for tables with a primary key." -msgstr "" +msgstr "Ordenació per defecte per a taules amb clau principal." #: libraries/config/messages.inc.php:537 #| msgid "Default sorting order" @@ -6796,6 +6806,8 @@ msgid "" "Sets the effective timezone; possibly different than the one from your " "database server" msgstr "" +"Estableix el fus horari efectiu; possiblement diferent del del teu servidor " +"de base de dades" #: libraries/config/messages.inc.php:557 #| msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth" @@ -7332,6 +7344,9 @@ msgid "" "configurable menus feature; leaving either one of them blank will disable " "this feature, suggested: [kbd]pma__users[/kbd]." msgstr "" +"Tant aquesta taula com la taula de grups d'usuari es necessiten per activar " +"la funcionalitat de menús configurables; deixant una d'ambdues en blanc " +"desactivarà aquesta funcionalitat, suggerit: [kbd]pma__users[/kbd]." #: libraries/config/messages.inc.php:724 #| msgid "Use Tables" @@ -7344,6 +7359,9 @@ msgid "" "menus feature; leaving either one of them blank will disable this feature, " "suggested: [kbd]pma__usergroups[/kbd]." msgstr "" +"Tant aquesta taula com la taula d'usuaris es necessiten per activar la " +"funcionalitat de menús configurables; deixant una d'ambdues en blanc " +"desactivarà aquesta funcionalitat, suggerit: [kbd]pma__usergroups[/kbd]." #: libraries/config/messages.inc.php:726 #| msgid "Use Host Table" @@ -7363,7 +7381,7 @@ msgstr "" #: libraries/config/messages.inc.php:728 msgid "Hidden navigation items table" -msgstr "" +msgstr "Taula d'elements de navegació amagada" #: libraries/config/messages.inc.php:730 msgid "User for config auth" @@ -7712,10 +7730,14 @@ msgid "" "if the server where phpMyAdmin is installed does not have direct access to " "the internet. The format is: \"hostname:portnumber\"." msgstr "" +"La URL del proxy a utilitzar per a obtenir informació sobre la darrera " +"versió de phpMyAdmin o al enviar informes d'errors. Es necessitarà si el " +"servidor òn està instal.lat phpMyAdmin no té accés directe a internet. El " +"formato es: \"servidor:port\"." #: libraries/config/messages.inc.php:795 msgid "Proxy url" -msgstr "" +msgstr "URL del proxy" #: libraries/config/messages.inc.php:796 msgid "" @@ -7723,6 +7745,9 @@ msgid "" "authentication is performed. If a username is supplied, Basic Authentication " "will be performed. No other types of authentication are currently supported." msgstr "" +"El nom d'usuari per a autenticar amb el proxy. Per defecte, no es fa " +"autenticació. Si es dona un nom d'usuari, es farà una autenticació bàsica. " +"Actualment no hi ha compatibilitat amb altres tipus d'autenticació." #: libraries/config/messages.inc.php:797 #| msgid "Username" @@ -7731,7 +7756,7 @@ msgstr "Nom d'usuari del proxy" #: libraries/config/messages.inc.php:798 msgid "The password for authenticating with the proxy." -msgstr "" +msgstr "La contrasenya per autenticar amb el proxy." #: libraries/config/messages.inc.php:799 #| msgid "Password" @@ -7756,23 +7781,23 @@ msgstr "ZIP" #: libraries/config/messages.inc.php:803 msgid "Enter your public key for your domain reCaptcha service." -msgstr "" +msgstr "Entra la teva clau pública pel teu domini del servei reCaptcha." #: libraries/config/messages.inc.php:804 msgid "Public key for reCaptcha" -msgstr "" +msgstr "Clau pùblica per a reCaptcha" #: libraries/config/messages.inc.php:805 msgid "Enter your private key for your domain reCaptcha service." -msgstr "" +msgstr "Entra la teva clau privada pel teu domini del servei reCaptcha." #: libraries/config/messages.inc.php:806 msgid "Private key for reCaptcha" -msgstr "" +msgstr "Clau privada per a reCaptcha" #: libraries/config/messages.inc.php:808 msgid "Choose the default action when sending error reports." -msgstr "" +msgstr "Tria l'acció per defecte quan s'enviin informes d'error." #: libraries/config/messages.inc.php:809 #| msgid "Server port" @@ -7784,6 +7809,8 @@ msgid "" "Enable Zero Configuration mode which lets you setup phpMyAdmin configuration " "storage tables automatically." msgstr "" +"Activar el mode de «Configuració Zero» que et permet definir les taules " +"d'emmagatzemament de configuració de phpMyAdmin automàticament." #: libraries/config/messages.inc.php:814 #| msgid "Server configuration" @@ -7866,13 +7893,15 @@ msgstr "Sense canvis" #: libraries/database_interface.inc.php:32 #, php-format msgid "See %sour documentation%s for more information." -msgstr "" +msgstr "Consulta %sla nostra documentació%s per a més informació." #: libraries/database_interface.inc.php:48 msgid "" "You are using the mysql extension which is deprecated in phpMyAdmin. Please " "consider installing the mysqli extension." msgstr "" +"Estàs fent servir l'extensió -mysql- ja obsoleta per a phpMyAdmin. Considera " +"instal.lar l'extensió -mysqli-." #: libraries/db_designer.lib.php:25 msgid "Select page" @@ -8259,7 +8288,7 @@ msgstr "Veure la sortida com a texte" #: libraries/display_export.lib.php:653 libraries/display_export.lib.php:757 msgid "Rename exported databases/tables/columns" -msgstr "" +msgstr "Reanomenar les bases de dades/taules/columnes exportades" #: libraries/display_export.lib.php:663 msgid "Save output to a file" @@ -8267,7 +8296,7 @@ msgstr "Desa la sortida com a arxiu" #: libraries/display_export.lib.php:690 msgid "Skip tables larger than" -msgstr "" +msgstr "Ometre taules més grans que" #: libraries/display_export.lib.php:784 #| msgid "Select Tables" @@ -8364,7 +8393,7 @@ msgstr "Arxiu a importar:" #: libraries/display_import.lib.php:232 libraries/display_import.lib.php:243 msgid "You may also drag and drop a file on any page." -msgstr "" +msgstr "També pots arrossegar un arxiu en qualsevol pàgina." #: libraries/display_import.lib.php:246 msgid "File uploads are not allowed on this server." @@ -8397,6 +8426,8 @@ msgid "" "Skip this number of queries (for SQL) or lines (for other formats), starting " "from the first one:" msgstr "" +"Saltar aquesta quantitat de consultes (en SQL) or línies (en altres formats)" +", contant des de la primera:" #: libraries/display_import.lib.php:340 msgid "Format-Specific Options:" @@ -8800,14 +8831,17 @@ msgid "" "as well as information about relevant configuration settings to send to the " "phpMyAdmin team to help us in debugging the problem." msgstr "" +"phpMyAdmin ha trobat un error. Hem reunit dades sobre aquest error així com " +"informació relevant de configuració per a enviar al equip de phpMyAdmin per " +"a ajudar-nos a investigar el problema." #: libraries/error_report.lib.php:358 msgid "You may examine the data in the error report:" -msgstr "" +msgstr "Pots examinar les dades a l'informe d'error:" #: libraries/error_report.lib.php:365 msgid "Please explain the steps that lead to the error:" -msgstr "" +msgstr "Explica les passes que porten a l'error:" #: libraries/export.lib.php:118 libraries/export.lib.php:153 #: libraries/export.lib.php:377 @@ -8841,7 +8875,7 @@ msgstr "MySQL ha retornat un conjunt buit (p.e. cap fila)." #: libraries/import.lib.php:265 libraries/sql.lib.php:1512 msgid "[ROLLBACK occurred.]" -msgstr "" +msgstr "[S'ha produït un ROLLBACK.]" #: libraries/import.lib.php:1255 msgid "" @@ -8894,13 +8928,15 @@ msgstr "Anar a la vista: %s" #: libraries/import.lib.php:1382 msgid "Only single-table UPDATE and DELETE queries can be simulated." -msgstr "" +msgstr "Només es poden simular consultes UPDATE i DELETE sobre una sola taula." #: libraries/import.lib.php:1799 msgid "" "Only INSERT, UPDATE, DELETE and REPLACE SQL queries containing transactional " "engine tables can be rolled back." msgstr "" +"Només es poden desfer (-rollback-) consultes SQL INSERT, UPDATE, DELETE i " +"REPLACE que continguin taules de motors transaccionals." #: libraries/index.lib.php:34 #, php-format @@ -8993,7 +9029,7 @@ msgstr "Converteix a Kana" #: libraries/mult_submits.inc.php:301 msgid "Success!" -msgstr "" +msgstr "Correcte!" #: libraries/mult_submits.lib.php:338 #| msgid "Replace table prefix" @@ -9270,6 +9306,9 @@ msgid "" "There are large item groups in navigation panel which may affect the " "performance. Consider disabling item grouping in the navigation panel." msgstr "" +"Hi ha grans grups d'elements al panell de navegació que poden afectar el " +"rendiment. Considera desactivar l'agrupació d'elements al panell de " +"navegació." #: libraries/navigation/NavigationTree.class.php:864 #, php-format @@ -9303,7 +9342,7 @@ msgstr "Filtrar pel nom o expresió regular" #: libraries/navigation/NavigationTree.class.php:1322 msgid "Collapse all" -msgstr "" +msgstr "Col.lapsar tots" #. l10n: The word "Node" must not be translated here #: libraries/navigation/NodeFactory.class.php:41 @@ -9319,7 +9358,7 @@ msgstr "" #: libraries/navigation/Nodes/Node.class.php:786 msgid "Expand/Collapse" -msgstr "" +msgstr "Expandir/Col.lapsar" #: libraries/navigation/Nodes/Node_Column_Container.class.php:26 #: libraries/navigation/Nodes/Node_Column_Container.class.php:27 @@ -9421,32 +9460,37 @@ msgstr "Nova" #: libraries/normalization.lib.php:114 msgid "Make all columns atomic" -msgstr "" +msgstr "Convertir totes les columnes a atómiques" #: libraries/normalization.lib.php:116 libraries/normalization.lib.php:773 msgid "First step of normalization (1NF)" -msgstr "" +msgstr "Primer pas de la normalització (1NF)" #: libraries/normalization.lib.php:119 libraries/normalization.lib.php:170 #: libraries/normalization.lib.php:213 libraries/normalization.lib.php:249 msgid "Step 1." -msgstr "" +msgstr "Pas 1." #: libraries/normalization.lib.php:121 msgid "" "Do you have any column which can be split into more than one column? For " "example: address can be split into street, city, country and zip." msgstr "" +"Tens alguna columna que es pugui dividir en més? Per exemple, l'adreça es " +"pot dividir en carrer, ciutat, país i codi postal." #: libraries/normalization.lib.php:128 msgid "Show me the central list of columns that are not already in this table" msgstr "" +"Mostra la llista central de columnes que encara no estiguin en aquesta taula" #: libraries/normalization.lib.php:131 msgid "" "Select a column which can be split into more than one. (on select of 'no " "such column', it'll move to next step)" msgstr "" +"Selecciona una columna que es pugui dividir en més d'una. (seleccionant 'cap " +"columna' anem al següent pas)" #: libraries/normalization.lib.php:138 normalization.php:19 #| msgid "Select two columns" @@ -9460,7 +9504,7 @@ msgstr "Cap columna" #: libraries/normalization.lib.php:146 msgid "split into " -msgstr "" +msgstr "dividir en " #: libraries/normalization.lib.php:167 #| msgid "Add primary key" @@ -9477,15 +9521,20 @@ msgid "" "There is no primary key; please add one.
Hint: A primary key is a column " "(or combination of columns) that uniquely identify all rows." msgstr "" +"No existeix una clau principal; afegeix una.
Suggeriment: una clau " +"principal és una columna (o combinació de columnes) que identifiquen " +"unívocament a totes les files." #: libraries/normalization.lib.php:185 msgid "Add a primary key on existing column(s)" -msgstr "" +msgstr "Afegir una clau principal en columna(es) existent(s)" #: libraries/normalization.lib.php:190 msgid "" "If it's not possible to make existing column combinations as primary key" msgstr "" +"No és possible utilitzar la combinació de columnes existents com a clau " +"principal" #: libraries/normalization.lib.php:194 #| msgid "Add primary key" @@ -9503,12 +9552,17 @@ msgid "" "For example, if you have first_name, last_name and full_name then combining " "first_name and last_name gives full_name which is redundant." msgstr "" +"Tens un grup de columnes que amb la seva combinació s'obtingui un altre " +"columna existent? Per exemple, si tens cognom, nom i nom_complet, llavors " +"combinant cognom i nom s'obté nom_complet, el que es redundant." #: libraries/normalization.lib.php:221 msgid "" "Check the columns which are redundant and click on remove. If no redundant " "column, click on 'No redundant column'" msgstr "" +"Revisa les columnes que siguin redundants i prem en eliminar. Si no hi ha, " +"prem en 'Cap columna redundant'" #: libraries/normalization.lib.php:226 #| msgid "Remove selected users" @@ -9522,7 +9576,7 @@ msgstr "Cap columna redundant" #: libraries/normalization.lib.php:248 msgid "Move repeating groups" -msgstr "" +msgstr "Moure grups repetits" #: libraries/normalization.lib.php:251 msgid "" @@ -9532,24 +9586,31 @@ msgid "" "on which form a repeating group. In this case a new table (book_id, author) " "should be created." msgstr "" +"Tens un grup de dues o més columnes estretament relacionades i que " +"repeteixen el mateix atribut? Per exemple, una taula que té dades sobre " +"llibres pot tenir columnes com id_llibre, autor1, autor2, autor3, etc. que " +"formen un grup repetit. En aquest cas hauries de crear una nova taula amb " +"id_llibre, autor." #: libraries/normalization.lib.php:259 msgid "" "Check the columns which form a repeating group. If no such group, click on " "'No repeating group'" msgstr "" +"Revisa les columnes que formin un grup repetitiu. Si no hi ha, prem en 'Cap " +"grup repetitiu'" #: libraries/normalization.lib.php:265 msgid "No repeating group" -msgstr "" +msgstr "Cap grup repetitiu" #: libraries/normalization.lib.php:291 msgid "Step 2." -msgstr "" +msgstr "Pas 2." #: libraries/normalization.lib.php:291 msgid "Find partial dependencies" -msgstr "" +msgstr "Cercar dependències parcials" #: libraries/normalization.lib.php:313 #, php-format @@ -9557,10 +9618,12 @@ msgid "" "No partial dependencies possible as no non-primary column exists since " "primary key ( %1$s ) is composed of all the columns in the table." msgstr "" +"No hi ha dependències parcials possibles degut a que la clau principal (%1$s)" +" està composta per totes les columnes de la taula." #: libraries/normalization.lib.php:318 libraries/normalization.lib.php:360 msgid "Table is already in second normal form." -msgstr "" +msgstr "La taula ja hi és en segona forma normal." #: libraries/normalization.lib.php:323 #, php-format @@ -9568,16 +9631,21 @@ msgid "" "The primary key ( %1$s ) consists of more than one column so we need to find " "the partial dependencies." msgstr "" +"La clau principal (%1$s) conté més d'una columna, pel que necessitem trobar " +"les dependències parcials." #: libraries/normalization.lib.php:327 libraries/normalization.lib.php:692 msgid "" "Please answer the following question(s) carefully to obtain a correct " "normalization." msgstr "" +"Respón a la /les pregunta(es) següent(s) acuradament per a obtenir una " +"normalització correcta." #: libraries/normalization.lib.php:331 msgid "+ Show me the possible partial dependencies based on data in the table" msgstr "" +"+ Mostrar les dependències parcials possibles segons les dades de la taula" #: libraries/normalization.lib.php:335 msgid "" From 0ec97263f0ffbe735ff63eae59b00aa5555d8f72 Mon Sep 17 00:00:00 2001 From: Jonas Date: Mon, 16 Mar 2015 19:34:49 +0100 Subject: [PATCH 09/13] Translated using Weblate (Danish) Currently translated at 99.7% (3024 of 3032 strings) [CI skip] --- po/da.po | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/po/da.po b/po/da.po index f9e1ed1aac..5cb8c92f4c 100644 --- a/po/da.po +++ b/po/da.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.0-alpha1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-06 08:15-0500\n" -"PO-Revision-Date: 2015-02-25 06:28+0200\n" -"Last-Translator: Aputsiaĸ Niels Janussen \n" -"Language-Team: Danish \n" +"PO-Revision-Date: 2015-03-16 19:34+0200\n" +"Last-Translator: Jonas \n" +"Language-Team: Danish " +"\n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: da\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 2.3-dev\n" @@ -820,7 +820,6 @@ msgid "List of changes" msgstr "Liste over ændringer" #: index.php:447 -#, fuzzy #| msgid "" #| "Your configuration file contains settings (root with no password) that " #| "correspond to the default MySQL privileged account. Your MySQL server is " @@ -832,10 +831,11 @@ msgid "" "default, is open to intrusion, and you really should fix this security hole " "by setting a password for user 'root'." msgstr "" -"Din konfigurationsfil indeholder indstillinger (root og ingen adgangskode) " -"som svarer til en standard MySQL-priviligeret brugerkonto. Din MySQL server " -"kører med denne standardindstilling, er åben for indtrængen, og du " -"opfordres stærkt til at gøre noget ved dette sikkerhedshul." +"Du er tilsluttet som \"root\" med intet kodeord, som svarer til en standard " +"MySQL-priviligeret brugerkonto. Din MySQL server kører med denne " +"standardindstilling, er åben for indtrængen, og du opfordres stærkt til at " +"gøre noget ved dette sikkerhedshul, ved at sætte et kodeord til brugeren \"" +"root\"." #: index.php:464 msgid "" @@ -1838,7 +1838,7 @@ msgstr "Bladre i fremmedværdier" #: js/messages.php:308 msgid "No auto-saved query" -msgstr "" +msgstr "Ingen automatisk gemt forespørgsel" #: js/messages.php:311 libraries/normalization.lib.php:849 msgid "Pick" @@ -2118,6 +2118,8 @@ msgid "" "Indicates that you have made changes to this page; you will be prompted for " "confirmation before abandoning changes" msgstr "" +"Indikerer at du har lavet ændringer ved denne side, du vil blive spurgt om " +"godkendelse før ændringerne frafalder" #: js/messages.php:409 msgid "Select referenced key" @@ -4768,10 +4770,9 @@ msgid "Length/Values" msgstr "Længde/Værdi*" #: libraries/central_columns.lib.php:670 -#, fuzzy #| msgid "Attributes" msgid "Attribute" -msgstr "Attributter" +msgstr "Attribut" #: libraries/central_columns.lib.php:674 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:974 @@ -5112,7 +5113,7 @@ msgid "Key should contain letters, numbers [em]and[/em] special characters." msgstr "Nøglen bør indeholde bogstaver, numre [em]og[/em] specialtegn." #: libraries/config/ServerConfigChecks.class.php:371 -#, fuzzy, php-format +#, php-format #| msgid "" #| "This %soption%s should be disabled as it allows attackers to bruteforce " #| "login to any MySQL server. If you feel this is necessary, use %strusted " @@ -5128,7 +5129,8 @@ msgid "" msgstr "" "Denne %soption%s bør deaktiveres, da den tillader angribere at lave et " "bruteforce login til en vilkårlig MySQL server. Hvis du føler, at dette er " -"nødvendigt, brug %strusted proxies list%s. IP-baseret beskyttelse er næppe " +"nødvendigt, brug %srestrict login to MySQL server%s eller %strusted proxies " +"list%s. IP-baseret beskyttelse med en tiltroet proxyliste er næppe " "pålidelig, hvis din IP-adresse hører til en udbyder med mange tusinde " "brugere." @@ -5318,10 +5320,9 @@ msgid "" msgstr "" #: libraries/config/messages.inc.php:25 -#, fuzzy #| msgid "Cannot log in to the MySQL server" msgid "Restrict login to MySQL server" -msgstr "Kan ikke logge ind på MySQL-serveren" +msgstr "Begræns login på MySQL-serveren" #: libraries/config/messages.inc.php:27 msgid "" @@ -9735,10 +9736,9 @@ msgid "Please enter correct captcha!" msgstr "Angiv venligst korrekt captcha!" #: libraries/plugins/auth/AuthenticationCookie.class.php:422 -#, fuzzy #| msgid "Cannot log in to the MySQL server" msgid "You are not allowed to log in to this MySQL server!" -msgstr "Kan ikke logge ind på MySQL-serveren" +msgstr "Du har ikke tilladelse til at logge ind på denne MySQL server!" #: libraries/plugins/auth/AuthenticationHttp.class.php:91 msgid "Wrong username/password. Access denied." @@ -11754,10 +11754,9 @@ msgstr "Brugergruppe" #: libraries/server_privileges.lib.php:726 #: libraries/server_privileges.lib.php:837 -#, fuzzy #| msgid "Persistent connections" msgid "Requires SSL-encrypted connections." -msgstr "Vedvarende forbindelser" +msgstr "Kræver SSL-krypterede forbindelser." #: libraries/server_privileges.lib.php:734 msgid "Require SSL" From 364b26b0dd783cbcc2b1be2113d2cf8cfbde1931 Mon Sep 17 00:00:00 2001 From: Andrea Vallorani Date: Tue, 17 Mar 2015 18:15:13 +0100 Subject: [PATCH 10/13] Bug #4798 Missing column when exporting in sql (2) Export failure when the comments contains reserved keywords (KEY, CONSTRAINT) To resolve, I removed the SQL comment from the current line before checking the presence of reserved keywords. Signed-off-by: Andrea Vallorani --- libraries/plugins/export/ExportSql.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 9f1ebb72d9..fcdc52dd77 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -1435,9 +1435,10 @@ class ExportSql extends ExportPlugin // lets find first line with constraints $first_occur = -1; for ($i = 0; $i < $sql_count; $i++) { + $sql_line = current(explode(' COMMENT ', $sql_lines[$i], 2)); if (preg_match( '@[\s]+(CONSTRAINT|KEY)@', - $sql_lines[$i] + $sql_line ) && $first_occur == -1) { $first_occur = $i; } From 4b8f3c9e615092ecc71310d1707e1b164ca8c26b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 17 Mar 2015 16:01:37 -0400 Subject: [PATCH 11/13] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 59d7aa94a9..0af052663a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 4.3.13.0 (not yet released) - bug #4803 "Show hidden items" is sometimes hidden - bug #4807 Breaks when sorting by multiple columns while using UNION +- bug #4798 Missing column when exporting in sql 4.3.12.0 (2015-03-14) - bug #4746 Right-aligned columns have left-aligned header From d5bcc22ebe801436d0d64dca1f4e4afac4400675 Mon Sep 17 00:00:00 2001 From: Xavier Navarro Date: Tue, 17 Mar 2015 18:45:06 +0100 Subject: [PATCH 12/13] Translated using Weblate (Catalan) Currently translated at 99.0% (3004 of 3032 strings) [CI skip] --- po/ca.po | 77 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 24 deletions(-) diff --git a/po/ca.po b/po/ca.po index ec44b6c469..cee61e9200 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.0-alpha1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-06 08:15-0500\n" -"PO-Revision-Date: 2015-03-17 07:12+0200\n" +"PO-Revision-Date: 2015-03-17 18:45+0200\n" "Last-Translator: Xavier Navarro \n" "Language-Team: Catalan " "\n" @@ -9653,11 +9653,14 @@ msgid "" "given set whose values combined together are sufficient to determine the " "value of the column." msgstr "" +"Per a cada una de les columnes a sota, selecciona el conjunt mínim de " +"columnes entre les que els seus valors combinats són suficients per a " +"determinar el valor de la columna." #: libraries/normalization.lib.php:345 libraries/normalization.lib.php:730 #, php-format msgid "'%1$s' depends on:" -msgstr "" +msgstr "'%1$s' depèn de:" #: libraries/normalization.lib.php:356 #, php-format @@ -9665,6 +9668,8 @@ msgid "" "No partial dependencies possible as the primary key ( %1$s ) has just one " "column." msgstr "" +"No hi ha dependències parcials possibles ja que la clau principal ( %1$s ) " +"només té una columna." #: libraries/normalization.lib.php:381 #, php-format @@ -9672,11 +9677,13 @@ msgid "" "In order to put the original table '%1$s' into Second normal form we need to " "create the following tables:" msgstr "" +"Per tal de convertir la taula original '%1$s' a la segona forma normal " +"necessitem crear les següents taules:" #: libraries/normalization.lib.php:417 #, php-format msgid "The second step of normalization is complete for table '%1$s'." -msgstr "" +msgstr "S'ha completat el segon pas de normalització per a la taula '%1$s'." #: libraries/normalization.lib.php:457 libraries/normalization.lib.php:600 #: libraries/normalization.lib.php:663 @@ -9690,10 +9697,12 @@ msgid "" "In order to put the original table '%1$s' into Third normal form we need to " "create the following tables:" msgstr "" +"Per tal de convertir la taula original '%1$s' a la tercera forma normal " +"necessitem crear les següents taules:" #: libraries/normalization.lib.php:548 msgid "The third step of normalization is complete." -msgstr "" +msgstr "S'ha completat el tercer pas de normalització." #: libraries/normalization.lib.php:642 #, php-format @@ -9708,7 +9717,7 @@ msgstr "Pas 3." #: libraries/normalization.lib.php:689 msgid "Find transitive dependencies" -msgstr "" +msgstr "Cercar dependències transitives" #: libraries/normalization.lib.php:696 msgid "" @@ -9717,16 +9726,22 @@ msgid "" "value of the column.
Note: A column may have no transitive dependency, " "in that case you don't have to select any." msgstr "" +"Per a cada una de les columnes a sota, selecciona el conjunt mínim de " +"columnes entre les que els seus valors combinats junts són suficients per a " +"determinar el valor de la columna.
Nota: Una columna pot no tenir " +"dependències transitives, en aquest cas no tens que seleccionar cap." #: libraries/normalization.lib.php:743 msgid "" "No Transitive dependencies possible as the table doesn't have any non " "primary key columns" msgstr "" +"No hi ha dependències transitives possibles ja que la taula no té cap " +"columna que no pertany a una clau principal" #: libraries/normalization.lib.php:747 msgid "Table is already in Third normal form!" -msgstr "" +msgstr "La taula ja es troba en tercera forma normal!" #: libraries/normalization.lib.php:770 #| msgid "Hide table structure actions" @@ -9735,31 +9750,35 @@ msgstr "Millorar l'estructura de taula (Normalització):" #: libraries/normalization.lib.php:771 msgid "Select up to what step you want to normalize" -msgstr "" +msgstr "Selecciona fins a quin pas vols normalitzar" #: libraries/normalization.lib.php:774 msgid "Second step of normalization (1NF+2NF)" -msgstr "" +msgstr "Segon pas de normalització (1NF+2NF)" #: libraries/normalization.lib.php:775 msgid "Third step of normalization (1NF+2NF+3NF)" -msgstr "" +msgstr "Tercer pas de normalització (1NF+2NF+3NF)" #: libraries/normalization.lib.php:782 msgid "" "Hint: Please follow the procedure carefully in order to obtain correct " "normalization" msgstr "" +"Consell: Segueix el procediment amb molta cura per obtenir una normalització " +"correcta" #: libraries/normalization.lib.php:843 msgid "" "This list is based on a subset of the table's data and is not necessarily " "accurate. " msgstr "" +"Aquesta llista està basada en un subconjunt de les dades de la taula i no és " +"necessàriament acurada. " #: libraries/normalization.lib.php:859 msgid "No partial dependencies found!" -msgstr "" +msgstr "No s'han trobat dependències parcials!" #: libraries/operations.lib.php:75 #| msgid "Rename database to" @@ -10015,7 +10034,7 @@ msgstr "" #: libraries/plugins/auth/AuthenticationConfig.class.php:164 msgid "Retry to connect" -msgstr "" +msgstr "Reintentar connexió" #: libraries/plugins/auth/AuthenticationCookie.class.php:146 msgid "Your session has expired. Please log in again." @@ -10041,11 +10060,11 @@ msgstr "Elecció de Servidor:" #: libraries/plugins/auth/AuthenticationCookie.class.php:354 msgid "Entered captcha is wrong, try again!" -msgstr "" +msgstr "El captcha entrat és incorrecte, intenta de nou!" #: libraries/plugins/auth/AuthenticationCookie.class.php:364 msgid "Please enter correct captcha!" -msgstr "" +msgstr "Entra el captcha correcte!" #: libraries/plugins/auth/AuthenticationCookie.class.php:422 #| msgid "Cannot log in to the MySQL server" @@ -10423,22 +10442,22 @@ msgstr "" #: libraries/plugins/export/ExportSql.class.php:511 msgid "It appears your database uses procedures;" -msgstr "" +msgstr "Sembla que la teva base de dades fa servir procediments;" #: libraries/plugins/export/ExportSql.class.php:515 #: libraries/plugins/export/ExportSql.class.php:551 #: libraries/plugins/export/ExportSql.class.php:1260 #: libraries/plugins/export/ExportSql.class.php:1798 msgid "alias export may not work reliably in all cases." -msgstr "" +msgstr "exportar els àlies podria no funcionar correctament en tots els casos." #: libraries/plugins/export/ExportSql.class.php:548 msgid "It appears your database uses functions;" -msgstr "" +msgstr "Sembla que la teva base de dades fa servir funcions;" #: libraries/plugins/export/ExportSql.class.php:1257 msgid "It appears your database uses views;" -msgstr "" +msgstr "Sembla que la teva base de dades fa servir vistes;" #: libraries/plugins/export/ExportSql.class.php:1302 msgid "Constraints for dumped tables" @@ -10478,7 +10497,7 @@ msgstr "RELACIONS DE LA TAULA" #: libraries/plugins/export/ExportSql.class.php:1795 msgid "It appears your table uses triggers;" -msgstr "" +msgstr "Sembla que la teva base de dades fa servir disparadors (-triggers-);" #: libraries/plugins/export/ExportSql.class.php:1827 #, php-format @@ -10657,7 +10676,7 @@ msgstr "Orientació" #: libraries/plugins/schema/SchemaPdf.class.php:67 #: libraries/plugins/schema/SchemaSvg.class.php:66 msgid "Same width for all tables" -msgstr "" +msgstr "El mateix ample per a totes les taules" #: libraries/plugins/schema/SchemaPdf.class.php:89 msgid "Show grid" @@ -10714,6 +10733,9 @@ msgid "" "Converts Boolean values to text (default 'T' and 'F'). First option is for " "TRUE, second for FALSE. Nonzero=true." msgstr "" +"Converteix els valors booleans a text (per defecte 'T' i 'F'). La primera " +"opció es per a -TRUE- (cert) i la segona per a -FALSE- (fals). Diferent de " +"zero = cert." #: libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php:31 msgid "" @@ -10809,10 +10831,13 @@ msgid "" "Image upload functionality which also displays a thumbnail. The options are " "the width and height of the thumbnail in pixels. Defaults to 100 X 100." msgstr "" +"Funcionalitat per a pujar imatges que també mostra miniatures. Les opcions " +"són l'amplada i l'alçada de la miniatura en píxels. El valor per defecte és " +"de 100 X 100." #: libraries/plugins/transformations/abstract/ImageUploadTransformationsPlugin.class.php:79 msgid "Image preview here" -msgstr "" +msgstr "Previsualització de l'imatge" #: libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php:33 msgid "" @@ -10848,11 +10873,13 @@ msgid "" "Validates the string using regular expression and performs insert only if " "string matches it. The first option is the Regular Expression." msgstr "" +"Valida la cadena usant expressions regulars i només insereix si el valor " +"coincideix. La primera opció és l'expressió regular." #: libraries/plugins/transformations/abstract/RegexValidationTransformationsPlugin.class.php:55 #, php-format msgid "Validation failed for the input string %s." -msgstr "" +msgstr "Ha fallat la validació de la cadena d'entrada %s." #: libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php:31 msgid "Formats text as SQL query with syntax highlighting." @@ -10877,6 +10904,8 @@ msgid "" "File upload functionality for TEXT columns. It does not have a textarea for " "input." msgstr "" +"Funcionalitat per a pujar arxius a columnes TEXT. No té un àrea de text per " +"entrar o editar." #: libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php:33 msgid "" @@ -10899,15 +10928,15 @@ msgstr "" #: libraries/plugins/transformations/input/Text_Plain_JsonEditor.class.php:33 msgid "Syntax highlighted CodeMirror editor for JSON." -msgstr "" +msgstr "Ressaltat de sintaxi de l'editor CodeMirror per a JSON." #: libraries/plugins/transformations/input/Text_Plain_SqlEditor.class.php:33 msgid "Syntax highlighted CodeMirror editor for SQL." -msgstr "" +msgstr "Ressaltat de sintaxi de l'editor CodeMirror per a SQL." #: libraries/plugins/transformations/input/Text_Plain_XmlEditor.class.php:33 msgid "Syntax highlighted CodeMirror editor for XML (and HTML)." -msgstr "" +msgstr "Ressaltat de sintaxi de l'editor CodeMirror per a XML (i HTML)." #: libraries/plugins/transformations/output/Text_Plain_Json.class.php:40 #| msgid "Formats text as SQL query with syntax highlighting." From 42afa53f32fbb49b0404be8f257f1ee287775db7 Mon Sep 17 00:00:00 2001 From: Xavier Navarro Date: Wed, 18 Mar 2015 06:47:33 +0100 Subject: [PATCH 13/13] Translated using Weblate (Catalan) Currently translated at 100.0% (3032 of 3032 strings) [CI skip] --- po/ca.po | 57 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/po/ca.po b/po/ca.po index cee61e9200..778ee448db 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.0-alpha1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-06 08:15-0500\n" -"PO-Revision-Date: 2015-03-17 18:45+0200\n" +"PO-Revision-Date: 2015-03-18 06:47+0200\n" "Last-Translator: Xavier Navarro \n" "Language-Team: Catalan " "\n" @@ -10964,7 +10964,7 @@ msgstr "Error: La relació de CLAU EXTERNA no s'ha afegit!" #: libraries/pmd_common.php:548 msgid "Error: Missing index on column(s)." -msgstr "" +msgstr "Error. Índex no trobat en columna (es)." #: libraries/pmd_common.php:552 #| msgid "Error: Relation not added." @@ -11083,11 +11083,11 @@ msgstr "Amaga/mostra els elements de navegació" #: libraries/relation.lib.php:298 msgid "Saving Query-By-Example searches" -msgstr "" +msgstr "Desant cerques de Consulta-Per-Exemple" #: libraries/relation.lib.php:309 msgid "Managing Central list of columns" -msgstr "" +msgstr "Gestió de la llista central de columnes" #: libraries/relation.lib.php:317 msgid "Quick steps to setup advanced features:" @@ -11467,7 +11467,7 @@ msgstr "Error en reiniciar la replicació." #: libraries/replication_gui.lib.php:935 msgid "Success." -msgstr "" +msgstr "Correcte." #: libraries/replication_gui.lib.php:936 #| msgid "Error" @@ -11906,7 +11906,7 @@ msgstr "No hi ha esdeveniments per mostrar." #: libraries/select_lang.lib.php:613 msgid "Ignoring unsupported language code." -msgstr "" +msgstr "Ignorant codi d'idioma no suportat." #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:46 #| msgid "Current Server" @@ -12189,7 +12189,7 @@ msgstr "Cap" #: libraries/server_privileges.lib.php:3206 #: libraries/server_user_groups.lib.php:78 msgid "User group" -msgstr "" +msgstr "Grup d'usuari" #: libraries/server_privileges.lib.php:726 #: libraries/server_privileges.lib.php:837 @@ -12199,26 +12199,29 @@ msgstr "Requereix de connexions xifrades amb SSL." #: libraries/server_privileges.lib.php:734 msgid "Require SSL" -msgstr "" +msgstr "Es requereix SSL" #: libraries/server_privileges.lib.php:759 #: libraries/server_privileges.lib.php:768 msgid "Requires that a specific cipher method be used for a connection." -msgstr "" +msgstr "Es requereix l'ús d'un mètode de xifratge específic per a la connexió." #: libraries/server_privileges.lib.php:778 #: libraries/server_privileges.lib.php:787 msgid "Requires that a valid X509 certificate issued by this CA be presented." msgstr "" +"Es requereix l'ús d'un certificat X509 vàlid emés per aquesta CA (Autoritat " +"de Certificació)." #: libraries/server_privileges.lib.php:797 #: libraries/server_privileges.lib.php:806 msgid "Requires that a valid X509 certificate with this subject be presented." msgstr "" +"Es requereix que es presenti un certificat X509 vàlid amb aquest subjecte." #: libraries/server_privileges.lib.php:818 msgid "Requires a valid X509 cetrificate." -msgstr "" +msgstr "Requereix un certificat X509 vàlid." #: libraries/server_privileges.lib.php:867 msgid "Resource limits" @@ -12317,6 +12320,8 @@ msgid "" "An account already exists with the same username but possibly a different " "hostname." msgstr "" +"Ja existeix un compte amb el mateix nom d'usuari però possiblement amb nom " +"de servidor diferent." #: libraries/server_privileges.lib.php:1663 msgid "Do not change the password" @@ -12381,7 +12386,7 @@ msgstr "Atorga" #: libraries/server_privileges.lib.php:2262 msgid "Not enough privilege to view users." -msgstr "" +msgstr "Permisos insuficients per veure usuaris." #: libraries/server_privileges.lib.php:2282 #: libraries/server_privileges.lib.php:3655 @@ -12537,6 +12542,8 @@ msgid "" "Note: You are attempting to edit privileges of the user with which you are " "currently logged in." msgstr "" +"Nota: estàs intentant editar els permisos de l'usuari amb el que has iniciat " +"la sessió actual." #: libraries/server_privileges.lib.php:4159 libraries/server_users.lib.php:25 msgid "Users overview" @@ -13631,11 +13638,11 @@ msgstr "El nombre de fils que no estàn dormint." #: libraries/server_user_groups.lib.php:23 #, php-format msgid "Users of '%s' user group" -msgstr "" +msgstr "Usuaris del grup d'usuaris '%s'" #: libraries/server_user_groups.lib.php:35 msgid "No users were found belonging to this user group." -msgstr "" +msgstr "No s'han trobat usuaris que pertanyin a aquest grup." #: libraries/server_user_groups.lib.php:64 libraries/server_users.lib.php:33 #| msgid "Users" @@ -13671,7 +13678,7 @@ msgstr "Afegir grup d'usuaris" #: libraries/server_user_groups.lib.php:212 #, php-format msgid "Edit user group: '%s'" -msgstr "" +msgstr "Editar grup d'usuaris: '%s'" #: libraries/server_user_groups.lib.php:228 #| msgid "No privileges." @@ -13738,7 +13745,7 @@ msgstr "Estat" #: libraries/sql.lib.php:351 msgid "Summary by state" -msgstr "" +msgstr "Resum per estat" #: libraries/sql.lib.php:357 #| msgid "Total time:" @@ -13816,7 +13823,7 @@ msgstr "Executa consulta/s SQL a la Base de Dades %s" #: libraries/sql_query_form.lib.php:240 msgid "Get auto-saved query" -msgstr "" +msgstr "Obtenir consulta auto desada" #: libraries/sql_query_form.lib.php:284 #| msgid "Bookmark this SQL query" @@ -13837,7 +13844,7 @@ msgstr "Mostra aquesta consulta de nou" #: libraries/sql_query_form.lib.php:333 msgid "Rollback when finished" -msgstr "" +msgstr "Desfer (-rollback-) al acabar" #: libraries/sql_query_form.lib.php:386 msgid "View only" @@ -13960,7 +13967,7 @@ msgstr "Afegir columnes a la llista central" #: libraries/structure.lib.php:351 msgid "Remove columns from central list" -msgstr "" +msgstr "Eliminar columnes de la llista central" #: libraries/structure.lib.php:353 #| msgid "CHAR textarea columns" @@ -14201,7 +14208,7 @@ msgstr "Línia temporal" #: libraries/tbl_chart.lib.php:64 msgctxt "Chart type" msgid "Scatter" -msgstr "" +msgstr "Dispersió" #: libraries/tbl_chart.lib.php:82 msgid "Stacked" @@ -14229,7 +14236,7 @@ msgstr "Etiqueta de l'eix Y:" #: libraries/tbl_chart.lib.php:237 msgid "Series names are in a column" -msgstr "" +msgstr "Els noms de les series hi són en una columna" #: libraries/tbl_chart.lib.php:240 #| msgid "Inside column:" @@ -14364,7 +14371,7 @@ msgstr "primer" #: libraries/tbl_columns_definition_form.lib.php:1099 msgid "Edit ENUM/SET values" -msgstr "" +msgstr "Editar valors ENUM/SET" #: libraries/tbl_columns_definition_form.lib.php:1124 msgctxt "for default" @@ -14425,7 +14432,7 @@ msgstr "Tria de l'índex:" #: libraries/tbl_indexes.lib.php:321 msgid "Key block size:" -msgstr "" +msgstr "Mida del bloc de clau:" #: libraries/tbl_indexes.lib.php:333 msgid "Index type:" @@ -14494,7 +14501,7 @@ msgstr "Propietats de la restricció" #: libraries/tbl_relation.lib.php:376 msgid "" "Only columns with index will be displayed. You can define an index below." -msgstr "" +msgstr "Només es mostraran columnes amb índex. Pots definir un índex a sota." #: libraries/tbl_relation.lib.php:381 msgid "Foreign key constraint" @@ -14820,7 +14827,7 @@ msgstr "Veure volcat (esquema) de les bases de dades" #: server_privileges.php:141 msgid "Username and hostname didn't change." -msgstr "" +msgstr "El nom d'usuari i de servidor no s'han canviat." #: server_status_processes.php:36 #, php-format @@ -15044,7 +15051,7 @@ msgstr "Nom de taula incorrecte" #: tbl_replace.php:236 #, php-format msgid "Row: %1$s, Column: %2$s, Error: %3$s" -msgstr "" +msgstr "Fila: %1$s, Columna: %2$s, Error: %3$s" #: tbl_structure.php:63 #, php-format