Merge remote-tracking branch 'origin/master'

2013-06-04 15:02:44 +02:00 · 2013-06-04 15:02:44 +02:00 · 34da3eb671
commit 34da3eb671
parent f7e0876444 a034965517
2 changed files with 12859 additions and 0 deletions
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@ -271,6 +271,8 @@ function PMA_langDetails($lang)
        return array('ka|georgian', 'ka', '&#4325;&#4304;&#4320;&#4311;&#4323;&#4314;&#4312;');
    case 'kk':
        return array('kk|kazakh', 'kk', 'Қазақ');
+    case 'kn':
+        return array('kn|kannada', 'kn', 'ಕನ್ನಡ');
    case 'lt':
        return array('lt|lithuanian', 'lt', 'Lietuvi&#371;');
    case 'lv':
--- a/po/kn.po
+++ b/po/kn.po