- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 0d71c13a9591d4a451ade6d1c7a62e79434a3cc9
by Michal Čihař 26 Aug '11

26 Aug '11

The branch, master has been updated via 0d71c13a9591d4a451ade6d1c7a62e79434a3cc9 (commit) via 011ec21abb11d0455e26dd9fb726782f56d17f62 (commit) via 7977d01347542919a71a44b88e49206263e29ca1 (commit) from d40c9bc0416247535228171e444a965cbe397ff1 (commit) - Log ----------------------------------------------------------------- commit 0d71c13a9591d4a451ade6d1c7a62e79434a3cc9 Merge: 011ec21 d40c9bc Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 26 09:02:15 2011 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/website commit 011ec21abb11d0455e26dd9fb726782f56d17f62 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 26 08:55:07 2011 +0200 Remove download counts from templates commit 7977d01347542919a71a44b88e49206263e29ca1 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 26 08:54:19 2011 +0200 Handle not existing download count ----------------------------------------------------------------------- Summary of changes: render.py | 5 ++++- templates/_release.tpl | 2 -- templates/themes.tpl | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/render.py b/render.py index 059d094..016502f 100755 --- a/render.py +++ b/render.py @@ -289,7 +289,10 @@ class SFGenerator: featured = (FILES_REGEXP.match(filename) is not None) if featured: helper.log.dbg('Release is featured!') - dlcount = item.getElementsByTagName('files:download-count')[0].childNodes[0].data + try: + dlcount = item.getElementsByTagName('files:download-count')[0].childNodes[0].data + except: + dlcount = None try: notes = item.getElementsByTagName('files:release-notes-url')[0].childNodes[0].data except: diff --git a/templates/_release.tpl b/templates/_release.tpl index 2dbea0e..721e851 100644 --- a/templates/_release.tpl +++ b/templates/_release.tpl @@ -10,7 +10,6 @@ <th>File</th> <th>Size</th> <th>MD5 checksum</th> - <th>Downloads</th> </tr> </thead> <tbody> @@ -18,7 +17,6 @@ <td><a href="${file.url}#!md5!${file.md5}" class="piwik_download">${file.name}</a></td> <td class="size">${file.humansize}</td> <td>${file.md5}</td> - <td class="count">${file.dlcount}</td> </tr> </tbody> </table> diff --git a/templates/themes.tpl b/templates/themes.tpl index 7888247..c1642f9 100644 --- a/templates/themes.tpl +++ b/templates/themes.tpl @@ -54,7 +54,7 @@ your theme for downloading here. <p py:if="theme.author">Author: ${theme.author}</p> <p>${Markup(theme.info)}</p> <ul class="dl"> - <li><a href="${theme.file.url}#!md5!${theme.file.md5}">${theme.file.name}</a> (${theme.file.humansize}, ${theme.file.dlcount} downloads, MD5: ${theme.file.md5})</li> + <li><a href="${theme.file.url}#!md5!${theme.file.md5}">${theme.file.name}</a> (${theme.file.humansize}, MD5: ${theme.file.md5})</li> </ul> </div> <div class="clearer"></div> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17318-g15fb569
by Michal Čihař 26 Aug '11

26 Aug '11

