10 May
2010
10 May
'10
2:33 p.m.
The branch, master has been updated
via 5b815953d9ba1413b78eadfa1b294011e6255400 (commit)
via fd49308bffd6e7c5d6aa298a1264e09ae3cbb73e (commit)
via 65a4aecde1974ae4a8dffc12853aaa95aa5cb352 (commit)
via 05b7f1a230f8ae1248877f119b817280099e3cac (commit)
via f3414fa611102a5ce2cfd02c8406b43d094a13b7 (commit)
via 52cd7d436d408eda06c24cdd49e13b21f6974888 (commit)
via 73a95305a9d254822d1fa47f6ba1195363512c6a (commit)
via 5f5fbe427faa5bbb18095894f232745ceba3c4bc (commit)
via 9da7c19c0002d2c7bfac87d54c79371e466eb8ab (commit)
via c2fb36705c780d4ebd4ae2e17ea3b7f7e9312d5a (commit)
via 6f2586a00e24df411551923bb143fcf555fcd1dc (commit)
via 46fba4fb638c38f905e77b1f7cbc776fc17e86a3 (commit)
via a100e183cf5973da3e94f6310b0b3c2e12473508 (commit)
via 7ef7b0fc56052c53f8700fa36337d1ee61f3d8d9 (commit)
via da987d195dc4e6b7a38f750e3038eeb1fd4ab6a6 (commit)
via 523dbbe3d170c90871cfb48b84f98a78ccf4a3a3 (commit)
via f8eeb59cf96c8ca7510b903ed3e2e2fea74b7d4c (commit)
via 0bf85872fed944ab13f9feea102cbe09c5aeb44d (commit)
via 9fbcff7cb7a2edcb11fbbc8205b7724be24d4307 (commit)
via f9d1ed025a4dd1f03aa4a95563908ce61afcbd5e (commit)
via 791f0f12c3c6e136bf9d4be583d62c08f198d205 (commit)
via 387bcf07dec3de98181b8d26fdc2a28f1737aa1a (commit)
via ae701494ebdd9f9c421b55e6af4ac71ab6feb888 (commit)
from c3768afb229c2b250d4ec418c1eb81054ba546c2 (commit)
- Log -----------------------------------------------------------------
commit 5b815953d9ba1413b78eadfa1b294011e6255400
Merge: c3768afb229c2b250d4ec418c1eb81054ba546c2 fd49308bffd6e7c5d6aa298a1264e09ae3cbb73e
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon May 10 13:33:04 2010 +0200
Merge remote branch 'pootle/master'
Conflicts:
po/fr.po
po/hi.po
commit fd49308bffd6e7c5d6aa298a1264e09ae3cbb73e
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 10:00:56 2010 +0200
Translation update done using Pootle.
commit 65a4aecde1974ae4a8dffc12853aaa95aa5cb352
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 10:00:47 2010 +0200
Translation update done using Pootle.
commit 05b7f1a230f8ae1248877f119b817280099e3cac
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 10:00:42 2010 +0200
Translation update done using Pootle.
commit f3414fa611102a5ce2cfd02c8406b43d094a13b7
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 10:00:11 2010 +0200
Translation update done using Pootle.
commit 52cd7d436d408eda06c24cdd49e13b21f6974888
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:59:55 2010 +0200
Translation update done using Pootle.
commit 73a95305a9d254822d1fa47f6ba1195363512c6a
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:59:31 2010 +0200
Translation update done using Pootle.
commit 5f5fbe427faa5bbb18095894f232745ceba3c4bc
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:58:17 2010 +0200
Translation update done using Pootle.
commit 9da7c19c0002d2c7bfac87d54c79371e466eb8ab
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:57:22 2010 +0200
Translation update done using Pootle.
commit c2fb36705c780d4ebd4ae2e17ea3b7f7e9312d5a
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:56:21 2010 +0200
Translation update done using Pootle.
commit 6f2586a00e24df411551923bb143fcf555fcd1dc
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:55:06 2010 +0200
Translation update done using Pootle.
commit 46fba4fb638c38f905e77b1f7cbc776fc17e86a3
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:54:59 2010 +0200
Translation update done using Pootle.
commit a100e183cf5973da3e94f6310b0b3c2e12473508
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:53:34 2010 +0200
Translation update done using Pootle.
commit 7ef7b0fc56052c53f8700fa36337d1ee61f3d8d9
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:51:47 2010 +0200
Translation update done using Pootle.
commit da987d195dc4e6b7a38f750e3038eeb1fd4ab6a6
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:51:17 2010 +0200
Translation update done using Pootle.
commit 523dbbe3d170c90871cfb48b84f98a78ccf4a3a3
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:49:26 2010 +0200
Translation update done using Pootle.
commit f8eeb59cf96c8ca7510b903ed3e2e2fea74b7d4c
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:47:03 2010 +0200
Translation update done using Pootle.
commit 0bf85872fed944ab13f9feea102cbe09c5aeb44d
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:46:56 2010 +0200
Translation update done using Pootle.
commit 9fbcff7cb7a2edcb11fbbc8205b7724be24d4307
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:46:09 2010 +0200
Translation update done using Pootle.
commit f9d1ed025a4dd1f03aa4a95563908ce61afcbd5e
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:44:16 2010 +0200
Translation update done using Pootle.
commit 791f0f12c3c6e136bf9d4be583d62c08f198d205
Merge: 387bcf07dec3de98181b8d26fdc2a28f1737aa1a bcf9a3a5f30846296b530a819430d3208f1f368d
Author: Pootle server <pootle(a)cihar.com>
Date: Mon May 10 08:40:15 2010 +0200
Merge remote branch 'origin/master' into HEAD
commit 387bcf07dec3de98181b8d26fdc2a28f1737aa1a
Merge: ae701494ebdd9f9c421b55e6af4ac71ab6feb888 632211d06557ceb56131a059e5eb116f65fcbedd
Author: Pootle server <pootle(a)cihar.com>
Date: Mon May 10 07:35:30 2010 +0200
Merge remote branch 'origin/master' into HEAD
Conflicts:
po/fr.po
commit ae701494ebdd9f9c421b55e6af4ac71ab6feb888
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sun May 9 22:26:51 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/fr.po | 4 ++--
po/hi.po | 49 ++++++++++++++++---------------------------------
2 files changed, 18 insertions(+), 35 deletions(-)
diff --git a/po/fr.po b/po/fr.po
index 5af3ddb..487895d 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-05-10 09:35+0200\n"
-"PO-Revision-Date: 2010-05-04 16:34+0200\n"
+"PO-Revision-Date: 2010-05-09 22:26+0200\n"
"Last-Translator: Marc <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.1\n"
diff --git a/po/hi.po b/po/hi.po
index b799c6c..d1ccd52 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(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-05-10 09:35+0200\n"
-"PO-Revision-Date: 2010-05-05 04:47+0200\n"
+"PO-Revision-Date: 2010-05-10 10:00+0200\n"
"Last-Translator: <u4663530(a)anu.edu.au>\n"
"Language-Team: hindi <hi(a)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"
@@ -88,12 +88,12 @@ msgstr "वर्णन"
#: browse_foreigners.php:268 browse_foreigners.php:276
#: libraries/messages.inc.php:1226
msgid "Use this value"
-msgstr "इस वाल्यु का उपयोग करें"
+msgstr "इस वेलियु का उपयोग करें"
#: db_create.php:46 libraries/messages.inc.php:223
#, php-format
msgid "Database %1$s has been created."
-msgstr ""
+msgstr "%1$s डेटाबेस बनाया गया है."
#: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
msgid "Database comment: "
@@ -199,7 +199,7 @@ msgstr "छापें"
#: db_export.php:29 libraries/messages.inc.php:1234
msgid "View dump (schema) of database"
-msgstr "डंप (स्कीमा) डेटाबेस दिखाएं"
+msgstr "डेटाबेस का डंप (स्कीमा) दिखाएं"
#: db_export.php:43 db_search.php:344 libraries/messages.inc.php:853
#: server_export.php:27
@@ -209,21 +209,21 @@ msgstr "सभी का चयन करें"
#: db_export.php:45 db_search.php:347 libraries/messages.inc.php:1196
#: server_export.php:29
msgid "Unselect All"
-msgstr " सभी को रद्द करें"
+msgstr "सभी को रद्द करें"
#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
msgid "The database name is empty!"
-msgstr ""
+msgstr "डेटाबेस नाम खाली है"
#: db_operations.php:236 libraries/messages.inc.php:761
#, php-format
msgid "Database %s has been renamed to %s"
-msgstr ""
+msgstr " डेटाबेस का नाम %s बदल कर %s रखा गया है"
#: db_operations.php:240 libraries/messages.inc.php:186
#, php-format
msgid "Database %s has been copied to %s"
-msgstr ""
+msgstr " डेटाबेस %s से %s में कॉपी किया गया है"
#: db_operations.php:410 libraries/messages.inc.php:244
msgid "Rename database to"
@@ -240,7 +240,7 @@ msgstr "और फिर"
#: db_operations.php:451 libraries/messages.inc.php:241
msgid "Copy database to"
-msgstr ""
+msgstr "डेटाबेस को ______ में कॉपी करें"
#: db_operations.php:458 libraries/messages.inc.php:1051
#: tbl_operations.php:526 tbl_tracking.php:388
@@ -259,7 +259,7 @@ msgstr "केवल डाटा"
#: db_operations.php:468 libraries/messages.inc.php:194
msgid "CREATE DATABASE before copying"
-msgstr ""
+msgstr "डेटाबेस कॉपी करने पहले डेटाबेस का निर्माण करें"
#: db_operations.php:471 libraries/export/sql.php:52
#: libraries/export/sql.php:74 libraries/export/sql.php:76
@@ -276,11 +276,11 @@ msgstr "AUTO_INCREMENT मूल्य जोडें"
#: db_operations.php:479 libraries/messages.inc.php:39 tbl_operations.php:543
msgid "Add constraints"
-msgstr "कांस्त्रैन्ट्स जोडें"
+msgstr "शर्तें जोडें"
#: db_operations.php:492 libraries/messages.inc.php:1067
msgid "Switch to copied database"
-msgstr ""
+msgstr "नक़ल किये गए डाटाबेस पर जायें"
#: db_operations.php:533 libraries/messages.inc.php:97
msgid "BLOB Repository"
@@ -290,7 +290,7 @@ msgstr "BLOB भंडार गृह"
#: libraries/messages.inc.php:1045 libraries/server_links.inc.php:49
#: server_processlist.php:59 tbl_tracking.php:596 test/theme.php:101
msgid "Status"
-msgstr ""
+msgstr "स्थिति"
#: db_operations.php:544
#, fuzzy
@@ -302,14 +302,13 @@ msgstr "सक्षम"
#: db_operations.php:548 libraries/messages.inc.php:101
msgid "Disable"
-msgstr "दिसअबल "
+msgstr "असक्षम"
#: db_operations.php:558 libraries/messages.inc.php:98
msgid "Damaged"
msgstr "क्षतिग्रस्त"
#: db_operations.php:562
-#, fuzzy
#| msgctxt "$strBLOBRepositoryRepair"
#| msgid "Repair"
msgctxt "BLOB repository"
@@ -317,12 +316,11 @@ msgid "Repair"
msgstr "मरम्मत"
#: db_operations.php:570
-#, fuzzy
#| msgctxt "$strBLOBRepositoryDisabled"
#| msgid "Disabled"
msgctxt "BLOB repository"
msgid "Disabled"
-msgstr "दिसअबल्ड "
+msgstr "असक्षम"
#: db_operations.php:574 libraries/messages.inc.php:104
msgid "Enable"
@@ -8097,18 +8095,3 @@ msgstr " %s कोलम पर इन्डेक्स बना
msgctxt "for MIME transformation"
msgid "Description"
msgstr "वर्णन"
-
-#, fuzzy
-#~| msgid "No"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "नहीं"
-
-#, fuzzy
-#~| msgid "No"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "नहीं"
-
-#~ msgid "has been altered."
-#~ msgstr "को बदला गया। "
hooks/post-receive
--
phpMyAdmin