- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10378-g1bf483e
by Michal Čihař 23 Sep '10

23 Sep '10

The branch, master has been updated via 1bf483ef8c7733c2c6f6936e93d242de27b59ab9 (commit) via f94b815bb0089be1e9850bb61cb6df49edc06bdd (commit) via eb4801acb00f9c3ee285273829a500488dbaad60 (commit) via 21d203c3ccdd4b04d83ced7c6d323fd2e8c60181 (commit) via ec5b926546bd8d493acbfb209db658294231367e (commit) via 0ed82520cf20d911d1b18d2725d9d56ababc7916 (commit) via 723e9f1d1ad6e1db84937d9439dac88c458eacb0 (commit) via 11cc29239270e1a64b39eed06039685b2cea7c19 (commit) via e96babbb7e58a54b9796c7749dd9e92ceaf7e950 (commit) via 409a632280de4b2c0ce3e98952c7523e5ee159f9 (commit) via c1ca80f753c71338319d92d204444a0dd33fc7b6 (commit) via be046369493c27c7942a0fdfa12265f372cba95c (commit) via e601f887bcec969030236de4c7c34d4a4df9cbff (commit) via b3142abf0455e3f687f30b74f3716ee1a5feaaa0 (commit) via 798f1451d3a91288fd5be5ab8ff6e3ab597e1d31 (commit) via 246cf3c7eb20d17e01fe22350a54f76890a1068a (commit) via bf4ddebb63d9a66ba456b0e82e9f448b51e27ec2 (commit) via edfc443eaa85327e95914c873b0af37b661c1ecd (commit) via d75ce63c20eef59cb1e8c4e05bd4fe71eec6a607 (commit) via 5c0c4984704e0c95a04e4fa10100d4d6d84684c1 (commit) via 26d34905fd809b89d5c5de04746fc7f1da813210 (commit) via 3efa7d9926fd82d371efb7906f629918cacd3ed5 (commit) via 17b0d7c8d6e0e88597922e170f8422ddaffecaee (commit) via 76d667a9baf9070cfda164be1849283dc09ede63 (commit) via 2237ebd347789355d0db5f67bb701e97a0d7b9d8 (commit) via b2ed4bbf591641394b168fc1d54c613556ac0f98 (commit) via f52249b21b7768d9489e867b294199a508536c6a (commit) via 71ae4823614b52155524ef9e0594e2d9b3b989a7 (commit) via e277b129f492c765befd57af4cf9006da584d76d (commit) via 2a8b009b52a123746edeaaf14b7dbe9cb7567da8 (commit) via a32ad730994857e3c5c60045c1f2e364b93a244e (commit) via cadd682815e28a02a39452d0025ab8aa1802c0de (commit) via 827048315399b2a547e90b147c621a6a556bfe74 (commit) from c689bc2061b4bb4c2a7e4d6cbda1c630fc9466dd (commit) - Log ----------------------------------------------------------------- commit 1bf483ef8c7733c2c6f6936e93d242de27b59ab9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 23 06:10:05 2010 +0200 Translation update done using Pootle. commit f94b815bb0089be1e9850bb61cb6df49edc06bdd Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 23 06:09:04 2010 +0200 Translation update done using Pootle. commit eb4801acb00f9c3ee285273829a500488dbaad60 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 23 06:06:22 2010 +0200 Translation update done using Pootle. commit 21d203c3ccdd4b04d83ced7c6d323fd2e8c60181 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 23 06:06:06 2010 +0200 Translation update done using Pootle. commit ec5b926546bd8d493acbfb209db658294231367e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 23 06:05:40 2010 +0200 Translation update done using Pootle. commit 0ed82520cf20d911d1b18d2725d9d56ababc7916 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 23 06:05:01 2010 +0200 Translation update done using Pootle. commit 723e9f1d1ad6e1db84937d9439dac88c458eacb0 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 23 06:04:37 2010 +0200 Translation update done using Pootle. commit 11cc29239270e1a64b39eed06039685b2cea7c19 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 23 06:04:03 2010 +0200 Translation update done using Pootle. commit e96babbb7e58a54b9796c7749dd9e92ceaf7e950 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 23 06:03:43 2010 +0200 Translation update done using Pootle. commit 409a632280de4b2c0ce3e98952c7523e5ee159f9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 23 06:02:43 2010 +0200 Translation update done using Pootle. commit c1ca80f753c71338319d92d204444a0dd33fc7b6 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 23 06:01:34 2010 +0200 Translation update done using Pootle. commit be046369493c27c7942a0fdfa12265f372cba95c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 23 06:00:22 2010 +0200 Translation update done using Pootle. commit e601f887bcec969030236de4c7c34d4a4df9cbff Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 23 05:59:35 2010 +0200 Translation update done using Pootle. commit b3142abf0455e3f687f30b74f3716ee1a5feaaa0 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 23 05:59:09 2010 +0200 Translation update done using Pootle. commit 798f1451d3a91288fd5be5ab8ff6e3ab597e1d31 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 23 05:58:24 2010 +0200 Translation update done using Pootle. commit 246cf3c7eb20d17e01fe22350a54f76890a1068a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Sep 23 05:57:49 2010 +0200 Translation update done using Pootle. commit bf4ddebb63d9a66ba456b0e82e9f448b51e27ec2 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 22:04:38 2010 +0200 Translation update done using Pootle. commit edfc443eaa85327e95914c873b0af37b661c1ecd Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 21:54:27 2010 +0200 Translation update done using Pootle. commit d75ce63c20eef59cb1e8c4e05bd4fe71eec6a607 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 21:53:47 2010 +0200 Translation update done using Pootle. commit 5c0c4984704e0c95a04e4fa10100d4d6d84684c1 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 21:53:07 2010 +0200 Translation update done using Pootle. commit 26d34905fd809b89d5c5de04746fc7f1da813210 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 21:49:37 2010 +0200 Translation update done using Pootle. commit 3efa7d9926fd82d371efb7906f629918cacd3ed5 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 21:49:07 2010 +0200 Translation update done using Pootle. commit 17b0d7c8d6e0e88597922e170f8422ddaffecaee Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 21:48:35 2010 +0200 Translation update done using Pootle. commit 76d667a9baf9070cfda164be1849283dc09ede63 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 21:47:29 2010 +0200 Translation update done using Pootle. commit 2237ebd347789355d0db5f67bb701e97a0d7b9d8 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 21:46:42 2010 +0200 Translation update done using Pootle. commit b2ed4bbf591641394b168fc1d54c613556ac0f98 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 21:46:23 2010 +0200 Translation update done using Pootle. commit f52249b21b7768d9489e867b294199a508536c6a Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 21:36:26 2010 +0200 Translation update done using Pootle. commit 71ae4823614b52155524ef9e0594e2d9b3b989a7 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 21:36:06 2010 +0200 Translation update done using Pootle. commit e277b129f492c765befd57af4cf9006da584d76d Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 21:35:41 2010 +0200 Translation update done using Pootle. commit 2a8b009b52a123746edeaaf14b7dbe9cb7567da8 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 21:35:17 2010 +0200 Translation update done using Pootle. commit a32ad730994857e3c5c60045c1f2e364b93a244e Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 21:31:53 2010 +0200 Translation update done using Pootle. commit cadd682815e28a02a39452d0025ab8aa1802c0de Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 21:31:38 2010 +0200 Translation update done using Pootle. commit 827048315399b2a547e90b147c621a6a556bfe74 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 22 21:31:21 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 102 ++++++++++++++++++++++------------------------------------- po/zh_CN.po | 80 +++++++++++++++++----------------------------- 2 files changed, 68 insertions(+), 114 deletions(-) diff --git a/po/fr.po b/po/fr.po index b35ae0c..42237c3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-09-21 08:04-0400\n" -"PO-Revision-Date: 2010-09-20 22:00+0200\n" +"PO-Revision-Date: 2010-09-22 22:04+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -7056,20 +7056,18 @@ msgstr "" "Les paramètres seront importés depuis le stockage local de votre navigateur." #: prefs_manage.php:254 -#, fuzzy #| msgid "Other core settings" msgid "You have no saved settings!" -msgstr "Autres réglages de base" +msgstr "Vous n'avez pas sauvegardé les paramètres!" #: prefs_manage.php:258 prefs_manage.php:312 msgid "This feature is not supported by your web browser" -msgstr "" +msgstr "Cette fonction n'est pas supportée par votre navigateur" #: prefs_manage.php:263 -#, fuzzy #| msgid "Server configuration" msgid "Merge with current configuration" -msgstr "Configuration du serveur" +msgstr "Fusionner avec la configuration courante" #: prefs_manage.php:277 #, php-format @@ -7077,22 +7075,26 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" +"Vous pouvez régler d'autres paramètres en modifiant config.inc.php, par " +"exemple au moyen du %sscript d'installation%s." #: prefs_manage.php:302 msgid "Save to browser's storage" -msgstr "" +msgstr "Sauvegarder dans l'espace de stockage du navigateur" #: prefs_manage.php:306 msgid "Settings will be saved in your browser's local storage." msgstr "" +"Les paramètres seront sauvegardés dans l'espace de stockage de votre " +"navigateur." #: prefs_manage.php:308 msgid "Existing settings will be overwritten!" -msgstr "" +msgstr "Les réglages existants seront écrasés!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." -msgstr "" +msgstr "Vous pouvez ramener tous vos paramètres à leur valeur par défaut." #: querywindow.php:93 msgid "Import files" @@ -7108,10 +7110,9 @@ msgid "%s table not found or not set in %s" msgstr "La table %s est absente ou non définie dans %s" #: schema_export.php:45 -#, fuzzy #| msgid "The %s table doesn't exist!" msgid "File doesn't exist" -msgstr "La table %s n'existe pas !" +msgstr "Le fichier n'existe pas" #: server_binlog.php:106 msgid "Select binary log to view" @@ -8818,7 +8819,6 @@ msgid "Cannot load or save configuration" msgstr "Impossible de charger ou sauvegarder la configuration" #: setup/frames/index.inc.php:50 -#, fuzzy #| msgid "" #| "Please create web server writable folder [em]config[/em] in phpMyAdmin " #| "top level directory as described in [a@../Documentation.html#setup_script]" @@ -8830,7 +8830,7 @@ msgid "" "documentation[/a]. Otherwise you will be only able to download or display it." msgstr "" "Veuillez créer le répertoire [em]config[/em] accessible en écriture tel que " -"décrit sur [a@../Documentation.html#setup_script]documentation[/a]. Sinon " +"décrit dans la [a(a)Documentation.html#setup_script]documentation[/a] Sinon " "vous ne pourrez que télécharger ou afficher la configuration." #: setup/frames/index.inc.php:57 @@ -9016,7 +9016,7 @@ msgstr "" "encrypter les cookies, vous n'avez pas à vous en souvenir." #: setup/lib/index.lib.php:253 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Import_export]Bzip2 compression " #| "and decompression[/a] requires functions (%s) which are unavailable on " @@ -9025,9 +9025,8 @@ msgid "" "%sBzip2 compression and decompression%s requires functions (%s) which are " "unavailable on this system." msgstr "" -"[a@?page=form&formset=features#tab_Import_export]La compression et " -"décompression Bzip2[/a] requièrent des fonctions (%s) non disponibles sur ce " -"serveur." +"La %scompression et décompression Bzip2%s requièrent des fonctions (%s) non " +"disponibles sur ce serveur." #: setup/lib/index.lib.php:255 msgid "" @@ -9038,13 +9037,13 @@ msgstr "" "utilisateurs." #: setup/lib/index.lib.php:256 -#, fuzzy, php-format +#, php-format #| msgid "You should use SSL connections if your web server supports it" msgid "This %soption%s should be enabled if your web server supports it." -msgstr "Vous devriez utiliser des connexions SSL si votre serveur le permet." +msgstr "Cette %soption%s devrait être activée si votre serveur web le permet." #: setup/lib/index.lib.php:258 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Import_export]GZip compression and " #| "decompression[/a] requires functions (%s) which are unavailable on this " @@ -9053,9 +9052,8 @@ msgid "" "%sGZip compression and decompression%s requires functions (%s) which are " "unavailable on this system." msgstr "" -"[a@?page=form&formset=features#tab_Import_export]La compression et " -"décompression GZip[/a] requièrent des fonctions (%s) non disponibles sur ce " -"serveur." +"La %scompression et décompression GZip%s requièrent des fonctions (%s) non " +"disponibles sur ce serveur." #: setup/lib/index.lib.php:260 #, php-format @@ -9064,9 +9062,13 @@ msgid "" "invalidation if %ssession.gc_maxlifetime%s is lower than its value " "(currently %d)." msgstr "" +"Le paramètre %sLogin cookie validity%s avec une valeur de plus de 1440 " +"secondes peut causer des interruptions de la session de travail si le " +"paramètre %ssession.gc_maxlifetime%s a une plus petite valeur (actuellement " +"%d)." #: setup/lib/index.lib.php:262 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] " #| "should be set to 1800 seconds (30 minutes) at most. Values larger than " @@ -9075,9 +9077,9 @@ msgid "" "%sLogin cookie validity%s should be set to 1800 seconds (30 minutes) at " "most. Values larger than 1800 may pose a security risk such as impersonation." msgstr "" -"[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] " -"devrait contenir une valeur d'au plus 1800 secondes (30 minutes). Une valeur " -"plus grande que 1800 pose un risque." +"Le paramètre %s]Login cookie validity%s devrait contenir une valeur d'au " +"plus 1800 secondes (30 minutes). Une valeur plus grande que 1800 pose un " +"risque." #: setup/lib/index.lib.php:264 #, php-format @@ -9085,9 +9087,11 @@ msgid "" "%sLogin cookie validity%s must be set to a value less or equal to %sLogin " "cookie store%s." msgstr "" +"Le paramètre %sLogin cookie validity%s doit avoir une valeur plus petite ou " +"égale au paramètre %sLogin cookie store%s." #: setup/lib/index.lib.php:266 -#, fuzzy, php-format +#, php-format #| msgid "" #| "If you feel this is necessary, use additional protection settings - [a@?" #| "page=servers&mode=edit&id=%1$d#tab_Server_config]host " @@ -9101,10 +9105,11 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" -"Si vous l'estimez nécessaire, utilisez des réglages de protection - [a@?" -"page=servers&mode=edit&id=%1$d#tab_Server_config]authentification du " -"serveur[/a] et [a@?page=form&formset=features#tab_Security]serveurs " -"mandataires de confiance[/a]." +"Si vous l'estimez nécessaire, utilisez des réglages de protection - %" +"sauthentification du serveur%s et %sserveurs mandataires de confiance%s. " +"Cependant, la protection par adresse IP peut ne pas être fiable si votre IP " +"appartient à un fournisseur via lequel des milliers d'utilisateurs, vous y " +"compris, sont connectés." #: setup/lib/index.lib.php:268 #, fuzzy, php-format @@ -9899,34 +9904,3 @@ msgstr "Nom de la vue" #: view_operations.php:91 msgid "Rename view to" msgstr "Changer le nom de la vue pour" - -#~| msgid "CSV" -#~ msgid "SVG" -#~ msgstr "SVG" - -#~ msgid "DIA" -#~ msgstr "DIA" - -#~ msgid "VISIO" -#~ msgstr "VISIO" - -#~ msgid "EPS" -#~ msgstr "EPS" - -#~ msgid "" -#~ "This [a@?page=form&formset=features#tab_Security]option[/a] should be " -#~ "enabled if your web server supports it" -#~ msgstr "" -#~ "Cette [a@?page=form&formset=features#tab_Security]option[/a] doit " -#~ "être activée si votre serveur la supporte." - -#~ msgid "" -#~ "Enter each value in a separate field, enclosed in single quotes. If you " -#~ "ever need to put a backslash (\"\\\") or a single quote (\"'\") amongst " -#~ "those values, precede it with a backslash (for example '\\\\xyz' or 'a" -#~ "\\'b')." -#~ msgstr "" -#~ "Veuillez entrer les valeurs dans des champs séparés et les entourer " -#~ "d'apostrophes. Si vous devez entrer un caractère (\"\\\") ou une " -#~ "apostrophe (\"'\") parmi ces valeurs, faites-le précéder du caractère " -#~ "d'échappement, par exemple '\\\\xyz' or 'a\\'b')." diff --git a/po/zh_CN.po b/po/zh_CN.po index bff89c0..cf08f86 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-09-21 08:04-0400\n" -"PO-Revision-Date: 2010-09-16 11:55+0200\n" +"PO-Revision-Date: 2010-09-23 06:10+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n" @@ -8535,7 +8535,7 @@ msgid "No newer stable version is available" msgstr "没有更新的可用版本" #: setup/lib/index.lib.php:250 -#, fuzzy, php-format +#, php-format #| msgid "" #| "This [a@?page=form&formset=features#tab_Security]option[/a] should be " #| "disabled as it allows attackers to bruteforce login to any MySQL server. " @@ -8549,10 +8549,8 @@ msgid "" "proxies list%s. However, IP-based protection may not be reliable if your IP " "belongs to an ISP where thousands of users, including you, are connected to." msgstr "" -"该[a@?page=form&formset=features#tab_Security]选项[/a]应该被关闭以防止尝" -"试暴力破解 MySQL 服务器。如果您认为有必要，可以使用[a@?page=form&" -"formset=features#tab_Security]可信代理表[/a]。但如果您和许多人使用同一个IP地" -"址，该措施的安全性将下降。" +"该%s选项%s应该被关闭以防止有人尝试暴力破解 MySQL 服务器。如果有必要，您可以使用%s可信代理表%s。但如果您和许多人共用一个 IP " +"地址，该措施的安全性将下降。" #: setup/lib/index.lib.php:252 msgid "" @@ -8564,7 +8562,7 @@ msgstr "" "码，该密语用于加密 Cookies。您不需要记住这个短语密码。" #: setup/lib/index.lib.php:253 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Import_export]Bzip2 compression " #| "and decompression[/a] requires functions (%s) which are unavailable on " @@ -8572,9 +8570,7 @@ msgstr "" msgid "" "%sBzip2 compression and decompression%s requires functions (%s) which are " "unavailable on this system." -msgstr "" -"此系统目前不支持 [a@?page=form&formset=features#tab_Import_export]Bzip2 " -"压缩和解压缩[/a]所必须的 (%s) 函数。" +msgstr "此系统目前不支持 %sBzip2 压缩和解压缩%s所必须的 (%s) 函数。" #: setup/lib/index.lib.php:255 msgid "" @@ -8585,13 +8581,13 @@ msgstr "" "入的权限。" #: setup/lib/index.lib.php:256 -#, fuzzy, php-format +#, php-format #| msgid "You should use SSL connections if your web server supports it" msgid "This %soption%s should be enabled if your web server supports it." -msgstr "如果浏览器支持，建议使用 SSL 连接。" +msgstr "如果浏览器支持，建议启用该%s选项%s。" #: setup/lib/index.lib.php:258 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Import_export]GZip compression and " #| "decompression[/a] requires functions (%s) which are unavailable on this " @@ -8599,9 +8595,7 @@ msgstr "如果浏览器支持，建议使用 SSL 连接。" msgid "" "%sGZip compression and decompression%s requires functions (%s) which are " "unavailable on this system." -msgstr "" -"此系统目前不支持 [a@?page=form&formset=features#tab_Import_export]GZip 压" -"缩和解压缩[/a]所必须的 (%s) 函数。" +msgstr "此系统目前不支持 %sGZip 压缩和解压缩%s所必须的 (%s) 函数。" #: setup/lib/index.lib.php:260 #, php-format @@ -8610,9 +8604,11 @@ msgid "" "invalidation if %ssession.gc_maxlifetime%s is lower than its value " "(currently %d)." msgstr "" +"如果%s登录 cookie 有效期%s超过 1440 秒且超过 %ssession.gc_maxlifetime%s 的值 (当前 %d) " +"则可能导致会话随机失效。" #: setup/lib/index.lib.php:262 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] " #| "should be set to 1800 seconds (30 minutes) at most. Values larger than " @@ -8620,19 +8616,17 @@ msgstr "" msgid "" "%sLogin cookie validity%s should be set to 1800 seconds (30 minutes) at " "most. Values larger than 1800 may pose a security risk such as impersonation." -msgstr "" -"[a@?page=form&formset=features#tab_Security]登录 cookie 有效期[/a]应小于 " -"1800 秒 (30 分钟)。如果有效期大于 1800 秒，将会增加安全风险。" +msgstr "%s登录 cookie 有效期%s不应超过 1800 秒 (30 分钟)。如果有效期大于 1800 秒，将会增加安全风险。" #: setup/lib/index.lib.php:264 #, php-format msgid "" "%sLogin cookie validity%s must be set to a value less or equal to %sLogin " "cookie store%s." -msgstr "" +msgstr "%s登录 cookie 有效期%s不能超过%s登录 cookie 保存时间%s。" #: setup/lib/index.lib.php:266 -#, fuzzy, php-format +#, php-format #| msgid "" #| "If you feel this is necessary, use additional protection settings - [a@?" #| "page=servers&mode=edit&id=%1$d#tab_Server_config]host " @@ -8645,14 +8639,10 @@ msgid "" "authentication%s settings and %strusted proxies list%s. However, IP-based " "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." -msgstr "" -"如果您认为有必要，可以使用额外的保护设置 - [a@?page=servers&" -"mode=edit&id=%1$d#tab_Server_config]主机认证[/a]和 [a@?page=form&" -"formset=features#tab_Security]可信代理表[/a]。但如果您和许多人使用同一个IP地" -"址，该措施的安全性将下降。" +msgstr "如果有必要，您可以使用额外的保护设置 - %s主机认证%s和%s可信代理表%s。但如果您和许多人共用一个 IP 地址，该措施的安全性将下降。" #: setup/lib/index.lib.php:268 -#, fuzzy, php-format +#, php-format #| msgid "" #| "You set the [kbd]config[/kbd] authentication type and included username " #| "and password for auto-login, which is not a desirable option for live " @@ -8667,63 +8657,53 @@ msgid "" "phpMyAdmin panel. Set %sauthentication type%s to [kbd]cookie[/kbd] or [kbd]" "http[/kbd]." msgstr "" -"您设置了 [kbd]config[/kbd] 认证方式，且为了能够自动登录而保存了用户名和密码，" -"但在常用主机上不建议这样设置。如果有人知道 phpMyAdmin 的地址，他们就能够进入 " -"phpMyAdmin 的管理界面。建议将[a@?page=servers&mode=edit&id=%1" -"$d#tab_Server]登录认证方式[/a]设置为 [kbd]cookie 认证[/kbd]或 [kbd]HTTP 认证" -"[/kbd]。" +"您设置了 [kbd]config[/kbd] 认证方式，且为了能够自动登录而保存了用户名和密码，但在常用主机上不建议这样设置。如果有人知道 " +"phpMyAdmin 的地址，他们就能够进入 phpMyAdmin 的管理界面。建议将%s认证方式%s设置为 [kbd]cookie 认证[/kbd]或 " +"[kbd]HTTP 认证[/kbd]。" #: setup/lib/index.lib.php:270 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Import_export]Zip compression[/a] " #| "requires functions (%s) which are unavailable on this system." msgid "" "%sZip compression%s requires functions (%s) which are unavailable on this " "system." -msgstr "" -"此系统目前不支持 [a@?page=form&formset=features#tab_Import_export]Zip 压" -"缩 (外链，英文)[/a]所必须的 (%s) 函数。" +msgstr "此系统目前不支持 %sZip 压缩%s所必须的 (%s) 函数。" #: setup/lib/index.lib.php:272 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Import_export]Zip decompression[/" #| "a] requires functions (%s) which are unavailable on this system." msgid "" "%sZip decompression%s requires functions (%s) which are unavailable on this " "system." -msgstr "" -"此系统目前不支持 [a@?page=form&formset=features#tab_Import_export]Zip 解" -"压缩 (外链，英文)[/a]所必须的 (%s) 函数。" +msgstr "此系统目前不支持 %sZip 解压缩%s所必须的 (%s) 函数。" #: setup/lib/index.lib.php:296 -#, fuzzy #| msgid "You should use SSL connections if your web server supports it" msgid "You should use SSL connections if your web server supports it." -msgstr "如果浏览器支持，建议使用 SSL 连接。" +msgstr "如果服务器支持，你应该使用 SSL 连接。" #: setup/lib/index.lib.php:306 -#, fuzzy #| msgid "You should use mysqli for performance reasons" msgid "You should use mysqli for performance reasons." -msgstr "您可以使用 mysqli 以获得更高的性能" +msgstr "您可以使用 mysqli 以获得更高的性能。" #: setup/lib/index.lib.php:331 msgid "You allow for connecting to the server without a password." msgstr "该服务器现在允许空密码登录。" #: setup/lib/index.lib.php:351 -#, fuzzy #| msgid "Key is too short, it should have at least 8 characters" msgid "Key is too short, it should have at least 8 characters." -msgstr "短语密码太短，至少应含有8个字符" +msgstr "短语密码太短，至少应有 8 个字符。" #: setup/lib/index.lib.php:358 -#, fuzzy #| msgid "Key should contain letters, numbers [em]and[/em] special characters" msgid "Key should contain letters, numbers [em]and[/em] special characters." -msgstr "短语密码应包含字母、数字[em]和[/em]特殊字符" +msgstr "短语密码应包含字母、数字[em]和[/em]特殊字符。" #: sql.php:569 tbl_replace.php:380 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10345-gc689bc2
by Michal Čihař 22 Sep '10