The branch, master has been updated via 15fb569d34a9576dc424e09c23fda58a0c9111bd (commit) via f8d77019cbb5847bbb61a1e905c681b58ceeb18a (commit) via ce2b930832a9b228b78fc22b26e2517c2000f83d (commit) via b43b8d30643dcf0ba8e75fddc7f591c006f44581 (commit) via 09ed45002994611a024e969ccaf377bb880cc026 (commit) via 87b8cfdee395a3bd219354905fb9b7663ee7ac25 (commit) via c40df38501d822abc480f5942350412e74f63977 (commit) via 61591e18056e563a2553cd42cc867407d36704ba (commit) via b68f235607255a1059e4c4689c046785365f10d4 (commit) via b48ea00bcfb57d937ab3dee9604c0e32f2cc8f91 (commit) via b2233b4833ee7d946c728f4f2b3ba6ecf6123c54 (commit) via da16f5c3224a740d58e4f74ce107145180107d6c (commit) via 9c9287f21d30144a74bfc3603d17263d5b385cca (commit) via 81bccb73928c85f5f368b5e22a9dcfe50f1cc5c5 (commit) via c4665ab0ecfd6844b9d84c0c2a673c7ef598316a (commit) via 785ba417038576c81dc7c4545082ae40c269c9b0 (commit) via 3422dbdf5cb01f691fea42ef170b40e348353b54 (commit) via 20ba6369d2cdeadd828bc3a52065d477fe193649 (commit) via da505529036aa5bc411d0270999a5354cdb79a05 (commit) via c03e0916e70207d6b6ea69578bf833d3434c8a2e (commit) via 528ca33787e24578130c314566aca2f7767f7026 (commit) via 003762be8e110b1bcbae757753b4c1926153639a (commit) via 0af70b23f3fc79dc178370620bac65fe13244737 (commit) via a009fac1a8f73e1c24bd514390db23705d681527 (commit) via 3fb342128e44bab6148bd98b0cf1cecd58101905 (commit) from 433f2c76ee60f683390bd65d14d6996da601c3f3 (commit) - Log ----------------------------------------------------------------- commit 15fb569d34a9576dc424e09c23fda58a0c9111bd Merge: 433f2c7 f8d7701 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 26 07:45:12 2011 +0200 Merge remote-tracking branch 'pootle/master' Conflicts: po/es.po commit f8d77019cbb5847bbb61a1e905c681b58ceeb18a Merge: ce2b930 fd118e0 Author: Pootle server <pootle(a)cihar.com> Date: Thu Aug 25 22:40:15 2011 +0200 Merge remote-tracking branch 'origin/master' commit ce2b930832a9b228b78fc22b26e2517c2000f83d Merge: b43b8d3 04772d6 Author: Pootle server <pootle(a)cihar.com> Date: Thu Aug 25 20:40:12 2011 +0200 Merge remote-tracking branch 'origin/master' commit b43b8d30643dcf0ba8e75fddc7f591c006f44581 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:57:21 2011 +0200 Translation update done using Pootle. commit 09ed45002994611a024e969ccaf377bb880cc026 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:56:52 2011 +0200 Translation update done using Pootle. commit 87b8cfdee395a3bd219354905fb9b7663ee7ac25 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:56:39 2011 +0200 Translation update done using Pootle. commit c40df38501d822abc480f5942350412e74f63977 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:56:36 2011 +0200 Translation update done using Pootle. commit 61591e18056e563a2553cd42cc867407d36704ba Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:56:27 2011 +0200 Translation update done using Pootle. commit b68f235607255a1059e4c4689c046785365f10d4 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:56:23 2011 +0200 Translation update done using Pootle. commit b48ea00bcfb57d937ab3dee9604c0e32f2cc8f91 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:56:18 2011 +0200 Translation update done using Pootle. commit b2233b4833ee7d946c728f4f2b3ba6ecf6123c54 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:56:13 2011 +0200 Translation update done using Pootle. commit da16f5c3224a740d58e4f74ce107145180107d6c Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:56:06 2011 +0200 Translation update done using Pootle. commit 9c9287f21d30144a74bfc3603d17263d5b385cca Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:56:02 2011 +0200 Translation update done using Pootle. commit 81bccb73928c85f5f368b5e22a9dcfe50f1cc5c5 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:55:49 2011 +0200 Translation update done using Pootle. commit c4665ab0ecfd6844b9d84c0c2a673c7ef598316a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:55:39 2011 +0200 Translation update done using Pootle. commit 785ba417038576c81dc7c4545082ae40c269c9b0 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:55:35 2011 +0200 Translation update done using Pootle. commit 3422dbdf5cb01f691fea42ef170b40e348353b54 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:55:26 2011 +0200 Translation update done using Pootle. commit 20ba6369d2cdeadd828bc3a52065d477fe193649 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:55:10 2011 +0200 Translation update done using Pootle. commit da505529036aa5bc411d0270999a5354cdb79a05 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:55:02 2011 +0200 Translation update done using Pootle. commit c03e0916e70207d6b6ea69578bf833d3434c8a2e Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:54:47 2011 +0200 Translation update done using Pootle. commit 528ca33787e24578130c314566aca2f7767f7026 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:54:30 2011 +0200 Translation update done using Pootle. commit 003762be8e110b1bcbae757753b4c1926153639a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:54:16 2011 +0200 Translation update done using Pootle. commit 0af70b23f3fc79dc178370620bac65fe13244737 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:53:50 2011 +0200 Translation update done using Pootle. commit a009fac1a8f73e1c24bd514390db23705d681527 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:53:44 2011 +0200 Translation update done using Pootle. commit 3fb342128e44bab6148bd98b0cf1cecd58101905 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Aug 25 18:53:38 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/es.po | 53 +++++++++++++++++++++++------------------------------ 1 files changed, 23 insertions(+), 30 deletions(-) diff --git a/po/es.po b/po/es.po index b83d586..f435519 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-25 23:09+0200\n" -"PO-Revision-Date: 2011-08-22 22:01+0200\n" +"PO-Revision-Date: 2011-08-25 18:57+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: spanish <es(a)li.org>\n" "Language: es\n" @@ -909,10 +909,10 @@ msgstr "Y" #: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295 #: js/messages.php:289 -#, fuzzy, php-format +#, php-format #| msgid "Point" msgid "Point %d" -msgstr "Punto" +msgstr "Punto %d" #: gis_data_editor.php:204 gis_data_editor.php:250 gis_data_editor.php:302 #: js/messages.php:295 @@ -1000,6 +1000,8 @@ msgstr "" msgid "" "Cannot convert file's character set without character set conversion library" msgstr "" +"No se pudo convertir el conjunto de caracteres del archivo sin la biblioteca " +"correspondiente" #: import.php:376 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" @@ -5370,13 +5372,12 @@ msgstr "Texto Open Document" #: libraries/config/validate.lib.php:198 msgid "Could not initialize Drizzle connection library" -msgstr "" +msgstr "No se pudo inicializar la biblioteca de conexión Drizzle" #: libraries/config/validate.lib.php:205 libraries/config/validate.lib.php:212 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "Could not connect to Drizzle server" -msgstr "No pudo conectarse con un servidor MySQL" +msgstr "No se pudo conectar con un servidor Drizzle" #: libraries/config/validate.lib.php:223 libraries/config/validate.lib.php:230 msgid "Could not connect to MySQL server" @@ -5489,11 +5490,10 @@ msgid "The server is not responding" msgstr "El servidor no está respondiendo" #: libraries/dbi/drizzle.dbi.lib.php:344 -#, fuzzy #| msgid "(or the local MySQL server's socket is not correctly configured)" msgid "(or the local Drizzle server's socket is not correctly configured)" msgstr "" -"(o el socket del servidor MySQL local no está configurado correctamente)" +"(o el zócalo del servidor Drizzle local no está configurado correctamente)" #: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:384 msgid "(or the local MySQL server's socket is not correctly configured)" @@ -7944,7 +7944,7 @@ msgstr "Juegos de caracteres" #: libraries/server_links.inc.php:104 server_plugins.php:47 #: server_plugins.php:80 msgid "Plugins" -msgstr "" +msgstr "Complementos" #: libraries/server_links.inc.php:108 msgid "Engines" @@ -8421,10 +8421,9 @@ msgid "General Settings" msgstr "Configuraciones generales" #: main.php:101 -#, fuzzy #| msgid "MySQL connection collation" msgid "Server connection collation" -msgstr "Cotejamiento de las conexiones MySQL" +msgstr "Cotejamiento de la conexión al servidor" #: main.php:116 msgid "Appearance Settings" @@ -8435,20 +8434,18 @@ msgid "More settings" msgstr "Más configuraciones" #: main.php:156 -#, fuzzy #| msgid "Database for user" msgid "Database server" -msgstr "Base de datos para el usuario" +msgstr "Servidor de base de datos" #: main.php:159 msgid "Software" -msgstr "" +msgstr "Programa" #: main.php:160 -#, fuzzy #| msgid "Show versions" msgid "Software version" -msgstr "Mostrar versiones" +msgstr "Versiones de programa" #: main.php:161 msgid "Protocol version" @@ -8461,20 +8458,18 @@ msgid "User" msgstr "Usuario" #: main.php:167 -#, fuzzy #| msgid "Server socket" msgid "Server charset" -msgstr "Puerto del servidor" +msgstr "Conjunto de caracteres del servidor" #: main.php:179 msgid "Web server" msgstr "Servidor web" #: main.php:190 -#, fuzzy #| msgid "Use light version" msgid "Database client version" -msgstr "Use la versión clara" +msgstr "Versión del cliente de base de datos" #: main.php:192 msgid "PHP extension" @@ -8973,7 +8968,7 @@ msgstr "Ver el volcado (schema) de la base de datos" #: server_plugins.php:81 msgid "Modules" -msgstr "" +msgstr "Módulos" #: server_plugins.php:102 msgid "Begin" @@ -8981,15 +8976,15 @@ msgstr "Empezar" #: server_plugins.php:111 msgid "Plugin" -msgstr "" +msgstr "Complemento" #: server_plugins.php:112 server_plugins.php:146 msgid "Module" -msgstr "" +msgstr "Módulo" #: server_plugins.php:113 server_plugins.php:148 msgid "Library" -msgstr "" +msgstr "Biblioteca" #: server_plugins.php:114 server_plugins.php:149 tbl_tracking.php:635 msgid "Version" @@ -8997,17 +8992,16 @@ msgstr "Versión" #: server_plugins.php:115 server_plugins.php:150 msgid "Author" -msgstr "" +msgstr "Autor" #: server_plugins.php:116 server_plugins.php:151 msgid "License" msgstr "Licencia" #: server_plugins.php:182 -#, fuzzy #| msgid "Disabled" msgid "disabled" -msgstr "Deshabilitado" +msgstr "desactivado" #: server_privileges.php:32 server_privileges.php:364 msgid "Includes all privileges except GRANT." @@ -12237,16 +12231,15 @@ msgstr "" "se encontró 'percona' en el comentario de la versión («version_comment»)" #: po/advisory_rules.php:62 -#, fuzzy #| msgid "Percona documentation is at http://www.percona.com/docs/wiki/" msgid "Drizzle documentation is at http://docs.drizzle.org/" -msgstr "" -"La documentación de Percona se encuentra en http://www.percona.com/docs/wiki/" +msgstr "La documentación de Drizzle se encuentra en http://docs.drizzle.org/" #: po/advisory_rules.php:63 #, php-format msgid "Version string (%s) matches Drizzle versioning scheme" msgstr "" +"La cadena de versión (%s) coincide con el esquema de versionado de Drizzle" #: po/advisory_rules.php:65 msgid "MySQL Architecture" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17292-g3d1813c
by Dieter Adriaenssens 25 Aug '11

25 Aug '11

