[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2980-g355b4c9

[Michal Čihař]

The branch, master has been updated
       via  355b4c97bdc9c4afb6c900e3f2761aa91e532a4f (commit)
      from  23e96896ac9ba59e64eaa637fce0f389c95a2c2e (commit)


- Log -----------------------------------------------------------------
commit 355b4c97bdc9c4afb6c900e3f2761aa91e532a4f
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon May 10 15:26:22 2010 +0200

    Cleanup after wrong merge.

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

Summary of changes:
 po/fr.po |   17 +----------------
 po/nb.po |   10 ----------
 2 files changed, 1 insertions(+), 26 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index cc54f0e..f69a4dc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2836,36 +2836,21 @@ 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"
 msgid "Encoding conversion"
-msgstr "Moteur de conversion"
+msgstr "Conversion de l'encodage"
 
 #. 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 "Conversion en kana"
 
diff --git a/po/nb.po b/po/nb.po
index 06ad6e3..3eb7757 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2804,7 +2804,6 @@ 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"
@@ -2812,28 +2811,19 @@ msgid "Encoding conversion"
 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 "Konverter til Kana"
 


hooks/post-receive
-- 
phpMyAdmin