22 Sep '10

The branch, master has been updated via c689bc2061b4bb4c2a7e4d6cbda1c630fc9466dd (commit) via 89329a8db0fd0916cf64a0a1da31bdbc1caafe6f (commit) from c03aab6dca3a1beed6b7ee1413465360d4aba195 (commit) - Log ----------------------------------------------------------------- commit c689bc2061b4bb4c2a7e4d6cbda1c630fc9466dd Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Sep 22 12:02:01 2010 +0200 Whitespace cleanup. commit 89329a8db0fd0916cf64a0a1da31bdbc1caafe6f Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Sep 22 12:01:49 2010 +0200 Go directly to table create page. ----------------------------------------------------------------------- Summary of changes: pmd/scripts/move.js | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js index f07d806..a2f1dcd 100644 --- a/pmd/scripts/move.js +++ b/pmd/scripts/move.js @@ -566,7 +566,7 @@ function New_relation() function Start_table_new() { - window.location.href = 'db_operations.php?server=' + server + '&db=' + db + '&token=' + token; + window.location.href = 'tbl_create.php?server=' + server + '&db=' + db + '&token=' + token; } function Start_tab_upd(table) @@ -921,19 +921,19 @@ function Start_display_field() } //------------------------------------------------------------------------------ var TargetColors = new Array(); -function getColorByTarget( target ) -{ +function getColorByTarget( target ) +{ var color = ''; //"rgba(0,100,150,1)"; for (i in TargetColors) if (TargetColors[i][0]==target) { color = TargetColors[i][1]; - break; - } + break; + } if (color.length==0) - { + { var i = TargetColors.length+1; var d = i % 6; var j = (i - d) / 6; @@ -951,7 +951,7 @@ function getColorByTarget( target ) var b = color_case[d][1]; var c = color_case[d][2]; e = (1 - (j - 1) / 6); - + var r = Math.round(a * 200 * e); var g = Math.round(b * 200 * e); var b = Math.round(c * 200 * e); @@ -959,8 +959,8 @@ function getColorByTarget( target ) TargetColors.push( new Array(target, color) ); - + } - return color; + return color; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10343-gc03aab6
by Michal Čihař 22 Sep '10

22 Sep '10