The branch, master has been updated via 3d1813c66c244ccc7571d467d4767a0169150489 (commit) via 946b82a1fb23adff4a789c393df230f0e15e6bc9 (commit) via 5c751cd1c033664ea830c1fd152f11ab826092d6 (commit) from fd118e02d45cab28409e64837fdcc8367a5c9ce8 (commit) - Log ----------------------------------------------------------------- commit 3d1813c66c244ccc7571d467d4767a0169150489 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Aug 25 23:04:03 2011 +0200 fix coding style, whitespace cleanup, docblocks commit 946b82a1fb23adff4a789c393df230f0e15e6bc9 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Aug 25 22:41:40 2011 +0200 remove unused code commit 5c751cd1c033664ea830c1fd152f11ab826092d6 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Aug 25 22:38:51 2011 +0200 make die() messages translatable, where possible ----------------------------------------------------------------------- Summary of changes: export.php | 4 +- file_echo.php | 2 +- libraries/Config.class.php | 79 +++++++++++++++--------- libraries/auth/cookie.auth.lib.php | 2 +- libraries/common.inc.php | 4 +- libraries/core.lib.php | 2 +- libraries/header_http.inc.php | 2 +- libraries/header_meta_style.inc.php | 2 +- libraries/schema/Pdf_Relation_Schema.class.php | 5 -- pmd_relation_new.php | 2 - setup/frames/form.inc.php | 4 +- setup/index.php | 2 +- setup/validate.php | 2 +- 13 files changed, 62 insertions(+), 50 deletions(-) diff --git a/export.php b/export.php index c5af244..aa64600 100644 --- a/export.php +++ b/export.php @@ -26,7 +26,7 @@ $type = $what; // Check export type if (! isset($export_list[$type])) { - die('Bad type!'); + die(__('Bad type!')); } /** @@ -103,7 +103,7 @@ if ($export_type == 'server') { } elseif ($export_type == 'table' && strlen($db) && strlen($table)) { $err_url = 'tbl_export.php?' . PMA_generate_common_url($db, $table); } else { - die('Bad parameters!'); + die(__('Bad parameters!')); } // Get the functions specific to the export type diff --git a/file_echo.php b/file_echo.php index 11a4487..bdfc173 100644 --- a/file_echo.php +++ b/file_echo.php @@ -18,7 +18,7 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) { /* Check whether MIME type is allowed */ if (! isset($allowed[$_REQUEST['type']])) { - die('Invalid export type'); + die(__('Invalid export type')); } /* diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 669bf32..49a3e1d 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -182,8 +182,7 @@ class PMA_Config '@Opera(/| )([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, $log_version - ) - ) { + )) { $this->set('PMA_USR_BROWSER_VER', $log_version[2]); $this->set('PMA_USR_BROWSER_AGENT', 'OPERA'); } elseif (preg_match( @@ -196,8 +195,8 @@ class PMA_Config } elseif (preg_match( '@OmniWeb/([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, - $log_version) - ) { + $log_version + )) { $this->set('PMA_USR_BROWSER_VER', $log_version[1]); $this->set('PMA_USR_BROWSER_AGENT', 'OMNIWEB'); // Konqueror 2.2.2 says Konqueror/2.2.2 @@ -205,8 +204,8 @@ class PMA_Config } elseif (preg_match( '@(Konqueror/)(.*)(;)@', $HTTP_USER_AGENT, - $log_version) - ) { + $log_version + )) { $this->set('PMA_USR_BROWSER_VER', $log_version[2]); $this->set('PMA_USR_BROWSER_AGENT', 'KONQUEROR'); } elseif (preg_match( @@ -223,8 +222,8 @@ class PMA_Config } elseif ( preg_match('@Mozilla/([0-9].[0-9]{1,2})@', $HTTP_USER_AGENT, - $log_version) - ) { + $log_version + )) { $this->set('PMA_USR_BROWSER_VER', $log_version[1]); $this->set('PMA_USR_BROWSER_AGENT', 'MOZILLA'); } else { @@ -327,12 +326,12 @@ class PMA_Config if (! preg_match( '@([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2})@', phpversion(), - $match) - ) { - preg_match( - '@([0-9]{1,2}).([0-9]{1,2})@', - phpversion(), $match + )) { + preg_match( + '@([0-9]{1,2}).([0-9]{1,2})@', + phpversion(), + $match ); } if (isset($match) && ! empty($match[1])) { @@ -457,11 +456,15 @@ class PMA_Config * @todo check validity of $_COOKIE['pma_collation_connection'] */ if (! empty($_COOKIE['pma_collation_connection'])) { - $this->set('collation_connection', - strip_tags($_COOKIE['pma_collation_connection'])); + $this->set( + 'collation_connection', + strip_tags($_COOKIE['pma_collation_connection']) + ); } else { - $this->set('collation_connection', - $this->get('DefaultConnectionCollation')); + $this->set( + 'collation_connection', + $this->get('DefaultConnectionCollation') + ); } // Now, a collation information could come from REQUEST // (an example of this: the collation selector in main.php) @@ -485,7 +488,9 @@ class PMA_Config // will have everything avaiable in session cache $server = isset($GLOBALS['server']) ? $GLOBALS['server'] - : (!empty($GLOBALS['cfg']['ServerDefault']) ? $GLOBALS['cfg']['ServerDefault'] : 0); + : (!empty($GLOBALS['cfg']['ServerDefault']) + ? $GLOBALS['cfg']['ServerDefault'] + : 0); $cache_key = 'server_' . $server; if ($server > 0 && !defined('PMA_MINIMUM_COMMON')) { $config_mtime = max($this->default_source_mtime, $this->source_mtime); @@ -510,8 +515,14 @@ class PMA_Config } $config_data = $_SESSION['cache'][$cache_key]['userprefs']; // type is 'db' or 'session' - $this->set('user_preferences', $_SESSION['cache'][$cache_key]['userprefs_type']); - $this->set('user_preferences_mtime', $_SESSION['cache'][$cache_key]['userprefs_mtime']); + $this->set( + 'user_preferences', + $_SESSION['cache'][$cache_key]['userprefs_type'] + ); + $this->set( + 'user_preferences_mtime', + $_SESSION['cache'][$cache_key]['userprefs_mtime'] + ); // backup some settings $org_fontsize = $this->settings['fontsize']; @@ -584,7 +595,8 @@ class PMA_Config if ((! isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != 'utf8_general_ci') || isset($config_data['collation_connection']) - && $GLOBALS['collation_connection'] != $config_data['collation_connection'] + && $GLOBALS['collation_connection'] + != $config_data['collation_connection'] ) { $this->setUserValue( null, @@ -607,10 +619,12 @@ class PMA_Config } /** - * Sets config value which is stored in user preferences (if available) or in a cookie. + * Sets config value which is stored in user preferences (if available) + * or in a cookie. * - * If user preferences are not yet initialized, option is applied to global config and - * added to a update queue, which is processed by {@link loadUserPreferences()} + * If user preferences are not yet initialized, option is applied to + * global config and added to a update queue, which is processed + * by {@link loadUserPreferences()} * * @param string $cookie_name can be null * @param string $cfg_path @@ -686,7 +700,7 @@ class PMA_Config { // Refuse to work while there still might be some world writable dir: if (is_dir('./config')) { - die('Remove "./config" directory before using phpMyAdmin!'); + die(__('Remove "./config" directory before using phpMyAdmin!')); } } @@ -710,8 +724,9 @@ class PMA_Config if (! is_readable($this->getSource())) { $this->source_mtime = 0; die( - 'Existing configuration file (' - . $this->getSource() . ') is not readable.' + sprintf(__('Existing configuration file (%d) is not readable.'), + $this->getSource() + ) ); } @@ -734,7 +749,7 @@ class PMA_Config $this->checkWebServerOs(); if ($this->get('PMA_IS_WINDOWS') == 0) { $this->source_mtime = 0; - die('Wrong permissions on configuration file, should not be world writable!'); + die(__('Wrong permissions on configuration file, should not be world writable!')); } } } @@ -1011,9 +1026,9 @@ class PMA_Config if ('off' == strtolower(ini_get('file_uploads'))) { $this->set('enable_upload', false); } - } else { + } else { $this->set('enable_upload', false); - } + } } /** @@ -1051,6 +1066,8 @@ class PMA_Config } /** + * Checks if protocol is https + * * @return bool */ public function isHttps() @@ -1129,6 +1146,8 @@ class PMA_Config } /** + * Get cookie path + * * @return string */ public function getCookiePath() diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index c2e50c0..2a3f7c1 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -32,7 +32,7 @@ if (function_exists('mcrypt_encrypt')) { srand((double) microtime() * 1000000); $td = mcrypt_module_open(MCRYPT_BLOWFISH, '', MCRYPT_MODE_CBC, ''); if ($td === false) { - die('Failed to use Blowfish from mcrypt!'); + die(__('Failed to use Blowfish from mcrypt!')); } $iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND); $GLOBALS['PMA_Config']->setCookie('pma_mcrypt_iv', base64_encode($iv)); diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 26e7a01..085bcb2 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -144,7 +144,7 @@ if (!defined('PMA_MINIMUM_COMMON')) { * protect against possible exploits - there is no need to have so much variables */ if (count($_REQUEST) > 1000) { - die('possible exploit'); + die(__('possible exploit')); } /** @@ -153,7 +153,7 @@ if (count($_REQUEST) > 1000) { */ foreach ($GLOBALS as $key => $dummy) { if (is_numeric($key)) { - die('numeric key detected'); + die(__('numeric key detected')); } } unset($dummy); diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 6379336..b4905c9 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -406,7 +406,7 @@ function PMA_arrayWalkRecursive(&$array, $function, $apply_to_keys_also = false) { static $recursive_counter = 0; if (++$recursive_counter > 1000) { - die('possible deep recursion attack'); + die(__('possible deep recursion attack')); } foreach ($array as $key => $value) { if (is_array($value)) { diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php index 3b32915..4b4e454 100644 --- a/libraries/header_http.inc.php +++ b/libraries/header_http.inc.php @@ -12,7 +12,7 @@ if (! defined('PHPMYADMIN')) { * */ if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) { - die("GLOBALS overwrite attempt"); + die(__("GLOBALS overwrite attempt")); } /** diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index 5e5c533..076035b 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -12,7 +12,7 @@ if (! defined('PHPMYADMIN')) { * */ if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) { - die("GLOBALS overwrite attempt"); + die(__("GLOBALS overwrite attempt")); } /** diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index 6108375..ff1a000 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -587,11 +587,6 @@ class Table_Stats $pdf->PMA_PDF_setXScale($this->x); $pdf->SetFillColor(255); } - /*if ($pdf->PageNo() > 1) { - $pdf->PMA_PDF_die( - __('The scale factor is too small to fit the schema on one page') - ); - } */ } } diff --git a/pmd_relation_new.php b/pmd_relation_new.php index fbd6246..8566d2d 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -16,8 +16,6 @@ extract($_POST, EXTR_SKIP); $tables = PMA_DBI_get_tables_full($db, $T1); $type_T1 = strtoupper($tables[$T1]['ENGINE']); $tables = PMA_DBI_get_tables_full($db, $T2); -//print_r($tables); -//die(); $type_T2 = strtoupper($tables[$T2]['ENGINE']); // native foreign key diff --git a/setup/frames/form.inc.php b/setup/frames/form.inc.php index 61484b2..5d34034 100644 --- a/setup/frames/form.inc.php +++ b/setup/frames/form.inc.php @@ -22,7 +22,7 @@ require './libraries/config/setup.forms.php'; $formset_id = filter_input(INPUT_GET, 'formset'); $mode = filter_input(INPUT_GET, 'mode'); if (! isset($forms[$formset_id])) { - die('Incorrect formset, check $formsets array in setup/frames/form.inc.php'); + die(__('Incorrect formset, check $formsets array in setup/frames/form.inc.php')); } if (isset($GLOBALS['strConfigFormset_' . $formset_id])) { @@ -33,4 +33,4 @@ foreach ($forms[$formset_id] as $form_name => $form) { $form_display->registerForm($form_name, $form); } process_formset($form_display); -?> \ No newline at end of file +?> diff --git a/setup/index.php b/setup/index.php index 99c7847..304e00f 100644 --- a/setup/index.php +++ b/setup/index.php @@ -19,7 +19,7 @@ if ($page === '') { } if (!file_exists("./setup/frames/$page.inc.php")) { // it will happen only when enterung URL by hand, we don't care for these cases - die('Wrong GET file attribute value'); + die(__('Wrong GET file attribute value')); } // Handle done action info diff --git a/setup/validate.php b/setup/validate.php index beeba71..22bdccb 100644 --- a/setup/validate.php +++ b/setup/validate.php @@ -19,7 +19,7 @@ header('Content-type: application/json'); $vids = explode(',', filter_input(INPUT_POST, 'id')); $values = json_decode(filter_input(INPUT_POST, 'values')); if (!($values instanceof stdClass)) { - die('Wrong data'); + die(__('Wrong data')); } $values = (array)$values; $result = PMA_config_validate($vids, $values, true); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17289-gfd118e0
by Dieter Adriaenssens 25 Aug '11

