From aee0e1ed295171fd4517ecb81edf477084de6daf Mon Sep 17 00:00:00 2001 From: Xavier Navarro Date: Fri, 13 Mar 2015 18:57:13 +0100 Subject: [PATCH 1/3] Translated using Weblate (Catalan) Currently translated at 94.5% (2868 of 3032 strings) [CI skip] --- po/ca.po | 112 +++++++++++++++++++++---------------------------------- 1 file changed, 42 insertions(+), 70 deletions(-) diff --git a/po/ca.po b/po/ca.po index 6b669b7f63..27d910d377 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:19+0200\n" +"PO-Revision-Date: 2015-03-13 18:57+0200\n" "Last-Translator: Xavier Navarro \n" "Language-Team: Catalan " "\n" @@ -14208,34 +14208,30 @@ msgstr "Opcions de transformació de visualització al navegador" #: libraries/tbl_columns_definition_form.lib.php:354 #: transformation_overview.php:42 -#, fuzzy #| msgid "Browser transformation" msgid "Input transformation" -msgstr "Transformació del navegador" +msgstr "Transformació d'entrada" #: libraries/tbl_columns_definition_form.lib.php:356 -#, fuzzy #| msgid "Transformation options" msgid "Input transformation options" -msgstr "Opcions de transformació" +msgstr "Opcions de transformació d'entrada" #: libraries/tbl_columns_definition_form.lib.php:597 -#, fuzzy, php-format +#, php-format #| msgid "Select referenced key" msgid "Referenced by %s." -msgstr "Tria la clau referenciada" +msgstr "Referenciat per %s." #: libraries/tbl_columns_definition_form.lib.php:605 -#, fuzzy #| msgid "Select Foreign Key" msgid "Is a foreign key." -msgstr "Tria una clau externa" +msgstr "És una clau externa." #: libraries/tbl_columns_definition_form.lib.php:632 -#, fuzzy #| msgid "Remove column(s)" msgid "Pick from Central Columns" -msgstr "Treu columna(es)" +msgstr "Selecciona des de les columnes centrals" #: libraries/tbl_columns_definition_form.lib.php:818 msgid "first" @@ -14298,10 +14294,9 @@ msgstr "" "principal!" #: libraries/tbl_indexes.lib.php:305 -#, fuzzy #| msgid "Index cache size" msgid "Index choice:" -msgstr "Tamany del cau d'índex" +msgstr "Tria de l'índex:" #: libraries/tbl_indexes.lib.php:321 msgid "Key block size:" @@ -14312,38 +14307,33 @@ msgid "Index type:" msgstr "Tipus d'índex:" #: libraries/tbl_indexes.lib.php:345 -#, fuzzy #| msgid "User:" msgid "Parser:" -msgstr "Usuari:" +msgstr "Analitzador:" #: libraries/tbl_indexes.lib.php:357 msgid "Comment:" msgstr "Comentari:" #: libraries/tbl_indexes.lib.php:392 libraries/tbl_indexes.lib.php:429 -#, fuzzy #| msgid "Drag to reorder" msgid "Drag to reorder" msgstr "Arrossega per reordenar" #: libraries/tbl_printview.lib.php:30 -#, fuzzy #| msgid "Showing tables" msgid "Showing tables:" -msgstr "Mostrant taules" +msgstr "Mostrant taules:" #: libraries/tbl_printview.lib.php:178 -#, fuzzy #| msgid "Row Statistics" msgid "Row Statistics:" -msgstr "Estadística de files" +msgstr "Estadística de files:" #: libraries/tbl_printview.lib.php:305 -#, fuzzy #| msgid "Space usage" msgid "Space usage:" -msgstr "Utilització d'espai" +msgstr "Utilització d'espai:" #: libraries/tbl_relation.lib.php:228 msgid "Internal relations" @@ -14362,22 +14352,19 @@ msgstr "" "de FOREIGN KEY." #: libraries/tbl_relation.lib.php:367 -#, fuzzy #| msgid "Foreign key constraint" msgid "Foreign key constraints" -msgstr "Límit de clau externa" +msgstr "Restriccions de clau externa" #: libraries/tbl_relation.lib.php:370 -#, fuzzy #| msgid "Action" msgid "Actions" -msgstr "Acció" +msgstr "Accions" #: libraries/tbl_relation.lib.php:371 -#, fuzzy #| msgid "Constraints for table" msgid "Constraint properties" -msgstr "Restriccions per la taula" +msgstr "Propietats de la restricció" #: libraries/tbl_relation.lib.php:376 msgid "" @@ -14389,44 +14376,39 @@ msgid "Foreign key constraint" msgstr "Límit de clau externa" #: libraries/tbl_relation.lib.php:402 -#, fuzzy #| msgid "Add constraints" msgid "+ Add constraint" -msgstr "Afegeix restriccions" +msgstr "+ Afegeix restricció" #: libraries/tbl_relation.lib.php:439 -#, fuzzy, php-format +#, php-format #| msgid "Foreign key constraint" msgid "Foreign key constraint %s has been dropped" -msgstr "Límit de clau externa" +msgstr "S'ha eliminat la restricció %s de la clau externa" #: libraries/tbl_relation.lib.php:463 msgid "Constraint name" msgstr "Nom de la restricció" #: libraries/tbl_relation.lib.php:526 -#, fuzzy #| msgid "Add column" msgid "+ Add column" -msgstr "Afegeix columna(es)" +msgstr "+ Afegeix columna" #: libraries/tbl_relation.lib.php:670 -#, fuzzy #| msgid "Choose column to display" msgid "Choose column to display:" -msgstr "Tria la columna a mostrar" +msgstr "Tria la columna a mostrar:" #: libraries/tbl_relation.lib.php:827 -#, fuzzy #| msgid "Thread %s was successfully killed." msgid "Display column was successfully updated." -msgstr "Fil %s cancel.lat correctament." +msgstr "Columna de visualització actualitzada correctament." #: libraries/tbl_relation.lib.php:911 -#, fuzzy #| msgid "Internal relation added" msgid "Internal relations were successfully updated." -msgstr "Afegida relació interna" +msgstr "Relacions internes actualitzades correctament." #: libraries/tbl_relation.lib.php:1176 #, php-format @@ -14440,10 +14422,10 @@ msgid "Create version %1$s of %2$s" msgstr "Crea versió %1$s de %2$s" #: libraries/tracking.lib.php:74 -#, fuzzy, php-format +#, php-format #| msgid "Create version" msgid "Create version %1$s" -msgstr "Crea versió" +msgstr "Crea versió %1$s" #: libraries/tracking.lib.php:79 msgid "Track these data definition statements:" @@ -14476,10 +14458,9 @@ msgid "Deactivate now" msgstr "Desactiva ara" #: libraries/tracking.lib.php:287 libraries/tracking.lib.php:350 -#, fuzzy #| msgid "Create version" msgid "Delete version" -msgstr "Crea versió" +msgstr "Esborra versió" #: libraries/tracking.lib.php:460 msgid "Tracking statements" @@ -14580,10 +14561,10 @@ msgid "Tracking for %1$s was deactivated at version %2$s." msgstr "Desactivat el seguiment per %1$s a la versió %2$s." #: libraries/tracking.lib.php:1306 -#, fuzzy, php-format +#, php-format #| msgid "Create version %1$s of %2$s" msgid "Version %1$s of %2$s was deleted." -msgstr "Crea versió %1$s de %2$s" +msgstr "Versió %1$s de %2$s esborrada." #: libraries/tracking.lib.php:1337 #, php-format @@ -14634,10 +14615,9 @@ msgid "Fatal error: The navigation can only be accessed via AJAX" msgstr "Error fatal: Només es pot accedir a la navegació mitjançant AJAX" #: prefs_forms.php:86 -#, fuzzy #| msgid "Cannot save settings, submitted form contains errors" msgid "Cannot save settings, submitted form contains errors!" -msgstr "No es poden desar els paràmetres, el formulari enviat conté errors" +msgstr "No es poden desar els paràmetres, el formulari enviat conté errors!" #: prefs_manage.php:82 msgid "Could not import configuration" @@ -14733,13 +14713,12 @@ msgid "Download" msgstr "Descarrega" #: setup/frames/form.inc.php:25 -#, fuzzy #| msgid "" #| "Incorrect formset, check $formsets array in setup/frames/form.inc.php" msgid "Incorrect formset, check $formsets array in setup/frames/form.inc.php!" msgstr "" -"Conjunt de formularis incorrecte, comprova l'array $formsets a l'arxiu setup/" -"frames/form.inc.php" +"Conjunt de formularis incorrecte, comprova l'array $formsets a l'arxiu " +"setup/frames/form.inc.php!" #: setup/frames/index.inc.php:53 msgid "Cannot load or save configuration" @@ -14943,18 +14922,17 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s" msgstr "" #: tbl_structure.php:63 -#, fuzzy, php-format +#, php-format #| msgid "The column name '%s' is a MySQL reserved keyword." msgid "The name '%s' is a MySQL reserved keyword." msgid_plural "The names '%s' are MySQL reserved keywords." -msgstr[0] "El nom de columna '%s' és una paraula clau reservada de MySQL." -msgstr[1] "El nom de columna '%s' és una paraula clau reservada de MySQL." +msgstr[0] "El nom '%s' és una paraula clau reservada de MySQL." +msgstr[1] "Els noms '%s' són paraules clau reservades de MySQL." #: tbl_structure.php:114 -#, fuzzy #| msgid "No rows selected" msgid "No column selected." -msgstr "No s'han triat arxius" +msgstr "No s'han triat columnes." #: tbl_tracking.php:33 #, php-format @@ -14962,16 +14940,14 @@ msgid "Tracking of %s is activated." msgstr "S'ha activat el seguiment de %s." #: tbl_tracking.php:102 -#, fuzzy #| msgid "The selected users have been deleted successfully." msgid "Tracking versions deleted successfully." -msgstr "S'han esborrat correctament els usuaris triats." +msgstr "S'han esborrat correctament les versions de seguiment." #: tbl_tracking.php:107 -#, fuzzy #| msgid "No rows selected" msgid "No versions selected." -msgstr "No s'han triat arxius" +msgstr "No s'han triat versions." #: tbl_tracking.php:138 msgid "SQL statements executed." @@ -14990,16 +14966,14 @@ msgid "Available MIME types" msgstr "Tipus MIME disponibles" #: transformation_overview.php:37 -#, fuzzy #| msgid "Available transformations" msgid "Available browser display transformations" -msgstr "Transformacions disponibles" +msgstr "Transformacions de navegador disponibles" #: transformation_overview.php:38 -#, fuzzy #| msgid "Available transformations" msgid "Available input transformations" -msgstr "Transformacions disponibles" +msgstr "Transformacions d'entrada disponibles" #: transformation_overview.php:53 msgctxt "for MIME transformation" @@ -15007,10 +14981,10 @@ msgid "Description" msgstr "Descripció" #: url.php:35 -#, fuzzy, php-format +#, php-format #| msgid "Tracking report" msgid "Taking you to %s." -msgstr "Informe de seguiment" +msgstr "Portant-te à %s." #: user_password.php:29 msgid "You don't have sufficient privileges to be here right now!" @@ -15033,10 +15007,9 @@ msgid "Rename view to" msgstr "Reanomena la vista a" #: view_operations.php:133 -#, fuzzy #| msgid "Delete the table (DROP)" msgid "Delete the view (DROP)" -msgstr "Esborra la taula (DROP)" +msgstr "Esborrar la vista (DROP)" #: libraries/advisory_rules.txt:49 msgid "Uptime below one day" @@ -15714,10 +15687,9 @@ msgstr "" "inferior a 1 per hora" #: libraries/advisory_rules.txt:262 -#, fuzzy #| msgid "tmp_table_size vs. max_heap_table_size" msgid "Different tmp_table_size and max_heap_table_size" -msgstr "\"tmp_table_size\" vs. \"max_heap_table_size\"" +msgstr "\"tmp_table_size\" i \"max_heap_table_size\" són diferents" #: libraries/advisory_rules.txt:265 msgid "{tmp_table_size} and {max_heap_table_size} are not the same." From 71530b3089e0b25f477cbb6661c6b11741ab8890 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 14 Mar 2015 07:13:00 -0400 Subject: [PATCH 2/3] 4.3.13-dev Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c95557e788..c0e198e255 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ phpMyAdmin - ChangeLog ====================== -4.3.12.0 (not yet released) +4.3.13.0 (not yet released) + +4.3.12.0 (2015-03-14) - bug #4746 Right-aligned columns have left-aligned header - bug #4779 PMA_Util::parseEnumSetValues fails on enums with UTF-8 values - bug Undefined index savedsearcheswork diff --git a/README b/README index fe1077eacc..37c7931c4c 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.3.12-dev +Version 4.3.13-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index b0c8cfd870..ba3d5a4f54 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.3.12-dev' +version = '4.3.13-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 45746e6546..13ada89bd0 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.3.12-dev'); + $this->set('PMA_VERSION', '4.3.13-dev'); /** * @deprecated */ From 81a6cec523369848e846ec4b3c6f5ed3abf54784 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 14 Mar 2015 07:15:02 -0400 Subject: [PATCH 3/3] 4.3.12 release Signed-off-by: Marc Delisle --- ChangeLog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 32b5002856..1a4f14f64a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,7 +65,9 @@ explanation + rfe #1608 Central columns allowing setting SIGNED / UNSIGNED attribute for integer + rfe #1441 Add regexp match when using AllowArbitraryServer -4.3.12.0 (not yet released) +4.3.13.0 (not yet released) + +4.3.12.0 (2015-03-14) - bug #4746 Right-aligned columns have left-aligned header - bug #4779 PMA_Util::parseEnumSetValues fails on enums with UTF-8 values - bug Undefined index savedsearcheswork