The branch, master has been updated via c03aab6dca3a1beed6b7ee1413465360d4aba195 (commit) via 530691edd0f0fec406a0106194dc56b1af9403e3 (commit) via cc7575a5f071ebc85c3dd112db3e986f1d249b6c (commit) via 0c40ab7c2d693c1c2de64b8ca6b24d682ec5584d (commit) via 5fef25fbd4e664aceba1651795a5a0cf97db2fdb (commit) via 8163be0908ff26275c8ff61089b796cde6691f30 (commit) via a664e48149ff3f1a432cd1a3c329babd485c6ea8 (commit) via f5d1a3288d120dfd61dad4f5c8403a6812d754a0 (commit) via 00029d606178a884f576f5bd5aa28b5f2b73a449 (commit) via 0f1275e8bdfb966f05d92461feda33cd2f65eec6 (commit) via c16510e1eafb8a1326638f76d972aaee49fbf25d (commit) via 59e1b0ca4d1fe62849ad559ec430cf910ba7e057 (commit) via 7058f9c811a7bba2ce5877b6328bce61727651cb (commit) via 887fd3db29c0ac95ade941ea48df0f95e2673120 (commit) via ad0f0c6954170810b0b9bafd3e2a4a106bbccc11 (commit) via 72d0f0379f156f4dbcf3b945a17fb9e6539f9710 (commit) from 2fef94a4e50d5f7d3e0e7cc608f65bbf72d8689d (commit) - Log ----------------------------------------------------------------- commit c03aab6dca3a1beed6b7ee1413465360d4aba195 Author: Domen <dbc334(a)gmail.com> Date: Tue Sep 21 20:14:39 2010 +0200 Translation update done using Pootle. commit 530691edd0f0fec406a0106194dc56b1af9403e3 Author: Domen <dbc334(a)gmail.com> Date: Tue Sep 21 20:14:02 2010 +0200 Translation update done using Pootle. commit cc7575a5f071ebc85c3dd112db3e986f1d249b6c Author: Domen <dbc334(a)gmail.com> Date: Tue Sep 21 20:12:30 2010 +0200 Translation update done using Pootle. commit 0c40ab7c2d693c1c2de64b8ca6b24d682ec5584d Author: Domen <dbc334(a)gmail.com> Date: Tue Sep 21 20:12:24 2010 +0200 Translation update done using Pootle. commit 5fef25fbd4e664aceba1651795a5a0cf97db2fdb Author: Domen <dbc334(a)gmail.com> Date: Tue Sep 21 20:12:17 2010 +0200 Translation update done using Pootle. commit 8163be0908ff26275c8ff61089b796cde6691f30 Author: Domen <dbc334(a)gmail.com> Date: Tue Sep 21 20:12:06 2010 +0200 Translation update done using Pootle. commit a664e48149ff3f1a432cd1a3c329babd485c6ea8 Author: Domen <dbc334(a)gmail.com> Date: Tue Sep 21 20:11:51 2010 +0200 Translation update done using Pootle. commit f5d1a3288d120dfd61dad4f5c8403a6812d754a0 Author: Domen <dbc334(a)gmail.com> Date: Tue Sep 21 20:11:43 2010 +0200 Translation update done using Pootle. commit 00029d606178a884f576f5bd5aa28b5f2b73a449 Author: Domen <dbc334(a)gmail.com> Date: Tue Sep 21 20:11:09 2010 +0200 Translation update done using Pootle. commit 0f1275e8bdfb966f05d92461feda33cd2f65eec6 Author: Domen <dbc334(a)gmail.com> Date: Tue Sep 21 20:10:38 2010 +0200 Translation update done using Pootle. commit c16510e1eafb8a1326638f76d972aaee49fbf25d Author: Domen <dbc334(a)gmail.com> Date: Tue Sep 21 20:10:14 2010 +0200 Translation update done using Pootle. commit 59e1b0ca4d1fe62849ad559ec430cf910ba7e057 Author: Domen <dbc334(a)gmail.com> Date: Tue Sep 21 20:09:40 2010 +0200 Translation update done using Pootle. commit 7058f9c811a7bba2ce5877b6328bce61727651cb Author: Domen <dbc334(a)gmail.com> Date: Tue Sep 21 20:09:27 2010 +0200 Translation update done using Pootle. commit 887fd3db29c0ac95ade941ea48df0f95e2673120 Author: Domen <dbc334(a)gmail.com> Date: Tue Sep 21 20:09:06 2010 +0200 Translation update done using Pootle. commit ad0f0c6954170810b0b9bafd3e2a4a106bbccc11 Author: Domen <dbc334(a)gmail.com> Date: Tue Sep 21 20:08:47 2010 +0200 Translation update done using Pootle. commit 72d0f0379f156f4dbcf3b945a17fb9e6539f9710 Author: Domen <dbc334(a)gmail.com> Date: Tue Sep 21 20:07:58 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sl.po | 94 ++++++++++++++++++++++++++++--------------------------------- 1 files changed, 43 insertions(+), 51 deletions(-) diff --git a/po/sl.po b/po/sl.po index 025d72d..b02c147 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-09-21 08:04-0400\n" -"PO-Revision-Date: 2010-09-11 15:50+0200\n" +"PO-Revision-Date: 2010-09-21 20:14+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -5392,7 +5392,6 @@ msgid "<code>CREATE TABLE</code> options:" msgstr "Možnosti <code>CREATE TABLE</code>:" #: libraries/export/sql.php:123 -#, fuzzy #| msgid "" #| "Enclose table and field names with backquotes (Protects field and " #| "table names formed with special characters)" @@ -5401,7 +5400,7 @@ msgid "" "names formed with special characters or keywords)" msgstr "" "Obdaj imena tabel in polj z narekovaji (Zaščiti imena polj in tabel, " -"tvorjena s posebnimi znaki)" +"tvorjena s posebnimi znaki ali ključnimi besedami)" #: libraries/export/sql.php:136 msgid "Instead of <code>INSERT</code> statements, use:" @@ -8910,7 +8909,7 @@ msgid "No newer stable version is available" msgstr "Na voljo ni novejše stabilne različice" #: setup/lib/index.lib.php:250 -#, fuzzy, php-format +#, php-format #| msgid "" #| "This [a@?page=form&formset=features#tab_Security]option[/a] should be " #| "disabled as it allows attackers to bruteforce login to any MySQL server. " @@ -8924,12 +8923,11 @@ msgid "" "proxies list%s. However, IP-based protection may not be reliable if your IP " "belongs to an ISP where thousands of users, including you, are connected to." msgstr "" -"Ta [a@?page=form&formset=features#tab_Security]možnost[/a] naj bo " -"onemogočena, saj omogoča napadalcem, da se z načinom bruteforce prijavijo v " -"kateri koli strežnik MySQL. Če menite, da je to potrebno, uporabite [a@?" -"page=form&formset=features#tab_Security]seznam zaupanih proxyjev[/a]. " -"Kakor koli, zaščita temelječa na IP ni zanesljiva, če vaš IP pripada ISP-ju, " -"na katerega je povezanih tisoče uporabnikov, vključno z vami." +"Ta %smožnost%s naj bo onemogočena, saj omogoča napadalcem, da se z načinom " +"bruteforce prijavijo v kateri koli strežnik MySQL. Če menite, da je to " +"potrebno, uporabite %sseznam zaupanih proxyjev%s. Kakor koli, zaščita " +"temelječa na IP ni zanesljiva, če vaš IP pripada ISP-ju, na katerega je " +"povezanih tisoče uporabnikov, vključno z vami." #: setup/lib/index.lib.php:252 msgid "" @@ -8942,7 +8940,7 @@ msgstr "" "šifriranju piškotkov; ne rabite si ga zapomniti." #: setup/lib/index.lib.php:253 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Import_export]Bzip2 compression " #| "and decompression[/a] requires functions (%s) which are unavailable on " @@ -8951,9 +8949,8 @@ msgid "" "%sBzip2 compression and decompression%s requires functions (%s) which are " "unavailable on this system." msgstr "" -"[a@?page=form&formset=features#tab_Import_export]Stiskanje in " -"razpenjanje Bzip2[/a] potrebuje funkcije (%s), ki na tem sistemu niso na " -"voljo." +"%sStiskanje in razširjanje Bzip2%s potrebuje funkcije (%s), ki na tem " +"sistemu niso na voljo." #: setup/lib/index.lib.php:255 msgid "" @@ -8965,13 +8962,13 @@ msgstr "" "vašem strežniku." #: setup/lib/index.lib.php:256 -#, fuzzy, php-format +#, php-format #| msgid "You should use SSL connections if your web server supports it" msgid "This %soption%s should be enabled if your web server supports it." -msgstr "Uporabite povezave SSL, če jih vaš spletni strežnik podpira" +msgstr "Ta %smožnost%s naj bo omogočena, če jo vaš spletni strežnik podpira." #: setup/lib/index.lib.php:258 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Import_export]GZip compression and " #| "decompression[/a] requires functions (%s) which are unavailable on this " @@ -8980,8 +8977,8 @@ msgid "" "%sGZip compression and decompression%s requires functions (%s) which are " "unavailable on this system." msgstr "" -"[a@?page=form&formset=features#tab_Import_export]Stiskanje in " -"razpenjanje GZip[/a] zahteva funkcije (%s), ki na tem sistemu niso na voljo." +"%sStiskanje in razširjanje GZip%s zahteva funkcije (%s), ki na tem sistemu " +"niso na voljo." #: setup/lib/index.lib.php:260 #, php-format @@ -8990,9 +8987,12 @@ msgid "" "invalidation if %ssession.gc_maxlifetime%s is lower than its value " "(currently %d)." msgstr "" +"%sVeljavnost prijavnega piškotka%s večja od 1440 sekund lahko povzroči " +"naključno razvrednotenje seje, če je %ssession.gc_maxlifetime%s nižji od " +"njegove vrednosti (trenutno %d)." #: setup/lib/index.lib.php:262 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] " #| "should be set to 1800 seconds (30 minutes) at most. Values larger than " @@ -9001,10 +9001,9 @@ msgid "" "%sLogin cookie validity%s should be set to 1800 seconds (30 minutes) at " "most. Values larger than 1800 may pose a security risk such as impersonation." msgstr "" -"[a@?page=form&formset=features#tab_Security]Veljavnost prijavnega piškotka[/" -"a] naj bo nastavljena na največ 1800 sekund (30 minut). Vrednosti večje od " -"1800 lahko predstavljajo varnostno tveganje, kot je pretvarjanje za drugo " -"osebo." +"%sVeljavnost prijavnega piškotka%s naj bo nastavljena na največ 1800 sekund " +"(30 minut). Vrednosti večje od 1800 lahko predstavljajo varnostno tveganje, " +"kot je pretvarjanje za drugo osebo." #: setup/lib/index.lib.php:264 #, php-format @@ -9012,9 +9011,11 @@ msgid "" "%sLogin cookie validity%s must be set to a value less or equal to %sLogin " "cookie store%s." msgstr "" +"%sVeljavnost prijavnega piškotka%s mora biti določena na vrednost manjšo ali " +"enako %sShrambi prijavnih piškotkov%s." #: setup/lib/index.lib.php:266 -#, fuzzy, php-format +#, php-format #| msgid "" #| "If you feel this is necessary, use additional protection settings - [a@?" #| "page=servers&mode=edit&id=%1$d#tab_Server_config]host " @@ -9029,14 +9030,12 @@ msgid "" "of users, including you, are connected to." msgstr "" "Če menite, da je to potrebno, uporabite dodatne nastavitve zaščite – " -"nastavitve [a@?page=servers&mode=edit&id=%1$d#tab_Server_config]" -"overovitve gostitelja[/a] in [a@?page=form&formset=features#tab_Security]" -"seznam zaupanih proxyjev[/a]. Kakor koli, zaščita temelječa na IP ni " -"zanesljiva, če vaš IP pripada ISP-ju, na katerega je povezanih tisoče " -"uporabnikov, vključno z vami." +"nastavitve %soverovitve gostitelja%s in %sseznam zaupanih proxyjev%s. Kakor " +"koli, zaščita temelječa na IP ni zanesljiva, če vaš IP pripada ISP-ju, na " +"katerega je povezanih tisoče uporabnikov, vključno z vami." #: setup/lib/index.lib.php:268 -#, fuzzy, php-format +#, php-format #| msgid "" #| "You set the [kbd]config[/kbd] authentication type and included username " #| "and password for auto-login, which is not a desirable option for live " @@ -9054,12 +9053,11 @@ msgstr "" "Nastavili ste vrsto overovitve [kbd]config[/kbd] in vključili uporabniško " "ime in geslo za samodejno prijavo, kar ni zaželena možnost za gostitelje " "aktivnih strani. Vsakdo, ki ve ali ugane vaš URL phpMyAdmina, lahko " -"neposredno dostopa do vaše plošče phpMyAdmin. Nastavite [a@?page=servers&" -"mode=edit&id=%1$d#tab_Server]vrsto overovitve[/a] na [kbd]cookie[/kbd] " -"ali [kbd]http[/kbd]." +"neposredno dostopa do vaše plošče phpMyAdmin. Nastavite %svrsto overovitve%s " +"na [kbd]cookie[/kbd] ali [kbd]http[/kbd]." #: setup/lib/index.lib.php:270 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Import_export]Zip compression[/a] " #| "requires functions (%s) which are unavailable on this system." @@ -9067,11 +9065,10 @@ msgid "" "%sZip compression%s requires functions (%s) which are unavailable on this " "system." msgstr "" -"[a@?page=form&formset=features#tab_Import_export]Stiskanje Zip[/a] " -"zahteva funkcije (%s), ki na tem sistemu niso na voljo." +"%sStiskanje Zip%s zahteva funkcije (%s), ki na tem sistemu niso na voljo." #: setup/lib/index.lib.php:272 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Import_export]Zip decompression[/" #| "a] requires functions (%s) which are unavailable on this system." @@ -9079,36 +9076,31 @@ msgid "" "%sZip decompression%s requires functions (%s) which are unavailable on this " "system." msgstr "" -"[a@?page=form&formset=features#tab_Import_export]Razpenjanje Zip[/a] " -"zahteva funkcije (%s), ki na tem sistemu niso na voljo." +"%sRazširjanje Zip%s zahteva funkcije (%s), ki na tem sistemu niso na voljo." #: setup/lib/index.lib.php:296 -#, fuzzy #| msgid "You should use SSL connections if your web server supports it" msgid "You should use SSL connections if your web server supports it." -msgstr "Uporabite povezave SSL, če jih vaš spletni strežnik podpira" +msgstr "Uporabite povezave SSL, če jih vaš spletni strežnik podpira." #: setup/lib/index.lib.php:306 -#, fuzzy #| msgid "You should use mysqli for performance reasons" msgid "You should use mysqli for performance reasons." -msgstr "Zaradi zmogljivostnih razlogov uporabljajte mysqli" +msgstr "Zaradi zmogljivostnih razlogov uporabljajte mysqli." #: setup/lib/index.lib.php:331 msgid "You allow for connecting to the server without a password." msgstr "Dovoljujete povezavo s strežnikom brez gesla." #: setup/lib/index.lib.php:351 -#, fuzzy #| msgid "Key is too short, it should have at least 8 characters" msgid "Key is too short, it should have at least 8 characters." -msgstr "Ključ je prekratek, ima naj vsaj 8 znakov" +msgstr "Ključ je prekratek, ima naj vsaj 8 znakov." #: setup/lib/index.lib.php:358 -#, fuzzy #| msgid "Key should contain letters, numbers [em]and[/em] special characters" msgid "Key should contain letters, numbers [em]and[/em] special characters." -msgstr "Ključ naj vsebuje črke, številke [em]in[/em] posebne znake" +msgstr "Ključ naj vsebuje črke, številke [em]in[/em] posebne znake." #: sql.php:569 tbl_replace.php:380 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10327-g2fef94a
by Michal Čihař 21 Sep '10

21 Sep '10

