Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

2014-12-09 13:34:01 +05:30 · 2014-12-09 13:34:01 +05:30 · 27a3391aff
commit 27a3391aff
parent c4df5731e0 b3899f13f5
2 changed files with 14437 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('fi|finnish', 'fi', 'Suomi');
    case 'fr':
        return array('fr|french', 'fr', 'Fran&ccedil;ais');
+    case 'fy':
+        return array('fy|frisian', 'fy', 'Frysk');
    case 'gl':
        return array('gl|galician', 'gl', 'Galego');
    case 'he':
--- a/po/fy.po
+++ b/po/fy.po