The branch, master has been updated via ef0019cd909457d957920b7c31ec0b1097444652 (commit) via ed17ea17927b197a95952786f710592de31cf44a (commit) via 3706e9a2fd08ca3512a66cac433d9dcd1dc50e4b (commit) via a5b962a98122ffd05ad4837c163cc4b7badde19b (commit) via 75fda0be6584ef1d4ca6bb54ef9abcc92e667c46 (commit) via e6200bb19e12894a2a946e32414d178def3af15a (commit) via 4c7406f8a0a9fe4b9766cfd29ecc437c062e619b (commit) via 4a4f4abed1d6293d85b2972827588b046f442ce5 (commit) via f3ef0ba5f2dd2ca84279adcca4e4e4512080aef4 (commit) via 1f29aab41d00be52741f0d96e79b7a78759b2445 (commit) via 2f49894c12f6b5be63e3b9008b78dfac3881bab6 (commit) via faa5b053319a1c5d2f6316f82b74fcfc70f25af9 (commit) via ae7cd4e3d1dd31350be82cce033790109a186380 (commit) via 14f110ecdc9bc7cf0bd2a64df220ac930a9a90eb (commit) via 9472f0e5e9e7dd9c4bc1fc3f790d8a32d0b31e5f (commit) via f07a66ab90a7e13e24c0c713094d4c88126d09c4 (commit) via fcbf24de9a7c4995985f72285254de83b924d252 (commit) via 3ec29b69955464d4a0fc65f83a502e01373f6638 (commit) from e537f8831377dcef9ae944dd782308ca817491a5 (commit)
- Log ----------------------------------------------------------------- commit ef0019cd909457d957920b7c31ec0b1097444652 Merge: ed17ea17927b197a95952786f710592de31cf44a e537f8831377dcef9ae944dd782308ca817491a5 Author: Michal Čihař michal@cihar.com Date: Mon Apr 19 10:08:22 2010 +0200
Merge remote branch 'origin/master'
Conflicts: po/fr.po po/id.po po/lt.po
commit ed17ea17927b197a95952786f710592de31cf44a Author: Marc Delisle marc@infomarc.info Date: Sun Apr 18 14:10:25 2010 +0200
Translation update done using Pootle.
commit 3706e9a2fd08ca3512a66cac433d9dcd1dc50e4b Author: Marc Delisle marc@infomarc.info Date: Sun Apr 18 14:09:57 2010 +0200
Translation update done using Pootle.
commit a5b962a98122ffd05ad4837c163cc4b7badde19b Author: Marc Delisle marc@infomarc.info Date: Sun Apr 18 14:09:39 2010 +0200
Translation update done using Pootle.
commit 75fda0be6584ef1d4ca6bb54ef9abcc92e667c46 Author: Marc Delisle marc@infomarc.info Date: Sun Apr 18 14:08:33 2010 +0200
Translation update done using Pootle.
commit e6200bb19e12894a2a946e32414d178def3af15a Author: Marc Delisle marc@infomarc.info Date: Sun Apr 18 14:07:42 2010 +0200
Translation update done using Pootle.
commit 4c7406f8a0a9fe4b9766cfd29ecc437c062e619b Author: Marc Delisle marc@infomarc.info Date: Sun Apr 18 14:07:12 2010 +0200
Translation update done using Pootle.
commit 4a4f4abed1d6293d85b2972827588b046f442ce5 Author: Marc Delisle marc@infomarc.info Date: Sun Apr 18 14:05:46 2010 +0200
Translation update done using Pootle.
commit f3ef0ba5f2dd2ca84279adcca4e4e4512080aef4 Author: Marc Delisle marc@infomarc.info Date: Sun Apr 18 14:05:32 2010 +0200
Translation update done using Pootle.
commit 1f29aab41d00be52741f0d96e79b7a78759b2445 Author: Marc Delisle marc@infomarc.info Date: Sun Apr 18 13:55:44 2010 +0200
Translation update done using Pootle.
commit 2f49894c12f6b5be63e3b9008b78dfac3881bab6 Author: Marc Delisle marc@infomarc.info Date: Sun Apr 18 13:54:52 2010 +0200
Translation update done using Pootle.
commit faa5b053319a1c5d2f6316f82b74fcfc70f25af9 Author: Marc Delisle marc@infomarc.info Date: Sun Apr 18 13:53:22 2010 +0200
Translation update done using Pootle.
commit ae7cd4e3d1dd31350be82cce033790109a186380 Merge: 14f110ecdc9bc7cf0bd2a64df220ac930a9a90eb 5a75ca180ae0eb5c47a80428c7707cca6d5d1269 Author: Michal Čihař michal@cihar.com Date: Sun Apr 18 02:40:27 2010 +0200
Merge remote branch 'origin/master'
commit 14f110ecdc9bc7cf0bd2a64df220ac930a9a90eb Author: Azhari Harahap azhari.harahap@yahoo.com Date: Sat Apr 17 21:14:38 2010 +0200
Translation update done using Pootle.
commit 9472f0e5e9e7dd9c4bc1fc3f790d8a32d0b31e5f Merge: f07a66ab90a7e13e24c0c713094d4c88126d09c4 f3f41cbe78693781a9874c59a8ae736d324797bd Author: Michal Čihař michal@cihar.com Date: Sat Apr 17 20:40:25 2010 +0200
Merge remote branch 'origin/master'
commit f07a66ab90a7e13e24c0c713094d4c88126d09c4 Author: Rytis Slatkevičius rytis.s@gmail.com Date: Fri Apr 16 19:52:41 2010 +0200
Translation update done using Pootle.
commit fcbf24de9a7c4995985f72285254de83b924d252 Author: Rytis Slatkevičius rytis.s@gmail.com Date: Fri Apr 16 19:52:16 2010 +0200
Translation update done using Pootle.
commit 3ec29b69955464d4a0fc65f83a502e01373f6638 Author: Rytis Slatkevičius rytis.s@gmail.com Date: Fri Apr 16 19:51:54 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/fr.po | 28 ++++++++++++++-------------- po/id.po | 6 +++--- po/lt.po | 12 ++++++------ 3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/po/fr.po b/po/fr.po index 00a0009..b5091b6 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@lists.sourceforge.net\n" "POT-Creation-Date: 2010-04-18 08:42-0400\n" -"PO-Revision-Date: 2010-04-10 16:00+0200\n" +"PO-Revision-Date: 2010-04-18 14:10+0200\n" "Last-Translator: Marc marc@infomarc.info\n" "Language-Team: french fr@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.1\n"
@@ -277,7 +277,7 @@ msgstr "Ajouter des privilèges sur cette table"
#: libraries/messages.inc.php:48 msgid "Add search conditions (body of the "where" clause):" -msgstr "Critères de recherche (pour l'énoncé "where"):" +msgstr "Critères de recherche (pour l'énoncé "where") :"
#: libraries/messages.inc.php:49 #, php-format @@ -640,8 +640,8 @@ msgid "" "Cannot load [a@http://php.net/%1$s@Documentation%5D%5Bem%5D%1$s%5B/em%5D%5B/a] " "extension. Please check your PHP configuration." msgstr "" -"PHP ne peut charger l'extension [a@http://php.net/%1$s@Documentation%5D%5Bem%5D%1$s" -"[/em][/a]. Veuillez vérifier votre configuration de PHP." +"PHP ne peut charger l'extension [a@http://php.net/%1$s@Documentation%5D%5Bem%5D%" +"1$s[/em][/a]. Veuillez vérifier votre configuration de PHP."
#: libraries/messages.inc.php:136 msgid "" @@ -895,7 +895,7 @@ msgstr "La base de données %s a été copiée sur %s"
#: libraries/messages.inc.php:188 msgid "Copy table to (database<b>.</b>table):" -msgstr "<b>Copier</b> la table vers (base<b>.</b>table) :" +msgstr "Copier la table vers (base<b>.</b>table) :"
#: libraries/messages.inc.php:189 #, php-format @@ -1281,7 +1281,7 @@ msgstr "<b>Afficher le schéma</b> en PDF"
#: libraries/messages.inc.php:276 msgid "Do a "query by example" (wildcard: "%")" -msgstr "Recherche par valeur (passepartout: "%")" +msgstr "Recherche par valeur (passepartout: "%") "
#: libraries/messages.inc.php:277 msgid "DocSQL" @@ -2419,7 +2419,7 @@ msgstr "Déplacer le menu"
#: libraries/messages.inc.php:534 msgid "Move table to (database<b>.</b>table):" -msgstr "<b>Déplacer</b> la table vers (base<b>.</b>table) :" +msgstr "Déplacer la table vers (base<b>.</b>table) : "
#: libraries/messages.inc.php:535 #, php-format @@ -3662,8 +3662,8 @@ msgid "" "Only slaves started with the --report-host=host_name option are visible in " "this list." msgstr "" -"Seuls les esclaves démarrés avec l'option --report-host=host_name option " -"sont visibles sur cette liste." +"Seuls les esclaves démarrés avec l'option --report-host=host_name sont " +"visibles sur cette liste."
#: libraries/messages.inc.php:797 msgid "Show connected slaves" @@ -5691,7 +5691,7 @@ msgid "" "third options are the width and the height in pixels." msgstr "" "Affiche une image et un lien, le champ contient le nom du fichier. La " -"première option est un préfixe URL tel que "http://domaine.com/%5C". La " +"première option est un préfixe URL tel que "http://www.example.com/%5C". La " "seconde option est la largeur en pixels et la troisième option est la " "hauteur en pixels."
@@ -5702,8 +5702,8 @@ msgid "" "the link." msgstr "" "Affiche un lien, le champ contient le nom du fichier; en première option, un " -"préfixe comme "http://domaine.com/%5C", en seconde option, un titre pour le " -"lien." +"préfixe comme "http://www.example.com/%5C", en seconde option, un titre pour " +"le lien."
#: libraries/messages.inc.php:1200 msgid "Formats text as SQL query with syntax highlighting." @@ -6095,7 +6095,7 @@ msgstr "Préfixer avec \ les passepartouts _ et % pour un usage littéral" #, fuzzy, php-format #| msgid "Configuration" msgid "Configuration: %s" -msgstr "Configuration" +msgstr "Configuration : %s"
#: setup/lib/messages.inc.php:16 msgid "Allow character set conversion" diff --git a/po/id.po b/po/id.po index 3e66105..8d1d34a 100644 --- a/po/id.po +++ b/po/id.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-04-18 08:42-0400\n" -"PO-Revision-Date: 2010-03-28 13:56+0200\n" +"PO-Revision-Date: 2010-04-17 21:14+0200\n" "Last-Translator: Azhari Harahap azhari.harahap@yahoo.com\n" "Language-Team: indonesian id@li.org\n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n"
@@ -7437,7 +7437,7 @@ msgstr ""
#: setup/lib/messages.inc.php:377 msgid "Warning" -msgstr "" +msgstr "Peringatan"
#: setup/lib/messages.inc.php:378 msgid "" diff --git a/po/lt.po b/po/lt.po index 1449484..0509c15 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-04-18 08:42-0400\n" -"PO-Revision-Date: 2010-04-02 18:26+0200\n" -"Last-Translator: edgaras.janusauskas@gmail.com\n" +"PO-Revision-Date: 2010-04-16 19:52+0200\n" +"Last-Translator: Rytis rytis.s@gmail.com\n" "Language-Team: lithuanian lt@li.org\n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: lt\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" "100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.1\n" @@ -64,7 +64,7 @@ msgstr "" #, fuzzy #| msgid "Engines" msgid "Inline" -msgstr "Varikliai" +msgstr ""
#: libraries/Message.class.php:282 #, php-format @@ -415,7 +415,7 @@ msgstr "Didėjimo tvarka"
#: libraries/messages.inc.php:78 msgid "As defined:" -msgstr "" +msgstr "Kaip nurodyta:"
#: libraries/messages.inc.php:79 msgid "At Beginning of Table" @@ -509,7 +509,7 @@ msgstr "Išjungti"
#: libraries/messages.inc.php:102 msgid "You are about to DISABLE a BLOB Repository!" -msgstr "" +msgstr "Jūs ruošiatės IŠJUNGTI BLOB saugyklą!"
#: libraries/messages.inc.php:103 msgctxt "$strBLOBRepositoryEnabled"
hooks/post-receive
-
Michal Čihař