nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup after wrong merge.

Browse Source
This commit is contained in:
Michal Čihař
2010-05-10 15:26:22 +02:00
parent 23e96896ac
commit 355b4c97bd
2 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
po/fr.po
View File

@@ -2836,36 +2836,21 @@ msgid "Go to view"
msgstr "Aller à la vue" msgstr "Aller à la vue"
#. l10n: This is currently used only in Japanese locales #. l10n: This is currently used only in Japanese locales
<<<<<<< HEAD
#: libraries/kanji-encoding.lib.php:143 #: libraries/kanji-encoding.lib.php:143
#, fuzzy #, fuzzy
#| msgid "Recoding engine" #| msgid "Recoding engine"
msgid "Encoding conversion" msgid "Encoding conversion"
msgstr "Moteur de conversion" msgstr "Conversion de l'encodage"
#. l10n: This is currently used only in Japanese locales #. l10n: This is currently used only in Japanese locales
#: libraries/kanji-encoding.lib.php:145
#, fuzzy
=======
#: libraries/kanji-encoding.lib.php:142 #: libraries/kanji-encoding.lib.php:142
>>>>>>> pootle/master
#| msgid "None" #| msgid "None"
msgctxt "None encoding conversion" msgctxt "None encoding conversion"
msgid "None" msgid "None"
msgstr "aucune" msgstr "aucune"
#. l10n: This is currently used only in Japanese locales #. l10n: This is currently used only in Japanese locales
<<<<<<< HEAD
#: libraries/kanji-encoding.lib.php:151 #: 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" msgid "Convert to Kana"
msgstr "Conversion en kana" msgstr "Conversion en kana"

10
po/nb.po
View File

@@ -2804,7 +2804,6 @@ msgid "Go to view"
msgstr "Gå til visning" msgstr "Gå til visning"
#. l10n: This is currently used only in Japanese locales #. l10n: This is currently used only in Japanese locales
<<<<<<< HEAD
#: libraries/kanji-encoding.lib.php:143 #: libraries/kanji-encoding.lib.php:143
#, fuzzy #, fuzzy
#| msgid "Recoding engine" #| msgid "Recoding engine"
@@ -2812,28 +2811,19 @@ msgid "Encoding conversion"
msgstr "Rekodingsmotor" msgstr "Rekodingsmotor"
#. l10n: This is currently used only in Japanese locales #. l10n: This is currently used only in Japanese locales
#: libraries/kanji-encoding.lib.php:145
#, fuzzy
=======
#: libraries/kanji-encoding.lib.php:142 #: libraries/kanji-encoding.lib.php:142
>>>>>>> pootle/master
#| msgid "None" #| msgid "None"
msgctxt "None encoding conversion" msgctxt "None encoding conversion"
msgid "None" msgid "None"
msgstr "Ingen" msgstr "Ingen"
#. l10n: This is currently used only in Japanese locales #. l10n: This is currently used only in Japanese locales
<<<<<<< HEAD
#: libraries/kanji-encoding.lib.php:151 #: libraries/kanji-encoding.lib.php:151
=======
#: libraries/kanji-encoding.lib.php:146
#| msgid "Recoding engine"
msgid "encoding conversion" msgid "encoding conversion"
msgstr "kodingskonvertering" msgstr "kodingskonvertering"
#. l10n: This is currently used only in Japanese locales #. l10n: This is currently used only in Japanese locales
#: libraries/kanji-encoding.lib.php:149 #: libraries/kanji-encoding.lib.php:149
>>>>>>> pootle/master
msgid "Convert to Kana" msgid "Convert to Kana"
msgstr "Konverter til Kana" msgstr "Konverter til Kana"