25 Aug '11

The branch, master has been updated via fd118e02d45cab28409e64837fdcc8367a5c9ce8 (commit) via a805121a221b765612a7c7a346f0a6d773b502b4 (commit) from fb5820487ca57f12b8a9a1b9ea21ecfeff12607e (commit) - Log ----------------------------------------------------------------- commit fd118e02d45cab28409e64837fdcc8367a5c9ce8 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Aug 25 22:03:08 2011 +0200 try indentation commit a805121a221b765612a7c7a346f0a6d773b502b4 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Aug 25 22:00:32 2011 +0200 fix DocCoding ----------------------------------------------------------------------- Summary of changes: libraries/Config.class.php | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index b0d85a9..669bf32 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -179,19 +179,18 @@ class PMA_Config // (must check everything else before Mozilla) if (preg_match( - '@Opera(/| )([0-9].[0-9]{1,2})@', - $HTTP_USER_AGENT, - $log_version - ) + '@Opera(/| )([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version + ) ) { $this->set('PMA_USR_BROWSER_VER', $log_version[2]); $this->set('PMA_USR_BROWSER_AGENT', 'OPERA'); } elseif (preg_match( - '@MSIE ([0-9].[0-9]{1,2})@', - $HTTP_USER_AGENT, - $log_version - ) - ) { + '@MSIE ([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version + )) { $this->set('PMA_USR_BROWSER_VER', $log_version[1]); $this->set('PMA_USR_BROWSER_AGENT', 'IE'); } elseif (preg_match( @@ -613,10 +612,10 @@ class PMA_Config * If user preferences are not yet initialized, option is applied to global config and * added to a update queue, which is processed by {@link loadUserPreferences()} * - * @param string $cookie_name can be null + * @param string $cookie_name can be null * @param string $cfg_path - * @param mixed $new_cfg_value - * @param mixed $default_value + * @param mixed $new_cfg_value new value + * @param mixed $default_value default value * * @return nothing */ @@ -645,8 +644,8 @@ class PMA_Config /** * Reads value stored by {@link setUserValue()} * - * @param string $cookie_name - * @param mixed $cfg_value + * @param string $cookie_name cookie name + * @param mixed $cfg_value config value * * @return mixed */ @@ -744,7 +743,7 @@ class PMA_Config /** * returns specific config setting * - * @param string $setting + * @param string $setting config setting * * @return mixed value */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17287-gfb58204
by Dieter Adriaenssens 25 Aug '11

25 Aug '11

The branch, master has been updated via fb5820487ca57f12b8a9a1b9ea21ecfeff12607e (commit) from 04772d6d8f6c8857b2cb4d2ea74045a7bacd123f (commit) - Log ----------------------------------------------------------------- commit fb5820487ca57f12b8a9a1b9ea21ecfeff12607e Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Aug 25 21:44:04 2011 +0200 try indentation ----------------------------------------------------------------------- Summary of changes: libraries/Config.class.php | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 7beb4cc..b0d85a9 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -179,16 +179,18 @@ class PMA_Config // (must check everything else before Mozilla) if (preg_match( - '@Opera(/| )([0-9].[0-9]{1,2})@', - $HTTP_USER_AGENT, - $log_version) + '@Opera(/| )([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version + ) ) { $this->set('PMA_USR_BROWSER_VER', $log_version[2]); $this->set('PMA_USR_BROWSER_AGENT', 'OPERA'); } elseif (preg_match( - '@MSIE ([0-9].[0-9]{1,2})@', - $HTTP_USER_AGENT, - $log_version) + '@MSIE ([0-9].[0-9]{1,2})@', + $HTTP_USER_AGENT, + $log_version + ) ) { $this->set('PMA_USR_BROWSER_VER', $log_version[1]); $this->set('PMA_USR_BROWSER_AGENT', 'IE'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17286-g04772d6
by Dieter Adriaenssens 25 Aug '11

25 Aug '11

The branch, master has been updated via 04772d6d8f6c8857b2cb4d2ea74045a7bacd123f (commit) from 989d6b4f23ea37cfaa5ca8ab665c90a61db85ba6 (commit) - Log ----------------------------------------------------------------- commit 04772d6d8f6c8857b2cb4d2ea74045a7bacd123f Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Thu Aug 25 19:35:25 2011 +0200 fix link ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index 4e3d76b..dd70490 100644 --- a/Documentation.html +++ b/Documentation.html @@ -2835,7 +2835,7 @@ setfacl -d -m "g:www-data:rwx" tmp minor version since the one that is bundled with some PHP distributions is rather old and might cause problems <a href="#faq1_17a"> (see <abbr title="Frequently Asked Questions">FAQ</abbr> 1.17a)</a>.<br /><br /> - <a href="http://mariadb.org/"></a>MariaDB is also supported + <a href="http://mariadb.org/">MariaDB</a> is also supported (versions 5.1 and 5.2 were tested).<br /><br /> Since phpMyAdmin 3.5 <a href="http://www.drizzle.org/">Drizzle</a> is supported. </p> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17285-g989d6b4
by Michal Čihař 25 Aug '11

25 Aug '11

