Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into master-security
  • Loading branch information
nijel committed Jul 12, 2016
2 parents 1523866 + 0ce8cd7 commit a499487
Show file tree
Hide file tree
Showing 10 changed files with 254 additions and 326 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog
- issue #12325 Setup script icons broken

4.6.4 (not yet released)
- issue Include X-Robots-Tag header in responses

4.6.3 (2016-06-23)
- issue #12249 Fixed cookie path on Windows
Expand Down
5 changes: 5 additions & 0 deletions libraries/Header.php
Expand Up @@ -606,6 +606,11 @@ public function sendHttpHeaders()
header(
'X-Permitted-Cross-Domain-Policies: none'
);
// Robots meta tag
// see https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
header(
'X-Robots-Tag: noindex, nofollow'
);
PMA_noCacheHeader();
if (! defined('IS_TRANSFORMATION_WRAPPER')) {
// Define the charset to be used
Expand Down
71 changes: 30 additions & 41 deletions po/es.po
Expand Up @@ -3,11 +3,11 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2016-05-23 14:29+0200\n"
"PO-Revision-Date: 2016-05-20 18:50+0000\n"
"POT-Creation-Date: 2016-05-23 14:30+0200\n"
"PO-Revision-Date: 2016-07-03 16:17+0000\n"
"Last-Translator: Franco <fulanodetal.github1@openaliasbox.org>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/phpmyadmin/"
"master/es/>\n"
"Language-Team: Spanish "
"<https://hosted.weblate.org/projects/phpmyadmin/master/es/>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -2558,6 +2558,13 @@ msgid ""
"cause such a problem, clearing your \"Offline Website Data\" might help. In "
"Safari, such problem is commonly caused by \"Private Mode Browsing\"."
msgstr ""
"Hubo un problema accediendo al almacenamiento del navegador, algunas "
"características no funcionan adecuadamente para usted. Es probable que el "
"navegador no soporte el almacenamiento de información o se alcanzó el límite "
"de cuota. En Firefox, el almacenamiento corrupto también puede causar "
"problemas, limpiar sus \"Datos offline de sitios web\" puede ayudar. En "
"Safari, este problema es causado comúnmente por la \"Navegación en modo "
"privado\"."

#: js/messages.php:714
msgid "Copy tables to"
Expand Down Expand Up @@ -5539,14 +5546,11 @@ msgid "Highlight pointer"
msgstr "Resaltar puntero"

#: libraries/config/messages.inc.php:47
#, fuzzy
#| msgid ""
#| "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for "
#| "import operations."
msgid "Enable bzip2 compression for import operations."
msgstr ""
"Habilitar la compresión [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] para "
"las operaciones de importación."
msgstr "Habilitar compresión bzip2, para las operaciones de importación."

#: libraries/config/messages.inc.php:50
msgid "Bzip2"
Expand All @@ -5567,16 +5571,15 @@ msgid "CHAR columns editing"
msgstr "Edición de columnas CHAR"

#: libraries/config/messages.inc.php:58
#, fuzzy
#| msgid ""
#| "Use user-friendly editor for editing SQL queries ([a@http://codemirror."
#| "net/]CodeMirror[/a]) with syntax highlighting and line numbers."
msgid ""
"Use user-friendly editor for editing SQL queries (CodeMirror) with syntax "
"highlighting and line numbers."
msgstr ""
"Utilizar el editor SQL ([a@http://codemirror.net/]CodeMirror[/a]) con "
"resaltado de sintáxis y números de línea."
"Utilizar el editor SQL (CodeMirror) con resaltado de sintaxis y números de "
"línea."

#: libraries/config/messages.inc.php:62
msgid "Enable CodeMirror"
Expand Down Expand Up @@ -6346,14 +6349,12 @@ msgid "Disable some of the warnings shown by phpMyAdmin."
msgstr "Desactivar algunas de las advertencias mostradas por phpMyAdmin."

#: libraries/config/messages.inc.php:353
#, fuzzy
#| msgid ""
#| "Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for "
#| "import and export operations."
msgid "Enable gzip compression for import and export operations."
msgstr ""
"Habilite la compresión [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] para "
"las operaciones de importación y exportación."
"Habilitar compresión gzip para las operaciones de importación y exportación."

#: libraries/config/messages.inc.php:356
msgid "GZip"
Expand Down Expand Up @@ -7067,16 +7068,15 @@ msgid "Authentication type"
msgstr "Tipo de autenticación"

#: libraries/config/messages.inc.php:640
#, fuzzy
#| msgid ""
#| "Leave blank for no [a@https://wiki.phpmyadmin.net/pma/bookmark]bookmark[/"
#| "a] support, suggested: [kbd]pma__bookmark[/kbd]"
msgid ""
"Leave blank for no [doc@bookmarks@]bookmark[/doc] support, suggested: "
"[kbd]pma__bookmark[/kbd]"
msgstr ""
"Deje en blanco para no dar soporte [a@https://wiki.phpmyadmin.net/pma/"
"bookmark]bookmark[/a], de manera predeterminada: [kbd]pma_bookmark[/kbd]"
"Deje en blanco para no dar soporte [doc@bookmarks@]bookmark[/doc], de manera "
"predeterminada: [kbd]pma_bookmark[/kbd]"

#: libraries/config/messages.inc.php:643
msgid "Bookmark table"
Expand Down Expand Up @@ -7117,7 +7117,6 @@ msgid "Control user password"
msgstr "Controlar la contraseña del usuario"

#: libraries/config/messages.inc.php:656
#, fuzzy
#| msgid ""
#| "A special MySQL user configured with limited permissions, more "
#| "information available on [a@https://wiki.phpmyadmin.net/pma/"
Expand All @@ -7127,7 +7126,7 @@ msgid ""
"available on [doc@linked-tables]documentation[/doc]."
msgstr ""
"Un usuario MySQL especial configurado con permisos limitados, más "
"información disponible en [a@http://wiki.cihar.com/pma/controluser]wiki[/a]."
"información disponible en la [doc@linked-tables]documentación[/doc]."

#: libraries/config/messages.inc.php:659
msgid "Control user"
Expand Down Expand Up @@ -7295,7 +7294,6 @@ msgid "PDF schema: pages table"
msgstr "Esquema de PDF: tabla de páginas"

#: libraries/config/messages.inc.php:723
#, fuzzy
#| msgid ""
#| "Database used for relations, bookmarks, and PDF features. See [a@http://"
#| "wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave "
Expand All @@ -7306,9 +7304,8 @@ msgid ""
"Suggested: [kbd]phpmyadmin[/kbd]."
msgstr ""
"Base de datos usada para relaciones, favoritos, y características de los "
"PDF. Ver [a@http://wiki.cihar.com/pma/pmadb]pmadb[/a] para información "
"completa. Deje en blanco para que no exita soporte. Predeterminado: "
"[kbd]phpmyadmin[/kbd]."
"PDF. Ver [doc@linked-tables]pmadb[/doc] para información completa. Deje en "
"blanco para que no exista soporte. Predeterminado: [kbd]phpmyadmin[/kbd]."

#: libraries/config/messages.inc.php:727
#: templates/server/databases/create.phtml:20
Expand Down Expand Up @@ -7350,32 +7347,29 @@ msgid "Favorites table"
msgstr "Tablas favoritas"

#: libraries/config/messages.inc.php:742
#, fuzzy
#| msgid ""
#| "Leave blank for no [a@https://wiki.phpmyadmin.net/pma/relation]relation-"
#| "links[/a] support, suggested: [kbd]pma__relation[/kbd]."
msgid ""
"Leave blank for no [doc@relations@]relation-links[/doc] support, suggested: "
"[kbd]pma__relation[/kbd]."
msgstr ""
"Deje en blanco para no dar soporte [a@https://wiki.phpmyadmin.net/pma/"
"relation]relation-links[/a], de manera predeterminada: [kbd]pma__relation[/"
"kbd]."
"Deje en blanco para no dar soporte a [doc@relations@]relation-links[/doc], "
"sugerida: [kbd]pma__relation[/kbd]."

#: libraries/config/messages.inc.php:746
msgid "Relation table"
msgstr "Tabla de relaciones"

#: libraries/config/messages.inc.php:748
#, fuzzy
#| msgid ""
#| "See [a@https://wiki.phpmyadmin.net/pma/auth_types#signon]authentication "
#| "types[/a] for an example."
msgid ""
"See [doc@authentication-modes]authentication types[/doc] for an example."
msgstr ""
"Ver [a@http://wiki.cihar.com/pma/auth_types#signon]tipos de autenticación[/"
"a] para conocer un ejemplo."
"Ver [doc@authentication-modes]tipos de autenticación[/doc] para conocer un "
"ejemplo."

#: libraries/config/messages.inc.php:751
msgid "Signon session name"
Expand Down Expand Up @@ -7901,14 +7895,12 @@ msgid "Proxy password"
msgstr "Contraseña del proxy"

#: libraries/config/messages.inc.php:974
#, fuzzy
#| msgid ""
#| "Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for "
#| "import and export operations."
msgid "Enable ZIP compression for import and export operations."
msgstr ""
"Habilite la compresión [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] para "
"las operaciones de importación y exportación."
"Habilitar compresión ZIP para las operaciones de importación y exportación."

#: libraries/config/messages.inc.php:977
msgid "ZIP"
Expand Down Expand Up @@ -9501,7 +9493,7 @@ msgid ""
"(or combination of columns) that uniquely identify all rows."
msgstr ""
"No existe una clave primaria; agregue una.<br />Sugerencia: una clave "
"primaria es una columan (o combinación de columnas) que identifiquen "
"primaria es una columna (o combinación de columnas) que identifiquen "
"unívocamente a todas las filas."

#: libraries/normalization.lib.php:200
Expand Down Expand Up @@ -12340,7 +12332,6 @@ msgid "Authentication Plugin"
msgstr "Complemento de autenticación"

#: libraries/server_privileges.lib.php:1836
#, fuzzy
#| msgid "Password Hashing:"
msgid "Password Hashing Method"
msgstr "Método hash de contraseña"
Expand Down Expand Up @@ -14561,7 +14552,6 @@ msgid "Partition"
msgstr "Partición"

#: templates/columns_definitions/partitions.phtml:73
#, fuzzy
#| msgid "Value"
msgid "Values"
msgstr "Valores"
Expand All @@ -14583,7 +14573,6 @@ msgid "Index directory"
msgstr "Directorio índice"

#: templates/columns_definitions/partitions.phtml:82
#, fuzzy
#| msgid "Matched rows:"
msgid "Max rows"
msgstr "Filas máximas"
Expand All @@ -14593,10 +14582,9 @@ msgid "Min rows"
msgstr "Filas mínimas"

#: templates/columns_definitions/partitions.phtml:84
#, fuzzy
#| msgid "Table search"
msgid "Table space"
msgstr "Búsqueda de tablas"
msgstr "Espacio de tabla"

#: templates/columns_definitions/partitions.phtml:85
msgid "Node group"
Expand Down Expand Up @@ -15144,6 +15132,8 @@ msgid ""
"Can you tell us the steps leading to this error? It decisively helps in "
"debugging:"
msgstr ""
"¿Nos puede decir los pasos a este error? Es decisiva la ayuda en la "
"depuración de:"

#: templates/error/report_form.phtml:21
msgid "You may examine the data in the error report:"
Expand Down Expand Up @@ -15729,10 +15719,9 @@ msgid "An opening bracket was expected."
msgstr "Se esperaba un corchete de apertura."

#: vendor/phpmyadmin/sql-parser/src/Components/CreateDefinition.php:225
#, fuzzy
#| msgid "Variable name was expected."
msgid "A symbol name was expected!"
msgstr "Se esperaba el nombre de la variable."
msgstr "¡Se esperaba un nombre de símbolo!"

#: vendor/phpmyadmin/sql-parser/src/Components/CreateDefinition.php:257
msgid "A comma or a closing bracket was expected."
Expand Down
8 changes: 4 additions & 4 deletions po/fr.po
Expand Up @@ -3,9 +3,9 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2016-05-23 14:29+0200\n"
"PO-Revision-Date: 2016-06-15 17:37+0000\n"
"Last-Translator: Jocelyn Flament <jocelyn.flament@gmail.com>\n"
"POT-Creation-Date: 2016-05-23 14:30+0200\n"
"PO-Revision-Date: 2016-07-03 14:08+0000\n"
"Last-Translator: Adrien Bertrand <bertrand.adrien@gmail.com>\n"
"Language-Team: French "
"<https://hosted.weblate.org/projects/phpmyadmin/master/fr/>\n"
"Language: fr\n"
Expand Down Expand Up @@ -3072,7 +3072,7 @@ msgstr "Cor&eacute;en"

#: libraries/Charsets.php:313
msgid "Burmese"
msgstr ""
msgstr "Birman"

#: libraries/Charsets.php:316
msgid "Persian"
Expand Down

0 comments on commit a499487

Please sign in to comment.