The branch, master has been updated via 89183886a69f8b4e00ec222de792f42c39a48cf7 (commit) via d4c74fdc6e7a621a75ba2e0116c42a164cd132ad (commit) via 4528f507c795b29516540135feb202211954db68 (commit) via 850db69aad8ecd9d6872d23cfc7d9dc7eaac9de6 (commit) via 5d0b81daab4ab622c757f833efd8176124c9eb8d (commit) via 34edcdece49ba7da6bc794784aa7147b858c4930 (commit) via 5c027d777df3ac89b3558650f851dc262cce0101 (commit) from 00604060e83ed82fb874209b4364fc4c69902798 (commit) - Log ----------------------------------------------------------------- commit 89183886a69f8b4e00ec222de792f42c39a48cf7 Author: u4663530 <u4663530@anu.edu.au> Date: Thu May 13 05:52:05 2010 +0200 Translation update done using Pootle. commit d4c74fdc6e7a621a75ba2e0116c42a164cd132ad Author: u4663530 <u4663530@anu.edu.au> Date: Thu May 13 05:51:38 2010 +0200 Translation update done using Pootle. commit 4528f507c795b29516540135feb202211954db68 Author: u4663530 <u4663530@anu.edu.au> Date: Thu May 13 05:51:35 2010 +0200 Translation update done using Pootle. commit 850db69aad8ecd9d6872d23cfc7d9dc7eaac9de6 Author: u4663530 <u4663530@anu.edu.au> Date: Thu May 13 05:51:10 2010 +0200 Translation update done using Pootle. commit 5d0b81daab4ab622c757f833efd8176124c9eb8d Merge: 34edcdece49ba7da6bc794784aa7147b858c4930 00604060e83ed82fb874209b4364fc4c69902798 Author: Pootle server <pootle@cihar.com> Date: Wed May 12 20:40:10 2010 +0200 Merge remote branch 'origin/master' commit 34edcdece49ba7da6bc794784aa7147b858c4930 Merge: 5c027d777df3ac89b3558650f851dc262cce0101 c38f34393fe477870a1bb97a9c40444bb18fa4f2 Author: Pootle server <pootle@cihar.com> Date: Wed May 12 18:40:08 2010 +0200 Merge remote branch 'origin/master' commit 5c027d777df3ac89b3558650f851dc262cce0101 Author: Marc Delisle <marc@infomarc.info> Date: Wed May 12 18:01:23 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 5 ++--- po/hi.po | 11 ++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/po/fr.po b/po/fr.po index 94abbfe..709fbac 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-05-11 13:05-0400\n" -"PO-Revision-Date: 2010-05-10 14:16+0200\n" +"PO-Revision-Date: 2010-05-12 18:01+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" @@ -2924,7 +2924,6 @@ msgstr "" #. l10n: This is currently used only in Japanese locales #: libraries/kanji-encoding.lib.php:143 -#, fuzzy #| msgid "Recoding engine" msgid "Encoding conversion" msgstr "Conversion de l'encodage" diff --git a/po/hi.po b/po/hi.po index f07cd57..3351db9 100644 --- a/po/hi.po +++ b/po/hi.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-05-11 13:05-0400\n" -"PO-Revision-Date: 2010-05-10 14:17+0200\n" +"PO-Revision-Date: 2010-05-13 05:52+0200\n" "Last-Translator: <u4663530@anu.edu.au>\n" "Language-Team: hindi <hi@li.org>\n" +"Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -25,7 +25,7 @@ msgstr "सभी दिखाओ" #: libraries/export/pdf.php:147 libraries/messages.inc.php:605 #: pdf_schema.php:284 pdf_schema.php:1124 pdf_schema.php:1140 msgid "Page number:" -msgstr "" +msgstr "पृष्ठ संख्या:" #: browse_foreigners.php:132 libraries/messages.inc.php:1250 msgid "" @@ -33,8 +33,9 @@ msgid "" "parent window, or your browser's security settings are configured to block " "cross-window updates." msgstr "" -"लक्ष्य ब्राउज़र विंडो को अद्यतन नहीं किया जा सकता है. शायद तुमने मूल विंडो बंद कर दिया है," -"या अपनी ब्राउसर की सिक्यूरिटी सेट्टिंग को क्रोस-विंडो अद्यतन के लिए कांफिगुर कर रखा है." +"लक्ष्य ब्राउज़र विंडो को अद्यतन नहीं किया जा सकता है. शायद तुमने मूल विंडो " +"बंद कर दिया है,या अपनी ब्राउसर की सिक्यूरिटी सेट्टिंग को क्रोस-विंडो अद्यतन " +"के लिए कांफिगुर कर रखा है." #: browse_foreigners.php:150 db_structure.php:79 db_structure.php:80 #: db_structure.php:91 db_structure.php:93 db_structure.php:104 hooks/post-receive -- phpMyAdmin