The branch, master has been updated via 989d6b4f23ea37cfaa5ca8ab665c90a61db85ba6 (commit) via ccc7651837e1a03a6792b2c3cafa1199e1a4b19b (commit) via 527e8fe6bdbffee0b5769e6054f8e6980c39c4c8 (commit) via f751d943b14c81d4a8284b37f80468ec14ef0bf6 (commit) via 96f0c2e75b59ffd19049e42cd38857d56a57bbfd (commit) via 1a7d6af20424c45c019fd5930a3b7f8ed681c242 (commit) via 7e940e973fc11ad537449ffa0e8ff13bbb7d29e4 (commit) via 700c7fa3b8fd5f742316207af8b2d48a9080dcfe (commit) via 5f8bf7783a434590110e66afb016206d1f0c7a4d (commit) via 68a8066220e953933c688ced3eb40e9e2e3798ce (commit) via b905e6f94c5fbc6b8eb80b51ba6b01e5e9dc8cb5 (commit) via 8e0ebba66e04b1db135b4b77c72e8e0ed8e1286b (commit) via 239180935e4c94fc15c83491a6bc53b04abe0798 (commit) via d62f07257a2507a463d3f01521d3131cb9797b8d (commit) via 714ef1972db131ebf6aaff166fe847ac39bea8ad (commit) via 442eb9b67a8ef932e9411196507e518f532e06b5 (commit) via f81952af6649d1a873fedd69b3338c05a03431d1 (commit) via 3bdb698e4ff85f998fcd40cb6c51f2da8ae09e23 (commit) via 5db301020a22b854b79c5ffa944a667cfad7ab38 (commit) from 53f7ea521e39637c263cda8ecaa44bd0fdeab76c (commit) - Log ----------------------------------------------------------------- commit 989d6b4f23ea37cfaa5ca8ab665c90a61db85ba6 Merge: ccc7651 53f7ea5 Author: Pootle server <pootle(a)cihar.com> Date: Thu Aug 25 14:40:20 2011 +0200 Merge remote-tracking branch 'origin/master' commit ccc7651837e1a03a6792b2c3cafa1199e1a4b19b Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Aug 25 13:28:54 2011 +0200 Translation update done using Pootle. commit 527e8fe6bdbffee0b5769e6054f8e6980c39c4c8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:26:59 2011 +0200 Translation update done using Pootle. commit f751d943b14c81d4a8284b37f80468ec14ef0bf6 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:25:30 2011 +0200 Translation update done using Pootle. commit 96f0c2e75b59ffd19049e42cd38857d56a57bbfd Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:25:24 2011 +0200 Translation update done using Pootle. commit 1a7d6af20424c45c019fd5930a3b7f8ed681c242 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:25:19 2011 +0200 Translation update done using Pootle. commit 7e940e973fc11ad537449ffa0e8ff13bbb7d29e4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:25:13 2011 +0200 Translation update done using Pootle. commit 700c7fa3b8fd5f742316207af8b2d48a9080dcfe Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:25:07 2011 +0200 Translation update done using Pootle. commit 5f8bf7783a434590110e66afb016206d1f0c7a4d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:25:00 2011 +0200 Translation update done using Pootle. commit 68a8066220e953933c688ced3eb40e9e2e3798ce Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:24:54 2011 +0200 Translation update done using Pootle. commit b905e6f94c5fbc6b8eb80b51ba6b01e5e9dc8cb5 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:23:41 2011 +0200 Translation update done using Pootle. commit 8e0ebba66e04b1db135b4b77c72e8e0ed8e1286b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:22:02 2011 +0200 Translation update done using Pootle. commit 239180935e4c94fc15c83491a6bc53b04abe0798 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:21:42 2011 +0200 Translation update done using Pootle. commit d62f07257a2507a463d3f01521d3131cb9797b8d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:20:30 2011 +0200 Translation update done using Pootle. commit 714ef1972db131ebf6aaff166fe847ac39bea8ad Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:20:15 2011 +0200 Translation update done using Pootle. commit 442eb9b67a8ef932e9411196507e518f532e06b5 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 13:19:37 2011 +0200 Translation update done using Pootle. commit f81952af6649d1a873fedd69b3338c05a03431d1 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Aug 25 12:15:52 2011 +0200 Translation update done using Pootle. commit 3bdb698e4ff85f998fcd40cb6c51f2da8ae09e23 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:08:16 2011 +0200 Translation update done using Pootle. commit 5db301020a22b854b79c5ffa944a667cfad7ab38 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:08:05 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/el.po | 8 +++++--- po/tr.po | 32 +++++++++++++++++--------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/po/el.po b/po/el.po index 2d89b5e..f686860 100644 --- a/po/el.po +++ b/po/el.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-25 08:38+0200\n" -"PO-Revision-Date: 2011-08-23 08:34+0200\n" +"PO-Revision-Date: 2011-08-25 13:28+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" "Language: el\n" @@ -885,10 +885,10 @@ msgstr "Υ" #: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295 #: js/messages.php:289 -#, fuzzy, php-format +#, php-format #| msgid "Point" msgid "Point %d" -msgstr "Σημείο" +msgstr "Σημείο %d" #: gis_data_editor.php:204 gis_data_editor.php:250 gis_data_editor.php:302 #: js/messages.php:295 @@ -976,6 +976,8 @@ msgstr "" msgid "" "Cannot convert file's character set without character set conversion library" msgstr "" +"Αδύνατη η μετατροπή της κωδικοποίησης χωρίς τη βιβλιοθήκη μετατροπής " +"κωδικοποίησης" #: import.php:376 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" diff --git a/po/tr.po b/po/tr.po index e33621b..29ef3d2 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-25 08:38+0200\n" -"PO-Revision-Date: 2011-08-25 12:06+0200\n" +"PO-Revision-Date: 2011-08-25 13:26+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -190,7 +190,7 @@ msgstr "Varsayılan" #: libraries/schema/Pdf_Relation_Schema.class.php:1316 #: libraries/schema/Pdf_Relation_Schema.class.php:1337 tbl_printview.php:144 msgid "Links to" -msgstr "Bağlantı verilen" +msgstr "Bağlantı verilen:" #: db_datadict.php:172 db_printview.php:110 #: libraries/config/messages.inc.php:94 libraries/config/messages.inc.php:109 @@ -970,6 +970,8 @@ msgstr "" msgid "" "Cannot convert file's character set without character set conversion library" msgstr "" +"Karakter grubu dönüştürme kütüphanesi olmadan dosyanın karakter grubu " +"dönüştürülemez" #: import.php:376 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" @@ -5266,16 +5268,16 @@ msgstr "Açık Belge Metni" #: libraries/config/validate.lib.php:198 msgid "Could not initialize Drizzle connection library" -msgstr "" +msgstr "Drizzle bağlantı kütüphanesi başlatılamadı" #: libraries/config/validate.lib.php:205 libraries/config/validate.lib.php:212 #| msgid "Could not connect to MySQL server" msgid "Could not connect to Drizzle server" -msgstr "Drizzle sunucusuna bağlanamadı" +msgstr "Drizzle sunucusuna bağlanılamadı" #: libraries/config/validate.lib.php:223 libraries/config/validate.lib.php:230 msgid "Could not connect to MySQL server" -msgstr "MySQL sunucusuna bağlanamadı" +msgstr "MySQL sunucusuna bağlanılamadı" #: libraries/config/validate.lib.php:254 msgid "Empty username while using config authentication method" @@ -5378,7 +5380,7 @@ msgstr "Sunucu yanıt vermiyor" #: libraries/dbi/drizzle.dbi.lib.php:344 #| msgid "(or the local MySQL server's socket is not correctly configured)" msgid "(or the local Drizzle server's socket is not correctly configured)" -msgstr "(ya da yerel Drizeel sunucusunun soketi doğru olarak yapılandırılmadı)" +msgstr "(ya da yerel Drizzle sunucusunun soketi doğru olarak yapılandırılmadı)" #: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:384 msgid "(or the local MySQL server's socket is not correctly configured)" @@ -7796,7 +7798,7 @@ msgstr "Karakter Grupları" #: libraries/server_links.inc.php:104 server_plugins.php:47 #: server_plugins.php:80 msgid "Plugins" -msgstr "" +msgstr "Eklentiler" #: libraries/server_links.inc.php:108 msgid "Engines" @@ -8121,7 +8123,7 @@ msgstr "" #: libraries/transformations/image_jpeg__link.inc.php:10 msgid "Displays a link to download this image." -msgstr "Bu resmi indirme için bağlantı görüntüler." +msgstr "Bu resmi indirmek için bağlantı görüntüler." #: libraries/transformations/text_plain__dateformat.inc.php:10 msgid "" @@ -8283,7 +8285,7 @@ msgstr "Veritabanı sunucusu" #: main.php:159 msgid "Software" -msgstr "" +msgstr "Yazılım" #: main.php:160 #| msgid "Show versions" @@ -8801,7 +8803,7 @@ msgstr "Veritabanlarının dökümünü (şemasını) göster" #: server_plugins.php:81 msgid "Modules" -msgstr "" +msgstr "Modüller" #: server_plugins.php:102 msgid "Begin" @@ -8809,15 +8811,15 @@ msgstr "Yukarı" #: server_plugins.php:111 msgid "Plugin" -msgstr "" +msgstr "Eklenti" #: server_plugins.php:112 server_plugins.php:146 msgid "Module" -msgstr "" +msgstr "Modül" #: server_plugins.php:113 server_plugins.php:148 msgid "Library" -msgstr "" +msgstr "Kütüphane" #: server_plugins.php:114 server_plugins.php:149 tbl_tracking.php:635 msgid "Version" @@ -8825,7 +8827,7 @@ msgstr "Sürüm" #: server_plugins.php:115 server_plugins.php:150 msgid "Author" -msgstr "" +msgstr "Hazırlayan" #: server_plugins.php:116 server_plugins.php:151 msgid "License" @@ -11983,7 +11985,7 @@ msgstr "Drizzle belgesi http://docs.drizzle.org/ adresinde" #: po/advisory_rules.php:63 #, php-format msgid "Version string (%s) matches Drizzle versioning scheme" -msgstr "" +msgstr "Sürüm dizgisi (%s) Drizzle çeşitleme şemasıyla eşleşiyor" #: po/advisory_rules.php:65 msgid "MySQL Architecture" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17266-g53f7ea5
by Piotr Przybylski 25 Aug '11

25 Aug '11