The branch, master has been updated via 2fef94a4e50d5f7d3e0e7cc608f65bbf72d8689d (commit) from 426eb193eb1270a78ec8efe93a5bb670276cda37 (commit) - Log ----------------------------------------------------------------- commit 2fef94a4e50d5f7d3e0e7cc608f65bbf72d8689d Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Sep 21 14:47:38 2010 +0200 Czech translation update. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 126 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 62 insertions(+), 64 deletions(-) diff --git a/po/cs.po b/po/cs.po index 37a13d2..2c2ad03 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-09-21 08:04-0400\n" -"PO-Revision-Date: 2010-09-15 15:12+0200\n" +"PO-Revision-Date: 2010-09-21 14:47+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "MIME-Version: 1.0\n" @@ -646,8 +646,8 @@ msgstr "Sledování není zapnuté." #: db_structure.php:404 libraries/display_tbl.lib.php:1945 #, php-format msgid "" -"This view has at least this number of rows. Please refer to %sdocumentation%" -"s." +"This view has at least this number of rows. Please refer to %sdocumentation" +"%s." msgstr "" "Tento pohled má alespoň tolik řádek. Podrobnosti naleznete v %sdokumentaci%s." @@ -854,8 +854,8 @@ msgstr "Výpis byl uložen do souboru %s." #: import.php:58 #, php-format msgid "" -"You probably tried to upload too large file. Please refer to %sdocumentation%" -"s for ways to workaround this limit." +"You probably tried to upload too large file. Please refer to %sdocumentation" +"%s for ways to workaround this limit." msgstr "" "Pravděpodobně jste se pokusili nahrát příliš velký soubor. Přečtěte si " "prosím %sdokumentaci%s, jak toto omezení obejít." @@ -1637,8 +1637,8 @@ msgstr "Vítejte v %s" #: libraries/auth/config.auth.lib.php:106 #, php-format msgid "" -"You probably did not create a configuration file. You might want to use the %" -"1$ssetup script%2$s to create one." +"You probably did not create a configuration file. You might want to use the " +"%1$ssetup script%2$s to create one." msgstr "" "Pravděpodobná příčina je, že nemáte vytvořený konfigurační soubor. Pro jeho " "vytvoření by se vám mohl hodit %1$snastavovací skript%2$s." @@ -4503,8 +4503,8 @@ msgstr ", @TABLE@ bude nahrazen jménem tabulky" #, php-format msgid "" "This value is interpreted using %1$sstrftime%2$s, so you can use time " -"formatting strings. Additionally the following transformations will happen: %" -"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." +"formatting strings. Additionally the following transformations will happen: " +"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." msgstr "" "Tato hodnota je interpretována pomocí %1$sstrftime%2$s, takže můžete použít " "libovolné řetězce pro formátování data a času. Dále budou provedena " @@ -6428,8 +6428,8 @@ msgid "" "For a list of available transformation options and their MIME type " "transformations, click on %stransformation descriptions%s" msgstr "" -"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na %" -"spopisy transformací%s" +"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na " +"%spopisy transformací%s" #: libraries/tbl_properties.inc.php:143 msgid "Transformation options" @@ -6470,8 +6470,8 @@ msgid "" "No description is available for this transformation. Please ask the " "author what %s does." msgstr "" -"Pro tuto transformaci není dostupný žádný popis. Zeptejte se autora co %" -"s dělá." +"Pro tuto transformaci není dostupný žádný popis. Zeptejte se autora co " +"%s dělá." #: libraries/tbl_properties.inc.php:729 server_engines.php:56 #: tbl_operations.php:352 @@ -6996,8 +6996,8 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" -"Více věcí můžete nastavit úpravou config.inc.php, např. použitím %" -"sNastavovacího skriptu%s." +"Více věcí můžete nastavit úpravou config.inc.php, např. použitím " +"%sNastavovacího skriptu%s." #: prefs_manage.php:302 msgid "Save to browser's storage" @@ -7466,8 +7466,8 @@ msgstr "Odstranit databáze se stejnými jmény jako uživatelé." msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " "tables. The content of these tables may differ from the privileges the " -"server uses, if they have been changed manually. In this case, you should %" -"sreload the privileges%s before you continue." +"server uses, if they have been changed manually. In this case, you should " +"%sreload the privileges%s before you continue." msgstr "" "Poznámka: phpMyAdmin získává oprávnění přímo z tabulek MySQL. Obsah těchto " "tabulek se může lišit od oprávnění, která server právě používá, pokud byly " @@ -8849,7 +8849,7 @@ msgid "No newer stable version is available" msgstr "Není dostupná žádná novější verze" #: setup/lib/index.lib.php:250 -#, fuzzy, php-format +#, php-format #| msgid "" #| "This [a@?page=form&formset=features#tab_Security]option[/a] should be " #| "disabled as it allows attackers to bruteforce login to any MySQL server. " @@ -8863,13 +8863,12 @@ msgid "" "proxies list%s. However, IP-based protection may not be reliable if your IP " "belongs to an ISP where thousands of users, including you, are connected to." msgstr "" -"Tato [a@?page=form&formset=features#tab_Security]volba[/a] by měla být " -"zakázána, protože umožňuje útočníkům prolomit přihlašování k libovolnému " -"MySQL serveru útokem hrobou silou. V případě nutnosti použijte [a@?" -"page=form&formset=features#tab_Security]seznam důvěryhodných proxy[/a]. " -"Nicméně ochrana založená na kotrole IP adres, nemusí být spolehlivá, pokud " -"Vaše IP adresa patří poskytovateli internetových služeb, ke kterému jsou " -"připojeny tisíce uživatelů." +"Tato %svolba%s by měla být zakázána, protože umožňuje útočníkům prolomit " +"přihlašování k libovolnému MySQL serveru útokem hrobou silou. V případě " +"nutnosti použijte %sseznam důvěryhodných proxy%s. Nicméně ochrana založená " +"na kotrole IP adres, nemusí být spolehlivá, pokud Vaše IP adresa patří " +"poskytovateli internetových služeb, ke kterému jsou připojeny tisíce " +"uživatelů." #: setup/lib/index.lib.php:252 msgid "" @@ -8882,7 +8881,7 @@ msgstr "" "Klíč bude použit pro zašifrování cookies." #: setup/lib/index.lib.php:253 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Import_export]Bzip2 compression " #| "and decompression[/a] requires functions (%s) which are unavailable on " @@ -8891,8 +8890,8 @@ msgid "" "%sBzip2 compression and decompression%s requires functions (%s) which are " "unavailable on this system." msgstr "" -"[a@?page=form&formset=features#tab_Import_export]Komprese a dekomprese " -"bzip2[/a] vyžaduje funkce (%s) které nejsou dostupné na tomto systému." +"%sKomprese a dekomprese bzip2%s vyžaduje funkce (%s) které nejsou dostupné " +"na tomto systému." #: setup/lib/index.lib.php:255 msgid "" @@ -8904,13 +8903,13 @@ msgstr "" "ostatní uživatele na Vašem serveru." #: setup/lib/index.lib.php:256 -#, fuzzy, php-format +#, php-format #| msgid "You should use SSL connections if your web server supports it" msgid "This %soption%s should be enabled if your web server supports it." -msgstr "Měli byste použít SSL připojení pokud to váš webserver podporuje" +msgstr "Měli byste použít %sSSL připojení%s pokud to váš webserver podporuje" #: setup/lib/index.lib.php:258 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Import_export]GZip compression and " #| "decompression[/a] requires functions (%s) which are unavailable on this " @@ -8919,8 +8918,8 @@ msgid "" "%sGZip compression and decompression%s requires functions (%s) which are " "unavailable on this system." msgstr "" -"[a@?page=form&formset=features#tab_Import_export]GZip komprese a " -"dekomprese[/a] vyžaduje funkce (%s) které nejsou dostupné na tomto systému." +"%sGZip komprese a dekomprese%s vyžaduje funkce (%s) které nejsou dostupné na " +"tomto systému." #: setup/lib/index.lib.php:260 #, php-format @@ -8929,9 +8928,12 @@ msgid "" "invalidation if %ssession.gc_maxlifetime%s is lower than its value " "(currently %d)." msgstr "" +"%sPlatnost přihlašovací cookie%s větší než 1440 sekund může způsobit náhodné " +"ukončení sezení pokud je %ssession.gc_maxlifetime%s nižší než tato hodnota " +"(v současné době %d)." #: setup/lib/index.lib.php:262 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] " #| "should be set to 1800 seconds (30 minutes) at most. Values larger than " @@ -8940,9 +8942,9 @@ msgid "" "%sLogin cookie validity%s should be set to 1800 seconds (30 minutes) at " "most. Values larger than 1800 may pose a security risk such as impersonation." msgstr "" -"[a@?page=form&formset=features#tab_Security]Platnost přihlašovací cookie[/a] " -"by měla být nastavena nejvýše na 1800 sekund (30 minut). Hodnoty vyšší než " -"1800 mohou znamenat bezpečnostní riziko; hrozí například podvržení identity." +"%sPlatnost přihlašovací cookie%s by měla být nastavena nejvýše na 1800 " +"sekund (30 minut). Hodnoty vyšší než 1800 mohou znamenat bezpečnostní " +"riziko; hrozí například podvržení identity." #: setup/lib/index.lib.php:264 #, php-format @@ -8950,9 +8952,11 @@ msgid "" "%sLogin cookie validity%s must be set to a value less or equal to %sLogin " "cookie store%s." msgstr "" +"%sPlatnost přihlašovací cookie%s musí být nastavena nejvýše na hodnotu " +"%sUkldádání přihlašovaci cookie%s." #: setup/lib/index.lib.php:266 -#, fuzzy, php-format +#, php-format #| msgid "" #| "If you feel this is necessary, use additional protection settings - [a@?" #| "page=servers&mode=edit&id=%1$d#tab_Server_config]host " @@ -8966,22 +8970,20 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" -"Pokud to považujete za nutné, použijte další možnosti zabezpečení - [a@?" -"page=servers&mode=edit&id=%1$d#tab_Server_config]omezení počítačů[/" -"a] a [a@?page=form&formset=features#tab_Security]seznam důvěryhodných " -"proxy[/a]. Nicméně zabezpečení založené na IP adresách nemusí být " -"spolehlivé, pokud je vaše IP adresa dynamicky přidělována poskytovatelem " -"spolu s mnoha dalšími uživateli." +"Pokud to považujete za nutné, použijte další možnosti zabezpečení - " +"%somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " +"založené na IP adresách nemusí být spolehlivé, pokud je vaše IP adresa " +"dynamicky přidělována poskytovatelem spolu s mnoha dalšími uživateli." #: setup/lib/index.lib.php:268 -#, fuzzy, php-format +#, php-format #| msgid "" #| "You set the [kbd]config[/kbd] authentication type and included username " #| "and password for auto-login, which is not a desirable option for live " #| "hosts. Anyone who knows or guesses your phpMyAdmin URL can directly " -#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1" -#| "$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/" -#| "kbd]." +#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=" +#| "%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http" +#| "[/kbd]." msgid "" "You set the [kbd]config[/kbd] authentication type and included username and " "password for auto-login, which is not a desirable option for live hosts. " @@ -8992,11 +8994,11 @@ msgstr "" "Nastavil jste typ přihlašování [kbd]config[/kbd] a zadal jste uživatelské " "jméno a heslo pro automatické přihlášení, což není doporučená volba pro " "produkční servery. Kdokoli kdo zná URL phpMyAdminu může přímo přistoupit k " -"Vašemu phpMyAdmin panelu. Nastavte [a@?page=servers&mode=edit&id=%1" -"$d#tab_Server]typ přihlašování[/a] na [kbd]cookie[/kbd] nebo [kbd]http[/kbd]." +"Vašemu phpMyAdmin panelu. Nastavte %styp přihlašování%s na [kbd]cookie[/kbd] " +"nebo [kbd]http[/kbd]." #: setup/lib/index.lib.php:270 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Import_export]Zip compression[/a] " #| "requires functions (%s) which are unavailable on this system." @@ -9004,11 +9006,10 @@ msgid "" "%sZip compression%s requires functions (%s) which are unavailable on this " "system." msgstr "" -"[a@?page=form&formset=features#tab_Import_export]Zip komprese[/a] " -"vyžaduje funkce (%s) které nejsou dostupné na tomto systému." +"%sZip komprese%s vyžaduje funkce (%s) které nejsou dostupné na tomto systému." #: setup/lib/index.lib.php:272 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Import_export]Zip decompression[/" #| "a] requires functions (%s) which are unavailable on this system." @@ -9016,36 +9017,33 @@ msgid "" "%sZip decompression%s requires functions (%s) which are unavailable on this " "system." msgstr "" -"[a@?page=form&formset=features#tab_Import_export]Zip dekomprese[/a] " -"vyžaduje funkce (%s) které nejsou dostupné na tomto systému." +"%sZip dekomprese%s vyžaduje funkce (%s) které nejsou dostupné na tomto " +"systému." #: setup/lib/index.lib.php:296 -#, fuzzy #| msgid "You should use SSL connections if your web server supports it" msgid "You should use SSL connections if your web server supports it." -msgstr "Měli byste použít SSL připojení pokud to váš webserver podporuje" +msgstr "Měli byste použít SSL připojení pokud to váš webserver podporuje." #: setup/lib/index.lib.php:306 -#, fuzzy #| msgid "You should use mysqli for performance reasons" msgid "You should use mysqli for performance reasons." -msgstr "Měl byste použít mysqli z výkonostních důvodů" +msgstr "Měli byste použít mysqli z výkonostních důvodů." #: setup/lib/index.lib.php:331 msgid "You allow for connecting to the server without a password." msgstr "Dovolujete připojit se k serveru bez hesla." #: setup/lib/index.lib.php:351 -#, fuzzy #| msgid "Key is too short, it should have at least 8 characters" msgid "Key is too short, it should have at least 8 characters." -msgstr "Tajný klíč je příliš krátký, měl by obsahovat alespoň 8 znaků" +msgstr "Tajný klíč je příliš krátký, měl by obsahovat alespoň 8 znaků." #: setup/lib/index.lib.php:358 -#, fuzzy #| msgid "Key should contain letters, numbers [em]and[/em] special characters" msgid "Key should contain letters, numbers [em]and[/em] special characters." -msgstr "Tajný klíč by měl obsahovat číslice, písmena [em]A[/em] zvláštní znaky" +msgstr "" +"Tajný klíč by měl obsahovat číslice, písmena [em]A[/em] zvláštní znaky." #: sql.php:569 tbl_replace.php:380 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10326-g426eb19
by Marc Delisle 21 Sep '10

21 Sep '10

