diff --git a/includes/standard.inc b/includes/standard.inc
index f8dcbf6cb9dc1da26169c4bdd118037a8f78e1fe..38b5d153740c8a3c903cce177f6cc485ac8fcabd 100644
--- a/includes/standard.inc
+++ b/includes/standard.inc
@@ -286,197 +286,116 @@ function standard_country_list() {
  * a script or regional variant name. See
  * http://www.w3.org/International/articles/language-tags/ for more information.
  *
+ * This list is based on languages available from localize.drupal.org. See
+ * http://localize.drupal.org/issues for information on how to add languages
+ * there.
+ *
+ * The "Left-to-right marker" comments and the enclosed UTF-8 markers are to
+ * make otherwise strange looking PHP syntax natural (to not be displayed in
+ * right to left). See http://drupal.org/node/128866#comment-528929.
+ *
  * @return
  *   An array of language code to language name information.
  *   Language name information itself is an array of English and native names.
  */
 function standard_language_list() {
   return array(
-    'aa' => array('Afar'),
-    'ab' => array('Abkhazian', 'аҧсуа бызшәа'),
-    'ae' => array('Avestan'),
-    'af' => array('Afrikaans'),
-    'ak' => array('Akan'),
+    'af' => array('Afrikaans', 'Afrikaans'),
     'am' => array('Amharic', 'አማርኛ'),
     'ar' => array('Arabic', /* Left-to-right marker "‭" */ 'العربية', LANGUAGE_RTL),
-    'as' => array('Assamese'),
-    'ast' => array('Asturian'),
-    'av' => array('Avar'),
-    'ay' => array('Aymara'),
-    'az' => array('Azerbaijani', 'azərbaycan'),
-    'ba' => array('Bashkir'),
+    'ast' => array('Asturian', 'Asturianu'),
+    'az' => array('Azerbaijani', 'Azərbaycanca'),
     'be' => array('Belarusian', 'Беларуская'),
     'bg' => array('Bulgarian', 'Български'),
-    'bh' => array('Bihari'),
-    'bi' => array('Bislama'),
-    'bm' => array('Bambara', 'Bamanankan'),
-    'bn' => array('Bengali'),
-    'bo' => array('Tibetan'),
-    'br' => array('Breton'),
+    'bn' => array('Bengali', 'বাংলা'),
+    'bo' => array('Tibetan', 'བོད་སྐད་'),
     'bs' => array('Bosnian', 'Bosanski'),
     'ca' => array('Catalan', 'Català'),
-    'ce' => array('Chechen'),
-    'ch' => array('Chamorro'),
-    'co' => array('Corsican'),
-    'cr' => array('Cree'),
     'cs' => array('Czech', 'Čeština'),
-    'cu' => array('Old Slavonic'),
-    'cv' => array('Chuvash'),
     'cy' => array('Welsh', 'Cymraeg'),
     'da' => array('Danish', 'Dansk'),
     'de' => array('German', 'Deutsch'),
-    'dv' => array('Maldivian'),
-    'dz' => array('Bhutani'),
-    'ee' => array('Ewe', 'Ɛʋɛ'),
+    'dz' => array('Dzongkha', 'རྫོང་ཁ'),
     'el' => array('Greek', 'Ελληνικά'),
-    'en' => array('English'),
-    'en-gb' => array('English, British'),
-    'eo' => array('Esperanto'),
+    'en' => array('English', 'English'),
+    'en-gb' => array('English, British', 'English, British'),
+    'eo' => array('Esperanto', 'Esperanto'),
     'es' => array('Spanish', 'Español'),
     'et' => array('Estonian', 'Eesti'),
     'eu' => array('Basque', 'Euskera'),
-    'fa' => array('Persian', /* Left-to-right marker "‭" */ 'فارسی', LANGUAGE_RTL),
-    'ff' => array('Fulah', 'Fulfulde'),
+    'fa' => array('Persian, Farsi', /* Left-to-right marker "‭" */ 'فارسی', LANGUAGE_RTL),
     'fi' => array('Finnish', 'Suomi'),
-    'fil' => array('Filipino'),
-    'fj' => array('Fiji'),
-    'fo' => array('Faeroese'),
+    'fil' => array('Filipino', 'Filipino'),
+    'fo' => array('Faeroese', 'Føroyskt'),
     'fr' => array('French', 'Français'),
-    'fy' => array('Frisian', 'Frysk'),
     'ga' => array('Irish', 'Gaeilge'),
-    'gd' => array('Scots Gaelic'),
+    'gd' => array('Scots Gaelic', 'Gàidhlig'),
     'gl' => array('Galician', 'Galego'),
-    'gn' => array('Guarani'),
-    'gsw-berne' => array('Swiss German'),
-    'gu' => array('Gujarati'),
-    'gv' => array('Manx'),
-    'ha' => array('Hausa'),
+    'gsw-berne' => array('Swiss German', 'Schwyzerdütsch'),
+    'gu' => array('Gujarati', 'ગુજરાતી'),
     'he' => array('Hebrew', /* Left-to-right marker "‭" */ 'עברית', LANGUAGE_RTL),
     'hi' => array('Hindi', 'हिन्दी'),
-    'ho' => array('Hiri Motu'),
     'hr' => array('Croatian', 'Hrvatski'),
-    'ht' => array('Haitian Creole'),
+    'ht' => array('Haitian Creole', 'Kreyòl ayisyen'),
     'hu' => array('Hungarian', 'Magyar'),
     'hy' => array('Armenian', 'Õ€Õ¡ÕµÕ¥Ö€Õ¥Õ¶'),
-    'hz' => array('Herero'),
-    'ia' => array('Interlingua'),
     'id' => array('Indonesian', 'Bahasa Indonesia'),
-    'ie' => array('Interlingue'),
-    'ig' => array('Igbo'),
-    'ik' => array('Inupiak'),
     'is' => array('Icelandic', 'Íslenska'),
     'it' => array('Italian', 'Italiano'),
-    'iu' => array('Inuktitut'),
     'ja' => array('Japanese', '日本語'),
-    'jv' => array('Javanese'),
-    'ka' => array('Georgian'),
-    'kg' => array('Kongo'),
-    'ki' => array('Kikuyu'),
-    'kj' => array('Kwanyama'),
+    'jv' => array('Javanese', 'Basa Java'),
+    'ka' => array('Georgian', 'ქართული ენა'),
     'kk' => array('Kazakh', 'Қазақ'),
-    'kl' => array('Greenlandic'),
-    'km' => array('Cambodian'),
     'kn' => array('Kannada', 'ಕನ್ನಡ'),
     'ko' => array('Korean', '한국어'),
-    'kr' => array('Kanuri'),
-    'ks' => array('Kashmiri'),
     'ku' => array('Kurdish', 'Kurdî'),
-    'kv' => array('Komi'),
-    'kw' => array('Cornish'),
     'ky' => array('Kyrgyz', 'Кыргызча'),
-    'la' => array('Latin', 'Latina'),
-    'lb' => array('Luxembourgish'),
-    'lg' => array('Luganda'),
-    'ln' => array('Lingala'),
-    'lo' => array('Laothian'),
+    'lo' => array('Lao', 'ພາສາລາວ'),
     'lt' => array('Lithuanian', 'Lietuvių'),
     'lv' => array('Latvian', 'Latviešu'),
-    'mg' => array('Malagasy'),
-    'mh' => array('Marshallese'),
-    'mi' => array('Māori'),
+    'mfe' => array('Mauritian Creole', 'Kreol Morisyen'),
+    'mg' => array('Malagasy', 'Malagasy'),
+    'mi' => array('Maori', 'Māori'),
     'mk' => array('Macedonian', 'Македонски'),
     'ml' => array('Malayalam', 'മലയാളം'),
-    'mn' => array('Mongolian'),
-    'mo' => array('Moldavian'),
-    'mr' => array('Marathi'),
-    'ms' => array('Malay', 'Bahasa Melayu'),
+    'mn' => array('Mongolian', 'монгол'),
+    'mr' => array('Marathi', 'मराठी'),
     'mt' => array('Maltese', 'Malti'),
-    'my' => array('Burmese'),
-    'na' => array('Nauru'),
-    'nd' => array('North Ndebele'),
-    'ne' => array('Nepali'),
-    'ng' => array('Ndonga'),
+    'my' => array('Burmese', 'ဗမာစကား'),
+    'ne' => array('Nepali', 'नेपाली'),
     'nl' => array('Dutch', 'Nederlands'),
     'nb' => array('Norwegian Bokmål', 'Bokmål'),
     'nn' => array('Norwegian Nynorsk', 'Nynorsk'),
-    'nr' => array('South Ndebele'),
-    'nv' => array('Navajo'),
-    'ny' => array('Chichewa'),
-    'oc' => array('Occitan'),
-    'om' => array('Oromo'),
-    'or' => array('Oriya'),
-    'os' => array('Ossetian'),
-    'pa' => array('Punjabi'),
-    'pi' => array('Pali'),
+    'oc' => array('Occitan', 'Occitan'),
+    'or' => array('Oriya', 'ଓଡ଼ିଆ'),
+    'pa' => array('Punjabi', 'ਪੰਜਾਬੀ'),
     'pl' => array('Polish', 'Polski'),
-    'ps' => array('Pashto', /* Left-to-right marker "‭" */ 'پښتو', LANGUAGE_RTL),
-    'pt' => array('Portuguese, International'),
-    'pt-pt' => array('Portuguese, Portugal', 'Português'),
-    'pt-br' => array('Portuguese, Brazil', 'Português'),
-    'qu' => array('Quechua'),
-    'rm' => array('Rhaeto-Romance'),
-    'rn' => array('Kirundi'),
+    'pt' => array('Portuguese, International', 'Português, Internacional'),
+    'pt-pt' => array('Portuguese, Portugal', 'Português, Portugal'),
+    'pt-br' => array('Portuguese, Brazil', 'Português, Brasil'),
     'ro' => array('Romanian', 'Română'),
     'ru' => array('Russian', 'Русский'),
-    'rw' => array('Kinyarwanda'),
-    'sa' => array('Sanskrit'),
-    'sc' => array('Sardinian'),
-    'sco' => array('Scots'),
-    'sd' => array('Sindhi'),
-    'se' => array('Northern Sami'),
-    'sg' => array('Sango'),
-    'sh' => array('Serbo-Croatian'),
+    'sco' => array('Scots', 'Scots'),
+    'se' => array('Northern Sami', 'Sámi'),
     'si' => array('Sinhala', 'සිංහල'),
     'sk' => array('Slovak', 'Slovenčina'),
     'sl' => array('Slovenian', 'Slovenščina'),
-    'sm' => array('Samoan'),
-    'sn' => array('Shona'),
-    'so' => array('Somali'),
     'sq' => array('Albanian', 'Shqip'),
     'sr' => array('Serbian', 'Српски'),
-    'ss' => array('Siswati'),
-    'st' => array('Sesotho'),
-    'su' => array('Sudanese'),
     'sv' => array('Swedish', 'Svenska'),
     'sw' => array('Swahili', 'Kiswahili'),
     'ta' => array('Tamil', 'தமிழ்'),
+    'ta-lk' => array('Tamil, Sri Lanka', 'தமிழ், இலங்கை'),
     'te' => array('Telugu', 'తెలుగు'),
-    'tg' => array('Tajik'),
     'th' => array('Thai', 'ภาษาไทย'),
-    'ti' => array('Tigrinya'),
-    'tk' => array('Turkmen'),
-    'tl' => array('Tagalog'),
-    'tn' => array('Setswana'),
-    'to' => array('Tonga'),
+    'ti' => array('Tigrinya', 'ትግርኛ'),
     'tr' => array('Turkish', 'Türkçe'),
-    'ts' => array('Tsonga'),
-    'tt' => array('Tatar', 'Tatarça'),
-    'tw' => array('Twi'),
-    'ty' => array('Tahitian'),
-    'ug' => array('Uighur'),
+    'ug' => array('Uighur', 'Уйғур'),
     'uk' => array('Ukrainian', 'Українська'),
     'ur' => array('Urdu', /* Left-to-right marker "‭" */ 'اردو', LANGUAGE_RTL),
-    'uz' => array('Uzbek', "o'zbek"),
-    've' => array('Venda'),
     'vi' => array('Vietnamese', 'Tiếng Việt'),
-    'wo' => array('Wolof'),
-    'xh' => array('Xhosa', 'isiXhosa'),
-    'xx-lolspeak' => array('Lolspeak'),
-    'yi' => array('Yiddish'),
-    'yo' => array('Yoruba', 'Yorùbá'),
-    'za' => array('Zhuang'),
+    'xx-lolspeak' => array('Lolspeak', 'Lolspeak'),
     'zh-hans' => array('Chinese, Simplified', '简体中文'),
     'zh-hant' => array('Chinese, Traditional', '繁體中文'),
-    'zu' => array('Zulu', 'isiZulu'),
   );
 }