The branch, master has been updated via 53f7ea521e39637c263cda8ecaa44bd0fdeab76c (commit) via f45a79a6511edbf2e32124b7918b6f5a473bf0e2 (commit) via bd3b7d28d45d432a1262e66392364ec22703368d (commit) from 2dd51d579be885992a35c12c74e187287c373342 (commit) - Log ----------------------------------------------------------------- commit 53f7ea521e39637c263cda8ecaa44bd0fdeab76c Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Aug 25 13:20:50 2011 +0200 PHPDoc commit f45a79a6511edbf2e32124b7918b6f5a473bf0e2 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Aug 25 13:16:28 2011 +0200 Whitespace cleanup, code formatting commit bd3b7d28d45d432a1262e66392364ec22703368d Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Thu Aug 25 13:16:06 2011 +0200 Whitespace cleanup ----------------------------------------------------------------------- Summary of changes: libraries/config.default.php | 2 +- libraries/export/xml.php | 8 ++-- libraries/svg_plot/pma_scatter_plot.php | 70 +++++++++++++---------------- libraries/svg_plot/pma_svg_data_point.php | 7 +-- tbl_select.php | 13 +++--- tbl_structure.php | 4 +- 6 files changed, 47 insertions(+), 57 deletions(-) diff --git a/libraries/config.default.php b/libraries/config.default.php index 0ee64f6..57ed7a7 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2807,7 +2807,7 @@ if ($cfg['ShowFunctionFields']) { 'FUNC_CHAR' => '', 'FUNC_DATE' => '', 'FUNC_NUMBER' => '', - 'FUNC_SPATIAL' => 'GeomFromText', + 'FUNC_SPATIAL' => 'GeomFromText', 'FUNC_UUID' => 'UUID', 'first_timestamp' => 'NOW', ); diff --git a/libraries/export/xml.php b/libraries/export/xml.php index 694f04b..a6b4940 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -32,7 +32,7 @@ if (isset($plugin_list)) { 'type' => 'begin_group', 'name' => 'structure', 'text' => __('Object creation options (all are recommended)') - ); + ); if (!PMA_DRIZZLE) { $plugin_list['xml']['options'][] = array( 'type' => 'bool', @@ -43,7 +43,7 @@ if (isset($plugin_list)) { 'type' => 'bool', 'name' => 'export_procedures', 'text' => __('Procedures') - ); + ); } $plugin_list['xml']['options'][] = array( 'type' => 'bool', @@ -60,8 +60,8 @@ if (isset($plugin_list)) { 'type' => 'bool', 'name' => 'export_views', 'text' => __('Views') - ); - } + ); + } $plugin_list['xml']['options'][] = array( 'type' => 'end_group' ); diff --git a/libraries/svg_plot/pma_scatter_plot.php b/libraries/svg_plot/pma_scatter_plot.php index 10c0aea..c0be405 100644 --- a/libraries/svg_plot/pma_scatter_plot.php +++ b/libraries/svg_plot/pma_scatter_plot.php @@ -119,12 +119,12 @@ class PMA_Scatter_Plot $this->_dataPoints = array(); if (! is_null($this->_userSpecifiedSettings)) { foreach (array_keys($this->_userSpecifiedSettings) as $key){ - $this->_settings[$key] = $this->_userSpecifiedSettings[$key]; - } + $this->_settings[$key] = $this->_userSpecifiedSettings[$key]; + } } if ($this->_settings['dataLabel'] == '') { - $labels = array_keys($this->_data[0]); - $this->_settings['dataLabel'] = $labels[0]; + $labels = array_keys($this->_data[0]); + $this->_settings['dataLabel'] = $labels[0]; } } @@ -143,7 +143,7 @@ class PMA_Scatter_Plot . ' height="' . $this->_settings['height'] . '">'; $output .= '<g id="groupPanel">'; $output .= '<defs> - <path id="myTextPath1" + <path id="myTextPath1" d="M10,190 L10,50"/> <path id="myTextPath2" d="M250,10 L370,10"/> @@ -194,41 +194,38 @@ class PMA_Scatter_Plot // Currently assuming only numeric fields are selected $coordinates = array(); foreach ($data as $row) { - $coordinates[0][] = $row[$xField]; - $coordinates[1][] = $row[$yField]; - } + $coordinates[0][] = $row[$xField]; + $coordinates[1][] = $row[$yField]; + } for ($i = 0 ; $i < 2 ; $i++) { - $maxC = ($i == 0) ? 500 : 320; - if( !is_numeric($coordinates[$i][0])) { + if ( !is_numeric($coordinates[$i][0])) { $uniqueC = array_unique($coordinates[$i]); $countC = count(array_unique($coordinates[$i])); - $map = $tmp = array(); + $map = $tmp = array(); foreach ($uniqueC as $uc) { - $tmp[] = $uc; - } + $tmp[] = $uc; + } for ($j = 0 ; $j < $countC ; $j++) { $map[$tmp[$j]] = 20 + $j * $maxC / $countC; - } - for($j = 0 ; $j < count($coordinates[$i]) ; $j++) { - $coordinates[$i][$j] = $map[$coordinates[$i][$j]]; - } - - } - elseif (is_numeric($coordinates[$i][0])) { - - $maxC = max($coordinates[$i]); - for($j = 0 ; $j < count($coordinates[$i]) ; $j++) { - - if ($i == 0) - $coordinates[$i][$j] = 20 + 500 * $coordinates[$i][$j] / $maxC; - else - $coordinates[$i][$j] = 20 + 320 * (1 - $coordinates[$i][$j] / $maxC); - } - } - } - return $coordinates; + } + for ($j = 0 ; $j < count($coordinates[$i]) ; $j++) { + $coordinates[$i][$j] = $map[$coordinates[$i][$j]]; + } + } + else if (is_numeric($coordinates[$i][0])) { + $maxC = max($coordinates[$i]); + for ($j = 0 ; $j < count($coordinates[$i]) ; $j++) { + if ($i == 0) { + $coordinates[$i][$j] = 20 + 500 * $coordinates[$i][$j] / $maxC; + } else { + $coordinates[$i][$j] = 20 + 320 * (1 - $coordinates[$i][$j] / $maxC); + } + } + } + } + return $coordinates; } /** @@ -238,15 +235,13 @@ class PMA_Scatter_Plot * @param int $color_number Start index to the color array * @param array $scale_data Data related to scaling * @param string $label Label for the data points - * @param image $results Image object in the case of png - * - * @return the formatted array of data. + * @return string the formatted array of data. */ private function _prepareDataSet($data, $color_number, $scale_data, $label) { $result = ''; // loop through the rows - for($i = 0 ; $i < count($data) ; $i++) { + for ($i = 0 ; $i < count($data) ; $i++) { $index = $color_number % sizeof($this->_settings['colors']); @@ -255,11 +250,10 @@ class PMA_Scatter_Plot $options = array('color' => $this->_settings['colors'][$index], 'id' => $i); $this->_dataPoints[] = $data_element; - $result .= $data_element->prepareRowAsSVG($options); + $result .= $data_element->prepareRowAsSVG($options); $color_number++; } - return $result; } } diff --git a/libraries/svg_plot/pma_svg_data_point.php b/libraries/svg_plot/pma_svg_data_point.php index 7d01b2b..ceaa8bc 100644 --- a/libraries/svg_plot/pma_svg_data_point.php +++ b/libraries/svg_plot/pma_svg_data_point.php @@ -25,9 +25,8 @@ class PMA_SVG_Data_Point extends PMA_SVG_Data_Element public function __construct($cx, $cy, $label, $dataRow) { parent::__construct($label,$dataRow); - $this->cx = $cx; - $this->cy = $cy; - + $this->cx = $cx; + $this->cy = $cy; } public function prepareRowAsSVG($options) @@ -39,10 +38,8 @@ class PMA_SVG_Data_Point extends PMA_SVG_Data_Element * Prepares and returns the code related to a row in the query result as SVG. * * @param array $options Array containing options related to properties of the point - * * @return the code related to a row in the query result. */ - protected function prepareSvg($options) { $point_options = array( diff --git a/tbl_select.php b/tbl_select.php index ee5da27..abda399 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -162,9 +162,9 @@ echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params); $foreignData = PMA_getForeignData($foreigners, $field, false, '', ''); - echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $fields_type, $i, $db, $table, $titles,$GLOBALS['cfg']['ForeignKeyMaxLimit'], '', true); + echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $fields_type, $i, $db, $table, $titles,$GLOBALS['cfg']['ForeignKeyMaxLimit'], '', true); - ?> + ?> <input type="hidden" name="names[<?php echo $i; ?>]" value="<?php echo htmlspecialchars($fields_list[$i]); ?>" /> <input type="hidden" name="types[<?php echo $i; ?>]" @@ -290,16 +290,15 @@ else { reset($func); while (list($i, $func_type) = each($func)) { - list($charsets[$i]) = explode('_', $collations[$i]); + list($charsets[$i]) = explode('_', $collations[$i]); $unaryFlag = (isset($GLOBALS['cfg']['UnaryOperators'][$func_type]) && $GLOBALS['cfg']['UnaryOperators'][$func_type] == 1) ? true : false; $tmp_geom_func = isset($geom_func[$i]) ? $geom_func[$i] : null; - $whereClause = PMA_tbl_search_getWhereClause($fields[$i],$names[$i], $types[$i], $collations[$i], $func_type, $unaryFlag, $tmp_geom_func); + $whereClause = PMA_tbl_search_getWhereClause($fields[$i],$names[$i], $types[$i], $collations[$i], $func_type, $unaryFlag, $tmp_geom_func); - if($whereClause) - $w[] = $whereClause; + if($whereClause) + $w[] = $whereClause; } // end for - //print_r($w); if ($w) { $sql_query .= ' WHERE ' . implode(' AND ', $w); } diff --git a/tbl_structure.php b/tbl_structure.php index 6604ea2..4c3842c 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -507,8 +507,8 @@ foreach ($fields as $row) { } } ?> </div> - <?php if (!PMA_DRIZZLE) { ?> - <div class="action_spatial"> + <?php if (!PMA_DRIZZLE) { ?> + <div class="action_spatial"> <?php if (isset($spatial_enabled)) { if ($spatial_enabled) { ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin scripts branch, master, updated. 33c24a3a2a4bf67844e2e1da81236f745f0b265c
by Michal Čihař 25 Aug '11

