Merge remote branch 'pootle/master'
Conflicts: po/fr.po po/hi.po po/nb.po
This commit is contained in:
Michal Čihař
18
po/fr.po
18
po/fr.po
@@ -4,7 +4,7 @@ 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-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@infomarc.info>\n"
|
||||
"Language-Team: french <fr@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
|
||||
|
||||
9
po/hi.po
9
po/hi.po
@@ -4,7 +4,7 @@ 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-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@anu.edu.au>\n"
|
||||
"Language-Team: hindi <hi@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
|
||||
|
||||
20
po/nb.po
20
po/nb.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-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@gmail.com>\n"
|
||||
"Language-Team: norwegian <no@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
|
||||
|
||||
Reference in New Issue
Block a user