All mimetypes and their transformations are defined through single files in
- the directory 'libraries/transformations/'.
+
All specific transformations for mimetypes are defined through class files in
+ the directory 'libraries/plugins/transformations/'. Each of them extends
+ a certain transformation abstract class declared in
+ libraries/plugins/transformations/abstract.
They are stored in files to ease up customization and easy adding of new
transformations.
@@ -2496,109 +2498,35 @@ setfacl -d -m "g:www-data:rwx" tmp
always work. It makes no sense to apply a transformation to a mimetype the
transform-function doesn't know to handle.
-
One can, however, use empty mime-types and global transformations which should work
- for many mimetypes. You can also use transforms on a different mimetype than what they where built
- for, but pay attention to option usage as well as what the transformation does to your
- column.
-
There is a file called 'transformations.lib.php' that provides some basic functions
which can be included by any other transform function.
-
There are 5 possible file names:
+
The file name convention is
+ [Mimetype]_[Subtype]_[Transformation Name].class.php,
+ while the abtract class that it extends has the name
+ [Transformation Name]TransformationsPlugin.
+ All of the methods that have to be implemented by a transformations plug-in are:
+
+
getMIMEType() and getMIMESubtype() in the main class;
+
getName(), getInfo() and applyTransformation() in the abstract class it extends.
+
+
+
+
The getMIMEType(), getMIMESubtype() and getName() methods return the name of the
+ MIME type, MIME Subtype and transformation accordingly. getInfo() returns the
+ transformation's description and possible options it may receive and
+ applyTransformation() is the method that does the actual work of the
+ transformation plug-in.
-
A mimetype+subtype transform:
+
Please see the libraries/plugins/transformations/TEMPLATE and
+ libraries/plugins/transformations/TEMPLATE_ABSTRACT
+ files for adding your own transformation plug-in. You can also generate a
+ new transformation plug-in (with or without the abstract transformation class),
+ by using
+ libraries/plugins/transformations/generator_plugin.sh or
+ libraries/plugins/transformations/generator_main_class.sh.
- [mimetype]_[subtype]__[transform].inc.php
-
- Please not that mimetype and subtype are separated via '_', which shall
- not be contained in their names. The transform function/filename may
- contain only characters which cause no problems in the file system as
- well as the PHP function naming convention.
-
- The transform function will the be called
- 'PMA_transform_[mimetype]_[subtype]__[transform]()'.
-
- Please note that there are no single '_' characters.
- The transform function/filename may contain only characters which cause
- no problems in the file system as well as the PHP function naming
- convention.
-
- The transform function will the be called
- 'PMA_transform_[mimetype]__[transform]()'.
A mimetype+subtype without specific transform function
-
- [mimetype]_[subtype].inc.php
-
- Please note that there are no '__' characters in the filename. Do not
- use special characters in the filename causing problems with the file
- system.
-
- No transformation function is defined in the file itself.
-
- Example:
-
- text_plain.inc.php
- (No function)
-
-
A mimetype (w/o subtype) without specific transform function
-
- [mimetype].inc.php
-
- Please note that there are no '_' characters in the filename. Do not use
- special characters in the filename causing problems with the file system.
-
-
- No transformation function is defined in the file itself.
-
- Example:
-
- text.inc.php
- (No function)
-
-
A global transform function with no specific mimetype
-
- global__[transform].inc.php
-
- The transform function will the be called
- 'PMA_transform_global__[transform]()'.
So generally use '_' to split up mimetype and subtype, and '__' to provide a
- transform function.
-
-
All filenames containing no '__' in themselves are not shown as valid transform
- functions in the dropdown.
-
-
Please see the libraries/transformations/TEMPLATE file for adding your own transform
- function. See the libraries/transformations/TEMPLATE_MIMETYPE for adding a mimetype
- without a transform function.
-
-
To create a new transform function please see
- libraries/transformations/template_generator.sh.
- To create a new, empty mimetype please see
- libraries/transformations/template_generator_mimetype.sh.
-
-
A transform function always gets passed three variables:
+
The applyTransformation() method always gets passed three variables:
$buffer - Contains the text inside of the column. This is the text,
you want to transform.
Additionally you should also provide additional function to provide
- information about the transformation to the user. This function should
- have same name as transformation function just with appended
- _info suffix. This function accepts no parameters and returns
- array with information about the transformation. Currently following keys
- can be used:
-
-
-
info
-
Long description of the transformation.
-
-
FAQ - Frequently Asked Questions
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 704be2f262..570a1519cb 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -792,6 +792,7 @@ class PMA_Table
// do not create the table if dataonly
if ($what != 'dataonly') {
+ require_once "libraries/plugin_interface.lib.php";
// get Export SQL instance
$export_sql_plugin = PMA_getPlugin(
"export",
diff --git a/libraries/plugins/AuthenticationPlugin.class.php b/libraries/plugins/AuthenticationPlugin.class.php
index 9b2ea57aac..b825ade644 100644
--- a/libraries/plugins/AuthenticationPlugin.class.php
+++ b/libraries/plugins/AuthenticationPlugin.class.php
@@ -13,7 +13,7 @@ if (! defined('PHPMYADMIN')) {
require_once "PluginObserver.class.php";
/**
- * Provides a common interface that will have to implemented by all of the
+ * Provides a common interface that will have to be implemented by all of the
* authentication plugins.
*
* @package PhpMyAdmin
diff --git a/libraries/plugins/ExportPlugin.class.php b/libraries/plugins/ExportPlugin.class.php
index 620db86a3a..5784229feb 100644
--- a/libraries/plugins/ExportPlugin.class.php
+++ b/libraries/plugins/ExportPlugin.class.php
@@ -13,7 +13,7 @@ if (! defined('PHPMYADMIN')) {
require_once "PluginObserver.class.php";
/**
- * Provides a common interface that will have to implemented by all of the
+ * Provides a common interface that will have to be implemented by all of the
* export plugins. Some of the plugins will also implement other public
* methods, but those are not declared here, because they are not implemented
* by all export plugins.
diff --git a/libraries/plugins/ImportPlugin.class.php b/libraries/plugins/ImportPlugin.class.php
index 018f3a60a0..142aad252e 100644
--- a/libraries/plugins/ImportPlugin.class.php
+++ b/libraries/plugins/ImportPlugin.class.php
@@ -13,7 +13,7 @@ if (! defined('PHPMYADMIN')) {
require_once "PluginObserver.class.php";
/**
- * Provides a common interface that will have to implemented by all of the
+ * Provides a common interface that will have to be implemented by all of the
* import plugins.
*
* @package PhpMyAdmin
diff --git a/libraries/plugins/TransformationsInterface.int.php b/libraries/plugins/TransformationsInterface.int.php
index 7519cae210..ee8d7988cf 100644
--- a/libraries/plugins/TransformationsInterface.int.php
+++ b/libraries/plugins/TransformationsInterface.int.php
@@ -10,7 +10,7 @@ if (! defined('PHPMYADMIN')) {
}
/**
- * Provides a common interface that will have to implemented by all of the
+ * Provides a common interface that will have to be implemented by all of the
* transformations plugins.
*
* @package PhpMyAdmin
diff --git a/libraries/plugins/transformations/todo_rewrite/README b/libraries/plugins/transformations/README
similarity index 100%
rename from libraries/plugins/transformations/todo_rewrite/README
rename to libraries/plugins/transformations/README
diff --git a/libraries/plugins/transformations/TEMPLATE b/libraries/plugins/transformations/TEMPLATE
new file mode 100644
index 0000000000..5668f34224
--- /dev/null
+++ b/libraries/plugins/transformations/TEMPLATE
@@ -0,0 +1,46 @@
+
\ No newline at end of file
diff --git a/libraries/plugins/transformations/TEMPLATE_ABSTRACT b/libraries/plugins/transformations/TEMPLATE_ABSTRACT
new file mode 100644
index 0000000000..68946aaa76
--- /dev/null
+++ b/libraries/plugins/transformations/TEMPLATE_ABSTRACT
@@ -0,0 +1,89 @@
+mimetype contains the original MimeType of the field (i.e. 'text/plain', 'image/jpeg' etc.)
+
+ return $buffer;
+ }
+
+ /**
+ * This method is called when any PluginManager to which the observer
+ * is attached calls PluginManager::notify()
+ *
+ * @param SplSubject $subject The PluginManager notifying the observer
+ * of an update.
+ *
+ * @todo implement
+ * @return void
+ */
+ public function update (SplSubject $subject)
+ {
+ ;
+ }
+
+
+ /* ~~~~~~~~~~~~~~~~~~~~ Getters and Setters ~~~~~~~~~~~~~~~~~~~~ */
+
+
+ /**
+ * Gets the TransformationName of the specific plugin
+ *
+ * @return string
+ */
+ public static function getName()
+ {
+ return "[TransformationName]";
+ }
+}
+?>
\ No newline at end of file
diff --git a/libraries/plugins/transformations/generator_main_class.sh b/libraries/plugins/transformations/generator_main_class.sh
new file mode 100755
index 0000000000..05876671ac
--- /dev/null
+++ b/libraries/plugins/transformations/generator_main_class.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# Shell script that creates only the main class for a new transformation
+# plug-in, using a template
+#
+# $1: MIMEType
+# $2: MIMESubtype
+# $3: Transformation Name
+
+if [ $# != 3 ]
+then
+ echo -e "Usage: ./generator_main_class.sh MIMEType MIMESubtype TransformationName\n"
+ exit 65
+fi
+
+./generator_plugin.sh "$1" "$2" "$3" "--generate_only_main_class"
\ No newline at end of file
diff --git a/libraries/plugins/transformations/generator_plugin.sh b/libraries/plugins/transformations/generator_plugin.sh
new file mode 100755
index 0000000000..225a2cb98a
--- /dev/null
+++ b/libraries/plugins/transformations/generator_plugin.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+#
+# Shell script that creates a new transformation plug-in (both main and
+# abstract class) using a template.
+#
+# The 'description' parameter will add a new entry in the language file.
+# Watch out for special escaping.
+#
+# $1: MIMEType
+# $2: MIMESubtype
+# $3: Transformation Name
+# $4: (optional) Description
+
+echo $#
+if [ $# -ne 3 -a $# -ne 4 ]; then
+ echo -e "Usage: ./generator_plugin.sh MIMEType MIMESubtype TransformationName [Description]\n"
+ exit 65
+fi
+
+# make sure that the MIME Type, MIME Subtype and Transformation names
+# are in the correct format
+
+# make all names lowercase
+MT="`echo $1 | tr [:upper:] [:lower:]`"
+MS="`echo $2 | tr [:upper:] [:lower:]`"
+TN="`echo $3 | tr [:upper:] [:lower:]`"
+# make first letter uppercase
+MT="${MT^}"
+MS="${MS^}"
+TN="${TN^}"
+# make the first letter after each underscore uppercase
+MT="`echo $MT`"
+MT="`echo $MT | sed -e 's/_./\U&\E/g'`"
+MS="`echo $MS`"
+MS="`echo $MS | sed -e 's/_./\U&\E/g'`"
+TN="`echo $TN`"
+TN="`echo $TN | sed -e 's/_./\U&\E/g'`"
+
+# define the name of the main class file and of its template
+ClassFile=$MT\_$MS\_$TN.class.php
+Template=TEMPLATE
+# define the name of the abstract class file and its template
+AbstractClassFile=abstract/"$TN"TransformationsPlugin.class.php
+AbstractTemplate=TEMPLATE_ABSTRACT
+# replace template names with argument names
+sed "s/\[MIMEType]/$MT/; s/\[MIMESubtype\]/$MS/; s/\[TransformationName\]/$TN/;" < $Template > $ClassFile
+echo "Created $ClassFile"
+
+GenerateAbstractClass=1
+if [ -n $4 ]; then
+ if [ "$4" == "--generate_only_main_class" ]; then
+ if [ -e $AbstractClassFile ]; then
+ GenerateAbstractClass=0
+ fi
+ fi
+fi
+
+if [ $GenerateAbstractClass -eq 1 ]; then
+ # replace template names with argument names
+ sed "s/\[TransformationName\]/$TN/; s/Description of the transformation./$4/;" < $AbstractTemplate > $AbstractClassFile
+ echo "Created $AbstractClassFile"
+fi
+
+echo ""
\ No newline at end of file
diff --git a/libraries/plugins/transformations/todo_rewrite/TEMPLATE b/libraries/plugins/transformations/todo_rewrite/TEMPLATE
deleted file mode 100644
index 463aded524..0000000000
--- a/libraries/plugins/transformations/todo_rewrite/TEMPLATE
+++ /dev/null
@@ -1,38 +0,0 @@
-___.inc.php
- *
- * The string [ENTER_FILENAME_HERE] shall be substituted with the filename without the '.inc.php'
- * extension. For further information regarding naming conventions see the /Documentation.html file.
- */
-
-function PMA_transformation_[ENTER_FILENAME_HERE]_info()
-{
- return array(
- 'info' => __('Description of the transformation.'),
- );
-}
-
-function PMA_transformation_[ENTER_FILENAME_HERE]($buffer, $options = array(), $meta = '')
-{
- // possibly use a global transform and feed it with special options
-
- // further operations on $buffer using the $options[] array.
-
- // You can evaluate the propagated $meta Object. It's contained fields are described in http://www.php.net/mysql_fetch_field.
- // This stored information can be used to get the field information about the transformed field.
- // $meta->mimetype contains the original MimeType of the field (i.e. 'text/plain', 'image/jpeg' etc.)
-
- return $buffer;
-}
-
-?>
diff --git a/libraries/plugins/transformations/todo_rewrite/TEMPLATE_MIMETYPE b/libraries/plugins/transformations/todo_rewrite/TEMPLATE_MIMETYPE
deleted file mode 100644
index 291eb603b1..0000000000
--- a/libraries/plugins/transformations/todo_rewrite/TEMPLATE_MIMETYPE
+++ /dev/null
@@ -1,12 +0,0 @@
-
diff --git a/libraries/plugins/transformations/todo_rewrite/generator.sh b/libraries/plugins/transformations/todo_rewrite/generator.sh
deleted file mode 100755
index 034d0f020d..0000000000
--- a/libraries/plugins/transformations/todo_rewrite/generator.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# Shell script that adds a new function file using a template. Should not be called directly
-# but instead by template_Generator.sh and template_generator_mimetype.sh
-#
-#
-# $1: Template
-# $2: Filename
-# $3: (optional) Description
-
-if [ $# == 0 ]
-then
- echo "Please call template_generator.sh or template_generator_mimetype.sh instead"
- echo ""
- exit 65
-fi
-functionupper="`echo $2 | tr [:lower:] [:upper:]`"
-functionlower="`echo $2 | tr [:upper:] [:lower:]`"
-
-sed "s/\[ENTER_FILENAME_HERE\]/$functionupper/; s/\[enter_filename_here\]/$functionlower/; s/Description of the transformation./$3/;" < $1 > $2.inc.php
-
-echo "Created $2.inc.php"
-echo ""
diff --git a/libraries/plugins/transformations/todo_rewrite/template_generator.sh b/libraries/plugins/transformations/todo_rewrite/template_generator.sh
deleted file mode 100755
index 0b029e9482..0000000000
--- a/libraries/plugins/transformations/todo_rewrite/template_generator.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-#
-# Shell script that adds a new mimetype with transform function.
-#
-# The filename should contain either 'mimetype_subtype' or 'mimetype'.
-# The suffix '.inc.php' is appended automatically!
-#
-# The 'description' parameter will add a new entry in the language file. Watch out for
-# special escaping.
-#
-# Example: template_generator.sh 'filename' 'description'
-#
-if [ $# == 0 ]
-then
- echo "Usage: template_generator.sh 'filename' 'description'"
- echo ""
- exit 65
-fi
-
-
-
-./generator.sh 'TEMPLATE' "$1" "$2"
-echo " "
-echo "New TRANSFORM FUNCTION $1.inc.php added."
diff --git a/libraries/plugins/transformations/todo_rewrite/template_generator_mimetype.sh b/libraries/plugins/transformations/todo_rewrite/template_generator_mimetype.sh
deleted file mode 100755
index b93ee5d4ea..0000000000
--- a/libraries/plugins/transformations/todo_rewrite/template_generator_mimetype.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-#
-# Shell script that adds a new mimetype without transform function.
-#
-# The filename should contain either 'mimetype_subtype' or 'mimetype'.
-# The suffix '.inc.php' is appended automatically!
-#
-# Example: template_generator_mimetype.sh 'filename'
-#
-if [ $# == 0 ]
-then
- echo "Usage: template_generator_mimetype.sh 'filename'"
- echo ""
- exit 65
-fi
-
-./generator.sh 'TEMPLATE_MIMETYPE' "$1"
-echo " "
-echo "New MIMETYPE $1.inc.php added."
diff --git a/po/ca.po b/po/ca.po
index ea8b762f90..0be0673195 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4,15 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-07-03 09:19+0200\n"
-"PO-Revision-Date: 2012-03-28 14:16+0200\n"
-"Last-Translator: Michal Čihař \n"
+"PO-Revision-Date: 2012-07-05 17:22+0200\n"
+"Last-Translator: Xavier Navarro \n"
"Language-Team: catalan \n"
"Language: ca\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 0.8\n"
+"X-Generator: Weblate 1.1\n"
#: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354
#: libraries/DisplayResults.class.php:609 server_privileges.php:1851
@@ -1469,10 +1469,9 @@ msgid "From general log"
msgstr "Del registre general"
#: js/messages.php:172
-#, fuzzy
#| msgid "Loading logs"
msgid "Analysing logs"
-msgstr "Carregant els registres"
+msgstr "analitzant registres"
#: js/messages.php:173
msgid "Analysing & loading logs. This may take a while."
@@ -1513,10 +1512,9 @@ msgid "Jump to Log table"
msgstr "Saltar a la taula del registre"
#: js/messages.php:180
-#, fuzzy
#| msgid "No data"
msgid "No data found"
-msgstr "No hi ha dades"
+msgstr "No s'han trobat dades"
#: js/messages.php:181
msgid "Log analysed, but no data found in this time span."
@@ -1557,16 +1555,14 @@ msgid "Chart"
msgstr "Gràfic"
#: js/messages.php:191
-#, fuzzy
#| msgid "Add chart"
msgid "Edit chart"
-msgstr "Afegir gràfic"
+msgstr "Editar gràfic"
#: js/messages.php:192
-#, fuzzy
#| msgid "Series:"
msgid "Series"
-msgstr "Series:"
+msgstr "Series"
#. l10n: A collection of available filters
#: js/messages.php:195
@@ -1642,16 +1638,14 @@ msgid "Import"
msgstr "Importa"
#: js/messages.php:213
-#, fuzzy
#| msgid "Could not import configuration"
msgid "Import monitor configuration"
-msgstr "No es pot importar la configuració"
+msgstr "Importar configuració del monitor"
#: js/messages.php:214
-#, fuzzy
#| msgid "Please select the primary key or a unique key"
msgid "Please select the file you want to import"
-msgstr "Tria la clau principal o una clau única"
+msgstr "Tria l'arxiu a importar"
#: js/messages.php:216
msgid "Analyse Query"
@@ -1663,11 +1657,11 @@ msgstr "Sistema d'assessorament"
#: js/messages.php:221
msgid "Possible performance issues"
-msgstr ""
+msgstr "Possibles problemes de rendiment"
#: js/messages.php:222
msgid "Issue"
-msgstr ""
+msgstr "Problema"
#: js/messages.php:223
msgid "Recommendation"
@@ -1683,7 +1677,7 @@ msgstr "Justificació"
#: js/messages.php:226
msgid "Used variable / formula"
-msgstr ""
+msgstr "Variable usada / formula"
#: js/messages.php:227
msgid "Test"
@@ -1727,7 +1721,7 @@ msgstr "Correcte"
#: js/messages.php:242
msgid "Click to dismiss this notification"
-msgstr ""
+msgstr "Prem per rebutjar aquest avís"
#: js/messages.php:245
msgid "Renaming Databases"
@@ -1802,6 +1796,7 @@ msgstr "Esborrant"
#: js/messages.php:269
msgid "The definition of a stored function must contain a RETURN statement!"
msgstr ""
+"La definició d'una funció enmagatzemada ha d'incloure una instrucció RETURN!"
#: js/messages.php:272 libraries/rte/rte_routines.lib.php:747
msgid "ENUM/SET editor"
@@ -1828,7 +1823,7 @@ msgstr "Afegir %d valors"
#: js/messages.php:279
msgid ""
"Note: If the file contains multiple tables, they will be combined into one"
-msgstr ""
+msgstr "Nota: Si l'arxiu conté múltiples taules, es combinaran en una"
#: js/messages.php:282
msgid "Hide query box"
@@ -1880,15 +1875,15 @@ msgstr "Cerca de zoom"
#: js/messages.php:300
msgid "Each point represents a data row."
-msgstr ""
+msgstr "Cada punt representa una fila de dades."
#: js/messages.php:302
msgid "Hovering over a point will show its label."
-msgstr ""
+msgstr "Situant el cursor sobre un punt es mostrarà la seva etiqueta."
#: js/messages.php:304
msgid "To zoom in, select a section of the plot with the mouse."
-msgstr ""
+msgstr "Per acostar, selecciona una secció del gràfic amb el ratolí."
#: js/messages.php:306
msgid "Click reset zoom button to come back to original state."
@@ -1897,10 +1892,12 @@ msgstr ""
#: js/messages.php:308
msgid "Click a data point to view and possibly edit the data row."
msgstr ""
+"Prem en un punt de dades per veure i possiblement editar la fila de dades."
#: js/messages.php:310
msgid "The plot can be resized by dragging it along the bottom right corner."
msgstr ""
+"El gràfic es pot re-dimensionar arrossegant la cantonada inferior dreta."
#: js/messages.php:312
msgid "Select two columns"
@@ -1908,7 +1905,7 @@ msgstr "selecciona dues columnes"
#: js/messages.php:313
msgid "Select two different columns"
-msgstr ""
+msgstr "Selecciona dues columnes diferents"
#: js/messages.php:314
msgid "Query results"
@@ -1952,6 +1949,8 @@ msgid ""
"You haven't saved the changes in the layout. They will be lost if you don't "
"save them. Do you want to continue?"
msgstr ""
+"No has desat els canvis en el disseny. Es perdran si no els deses. Vols "
+"continuar?"
#: js/messages.php:344
msgid "Add an option for column "
@@ -1959,17 +1958,19 @@ msgstr "Afegeix una opció per a la columna "
#: js/messages.php:347
msgid "Press escape to cancel editing"
-msgstr ""
+msgstr "Prem la tecla escape per cancel·lar la edició"
#: js/messages.php:348
msgid ""
"You have edited some data and they have not been saved. Are you sure you "
"want to leave this page before saving the data?"
msgstr ""
+"Has editat algunes dades i no s'han desat. Estàs segur que vols sortir "
+"d'aquesta pàgina per desar les dades?"
#: js/messages.php:349
msgid "Drag to reorder"
-msgstr ""
+msgstr "Arrossega per reordenar"
#: js/messages.php:350
msgid "Click to sort"
@@ -1977,7 +1978,7 @@ msgstr "Clica per clasificar"
#: js/messages.php:351
msgid "Click to mark/unmark"
-msgstr ""
+msgstr "Prem per marcar/desmarcar"
#: js/messages.php:352
msgid "Double-click to copy column name"
@@ -1986,17 +1987,24 @@ msgstr ""
#: js/messages.php:353
msgid "Click the drop-down arrow to toggle column's visibility"
msgstr ""
+"Prem a la fletxa de llista desplegable per alternar la visibilitat de "
+"la columna"
#: js/messages.php:355
msgid ""
"This table does not contain a unique column. Features related to the grid "
"edit, checkbox, Edit, Copy and Delete links may not work after saving."
msgstr ""
+"Aquesta taula no conté una columna única. Característiques relacionades amb "
+"l'edició de quadrícula, checkbox, Editar, Copiar i Esborrar enllaços poden "
+"no funcionar després de desar."
#: js/messages.php:356
msgid ""
"You can also edit most columns by clicking directly on their content."
msgstr ""
+"També pots editar la majoria de les columnes prement directament en el "
+"seu contingut."
#: js/messages.php:357
msgid "Go to link"
@@ -2287,7 +2295,7 @@ msgstr "Se"
#. l10n: Month-year order for calendar, use either "calendar-month-year" or "calendar-year-month".
#: js/messages.php:506
msgid "calendar-month-year"
-msgstr ""
+msgstr "calendari-mes-any"
#. l10n: Year suffix for calendar, "none" is empty.
#: js/messages.php:508
@@ -2369,7 +2377,7 @@ msgstr "per hora"
#: libraries/Advisor.class.php:434
msgid "per day"
-msgstr ""
+msgstr "per dia"
#: libraries/CommonFunctions.class.php:251
#, php-format
@@ -2610,7 +2618,7 @@ msgstr "No hi ha cap arxiu per pujar"
#: libraries/CommonFunctions.class.php:3602
#: libraries/CommonFunctions.class.php:3603
msgid "Execute"
-msgstr ""
+msgstr "Executar"
#: libraries/CommonFunctions.class.php:4146
msgid "Print"
@@ -2619,11 +2627,13 @@ msgstr "Imprimeix"
#: libraries/Config.class.php:915
#, php-format
msgid "Existing configuration file (%s) is not readable."
-msgstr ""
+msgstr "No es pot llegir l'arxiu de configuració existent (%s)."
#: libraries/Config.class.php:945
msgid "Wrong permissions on configuration file, should not be world writable!"
msgstr ""
+"Permisos incorrectes a l'arxiu de configuració, no pot ser modificable per "
+"tothom!"
#: libraries/Config.class.php:1521
msgid "Font size"
@@ -2664,7 +2674,7 @@ msgstr "vertical"
#: libraries/DisplayResults.class.php:734
#, php-format
msgid "Headers every %s rows"
-msgstr ""
+msgstr "Capceleres cada %s files"
#: libraries/DisplayResults.class.php:1217
msgid "Sort by key"
@@ -2736,11 +2746,11 @@ msgstr "Amagar transformació del navegador"
#: libraries/DisplayResults.class.php:1426
msgid "Well Known Text"
-msgstr ""
+msgstr "Text conegut"
#: libraries/DisplayResults.class.php:1427
msgid "Well Known Binary"
-msgstr ""
+msgstr "Binari conegut"
#: libraries/DisplayResults.class.php:2631
#: libraries/DisplayResults.class.php:2647
@@ -2803,7 +2813,7 @@ msgstr "Mostra el gràfic"
#: libraries/DisplayResults.class.php:4512
msgid "Visualize GIS data"
-msgstr ""
+msgstr "Visualitzar dades GIS"
#: libraries/DisplayResults.class.php:4542 view_create.php:122
msgid "Create view"
@@ -2815,11 +2825,11 @@ msgstr "No s'ha trobat l'enllaç"
#: libraries/Error_Handler.class.php:65
msgid "Too many error messages, some are not displayed."
-msgstr ""
+msgstr "Masses missatges d'error, alguns no es mostren."
#: libraries/File.class.php:235
msgid "File was not an uploaded file."
-msgstr ""
+msgstr "L'arxiu no ha estat pujat."
#: libraries/File.class.php:273
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -2864,11 +2874,11 @@ msgstr ""
#: libraries/File.class.php:485
msgid "Error while moving uploaded file."
-msgstr ""
+msgstr "Error moven l'arxiu pujat."
#: libraries/File.class.php:493
msgid "Cannot read (moved) upload file."
-msgstr ""
+msgstr "No es pot llegir l'arxiu pujat (i mogut)."
#: libraries/Footer.class.php:197 libraries/Footer.class.php:201
#: libraries/Footer.class.php:204
@@ -3123,7 +3133,7 @@ msgstr "La taula %s ha canviat de nom a %s"
#: libraries/Table.class.php:1409
msgid "Could not save table UI preferences"
-msgstr ""
+msgstr "No s'ha pogut desar la llista de preferències d'interfície"
#: libraries/Table.class.php:1433
#, php-format
@@ -3131,6 +3141,8 @@ msgid ""
"Failed to cleanup table UI preferences (see $cfg['Servers'][$i]"
"['MaxTableUiprefs'] %s)"
msgstr ""
+"No s'ha pogut netejar la taula de preferències de la interfície d'usuari "
+"(vegeu $cfg['Servers'][$i]['MaxTableUiprefs'] %s)"
#: libraries/Table.class.php:1571
#, php-format
@@ -3139,6 +3151,9 @@ msgid ""
"after you refresh this page. Please check if the table structure has been "
"changed."
msgstr ""
+"No es pot desar la propietat d'interfície d'usuari \"%s\". Els canvis fets no "
+"seran persistents després d'actualitzar la pàgina. Comprova si l'estructura "
+"de la taula ha canviat."
#: libraries/TableSearch.class.php:211 libraries/insert_edit.lib.php:230
#: libraries/insert_edit.lib.php:236 libraries/rte/rte_routines.lib.php:1458
@@ -3219,10 +3234,9 @@ msgid "How to use"
msgstr "Cóm utilitzar"
#: libraries/TableSearch.class.php:1227
-#, fuzzy
#| msgid "Reset"
msgid "Reset zoom"
-msgstr "Reinicia"
+msgstr "Reinicia l'ampliació"
#: libraries/Theme.class.php:169
#, php-format
@@ -3254,7 +3268,7 @@ msgstr "No s'ha trobat el camí de les imatges del tema %s!"
#: libraries/Theme_Manager.class.php:363 themes.php:16 themes.php:21
msgid "Theme"
-msgstr ""
+msgstr "Tema"
#: libraries/Types.class.php:295
msgid ""
@@ -3605,6 +3619,8 @@ msgid ""
"This usually means there is a syntax error in it, please check any errors "
"shown below."
msgstr ""
+"Això generalment significa que té un error de sintaxi, revisa els errors que "
+"es mostren a continuació."
#: libraries/common.inc.php:581
#, php-format
@@ -3645,15 +3661,15 @@ msgstr "Es necessari actualitzar a %s %s o posterior."
#: libraries/common.inc.php:1076
msgid "GLOBALS overwrite attempt"
-msgstr ""
+msgstr "intent de sobreescriure la variable GLOBALS"
#: libraries/common.inc.php:1083
msgid "possible exploit"
-msgstr ""
+msgstr "possible aprofitament"
#: libraries/common.inc.php:1092
msgid "numeric key detected"
-msgstr ""
+msgstr "detectat teclat numéric"
#: libraries/config.values.php:53 libraries/config.values.php:60
#: libraries/config.values.php:68
@@ -3662,11 +3678,11 @@ msgstr "Ambdós"
#: libraries/config.values.php:57
msgid "Nowhere"
-msgstr ""
+msgstr "Enlloc"
#: libraries/config.values.php:58
msgid "Left"
-msgstr ""
+msgstr "Esquerra"
#: libraries/config.values.php:59
msgid "Right"
@@ -3944,6 +3960,8 @@ msgid ""
"Defines the minimum size for input fields generated for CHAR and VARCHAR "
"columns"
msgstr ""
+"Defineix el tamany mínim per als camps d'entrada generats per columnes CHAR "
+"i VARCHAR"
#: libraries/config/messages.inc.php:37
msgid "Minimum size for input field"
@@ -3954,6 +3972,7 @@ msgid ""
"Defines the maximum size for input fields generated for CHAR and VARCHAR "
"columns"
msgstr ""
+"Defineix el nombre dels camps d'entrada generats per columnes CHAR i VARCHAR"
#: libraries/config/messages.inc.php:39
msgid "Maximum size for input field"
@@ -4076,6 +4095,9 @@ msgid ""
"Disable the table maintenance mass operations, like optimizing or repairing "
"the selected tables of a database."
msgstr ""
+"Desactivar les operacions de manteniment massiu de taules, com "
+"l'optimització o la reparació de les taules seleccionades d'una base de "
+"dades."
#: libraries/config/messages.inc.php:67
msgid "Disable multi table maintenance"
@@ -5035,7 +5057,7 @@ msgstr "Aixó són enllaços a Edició, Còpia i Esborrat"
#: libraries/config/messages.inc.php:326
msgid "Where to show the table row links"
-msgstr ""
+msgstr "Ón de mostrar els vincles de fila de taula"
#: libraries/config/messages.inc.php:327
msgid "Use natural order for sorting table and database names"
@@ -5167,7 +5189,7 @@ msgstr "Motor d'enregistrament"
#: libraries/config/messages.inc.php:356
msgid "When browsing tables, the sorting of each table is remembered"
-msgstr ""
+msgstr "Al navegar per les taules, es recorda la classificació de cada taula"
#: libraries/config/messages.inc.php:357
msgid "Remember table's sorting"
@@ -5184,7 +5206,7 @@ msgstr "Repeteix capçeleres"
#: libraries/config/messages.inc.php:361
msgid "Save all edited cells at once"
-msgstr ""
+msgstr "Desa totes les cel.les editades alhora"
#: libraries/config/messages.inc.php:362
msgid "Directory where exports can be saved on server"
@@ -5311,6 +5333,8 @@ msgid ""
"An alternate host to hold the configuration storage; leave blank to use the "
"already defined host"
msgstr ""
+"Un hoste alternatiu per mantenir l'emmagatzematge de la configuració, deixa "
+"en blanc per utilitzar la màquina ja definida"
#: libraries/config/messages.inc.php:388
msgid "Control host"
@@ -5395,6 +5419,8 @@ msgid ""
"Limits number of table preferences which are stored in database, the oldest "
"records are automatically removed"
msgstr ""
+"Limita el nombre de preferències de taula que s'emmagatzemen a la base de "
+"dades, els registres més antics s'eliminen automàticament"
#: libraries/config/messages.inc.php:405
msgid "Maximal number of table preferences to store"
@@ -5731,6 +5757,8 @@ msgid ""
"Defines whether or not type display direction option is shown when browsing "
"a table"
msgstr ""
+"Defineix si es mostra o no l'opció de tipus de direcció de visualització "
+"quan es navega per una taula"
#: libraries/config/messages.inc.php:467
msgid "Show display direction"
@@ -5758,7 +5786,7 @@ msgstr "Mostra els camps de funció"
#: libraries/config/messages.inc.php:472
msgid "Whether to show hint or not"
-msgstr ""
+msgstr "Mostrar o no ajudes"
#: libraries/config/messages.inc.php:473
msgid "Show hint"
@@ -5792,6 +5820,8 @@ msgstr "Mostra consultes SQL"
msgid ""
"Defines whether the query box should stay on-screen after its submission"
msgstr ""
+"Defineix si el quadre de consulta ha de romandre a la pantalla després de la "
+"seva presentació"
#: libraries/config/messages.inc.php:480 libraries/sql_query_form.lib.php:377
msgid "Retain query box"
@@ -6080,7 +6110,7 @@ msgstr "Text format Open Document"
#: libraries/config/validate.lib.php:212
msgid "Could not initialize Drizzle connection library"
-msgstr ""
+msgstr "No s'ha pogut inicialitzar la biblioteca de connexió Drizzle"
#: libraries/config/validate.lib.php:221 libraries/config/validate.lib.php:229
msgid "Could not connect to Drizzle server"
@@ -6128,7 +6158,7 @@ msgstr "No es troba l'extensió %s. Comprova la configuració de PHP."
#: libraries/core.lib.php:430
msgid "possible deep recursion attack"
-msgstr ""
+msgstr "possible atac de recursivitat profunda"
#: libraries/database_interface.lib.php:1966
msgid ""
@@ -6144,7 +6174,7 @@ msgstr "El servidor no respon."
#: libraries/database_interface.lib.php:1974
msgid "Please check privileges of directory containing database."
-msgstr ""
+msgstr "Comprova els permisos del directori que conté la base de dades."
#: libraries/database_interface.lib.php:1983
msgid "Details..."
@@ -7056,7 +7086,7 @@ msgstr "De"
#: libraries/mult_submits.inc.php:282
msgid "To"
-msgstr ""
+msgstr "A"
#: libraries/mult_submits.inc.php:287 libraries/mult_submits.inc.php:300
#: libraries/sql_query_form.lib.php:423
@@ -7065,7 +7095,7 @@ msgstr "Envia"
#: libraries/mult_submits.inc.php:292
msgid "Add table prefix"
-msgstr ""
+msgstr "Afegir prefix de taula"
#: libraries/mult_submits.inc.php:295
msgid "Add prefix"
@@ -7321,7 +7351,7 @@ msgstr ""
#: libraries/plugins/auth/AuthenticationCookie.class.php:42
msgid "Failed to use Blowfish from mcrypt!"
-msgstr ""
+msgstr "No s'ha pogut utilitzar Blowfish de mcrypt!"
#: libraries/plugins/auth/AuthenticationCookie.class.php:81
msgid "Your session has expired. Please login again."
@@ -7861,23 +7891,23 @@ msgstr ""
#: libraries/plugins/import/ImportShp.class.php:49
msgid "ESRI Shape File"
-msgstr ""
+msgstr "Arxiu de tipus ESRI"
#: libraries/plugins/import/ImportShp.class.php:149
#, php-format
msgid "There was an error importing the ESRI shape file: \"%s\"."
-msgstr ""
+msgstr "Hi va haver un error en importar el fitxer de tipus ESRI: \"%s\"."
#: libraries/plugins/import/ImportShp.class.php:202
msgid ""
"You tried to import an invalid file or the imported file contains invalid "
"data"
-msgstr ""
+msgstr "Has intentat importar un arxiu no vàlid o conté dades no vàlides"
#: libraries/plugins/import/ImportShp.class.php:208
#, php-format
msgid "MySQL Spatial Extension does not support ESRI type \"%s\"."
-msgstr ""
+msgstr "La extensió espacial MySQL no és compatible amb el tipus ESRI \"%s\"."
#: libraries/plugins/import/ImportShp.class.php:256
msgid "The imported file does not contain any data"
@@ -8102,7 +8132,7 @@ msgstr "Taules persistents usades recentment"
#: libraries/relation.lib.php:227
msgid "Persistent tables' UI preferences"
-msgstr ""
+msgstr "Preferències de la interfície de taules persistents"
#: libraries/relation.lib.php:249
msgid "User preferences"
@@ -8253,12 +8283,12 @@ msgstr "Ha fallat la següent consulta: \"%s\""
#: libraries/rte/rte_events.lib.php:118
msgid "Sorry, we failed to restore the dropped event."
-msgstr ""
+msgstr "Ho sentim, no s'ha pogut restaurar l'esdeveniment eliminat."
#: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_routines.lib.php:304
#: libraries/rte/rte_triggers.lib.php:90
msgid "The backed up query was:"
-msgstr ""
+msgstr "La consulta a la còpia de seguretat era:"
#: libraries/rte/rte_events.lib.php:123
#, php-format
@@ -8273,7 +8303,7 @@ msgstr "S'ha creat l'esdeveniment %1$s."
#: libraries/rte/rte_events.lib.php:143 libraries/rte/rte_routines.lib.php:337
#: libraries/rte/rte_triggers.lib.php:114
msgid "One or more errors have occured while processing your request:"
-msgstr ""
+msgstr "S'han produït un o més errors al processar la teva sol.licitud:"
#: libraries/rte/rte_events.lib.php:188
msgid "Edit event"
@@ -8306,11 +8336,11 @@ msgstr "Canviar a %s"
#: libraries/rte/rte_events.lib.php:430
msgid "Execute at"
-msgstr ""
+msgstr "Executar en"
#: libraries/rte/rte_events.lib.php:438
msgid "Execute every"
-msgstr ""
+msgstr "Executar cada"
#: libraries/rte/rte_events.lib.php:457
msgctxt "Start of recurring event"
@@ -8329,49 +8359,49 @@ msgstr "Preservar al completar"
#: libraries/rte/rte_events.lib.php:483 libraries/rte/rte_routines.lib.php:993
#: libraries/rte/rte_triggers.lib.php:368
msgid "Definer"
-msgstr ""
+msgstr "Definidor"
#: libraries/rte/rte_events.lib.php:528
#: libraries/rte/rte_routines.lib.php:1059
#: libraries/rte/rte_triggers.lib.php:407
msgid "The definer must be in the \"username@hostname\" format"
-msgstr ""
+msgstr "El definidor ha d'estar en el format \"usuari@servidor\""
#: libraries/rte/rte_events.lib.php:535
msgid "You must provide an event name"
-msgstr ""
+msgstr "Has de proporcionar un nom d'esdeveniment"
#: libraries/rte/rte_events.lib.php:547
msgid "You must provide a valid interval value for the event."
-msgstr ""
+msgstr "Has de proporcionar un valor de l'interval vàlid per a l'esdeveniment."
#: libraries/rte/rte_events.lib.php:559
msgid "You must provide a valid execution time for the event."
-msgstr ""
+msgstr "Has de proporcionar un temps d'execució vàlid per a l'esdeveniment."
#: libraries/rte/rte_events.lib.php:563
msgid "You must provide a valid type for the event."
-msgstr ""
+msgstr "Has de proporcionar un tipus vàlid per a l'esdeveniment."
#: libraries/rte/rte_events.lib.php:582
msgid "You must provide an event definition."
-msgstr ""
+msgstr "Has de proporcionar una definició d'esdeveniment."
#: libraries/rte/rte_footer.lib.php:31 server_privileges.php:2598
msgid "New"
-msgstr ""
+msgstr "Nou"
#: libraries/rte/rte_footer.lib.php:93
msgid "OFF"
-msgstr ""
+msgstr "Desconnectat"
#: libraries/rte/rte_footer.lib.php:98
msgid "ON"
-msgstr ""
+msgstr "Connectat"
#: libraries/rte/rte_footer.lib.php:110
msgid "Event scheduler status"
-msgstr ""
+msgstr "Estat del planificador d'esdeveniments"
#: libraries/rte/rte_list.lib.php:55
msgid "Returns"
@@ -8393,7 +8423,7 @@ msgstr "tipus de rutina invàlid: \"%s\""
#: libraries/rte/rte_routines.lib.php:303
msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
+msgstr "Malauradament, no hem pogut recuperar la rutina eliminada."
#: libraries/rte/rte_routines.lib.php:308
#, php-format
@@ -8415,7 +8445,7 @@ msgstr "Nom de rutina"
#: libraries/rte/rte_routines.lib.php:913
msgid "Parameters"
-msgstr ""
+msgstr "Paràmetres"
#: libraries/rte/rte_routines.lib.php:918
msgid "Direction"
@@ -8447,7 +8477,7 @@ msgstr "Retornar opcions"
#: libraries/rte/rte_routines.lib.php:989
msgid "Is deterministic"
-msgstr ""
+msgstr "És deterministic"
#: libraries/rte/rte_routines.lib.php:998
msgid "Security type"
@@ -8455,16 +8485,16 @@ msgstr "Tipus de seguretat"
#: libraries/rte/rte_routines.lib.php:1005
msgid "SQL data access"
-msgstr ""
+msgstr "Accés de dades SQL"
#: libraries/rte/rte_routines.lib.php:1075
msgid "You must provide a routine name"
-msgstr ""
+msgstr "Has de proporcionar un nom de rutina"
#: libraries/rte/rte_routines.lib.php:1101
#, php-format
msgid "Invalid direction \"%s\" given for parameter."
-msgstr ""
+msgstr "Direcció \"%s\" no vàlida donada per al paràmetre."
#: libraries/rte/rte_routines.lib.php:1115
#: libraries/rte/rte_routines.lib.php:1157
@@ -8472,25 +8502,28 @@ msgid ""
"You must provide length/values for routine parameters of type ENUM, SET, "
"VARCHAR and VARBINARY."
msgstr ""
+"Has de proporcionar la longitud/valors dels paràmetres de tipus ENUM, SET, "
+"VARCHAR i VARBINARY."
#: libraries/rte/rte_routines.lib.php:1133
msgid "You must provide a name and a type for each routine parameter."
msgstr ""
+"Has de proporcionar un nom i un tipus per a cada paràmetre de la rutina."
#: libraries/rte/rte_routines.lib.php:1145
msgid "You must provide a valid return type for the routine."
-msgstr ""
+msgstr "Has de proporcionar un tipus de resposta vàlida per a la rutina."
#: libraries/rte/rte_routines.lib.php:1191
msgid "You must provide a routine definition."
-msgstr ""
+msgstr "Has de proporcionar una definició de la rutina."
#: libraries/rte/rte_routines.lib.php:1286
#, php-format
msgid "%d row affected by the last statement inside the procedure"
msgid_plural "%d rows affected by the last statement inside the procedure"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d fila afectada per l'última sentència dins el procediment"
+msgstr[1] "%d files afectades per l'última sentència dins el procediment"
#: libraries/rte/rte_routines.lib.php:1302
#, php-format
@@ -8500,7 +8533,7 @@ msgstr "Resultats de l'execució de la rutina %s"
#: libraries/rte/rte_routines.lib.php:1382
#: libraries/rte/rte_routines.lib.php:1390
msgid "Execute routine"
-msgstr ""
+msgstr "Executar rutina"
#: libraries/rte/rte_routines.lib.php:1448
#: libraries/rte/rte_routines.lib.php:1451
@@ -8509,7 +8542,7 @@ msgstr "Paràmetres de rutina"
#: libraries/rte/rte_triggers.lib.php:89
msgid "Sorry, we failed to restore the dropped trigger."
-msgstr ""
+msgstr "Malauradament, no s'ha pogut restaurar el disparador eliminat."
#: libraries/rte/rte_triggers.lib.php:94
#, php-format
@@ -12732,10 +12765,9 @@ msgid "Query cache disabled"
msgstr "Memòria cau de consultes desactivat"
#: libraries/advisory_rules.txt:149
-#, fuzzy
#| msgid "The server is not responding"
msgid "The query cache is not enabled."
-msgstr "El servidor no respon"
+msgstr "El cau de consultes no està activat."
#: libraries/advisory_rules.txt:150
msgid ""
@@ -12750,10 +12782,9 @@ msgid "query_cache_size is set to 0 or query_cache_type is set to 'OFF'"
msgstr ""
#: libraries/advisory_rules.txt:153
-#, fuzzy
#| msgid "Query cache"
msgid "Query caching method"
-msgstr "Memòria cau de consultes"
+msgstr "Mètode de cau de consultes"
#: libraries/advisory_rules.txt:156
#, fuzzy
@@ -12777,10 +12808,10 @@ msgid ""
msgstr ""
#: libraries/advisory_rules.txt:160
-#, fuzzy, php-format
+#, php-format
#| msgid "Query cache"
msgid "Query cache efficiency (%%)"
-msgstr "Memòria cau de consultes"
+msgstr "Eficiència del cau de consultes (%%)"
#: libraries/advisory_rules.txt:163
msgid "Query cache not running efficiently, it has a low hit rate."
@@ -12797,9 +12828,8 @@ msgid "The current query cache hit rate of %s%% is below 20%%"
msgstr "Tamany de l'àrea de classificació"
#: libraries/advisory_rules.txt:167
-#, fuzzy
msgid "Query Cache usage"
-msgstr "Memòria cau de consultes"
+msgstr "Ús del cau de consultes"
#: libraries/advisory_rules.txt:170
#, php-format
@@ -12820,10 +12850,9 @@ msgid ""
msgstr ""
#: libraries/advisory_rules.txt:174
-#, fuzzy
#| msgid "Query cache"
msgid "Query cache fragmentation"
-msgstr "Memòria cau de consultes"
+msgstr "Fragmentació del cau de consultes"
#: libraries/advisory_rules.txt:177
#, fuzzy
@@ -12858,12 +12887,13 @@ msgid "Query cache low memory prunes"
msgstr "Memòria cau de consultes utilitzada"
#: libraries/advisory_rules.txt:184
-#, fuzzy
#| msgid "The amount of free memory for query cache."
msgid ""
"Cached queries are removed due to low query cache memory from the query "
"cache."
-msgstr "La quantitat de memòria liure per a memòria cau de consultes."
+msgstr ""
+"S'esborren les consultes al cau degut a la poca memòria dedicada al cau de "
+"consultes."
#: libraries/advisory_rules.txt:185
msgid ""
@@ -12880,10 +12910,9 @@ msgid ""
msgstr ""
#: libraries/advisory_rules.txt:188
-#, fuzzy
#| msgid "Query cache"
msgid "Query cache max size"
-msgstr "Memòria cau de consultes"
+msgstr "Tamany màxim del cau de consultes"
#: libraries/advisory_rules.txt:191
msgid ""
@@ -12904,10 +12933,9 @@ msgid "Current query cache size: %s"
msgstr "Versió actual: %s"
#: libraries/advisory_rules.txt:195
-#, fuzzy
#| msgid "Query results"
msgid "Query cache min result size"
-msgstr "Resultats de consultes"
+msgstr "Tamany minim de resultats del cau de consultes"
#: libraries/advisory_rules.txt:198
msgid ""
@@ -12931,16 +12959,14 @@ msgid "query_cache_limit is set to 1 MiB"
msgstr ""
#: libraries/advisory_rules.txt:204
-#, fuzzy
#| msgid "Allows creating temporary tables."
msgid "Percentage of sorts that cause temporary tables"
-msgstr "Permet crear taules temporals."
+msgstr "Percentatge de classificacions que esdevenen taules temporals"
#: libraries/advisory_rules.txt:207 libraries/advisory_rules.txt:214
-#, fuzzy
#| msgid "Allows creating temporary tables."
msgid "Too many sorts are causing temporary tables."
-msgstr "Permet crear taules temporals."
+msgstr "Masses classificacions esdevenen en taules temporals."
#: libraries/advisory_rules.txt:208 libraries/advisory_rules.txt:215
msgid ""
@@ -12956,10 +12982,9 @@ msgid ""
msgstr ""
#: libraries/advisory_rules.txt:211
-#, fuzzy
#| msgid "Allows creating temporary tables."
msgid "Rate of sorts that cause temporary tables"
-msgstr "Permet crear taules temporals."
+msgstr "Rati de classificacions que provoquen taules temporals"
#: libraries/advisory_rules.txt:216
#, fuzzy, php-format
@@ -12969,10 +12994,9 @@ msgid ""
msgstr "Tamany de l'àrea de classificació"
#: libraries/advisory_rules.txt:218
-#, fuzzy
#| msgid "Textarea rows"
msgid "Sort rows"
-msgstr "Files per a textareas"
+msgstr "Files classificades"
#: libraries/advisory_rules.txt:221
msgid "There are lots of rows being sorted."
@@ -12992,16 +13016,14 @@ msgid "Sorted rows average: %s"
msgstr ""
#: libraries/advisory_rules.txt:226
-#, fuzzy
#| msgid "There are no files to upload"
msgid "Rate of joins without indexes"
-msgstr "No hi ha cap arxiu per pujar"
+msgstr "Rati d'unions (\"JOIN\") sense índex"
#: libraries/advisory_rules.txt:229
-#, fuzzy
#| msgid "There are no files to upload"
msgid "There are too many joins without indexes."
-msgstr "No hi ha cap arxiu per pujar"
+msgstr "Masses unions sense índex."
#: libraries/advisory_rules.txt:230
msgid ""
@@ -13146,11 +13168,10 @@ msgid ""
msgstr ""
#: libraries/advisory_rules.txt:269
-#, fuzzy
#| msgid "%s table"
#| msgid_plural "%s tables"
msgid "Temp disk rate"
-msgstr "%s taula"
+msgstr "Rati de taules temporals en disc"
#: libraries/advisory_rules.txt:273
msgid ""
@@ -13171,10 +13192,9 @@ msgid ""
msgstr ""
#: libraries/advisory_rules.txt:289
-#, fuzzy
#| msgid "Sort buffer size"
msgid "MyISAM key buffer size"
-msgstr "Tamany de l'àrea de classificació"
+msgstr "Tamany de l'àrea de claus MyISAM"
#: libraries/advisory_rules.txt:292
msgid "Key buffer is not initialized. No MyISAM indexes will be cached."
@@ -13193,16 +13213,16 @@ msgid "key_buffer_size is 0"
msgstr "Tamany de l'àrea de classificació"
#: libraries/advisory_rules.txt:296
-#, fuzzy, php-format
+#, php-format
#| msgid "Sort buffer size"
msgid "Max %% MyISAM key buffer ever used"
-msgstr "Tamany de l'àrea de classificació"
+msgstr "%% Màxim àrea de claus MyISAM usada mai"
#: libraries/advisory_rules.txt:299 libraries/advisory_rules.txt:307
-#, fuzzy, php-format
+#, php-format
#| msgid "Sort buffer size"
msgid "MyISAM key buffer (index cache) %% used is low."
-msgstr "Tamany de l'àrea de classificació"
+msgstr "Àrea de claus MyISAM (cau d'índex) usada %% baixa."
#: libraries/advisory_rules.txt:300 libraries/advisory_rules.txt:308
msgid ""
@@ -13212,17 +13232,18 @@ msgid ""
msgstr ""
#: libraries/advisory_rules.txt:301
-#, fuzzy, php-format
+#, php-format
#| msgid "Sort buffer size"
msgid ""
"max %% MyISAM key buffer ever used: %s%%, this value should be above 95%%"
-msgstr "Tamany de l'àrea de classificació"
+msgstr ""
+"Màxim %% d'àrea de claus MyISAM usat mai: %s%%, aquest valor ha d'estar al "
+"voltant del 95%%"
#: libraries/advisory_rules.txt:304
-#, fuzzy
#| msgid "Sort buffer size"
msgid "Percentage of MyISAM key buffer used"
-msgstr "Tamany de l'àrea de classificació"
+msgstr "Percentatge usat de l'àrea de claus MyISAM"
#: libraries/advisory_rules.txt:309
#, fuzzy, php-format
@@ -13252,16 +13273,14 @@ msgid "Index reads from memory: %s%%, this value should be above 95%%"
msgstr "Tamany de l'àrea de classificació"
#: libraries/advisory_rules.txt:320
-#, fuzzy
#| msgid "Create table"
msgid "Rate of table open"
-msgstr "Crea una taula"
+msgstr "Rati de taules obertes"
#: libraries/advisory_rules.txt:323
-#, fuzzy
#| msgid "The current number of pending writes."
msgid "The rate of opening tables is high."
-msgstr "El nombre actual d'escritures pendents."
+msgstr "El rati de taules obertes és alt."
#: libraries/advisory_rules.txt:324
msgid ""
@@ -13276,10 +13295,9 @@ msgid "Opened table rate: %s, this value should be less than 10 per hour"
msgstr "Tamany de l'àrea de classificació"
#: libraries/advisory_rules.txt:327
-#, fuzzy
#| msgid "Format of imported file"
msgid "Percentage of used open files limit"
-msgstr "Format de l'arxiu importat"
+msgstr "Percentatge d'ús del límit d'arxius oberts"
#: libraries/advisory_rules.txt:330
msgid ""
@@ -13300,16 +13318,14 @@ msgid ""
msgstr ""
#: libraries/advisory_rules.txt:334
-#, fuzzy
#| msgid "Format of imported file"
msgid "Rate of open files"
-msgstr "Format de l'arxiu importat"
+msgstr "Rati d'arxius oberts"
#: libraries/advisory_rules.txt:337
-#, fuzzy
#| msgid "The number of pending log file fsyncs."
msgid "The rate of opening files is high."
-msgstr "El nombre d'operacions fsync pendents a l'arxiu de registre."
+msgstr "El rati d'arxius oberts és alt."
#: libraries/advisory_rules.txt:339
#, fuzzy, php-format
@@ -13318,16 +13334,15 @@ msgid "Opened files rate: %s, this value should be less than 5 per hour"
msgstr "Tamany de l'àrea de classificació"
#: libraries/advisory_rules.txt:341
-#, fuzzy, php-format
+#, php-format
#| msgid "Create table on database %s"
msgid "Immediate table locks %%"
-msgstr "Crear una taula nova a la base de dades %s"
+msgstr "%% de bloquejos immediats de taules"
#: libraries/advisory_rules.txt:344 libraries/advisory_rules.txt:351
-#, fuzzy
#| msgid " number of times that a table lock was acquired immediately."
msgid "Too many table locks were not granted immediately."
-msgstr "El nombre de vegades que un bloqueig de taula s'ha fet immediatament."
+msgstr "Masses bloquejos de taula no s'han fet immediatament."
#: libraries/advisory_rules.txt:345 libraries/advisory_rules.txt:352
msgid "Optimize queries and/or use InnoDB to reduce lock wait."
@@ -13350,10 +13365,9 @@ msgid "Table lock wait rate: %s, this value should be less than 1 per hour"
msgstr "Tamany de l'àrea de classificació"
#: libraries/advisory_rules.txt:355
-#, fuzzy
#| msgid "Key cache"
msgid "Thread cache"
-msgstr "Memòria cau de claus"
+msgstr "Memòria cau de fils"
#: libraries/advisory_rules.txt:358
msgid ""
@@ -13372,16 +13386,15 @@ msgid "The thread cache is set to 0"
msgstr "El seguiment no està actiu."
#: libraries/advisory_rules.txt:362
-#, fuzzy, php-format
+#, php-format
#| msgid "Tracking is not active."
msgid "Thread cache hit rate %%"
-msgstr "El seguiment no està actiu."
+msgstr "%% de rati d'encerts al cau de fils"
#: libraries/advisory_rules.txt:365
-#, fuzzy
#| msgid "Tracking is not active."
msgid "Thread cache is not efficient."
-msgstr "El seguiment no està actiu."
+msgstr "El cau de fils no és eficient."
#: libraries/advisory_rules.txt:366
msgid "Increase {thread_cache_size}."
@@ -13400,10 +13413,9 @@ msgid "Threads that are slow to launch"
msgstr "El nombre de fils que no estàn dormint."
#: libraries/advisory_rules.txt:372
-#, fuzzy
#| msgid "The number of threads that are not sleeping."
msgid "There are too many threads that are slow to launch."
-msgstr "El nombre de fils que no estàn dormint."
+msgstr "Hi ha massa fils que s'inicien lentament."
#: libraries/advisory_rules.txt:373
msgid ""
@@ -13441,10 +13453,9 @@ msgid "slow_launch_time is set to %s"
msgstr "«long_query_time» està configurat a %d segon(s)."
#: libraries/advisory_rules.txt:385
-#, fuzzy
#| msgid "Persistent connections"
msgid "Percentage of used connections"
-msgstr "Connexions persistents"
+msgstr "Percentatge de connexions usades"
#: libraries/advisory_rules.txt:388
msgid ""
@@ -13466,10 +13477,9 @@ msgid ""
msgstr ""
#: libraries/advisory_rules.txt:392
-#, fuzzy
#| msgid "Persistent connections"
msgid "Percentage of aborted connections"
-msgstr "Connexions persistents"
+msgstr "Percentatge de connexions fallides"
#: libraries/advisory_rules.txt:395 libraries/advisory_rules.txt:402
#, fuzzy
@@ -13491,10 +13501,9 @@ msgid "%s%% of all connections are aborted. This value should be below 1%%"
msgstr ""
#: libraries/advisory_rules.txt:399
-#, fuzzy
#| msgid "Persistent connections"
msgid "Rate of aborted connections"
-msgstr "Connexions persistents"
+msgstr "Rati de connexions fallides"
#: libraries/advisory_rules.txt:404
#, php-format
@@ -13503,10 +13512,9 @@ msgid ""
msgstr ""
#: libraries/advisory_rules.txt:406
-#, fuzzy
#| msgid "Format of imported file"
msgid "Percentage of aborted clients"
-msgstr "Format de l'arxiu importat"
+msgstr "Percentatge de clients avortats"
#: libraries/advisory_rules.txt:409 libraries/advisory_rules.txt:416
#, fuzzy
@@ -13527,10 +13535,9 @@ msgid "%s%% of all clients are aborted. This value should be below 2%%"
msgstr ""
#: libraries/advisory_rules.txt:413
-#, fuzzy
#| msgid "Format of imported file"
msgid "Rate of aborted clients"
-msgstr "Format de l'arxiu importat"
+msgstr "Rati de clients avortats"
#: libraries/advisory_rules.txt:418
#, fuzzy, php-format
@@ -13543,10 +13550,9 @@ msgid "Is InnoDB disabled?"
msgstr ""
#: libraries/advisory_rules.txt:425
-#, fuzzy
#| msgid "Could not save configuration"
msgid "You do not have InnoDB enabled."
-msgstr "No es pot desar la configuració"
+msgstr "El motor InnoDB no està activat."
#: libraries/advisory_rules.txt:426
msgid "InnoDB is usually the better choice for table engines."
@@ -13557,18 +13563,18 @@ msgid "have_innodb is set to 'value'"
msgstr ""
#: libraries/advisory_rules.txt:429
-#, fuzzy
#| msgid "Buffer pool size"
msgid "InnoDB log size"
-msgstr "Tamany de la memòria cau"
+msgstr "Tamany del registre d'InnoDB"
#: libraries/advisory_rules.txt:432
-#, fuzzy
#| msgid "The number writes done to the InnoDB buffer pool."
msgid ""
"The InnoDB log file size is not an appropriate size, in relation to the "
"InnoDB buffer pool."
-msgstr "El nombre d'escriptures fetes a la memòria cau d'InnoDB."
+msgstr ""
+"El tamany del registre d'InnoDB no és acurat, en relació a la reserva de "
+"búfers InnoDB."
#: libraries/advisory_rules.txt:433
#, php-format
@@ -13622,10 +13628,9 @@ msgid "Your absolute InnoDB log size is %s MiB"
msgstr ""
#: libraries/advisory_rules.txt:443
-#, fuzzy
#| msgid "Buffer pool size"
msgid "InnoDB buffer pool size"
-msgstr "Tamany de la memòria cau"
+msgstr "Tamany del búfer d'InnoDB"
#: libraries/advisory_rules.txt:446
#, fuzzy
@@ -13658,10 +13663,9 @@ msgid ""
msgstr ""
#: libraries/advisory_rules.txt:452
-#, fuzzy
#| msgid "max. concurrent connections"
msgid "MyISAM concurrent inserts"
-msgstr "max. connexions a la vegada"
+msgstr "Insercions MyISAM a l'hora"
#: libraries/advisory_rules.txt:455
#, fuzzy
diff --git a/po/ckb.po b/po/ckb.po
index 8e7309c415..71bcbfe24a 100644
--- a/po/ckb.po
+++ b/po/ckb.po
@@ -8,15 +8,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-07-03 09:19+0200\n"
-"PO-Revision-Date: 2012-05-26 20:03+0200\n"
-"Last-Translator: Aso Naderi \n"
+"PO-Revision-Date: 2012-07-04 20:30+0200\n"
+"Last-Translator: Hunar kirkuk \n"
"Language-Team: none\n"
"Language: ckb\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 1.0\n"
+"X-Generator: Weblate 1.1\n"
#: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354
#: libraries/DisplayResults.class.php:609 server_privileges.php:1851
@@ -777,9 +777,9 @@ msgid "Bad parameters!"
msgstr ""
#: export.php:196 export.php:227 export.php:781
-#, php-format
+#, php-format, fuzzy
msgid "Insufficient space to save the file %s."
-msgstr ""
+msgstr "پاشکەوتکردنی فایل وەک"
#: export.php:362
#, php-format
@@ -799,7 +799,7 @@ msgstr ""
#: file_echo.php:21
msgid "Invalid export type"
-msgstr ""
+msgstr "هەناردنی ئەم جۆرە ڕێگەپێدراو نییە"
#: gis_data_editor.php:75
#, php-format
@@ -919,7 +919,7 @@ msgid ""
"No data was received to import. Either no file name was submitted, or the "
"file size exceeded the maximum size permitted by your PHP configuration. See "
"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
-msgstr ""
+msgstr "هێنان"
#: import.php:412
msgid ""
@@ -1025,7 +1025,7 @@ msgstr ""
#. l10n: Default description for the y-Axis of Charts
#: js/messages.php:48
msgid "Total count"
-msgstr ""
+msgstr "تێکڕای گشتی"
#: js/messages.php:51
msgid "The host name is empty!"
@@ -1040,8 +1040,9 @@ msgid "The password is empty!"
msgstr "وشەی نهێنی بەتاڵە!"
#: js/messages.php:54 server_privileges.php:1446 user_password.php:112
+#, fuzzy
msgid "The passwords aren't the same!"
-msgstr ""
+msgstr "وشە نهێنیەکان وەک خۆیان نین"
#: js/messages.php:55 server_privileges.php:1965 server_privileges.php:1989
#: server_privileges.php:2405 server_privileges.php:2601
@@ -2279,20 +2280,20 @@ msgstr ""
#: libraries/Advisor.class.php:425 server_status.php:972
msgid "per second"
-msgstr ""
+msgstr "لە چرکەیەک دا"
#: libraries/Advisor.class.php:428 server_status.php:967
msgid "per minute"
-msgstr ""
+msgstr "لە خولەکێک دا"
#: libraries/Advisor.class.php:431 server_status.php:963 server_status.php:999
#: server_status.php:1129 server_status.php:1192
msgid "per hour"
-msgstr ""
+msgstr "لە کاتژمێرێکدا"
#: libraries/Advisor.class.php:434
msgid "per day"
-msgstr ""
+msgstr "لە ڕؤژێکدا"
#: libraries/CommonFunctions.class.php:251
#, php-format
@@ -2305,7 +2306,7 @@ msgstr ""
#: libraries/display_export.lib.php:248 libraries/engines/pbxt.lib.php:114
#: libraries/relation.lib.php:90 main.php:249 server_variables.php:130
msgid "Documentation"
-msgstr ""
+msgstr "بهڵگهسازی"
#. l10n: Please check that translation actually exists.
#: libraries/CommonFunctions.class.php:534
@@ -2330,12 +2331,12 @@ msgstr "en"
#: libraries/insert_edit.lib.php:1195 tbl_operations.php:232
#: tbl_relation.php:292 view_operations.php:55
msgid "Error"
-msgstr ""
+msgstr "هەڵە"
#: libraries/CommonFunctions.class.php:683 server_status.php:613
#: server_status.php:1295 sql.php:969
msgid "SQL query"
-msgstr ""
+msgstr "داواکاری SQL"
#: libraries/CommonFunctions.class.php:727
#: libraries/rte/rte_events.lib.php:105 libraries/rte/rte_events.lib.php:110
@@ -6212,7 +6213,7 @@ msgstr ""
#: libraries/display_select_lang.lib.php:52
#: libraries/display_select_lang.lib.php:53 setup/frames/index.inc.php:75
msgid "Language"
-msgstr ""
+msgstr "زمان"
#: libraries/engines/bdb.lib.php:25 main.php:248
msgid "Version information"
@@ -7142,7 +7143,7 @@ msgstr ""
#: libraries/plugins/export/ExportSql.class.php:703
#: libraries/plugins/export/ExportXml.class.php:200
msgid "Server version"
-msgstr ""
+msgstr "وەشانی ڕاژە"
#: libraries/plugins/export/ExportLatex.class.php:231
#: libraries/plugins/export/ExportSql.class.php:705
diff --git a/po/da.po b/po/da.po
index 8dd9b15df6..ad8f43b951 100644
--- a/po/da.po
+++ b/po/da.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-07-03 09:19+0200\n"
-"PO-Revision-Date: 2012-07-04 01:34+0200\n"
+"PO-Revision-Date: 2012-07-05 23:51+0200\n"
"Last-Translator: Aputsiaq Niels Janussen \n"
"Language-Team: danish \n"
"Language: da\n"
@@ -1059,7 +1059,7 @@ msgstr "Intet brugernavn!"
#: js/messages.php:53 server_privileges.php:1448 user_password.php:109
msgid "The password is empty!"
-msgstr "Der er ikke angivet nogen adgangskode"
+msgstr "Adgangskoden er tom!"
#: js/messages.php:54 server_privileges.php:1446 user_password.php:112
msgid "The passwords aren't the same!"
@@ -1397,7 +1397,7 @@ msgid ""
"restart:"
msgstr ""
"De følgende indstillinger vil blive anvendt globalt og nulstillet til "
-"standard ved genstart af server"
+"standard ved genstart af server:"
#. l10n: %s is FILE or TABLE
#: js/messages.php:153
@@ -2489,7 +2489,7 @@ msgstr "%s dage, %s timer, %s minutter og %s sekunder"
#: libraries/CommonFunctions.class.php:2204
msgid "Missing parameter:"
-msgstr "Manglende parameter"
+msgstr "Manglende parameter:"
#: libraries/CommonFunctions.class.php:2624
#: libraries/CommonFunctions.class.php:2628
@@ -3088,10 +3088,10 @@ msgid "Source database `%s` was not found!"
msgstr "Kildedatabasen '%s' blev ikke fundet!"
#: libraries/Table.class.php:774
-#, fuzzy, php-format
+#, php-format
#| msgid "Theme %s not found!"
msgid "Target database `%s` was not found!"
-msgstr "Tema %s ikke fundet!"
+msgstr "Mål-databasen '%s' blev ikke fundet!"
#: libraries/Table.class.php:1200
msgid "Invalid database"
@@ -3107,10 +3107,10 @@ msgid "Error renaming table %1$s to %2$s"
msgstr "Fejl ved omdøbning af tabel %1$s til %2$s"
#: libraries/Table.class.php:1265
-#, fuzzy, php-format
+#, php-format
#| msgid "Table %s has been renamed to %s"
msgid "Table %1$s has been renamed to %2$s."
-msgstr "Tabellen %s er nu omdøbt til %s"
+msgstr "Tabellen %1$s er nu omdøbt til %2$s."
#: libraries/Table.class.php:1409
msgid "Could not save table UI preferences"
@@ -3165,7 +3165,7 @@ msgstr "Rediger/Indsæt"
#: libraries/TableSearch.class.php:795
msgid "Select columns (at least one):"
-msgstr "Vælg mindst een kolonne"
+msgstr "Vælg kolonner (mindst én):"
#: libraries/TableSearch.class.php:815
msgid "Add search conditions (body of the \"where\" clause):"
@@ -3215,10 +3215,9 @@ msgid "How to use"
msgstr "Hvordan man bruger"
#: libraries/TableSearch.class.php:1227
-#, fuzzy
#| msgid "Reset"
msgid "Reset zoom"
-msgstr "Nulstil"
+msgstr "Nulstil zoom"
#: libraries/Theme.class.php:169
#, php-format
@@ -3323,10 +3322,10 @@ msgid "An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE"
msgstr ""
#: libraries/Types.class.php:319 libraries/Types.class.php:721
-#, fuzzy, php-format
+#, php-format
#| msgid "Create version %s of %s.%s"
msgid "A date, supported range is %1$s to %2$s"
-msgstr "Opret version %s af %s.%s"
+msgstr "En dato, understøttet interval er %1$s til %2$s"
#: libraries/Types.class.php:321 libraries/Types.class.php:723
#, php-format
@@ -3340,10 +3339,10 @@ msgid ""
msgstr ""
#: libraries/Types.class.php:325 libraries/Types.class.php:727
-#, fuzzy, php-format
+#, php-format
#| msgid "Error renaming table %1$s to %2$s"
msgid "A time, range is %1$s to %2$s"
-msgstr "Fejl ved omdøbning af tabel %1$s til %2$s"
+msgstr "Et tidspunkt, interval er %1$s til %2$s"
#: libraries/Types.class.php:327
msgid ""
@@ -3448,10 +3447,9 @@ msgid "A curve with linear interpolation between points"
msgstr ""
#: libraries/Types.class.php:363
-#, fuzzy
#| msgid "Add a polygon"
msgid "A polygon"
-msgstr "Tilføj polygon"
+msgstr "En polygon"
#: libraries/Types.class.php:365
msgid "A collection of points"
@@ -3475,21 +3473,18 @@ msgid "Numeric"
msgstr ""
#: libraries/Types.class.php:642 libraries/Types.class.php:976
-#, fuzzy
#| msgid "Create an index"
msgctxt "date and time types"
msgid "Date and time"
-msgstr "Lav et nyt indeks"
+msgstr "Dato og tid"
#: libraries/Types.class.php:651 libraries/Types.class.php:979
-#, fuzzy
#| msgid "Linestring"
msgctxt "string types"
msgid "String"
-msgstr "Linjestreng"
+msgstr "Streng"
#: libraries/Types.class.php:672
-#, fuzzy
#| msgid "Spatial"
msgctxt "spatial types"
msgid "Spatial"
@@ -3610,7 +3605,6 @@ msgid "Could not load default configuration from: %1$s"
msgstr "Kunne ikke indlæse standardkonfiguration fra: %1$s"
#: libraries/common.inc.php:588
-#, fuzzy
#| msgid ""
#| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
#| "configuration file!"
@@ -3618,7 +3612,7 @@ msgid ""
"The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
"configuration file!"
msgstr ""
-"$cfg['PmaAbsoluteUri'] direktivet SKAL være sat i din "
+"Direktitvet [code]$cfg['PmaAbsoluteUri'][/code] SKAL være sat i din "
"konfigurationsfil!"
#: libraries/common.inc.php:621
@@ -3949,10 +3943,9 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:37
-#, fuzzy
#| msgid "Customize text input fields"
msgid "Minimum size for input field"
-msgstr "Tilpas tekstfelter"
+msgstr "Mindste størrelse for input-felt"
#: libraries/config/messages.inc.php:38
msgid ""
@@ -3961,10 +3954,9 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:39
-#, fuzzy
#| msgid "Maximum size for temporary sort files"
msgid "Maximum size for input field"
-msgstr "Maksimal størrelse for midlertidige sorteringsfiler"
+msgstr "Maksimal størrelse for input-felt"
#: libraries/config/messages.inc.php:40
msgid "Number of columns for CHAR/VARCHAR textareas"
@@ -4053,10 +4045,9 @@ msgid "Whether the table structure actions should be hidden"
msgstr ""
#: libraries/config/messages.inc.php:59
-#, fuzzy
#| msgid "Propose table structure"
msgid "Hide table structure actions"
-msgstr "Foreslå tabelstruktur"
+msgstr "Skjul handlinger for tabelstruktur"
#: libraries/config/messages.inc.php:60
msgid "Show binary contents as HEX by default"
@@ -4629,20 +4620,18 @@ msgid "Customize startup page"
msgstr "Tilpas opstartside"
#: libraries/config/messages.inc.php:228
-#, fuzzy
#| msgid "Database server"
msgid "Database structure"
-msgstr "Database server"
+msgstr "Database-struktur"
#: libraries/config/messages.inc.php:229
msgid "Choose which details to show in the database structure (list of tables)"
msgstr ""
#: libraries/config/messages.inc.php:230
-#, fuzzy
#| msgid "Database server"
msgid "Table structure"
-msgstr "Database server"
+msgstr "Tabel-struktur"
#: libraries/config/messages.inc.php:231
msgid "Settings for the table structure (list of columns)"
@@ -4816,10 +4805,9 @@ msgid "Minimum number of tables to display the table filter box"
msgstr "Mindste antal tabeller der skal vises i tabel-filterboksen"
#: libraries/config/messages.inc.php:281
-#, fuzzy
#| msgid "Minimum number of tables to display the table filter box"
msgid "Minimum number of databases to display the database filter box"
-msgstr "Mindste antal tabeller der skal vises i tabel-filterboksen"
+msgstr "Mindste antal databaser, der skal vises i database-filterboksen"
#: libraries/config/messages.inc.php:282
msgid "String that separates databases into different tree levels"
@@ -5308,10 +5296,9 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:388
-#, fuzzy
#| msgid "Control user"
msgid "Control host"
-msgstr "Kontrolbruger"
+msgstr "Kontrolvært"
#: libraries/config/messages.inc.php:389
msgid "Count tables when showing database list"
@@ -5393,10 +5380,9 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:405
-#, fuzzy
#| msgid "Maximum number of tables displayed in table list"
msgid "Maximal number of table preferences to store"
-msgstr "Maksimalt antal tabeller vist i tabellisten"
+msgstr "Maksimalt antal tabel-præferencer, der lagres"
#: libraries/config/messages.inc.php:406
msgid "Try to connect without password"
@@ -5692,10 +5678,9 @@ msgid "Show or hide a column displaying the Creation timestamp for all tables"
msgstr ""
#: libraries/config/messages.inc.php:461
-#, fuzzy
#| msgid "Show more actions"
msgid "Show Creation timestamp"
-msgstr "Vis flere operationer"
+msgstr "Vis tidsstempel for oprettelse"
#: libraries/config/messages.inc.php:462
msgid ""
@@ -5712,10 +5697,9 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:465
-#, fuzzy
#| msgid "Show master status"
msgid "Show Last check timestamp"
-msgstr "Vis master status"
+msgstr "Vis tidsstempel for Seneste tjek"
#: libraries/config/messages.inc.php:466
msgid ""
@@ -6121,18 +6105,18 @@ msgid "possible deep recursion attack"
msgstr "muligt dybt rekursionsangreb"
#: libraries/database_interface.lib.php:1966
-#, fuzzy
#| msgid " the local MySQL server's socket is not correctly configured)"
msgid ""
"The server is not responding (or the local server's socket is not correctly "
"configured)."
-msgstr "(eller den lokale MySQL servers socket er ikke korrekt konfigureret)"
+msgstr ""
+"Serveren svarer ikke (eller den lokale servers socket er ikke korrekt "
+"konfigureret)."
#: libraries/database_interface.lib.php:1969
-#, fuzzy
#| msgid "The server is not responding"
msgid "The server is not responding."
-msgstr "Serveren svarer ikke"
+msgstr "Serveren svarer ikke."
#: libraries/database_interface.lib.php:1974
msgid "Please check privileges of directory containing database."
@@ -6155,13 +6139,13 @@ msgstr[0] "I alt:%s sammenfald"
msgstr[1] "I alt%s sammenfald"
#: libraries/db_search.lib.php:211
-#, fuzzy, php-format
+#, php-format
#| msgid "%1$s match inside table %2$s"
#| msgid_plural "%1$s matches inside table %2$s"
msgid "%1$s match in %2$s"
msgid_plural "%1$s matches in %2$s"
-msgstr[0] "%1$s sammenfald i tabel %2$s"
-msgstr[1] "%1$s sammenfald i tabel %2$s"
+msgstr[0] "%1$s sammenfald i %2$s"
+msgstr[1] "%1$s sammenfald i %2$s"
#: libraries/db_search.lib.php:233
#, php-format
@@ -6402,7 +6386,7 @@ msgstr ""
#: libraries/display_export.lib.php:367 libraries/display_import.lib.php:326
msgid "Encoding Conversion:"
-msgstr "Inkodningskonvertering"
+msgstr "Konvertering af indkodning:"
#: libraries/display_git_revision.lib.php:59
#, php-format
@@ -6418,16 +6402,16 @@ msgid "Git revision"
msgstr ""
#: libraries/display_git_revision.lib.php:70
-#, fuzzy, php-format
+#, php-format
#| msgid "Create version %s of %s.%s"
msgid "committed on %1$s by %2$s"
-msgstr "Opret version %s af %s.%s"
+msgstr "indsendt den %1$s af %2$s"
#: libraries/display_git_revision.lib.php:78
-#, fuzzy, php-format
+#, php-format
#| msgid "Create version %s of %s.%s"
msgid "authored on %1$s by %2$s"
-msgstr "Opret version %s af %s.%s"
+msgstr "forfattet den %1$s af %2$s"
#: libraries/display_import.lib.php:68
msgid ""
@@ -6445,10 +6429,9 @@ msgid "%s of %s"
msgstr ""
#: libraries/display_import.lib.php:85
-#, fuzzy
#| msgid "Format of imported file"
msgid "Uploading your import file..."
-msgstr "Format på importeret fil"
+msgstr "Overfører din importfil ..."
#: libraries/display_import.lib.php:93
#, php-format
@@ -6921,10 +6904,10 @@ msgid "Edit structure by following the \"Structure\" link"
msgstr "Rediger struktur ved at følge linket \"Struktur\""
#: libraries/import.lib.php:1178
-#, fuzzy, php-format
+#, php-format
#| msgid "Go to database"
msgid "Go to database: %s"
-msgstr "Gå til database"
+msgstr "Gå til databasen: %s"
#: libraries/import.lib.php:1181 libraries/import.lib.php:1209
#, php-format
@@ -6932,10 +6915,10 @@ msgid "Edit settings for %s"
msgstr "Rediger indstillinger for %s"
#: libraries/import.lib.php:1204
-#, fuzzy, php-format
+#, php-format
#| msgid "Go to table"
msgid "Go to table: %s"
-msgstr "Gå til tabel"
+msgstr "Gå til tabellen: %s"
#: libraries/import.lib.php:1207
#, php-format
@@ -6943,10 +6926,10 @@ msgid "Structure of %s"
msgstr "Strukturen af %s"
#: libraries/import.lib.php:1215
-#, fuzzy, php-format
+#, php-format
#| msgid "Go to view"
msgid "Go to view: %s"
-msgstr "Gå til view"
+msgstr "Gå til view: %s"
#: libraries/insert_edit.lib.php:235 libraries/insert_edit.lib.php:266
#: pmd_general.php:174
@@ -7055,10 +7038,9 @@ msgid "Add prefix"
msgstr "Tilføj præfiks"
#: libraries/mult_submits.inc.php:309
-#, fuzzy
#| msgid "Do you really want to "
msgid "Do you really want to execute the following query?"
-msgstr "Er du sikker på at du vil "
+msgstr "Er du sikker på at du vil udføre følgende forespørgsel?"
#: libraries/mult_submits.inc.php:533 tbl_replace.php:243
msgid "No change"
@@ -7550,16 +7532,14 @@ msgid "MediaWiki Table"
msgstr "MediaWiki tabel"
#: libraries/plugins/export/ExportMediawiki.class.php:77
-#, fuzzy
#| msgid "Export contents"
msgid "Export table names"
-msgstr "Eksport indhold"
+msgstr "Eksportér tabelnavne"
#: libraries/plugins/export/ExportMediawiki.class.php:84
-#, fuzzy
#| msgid "horizontal (rotated headers)"
msgid "Export table headers"
-msgstr "vandret (roterede overskrifter)"
+msgstr "Eksportér tabel-hoveder"
#: libraries/plugins/export/ExportPdf.class.php:69
msgid "PDF"
@@ -7730,7 +7710,7 @@ msgstr "RELATIONS FOR TABLE (Relationer for tabellen)"
#: libraries/plugins/export/ExportSql.class.php:1537
msgid "Error reading data:"
-msgstr "Fejl ved læsning af data."
+msgstr "Fejl ved læsning af data:"
#: libraries/plugins/export/ExportXml.class.php:68
#: libraries/plugins/import/ImportXml.class.php:49
@@ -7820,10 +7800,10 @@ msgid "This plugin does not support compressed imports!"
msgstr "Denne plugin understøtter ikke komprimeret import!"
#: libraries/plugins/import/ImportMediawiki.class.php:298
-#, fuzzy, php-format
+#, php-format
#| msgid "Invalid format of CSV input on line %d."
msgid "Invalid format of mediawiki input on line: %s."
-msgstr "Ugyldigt format for CSV-input på linie %d."
+msgstr "Ugyldigt format for mediawiki-input på linje: %s."
#: libraries/plugins/import/ImportOds.class.php:73
msgid "Import percentages as proper decimals (ex. 12.00% to .12)"
@@ -7867,7 +7847,7 @@ msgstr "MySQL Spatial Extension understøtter ikke ESRI type \"%s\"."
#: libraries/plugins/import/ImportShp.class.php:256
msgid "The imported file does not contain any data"
-msgstr "Den importerede fil indeholder ingen data!"
+msgstr "Den importerede fil indeholder ingen data"
#: libraries/plugins/import/ImportSql.class.php:57
msgid "SQL compatibility mode:"
@@ -8034,11 +8014,10 @@ msgid "not OK"
msgstr "ikke OK"
#: libraries/relation.lib.php:94
-#, fuzzy
#| msgid "OK"
msgctxt "Correctly working"
msgid "OK"
-msgstr "OK"
+msgstr "O.K."
#: libraries/relation.lib.php:97
msgid "Enabled"
@@ -11236,7 +11215,7 @@ msgstr "Opdateringsfrekvens"
#: server_status.php:1662
msgid "Chart columns"
-msgstr "Diagramkolonner:"
+msgstr "Diagramkolonner"
#: server_status.php:1678
msgid "Chart arrangement"
@@ -11375,7 +11354,7 @@ msgstr "Slet serie"
#: server_status.php:1776
msgid "Series in Chart:"
-msgstr "Serier i diagram"
+msgstr "Serier i diagram:"
#: server_status.php:1791
msgid "Log statistics"
diff --git a/po/fa.po b/po/fa.po
index 2c4478c63d..39beebf2a3 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.2-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-07-03 09:19+0200\n"
-"PO-Revision-Date: 2012-07-04 11:24+0200\n"
+"PO-Revision-Date: 2012-07-05 21:15+0200\n"
"Last-Translator: Ashiyane Digital Security Team \n"
"Language-Team: persian \n"
"Language: fa\n"
@@ -2673,7 +2673,7 @@ msgstr "تنظمیات دسترسی اشتباه در فایل تنظیمات ،
#: libraries/Config.class.php:1521
msgid "Font size"
-msgstr "اندازه حروف"
+msgstr "اندازه فونت"
#: libraries/DisplayResults.class.php:500
msgid "Save edited data"
@@ -6179,10 +6179,9 @@ msgid "Exporting rows from \"%s\" table"
msgstr "ساخت جدول جديد در پايگاه داده %s"
#: libraries/display_export.lib.php:105
-#, fuzzy
#| msgid "Export"
msgid "Export Method:"
-msgstr "صدور"
+msgstr "صدور:"
#: libraries/display_export.lib.php:121
msgid "Quick - display only the minimal options"
@@ -6193,10 +6192,9 @@ msgid "Custom - display all possible options"
msgstr ""
#: libraries/display_export.lib.php:145
-#, fuzzy
#| msgid "Databases"
msgid "Database(s):"
-msgstr "پايگاههاي داده"
+msgstr "پايگاههاي داده:"
#: libraries/display_export.lib.php:147
#, fuzzy
diff --git a/po/gl.po b/po/gl.po
index ea5723f84f..f26dec91b7 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13616,15 +13616,14 @@ msgstr "concurrent_insert está definido a 0"
#~ "No description is available for this transformation. Please ask the "
#~ "author what %s does."
#~ msgstr ""
-#~ "Non existe descrición desta transformación. Pregúntelle ao autor que "
-#~ "é o que fai %s."
+#~ "Non existe descrición desta transformación. Pregúntelle ao autor que é "
+#~ "o que fai %s."
#~ msgid ""
#~ "MIME types printed in italics do not have a separate transformation "
#~ "function"
#~ msgstr ""
-#~ "Os tipos MIME en cursiva non contan cunha función de transformación "
-#~ "separada"
+#~ "Os tipos MIME en cursiva non contan cunha función de transformación separada"
#~ msgid "rows"
#~ msgstr "Visualizar"
diff --git a/po/nb.po b/po/nb.po
index a36a92dfca..b00296a132 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-07-03 09:19+0200\n"
-"PO-Revision-Date: 2012-07-04 16:03+0200\n"
+"PO-Revision-Date: 2012-07-09 03:26+0200\n"
"Last-Translator: Nicholas Arnesen \n"
"Language-Team: norwegian \n"
"Language: nb\n"
@@ -1180,6 +1180,11 @@ msgid ""
"likely that your current configuration will not work anymore. Please reset "
"your configuration to default in the Settings menu."
msgstr ""
+"Den grafiske fremstillinskonfigurasjonen i din nettlesers lokale lager er "
+"ikke lengre kompatibel til den nyere versjonen av overvåkningsdialogen. Det "
+"er veldig sannsynlig at din nåværende konfigurasjon ikke vil fungere lengre. "
+"Vennlist tilbakestill din konfigurasjon til standard i menyen "
+"Innstillinger."
#: js/messages.php:93
msgid "Query cache efficiency"
@@ -1396,94 +1401,90 @@ msgstr ""
#. l10n: %s is FILE or TABLE
#: js/messages.php:153
-#, fuzzy, php-format
+#, php-format
#| msgid "Save output to a file"
msgid "Set log_output to %s"
-msgstr "Lagre utdata til fil"
+msgstr "Lagre utdata til %s"
#. l10n: Enable in this context means setting a status variable to ON
#: js/messages.php:155
-#, fuzzy, php-format
+#, php-format
#| msgid "Enabled"
msgid "Enable %s"
-msgstr "Påslått"
+msgstr "Aktiver %s"
#. l10n: Disable in this context means setting a status variable to OFF
#: js/messages.php:157
-#, fuzzy, php-format
+#, php-format
#| msgid "Disabled"
msgid "Disable %s"
-msgstr "Avslått"
+msgstr "Deaktiver %s"
#. l10n: %d seconds
#: js/messages.php:159
#, php-format
msgid "Set long_query_time to %ds"
-msgstr ""
+msgstr "Sett long_query_time til %ds"
#: js/messages.php:160
msgid ""
"You can't change these variables. Please log in as root or contact your "
"database administrator."
msgstr ""
+"Du kan ikke endre disse verdiene. Logg inn som root eller kontakt din "
+"databaseadministrator."
#: js/messages.php:161
-#, fuzzy
#| msgid "Manage your settings"
msgid "Change settings"
-msgstr "Endre dine innstillinger"
+msgstr "Endre innstillinger"
#: js/messages.php:162
-#, fuzzy
#| msgid "More settings"
msgid "Current settings"
-msgstr "Flere innstillinger"
+msgstr "Nåværende innstillinger"
#: js/messages.php:164 server_status.php:1726
-#, fuzzy
#| msgid "Report title"
msgid "Chart Title"
-msgstr "Rapporttittel"
+msgstr "Fremstillings-tittel"
#. l10n: As in differential values
#: js/messages.php:166
-#, fuzzy
#| msgid "Difference"
msgid "Differential"
-msgstr "Differanse"
+msgstr "Differensial"
#: js/messages.php:167
#, php-format
msgid "Divided by %s"
-msgstr ""
+msgstr "Delt på %s"
#: js/messages.php:168
msgid "Unit"
-msgstr ""
+msgstr "Enhet"
#: js/messages.php:170
msgid "From slow log"
-msgstr ""
+msgstr "Fra langsom logg"
#: js/messages.php:171
msgid "From general log"
-msgstr ""
+msgstr "Fra generell logg"
#: js/messages.php:172
-#, fuzzy
#| msgid "Loading"
msgid "Analysing logs"
-msgstr "Laster"
+msgstr "Analyserer logger"
#: js/messages.php:173
msgid "Analysing & loading logs. This may take a while."
-msgstr ""
+msgstr "Analyserer og laster inn logger. Dette kan ta tid."
#: js/messages.php:174
-#, fuzzy
#| msgid "Read requests"
msgid "Cancel request"
-msgstr "Leseforespørsler"
+msgstr "Avbryt forespørsel"
#: js/messages.php:175
msgid ""
@@ -1491,6 +1492,9 @@ msgid ""
"However only the SQL query itself has been used as a grouping criteria, so "
"the other attributes of queries, such as start time, may differ."
msgstr ""
+"Denne kolonnen viser antallet identiske spørringer som er gruppert sammen. "
+"Men kun SQL-spørringene har blitt brukt som en grupperingskriterie, så andre "
+"attributter i spørringer som starter samtidig kan variere."
#: js/messages.php:176
msgid ""
@@ -1498,38 +1502,38 @@ msgid ""
"same table are also being grouped together, disregarding of the inserted "
"data."
msgstr ""
+"Ettersom gruppering av INSERT-spørringer har blitt valgt så vil INSERT-"
+"spørringer i samme tabellen bli gruppert sammen, uten hensyn til de innsatte "
+"dataene."
#: js/messages.php:177
msgid "Log data loaded. Queries executed in this time span:"
msgstr ""
+"Loggdata lastet inn. Spørringer vil bli utført i løpet av denne tidsplanen:"
#: js/messages.php:179
-#, fuzzy
#| msgid "Jump to database"
msgid "Jump to Log table"
-msgstr "Gå til database"
+msgstr "Gå til Loggtabellen"
#: js/messages.php:180
-#, fuzzy
#| msgid "No databases"
msgid "No data found"
-msgstr "Ingen databaser"
+msgstr "Ingen data funnet"
#: js/messages.php:181
msgid "Log analysed, but no data found in this time span."
-msgstr ""
+msgstr "Logg analysert, men ingen data var funnet i løpet av tidsperioden."
#: js/messages.php:183
-#, fuzzy
#| msgid "Analyze"
msgid "Analyzing..."
-msgstr "Analyser"
+msgstr "Analyserer..."
#: js/messages.php:184
-#, fuzzy
#| msgid "Explain SQL"
msgid "Explain output"
-msgstr "Forklar SQL"
+msgstr "Forklar utdata"
#: js/messages.php:186 js/messages.php:516
#: libraries/plugins/export/ExportHtmlword.class.php:477
@@ -1540,47 +1544,41 @@ msgid "Time"
msgstr "Tid"
#: js/messages.php:187
-#, fuzzy
#| msgid "Total"
msgid "Total time:"
-msgstr "Totalt"
+msgstr "Total tid:"
#: js/messages.php:188
#, fuzzy
#| msgid "Profiling"
msgid "Profiling results"
-msgstr "Profilering"
+msgstr "Profiliserer resultater"
#: js/messages.php:189
-#, fuzzy
#| msgid "Table"
msgctxt "Display format"
msgid "Table"
msgstr "Tabell"
#: js/messages.php:190
-#, fuzzy
msgid "Chart"
-msgstr "Tegnsett"
+msgstr "Grafisk fremstilling"
#: js/messages.php:191
-#, fuzzy
#| msgid "Apply index(s)"
msgid "Edit chart"
-msgstr "Utfør indeks(er)"
+msgstr "Endre fremstilling"
#: js/messages.php:192
-#, fuzzy
#| msgid "SQL queries"
msgid "Series"
-msgstr "SQL spørringer"
+msgstr "Serier"
#. l10n: A collection of available filters
#: js/messages.php:195
-#, fuzzy
#| msgid "Tables display options"
msgid "Log table filter options"
-msgstr "Tabellvisningsinnstillinger"
+msgstr "Logg tabellfiltervalgene"
#. l10n: Filter as in "Start Filtering"
#: js/messages.php:197
@@ -1589,33 +1587,30 @@ msgstr "Filtrer"
#: js/messages.php:198
msgid "Filter queries by word/regexp:"
-msgstr ""
+msgstr "Filtrer spørringer med ord/regexp:"
#: js/messages.php:199
msgid "Group queries, ignoring variable data in WHERE clauses"
-msgstr ""
+msgstr "Grupper spørringer, og ignorer varierende data brukt i WHERE-muligheter"
#: js/messages.php:200
-#, fuzzy
#| msgid "Number of inserted rows"
msgid "Sum of grouped rows:"
-msgstr "Antall innsettingsrader"
+msgstr "Sum av grupperte rader:"
#: js/messages.php:201
-#, fuzzy
#| msgid "Total"
msgid "Total:"
-msgstr "Totalt"
+msgstr "Totalt:"
#: js/messages.php:203
-#, fuzzy
#| msgid "Loading"
msgid "Loading logs"
-msgstr "Laster"
+msgstr "Laster logger"
#: js/messages.php:204
msgid "Monitor refresh failed"
-msgstr ""
+msgstr "Visningsoppdatering feilet"
#: js/messages.php:205
msgid ""
@@ -1623,26 +1618,32 @@ msgid ""
"This is most likely because your session expired. Reloading the page and "
"reentering your credentials should help."
msgstr ""
+"Imens nytt diagramdata ble forespurt, returnerte serveren en ugyldig "
+"respons. Dette er mest sannsynlig begrunnet at din sesjon utgikk. Det burde "
+"hjelpe å laste inn siden og logge inn på nytt."
#: js/messages.php:206
-#, fuzzy
#| msgid "Reload"
msgid "Reload page"
-msgstr "Oppdater"
+msgstr "Oppdater siden"
#: js/messages.php:208
msgid "Affected rows:"
-msgstr ""
+msgstr "Berørte rader:"
#: js/messages.php:210
msgid "Failed parsing config file. It doesn't seem to be valid JSON code."
msgstr ""
+"Feilet analyseringen av konfigurasjonsfilen. Det virker ikke som det er "
+"gyldig JSON-kode."
#: js/messages.php:211
msgid ""
"Failed building chart grid with imported config. Resetting to default "
"config..."
msgstr ""
+"Kunne ikke bygge diagramrutenett med importert konfigurasjon. Setter til "
+"standardkonfigurasjon..."
#: js/messages.php:212 libraries/Menu.class.php:309
#: libraries/Menu.class.php:396 libraries/Menu.class.php:493
@@ -1652,60 +1653,54 @@ msgid "Import"
msgstr "Importer"
#: js/messages.php:213
-#, fuzzy
#| msgid "Could not load default configuration from: %1$s"
msgid "Import monitor configuration"
-msgstr "Kunne ikke laste standard konfigurasjonsfil fra: %1$s"
+msgstr "Importer overvåkningskonfigurasjon"
#: js/messages.php:214
-#, fuzzy
#| msgid "Please select the primary key or a unique key"
msgid "Please select the file you want to import"
-msgstr "Velg primærnøkkelen eller en unik nøkkel"
+msgstr "Velg filen du vil importere"
#: js/messages.php:216
-#, fuzzy
#| msgid "Update Query"
msgid "Analyse Query"
-msgstr "Oppdater spørring"
+msgstr "Analyser Spørring"
#: js/messages.php:220
msgid "Advisor system"
-msgstr ""
+msgstr "Rådgivningssystem"
#: js/messages.php:221
msgid "Possible performance issues"
-msgstr ""
+msgstr "Mulige ytelsesproblemer"
#: js/messages.php:222
msgid "Issue"
-msgstr ""
+msgstr "Problem"
#: js/messages.php:223
-#, fuzzy
#| msgid "Documentation"
msgid "Recommendation"
-msgstr "Dokumentasjon"
+msgstr "Anbefaling"
#: js/messages.php:224
-#, fuzzy
#| msgid "Details..."
msgid "Rule details"
-msgstr "Detaljer..."
+msgstr "Regeldetaljer"
#: js/messages.php:225
-#, fuzzy
#| msgid "Authentication"
msgid "Justification"
-msgstr "Godkjenning"
+msgstr "Begrunnelse"
#: js/messages.php:226
msgid "Used variable / formula"
-msgstr ""
+msgstr "Brukt variabel / formel"
#: js/messages.php:227
msgid "Test"
-msgstr ""
+msgstr "Test"
#: js/messages.php:232 pmd_general.php:417 pmd_general.php:454
#: pmd_general.php:574 pmd_general.php:622 pmd_general.php:698
@@ -1745,7 +1740,7 @@ msgstr "OK"
#: js/messages.php:242
msgid "Click to dismiss this notification"
-msgstr ""
+msgstr "Klikk for å overse dette varselet"
#: js/messages.php:245
msgid "Renaming Databases"
@@ -1768,22 +1763,19 @@ msgid "Table must have at least one column"
msgstr "Tabellen må ha minst en kolonne"
#: js/messages.php:254
-#, fuzzy
#| msgid "Use Tables"
msgid "Insert Table"
-msgstr "Bruk tabeller"
+msgstr "Sett inn tabell"
#: js/messages.php:255
-#, fuzzy
#| msgid "Apply index(s)"
msgid "Hide indexes"
-msgstr "Utfør indeks(er)"
+msgstr "Skjul indekser"
#: js/messages.php:256
-#, fuzzy
#| msgid "Show grid"
msgid "Show indexes"
-msgstr "Vis rutenett"
+msgstr "Vis indekser"
#: js/messages.php:257 libraries/mult_submits.inc.php:317
#, fuzzy
@@ -1808,32 +1800,28 @@ msgid "Searching"
msgstr "Søker"
#: js/messages.php:263
-#, fuzzy
#| msgid "Hide search criteria"
msgid "Hide search results"
-msgstr "Skjul søkekriterier"
+msgstr "Skjul søkeresultater"
#: js/messages.php:264
-#, fuzzy
#| msgid "Show search criteria"
msgid "Show search results"
-msgstr "Vis søkekriterier"
+msgstr "Vis søkeresultater"
#: js/messages.php:265
-#, fuzzy
#| msgid "Browse"
msgid "Browsing"
-msgstr "Se på"
+msgstr "Leser"
#: js/messages.php:266
-#, fuzzy
#| msgid "Deleting %s"
msgid "Deleting"
-msgstr "Sletter %s"
+msgstr "Sletter"
#: js/messages.php:269
msgid "The definition of a stored function must contain a RETURN statement!"
-msgstr ""
+msgstr "Definisjonen av en lagret funksjon må inneholde RETURN erklæring!"
#: js/messages.php:272 libraries/rte/rte_routines.lib.php:747
msgid "ENUM/SET editor"
@@ -1853,15 +1841,17 @@ msgid "Enter each value in a separate field"
msgstr "Skriv hver verdi i et eget felt"
#: js/messages.php:276
-#, fuzzy, php-format
+#, php-format
#| msgid "+ Add a new value"
msgid "Add %d value(s)"
-msgstr "+ Legg til ny verdi"
+msgstr "Legg til %d verdi(er)"
#: js/messages.php:279
msgid ""
"Note: If the file contains multiple tables, they will be combined into one"
msgstr ""
+"Legg merke til: Om filen inneholder flere tabeller, så vil de kombineres til "
+"en tabell"
#: js/messages.php:282
msgid "Hide query box"
@@ -1881,10 +1871,9 @@ msgid "Change"
msgstr "Endre"
#: js/messages.php:287
-#, fuzzy
#| msgid "Maximum execution time"
msgid "Query execution time"
-msgstr "Maks kjøretid"
+msgstr "Spørringens utførelsestid"
#: js/messages.php:288 libraries/DisplayResults.class.php:523
#: libraries/DisplayResults.class.php:531
@@ -1917,15 +1906,15 @@ msgstr "Søk"
#: js/messages.php:300
msgid "Each point represents a data row."
-msgstr ""
+msgstr "Hvert punkt representerer en datarad."
#: js/messages.php:302
msgid "Hovering over a point will show its label."
-msgstr ""
+msgstr "Ved å ha musen over punktet vises dets etikett."
#: js/messages.php:304
msgid "To zoom in, select a section of the plot with the mouse."
-msgstr ""
+msgstr "For å zoome inn, velger en del for plotteområdet med musen."
#: js/messages.php:306
msgid "Click reset zoom button to come back to original state."
@@ -1940,26 +1929,23 @@ msgid "The plot can be resized by dragging it along the bottom right corner."
msgstr ""
#: js/messages.php:312
-#, fuzzy
#| msgid "Add/Delete columns"
msgid "Select two columns"
-msgstr "Legg til/Slett kolonner"
+msgstr "Velg to kolonner"
#: js/messages.php:313
msgid "Select two different columns"
-msgstr ""
+msgstr "Velg to forskjellige kolonner"
#: js/messages.php:314
-#, fuzzy
#| msgid "Query results operations"
msgid "Query results"
-msgstr "Spørringsresultatshandlinger"
+msgstr "Spørringsresultater"
#: js/messages.php:315
-#, fuzzy
#| msgid "Data pointer size"
msgid "Data point content"
-msgstr "Datapekerstørrelse"
+msgstr "Datapunktinnhold"
#: js/messages.php:318 tbl_change.php:244 tbl_indexes.php:249
#: tbl_indexes.php:284
@@ -1968,13 +1954,12 @@ msgstr "Ignorer"
#: js/messages.php:319 libraries/DisplayResults.class.php:2592
msgid "Copy"
-msgstr ""
+msgstr "Kopier"
#: js/messages.php:334
-#, fuzzy
#| msgid "Add column"
msgid "Add columns"
-msgstr "Legg til kolonne(r)"
+msgstr "Legg til kolonner"
#: js/messages.php:337
msgid "Select referenced key"
@@ -1997,6 +1982,8 @@ msgid ""
"You haven't saved the changes in the layout. They will be lost if you don't "
"save them. Do you want to continue?"
msgstr ""
+"Du har ikke lagret endringene i utseendet. De vil forsvinne om du ikke "
+"lagrer dem. Ønsker du å fortsette?"
#: js/messages.php:344
msgid "Add an option for column "
@@ -2004,27 +1991,28 @@ msgstr "Legg til valg for kolonne "
#: js/messages.php:347
msgid "Press escape to cancel editing"
-msgstr ""
+msgstr "Trykk escape for å avbryte endring"
#: js/messages.php:348
msgid ""
"You have edited some data and they have not been saved. Are you sure you "
"want to leave this page before saving the data?"
msgstr ""
+"Du har endret en del data og de har ikke blitt lagret. Er du sikker på at du "
+"vil forlate denne siden før du lagrer dataene?"
#: js/messages.php:349
msgid "Drag to reorder"
-msgstr ""
+msgstr "Dra for å omplassere"
#: js/messages.php:350
-#, fuzzy
#| msgid "Click to select"
msgid "Click to sort"
-msgstr "Klikk for å velge"
+msgstr "Klikk for å sortere"
#: js/messages.php:351
msgid "Click to mark/unmark"
-msgstr ""
+msgstr "Klikk for å markere/ta vekk markering"
#: js/messages.php:352
msgid "Double-click to copy column name"
@@ -2032,7 +2020,7 @@ msgstr ""
#: js/messages.php:353
msgid "Click the drop-down arrow to toggle column's visibility"
-msgstr ""
+msgstr "Klikk pilen som peker ned for å bytte på kolonnens synlighet"
#: js/messages.php:355
msgid ""
@@ -2044,12 +2032,13 @@ msgstr ""
msgid ""
"You can also edit most columns by clicking directly on their content."
msgstr ""
+"Du kan også endre de fleste kolonnene ved å klikke direkte på "
+"innholdet."
#: js/messages.php:357
-#, fuzzy
#| msgid "Go to view"
msgid "Go to link"
-msgstr "Gå til visning"
+msgstr "Gå til link"
#: js/messages.php:358
#, fuzzy
@@ -2098,10 +2087,9 @@ msgid ", latest stable version:"
msgstr ", siste tilgjengelige versjon:"
#: js/messages.php:374
-#, fuzzy
#| msgid "Jump to database"
msgid "up to date"
-msgstr "Gå til database"
+msgstr "er oppdatert"
#. l10n: Display text for calendar close link
#: js/messages.php:393
@@ -2109,14 +2097,12 @@ msgid "Done"
msgstr "Utført"
#: js/messages.php:397
-#, fuzzy
#| msgid "Prev"
msgctxt "Previous month"
msgid "Prev"
msgstr "Forrige"
#: js/messages.php:402
-#, fuzzy
#| msgid "Next"
msgctxt "Next month"
msgid "Next"
@@ -2266,7 +2252,6 @@ msgstr "Lørdag"
#. l10n: Short week day name
#: js/messages.php:468
-#, fuzzy
#| msgctxt "Short week day name"
#| msgid "Sun"
msgid "Sun"
@@ -2345,15 +2330,14 @@ msgstr "Uke"
#. l10n: Month-year order for calendar, use either "calendar-month-year" or "calendar-year-month".
#: js/messages.php:506
msgid "calendar-month-year"
-msgstr ""
+msgstr "kalender-måned-år"
#. l10n: Year suffix for calendar, "none" is empty.
#: js/messages.php:508
-#, fuzzy
#| msgid "None"
msgctxt "Year suffix"
msgid "none"
-msgstr "Ingen"
+msgstr "ingen"
#: js/messages.php:517
msgid "Hour"
@@ -2429,7 +2413,7 @@ msgstr "per time"
#: libraries/Advisor.class.php:434
msgid "per day"
-msgstr ""
+msgstr "hver dag"
#: libraries/CommonFunctions.class.php:251
#, php-format
@@ -2691,11 +2675,11 @@ msgstr "Skriv ut"
#: libraries/Config.class.php:915
#, php-format
msgid "Existing configuration file (%s) is not readable."
-msgstr ""
+msgstr "Nåværende konfigurasjonsfil (%s) er ikke lesbar."
#: libraries/Config.class.php:945
msgid "Wrong permissions on configuration file, should not be world writable!"
-msgstr ""
+msgstr "Gale tillatelser på konfigurasjonsfilen, den burde ikke være skrivbar!"
#: libraries/Config.class.php:1521
msgid "Font size"
@@ -2905,11 +2889,11 @@ msgstr "Link ikke funnet"
#: libraries/Error_Handler.class.php:65
msgid "Too many error messages, some are not displayed."
-msgstr ""
+msgstr "For mange feilmeldinger, noen vises ikke."
#: libraries/File.class.php:235
msgid "File was not an uploaded file."
-msgstr ""
+msgstr "Filen var ikke en opplastet fil."
#: libraries/File.class.php:273
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -2954,11 +2938,11 @@ msgstr ""
#: libraries/File.class.php:485
msgid "Error while moving uploaded file."
-msgstr ""
+msgstr "Feil oppstod imens den opplastede filen ble flyttet."
#: libraries/File.class.php:493
msgid "Cannot read (moved) upload file."
-msgstr ""
+msgstr "Kan ikke lese (flyttet) opplastet fil."
#: libraries/Footer.class.php:197 libraries/Footer.class.php:201
#: libraries/Footer.class.php:204
@@ -3139,28 +3123,24 @@ msgstr[0] "%1$d rader innsatt."
msgstr[1] "%1$d rader innsatt."
#: libraries/PDF.class.php:88
-#, fuzzy
#| msgid "Allows reading data."
msgid "Error while creating PDF:"
-msgstr "Tillater lesing av data."
+msgstr "Feil oppstod under oppretting av PDF:"
#: libraries/RecentTable.class.php:112
-#, fuzzy
#| msgid "Could not save configuration"
msgid "Could not save recent table"
-msgstr "Kunne ikke lagre konfigurasjonen"
+msgstr "Kunne ikke lagre tabell"
#: libraries/RecentTable.class.php:147
-#, fuzzy
#| msgid "Count tables"
msgid "Recent tables"
-msgstr "Tell tabeller"
+msgstr "Tidligere tabeller"
#: libraries/RecentTable.class.php:154
-#, fuzzy
#| msgid "There are no configured servers"
msgid "There are no recent tables"
-msgstr "Der finnes ingen konfigurerte tjenere"
+msgstr "Det er ikke noen nylig brukte tabeller"
#: libraries/StorageEngine.class.php:214
msgid ""
@@ -3184,10 +3164,9 @@ msgid "This MySQL server does not support the %s storage engine."
msgstr "Denne MySQL tjeneren har ikke støtte for %s lagringsmotoren."
#: libraries/Table.class.php:355
-#, fuzzy
#| msgid "Show slave status"
msgid "unknown table status: "
-msgstr "Vis slavestatus"
+msgstr "ukjent tabellstatus: "
#: libraries/Table.class.php:766
#, fuzzy, php-format
@@ -3363,7 +3342,7 @@ msgstr "Stilsti ble ikke funnet for stilen %s!"
#: libraries/Theme_Manager.class.php:363 themes.php:16 themes.php:21
msgid "Theme"
-msgstr ""
+msgstr "Tema"
#: libraries/Types.class.php:295
msgid ""
@@ -3706,10 +3685,9 @@ msgid "Check Privileges"
msgstr "Kontroller privilegier"
#: libraries/common.inc.php:572
-#, fuzzy
#| msgid "Could not save configuration"
msgid "Failed to read configuration file"
-msgstr "Kunne ikke lagre konfigurasjonen"
+msgstr "Kunne ikke lese konfigurasjonsfilen"
#: libraries/common.inc.php:574
msgid ""
@@ -3759,7 +3737,7 @@ msgstr ""
#: libraries/common.inc.php:1083
msgid "possible exploit"
-msgstr ""
+msgstr "mulig sikkerhetshull"
#: libraries/common.inc.php:1092
msgid "numeric key detected"
@@ -7479,7 +7457,7 @@ msgstr ""
#: libraries/plugins/auth/AuthenticationCookie.class.php:42
msgid "Failed to use Blowfish from mcrypt!"
-msgstr ""
+msgstr "Kunne ikke bruke Blowfish fra mcrypt!"
#: libraries/plugins/auth/AuthenticationCookie.class.php:81
msgid "Your session has expired. Please login again."
@@ -7534,10 +7512,9 @@ msgid "Wrong username/password. Access denied."
msgstr "Ugyldig brukernavn/passord. Ingen tilgang."
#: libraries/plugins/auth/AuthenticationSignon.class.php:102
-#, fuzzy
#| msgid "Config authentication"
msgid "Can not find signon authentication script:"
-msgstr "Konfigurer vertsautentisering"
+msgstr "Kunne ikke finne signon autentiseringsscriptet:"
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:132
#, php-format
@@ -9417,10 +9394,9 @@ msgid "Official Homepage"
msgstr "Offisiell phpMyAdmin-hjemmeside"
#: main.php:254
-#, fuzzy
#| msgid "Attributes"
msgid "Contribute"
-msgstr "Attributter"
+msgstr "Bidra"
#: main.php:255
#, fuzzy
@@ -9428,10 +9404,9 @@ msgid "Get support"
msgstr "Eksporter"
#: main.php:256
-#, fuzzy
#| msgid "No change"
msgid "List of changes"
-msgstr "Ingen endring"
+msgstr "Endringsliste"
#: main.php:281
msgid ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 06e7963bfe..3af8d0613c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-07-03 09:19+0200\n"
-"PO-Revision-Date: 2012-07-04 15:59+0200\n"
-"Last-Translator: Marcelo Altmann \n"
+"PO-Revision-Date: 2012-07-08 20:32+0200\n"
+"Last-Translator: Keven do Nascimento Carneiro \n"
"Language-Team: brazilian_portuguese \n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
@@ -6405,7 +6405,6 @@ msgid "gzipped"
msgstr "compactado com gzip"
#: libraries/display_export.lib.php:339
-#, fuzzy
#| msgid "\"bzipped\""
msgid "bzipped"
msgstr "compactado com bzip"
@@ -6806,7 +6805,7 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:48
msgid "Transaction buffer size"
-msgstr ""
+msgstr "Tamanho do buffer de transação"
#: libraries/engines/pbxt.lib.php:49
msgid ""
diff --git a/test/classes/Advisor_test.php b/test/classes/PMA_Advisor_test.php
similarity index 100%
rename from test/classes/Advisor_test.php
rename to test/classes/PMA_Advisor_test.php
diff --git a/test/classes/PMA_Error_test.php b/test/classes/PMA_Error_test.php
index 518a4e369f..0965b90546 100644
--- a/test/classes/PMA_Error_test.php
+++ b/test/classes/PMA_Error_test.php
@@ -1,6 +1,6 @@
object = $this->getMockForAbstractClass('PMA_List_Database');
+ }
+
+ /**
+ * Call protected functions by making the visibitlity to public.
+ *
+ * @param string $name method name
+ * @param array $params parameters for the invocation
+ *
+ * @return the output from the protected method.
+ */
+ private function _callProtectedFunction($name, $params)
+ {
+ $class = new ReflectionClass('PMA_List_Database');
+ $method = $class->getMethod($name);
+ $method->setAccessible(true);
+ return $method->invokeArgs($this->object, $params);
}
public function testEmpty()
@@ -54,5 +72,73 @@ class PMA_List_Database_test extends PHPUnit_Framework_TestCase
$arr = new PMA_List_Database;
$this->assertEquals('' . "\n", $arr->getHtmlOptions());
}
+
+ /**
+ * Test for checkHideDatabase
+ */
+ public function testCheckHideDatabase()
+ {
+ $GLOBALS['cfg']['Server']['hide_db'] = array('single\\_db');
+ $this->assertEquals(
+ $this->_callProtectedFunction(
+ 'checkHideDatabase',
+ array()
+ ),
+ ''
+ );
+ }
+
+ /**
+ * Test for getDefault
+ */
+ public function testGetDefault()
+ {
+ $GLOBALS['db'] = '';
+ $this->assertEquals(
+ $this->object->getDefault(),
+ ''
+ );
+
+ $GLOBALS['db'] = 'mysql';
+ $this->assertEquals(
+ $this->object->getDefault(),
+ 'mysql'
+ );
+ }
+
+ /**
+ * Test for getGroupedDetails
+ */
+ public function testGetGroupedDetails()
+ {
+ $GLOBALS['cfg']['ShowTooltip'] = true;
+ $GLOBALS['cfgRelation']['commwork'] = true;
+ $GLOBALS['server'] = 1;
+ $GLOBALS['cfg']['LeftFrameDBTree'] = true;
+ $GLOBALS['cfg']['LeftFrameDBSeparator'] = array('|',',');
+
+ $this->assertEquals(
+ $this->object->getGroupedDetails(10, 100),
+ array()
+ );
+ }
+
+ /**
+ * Test for getHtmlListGrouped
+ */
+ public function testGetHtmlListGrouped()
+ {
+ $GLOBALS['cfg']['ShowTooltip'] = true;
+ $GLOBALS['cfgRelation']['commwork'] = true;
+ $GLOBALS['server'] = 1;
+ $GLOBALS['cfg']['LeftFrameDBTree'] = true;
+ $GLOBALS['cfg']['LeftFrameDBSeparator'] = array('|',',');
+
+ $this->assertEquals(
+ $this->object->getHtmlListGrouped(true,5,5),
+ '
+
'
+ );
+ }
}
?>
diff --git a/test/classes/PMA_Scripts_test.php b/test/classes/PMA_Scripts_test.php
new file mode 100644
index 0000000000..ef26ed54e3
--- /dev/null
+++ b/test/classes/PMA_Scripts_test.php
@@ -0,0 +1,137 @@
+object = $this->getMockForAbstractClass('PMA_Scripts');
+ }
+
+ /**
+ * Tears down the fixture, for example, closes a network connection.
+ * This method is called after a test is executed.
+ *
+ * @access protected
+ * @return void
+ */
+ protected function tearDown()
+ {
+ unset($this->object);
+ }
+
+ /**
+ * Call private functions by making the visibitlity to public.
+ *
+ * @param string $name method name
+ * @param array $params parameters for the invocation
+ *
+ * @return the output from the private method.
+ */
+ private function _callPrivateFunction($name, $params)
+ {
+ $class = new ReflectionClass('PMA_Scripts');
+ $method = $class->getMethod($name);
+ $method->setAccessible(true);
+ return $method->invokeArgs($this->object, $params);
+ }
+
+ /**
+ * Test for _includeFile
+ *
+ * @param tring $url Location of javascript, relative to js/ folder.
+ * @param int $timestamp The date when the file was last modified
+ * @param string $ie_conditional true - wrap with IE conditional comment
+ * 'lt 9' etc. - wrap for specific IE version
+ * @param $output output from the _includeFile method
+ *
+ * @dataProvider providerForTestIncludeFile
+ */
+ public function testIncludeFile($url, $timestamp, $ie_conditional, $output){
+ $this->assertEquals(
+ $this->_callPrivateFunction(
+ '_includeFile',
+ array($url, $timestamp, $ie_conditional)
+ ),
+ $output
+ );
+ }
+
+ /**
+ * @return array data for testIncludeFile
+ */
+ public function providerForTestIncludeFile(){
+ return array(
+ array(
+ 'common.js',
+ null,
+ true,
+ '
+'
+ ),
+ array(
+ 'common.js',
+ null,
+ false,
+ '
+'
+ )
+ );
+ }
+
+ /**
+ * Test for getDisplay
+ */
+ public function testGetDisplay(){
+
+ $this->object->addFile('common.js');
+ $this->object->addEvent('onClick', 'doSomething');
+
+ $this->assertEquals(
+ $this->object->getDisplay(),
+ '
+'
+ );
+ }
+
+ /**
+ * test for addCode
+ */
+ public function testAddCode(){
+
+ $this->object->addCode('alert(\'CodeAdded\')');
+
+ $this->assertEquals(
+ $this->object->getDisplay(),
+ ''
+ );
+ }
+}
diff --git a/test/classes/PMA_StorageEngine_test.php b/test/classes/PMA_StorageEngine_test.php
new file mode 100644
index 0000000000..db587918f2
--- /dev/null
+++ b/test/classes/PMA_StorageEngine_test.php
@@ -0,0 +1,240 @@
+'table1',
+ 'table`2');
+ }
+ }
+ $this->object = $this->getMockForAbstractClass('PMA_StorageEngine', array('dummy'));
+ }
+
+ /**
+ * Tears down the fixture, for example, closes a network connection.
+ * This method is called after a test is executed.
+ *
+ * @access protected
+ * @return void
+ */
+ protected function tearDown()
+ {
+ unset($this->object);
+ }
+
+ /**
+ * Test for getStorageEngines
+ */
+ public function testGetStorageEngines(){
+
+ $this->assertEquals(
+ $this->object->getStorageEngines(),
+ array(
+ 'dummy' => 'table1',
+ 0 => 'table`2'
+ )
+ );
+ }
+
+ /**
+ * Test for getHtmlSelect
+ */
+ public function testGetHtmlSelect(){
+
+ $this->assertEquals(
+ $this->object->getHtmlSelect(),
+ '
+'
+ );
+ }
+
+ /**
+ * Test for getEngine
+ */
+ public function testGetEngine(){
+
+ $this->assertTrue(
+ $this->object->getEngine('dummy') instanceof PMA_StorageEngine
+ );
+ }
+
+ /**
+ * Test for isValid
+ */
+ public function testIsValid(){
+
+ $this->assertTrue(
+ $this->object->isValid('PBMS')
+ );
+ $this->assertTrue(
+ $this->object->isValid('dummy')
+ );
+ }
+
+ /**
+ * Test for getPage
+ */
+ public function testGetPage(){
+
+ $this->assertFalse(
+ $this->object->getPage(1)
+ );
+ }
+
+ /**
+ * Test for getInfoPages
+ */
+ public function testGetInfoPages(){
+
+ $this->assertEquals(
+ $this->object->getInfoPages(),
+ array()
+ );
+ }
+
+ /**
+ * Test for getVariablesLikePattern
+ */
+ public function testGetVariablesLikePattern(){
+
+ $this->assertFalse(
+ $this->object->getVariablesLikePattern()
+ );
+ }
+
+ /**
+ * Test for getMysqlHelpPage
+ */
+ public function testGetMysqlHelpPage(){
+
+ $this->assertEquals(
+ $this->object->getMysqlHelpPage(),
+ 'dummy-storage-engine'
+ );
+ }
+
+ /**
+ * Test for getVariables
+ */
+ public function testGetVariables(){
+
+ $this->assertEquals(
+ $this->object->getVariables(),
+ array()
+ );
+ }
+
+ /**
+ * Test for getSupportInformationMessage
+ */
+ public function testGetSupportInformationMessage(){
+ $this->assertEquals(
+ $this->object->getSupportInformationMessage(),
+ 'This MySQL server does not support the t storage engine.'
+ );
+
+ $this->object->support = 1;
+ $this->assertEquals(
+ $this->object->getSupportInformationMessage(),
+ 't has been disabled for this MySQL server.'
+ );
+
+ $this->object->support = 2;
+ $this->assertEquals(
+ $this->object->getSupportInformationMessage(),
+ 't is available on this MySQL server.'
+ );
+
+ $this->object->support = 3;
+ $this->assertEquals(
+ $this->object->getSupportInformationMessage(),
+ 't is the default storage engine on this MySQL server.'
+ );
+ }
+
+ /**
+ * Test for getComment
+ */
+ public function testGetComment(){
+
+ $this->assertEquals(
+ $this->object->getComment(),
+ 't'
+ );
+ }
+
+ /**
+ * Test for getTitle
+ */
+ public function testGetTitle(){
+
+ $this->assertEquals(
+ $this->object->getTitle(),
+ 't'
+ );
+ }
+
+ /**
+ * Test for engine_init
+ */
+ public function testEngine_init(){
+
+ $this->assertNull(
+ $this->object->engine_init()
+ );
+ }
+
+ /**
+ * Test for resolveTypeSize
+ */
+ public function testResolveTypeSize(){
+
+ $this->assertEquals(
+ $this->object->resolveTypeSize(12),
+ array(
+ 0 => 12,
+ 1 => 'B'
+ )
+ );
+ }
+}
diff --git a/test/classes/PMA_Theme_Manager_test.php b/test/classes/PMA_Theme_Manager_test.php
index ad8bdd818b..d9c7bfbec1 100644
--- a/test/classes/PMA_Theme_Manager_test.php
+++ b/test/classes/PMA_Theme_Manager_test.php
@@ -14,6 +14,8 @@ require_once 'libraries/url_generating.lib.php';
require_once 'libraries/php-gettext/gettext.inc';
require_once 'libraries/Theme.class.php';
require_once 'libraries/Theme_Manager.class.php';
+require_once 'libraries/Config.class.php';
+require_once 'libraries/core.lib.php';
class PMA_Theme_Manager_test extends PHPUnit_Framework_TestCase
{
@@ -25,6 +27,7 @@ class PMA_Theme_Manager_test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['ServerDefault'] = 0;
$GLOBALS['server'] = 99;
$_SESSION[' PMA_token '] = 'token';
+ $GLOBALS['PMA_Config'] = new PMA_Config();
}
public function testCookieName()
@@ -46,5 +49,58 @@ class PMA_Theme_Manager_test extends PHPUnit_Framework_TestCase
$this->assertContains(''
+ )
+ );
+ }
+
+ /**
+ * Test for getTypeDescription
+ */
+ public function testGetTypeDescription(){
+ $this->assertEquals(
+ $this->object->getTypeDescription('enum'),
+ ''
+ );
+ }
+
+ /**
+ * Test for getFunctionsClass
+ */
+ public function testGetFunctionsClass(){
+ $this->assertEquals(
+ $this->object->getFunctionsClass('enum'),
+ array()
+ );
+ }
+
+ /**
+ * Test for getFunctions
+ */
+ public function testGetFunctions(){
+ $this->assertEquals(
+ $this->object->getFunctions('enum'),
+ array()
+ );
+ }
+
+ /**
+ * Test for getAllFunctions
+ */
+ public function testGetAllFunctions(){
+ $this->assertEquals(
+ $this->object->getAllFunctions(),
+ array()
+ );
+ }
+
+ /**
+ * Test for getAttributes
+ */
+ public function testGetAttributes(){
+ $this->assertEquals(
+ $this->object->getAttributes(),
+ array()
+ );
+ }
+
+ /**
+ * Test for getColumns
+ */
+ public function testGetColumns(){
+ $this->assertEquals(
+ $this->object->getColumns(),
+ array(
+ 'INT',
+ 'VARCHAR',
+ 'TEXT',
+ 'DATE',
+ )
+ );
+ }
}
?>
diff --git a/test/classes/gis/PMA_GIS_Geom_test.php b/test/classes/gis/PMA_GIS_Geom_test.php
index 963a243a57..f0c67eb420 100644
--- a/test/classes/gis/PMA_GIS_Geom_test.php
+++ b/test/classes/gis/PMA_GIS_Geom_test.php
@@ -15,28 +15,6 @@ require_once 'libraries/gis/pma_gis_geometry.php';
*/
abstract class PMA_GIS_GeomTest extends PHPUnit_Framework_TestCase
{
- /**
- * test generateWkt method
- *
- * @param array $gis_data array of GIS data
- * @param int $index index
- * @param string $empty string to be insterted in place of missing values
- * @param string $wkt expected WKT
- *
- * @return void
- * @dataProvider providerForTestGenerateWkt
- */
- public function testGenerateWkt($gis_data, $index, $empty, $wkt)
- {
- if ($empty == null) {
- $this->assertEquals($this->object->generateWkt($gis_data, $index), $wkt);
- } else {
- $this->assertEquals(
- $this->object->generateWkt($gis_data, $index, $empty),
- $wkt
- );
- }
- }
/**
* test generateParams method
diff --git a/test/libraries/PMA_bookmark_test.php b/test/libraries/PMA_bookmark_test.php
new file mode 100644
index 0000000000..7454299905
--- /dev/null
+++ b/test/libraries/PMA_bookmark_test.php
@@ -0,0 +1,125 @@
+ 'id',
+ 'label' => 'label'
+ );
+ }
+ }
+
+ if (! defined('PMA_DBI_QUERY_STORE')) {
+ define('PMA_DBI_QUERY_STORE', 1);
+ }
+
+ $GLOBALS['cfg']['Server']['user'] = 'root';
+ $GLOBALS['cfg']['Server']['pmadb'] = 'phpmyadmin';
+ $GLOBALS['cfg']['Server']['bookmarktable'] = 'pma_bookmark';
+ $GLOBALS['server'] = 1;
+
+ require_once 'libraries/bookmark.lib.php';
+ }
+ /**
+ * Test for PMA_Bookmark_getParams
+ */
+ public function testPMA_Bookmark_getParams(){
+
+ $this->assertEquals(
+ PMA_Bookmark_getParams(),
+ array(
+ 'user' => 'root',
+ 'db' => 'phpmyadmin',
+ 'table'=> 'pma_bookmark'
+ )
+ );
+ }
+
+ /**
+ * Test for PMA_Bookmark_getList
+ */
+ public function testPMA_Bookmark_getList(){
+ $this->assertEquals(
+ PMA_Bookmark_getList('phpmyadmin'),
+ array(
+ 'id' => 'id (shared)',
+ 'label' => 'label (shared)'
+ )
+ );
+ }
+
+ /**
+ * Test for PMA_Bookmark_get
+ */
+ public function testPMA_Bookmark_get(){
+ if (! function_exists('PMA_DBI_fetch_value')) {
+ function PMA_DBI_fetch_value()
+ {
+ return "SELECT query FROM `phpmyadmin`.`pma_bookmark` WHERE dbase = 'phpmyadmin' AND (user = 'root' OR user = '') AND `id` = 1";
+ }
+ }
+ $this->assertEquals(
+ PMA_Bookmark_get('phpmyadmin', '1'),
+ "SELECT query FROM `phpmyadmin`.`pma_bookmark` WHERE dbase = 'phpmyadmin' AND (user = 'root' OR user = '') AND `id` = 1"
+ );
+ }
+
+ /**
+ * Test for PMA_Bookmark_save
+ */
+ public function testPMA_Bookmark_save(){
+ if (! function_exists('PMA_DBI_query')) {
+ function PMA_DBI_query()
+ {
+ return true;
+ }
+ }
+ $this->assertEquals(
+ PMA_Bookmark_save('phpmyadmin'),
+ true
+ );
+ }
+
+ /**
+ * Test for PMA_Bookmark_delete
+ */
+ public function testPMA_Bookmark_delete(){
+ if (! function_exists('PMA_DBI_try_query')) {
+ function PMA_DBI_try_query()
+ {
+ return true;
+ }
+ }
+ $this->assertEquals(
+ PMA_Bookmark_delete('phpmyadmin', '1'),
+ true
+ );
+ }
+}
diff --git a/test/libraries/PMA_build_html_for_db_test.php b/test/libraries/PMA_build_html_for_db_test.php
new file mode 100644
index 0000000000..c05d5b4352
--- /dev/null
+++ b/test/libraries/PMA_build_html_for_db_test.php
@@ -0,0 +1,155 @@
+assertEquals(
+ PMA_getColumnOrder(),
+ array(
+ 'DEFAULT_COLLATION_NAME' => array(
+ 'disp_name' => __('Collation'),
+ 'description_function' => 'PMA_getCollationDescr',
+ 'format' => 'string',
+ 'footer' => 'footer'
+ ),
+ 'SCHEMA_TABLES' => array(
+ 'disp_name' => __('Tables'),
+ 'format' => 'number',
+ 'footer' => 0
+ ),
+ 'SCHEMA_TABLE_ROWS' => array(
+ 'disp_name' => __('Rows'),
+ 'format' => 'number',
+ 'footer' => 0
+ ),
+ 'SCHEMA_DATA_LENGTH' => array(
+ 'disp_name' => __('Data'),
+ 'format' => 'byte',
+ 'footer' => 0
+ ),
+ 'SCHEMA_INDEX_LENGTH' => array(
+ 'disp_name' => __('Indexes'),
+ 'format' => 'byte',
+ 'footer' => 0
+ ),
+ 'SCHEMA_LENGTH' => array(
+ 'disp_name' => __('Total'),
+ 'format' => 'byte',
+ 'footer' => 0
+ ),
+ 'SCHEMA_DATA_FREE' => array(
+ 'disp_name' => __('Overhead'),
+ 'format' => 'byte',
+ 'footer' => 0
+ )
+ )
+ );
+ }
+
+ /**
+ * Test for PMA_buildHtmlForDb
+ *
+ * @param array $current
+ * @param boolean $is_superuser
+ * @param string $checkall
+ * @param string $url_query
+ * @param array $column_order
+ * @param array $replication_types
+ * @param array $replication_info
+ * @param $output
+ *
+ * @dataProvider providerForTestPMA_buildHtmlForDb
+ */
+ public function testPMA_buildHtmlForDb($current, $is_superuser, $checkall, $url_query,$column_order, $replication_types, $replication_info, $output){
+
+ if (! function_exists('PMA_is_system_schema')) {
+ function PMA_is_system_schema()
+ {
+ return false;
+ }
+ }
+ if (! function_exists('p')) {
+ function p()
+ {
+ return;
+ }
+ }
+ if (! defined('PMA_DRIZZLE')) {
+ define('PMA_DRIZZLE', false);
+ }
+
+ $GLOBALS['cfg']['PropertiesIconic'] = true;
+ $_SESSION['PMA_Theme'] = new PMA_Theme();
+ $GLOBALS['pmaThemeImage'] = '';
+
+ $this->assertEquals(
+ PMA_buildHtmlForDb($current, $is_superuser, $checkall, $url_query,
+ $column_order, $replication_types, $replication_info),
+ $output
+ );
+ }
+
+ public function providerForTestPMA_buildHtmlForDb(){
+ return array(
+ array(
+ array('SCHEMA_NAME' => 'pma'),
+ true,
+ '',
+ 'target=main.php',
+ array(
+ 'SCHEMA_NAME' => 'pma',
+ 'footer' => 1,
+ 'format' => 'byte',
+ 'description_function' => 'onClick'
+ ),
+ array(
+ 'SCHEMA_NAME' => 'pma',
+ ),
+ array(
+ 'pma' => array(
+ 'status' => 'true',
+ 'Ignore_DB' => array(
+ 'pma' => 'pma'
+ ),
+ )
+ ),
+ array(
+ 0 => array(
+ 'SCHEMA_NAME' => 'pma',
+ 'footer' => 1,
+ 'format' => 'byte',
+ 'description_function' => 'onClick'
+ ),
+ 1 => '