25 Aug '11

The branch, master has been updated via 33c24a3a2a4bf67844e2e1da81236f745f0b265c (commit) from 9e67c1ede429420e101b5271adb55bf5dc1735ea (commit) - Log ----------------------------------------------------------------- commit 33c24a3a2a4bf67844e2e1da81236f745f0b265c Author: Michal Čihař <michal(a)cihar.com> Date: Thu Aug 25 12:48:29 2011 +0200 Fix path ----------------------------------------------------------------------- Summary of changes: website/pma-copy-docs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/website/pma-copy-docs b/website/pma-copy-docs index a45c0f5..2dd16bd 100755 --- a/website/pma-copy-docs +++ b/website/pma-copy-docs @@ -8,7 +8,7 @@ git pull -q rsync -az favicon.ico CREDITS ChangeLog Documentation.html INSTALL LICENSE README docs.css web.sourceforge.net:htdocs/documentation/ cd themes/original/img/ rsync -az docs_menu_bg.png logo_right.png web.sourceforge.net:htdocs/documentation/themes/original/img/ -cd /home/pmaweb/pma/phpMyAdmin/libraries/ +cd /home/pmaweb/pma/phpmyadmin/libraries/ rsync -az vendor_config.php web.sourceforge.net:htdocs/documentation/libraries/ # Localised documentation hooks/post-receive -- phpMyAdmin scripts

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17263-g2dd51d5
by Michal Čihař 25 Aug '11

25 Aug '11

