[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2977-g7bf1188

Michal Čihař nijel at users.sourceforge.net
Mon May 10 14:21:11 CEST 2010 

The branch, master has been updated
       via  7bf11881a021cb075c791faa4e0031dacb69ada8 (commit)
       via  78bf68f4cd049877aa2421bcc1000c072992b242 (commit)
       via  47f65e03a32d5fa93b306af1ab33265f1f6c4c1e (commit)
       via  51becf5d6a7b15b78c17ed4d9da23e80fadba7c6 (commit)
       via  3a69f57d2e4a48e6f59e3edff75308034b758b9d (commit)
       via  03daa1112b0a15606c7dd52c7d8f916cb504573d (commit)
       via  a4b9ec7ab42db705d6d42bc0908b087646b46121 (commit)
       via  df15b29460dee6587b51bfa25fc89b47eb3bcb23 (commit)
       via  5199997c5520e5bba5b22fd29a5bb6512690d6a7 (commit)
       via  b086c0ca73ce6f3f242e6ba2b4d08dacd163e953 (commit)
       via  cf3fd1b33d2b7b7c0a80fd26c7a094a718979071 (commit)
       via  28eb92ee72ab28e192a4a8d810d98519c4a62b34 (commit)
       via  83e93911ade08acdd1f0452a5a652a06a8515744 (commit)
       via  72bae4b972c53c7d2d35a15137a94a667cb7547d (commit)
       via  227ce7913b4d12c069639b8a749c631c21c76635 (commit)
      from  d47b913599355823b036d54093cf484c6236f9dd (commit)


- Log -----------------------------------------------------------------
commit 7bf11881a021cb075c791faa4e0031dacb69ada8
Merge: d47b913599355823b036d54093cf484c6236f9dd 78bf68f4cd049877aa2421bcc1000c072992b242
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon May 10 14:20:47 2010 +0200

    Merge remote branch 'pootle/master'
    
    Conflicts:
    	po/fr.po
    	po/hi.po
    	po/nb.po

commit 78bf68f4cd049877aa2421bcc1000c072992b242
Author: u4663530 <u4663530 at anu.edu.au>
Date:   Mon May 10 14:17:29 2010 +0200

    Translation update done using Pootle.

commit 47f65e03a32d5fa93b306af1ab33265f1f6c4c1e
Author: u4663530 <u4663530 at anu.edu.au>
Date:   Mon May 10 14:17:02 2010 +0200

    Translation update done using Pootle.

commit 51becf5d6a7b15b78c17ed4d9da23e80fadba7c6
Author: u4663530 <u4663530 at anu.edu.au>
Date:   Mon May 10 14:16:49 2010 +0200

    Translation update done using Pootle.

commit 3a69f57d2e4a48e6f59e3edff75308034b758b9d
Author: u4663530 <u4663530 at anu.edu.au>
Date:   Mon May 10 14:16:32 2010 +0200

    Translation update done using Pootle.

commit 03daa1112b0a15606c7dd52c7d8f916cb504573d
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon May 10 14:16:01 2010 +0200

    Translation update done using Pootle.

commit a4b9ec7ab42db705d6d42bc0908b087646b46121
Author: u4663530 <u4663530 at anu.edu.au>
Date:   Mon May 10 14:16:00 2010 +0200

    Translation update done using Pootle.

commit df15b29460dee6587b51bfa25fc89b47eb3bcb23
Author: u4663530 <u4663530 at anu.edu.au>
Date:   Mon May 10 14:15:48 2010 +0200

    Translation update done using Pootle.

commit 5199997c5520e5bba5b22fd29a5bb6512690d6a7
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon May 10 14:14:01 2010 +0200

    Translation update done using Pootle.

commit b086c0ca73ce6f3f242e6ba2b4d08dacd163e953
Author: u4663530 <u4663530 at anu.edu.au>
Date:   Mon May 10 14:14:00 2010 +0200

    Translation update done using Pootle.

commit cf3fd1b33d2b7b7c0a80fd26c7a094a718979071
Author: u4663530 <u4663530 at anu.edu.au>
Date:   Mon May 10 14:13:40 2010 +0200

    Translation update done using Pootle.

commit 28eb92ee72ab28e192a4a8d810d98519c4a62b34
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon May 10 14:13:34 2010 +0200

    Translation update done using Pootle.

commit 83e93911ade08acdd1f0452a5a652a06a8515744
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date:   Mon May 10 14:08:32 2010 +0200

    Translation update done using Pootle.

commit 72bae4b972c53c7d2d35a15137a94a667cb7547d
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date:   Mon May 10 14:08:23 2010 +0200

    Translation update done using Pootle.

commit 227ce7913b4d12c069639b8a749c631c21c76635
Author: sven.erik.andersen <sven.erik.andersen at gmail.com>
Date:   Mon May 10 14:07:39 2010 +0200

    Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes:
 po/fr.po |   18 ++++++++++++++++--
 po/hi.po |    9 ++++-----
 po/nb.po |   20 +++++++++++++++++---
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 9b87ffd..cc54f0e 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 at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-05-10 14:17+0200\n"
-"PO-Revision-Date: 2010-05-09 22:26+0200\n"
+"PO-Revision-Date: 2010-05-10 14:16+0200\n"
 "Last-Translator: Marc <marc at infomarc.info>\n"
 "Language-Team: french <fr at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -2836,6 +2836,7 @@ msgid "Go to view"
 msgstr "Aller à la vue"
 
 #. l10n: This is currently used only in Japanese locales
+<<<<<<< HEAD
 #: libraries/kanji-encoding.lib.php:143
 #, fuzzy
 #| msgid "Recoding engine"
@@ -2845,15 +2846,28 @@ msgstr "Moteur de conversion"
 #. l10n: This is currently used only in Japanese locales
 #: libraries/kanji-encoding.lib.php:145
 #, fuzzy
+=======
+#: libraries/kanji-encoding.lib.php:142
+>>>>>>> pootle/master
 #| msgid "None"
 msgctxt "None encoding conversion"
 msgid "None"
 msgstr "aucune"
 
 #. l10n: This is currently used only in Japanese locales
+<<<<<<< HEAD
 #: libraries/kanji-encoding.lib.php:151
+=======
+#: libraries/kanji-encoding.lib.php:146
+#| msgid "Recoding engine"
+msgid "encoding conversion"
+msgstr "Conversion de l'encodage"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:149
+>>>>>>> pootle/master
 msgid "Convert to Kana"
-msgstr ""
+msgstr "Conversion en kana"
 
 #. l10n: Text direction, use either ltr or rtl
 #: libraries/messages.inc.php:19
diff --git a/po/hi.po b/po/hi.po
index 14125b0..955fca3 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-05-10 14:17+0200\n"
-"PO-Revision-Date: 2010-05-10 10:00+0200\n"
+"PO-Revision-Date: 2010-05-10 14:17+0200\n"
 "Last-Translator:  <u4663530 at anu.edu.au>\n"
 "Language-Team: hindi <hi at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -227,7 +227,7 @@ msgstr " डेटाबेस %s से %s में कॉपी किया
 
 #: db_operations.php:410 libraries/messages.inc.php:244
 msgid "Rename database to"
-msgstr "दताबसे का नाम बदल कर ____ रखें"
+msgstr "डेटाबेस का नाम बदल कर ____ रखें"
 
 #: db_operations.php:415 libraries/messages.inc.php:169
 #: server_processlist.php:57
@@ -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
@@ -293,7 +293,6 @@ msgid "Status"
 msgstr "स्थिति"
 
 #: db_operations.php:544
-#, fuzzy
 #| msgctxt "$strBLOBRepositoryEnabled"
 #| msgid "Enabled"
 msgctxt "BLOB repository"
@@ -330,7 +329,7 @@ msgstr "सक्षम"
 #: tbl_select.php:137 tbl_structure.php:179 tbl_structure.php:768
 #: tbl_tracking.php:275 tbl_tracking.php:326
 msgid "Collation"
-msgstr ""
+msgstr "क्रम में करें"
 
 #: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
 #, php-format
diff --git a/po/nb.po b/po/nb.po
index 146ab4c..06ad6e3 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-05-10 14:17+0200\n"
-"PO-Revision-Date: 2010-05-06 08:35+0200\n"
+"PO-Revision-Date: 2010-05-10 14:08+0200\n"
 "Last-Translator:  <sven.erik.andersen at gmail.com>\n"
 "Language-Team: norwegian <no at li.org>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.1\n"
 
@@ -2804,6 +2804,7 @@ msgid "Go to view"
 msgstr "Gå til visning"
 
 #. l10n: This is currently used only in Japanese locales
+<<<<<<< HEAD
 #: libraries/kanji-encoding.lib.php:143
 #, fuzzy
 #| msgid "Recoding engine"
@@ -2813,15 +2814,28 @@ msgstr "Rekodingsmotor"
 #. l10n: This is currently used only in Japanese locales
 #: libraries/kanji-encoding.lib.php:145
 #, fuzzy
+=======
+#: libraries/kanji-encoding.lib.php:142
+>>>>>>> pootle/master
 #| msgid "None"
 msgctxt "None encoding conversion"
 msgid "None"
 msgstr "Ingen"
 
 #. l10n: This is currently used only in Japanese locales
+<<<<<<< HEAD
 #: libraries/kanji-encoding.lib.php:151
+=======
+#: libraries/kanji-encoding.lib.php:146
+#| msgid "Recoding engine"
+msgid "encoding conversion"
+msgstr "kodingskonvertering"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:149
+>>>>>>> pootle/master
 msgid "Convert to Kana"
-msgstr ""
+msgstr "Konverter til Kana"
 
 #. l10n: Text direction, use either ltr or rtl
 #: libraries/messages.inc.php:19


hooks/post-receive
-- 
phpMyAdmin

More information about the Git mailing list