The branch, master has been updated via 426eb193eb1270a78ec8efe93a5bb670276cda37 (commit) from 6f21803615918bd55eb8180d33b43e72d71f2f25 (commit) - Log ----------------------------------------------------------------- commit 426eb193eb1270a78ec8efe93a5bb670276cda37 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 21 08:16:52 2010 -0400 empty previous search results ----------------------------------------------------------------------- Summary of changes: js/tbl_select.js | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/js/tbl_select.js b/js/tbl_select.js index f7bd272..47d1246 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -32,6 +32,8 @@ $(document).ready(function() { $search_form = $(this); event.preventDefault(); + // empty previous search results while we are waiting for new results + $("#searchresults").empty(); PMA_ajaxShowMessage(PMA_messages['strSearching']); // add this hidden field just once hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10324-g8c7d339
by Marc Delisle 21 Sep '10

21 Sep '10

The branch, master has been updated via 8c7d339e04d4380ad13ae83f4367f87f06d3b7d2 (commit) from 1d8c5cbf3c350496ee940df4ffbe6526c9e4f512 (commit) - Log ----------------------------------------------------------------- commit 8c7d339e04d4380ad13ae83f4367f87f06d3b7d2 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 21 08:04:25 2010 -0400 These are not translatable ----------------------------------------------------------------------- Summary of changes: libraries/schema/User_Schema.class.php | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index ba62028..1511158 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -347,11 +347,11 @@ class PMA_User_Schema ?>: </legend> <select name="export_type" id="export_type"> - <option value="pdf" selected="selected"><?php echo __('PDF');?></option> - <option value="svg"><?php echo __('SVG');?></option> - <option value="dia"><?php echo __('DIA');?></option> - <option value="visio"><?php echo __('VISIO');?></option> - <option value="eps"><?php echo __('EPS');?></option> + <option value="pdf" selected="selected">PDF</option> + <option value="svg">SVG</option> + <option value="dia">DIA</option> + <option value="visio">Visio</option> + <option value="eps">EPS</option> </select> <label><?php echo __('Select Export Relational Type');?></label> <?php hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10323-g1d8c5cb
by Piotr Przybylski 21 Sep '10

21 Sep '10

The branch, master has been updated via 1d8c5cbf3c350496ee940df4ffbe6526c9e4f512 (commit) via 6a4766f60c83a990f291e82bc52ff66fd55eab49 (commit) via 2524b2588d0fa7cc5bf0759c3eb8dc7d44885791 (commit) via 3a5f08f32d256cae9e12e9edd9171f0edea959f7 (commit) from 1a3d33fbe22378c2bcf139868ac8ff19d17b9dcd (commit) - Log ----------------------------------------------------------------- commit 1d8c5cbf3c350496ee940df4ffbe6526c9e4f512 Author: Crack <piotrprz(a)gmail.com> Date: Tue Sep 21 13:43:56 2010 +0200 fix docs commit 6a4766f60c83a990f291e82bc52ff66fd55eab49 Author: Crack <piotrprz(a)gmail.com> Date: Tue Sep 21 13:42:37 2010 +0200 Add setup script warning for when LoginCookieStore < LoginCookieValidity commit 2524b2588d0fa7cc5bf0759c3eb8dc7d44885791 Author: Crack <piotrprz(a)gmail.com> Date: Tue Sep 21 13:24:42 2010 +0200 Setup script front page messages: - removed URLs from translatable strings and fixed tab links - added warning when LoginCookieValidity > 1440 - added error when LoginCookieValidity > session.gc_maxlifetime commit 3a5f08f32d256cae9e12e9edd9171f0edea959f7 Author: Crack <piotrprz(a)gmail.com> Date: Tue Sep 21 13:10:59 2010 +0200 load LoginCookieValidity from user prefereces cache to make it usable in auth plugins ----------------------------------------------------------------------- Summary of changes: Documentation.html | 2 +- libraries/common.inc.php | 14 +++++++++- setup/lib/index.lib.php | 68 +++++++++++++++++++++++++++++++++++---------- 3 files changed, 67 insertions(+), 17 deletions(-) diff --git a/Documentation.html b/Documentation.html index 5b75982..71cd175 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1382,7 +1382,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> not lower than the value of $cfg['LoginCookieValidity'].</dd> <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [number of seconds]</dt> - <dd>Define how long is login cookie should be stored in browser. Default 0 + <dd>Define how long login cookie should be stored in browser. Default 0 means that it will be kept for existing session. This is recommended for not trusted environments.</dd> diff --git a/libraries/common.inc.php b/libraries/common.inc.php index ee20145..e4ce8c8 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -801,7 +801,19 @@ if (! defined('PMA_MINIMUM_COMMON')) { require_once './libraries/logging.lib.php'; - // Gets the authentication library that fits the $cfg['Server'] settings + // get LoginCookieValidity from preferences cache + // no generic solution for loading preferences from cache as some settings need to be kept + // for processing in PMA_Config::loadUserPreferences() + $cache_key = 'server_' . $GLOBALS['server']; + if (isset($_SESSION['cache'][$cache_key]['userprefs']['LoginCookieValidity'])) { + $value = $_SESSION['cache'][$cache_key]['userprefs']['LoginCookieValidity']; + $GLOBALS['PMA_Config']->set('LoginCookieValidity', $value); + $GLOBALS['cfg']['LoginCookieValidity'] = $value; + unset($value); + } + unset($cache_key); + + // Gets the authentication library that fits the $cfg['Server'] settings // and run authentication // to allow HTTP or http diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index 17c9cf6..b5df478 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -247,17 +247,30 @@ function perform_config_checks() $blowfish_secret_set = false; $cookie_auth_used = false; - $strAllowArbitraryServerWarning = __('This [a@?page=form&formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'); + $strAllowArbitraryServerWarning = __('This %soption%s should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use %strusted proxies list%s. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'); + $strAllowArbitraryServerWarning = sprintf($strAllowArbitraryServerWarning, '[a@?page=form&formset=Features#tab_Security]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '[/a]'); $strBlowfishSecretMsg = __('You didn\'t have blowfish secret set and have enabled cookie authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.'); - $strBZipDumpWarning = __('[a@?page=form&formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.'); + $strBZipDumpWarning = __('%sBzip2 compression and decompression%s requires functions (%s) which are unavailable on this system.'); + $strBZipDumpWarning = sprintf($strBZipDumpWarning, '[a@?page=form&formset=Features#tab_Import_export]', '[/a]', '%s'); $strDirectoryNotice = __('This value should be double checked to ensure that this directory is neither world accessible nor readable or writable by other users on your server.'); - $strForceSSLNotice = __('This [a@?page=form&formset=features#tab_Security]option[/a] should be enabled if your web server supports it'); - $strGZipDumpWarning = __('[a@?page=form&formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.'); - $strLoginCookieValidityWarning = __('[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.'); - $strSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - [a@?page=servers&mode=edit&id=%1$d#tab_Server_config]host authentication[/a] settings and [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'); - $strServerAuthConfigMsg = __('You set the [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/kbd].'); - $strZipDumpExportWarning = __('[a@?page=form&formset=features#tab_Import_export]Zip compression[/a] requires functions (%s) which are unavailable on this system.'); - $strZipDumpImportWarning = __('[a@?page=form&formset=features#tab_Import_export]Zip decompression[/a] requires functions (%s) which are unavailable on this system.'); + $strForceSSLNotice = __('This %soption%s should be enabled if your web server supports it.'); + $strForceSSLNotice = sprintf($strForceSSLNotice, '[a@?page=form&formset=Features#tab_Security]', '[/a]'); + $strGZipDumpWarning = __('%sGZip compression and decompression%s requires functions (%s) which are unavailable on this system.'); + $strGZipDumpWarning = sprintf($strGZipDumpWarning, '[a@?page=form&formset=Features#tab_Import_export]', '[/a]', '%s'); + $strLoginCookieValidityWarning = __('%sLogin cookie validity%s greater than 1440 seconds may cause random session invalidation if %ssession.gc_maxlifetime%s is lower than its value (currently %d).'); + $strLoginCookieValidityWarning = sprintf($strLoginCookieValidityWarning, '[a@?page=form&formset=Features#tab_Security]', '[/a]', '[a@http://www.php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime]', '[/a]', ini_get('session.gc_maxlifetime')); + $strLoginCookieValidityWarning2 = __('%sLogin cookie validity%s should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.'); + $strLoginCookieValidityWarning2 = sprintf($strLoginCookieValidityWarning2, '[a@?page=form&formset=Features#tab_Security]', '[/a]'); + $strLoginCookieValidityWarning3 = __('%sLogin cookie validity%s must be set to a value less or equal to %sLogin cookie store%s.'); + $strLoginCookieValidityWarning3 = sprintf($strLoginCookieValidityWarning3, '[a@?page=form&formset=Features#tab_Security]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '[/a]'); + $strSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - %shost authentication%s settings and %strusted proxies list%s. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'); + $strSecurityInfoMsg = sprintf($strSecurityInfoMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server_config]', '[/a]', '[a@?page=form&formset=Features#tab_Security]', '%s'); + $strServerAuthConfigMsg = __('You set the [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set %sauthentication type%s to [kbd]cookie[/kbd] or [kbd]http[/kbd].'); + $strServerAuthConfigMsg = sprintf($strServerAuthConfigMsg, '[a@?page=servers&mode=edit&id=%1$d#tab_Server]', '[/a]'); + $strZipDumpExportWarning = __('%sZip compression%s requires functions (%s) which are unavailable on this system.'); + $strZipDumpExportWarning = sprintf($strZipDumpExportWarning, '[a@?page=form&formset=Features#tab_Import_export]', '[/a]', '%s'); + $strZipDumpImportWarning = __('%sZip decompression%s requires functions (%s) which are unavailable on this system.'); + $strZipDumpImportWarning = sprintf($strZipDumpImportWarning, '[a@?page=form&formset=Features#tab_Import_export]', '[/a]', '%s'); for ($i = 1, $server_cnt = $cf->getServerCount(); $i <= $server_cnt; $i++) { $cookie_auth_server = ($cf->getValue("Servers/$i/auth_type") == 'cookie'); @@ -280,7 +293,7 @@ function perform_config_checks() if (!$cf->getValue("Servers/$i/ssl")) { $title = PMA_lang(PMA_lang_name('Servers/1/ssl')) . " ($server_name)"; messages_set('notice', "Servers/$i/ssl", $title, - __('You should use SSL connections if your web server supports it')); + __('You should use SSL connections if your web server supports it.')); } // @@ -290,7 +303,7 @@ function perform_config_checks() if ($cf->getValue("Servers/$i/extension") == 'mysql') { $title = PMA_lang(PMA_lang_name('Servers/1/extension')) . " ($server_name)"; messages_set('notice', "Servers/$i/extension", $title, - __('You should use mysqli for performance reasons')); + __('You should use mysqli for performance reasons.')); } // @@ -335,19 +348,19 @@ function perform_config_checks() // check length if (strlen($blowfish_secret) < 8) { // too short key - $blowfish_warnings[] = __('Key is too short, it should have at least 8 characters'); + $blowfish_warnings[] = __('Key is too short, it should have at least 8 characters.'); } // check used characters $has_digits = (bool) preg_match('/\d/', $blowfish_secret); $has_chars = (bool) preg_match('/\S/', $blowfish_secret); $has_nonword = (bool) preg_match('/\W/', $blowfish_secret); if (!$has_digits || !$has_chars || !$has_nonword) { - $blowfish_warnings[] = PMA_lang(__('Key should contain letters, numbers [em]and[/em] special characters')); + $blowfish_warnings[] = PMA_lang(__('Key should contain letters, numbers [em]and[/em] special characters.')); } if (!empty($blowfish_warnings)) { messages_set('warning', 'blowfish_warnings' . count($blowfish_warnings), PMA_lang(PMA_lang_name('blowfish_secret')), - implode(" ", $blowfish_warnings)); + implode(' ', $blowfish_warnings)); } } } @@ -374,12 +387,37 @@ function perform_config_checks() // // $cfg['LoginCookieValidity'] + // value greater than session.gc_maxlifetime will cause random session invalidation after that time + // + if ($cf->getValue('LoginCookieValidity') > 1440 + || $cf->getValue('LoginCookieValidity') > ini_get('session.gc_maxlifetime')) { + $message_type = $cf->getValue('LoginCookieValidity') > ini_get('session.gc_maxlifetime') + ? 'error' + : 'warning'; + messages_set($message_type, 'LoginCookieValidity', + PMA_lang(PMA_lang_name('LoginCookieValidity')), + PMA_lang($strLoginCookieValidityWarning)); + } + + // + // $cfg['LoginCookieValidity'] // should be at most 1800 (30 min) // if ($cf->getValue('LoginCookieValidity') > 1800) { messages_set('warning', 'LoginCookieValidity', PMA_lang(PMA_lang_name('LoginCookieValidity')), - PMA_lang($strLoginCookieValidityWarning)); + PMA_lang($strLoginCookieValidityWarning2)); + } + + // + // $cfg['LoginCookieValidity'] + // $cfg['LoginCookieStore'] + // LoginCookieValidity must be less or equal to LoginCookieStore + // + if ($cf->getValue('LoginCookieStore') != 0 && $cf->getValue('LoginCookieValidity') > $cf->getValue('LoginCookieStore')) { + messages_set('error', 'LoginCookieValidity', + PMA_lang(PMA_lang_name('LoginCookieValidity')), + PMA_lang($strLoginCookieValidityWarning3)); } // hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10319-g1a3d33f
by Michal Čihař 21 Sep '10

21 Sep '10

The branch, master has been updated via 1a3d33fbe22378c2bcf139868ac8ff19d17b9dcd (commit) via 010d01f0a2d8e4be9dca11be606bdbbb090f818a (commit) via 07f12c70511e6cb8248842ff909d8706e0f132db (commit) via bac0dcb5a6844f9c3815ab3ef63684b18341491a (commit) via 0a8929570d9c96e1aeb77ec42cc5d66f211f4658 (commit) via 110cd7951be0f34fcee29e8bb2ea8aa7f7643f26 (commit) via 37eb1cf5e6b99de36ec1aeaf4142e386a2a456b6 (commit) via a05bc36c3225f62fa1bcb32e5cf8c6644b7baf28 (commit) via c877d5f447214db668d82b2d2595b106d7f4b896 (commit) via 3563bd4beb5d27e15907745b7a41e6c0ad8bbbdc (commit) via e24c0595032cf1e1bbe307c1472aadfbba7d89e8 (commit) via d20f3b9c6d0af63e2b928000b71923f52ab8e22c (commit) via 58fdd36058781d82a773a53da4df42b9dbefca3b (commit) via 7bfb4f33301ac7b37d8f46d14ad3e0906e5dada8 (commit) via 1653602c39f239e069d00dd9a04f1f0ef956152b (commit) via 36f48c204d3b9c628cef23daeec9f4bbe1ddef7b (commit) via 1ca7d0b081311a4c53576b25fcafa08b48a9c54f (commit) via 691662876561307c8579443d94d99024102cc23a (commit) via e2ba95a90426dc430243dba67e42ed5e7d567146 (commit) via f0138961bd2fbcc4fa0b99f891529506c98037f3 (commit) via f18843c5e1a2c700e57f05fe6ed3b2ddeb69ad30 (commit) via fa9befb52779664175b5d5f61af5edbe26f3dc8a (commit) via 173c919679e40aed3fb6adda52118ea7f1247279 (commit) via c8fc3dee15d2a0bbd1598004c221ff42cb630a0d (commit) via 088676653dd3bcad8ece6f7d8098f69761f85b66 (commit) via c00ee704c4d8a69d1267d89e6f63132c9c424231 (commit) via 02437e8c2f863587208f850108e0827e28f0fa72 (commit) via 50a38093b065e1116b163b3ca0db0fddce7b9ab5 (commit) via 3d5daf553bf4e8ba18011cb755534f358aa6a19a (commit) via 6aec7817a0e98f831e51eba92fccb3a4c5a1ee1d (commit) via dbb755f40b7bb06ce8ad0457fa3a843b308decb0 (commit) via 26b41e762245a7f8115dacc717db102108323b36 (commit) via 6489b30e539e09c565d5288827e1fdbb8a95e355 (commit) via 4d79e45a35124d4f5233a5be0f992378992db59c (commit) via 64932323e58dc99c1c581004a9341d3ac53d2ed0 (commit) via 7c9803d8f1999571fab1460e1d2a082cefd6365c (commit) via 213678986dd34516520bb97f7fb0e2a2bc31d260 (commit) via 55f8350dd644b753979a46ab753c4f1fe556b4ae (commit) via e2ce0d4a65e0d7f203ac1645cfa5299dd7220a0f (commit) via c6f337da8cc41ee4c5619fb0f8bb5ae8631001c9 (commit) via 4cac4b24c7e3f0766977620dca4a6e5307f6f0cf (commit) via 30ce734c3acd6798f0034e639e9581b9efdb9c46 (commit) via 2101d958dfd3fa01fac86e7bc50ccf9abbef6349 (commit) via 1279008b35e05ca86000aff202546d970bd11032 (commit) via c3c17e8cb9922d7cf28618a255d7ade9c5e89150 (commit) via b44c7608e8771f1d7e5e2cc708b7749004c45199 (commit) via dd8989f021501222178ca2eb7f84b288b4d579c8 (commit) via 843927111efea0cff8d1c5b71093bb83efb92f7c (commit) via 29e224c18c305829e0e2375f74e336aad2be1de3 (commit) via faf6bb1a165d0cc34463d3c49ecc233d4ae1c24b (commit) via bece88ce187fc84b697ab17a135205a846cf0792 (commit) via 7584f95d21af260071d4dfb3e9c4108eda043e20 (commit) via 74c5a6c14d7cf3778deef48f85272d1e4b5d2b39 (commit) via dad20040ed959cd2c28976a4f64c362105005389 (commit) via e62f0e38a8630eae9d39e1f5291561a4feb93bf6 (commit) via d6ba6e21c26facb9aabc54719373073de8ff0179 (commit) via a336a80886986de1da0f7e0c697d0e253428023a (commit) via b4cc90a79c2b8e72bb1e67d4b272a3dfc741ca9b (commit) via e6a04238ffb42b8f555ca730cca8fcaa56f6e0e3 (commit) via 8de2a6c4a63b3c564fd9f2db7550871b0607c3e1 (commit) via 741a7f921999d7f62e0a33eeb620dd8ab759ceed (commit) via db95ace15c5092b2652c1e1d67982b997b771ded (commit) via 6bbd91f3b0497a7e4f58945bdce5c44ba0fa9143 (commit) via 99b3b565f307ea4c5fd556871f11a34ea074cf20 (commit) via 7bdd2e4ddd5959a7327d33d20ca6f969ed389298 (commit) via 90d0079511c2e20924d618b4e4a92a83f1a0e3f6 (commit) via 990c11e8c7e244ea5ca9255f1356408784d1b490 (commit) via 5299ebb21d1d388e3830923ad7d31c33da539335 (commit) via 6a690addaec97521dd91bfe25ca640d7bb63c6da (commit) via 9813be99d5e8aacb0de12e07720882891a9e49f4 (commit) via d06c2933d1aeeb5ea53971e2df45a1757a4a817f (commit) via 2b3065ee286cd7eb461aa1f2bc69955be8a0fa26 (commit) via 4110849fed046a9db6958d635863a6e509a5f1fe (commit) via 577b26088016f8a5544c3603f6c3a82b09db67fd (commit) via 9134f9965efffb6a064daf1fba45c2184d37a632 (commit) via 61bc6c69f7533415595db4ad04dae892ed97dc9c (commit) via c19a7e26b9b257c4721371b6be5e6014f62549cc (commit) via f8efa655ee99dd4a1bcc8019f93dca386bcf9b5c (commit) via f5e7134d04f0d6122ca6f44db308d19f70a70a3a (commit) via d04eaf067d75c20d495963eee12c2ab66ea8279b (commit) via a3706fd78b83187eaf963b66617386e17d2dcc7b (commit) via 02db79828159fa5ef99d26c44746017cde14efcd (commit) via 14e1a01aae4bd7313eee8b687d39a404a89627cc (commit) via e88d7f983694f6bd029718b306bb2bc9864d0435 (commit) via 3ebd9371f3d32794761626b937a25db9f91ebe87 (commit) via 1cfb2c07dc6df12d5bc730986174528a1df3b855 (commit) via cca2381db52258574d58da29120456c77ea04fdc (commit) via 7ece295e7b2b85d9701602501ca717408ecd7fa2 (commit) via 8c3a102c9e05743a29012556f1d8b51aa25b098e (commit) via fff791d793e9937bae0207db43372b5392b57b8f (commit) via ab52b8857226c94357b35ec0f2f22f48d151e5f9 (commit) via 71d4ed5839dde6952c151e638d52df06c836fa18 (commit) via 4e50a436786d7479097a943449c003f9437cbd9a (commit) from 35cf83bc12805c230f71c31653fd50c8751e32d7 (commit) - Log ----------------------------------------------------------------- commit 1a3d33fbe22378c2bcf139868ac8ff19d17b9dcd Merge: 35cf83bc12805c230f71c31653fd50c8751e32d7 010d01f0a2d8e4be9dca11be606bdbbb090f818a Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Sep 21 10:31:59 2010 +0200 Merge remote branch 'pootle/master' commit 010d01f0a2d8e4be9dca11be606bdbbb090f818a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 22:00:14 2010 +0200 Translation update done using Pootle. commit 07f12c70511e6cb8248842ff909d8706e0f132db Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:59:39 2010 +0200 Translation update done using Pootle. commit bac0dcb5a6844f9c3815ab3ef63684b18341491a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:59:18 2010 +0200 Translation update done using Pootle. commit 0a8929570d9c96e1aeb77ec42cc5d66f211f4658 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:59:04 2010 +0200 Translation update done using Pootle. commit 110cd7951be0f34fcee29e8bb2ea8aa7f7643f26 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:58:19 2010 +0200 Translation update done using Pootle. commit 37eb1cf5e6b99de36ec1aeaf4142e386a2a456b6 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:57:52 2010 +0200 Translation update done using Pootle. commit a05bc36c3225f62fa1bcb32e5cf8c6644b7baf28 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:57:35 2010 +0200 Translation update done using Pootle. commit c877d5f447214db668d82b2d2595b106d7f4b896 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:57:08 2010 +0200 Translation update done using Pootle. commit 3563bd4beb5d27e15907745b7a41e6c0ad8bbbdc Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:56:47 2010 +0200 Translation update done using Pootle. commit e24c0595032cf1e1bbe307c1472aadfbba7d89e8 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:56:36 2010 +0200 Translation update done using Pootle. commit d20f3b9c6d0af63e2b928000b71923f52ab8e22c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:56:20 2010 +0200 Translation update done using Pootle. commit 58fdd36058781d82a773a53da4df42b9dbefca3b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:56:13 2010 +0200 Translation update done using Pootle. commit 7bfb4f33301ac7b37d8f46d14ad3e0906e5dada8 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:56:02 2010 +0200 Translation update done using Pootle. commit 1653602c39f239e069d00dd9a04f1f0ef956152b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:55:25 2010 +0200 Translation update done using Pootle. commit 36f48c204d3b9c628cef23daeec9f4bbe1ddef7b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:55:12 2010 +0200 Translation update done using Pootle. commit 1ca7d0b081311a4c53576b25fcafa08b48a9c54f Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:54:36 2010 +0200 Translation update done using Pootle. commit 691662876561307c8579443d94d99024102cc23a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 21:54:25 2010 +0200 Translation update done using Pootle. commit e2ba95a90426dc430243dba67e42ed5e7d567146 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:48:45 2010 +0200 Translation update done using Pootle. commit f0138961bd2fbcc4fa0b99f891529506c98037f3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:48:29 2010 +0200 Translation update done using Pootle. commit f18843c5e1a2c700e57f05fe6ed3b2ddeb69ad30 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:48:06 2010 +0200 Translation update done using Pootle. commit fa9befb52779664175b5d5f61af5edbe26f3dc8a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:47:15 2010 +0200 Translation update done using Pootle. commit 173c919679e40aed3fb6adda52118ea7f1247279 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:46:47 2010 +0200 Translation update done using Pootle. commit c8fc3dee15d2a0bbd1598004c221ff42cb630a0d Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:44:28 2010 +0200 Translation update done using Pootle. commit 088676653dd3bcad8ece6f7d8098f69761f85b66 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:44:23 2010 +0200 Translation update done using Pootle. commit c00ee704c4d8a69d1267d89e6f63132c9c424231 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:44:19 2010 +0200 Translation update done using Pootle. commit 02437e8c2f863587208f850108e0827e28f0fa72 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:44:09 2010 +0200 Translation update done using Pootle. commit 50a38093b065e1116b163b3ca0db0fddce7b9ab5 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:43:01 2010 +0200 Translation update done using Pootle. commit 3d5daf553bf4e8ba18011cb755534f358aa6a19a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:42:55 2010 +0200 Translation update done using Pootle. commit 6aec7817a0e98f831e51eba92fccb3a4c5a1ee1d Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:42:50 2010 +0200 Translation update done using Pootle. commit dbb755f40b7bb06ce8ad0457fa3a843b308decb0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:42:46 2010 +0200 Translation update done using Pootle. commit 26b41e762245a7f8115dacc717db102108323b36 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:42:41 2010 +0200 Translation update done using Pootle. commit 6489b30e539e09c565d5288827e1fdbb8a95e355 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:42:33 2010 +0200 Translation update done using Pootle. commit 4d79e45a35124d4f5233a5be0f992378992db59c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:42:24 2010 +0200 Translation update done using Pootle. commit 64932323e58dc99c1c581004a9341d3ac53d2ed0 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:42:13 2010 +0200 Translation update done using Pootle. commit 7c9803d8f1999571fab1460e1d2a082cefd6365c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:41:59 2010 +0200 Translation update done using Pootle. commit 213678986dd34516520bb97f7fb0e2a2bc31d260 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:41:46 2010 +0200 Translation update done using Pootle. commit 55f8350dd644b753979a46ab753c4f1fe556b4ae Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:41:42 2010 +0200 Translation update done using Pootle. commit e2ce0d4a65e0d7f203ac1645cfa5299dd7220a0f Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:41:28 2010 +0200 Translation update done using Pootle. commit c6f337da8cc41ee4c5619fb0f8bb5ae8631001c9 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:41:22 2010 +0200 Translation update done using Pootle. commit 4cac4b24c7e3f0766977620dca4a6e5307f6f0cf Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:41:11 2010 +0200 Translation update done using Pootle. commit 30ce734c3acd6798f0034e639e9581b9efdb9c46 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:40:55 2010 +0200 Translation update done using Pootle. commit 2101d958dfd3fa01fac86e7bc50ccf9abbef6349 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:39:51 2010 +0200 Translation update done using Pootle. commit 1279008b35e05ca86000aff202546d970bd11032 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:39:43 2010 +0200 Translation update done using Pootle. commit c3c17e8cb9922d7cf28618a255d7ade9c5e89150 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:38:18 2010 +0200 Translation update done using Pootle. commit b44c7608e8771f1d7e5e2cc708b7749004c45199 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:37:36 2010 +0200 Translation update done using Pootle. commit dd8989f021501222178ca2eb7f84b288b4d579c8 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:37:32 2010 +0200 Translation update done using Pootle. commit 843927111efea0cff8d1c5b71093bb83efb92f7c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:37:01 2010 +0200 Translation update done using Pootle. commit 29e224c18c305829e0e2375f74e336aad2be1de3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:36:39 2010 +0200 Translation update done using Pootle. commit faf6bb1a165d0cc34463d3c49ecc233d4ae1c24b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:27:06 2010 +0200 Translation update done using Pootle. commit bece88ce187fc84b697ab17a135205a846cf0792 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:26:03 2010 +0200 Translation update done using Pootle. commit 7584f95d21af260071d4dfb3e9c4108eda043e20 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:25:39 2010 +0200 Translation update done using Pootle. commit 74c5a6c14d7cf3778deef48f85272d1e4b5d2b39 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:25:05 2010 +0200 Translation update done using Pootle. commit dad20040ed959cd2c28976a4f64c362105005389 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:24:52 2010 +0200 Translation update done using Pootle. commit e62f0e38a8630eae9d39e1f5291561a4feb93bf6 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:24:40 2010 +0200 Translation update done using Pootle. commit d6ba6e21c26facb9aabc54719373073de8ff0179 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:23:35 2010 +0200 Translation update done using Pootle. commit a336a80886986de1da0f7e0c697d0e253428023a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:20:35 2010 +0200 Translation update done using Pootle. commit b4cc90a79c2b8e72bb1e67d4b272a3dfc741ca9b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:20:17 2010 +0200 Translation update done using Pootle. commit e6a04238ffb42b8f555ca730cca8fcaa56f6e0e3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:19:53 2010 +0200 Translation update done using Pootle. commit 8de2a6c4a63b3c564fd9f2db7550871b0607c3e1 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:19:36 2010 +0200 Translation update done using Pootle. commit 741a7f921999d7f62e0a33eeb620dd8ab759ceed Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:19:13 2010 +0200 Translation update done using Pootle. commit db95ace15c5092b2652c1e1d67982b997b771ded Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:18:45 2010 +0200 Translation update done using Pootle. commit 6bbd91f3b0497a7e4f58945bdce5c44ba0fa9143 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:14:25 2010 +0200 Translation update done using Pootle. commit 99b3b565f307ea4c5fd556871f11a34ea074cf20 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:13:56 2010 +0200 Translation update done using Pootle. commit 7bdd2e4ddd5959a7327d33d20ca6f969ed389298 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:13:45 2010 +0200 Translation update done using Pootle. commit 90d0079511c2e20924d618b4e4a92a83f1a0e3f6 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:13:30 2010 +0200 Translation update done using Pootle. commit 990c11e8c7e244ea5ca9255f1356408784d1b490 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:12:44 2010 +0200 Translation update done using Pootle. commit 5299ebb21d1d388e3830923ad7d31c33da539335 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:12:06 2010 +0200 Translation update done using Pootle. commit 6a690addaec97521dd91bfe25ca640d7bb63c6da Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:11:50 2010 +0200 Translation update done using Pootle. commit 9813be99d5e8aacb0de12e07720882891a9e49f4 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:11:03 2010 +0200 Translation update done using Pootle. commit d06c2933d1aeeb5ea53971e2df45a1757a4a817f Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:10:57 2010 +0200 Translation update done using Pootle. commit 2b3065ee286cd7eb461aa1f2bc69955be8a0fa26 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:10:44 2010 +0200 Translation update done using Pootle. commit 4110849fed046a9db6958d635863a6e509a5f1fe Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:10:32 2010 +0200 Translation update done using Pootle. commit 577b26088016f8a5544c3603f6c3a82b09db67fd Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:09:58 2010 +0200 Translation update done using Pootle. commit 9134f9965efffb6a064daf1fba45c2184d37a632 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:09:48 2010 +0200 Translation update done using Pootle. commit 61bc6c69f7533415595db4ad04dae892ed97dc9c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:09:31 2010 +0200 Translation update done using Pootle. commit c19a7e26b9b257c4721371b6be5e6014f62549cc Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:08:07 2010 +0200 Translation update done using Pootle. commit f8efa655ee99dd4a1bcc8019f93dca386bcf9b5c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:07:53 2010 +0200 Translation update done using Pootle. commit f5e7134d04f0d6122ca6f44db308d19f70a70a3a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:07:44 2010 +0200 Translation update done using Pootle. commit d04eaf067d75c20d495963eee12c2ab66ea8279b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:07:36 2010 +0200 Translation update done using Pootle. commit a3706fd78b83187eaf963b66617386e17d2dcc7b Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:07:31 2010 +0200 Translation update done using Pootle. commit 02db79828159fa5ef99d26c44746017cde14efcd Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:07:23 2010 +0200 Translation update done using Pootle. commit 14e1a01aae4bd7313eee8b687d39a404a89627cc Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:07:15 2010 +0200 Translation update done using Pootle. commit e88d7f983694f6bd029718b306bb2bc9864d0435 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 16:07:00 2010 +0200 Translation update done using Pootle. commit 3ebd9371f3d32794761626b937a25db9f91ebe87 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:56:59 2010 +0200 Translation update done using Pootle. commit 1cfb2c07dc6df12d5bc730986174528a1df3b855 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:56:37 2010 +0200 Translation update done using Pootle. commit cca2381db52258574d58da29120456c77ea04fdc Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:54:59 2010 +0200 Translation update done using Pootle. commit 7ece295e7b2b85d9701602501ca717408ecd7fa2 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:54:45 2010 +0200 Translation update done using Pootle. commit 8c3a102c9e05743a29012556f1d8b51aa25b098e Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:53:42 2010 +0200 Translation update done using Pootle. commit fff791d793e9937bae0207db43372b5392b57b8f Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:53:23 2010 +0200 Translation update done using Pootle. commit ab52b8857226c94357b35ec0f2f22f48d151e5f9 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:52:18 2010 +0200 Translation update done using Pootle. commit 71d4ed5839dde6952c151e638d52df06c836fa18 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:52:07 2010 +0200 Translation update done using Pootle. commit 4e50a436786d7479097a943449c003f9437cbd9a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 20 14:51:51 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 293 ++++++++++++++++++++++++++------------------------------------ 1 files changed, 124 insertions(+), 169 deletions(-) diff --git a/po/fr.po b/po/fr.po index 67f846c..85bab34 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-09-15 15:08+0200\n" -"PO-Revision-Date: 2010-09-05 15:34+0200\n" +"PO-Revision-Date: 2010-09-20 22:00+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "Language: fr\n" @@ -817,7 +817,7 @@ msgstr "Valeurs pour la colonne «%s»" #: enum_editor.php:22 libraries/tbl_properties.inc.php:799 msgid "Enter each value in a separate field." -msgstr "" +msgstr "Saisir chaque valeur dans un champ séparé." #: export.php:73 msgid "Selected export type has to be saved in file!" @@ -3092,10 +3092,9 @@ msgid "Display servers selection" msgstr "Affiche la liste des serveurs" #: libraries/config/messages.inc.php:268 -#, fuzzy #| msgid "Display databases in a tree" msgid "Display table filter" -msgstr "Montre les bases de données dans une arborescence" +msgstr "Montrer le filtre de table" #: libraries/config/messages.inc.php:269 msgid "String that separates databases into different tree levels" @@ -3234,7 +3233,6 @@ msgid "Login cookie validity" msgstr "Durée de validité de la connexion (mode cookie)" #: libraries/config/messages.inc.php:296 -#, fuzzy #| msgid "Double size of textarea for LONGTEXT fields" msgid "Double size of textarea for LONGTEXT columns" msgstr "Doubler la taille de la zone de texte pour les colonnes LONGTEXT" @@ -5056,12 +5054,14 @@ msgid "" "The timeout, in seconds, for temporary BLOBs. Uploaded BLOB data is removed " "after this time, unless they are referenced by a record in the database." msgstr "" +"Le délai d'expiration, en secondes, pour les BLOBs temporaires. Les données " +"du BLOB téléversé sont effacées après ce délai, à moins qu'elles ne soient " +"référencées par un enregistrement de la base de données." #: libraries/engines/pbms.lib.php:50 -#, fuzzy #| msgid "Log file threshold" msgid "Temp Log Threshold" -msgstr "Seuil du fichier journal" +msgstr "Seuil du journal temporaire" #: libraries/engines/pbms.lib.php:51 msgid "" @@ -5069,26 +5069,35 @@ msgid "" "indicate the unit of the value. A value in bytes is assumed when no unit is " "specified." msgstr "" +"La taille maximum d'un fichier journal BLOB temporaire. Vous pouvez utiliser " +"Kb, MB ou GB pour indiquer l'unité de valeur. Une valeur en octets est " +"assumée si aucune unité n'est spécifiée." #: libraries/engines/pbms.lib.php:55 msgid "Max Keep Alive" -msgstr "" +msgstr "Durée de vie maximum" #: libraries/engines/pbms.lib.php:56 msgid "" "The timeout for inactive connection with the keep-alive flag set. After this " "time the connection will be closed. The time-out is in milliseconds (1/1000)." msgstr "" +"Le délai d'expiration pour une connexion inactive comportant le réglage " +"keep-alive actif. Après ce délai la connexion sera fermée. Le délai est en " +"millisecondes (1/1000)." #: libraries/engines/pbms.lib.php:60 msgid "Metadata Headers" -msgstr "" +msgstr "En-têtes de méta-données" #: libraries/engines/pbms.lib.php:61 msgid "" "A \":\" delimited list of metadata headers to be used to initialize the " "pbms_metadata_header table when a database is created." msgstr "" +"Une liste d'en-têtes de méta-données délimitée par des «.», qui servira à " +"initialiser la table pbms_metadata_header quand une base de données est " +"créée." #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" @@ -5243,57 +5252,49 @@ msgstr "" "plus anciens sont détruits, sinon ils sont renommés." #: libraries/export/csv.php:21 libraries/import/csv.php:27 -#, fuzzy #| msgid "Columns terminated by" msgid "Columns separated with:" -msgstr "Colonnes terminées par" +msgstr "Colonnes séparées par :" #: libraries/export/csv.php:22 libraries/import/csv.php:28 -#, fuzzy #| msgid "Columns enclosed by" msgid "Columns enclosed with:" -msgstr "Colonnes entourées par" +msgstr "Colonnes entourées par :" #: libraries/export/csv.php:23 libraries/import/csv.php:29 -#, fuzzy #| msgid "Columns escaped by" msgid "Columns escaped with:" -msgstr "Caractère d'échappement" +msgstr "Caractère d'échappement :" #: libraries/export/csv.php:24 libraries/import/csv.php:30 -#, fuzzy #| msgid "Lines terminated by" msgid "Lines terminated with:" -msgstr "Lignes terminées par" +msgstr "Lignes terminées par :" #: libraries/export/csv.php:25 libraries/export/excel.php:22 #: libraries/export/htmlword.php:28 libraries/export/latex.php:79 #: libraries/export/ods.php:23 libraries/export/odt.php:59 #: libraries/export/xls.php:23 libraries/export/xlsx.php:23 -#, fuzzy #| msgid "Replace NULL by" msgid "Replace NULL with:" -msgstr "Remplacer NULL par" +msgstr "Remplacer NULL par :" #: libraries/export/csv.php:26 libraries/export/excel.php:23 -#, fuzzy #| msgid "Remove CRLF characters within columns" msgid "Remove carriage return/line feed characters within columns" msgstr "Enlève les caractères de fin de ligne à l'intérieur des colonnes" #: libraries/export/excel.php:32 -#, fuzzy #| msgid "Excel edition" msgid "Excel edition:" -msgstr "Excel en version" +msgstr "Version d'Excel :" #: libraries/export/htmlword.php:27 libraries/export/latex.php:69 #: libraries/export/odt.php:55 libraries/export/sql.php:132 #: libraries/export/texytext.php:25 libraries/export/xml.php:45 -#, fuzzy #| msgid "Databases display options" msgid "Data dump options" -msgstr "Options d'affichage des bases de données" +msgstr "Options d'exportation" #: libraries/export/htmlword.php:135 libraries/export/odt.php:175 #: libraries/export/sql.php:929 libraries/export/texytext.php:123 @@ -5319,36 +5320,31 @@ msgstr "Structure de la table @TABLE@" #: libraries/export/latex.php:47 libraries/export/odt.php:39 #: libraries/export/sql.php:87 -#, fuzzy #| msgid "Transformation options" msgid "Object creation options" -msgstr "Options de transformation" +msgstr "Options de création d'objets" #: libraries/export/latex.php:51 libraries/export/latex.php:75 -#, fuzzy #| msgid "Table caption" msgid "Table caption (continued)" -msgstr "Sous-titre de la table" +msgstr "Sous-titre de la table (suite)" #: libraries/export/latex.php:56 libraries/export/odt.php:42 #: libraries/export/sql.php:40 -#, fuzzy #| msgid "Disable foreign key checks" msgid "Display foreign key relationships" -msgstr "Désactiver la vérification des clés étrangères" +msgstr "Afficher les relations de clés étrangères" #: libraries/export/latex.php:59 libraries/export/odt.php:45 -#, fuzzy #| msgid "Displaying Column Comments" msgid "Display comments" -msgstr "Commentaires de colonnes" +msgstr "Afficher les commentaires" #: libraries/export/latex.php:62 libraries/export/odt.php:48 #: libraries/export/sql.php:44 -#, fuzzy #| msgid "Available MIME types" msgid "Display MIME types" -msgstr "Types MIME disponibles" +msgstr "Afficher les types MIME" #: libraries/export/latex.php:139 libraries/export/sql.php:281 #: libraries/export/xml.php:105 libraries/header_printview.inc.php:56 @@ -5389,10 +5385,9 @@ msgid "(Generates a report containing the data of a single table)" msgstr "(Génère un rapport contenant les données d'une seule table)" #: libraries/export/pdf.php:24 -#, fuzzy #| msgid "Report title" msgid "Report title:" -msgstr "Titre du rapport" +msgstr "Titre du rapport :" #: libraries/export/php_array.php:16 msgid "PHP array" @@ -5403,72 +5398,76 @@ msgid "" "Display comments (includes info such as export timestamp, PHP version, " "and server version)" msgstr "" +"Afficher les commentaires (incluant les informations telles que " +"l'horodatage d'exportation, la version de PHP et la version du serveur)" #: libraries/export/sql.php:35 -#, fuzzy #| msgid "Add custom comment into header (\\n splits lines)" msgid "Additional custom header comment (\\n splits lines):" -msgstr "Commentaires mis en en-tête (\\n sépare les lignes)" +msgstr "" +"Commentaires mis en en-tête (\n" +" sépare les lignes) :" #: libraries/export/sql.php:37 msgid "" "Include a timestamp of when databases were created, last updated, and last " "checked" msgstr "" +"Inclut un horodatage de création, mise à jour et dernière vérification des " +"bases de données" #: libraries/export/sql.php:65 msgid "" "Database system or older MySQL server to maximize output compatibility with:" msgstr "" +"Maximiser la compatibilité avec un système de base de données ou un ancien " +"serveur MySQL:" #: libraries/export/sql.php:72 libraries/export/sql.php:105 #: libraries/export/sql.php:107 -#, fuzzy, php-format +#, php-format #| msgid "Statements" msgid "Add %s statement" -msgstr "Information" +msgstr "Ajouter un énoncé %s" #: libraries/export/sql.php:91 -#, fuzzy #| msgid "Statements" msgid "Add statements:" -msgstr "Information" +msgstr "Ajouter les énoncés :" #: libraries/export/sql.php:111 -#, fuzzy #| msgid "<code>@TABLE@</code>" msgid "<code>CREATE TABLE</code> options:" -msgstr "<code>@TABLE@</code>" +msgstr "Options pour <code>CREATE TABLE</code> :" #: libraries/export/sql.php:123 -#, fuzzy msgid "" "Enclose table and field names with backquotes (Protects field and table " "names formed with special characters or keywords)" msgstr "" -"« Protéger les noms des tables et des champs par des " -"\"`\" » assure que les noms de champ et de table contenant des " -"caractères spéciaux sont protégés." +"Entourer les noms des tables et des colonnes par des guillemets obliques " +"(Protège les noms de tables et de colonnes comportant des caractères " +"spéciaux ou des mots réservés)" #: libraries/export/sql.php:136 msgid "Instead of <code>INSERT</code> statements, use:" -msgstr "" +msgstr "Au lieu d'énoncés <code>INSERT</code>, utiliser :" #: libraries/export/sql.php:138 msgid "<code>INSERT DELAYED</code> statements" -msgstr "" +msgstr "Énoncés <code>INSERT DELAYED</code>" #: libraries/export/sql.php:140 msgid "<code>INSERT IGNORE</code> statements" -msgstr "" +msgstr "Énoncés <code>INSERT IGNORE</code>" #: libraries/export/sql.php:147 msgid "Function to use when dumping data:" -msgstr "" +msgstr "Fonction à utiliser lors de l'exportation des données :" #: libraries/export/sql.php:151 msgid "Syntax to use when inserting data:" -msgstr "" +msgstr "Syntaxe à utiliser lors de l'insertion de données :" #: libraries/export/sql.php:154 msgid "" @@ -5476,6 +5475,9 @@ msgid "" "    Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES " "(1,2,3)</code>" msgstr "" +"inclure les noms de colonnes dans chaque énoncé <code>INSERT</code> " +"      Par exemple: <code>INSERT INTO tbl_name " +"(col_A,col_B,col_C) VALUES (1,2,3)</code>" #: libraries/export/sql.php:155 msgid "" @@ -5483,30 +5485,43 @@ msgid "" "    Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), " "(7,8,9)</code>" msgstr "" +"insérer des lignes multiples avec chaque énoncé <code>INSERT</code> " +"      Par exemple : <code>INSERT INTO tbl_name VALUES " +"(1,2,3), (4,5,6), (7,8,9)</code>" #: libraries/export/sql.php:156 msgid "" "both of the above       Example: <code>INSERT INTO " "tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>" msgstr "" +"les deux modes ci-dessus       Par exemple : " +"<code>INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), " +"(7,8,9)</code>" #: libraries/export/sql.php:157 msgid "" "neither of the above       Example: <code>INSERT INTO " "tbl_name VALUES (1,2,3)</code>" msgstr "" +"aucun des modes ci-dessus       Par exemple : " +"<code>INSERT INTO tbl_name VALUES (1,2,3)</code>" #: libraries/export/sql.php:167 msgid "" "Dump binary columns in hexadecimal notation (for example, \"abc\" becomes " "0x616263)" msgstr "" +"Exporter les colonnes binaires en format hexadécimal (par exemple, «abc» " +"devient 0x616263)" #: libraries/export/sql.php:171 msgid "" "Dump TIMESTAMP columns in UTC (enables TIMESTAMP columns to be dumped and " "reloaded between servers in different time zones)" msgstr "" +"Exporter les colonnes TIMESTAMP en UTC (permet les colonnes TIMESTAMP " +"d'être exportées et importées entre des serveurs de zones horaires " +"différentes)" #: libraries/export/sql.php:435 libraries/export/xml.php:34 msgid "Procedures" @@ -5551,13 +5566,12 @@ msgstr "XML" #: libraries/export/xml.php:30 msgid "Object creation options (all are recommended)" -msgstr "" +msgstr "Options de création d'objets (toutes sont recommandées)" #: libraries/export/xml.php:40 -#, fuzzy #| msgid "View" msgid "Views" -msgstr "Vue" +msgstr "Vues" #: libraries/export/xml.php:47 msgid "Export contents" @@ -5622,6 +5636,8 @@ msgid "" "The first line of the file contains the table column names (if this is " "unchecked, the first line will become part of the data)" msgstr "" +"La première ligne du fichier contient le nom des colonnes de la table (si " +"ceci n'est pas coché, la première ligne fait partie des données)" #: libraries/import/csv.php:39 msgid "" @@ -5629,12 +5645,15 @@ msgid "" "database, list the corresponding column names here. Column names must be " "separated by commas and not enclosed in quotations." msgstr "" +"Si les données de chaque ligne du fichier ne sont pas dans le même ordre que " +"dans la base de données, listez ici les noms de colonnes correspondantes. " +"Les noms de colonnes doivent être séparées par une virgule et non entourées " +"de guillemets." #: libraries/import/csv.php:41 -#, fuzzy #| msgid "Column names" msgid "Column names: " -msgstr "Nom des colonnes" +msgstr "Nom des colonnes :" #: libraries/import/csv.php:60 libraries/import/csv.php:72 #: libraries/import/csv.php:76 libraries/import/csv.php:80 @@ -5648,6 +5667,9 @@ msgid "" "Invalid column (%s) specified! Ensure that columns names are spelled " "correctly, separated by commas, and not enclosed in quotes." msgstr "" +"Colonne %s invalide! Assurez-vous que les noms de colonnes sont " +"orthographiés correctement, séparés par des virgules et non entourés de " +"guillemets. " #: libraries/import/csv.php:179 libraries/import/csv.php:426 #, php-format @@ -5678,28 +5700,25 @@ msgid "This plugin does not support compressed imports!" msgstr "Ce greffon ne supporte pas les importations en format comprimé !" #: libraries/import/ods.php:28 -#, fuzzy #| msgid "Import percentages as proper decimals (12.00% to .12)" msgid "Import percentages as proper decimals (ex. 12.00% to .12)" -msgstr "Importer les pourcentages en tant que décimales (12.00% devient .12)" +msgstr "" +"Importer les pourcentages en tant que décimales (12.00% devient .12)" #: libraries/import/ods.php:29 -#, fuzzy #| msgid "Import currencies ($5.00 to 5.00)" msgid "Import currencies (ex. $5.00 to 5.00)" -msgstr "Importer les valeurs de monnaie ($5.00 devient 5.00)" +msgstr "Importer les valeurs de monnaie ($5.00 devient 5.00)" #: libraries/import/sql.php:32 -#, fuzzy #| msgid "SQL compatibility mode" msgid "SQL compatibility mode:" -msgstr "Mode de compatibilité SQL" +msgstr "Mode de compatibilité SQL :" #: libraries/import/sql.php:42 -#, fuzzy #| msgid "Do not use AUTO_INCREMENT for zero values" msgid "Do not use <code>AUTO_INCREMENT</code> for zero values" -msgstr "Ne pas utiliser AUTO_INCREMENT pour la valeur zéro" +msgstr "Ne pas utiliser <code>AUTO_INCREMENT</code> pour la valeur zéro" #: libraries/import/xml.php:74 libraries/import/xml.php:130 msgid "" @@ -5947,7 +5966,6 @@ msgid "Log out" msgstr "Quitter" #: libraries/plugin_interface.lib.php:336 -#, fuzzy #| msgid "This format has no options" msgid "This format has no options" msgstr "Ce format ne comporte pas d'options" @@ -5988,7 +6006,7 @@ msgstr "Historique SQL" #: libraries/relation.lib.php:141 msgid "User preferences" -msgstr "" +msgstr "Préférences de l'utilisateur" #: libraries/relation.lib.php:145 msgid "Quick steps to setup advanced features:" @@ -6154,7 +6172,7 @@ msgstr "Pas de table" #: libraries/schema/Export_Relation_Schema.class.php:207 msgid "SCHEMA ERROR: " -msgstr "" +msgstr "Erreur de schéma : " #: libraries/schema/Pdf_Relation_Schema.class.php:891 #: libraries/schema/Pdf_Relation_Schema.class.php:1119 @@ -6196,49 +6214,46 @@ msgstr "Relations internes" #: libraries/schema/User_Schema.class.php:116 msgid "FOREIGN KEY" -msgstr "" +msgstr "FOREIGN KEY" #: libraries/schema/User_Schema.class.php:148 msgid "Please choose a page to edit" msgstr "Page à éditer" #: libraries/schema/User_Schema.class.php:153 -#, fuzzy #| msgid "Select Tables" msgid "Select page" -msgstr "Choisissez les tables" +msgstr "Choisissez la page" #: libraries/schema/User_Schema.class.php:211 msgid "Select Tables" msgstr "Choisissez les tables" #: libraries/schema/User_Schema.class.php:346 -#, fuzzy #| msgid "Relational schema" msgid "Display relational schema" -msgstr "Schéma relationnel" +msgstr "Afficher le schéma relationnel" #: libraries/schema/User_Schema.class.php:351 -#, fuzzy #| msgid "CSV" msgid "SVG" -msgstr "CSV" +msgstr "SVG" #: libraries/schema/User_Schema.class.php:352 msgid "DIA" -msgstr "" +msgstr "DIA" #: libraries/schema/User_Schema.class.php:353 msgid "VISIO" -msgstr "" +msgstr "VISIO" #: libraries/schema/User_Schema.class.php:354 msgid "EPS" -msgstr "" +msgstr "EPS" #: libraries/schema/User_Schema.class.php:356 msgid "Select Export Relational Type" -msgstr "" +msgstr "Choisissez le type d'exportation des relations" #: libraries/schema/User_Schema.class.php:377 msgid "Show grid" @@ -6269,10 +6284,9 @@ msgid "Portrait" msgstr "Portrait" #: libraries/schema/User_Schema.class.php:394 -#, fuzzy #| msgid "Creation" msgid "Orientation" -msgstr "Création" +msgstr "Orientation" #: libraries/schema/User_Schema.class.php:407 msgid "Paper size" @@ -6302,7 +6316,6 @@ msgid "Unknown language: %1$s." msgstr "Langue inconnue: %1$s." #: libraries/select_server.lib.php:38 libraries/select_server.lib.php:44 -#, fuzzy #| msgid "Current server" msgid "Current Server" msgstr "Serveur actuel" @@ -6335,10 +6348,9 @@ msgid "Synchronize" msgstr "Synchroniser" #: libraries/server_links.inc.php:99 -#, fuzzy #| msgid "settings" msgid "Settings" -msgstr "réglages" +msgstr "Réglages" #: libraries/server_synchronize.lib.php:1337 server_synchronize.php:1108 msgid "Source database" @@ -6464,7 +6476,7 @@ msgstr "Fin des informations sur l'anomalie" #: libraries/sqlparser.lib.php:367 msgid "Automatically appended backtick to the end of query!" -msgstr "" +msgstr "Un guillemet oblique a été ajouté à la fin de la requête!" #: libraries/sqlparser.lib.php:370 msgid "Unclosed quote" @@ -6547,11 +6559,11 @@ msgstr "" #: libraries/tbl_properties.inc.php:371 msgid "ENUM or SET data too long?" -msgstr "" +msgstr "Données trop longues pour ENUM ou SET?" #: libraries/tbl_properties.inc.php:373 msgid "Get more editing space" -msgstr "" +msgstr "Obtenir plus d'espace d'édition" #: libraries/tbl_properties.inc.php:396 msgctxt "for default" @@ -6728,16 +6740,14 @@ msgstr "" "du texte (par défaut: «...»)." #: libraries/user_preferences.inc.php:32 -#, fuzzy #| msgid "Other core settings" msgid "Manage your settings" -msgstr "Autres réglages de base" +msgstr "Gérer vos paramètres" #: libraries/user_preferences.inc.php:47 prefs_manage.php:291 -#, fuzzy #| msgid "Modifications have been saved" msgid "Configuration has been saved" -msgstr "Les modifications ont été sauvegardées" +msgstr "La configuration a été sauvegardée" #: libraries/user_preferences.inc.php:68 #, php-format @@ -6745,18 +6755,22 @@ msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." msgstr "" +"Vos préférences seront sauvegardées pour la session courante seulement. Un " +"stockage permanent requiert l'installation de %sstockage de configuration " +"phpMyAdmin%s." #: libraries/user_preferences.lib.php:141 -#, fuzzy #| msgid "Cannot load or save configuration" msgid "Could not save configuration" -msgstr "Impossible de charger ou sauvegarder la configuration" +msgstr "Impossible de sauvegarder la configuration" #: libraries/user_preferences.lib.php:308 msgid "" "Your browser has phpMyAdmin configuration for this domain. Would you like to " "import it for current session?" msgstr "" +"Votre navigateur contient une configuration phpMyAdmin pour ce domaine. " +"Voulez-vous l'importer dans la session courante?" #: libraries/zip_extension.lib.php:25 msgid "No files found inside ZIP archive!" @@ -6768,34 +6782,31 @@ msgid "Error in ZIP archive:" msgstr "Erreur rencontrée dans l'archive ZIP :" #: main.php:67 -#, fuzzy #| msgid "General relation features" msgid "General Settings" -msgstr "Fonctions relationnelles" +msgstr "Paramètres généraux" #: main.php:98 msgid "MySQL connection collation" msgstr "Interclassement pour la connexion MySQL" #: main.php:113 -#, fuzzy #| msgid "Other core settings" msgid "Appearance Settings" -msgstr "Autres réglages de base" +msgstr "Paramètres d'affichage" #: main.php:133 msgid "Background color" -msgstr "" +msgstr "Couleur d'arrière-plan" #: main.php:134 msgid "Choose..." -msgstr "" +msgstr "Choisissez..." #: main.php:151 prefs_manage.php:274 -#, fuzzy #| msgid "settings" msgid "More settings" -msgstr "réglages" +msgstr "Plus de paramètres" #: main.php:168 msgid "Protocol version" @@ -6837,7 +6848,7 @@ msgstr "Site officiel" #: main.php:221 msgid "Mailing lists" -msgstr "" +msgstr "Listes de courriel" #: main.php:247 msgid "" @@ -7065,42 +7076,42 @@ msgid "to/from page" msgstr "de/vers la page" #: prefs_forms.php:78 -#, fuzzy #| msgid "Submitted form contains errors" msgid "Cannot save settings, submitted form contains errors" -msgstr "Le formulaire soumis contient des erreurs" +msgstr "" +"Le formulaire soumis contient des erreurs, impossible de sauvegarder les " +"paramètres" #: prefs_manage.php:80 -#, fuzzy #| msgid "Could not load default configuration from: %1$s" msgid "Could not import configuration" -msgstr "Chargement de la configuration par défaut impossible depuis %1$s" +msgstr "Erreur d'importation de la configuration" #: prefs_manage.php:112 msgid "Configuration contains incorrect data for some fields." -msgstr "" +msgstr "La configuration contient des valeurs incorrectes pour certains champs." #: prefs_manage.php:128 msgid "Do you want to import remaining settings?" -msgstr "" +msgstr "Voulez-vous importer les autres paramètres?" #: prefs_manage.php:225 prefs_manage.php:251 msgid "Saved on: @DATE@" -msgstr "" +msgstr "Sauvegardé le : @DATE@" #: prefs_manage.php:239 -#, fuzzy #| msgid "Import files" msgid "Import from file" -msgstr "Importe les fichiers" +msgstr "Importer depuis le fichier" #: prefs_manage.php:245 msgid "Import from browser's storage" -msgstr "" +msgstr "Importer depuis le stockage du navigateur" #: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." msgstr "" +"Les paramètres seront importés depuis le stockage local de votre navigateur." #: prefs_manage.php:254 #, fuzzy @@ -9902,59 +9913,3 @@ msgstr "Changer le nom de la vue pour" #~ "d'apostrophes. Si vous devez entrer un caractère (\"\\\") ou une " #~ "apostrophe (\"'\") parmi ces valeurs, faites-le précéder du caractère " #~ "d'échappement, par exemple '\\\\xyz' or 'a\\'b')." - -#, fuzzy -#~| msgid "" -#~| "Please enter the values for transformation options using this format: " -#~| "'a', 100, b,'c'... If you ever need to put a backslash (\"\\\") or " -#~| "a single quote (\"'\") amongst those values, precede it with a backslash " -#~| "(for example '\\\\xyz' or 'a\\'b')." -#~ msgid "" -#~ "Enter each value in a separate field. If you ever need to put a backslash " -#~ "(\"\\\") or a single quote (\"'\") amongst those values, precede it with " -#~ "a backslash (for example '\\\\xyz' or 'a\\'b')." -#~ msgstr "" -#~ "Veuillez entrer les valeurs des options de transformation en suivant ce " -#~ "format: 'a', 100, b,'c'... Si vous devez entrer un caractère (\"\\" -#~ "\") ou une apostrophe (\"'\") parmi ces valeurs, faites-le précéder du " -#~ "caractère d'échappement, par exemple '\\\\xyz' or 'a\\'b')." - -#~ msgid "New table" -#~ msgstr "Nouvelle table" - -#~ msgid "server name" -#~ msgstr "nom de serveur" - -#~ msgid "database name" -#~ msgstr "nom de base de données" - -#~ msgid "table name" -#~ msgstr "nom de table" - -#~ msgid "Edit PDF Pages" -#~ msgstr "Préparer le schéma en PDF" - -#~ msgid "Data Dictionary Format" -#~ msgstr "Orientation du dictionnaire" - -#~ msgid "no" -#~ msgstr "non" - -#~ msgid "Enter login options for signon authentication" -#~ msgstr "Entrez les options pour l'authentification signon" - -#~ msgid "Signon login options" -#~ msgstr "Option de connexion signon" - -#~ msgid "PMA database" -#~ msgstr "Base de données PMA" - -#~ msgid "" -#~ "SQL queries settings, for SQL Query box options see [a@?page=form&" -#~ "formset=main_frame#tab_Sql_box]Navigation frame[/a] settings" -#~ msgstr "" -#~ "Réglages pour requêtes SQL, voir [a@?page=form&" -#~ "formset=main_frame#tab_Sql_box]Navigation frame[/a]" - -#~ msgid "yes" -#~ msgstr "oui" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10226-g35cf83b
by Michal Čihař 21 Sep '10

21 Sep '10

The branch, master has been updated via 35cf83bc12805c230f71c31653fd50c8751e32d7 (commit) via 4b313daa7a9c70c64a50a1786a5350876cb48c49 (commit) from 8f2546271cff3a91434cefbc77f9cf56d5e42168 (commit) - Log ----------------------------------------------------------------- commit 35cf83bc12805c230f71c31653fd50c8751e32d7 Merge: 8f2546271cff3a91434cefbc77f9cf56d5e42168 4b313daa7a9c70c64a50a1786a5350876cb48c49 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Sep 21 10:30:19 2010 +0200 Merge remote branch 'knittl/inline-edit-xss' commit 4b313daa7a9c70c64a50a1786a5350876cb48c49 Author: Daniel Knittl-Frank <knittl89+git(a)googlemail.com> Date: Mon Sep 20 18:12:05 2010 +0200 Fix persistent XSS in table browsing mode $where_clause was used instead of escaped $where_clause_html. This would only come into play when a string field was contained in the index (and thus used in the where clause). Signed-off-by: Daniel Knittl-Frank <knittl89+git(a)googlemail.com> ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 2 +- libraries/display_tbl_links.lib.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index a57c909..3520257 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1457,7 +1457,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } if( !empty($where_clause) ) { - $vertical_display['where_clause'][$row_no] = '<input type="hidden" class="where_clause" value ="' . $where_clause . '" />'; + $vertical_display['where_clause'][$row_no] = '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; } else { unset($vertical_display['where_clause'][$row_no]); diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php index a8511fe..d261fd0 100644 --- a/libraries/display_tbl_links.lib.php +++ b/libraries/display_tbl_links.lib.php @@ -61,6 +61,6 @@ if ($doWriteModifyAt == 'left') { * Used by jQuery scripts for handling inline editing */ if( !empty($where_clause)) { - echo '<input type="hidden" class="where_clause" value ="' . $where_clause . '" />'; + echo '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 6ad1cda3c4752f4a42a7aa745b0c94a8479386ac
by Michal Čihař 20 Sep '10

20 Sep '10

The branch, master has been updated via 6ad1cda3c4752f4a42a7aa745b0c94a8479386ac (commit) via fd062afe0f560a0b0c46f18ab7fd99e3dd7f8f4e (commit) via c6763fbdd51da3b004c4ace48ec132b25d04c576 (commit) from 283456c54ecc92672220117886b5ef0e68ec067a (commit) - Log ----------------------------------------------------------------- commit 6ad1cda3c4752f4a42a7aa745b0c94a8479386ac Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Sep 20 12:02:43 2010 +0200 Add missing screenshot. commit fd062afe0f560a0b0c46f18ab7fd99e3dd7f8f4e Merge: c6763fbdd51da3b004c4ace48ec132b25d04c576 283456c54ecc92672220117886b5ef0e68ec067a Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Sep 10 11:12:14 2010 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/website commit c6763fbdd51da3b004c4ace48ec132b25d04c576 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Sep 10 11:04:25 2010 +0200 Drop Subversion mentions, we're using Git for some time. ----------------------------------------------------------------------- Summary of changes: images/themes/smooth_yellow.png | Bin 0 -> 61831 bytes templates/downloads.tpl | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 images/themes/smooth_yellow.png diff --git a/images/themes/smooth_yellow.png b/images/themes/smooth_yellow.png new file mode 100644 index 0000000..ed413af Binary files /dev/null and b/images/themes/smooth_yellow.png differ diff --git a/templates/downloads.tpl b/templates/downloads.tpl index 1c0b330..3bf7f5e 100644 --- a/templates/downloads.tpl +++ b/templates/downloads.tpl @@ -64,7 +64,7 @@ </table> - More information about using subversion is available on <a + More information about using Git is available on <a href="${base_url}improve.${file_ext}#devel">development page</a>. @@ -74,7 +74,7 @@ href="https://sourceforge.net/projects/phpmyadmin/files/">SourceForge files page</a>. Releases which had security issues are removed from this download location, if you want to see them, you need to get them from our - Subversion repository (check <a href="${base_url}improve.${file_ext}#devel">developer information</a> for instructions). + Git repository (check <a href="${base_url}improve.${file_ext}#devel">developer information</a> for instructions). <py:for each="release in releases_older"> <h3>${release.fullname}</h3> hooks/post-receive -- phpMyAdmin website

1 0