The branch, master has been updated via 2dd51d579be885992a35c12c74e187287c373342 (commit) via e2948b1a50ef3eb6c68fec74c45ba0f9d3a07330 (commit) via 07462d1238534921e40ea6a0e417cd45e12b8d1f (commit) via 3cabd054ad2416f9525da84ea6e1ab109e298b54 (commit) via cbe041c7c120e4ba318d11305d006f967b03da96 (commit) via 76ff1ff981f253e0baeffe6869c18e1485a1fd80 (commit) via 9a89c9b385fcaa40b0ab1e0895290edbe8a30b95 (commit) via 31cb8b0f6cf9367da276bc7f6b241fadd652ed46 (commit) via 19b5851470497630aac64ab7986cafe8d6b31c68 (commit) via 85d61b1f142af8e86f83eec1e1d0f2a479766261 (commit) via c7bcda0299af982fcb4d0dd04537cbfc18ca65bc (commit) via 066ca0df368067461db2ee69780926e04d779449 (commit) via d6c62420ebc541087fccafce4a0e1051e628cb06 (commit) via bcfbcab3a052b9a1cece2626be23ce578505208d (commit) via 5012b3d88085602ae8155cd79076b0ffd8cdb0f0 (commit) via e1fd004bb2118e725a3239ad61fd2014dd62d829 (commit) via 5e6e2e3e5d0fe9a1fc8b40dae1e674330cfcbb08 (commit) via 409b1dc125eb923a184fb7996c2fd280db4f0411 (commit) via e473a5f3351901c47894473da110e1a7ebd17603 (commit) via 8745cb4c475ca4bbe216cedb5b61def9ba37650b (commit) via 81124927a8dedec4faaa957869a1d4f58a7dd273 (commit) via a3afc2d56f28af8df3c666c5c93859502146bdb9 (commit) via 96e070d84aa68bdb366ad70dc41be0330f61b5cc (commit) via b4ec82881f1d7735fe6f35b50f28f9216dc6b288 (commit) from 0e3bdcdb4ccb17705122b8dd72a71886ec6543dc (commit) - Log ----------------------------------------------------------------- commit 2dd51d579be885992a35c12c74e187287c373342 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:06:47 2011 +0200 Translation update done using Pootle. commit e2948b1a50ef3eb6c68fec74c45ba0f9d3a07330 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:06:32 2011 +0200 Translation update done using Pootle. commit 07462d1238534921e40ea6a0e417cd45e12b8d1f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:05:50 2011 +0200 Translation update done using Pootle. commit 3cabd054ad2416f9525da84ea6e1ab109e298b54 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:05:33 2011 +0200 Translation update done using Pootle. commit cbe041c7c120e4ba318d11305d006f967b03da96 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:05:09 2011 +0200 Translation update done using Pootle. commit 76ff1ff981f253e0baeffe6869c18e1485a1fd80 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:04:58 2011 +0200 Translation update done using Pootle. commit 9a89c9b385fcaa40b0ab1e0895290edbe8a30b95 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:04:42 2011 +0200 Translation update done using Pootle. commit 31cb8b0f6cf9367da276bc7f6b241fadd652ed46 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:04:29 2011 +0200 Translation update done using Pootle. commit 19b5851470497630aac64ab7986cafe8d6b31c68 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:04:05 2011 +0200 Translation update done using Pootle. commit 85d61b1f142af8e86f83eec1e1d0f2a479766261 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 12:03:43 2011 +0200 Translation update done using Pootle. commit c7bcda0299af982fcb4d0dd04537cbfc18ca65bc Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Aug 25 11:59:34 2011 +0200 Translation update done using Pootle. commit 066ca0df368067461db2ee69780926e04d779449 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:36:31 2011 +0200 Translation update done using Pootle. commit d6c62420ebc541087fccafce4a0e1051e628cb06 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:35:35 2011 +0200 Translation update done using Pootle. commit bcfbcab3a052b9a1cece2626be23ce578505208d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:35:25 2011 +0200 Translation update done using Pootle. commit 5012b3d88085602ae8155cd79076b0ffd8cdb0f0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:34:53 2011 +0200 Translation update done using Pootle. commit e1fd004bb2118e725a3239ad61fd2014dd62d829 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:27:00 2011 +0200 Translation update done using Pootle. commit 5e6e2e3e5d0fe9a1fc8b40dae1e674330cfcbb08 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:26:34 2011 +0200 Translation update done using Pootle. commit 409b1dc125eb923a184fb7996c2fd280db4f0411 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:26:13 2011 +0200 Translation update done using Pootle. commit e473a5f3351901c47894473da110e1a7ebd17603 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:25:52 2011 +0200 Translation update done using Pootle. commit 8745cb4c475ca4bbe216cedb5b61def9ba37650b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:25:13 2011 +0200 Translation update done using Pootle. commit 81124927a8dedec4faaa957869a1d4f58a7dd273 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:23:20 2011 +0200 Translation update done using Pootle. commit a3afc2d56f28af8df3c666c5c93859502146bdb9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:22:13 2011 +0200 Translation update done using Pootle. commit 96e070d84aa68bdb366ad70dc41be0330f61b5cc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:21:33 2011 +0200 Translation update done using Pootle. commit b4ec82881f1d7735fe6f35b50f28f9216dc6b288 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Aug 25 11:20:00 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 38 +++++++++++++------------------------- po/tr.po | 35 +++++++++++++---------------------- 2 files changed, 26 insertions(+), 47 deletions(-) diff --git a/po/ja.po b/po/ja.po index eebf172..5973a1c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-25 08:38+0200\n" -"PO-Revision-Date: 2011-08-23 12:27+0200\n" +"PO-Revision-Date: 2011-08-25 11:36+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -2314,10 +2314,9 @@ msgid_plural "%1$d rows inserted." msgstr[0] "%1$d 行挿入しました。" #: libraries/PDF.class.php:81 -#, fuzzy #| msgid "Allows reading data." msgid "Error while creating PDF:" -msgstr "データの読み込みを許可する" +msgstr "PDF を作成中にエラーが発生しました：" #: libraries/RecentTable.class.php:107 msgid "Could not save recent table" @@ -2352,10 +2351,9 @@ msgid "This MySQL server does not support the %s storage engine." msgstr "この MySQL サーバは %s ストレージエンジンをサポートしていません" #: libraries/Table.class.php:329 -#, fuzzy #| msgid "Show slave status" msgid "unknown table status: " -msgstr "スレーブの状態を表示する" +msgstr "不明なテーブルステータス：" #: libraries/Table.class.php:1115 msgid "Invalid database" @@ -5337,10 +5335,9 @@ msgid "The server is not responding" msgstr "サーバが応答しません" #: libraries/dbi/drizzle.dbi.lib.php:344 -#, fuzzy #| msgid "(or the local MySQL server's socket is not correctly configured)" msgid "(or the local Drizzle server's socket is not correctly configured)" -msgstr "(あるいはローカルの MySQL サーバのソケットが正しく設定されていません)" +msgstr "(あるいはローカルの Drizzle サーバのソケットが正しく設定されていません)" #: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:384 msgid "(or the local MySQL server's socket is not correctly configured)" @@ -8212,10 +8209,9 @@ msgid "General Settings" msgstr "一般設定" #: main.php:101 -#, fuzzy #| msgid "MySQL connection collation" msgid "Server connection collation" -msgstr "MySQL 接続の照合順序" +msgstr "サーバ接続の照合順序" #: main.php:116 msgid "Appearance Settings" @@ -8226,20 +8222,18 @@ msgid "More settings" msgstr "詳細設定" #: main.php:156 -#, fuzzy #| msgid "Database for user" msgid "Database server" -msgstr "ユーザ専用データベース" +msgstr "データベースサーバ" #: main.php:159 msgid "Software" -msgstr "" +msgstr "ソフトウェア" #: main.php:160 -#, fuzzy #| msgid "Show versions" msgid "Software version" -msgstr "バージョンを表示する" +msgstr "ソフトウェアバージョン" #: main.php:161 msgid "Protocol version" @@ -8252,20 +8246,18 @@ msgid "User" msgstr "ユーザ" #: main.php:167 -#, fuzzy #| msgid "Server socket" msgid "Server charset" -msgstr "サーバのソケット" +msgstr "サーバの文字セット" #: main.php:179 msgid "Web server" msgstr "ウェブサーバ" #: main.php:190 -#, fuzzy #| msgid "Use light version" msgid "Database client version" -msgstr "軽快モードを使用する" +msgstr "データベースクライアントのバージョン" #: main.php:192 msgid "PHP extension" @@ -8788,7 +8780,6 @@ msgid "License" msgstr "ライセンス" #: server_plugins.php:182 -#, fuzzy #| msgid "Disabled" msgid "disabled" msgstr "無効" @@ -9495,10 +9486,9 @@ msgid "Show unformatted values" msgstr "生の値（書式化なし）で表示する" #: server_status.php:859 -#, fuzzy #| msgid "Related Links" msgid "Related links:" -msgstr "関連リンク" +msgstr "関連リンク:" #: server_status.php:892 #, fuzzy @@ -11447,10 +11437,9 @@ msgid "Show more actions" msgstr "他の操作を表示する" #: tbl_structure.php:604 -#, fuzzy #| msgid "Print view" msgid "Edit view" -msgstr "印刷用画面" +msgstr "ビューを編集する" #: tbl_structure.php:621 msgid "Relation view" @@ -11911,10 +11900,9 @@ msgid "'percona' found in version_comment" msgstr "" #: po/advisory_rules.php:62 -#, fuzzy #| msgid "Percona documentation is at http://www.percona.com/docs/wiki/" msgid "Drizzle documentation is at http://docs.drizzle.org/" -msgstr "Percona ドキュメントは http://www.percona.com/docs/wiki/ にあります。" +msgstr "Drizzle ドキュメントは http://docs.drizzle.org/ にあります。" #: po/advisory_rules.php:63 #, php-format diff --git a/po/tr.po b/po/tr.po index b38800f..e33621b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-25 08:38+0200\n" -"PO-Revision-Date: 2011-08-22 22:59+0200\n" +"PO-Revision-Date: 2011-08-25 12:06+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -881,10 +881,10 @@ msgstr "Y" #: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295 #: js/messages.php:289 -#, fuzzy, php-format +#, php-format #| msgid "Point" msgid "Point %d" -msgstr "Nokta" +msgstr "Nokta %d" #: gis_data_editor.php:204 gis_data_editor.php:250 gis_data_editor.php:302 #: js/messages.php:295 @@ -5269,10 +5269,9 @@ msgid "Could not initialize Drizzle connection library" msgstr "" #: libraries/config/validate.lib.php:205 libraries/config/validate.lib.php:212 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "Could not connect to Drizzle server" -msgstr "MySQL sunucusuna bağlanamadı" +msgstr "Drizzle sunucusuna bağlanamadı" #: libraries/config/validate.lib.php:223 libraries/config/validate.lib.php:230 msgid "Could not connect to MySQL server" @@ -5377,10 +5376,9 @@ msgid "The server is not responding" msgstr "Sunucu yanıt vermiyor" #: libraries/dbi/drizzle.dbi.lib.php:344 -#, fuzzy #| msgid "(or the local MySQL server's socket is not correctly configured)" msgid "(or the local Drizzle server's socket is not correctly configured)" -msgstr "(ya da yerel MySQL sunucusunun soketi doğru olarak yapılandırılmadı)" +msgstr "(ya da yerel Drizeel sunucusunun soketi doğru olarak yapılandırılmadı)" #: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:384 msgid "(or the local MySQL server's socket is not correctly configured)" @@ -8266,10 +8264,9 @@ msgid "General Settings" msgstr "Genel Ayarlar" #: main.php:101 -#, fuzzy #| msgid "MySQL connection collation" msgid "Server connection collation" -msgstr "MySQL bağlantı karşılaştırması" +msgstr "Sunucu bağlantısı karşılaştırması" #: main.php:116 msgid "Appearance Settings" @@ -8280,20 +8277,18 @@ msgid "More settings" msgstr "Daha fazla ayarlar" #: main.php:156 -#, fuzzy #| msgid "Database for user" msgid "Database server" -msgstr "Kullanıcı için veritabanı" +msgstr "Veritabanı sunucusu" #: main.php:159 msgid "Software" msgstr "" #: main.php:160 -#, fuzzy #| msgid "Show versions" msgid "Software version" -msgstr "Sürümleri göster" +msgstr "Yazılım sürümü" #: main.php:161 msgid "Protocol version" @@ -8306,20 +8301,18 @@ msgid "User" msgstr "Kullanıcı" #: main.php:167 -#, fuzzy #| msgid "Server socket" msgid "Server charset" -msgstr "Sunucu soketi" +msgstr "Sunucu karakter grubu" #: main.php:179 msgid "Web server" msgstr "Web sunucusu" #: main.php:190 -#, fuzzy #| msgid "Use light version" msgid "Database client version" -msgstr "Sade sürümü kullan" +msgstr "Veritabanı istemcisi sürümü" #: main.php:192 msgid "PHP extension" @@ -8839,10 +8832,9 @@ msgid "License" msgstr "Lisans" #: server_plugins.php:182 -#, fuzzy #| msgid "Disabled" msgid "disabled" -msgstr "Etkisiz" +msgstr "etkisizleştirildi" #: server_privileges.php:32 server_privileges.php:364 msgid "Includes all privileges except GRANT." @@ -11977,17 +11969,16 @@ msgstr "MySQL kılavuzu sadece resmi MySQL binarileri için doğrudur." #: po/advisory_rules.php:57 msgid "Percona documentation is at http://www.percona.com/docs/wiki/" -msgstr "Percona belgeleri http://www.percona.com/docs/wiki/ adresinde" +msgstr "Percona belgesi http://www.percona.com/docs/wiki/ adresinde" #: po/advisory_rules.php:58 msgid "'percona' found in version_comment" msgstr "'percona', version_comment içinde bulundu" #: po/advisory_rules.php:62 -#, fuzzy #| msgid "Percona documentation is at http://www.percona.com/docs/wiki/" msgid "Drizzle documentation is at http://docs.drizzle.org/" -msgstr "Percona belgeleri http://www.percona.com/docs/wiki/ adresinde" +msgstr "Drizzle belgesi http://docs.drizzle.org/ adresinde" #: po/advisory_rules.php:63 #, php-format hooks/post-receive -- phpMyAdmin

1 0