Added transformation to wfMsg output, allowing tags such as {{SITENAME}} and {{localu...
[lhc/web/wiklou.git] / languages / Language.php
index dbd8704..346e163 100644 (file)
@@ -1,4 +1,16 @@
 <?php
+#
+# In general you should not make customizations in these language files
+# directly, but should use the MediaWiki: special namespace to customize
+# user interface messages through the wiki.
+# See http://meta.wikipedia.org/wiki/MediaWiki_namespace
+#
+# NOTE TO TRANSLATORS: Do not copy this whole file when making translations!
+# A lot of common constants and a base class with inheritable methods are
+# defined here, which should not be redefined. See the other LanguageXx.php
+# files for examples.
+#
+
 #--------------------------------------------------------------------------
 # Constants
 #--------------------------------------------------------------------------
@@ -26,6 +38,27 @@ define("MAG_IMG_LEFT",       18);
 define("MAG_IMG_NONE",       19);
 define("MAG_IMG_WIDTH",      20);
 define("MAG_IMG_CENTER",      21);
+define("MAG_INT", 22);
+define("MAG_FORCETOC", 23);
+define("MAG_SITENAME", 24);
+define("MAG_NS", 25);
+define("MAG_LOCALURL", 26);
+define("MAG_LOCALURLE", 27);
+define("MAG_SERVER", 28);
+
+$wgVariableIDs = array(
+       MAG_CURRENTMONTH,
+       MAG_CURRENTMONTHNAME,
+       MAG_CURRENTDAY,
+       MAG_CURRENTDAYNAME,
+       MAG_CURRENTYEAR,
+       MAG_CURRENTTIME,
+       MAG_NUMBEROFARTICLES,
+       MAG_CURRENTMONTHNAMEGEN,
+    MAG_SITENAME,
+       MAG_SERVER
+);
+
 
 
 #--------------------------------------------------------------------------
@@ -47,25 +80,29 @@ if($wgMetaNamespace === FALSE)
        $wgMetaNamespace = str_replace( " ", "_", $wgSitename );
 
 /* private */ $wgNamespaceNamesEn = array(
-       -2      => "Media",
-       -1      => "Special",
-       0       => "",
-       1       => "Talk",
-       2       => "User",
-       3       => "User_talk",
-       4       => $wgMetaNamespace,
-       5       => $wgMetaNamespace . "_talk",
-       6       => "Image",
-       7       => "Image_talk",
-       8       => "MediaWiki",
-       9       => "MediaWiki_talk"
+       NS_MEDIA            => "Media",
+       NS_SPECIAL          => "Special",
+       NS_MAIN             => "",
+       NS_TALK             => "Talk",
+       NS_USER             => "User",
+       NS_USER_TALK        => "User_talk",
+       NS_WIKIPEDIA        => $wgMetaNamespace,
+       NS_WIKIPEDIA_TALK   => $wgMetaNamespace . "_talk",
+       NS_IMAGE            => "Image",
+       NS_IMAGE_TALK       => "Image_talk",
+       NS_MEDIAWIKI        => "MediaWiki",
+       NS_MEDIAWIKI_TALK   => "MediaWiki_talk",
+       NS_TEMPLATE         => "Template",
+       NS_TEMPLATE_TALK    => "Template_talk",
+       NS_HELP             => "Help",
+       NS_HELP_TALK        => "Help_talk"
 );
 
 /* private */ $wgDefaultUserOptionsEn = array(
        "quickbar" => 1, "underline" => 1, "hover" => 1,
        "cols" => 80, "rows" => 25, "searchlimit" => 20,
        "contextlines" => 5, "contextchars" => 50,
-       "skin" => 0, "math" => 1, "rcdays" => 7, "rclimit" => 50,
+       "skin" => 'standard', "math" => 1, "rcdays" => 7, "rclimit" => 50,
        "highlightbroken" => 1, "stubthreshold" => 0,
        "previewontop" => 1, "editsection"=>1,"editsectiononrightclick"=>0, "showtoc"=>1,
        "showtoolbar" =>1,
@@ -77,7 +114,14 @@ if($wgMetaNamespace === FALSE)
 );
 
 /* private */ $wgSkinNamesEn = array(
-       "Standard", "Nostalgia", "Cologne Blue", "Paddington", "Montparnasse"
+       'standard' => "Standard",
+       'nostalgia' => "Nostalgia",
+       'cologneblue' => "Cologne Blue",
+       'smarty' => "Paddington",
+       'montparnasse' => "Montparnasse",
+       'davinci' => "DaVinci",
+       'mono' => "Mono",
+       'monobook' => "MonoBook"
 );
 
 /* private */ $wgMathNamesEn = array(
@@ -105,11 +149,11 @@ this</a> (alternative: like this<a href=\"\" class=\"internal\">?</a>).",
        "hideminor" => "Hide minor edits in recent changes",
        "usenewrc" => "Enhanced recent changes (not for all browsers)",
        "numberheadings" => "Auto-number headings",
-       "showtoolbar"=>"Show edit box toolbar",
+       "showtoolbar"=>"Show edit toolbar",
        "editondblclick" => "Edit pages on double click (JavaScript)",
        "editsection"=>"Enable section editing via [edit] links",
-       "editsectiononrightclick"=>"Enable section editing by right clicking<br> on section titles (JavaScript)",
-       "showtoc"=>"Show table of contents<br>(for articles with more than 3 headings)",
+       "editsectiononrightclick"=>"Enable section editing by right clicking<br /> on section titles (JavaScript)",
+       "showtoc"=>"Show table of contents<br />(for articles with more than 3 headings)",
        "rememberpassword" => "Remember password across sessions",
        "editwidth" => "Edit box has full width",
        "watchdefault" => "Add pages you edit to your watchlist",
@@ -125,157 +169,209 @@ this</a> (alternative: like this<a href=\"\" class=\"internal\">?</a>).",
        "Amazon.com" => "http://www.amazon.com/exec/obidos/ISBN=$1"
 );
 
-/* private */ $wgLanguageNamesEn = array(
-       "aa"    => "Afar",
-       "ab"    => "&#1040;&#1191;&#1089;&#1085;&#1099; (Apsny)",
-       "af"    => "Afrikaans",
-       "als"   => "Els&auml;ssisch", # FIXME: not a real language code; is subsumed under 'gem'
-       "am"    => "Amharic",
-       "ar" => "&#8238;&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;&#8236; (Araby)",
-       "as"    => "Assamese",
-       "ay"    => "Aymara",
-       "az"    => "&#1040;&#1079;&#1241;&#1088;&#1073;&#1072;&#1112;&#1209;&#1072;&#1085; (Azerbajan)",
-       "ba"    => "&#1041;&#1072;&#1096;&#1082;&#1086;&#1088;&#1090; (Bashkort)",
-       "be" => "&#1041;&#1077;&#1083;&#1072;&#1088;&#1091;&#1089;&#1082;&#1080;",
-       "bg"    => "Bulgarian",
-       "bh"    => "Bihara",
-       "bi"    => "Bislama",
-       "bn"    => "Bengali",
-       "bo"    => "Tibetan",
-       "br" => "Brezhoneg",
-       "bs" => "Bosnian",
-       "ca" => "Catal&#224;",
-       "ch" => "Chamoru",
-       "co"    => "Corsican",
-       "cs" => "&#268;esk&#225;",
-       "cy" => "Cymraeg",
-       "da" => "Dansk", # Note two different subdomains.
+/* The following list is in native languages, not in English */
+/* private */ $wgLanguageNames = array(
+       "aa" => "Afar",                 # Afar
+       "ab" => "Abkhazian",    # Abkhazian - FIXME
+       "af" => "Afrikaans",    # Afrikaans
+       "ak" => "Akana",                # Akan
+        "an" => "Aragon&eacute;s",      # Aragonese
+       "als" => "Els&auml;ssische",    # Alsatian
+       "am" => "&#4768;&#4635;&#4653;&#4763;", # Amharic
+       "ar" => "&#1575;&#1604;&#1593;&#1585;&#1576;&#1610;&#1577;",    # Arabic
+       "arc" => "&#1813;&#1829;&#1810;&#1834;&#1848;&#1821;&#1819;",   # Aramaic
+       "as" => "&#2437;&#2488;&#2478;&#2496;&#2527;&#2494;",   # Assamese
+        "ast" => "Asturleon&eacute;s",  # Asturian
+       "av" => "&#1040;&#1074;&#1072;&#1088;", # Avar
+       "ay" => "Aymar",                # Aymara
+       "az" => "Az&#601;rbaycan",      # Azerbaijani
+       "ba" => "&#1041;&#1072;&#1096;&#1185;&#1086;&#1088;&#1090;",    # Bashkir
+       "be" => "&#1041;&#1077;&#1083;&#1072;&#1088;&#1091;&#1089;&#1082;&#1072;&#1103;",       # Belarusian ''or'' Byelarussian
+       "bg" => "&#1041;&#1098;&#1083;&#1075;&#1072;&#1088;&#1089;&#1082;&#1080;",      # Bulgarian
+       "bh" => "&#2349;&#2379;&#2332;&#2346;&#2369;&#2352;&#2368;",    # Bihara
+       "bi" => "Bislama",              # Bislama
+       "bn" => "&#2476;&#2494;&#2434;&#2482;&#2494; - (Bangla)",       # Bengali
+        "bm" => "Bambara",
+       "bo" => "Bod skad",             # Tibetan
+       "br" => "Brezhoneg",    # Breton 
+       "bs" => "Bosanski",             # Bosnian
+       "ca" => "Catal&agrave;",        # Catalan
+       "ce" => "&#1053;&#1086;&#1093;&#1095;&#1080;&#1081;&#1085;",    # Chechen
+       "ch" => "Chamoru",              # Chamorro
+       "chy" => "Tsets&ecirc;hest&acirc;hese", # Cheyenne
+       "co" => "Corsu",                # Corsican
+       "cr" => "Nehiyaw",              # Cree
+       "cs" => "&#268;esky",   # Czech
+       "csb" => "Kasz&euml;bscziej",   # Cassubian - FIXME
+       "cv" => "&#1063;&#1233;&#1074;&#1072;&#1096; - (&#264;&#259;va&#349;)", # Chuvash 
+       "cy" => "Cymraeg",              # Welsh
+       "da" => "Dansk",                # Danish
+       "de" => "Deutsch",              # German
        "dk" => "Dansk", # 'da' is correct for the language.
-       "de" => "Deutsch",
-       "dz"    => "Bhutani",
-       "el" => "&#917;&#955;&#955;&#951;&#957;&#953;&#954;&#940; (Ellenika)",
-       "en"    => "English",
-       "eo"    => "Esperanto",
-       "es" => "Espa&#241;ol",
-       "et" => "Eesti",
-       "eu" => "Euskara",
-       "fa" => "&#8238;&#1601;&#1575;&#1585;&#1587;&#1740;&#8236; (Farsi)",
-       "fi" => "Suomi",
-       "fj"    => "Fijian",
-       "fo"    => "Faeroese",
-       "fr" => "Fran&#231;ais",
-       "fy" => "Frysk",
-       "ga" => "Gaelige",
-    "gd" => "G&agrave;idhlig",
-       "gl"    => "Galician",
-       "gn"    => "Guarani",
-       "gu" => "&#2711;&#2753;&#2716;&#2736;&#2750;&#2724;&#2752; (Gujarati)",
-    "gv" => "Gaelg",
-       "ha"    => "Hausa",
-       "he" => "&#1506;&#1489;&#1512;&#1497;&#1514; (Ivrit)",
-       "hi" => "&#2361;&#2367;&#2344;&#2381;&#2342;&#2368; (Hindi)",
-       "hr" => "Hrvatski",
-       "hu" => "Magyar",
-       "hy"    => "&#1344;&#1377;&#1397;&#1381;&#1408;&#1383;&#1398; (Armjan)",
-       "ia"    => "Interlingua",
-       "id"    => "Indonesia",
-       "ik"    => "Inupiak",
-       "is" => "&#205;slenska",
-       "it" => "Italiano",
-       "iu"    => "Inuktitut",
-       "ja" => "&#26085;&#26412;&#35486; (Nihongo)",
-       "jv"    => "Javanese",
-       "ka" => "&#4325;&#4304;&#4320;&#4311;&#4309;&#4308;&#4314;&#4312; (Kartuli)",
-       "kk"    => "&#1178;&#1072;&#1079;&#1072;&#1179; (Kazakh)",
-       "kl"    => "Greenlandic",
-       "km"    => "Cambodian",
-       "kn"    => "&#3221;&#3240;&#3277;&#3240;&#3233; (Kannada)",
-       "ko" => "&#54620;&#44397;&#50612; (Hangukeo)",
-       "ks"    => "Kashmiri",
-       "ku"    => "Kurd&icirc;",
-       "kw" => "Kernewek",
-       "ky"    => "Kirghiz",
-       "la" => "Latina",
-       "ln"    => "Lingala",
-       "lo"    => "Laotian",
-       "lt" => "Lietuvi&#371;",
-       "lv"    => "LatvieÅ¡u",
-       "mg" => "Malagasy",
-       "mi"    => "Maori",
-       "mk"    => "MakedonÅ¡&#269;ina",
-       "ml"    => "Malayalam",
-       "mn"    => "Mongolian",
-       "mo"    => "Moldavian",
-       "mr"    => "Marathi",
-       "ms" => "Bahasa Melayu",
-       "my"    => "Burmese",
-       "na"    => "Nauru",
-       "nah"   => "Nahuatl",
-       "nds"   => "Plattd&uuml;&uuml;tsch",
-       "ne" => "&#2344;&#2375;&#2346;&#2366;&#2354;&#2368; (Nepali)",
-       "nl" => "Nederlands",
-       "no" => "Norsk",
-       "oc"    => "Occitan",
-       "om"    => "Oromo",
-       "or"    => "Oriya",
-       "pa"    => "Punjabi",
-       "pl" => "Polski",
-       "ps"    => "Pashto",
-       "pt" => "Portugu&#234;s",
-       "qu"    => "Quechua",
-       "rm"    => "Rhaeto-Romance",
-       "rn"    => "Kirundi",
-       "ro" => "Rom&#226;n&#259;",
-       "ru" => "&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081; (Russkij)",
-       "rw"    => "Kinyarwanda",
-       "sa" => "&#2360;&#2306;&#2360;&#2381;&#2325;&#2371;&#2340; (Samskrta)",
-       "sd"    => "Sindhi",
+       "dv" => "Dhivehi",              # Dhivehi
+       "dz" => "Dzongkha",     # Bhutani
+       "ee" => "Eve",                  # Eve
+       "el" => "&#917;&#955;&#955;&#951;&#957;&#953;&#954;&#940;",     # Greek
+       "en" => "English",              # English
+       "eo" => "Esperanto",    # Esperanto
+       "es" => "Espa&ntilde;ol",       # Spanish
+       "et" => "Eesti",                # Estonian
+       "eu" => "Euskara",              # Basque
+       "fa" => "&#1601;&#1575;&#1585;&#1587;&#1740;",  # Persian
+       "ff" => "Fulfulde",             # Fulfulde
+       "fi" => "Suomi",                # Finnish
+       "fj" => "Na Vosa Vakaviti",     # Fijian
+       "fo" => "F&oslash;royskt",      # Faroese
+       "fr" => "Fran&ccedil;ais",      # French
+       "fy" => "Frysk",                # Frisian
+       "ga" => "Gaeilge",              # Irish
+       "gd" => "G&agrave;idhlig",      # Scots Gaelic
+       "gl" => "Galego",               # Gallegan
+       "gn" => "Ava&ntilde;e'&#7869;", # Guarani
+       "gu" => "&#2711;&#2753;&#2716;&#2736;&#2750;&#2724;&#2752;",    # Gujarati 
+       "gv" => "Gaelg",                # Manx
+       "ha" => "&#1607;&#1614;&#1608;&#1615;&#1587;&#1614;",   # Hausa
+       "haw" => "Hawai`i",             # Hawaiian
+       "he" => "&#1506;&#1489;&#1512;&#1497;&#1514;",  # Hebrew
+       "hi" => "&#2361;&#2367;&#2344;&#2381;&#2342;&#2368;",   # Hindi
+        "ho" => "Hiri Motu",
+       "hr" => "Hrvatski",             # Croatian
+        "ht" => "Haitian",     # Haitian (FIXME!)
+       "hu" => "Magyar",               # Hungarian
+       "hy" => "&#1344;&#1377;&#1397;&#1381;&#1408;&#1381;&#1398;",    # Armenian
+       "hz" => "Otsiherero",   # Herero
+       "ia" => "Interlingua",  # Interlingua (IALA)
+       "id" => "Bahasa Indonesia",     # Indonesian
+       "ie" => "Interlingue",  # Interlingue (Occidental)
+       "ig" => "Igbo",                 # Igbo
+        "ii" => "Yi",          # Sichuan Yi (FIXME!)
+       "ik" => "I&ntilde;upiak",       # Inupiak
+       "io" => "Ido",                  # Ido
+       "is" => "&Iacute;slensk",       # Icelandic
+       "it" => "Italiano",             # Italian
+       "iu" => "&#5123;&#5316;&#5251;&#5198;&#5200;&#5222;",   # Inuktitut
+       "ja" => "&#26085;&#26412;&#35486;",     # Japanese
+       "jv" => "Bahasa Jawa",  # Javanese
+       "ka" => "&#4325;&#4304;&#4320;&#4311;&#4323;&#4314;&#4312;",    # Georgian
+        "kg" => "Kongo",               # Kongo (FIXME!)
+       "ki" => "Kikuyu",               # Kikuyu (FIXME!)
+       "kj" => "Kuanyama",             # Kuanyama (FIXME!)
+       "kk" => "&#1179;&#1072;&#1079;&#1072;&#1179;&#1096;&#1072;",    # Kazakh
+       "kl" => "Kalaallisut",  # Greenlandic
+       "km" => "&#6039;&#6070;&#6047;&#6070;&#6017;&#6098;&#6040;&#6082;&#6042;",      # Cambodian
+       "kn" => "&#3221;&#3240;&#3277;&#3240;&#3233;",  # Kannada
+       "ko" => "&#54620;&#44397;&#50612;",     # Korean
+       "kr" => "Kanuri",
+       "ks" => "&#2325;&#2358;&#2381;&#2350;&#2368;&#2352;&#2368; - (&#1603;&#1588;&#1605;&#1610;&#1585;&#1610;)",     # Kashmiri 
+       "ku" => "Kurd&icirc;",  # Kurdish
+       "kv" => "Komi",
+       "kw" => "Kernewek",             # Cornish
+       "ky" => "K&#305;rg&#305;zca",   # Kirghiz
+       "la" => "Latina",               # Latin
+       "lb" => "L&euml;tzebuergesch",  # Luxemburguish
+       "lg" => "Luganda",              # Ganda
+       "li" => "Limburgs",             # Limburgian
+       "ln" => "Lingala",              # Lingala
+       "lo" => "Pha xa lao",   # Laotian 
+       "lt" => "Lietuvi&#371;",        # Lithuanian
+       "lv" => "Latvie&scaron;u",      # Latvian
+       "mg" => "Malagasy",             # Malagasy - FIXME
+       "mh" => "Ebon",                 # Marshallese
+       "mi" => "M&#257;ori",   # Maori
+       "mk" => "&#1052;&#1072;&#1082;&#1077;&#1076;&#1086;&#1085;&#1089;&#1082;&#1080;",       # Macedonian
+       "ml" => "&#3374;&#3378;&#3375;&#3390;&#3379;&#3330;",   # Malayalam
+       "mn" => "&#1052;&#1086;&#1085;&#1075;&#1086;&#1083;",   # Mongoloian
+       "mo" => "Moldoveana",   # Moldovan
+       "mr" => "&#2350;&#2352;&#2366;&#2336;&#2368;",  # Marathi
+       "ms" => "Bahasa Melayu",        # Malay
+       "mt" => "bil-Malti",    # Maltese
+       "my" => "Myanmasa",     # Burmese
+       "na" => "Nauru",                # Nauruan
+       "nb" => "Bokm&aring;l",         # Norwegian (Bokmal)
+       "nah" => "Nahuatl",
+       "nds" => "Platd&uuml;&uuml;tsch",       # Low German ''or'' Low Saxon
+       "ne" => "&#2344;&#2375;&#2346;&#2366;&#2354;&#2368;",   # Nepali
+       "ng" => "Ndonga",
+       "nl" => "Nederlands",   # Dutch
+       "nb" => "Norsk",                # Norwegian [currently using old '''no''' code]
+       "ne" => "&#2344;&#2375;&#2346;&#2366;&#2354;&#2368;",   # Nepali
+       "nn" => "Nynorsk"       ,       # (Norwegian) Nynorsk
+       "no" => "Norsk",                # Norwegian
+       "nv" => "Din&eacute; bizaad",   # Navajo
+       "ny" => "Chi-Chewa",    # Chichewa
+       "oc" => "Occitan",              # Occitan
+       "om" => "Oromoo",               # Oromo
+       "or" => "Oriya",                # Oriya - FIXME
+       "pa" => "&#2346;&#2306;&#2332;&#2366;&#2348;&#2368; / &#2602;&#2588;&#2622;&#2604;&#2624; / &#1662;&#1606;&#1580;&#1575;&#1576;&#1610;",        # Punjabi
+       "pi" => "&#2346;&#2366;&#2367;&#2356;", # Pali
+       "pl" => "Polski",               # Polish
+       "ps" => "&#1662;&#1690;&#1578;&#1608;", # Pashto
+       "pt" => "Portugu&ecirc;s",      # Portuguese
+       "qu" => "Runa Simi",    # Quechua
+       "rm" => "Rumantsch",    # Raeto-Romance
+       "rn" => "Kirundi",              # Kirundi
+       "ro" => "Rom&acirc;n&#259;",    # Romanian
+       "ru" => "&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;",    # Russian
+       "rw" => "Kinyarwanda",
+       "sa" => "&#2360;&#2306;&#2360;&#2381;&#2325;&#2371;&#2340;",    # Sanskrit
+       "sc" => "Sardu",        # Sardinian
+       "sd" => "&#2360;&#2367;&#2344;&#2343;&#2367;",  # Sindhi
+       "se" => "S&aacute;megiella",    # (Northern) Sami
        "sg"    => "Sangro",
-       "sh"    => "&#1057;&#1088;&#1087;&#1089;&#1082;&#1086;&#1093;&#1088;&#1074;&#1072;&#1090;&#1089;&#1082;&#1080; (Srbskohrvatski)",
-       "si"    => "Sinhalese",
+#      "sh"    => "&#1057;&#1088;&#1087;&#1089;&#1082;&#1086;&#1093;&#1088;&#1074;&#1072;&#1090;&#1089;&#1082;&#1080; (Srbskohrvatski)", ## Serbocroatian -- Obsolete
+       "si" => "Simhala",      # Sinhalese
        "simple" => "Simple English",
-       "sk"    => "Slovak",
-       "sl"    => "Slovensko",
-       "sm"    => "Samoan",
-       "sn"    => "Shona",
-       "so" => "Soomaali",
-       "sq" => "Shqip",
-       "sr" => "&#1057;&#1088;&#1087;&#1089;&#1082;&#1080; (Srpski)",
-       "ss"    => "Siswati",
-       "st"    => "Sesotho",
-       "su"    => "Sundanese",
-       "sv" => "Svenska",
-       "sw" => "Kiswahili",
-       "ta"    => "&#2980;&#2990;&#3007;&#2996;&#3021; (Tamil)",
-       "te"    => "&#3108;&#3142;&#3122;&#3137;&#3095;&#3137; (Telugu)",
-       "tg"    => "Tajik",
-       "th"    => "Thai",
-       "ti"    => "Tigrinya",
-       "tk"    => "Turkmen",
-       "tl"    => "Tagalog",
-       "tn"    => "Setswana",
-       "to"    => "Tonga",
-       "tr" => "T&#252;rk&#231;e",
-       "ts"    => "Tsonga",
-       "tt"    => "&#1058;&#1072;&#1090;&#1072;&#1088; (Tatar)",
-       "tw"    => "Twi",
-       "ug"    => "Uighur",
-       "uk" => "&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072; (Ukrayins`ka)",
-       "ur"    => "Urdu",
-       "uz"    => "&#1038;&#1079;&#1073;&#1077;&#1082; (Uzbek)",
-       "vi"    => "Ti&#7871;ng Vi&#7879;t",
-       "vo" => "Volap&#252;k",
-       "wo"    => "Wolof",
-       "xh" => "isiXhosa",
-       "yi"    => "Yiddish",
-       "yo"    => "Yoruba",
-       "za"    => "Zhuang",
-       "zh" => "&#20013;&#25991; (Zhongwen)",
-       "zh-cn" => "&#20013;&#25991;(&#31616;&#20307;) (Simplified Chinese)",
-       "zh-tw" => "&#20013;&#25991;(&#32321;&#20307;) (Traditional Chinese)",
-       "zu"    => "Zulu"
+       "sk" => "Sloven&#269;ina",      # Slovak
+       "sl" => "Sloven&scaron;&#269;ina",      # Slovenian
+       "sm" => "Gagana Samoa", # Samoan
+       "sn" => "chiShona",             # Shona
+       "so" => "Soomaaliga",   # Somali
+       "sq" => "Shqip",                # Albanian
+       "sr" => "&#1057;&#1088;&#1087;&#1089;&#1082;&#1080; / Srpski",  # Serbian
+       "ss" => "SiSwati",              # Swati
+       "st" => "seSotho",              # (Southern) Sotho
+       "su" => "Bahasa Sunda", # Sundanese
+       "sv" => "Svenska",              # Swedish
+       "sw" => "Kiswahili",    # Swahili
+       "ta" => "&#2980;&#2990;&#3007;&#2996;&#3021;",  # Tamil
+       "te" => "&#3108;&#3142;&#3122;&#3137;&#3095;&#3137;",   # Telugu
+       "tg" => "&#1058;&#1086;&#1207;&#1080;&#1082;&#1251;",   # Tajik
+       "th" => "&#3652;&#3607;&#3618;",        # Thai
+       "ti" => "Tigrinya",             # Tigrinya - FIXME
+       "tk" => "&#1578;&#1585;&#1603;&#1605;&#1606; / &#1058;&#1091;&#1088;&#1082;&#1084;&#1077;&#1085;",      # Turkmen
+       "tl" => "Tagalog",              # Tagalog (Filipino)
+       "tlh" => "tlhIngan-Hol",        # Klingon
+       "tn" => "Setswana",             # Setswana
+       "to" => "Tonga",                # Tonga - FIXME
+       "tp" => "Toki Pona",            # Toki Pona
+       "tpi" => "Tok Pisin",   # Tok Pisin 
+       "tr" => "T&uuml;rk&ccedil;e",   # Turkish
+       "ts" => "Xitsonga",             # Tsonga
+       "tt" => "Tatar",                # Tatar
+       "tw" => "Twi",                  # Twi -- FIXME
+       "ty" => "Reo M&#257;`ohi",      # Tahitian
+       "ug" => "Oyghurque",    # Uyghur
+       "uk" => "&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072;",       # Ukrainian
+       "ur" => "&#1575;&#1585;&#1583;&#1608;", # Urdu
+       "uz" => "&#1038;&#1079;&#1073;&#1077;&#1082;",  # Uzbek
+       "ve" => "Venda",                # Venda
+       "vi" => "Ti&#7871;ng Vi&#7879;t",       # Vietnamese
+       "vo" => "Volap&uuml;k", # VolapÃŒk
+       "wa" => "Walon",                # Walloon
+       "wo" => "Wollof",               # Wolof
+       "xh" => "isiXhosa",             # Xhosan
+       "yi" => "&#1497;&#1497;&#1460;&#1491;&#1497;&#1513;",   # Yiddish
+       "yo" => "Yor&ugrave;b&aacute;", # Yoruba
+       "za" => "(Cuengh)",             # Zhuang
+       "zh" => "&#20013;&#25991;",     # (Zh&#333;ng Wén) - Chinese
+       "zh-cn" => "&#20013;&#25991;(&#31616;&#20307;)",        # Simplified
+       "zh-tw" => "&#20013;&#25991;(&#32321;&#20307;)",        # Traditional
+       "zu" => "isiZulu",              # Zulu
 );
 
+$wgLanguageNamesEn =& $wgLanguageNames;
+
+
 /* private */ $wgWeekdayNamesEn = array(
        "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday",
        "Friday", "Saturday"
@@ -292,31 +388,41 @@ this</a> (alternative: like this<a href=\"\" class=\"internal\">?</a>).",
        "Sep", "Oct", "Nov", "Dec"
 );
 
+# Note to translators: 
+#   Please include the English words as synonyms.  This allows people 
+#   from other wikis to contribute more easily.
+# 
 /* private */ $wgMagicWordsEn = array(
 #   ID                                 CASE  SYNONYMS
     MAG_REDIRECT             => array( 0,    "#redirect"              ),
     MAG_NOTOC                => array( 0,    "__NOTOC__"              ),
+    MAG_FORCETOC             => array( 0,    "__FORCETOC__"           ),
     MAG_NOEDITSECTION        => array( 0,    "__NOEDITSECTION__"      ),
     MAG_START                => array( 0,    "__START__"              ),
-    MAG_CURRENTMONTH         => array( 1,    "{{CURRENTMONTH}}"       ),
-    MAG_CURRENTMONTHNAME     => array( 1,    "{{CURRENTMONTHNAME}}"   ),
-    MAG_CURRENTDAY           => array( 1,    "{{CURRENTDAY}}"         ),
-    MAG_CURRENTDAYNAME       => array( 1,    "{{CURRENTDAYNAME}}"     ),
-    MAG_CURRENTYEAR          => array( 1,    "{{CURRENTYEAR}}"        ),
-    MAG_CURRENTTIME          => array( 1,    "{{CURRENTTIME}}"        ),
-    MAG_NUMBEROFARTICLES     => array( 1,    "{{NUMBEROFARTICLES}}"   ),
-    MAG_CURRENTMONTHNAMEGEN  => array( 1,    "{{CURRENTMONTHNAMEGEN}}"),
-       MAG_MSG                  => array( 0,    "{{MSG:$1}}"             ),
-       MAG_SUBST                => array( 0,    "{{SUBST:$1}}"           ),
-    MAG_MSGNW                => array( 0,    "{{MSGNW:$1}}"           ),
+    MAG_CURRENTMONTH         => array( 1,    "CURRENTMONTH"           ),
+    MAG_CURRENTMONTHNAME     => array( 1,    "CURRENTMONTHNAME"       ),
+    MAG_CURRENTDAY           => array( 1,    "CURRENTDAY"             ),
+    MAG_CURRENTDAYNAME       => array( 1,    "CURRENTDAYNAME"         ),
+    MAG_CURRENTYEAR          => array( 1,    "CURRENTYEAR"            ),
+    MAG_CURRENTTIME          => array( 1,    "CURRENTTIME"            ),
+    MAG_NUMBEROFARTICLES     => array( 1,    "NUMBEROFARTICLES"       ),
+    MAG_CURRENTMONTHNAMEGEN  => array( 1,    "CURRENTMONTHNAMEGEN"    ),
+       MAG_MSG                  => array( 0,    "MSG:"                   ),
+       MAG_SUBST                => array( 0,    "SUBST:"                 ),
+    MAG_MSGNW                => array( 0,    "MSGNW:"                 ),
        MAG_END                  => array( 0,    "__END__"                ),
     MAG_IMG_THUMBNAIL        => array( 1,    "thumbnail", "thumb"     ),
     MAG_IMG_RIGHT            => array( 1,    "right"                  ),
     MAG_IMG_LEFT             => array( 1,    "left"                   ),
     MAG_IMG_NONE             => array( 1,    "none"                   ),
     MAG_IMG_WIDTH            => array( 1,    "$1px"                   ),
-    MAG_IMG_CENTER           => array( 1,    "center", "centre"       )
-
+    MAG_IMG_CENTER           => array( 1,    "center", "centre"       ),
+    MAG_INT                  => array( 0,    "INT:"                   ),
+    MAG_SITENAME             => array( 1,    "SITENAME"               ),
+    MAG_NS                   => array( 0,    "NS:"                    ),
+       MAG_LOCALURL             => array( 0,    "LOCALURL:"              ),
+       MAG_LOCALURLE            => array( 0,    "LOCALURLE:"             ),
+       MAG_SERVER               => array( 0,    "SERVER"                 )
 );
 
 # All special pages have to be listed here: a description of ""
@@ -343,7 +449,7 @@ this</a> (alternative: like this<a href=\"\" class=\"internal\">?</a>).",
        "Longpages"             => "Long articles",
        "Newpages"              => "Newly created articles",
        "Ancientpages"  => "Oldest articles",
-        "Deadendpages"  => "Dead-end pages",
+       "Deadendpages"  => "Dead-end pages",
 #      "Intl"                => "Interlanguage Links",
        "Allpages"              => "All pages by title",
 
@@ -355,17 +461,20 @@ this</a> (alternative: like this<a href=\"\" class=\"internal\">?</a>).",
        "Whatlinkshere" => "",
        "Recentchangeslinked" => "",
        "Movepage"              => "",
+       "Blockme"       => "",
        "Booksources"   => "External book sources",
-#      "Categories"    => "Page categories",
+       "Categories"    => "Page categories",
        "Export"                => "XML page export",
        "Version"               => "Show MediaWiki version",
+       "Allmessages"   => "All system messages"
 );
 
 /* private */ $wgSysopSpecialPagesEn = array(
        "Blockip"               => "Block a user/IP address",
        "Asksql"                => "Query the database",
        "Undelete"              => "Restore deleted pages",
-       "Makesysop"             => "Turn a user into a sysop"
+       "Makesysop"             => "Turn a user into a sysop",
+       "Import"                => "Import a page with history",
 );
 
 /* private */ $wgDeveloperSpecialPagesEn = array(
@@ -389,23 +498,24 @@ this</a> (alternative: like this<a href=\"\" class=\"internal\">?</a>).",
 "category_header" => "Articles in category \"$1\"",
 "subcategories" => "Subcategories",
 
+
 "linktrail"            => "/^([a-z]+)(.*)\$/sD",
 "mainpage"             => "Main Page",
 "mainpagetext" => "Wiki software successfully installed.",
 "about"                        => "About",
-"aboutwikipedia" => "About $wgSitename",
-"aboutpage"            => "$wgMetaNamespace:About",
+"aboutwikipedia" => "About {{SITENAME}}",
+"aboutpage"            => "{{ns:4}}:About",
+'article' => 'Article',
 "help"                 => "Help",
-"helppage"             => "$wgMetaNamespace:Help",
-"wikititlesuffix" => "$wgSitename",
+"helppage"             => "{{ns:12}}:Contents",
+"wikititlesuffix" => "{{SITENAME}}",
 "bugreports"   => "Bug reports",
-"bugreportspage" => "$wgMetaNamespace:Bug_reports",
-"sitesupport"   => "Donations",
-"sitesupportpage" => "", # If not set, won't appear. Can be wiki page or URL
+"bugreportspage" => "{{ns:4}}:Bug_reports",
+"sitesupport"   => "Donations", # Set a URL in $wgSiteSupportPage in LocalSettings.php
 "faq"                  => "FAQ",
-"faqpage"              => "$wgMetaNamespace:FAQ",
+"faqpage"              => "{{ns:4}}:FAQ",
 "edithelp"             => "Editing help",
-"edithelppage" => "$wgMetaNamespace:How_does_one_edit_a_page",
+"edithelppage" => "{{ns:12}}:Editing",
 "cancel"               => "Cancel",
 "qbfind"               => "Find",
 "qbbrowse"             => "Browse",
@@ -417,27 +527,37 @@ this</a> (alternative: like this<a href=\"\" class=\"internal\">?</a>).",
 "moredotdotdot"        => "More...",
 "mypage"               => "My page",
 "mytalk"               => "My talk",
+'navigation' => 'Navigation',
 "currentevents" => "Current events",
 "disclaimers" => "Disclaimers",
-"disclaimerpage"               => "$wgMetaNamespace:General_disclaimer",
+"disclaimerpage"               => "{{ns:4}}:General_disclaimer",
 "errorpagetitle" => "Error",
 "returnto"             => "Return to $1.",
-"fromwikipedia"        => "From $wgSitename, the free encyclopedia.",
+"fromwikipedia"        => "From {{SITENAME}}, the free encyclopedia.",
 "whatlinkshere"        => "Pages that link here",
 "help"                 => "Help",
 "search"               => "Search",
 "go"           => "Go",
 "history"              => "Page history",
+'history_short' => 'History',
 "printableversion" => "Printable version",
+'edit' => 'Edit',
 "editthispage" => "Edit this page",
+'delete' => 'Delete',
 "deletethispage" => "Delete this page",
+'protect' => 'Protect',
 "protectthispage" => "Protect this page",
+'unprotect' => 'Unprotect',
 "unprotectthispage" => "Unprotect this page",
 "newpage" => "New page",
 "talkpage"             => "Discuss this page",
+'specialpage' => 'Special Page',
+'personaltools' => 'Personal tools',
 "postcomment"   => "Post a comment",
 "articlepage"  => "View article",
 "subjectpage"  => "View subject", # For compatibility
+'talk' => 'Discussion',
+'toolbox' => 'Toolbox',
 "userpage" => "View user page",
 "wikipediapage" => "View meta page",
 "imagepage" =>         "View image page",
@@ -446,10 +566,10 @@ this</a> (alternative: like this<a href=\"\" class=\"internal\">?</a>).",
 "redirectedfrom" => "(Redirected from $1)",
 "lastmodified" => "This page was last modified $1.",
 "viewcount"            => "This page has been accessed $1 times.",
-"gnunote" => "All text is available under the terms of the <a class=internal href='/wiki/GNU_FDL'>GNU Free Documentation License</a>.",
-"printsubtitle" => "(From http://www.wikipedia.org)",
+"gnunote" => "All text is available under the terms of the <a class='internal' href='{{localurl:GNU_Free_Documentation_License}}'>GNU Free Documentation License</a>. $wgSitename is powered by <a href='http://www.mediawiki.org/' class='external'>MediaWiki</a>, an open source wiki engine.",
+"printsubtitle" => "(From {{SERVER}})",
 "protectedpage" => "Protected page",
-"administrators" => "$wgMetaNamespace:Administrators",
+"administrators" => "{{ns:4}}:Administrators",
 "sysoptitle"   => "Sysop access required",
 "sysoptext"            => "The action you have requested can only be
 performed by users with \"sysop\" status.
@@ -464,7 +584,7 @@ performed by sysops with  \"bureaucrat\" status.",
 "nbytes"               => "$1 bytes",
 "go"                   => "Go",
 "ok"                   => "OK",
-"sitetitle"            => "$wgSitename",
+"sitetitle"            => "{{SITENAME}}",
 "sitesubtitle" => "The Free Encyclopedia",
 "retrievedfrom" => "Retrieved from \"$1\"",
 "newmessages" => "You have $1.",
@@ -536,14 +656,14 @@ an incorrectly linked inter-language or inter-wiki title.",
 because it slows the database down to the point that no one can use
 the wiki.",
 "perfdisabledsub" => "Here's a saved copy from $1:",
-"wrong_wfQuery_params" => "Incorrect parameters to wfQuery()<br>
-Function: $1<br>
+"wrong_wfQuery_params" => "Incorrect parameters to wfQuery()<br />
+Function: $1<br />
 Query: $2
 ",
 "viewsource" => "View source",
 "protectedtext" => "This page has been locked to prevent editing; there are
 a number of reasons why this may be so, please see
-[[$wgMetaNamespace:Protected page]].
+[[{{ns:4}}:Protected page]].
 
 You can view and copy the source of this page:",
 
@@ -551,13 +671,13 @@ You can view and copy the source of this page:",
 #
 "logouttitle"  => "User logout",
 "logouttext" => "You are now logged out.
-You can continue to use $wgSitename anonymously, or you can log in
+You can continue to use {{SITENAME}} anonymously, or you can log in
 again as the same or as a different user. Note that some pages may
 continue to be displayed as if you were still logged in, until you clear
 your browser cache\n",
 
 "welcomecreation" => "<h2>Welcome, $1!</h2><p>Your account has been created.
-Don't forget to personalize your wikipedia preferences.",
+Don't forget to change your {{SITENAME}} preferences.",
 
 "loginpagetitle" => "User login",
 "yourname"             => "Your user name",
@@ -565,45 +685,46 @@ Don't forget to personalize your wikipedia preferences.",
 "yourpasswordagain" => "Retype password",
 "newusersonly" => " (new users only)",
 "remembermypassword" => "Remember my password across sessions.",
-"loginproblem" => "<b>There has been a problem with your login.</b><br>Try again!",
-"alreadyloggedin" => "<font color=red><b>User $1, you are already logged in!</b></font><br>\n",
+"loginproblem" => "<b>There has been a problem with your login.</b><br />Try again!",
+"alreadyloggedin" => "<font color=red><b>User $1, you are already logged in!</b></font><br />\n",
 
 "login"                        => "Log in",
-"loginprompt"           => "You must have cookies enabled to log in to $wgSitename.",
+"loginprompt"           => "You must have cookies enabled to log in to {{SITENAME}}.",
 "userlogin"            => "Log in",
 "logout"               => "Log out",
 "userlogout"   => "Log out",
 "notloggedin"  => "Not logged in",
 "createaccount"        => "Create new account",
-"createaccountmail"    => "by eMail",
+"createaccountmail"    => "by email",
 "badretype"            => "The passwords you entered do not match.",
 "userexists"   => "The user name you entered is already in use. Please choose a different name.",
-"youremail"            => "Your e-mail*",
+"youremail"            => "Your email*",
 "yournick"             => "Your nickname (for signatures)",
 "emailforlost" => "* Entering an email address is optional.  But it enables people to
 contact you through the website without you having to reveal your 
 email address to them, and it also helps you if you forget your   
 password.",
 "loginerror"   => "Login error",
-"nocookiesnew" => "The user account was created, but you are not logged in. $wgSitename uses cookies to log in users. You have cookies disabled. Please enable them, then log in with your new username and password.",
-"nocookieslogin"       => "$wgSitename uses cookies to log in users. You have cookies disabled. Please enable them and try again.",
+"nocookiesnew" => "The user account was created, but you are not logged in. {{SITENAME}} uses cookies to log in users. You have cookies disabled. Please enable them, then log in with your new username and password.",
+"nocookieslogin"       => "{{SITENAME}} uses cookies to log in users. You have cookies disabled. Please enable them and try again.",
 "noname"               => "You have not specified a valid user name.",
 "loginsuccesstitle" => "Login successful",
-"loginsuccess" => "You are now logged in to $wgSitename as \"$1\".",
+"loginsuccess" => "You are now logged in to {{SITENAME}} as \"$1\".",
 "nosuchuser"   => "There is no user by the name \"$1\".
 Check your spelling, or use the form below to create a new user account.",
 "wrongpassword"        => "The password you entered is incorrect. Please try again.",
 "mailmypassword" => "Mail me a new password",
-"passwordremindertitle" => "Password reminder from $wgSitename",
+"passwordremindertitle" => "Password reminder from {{SITENAME}}",
 "passwordremindertext" => "Someone (probably you, from IP address $1)
-requested that we send you a new $wgSitename login password.
+requested that we send you a new {{SITENAME}} login password.
 The password for user \"$2\" is now \"$3\".
 You should log in and change your password now.",
 "noemail"              => "There is no e-mail address recorded for user \"$1\".",
 "passwordsent" => "A new password has been sent to the e-mail address
 registered for \"$1\".
 Please log in again after you receive it.",
-"loginend"             => "",
+"loginend"             => "&nbsp;",
+"mailerror" => "Error sending mail: $1",
 
 # Edit page toolbar
 "bold_sample"=>"Bold text",
@@ -627,6 +748,8 @@ Please log in again after you receive it.",
 "sig_tip"=>"Your signature with timestamp",
 "hr_tip"=>"Horizontal line (use sparingly)",
 "infobox"=>"Click a button to get an example text",
+# alert box shown in browsers where text selection does not work, test e.g. with mozilla or konqueror
+"infobox_alert"=>"Please enter the text you want to be formatted.\\n It will be shown in the infobox for copy and pasting.\\nExample:\\n$1\\nwill become:\\n$2",
 
 # Edit pages
 #
@@ -639,8 +762,8 @@ Please log in again after you receive it.",
 "showpreview"  => "Show preview",
 "blockedtitle" => "User is blocked",
 "blockedtext"  => "Your user name or IP address has been blocked by $1.
-The reason given is this:<br>''$2''<p>You may contact $1 or one of the other
-[[$wgMetaNamespace:Administrators|administrators]] to discuss the block.
+The reason given is this:<br />''$2''<p>You may contact $1 or one of the other
+[[{{ns4}}:Administrators|administrators]] to discuss the block.
 
 Note that you may not use the \"email this user\" feature unless you have a valid email address registered in your [[Special:Preferences|user preferences]].
 
@@ -652,14 +775,17 @@ Your IP address is $3. Please include this address in any queries you make.
 "whitelistreadtext" => "You have to [[Special:Userlogin|login]] to read articles.",
 "whitelistacctitle" => "You are not allowed to create an account",
 "whitelistacctext" => "To be allowed to create accounts in this Wiki you have to [[Special:Userlogin|log]] in and have the appropriate permissions.",
+"loginreqtitle"        => "Login Required",
+"loginreqtext" => "You must [[special:Userlogin|login]] to view other pages.",
 "accmailtitle" => "Password sent.",
 "accmailtext" => "The Password for '$1' has been sent to $2.",
 "newarticle"   => "(New)",
 "newarticletext" =>
 "You've followed a link to a page that doesn't exist yet.
 To create the page, start typing in the box below 
-(see the [[$wgMetaNamespace:Help|help page]] for more info).
+(see the [[{{ns:4}}:Help|help page]] for more info).
 If you are here by mistake, just click your browser's '''back''' button.",
+"talkpagetext" => "<!-- MediaWiki:talkpagetext -->",
 "anontalkpagetext" => "---- ''This is the discussion page for an anonymous user who has not created an account yet or who does not use it. We therefore have to use the numerical [[IP address]] to identify him/her. Such an IP address can be shared by several users. If you are an anonymous user and feel that irrelevant comments have been directed at you, please [[Special:Userlogin|create an account or log in]] to avoid future confusion with other anonymous users.'' ",
 "noarticletext" => "(There is currently no text in this page)",
 "updated"              => "(Updated)",
@@ -685,11 +811,11 @@ revision of this page.
 If you save it, any changes made since this revision will be lost.</strong>\n",
 "yourdiff"             => "Differences",
 # FIXME: This is inappropriate for third-party use!
-"copyrightwarning" => "Please note that all contributions to $wgSitename are
+"copyrightwarning" => "Please note that all contributions to {{SITENAME}} are
 considered to be released under the GNU Free Documentation License
 (see $1 for details).
 If you don't want your writing to be edited mercilessly and redistributed
-at will, then don't submit it here.<br>
+at will, then don't submit it here.<br />
 You are also promising us that you wrote this yourself, or copied it from a
 public domain or similar free resource.
 <strong>DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!</strong>",
@@ -701,7 +827,7 @@ so you will not be able to save your edits right now. You may wish to cut-n-past
 the text into a text file and save it for later.",
 "protectedpagewarning" => "WARNING:  This page has been locked so that only
 users with sysop privileges can edit it. Be sure you are following the
-<a href='/wiki/$wgMetaNamespace:Protected_page_guidelines'>protected page
+<a href='$wgScriptPath/{{ns:4}}:Protected_page_guidelines'>protected page
 guidelines</a>.",
 
 # History pages
@@ -731,9 +857,9 @@ Please check the URL you used to access this page.\n",
 # Search results
 #
 "searchresults" => "Search results",
-"searchhelppage" => "$wgMetaNamespace:Searching",
-"searchingwikipedia" => "Searching $wgSitename",
-"searchresulttext" => "For more information about searching $wgSitename, see $1.",
+"searchhelppage" => "{{ns:4}}:Searching",
+"searchingwikipedia" => "Searching {{SITENAME}}",
+"searchresulttext" => "For more information about searching {{SITENAME}}, see $1.",
 "searchquery"  => "For query \"$1\"",
 "badquery"             => "Badly formed search query",
 "badquerytext" => "We could not process your query.
@@ -760,8 +886,8 @@ which are not indexed, or by specifying more than one search term (only pages
 containing all of the search terms will appear in the result).",
 "powersearch" => "Search",
 "powersearchtext" => "
-Search in namespaces :<br>
-$1<br>
+Search in namespaces :<br />
+$1<br />
 $2 List redirects &nbsp; Search for $3 $9",
 "searchdisabled" => "<p>Sorry! Full text search has been disabled temporarily, for performance reasons. In the meantime, you can use the Google search below, which may be out of date.</p>",
 "googlesearch" => "
@@ -776,7 +902,7 @@ border=\"0\" ALT=\"Google\"></A>
 <INPUT TYPE=text name=q size=31 maxlength=255 value=\"$1\">
 <INPUT type=submit name=btnG VALUE=\"Google Search\">
 <font size=-1>
-<input type=hidden name=domains value=\"{$wgServer}\"><br><input type=radio name=sitesearch value=\"\"> WWW <input type=radio name=sitesearch value=\"{$wgServer}\" checked> {$wgServer} <br>
+<input type=hidden name=domains value=\"{{SERVER}}\"><br /><input type=radio name=sitesearch value=\"\"> WWW <input type=radio name=sitesearch value=\"{{SERVER}}\" checked> {{SERVER}} <br />
 <input type='hidden' name='ie' value='$2'>
 <input type='hidden' name='oe' value='$2'>
 </font>
@@ -789,13 +915,12 @@ border=\"0\" ALT=\"Google\"></A>
 #
 "preferences"  => "Preferences",
 "prefsnologin" => "Not logged in",
-"prefsnologintext"     => "You must be <a href=\"" .
-  wfLocalUrl( "Special:Userlogin" ) . "\">logged in</a>
+"prefsnologintext"     => "You must be <a href=\"{{localurl:Special:Userlogin}}\">logged in</a>
 to set user preferences.",
 "prefslogintext" => "You are logged in as \"$1\".
 Your internal ID number is $2.
 
-See [[$wgMetaNamespace:User preferences help]] for help deciphering the options.",
+See [[{{ns:4}}:User preferences help]] for help deciphering the options.",
 "prefsreset"   => "Preferences have been reset from storage.",
 "qbsettings"   => "Quickbar settings", 
 "changepassword" => "Change password",
@@ -807,7 +932,10 @@ See [[$wgMetaNamespace:User preferences help]] for help deciphering the options.
 "math_unknown_function"        => "unknown function ",
 "math_lexing_error"    => "lexing error",
 "math_syntax_error"    => "syntax error",
-"math_image_error"     => "PNG conversion failed",
+"math_image_error"     => "PNG conversion failed; check for correct installation of latex, dvips, gs, and convert",
+"math_bad_tmpdir"      => "Can't write to or create math temp directory",
+"math_bad_output"      => "Can't write to or create math output directory",
+"math_notexvc" => "Missing texvc executable; please see math/README to configure.",
 "saveprefs"            => "Save preferences",
 "resetprefs"   => "Reset preferences",
 "oldpassword"  => "Old password",
@@ -844,7 +972,7 @@ from server time (UTC).",
 # "rclinks"            => "Show last $1 changes in last $2 hours / last $3 days",
 # "rclinks"            => "Show last $1 changes in last $2 days.",
 "showhideminor"         => "$1 minor edits | $2 bots | $3 logged in users ",
-"rclinks"              => "Show last $1 changes in last $2 days<br>$3",
+"rclinks"              => "Show last $1 changes in last $2 days<br />$3",
 "rchide"               => "in $4 form; $1 minor edits; $2 secondary namespaces; $3 multiple edits.",
 "rcliu"                        => "; $1 edits from logged in users",
 "diff"                 => "diff",
@@ -865,23 +993,20 @@ from server time (UTC).",
 "reupload"             => "Re-upload",
 "reuploaddesc" => "Return to the upload form.",
 "uploadnologin" => "Not logged in",
-"uploadnologintext"    => "You must be <a href=\"" .
-  wfLocalUrl( "Special:Userlogin" ) . "\">logged in</a>
+"uploadnologintext"    => "You must be <a href=\"{{localurl:Special:Userlogin}}\">logged in</a>
 to upload files.",
 "uploadfile"   => "Upload images, sounds, documents etc.",
 "uploaderror"  => "Upload error",
 "uploadtext"   => "<strong>STOP!</strong> Before you upload here,
-make sure to read and follow the <a href=\"" .
-wfLocalUrlE( "$wgMetaNamespace:Image_use_policy" ) . "\">image use policy</a>.
+make sure to read and follow the <a href=\"{{localurle:Special:Image_use_policy}}\">image use policy</a>.
 <p>If a file with the name you are specifying already
 exists on the wiki, it'll be replaced without warning.
 So unless you mean to update a file, it's a good idea
 to first check if such a file exists.
 <p>To view or search previously uploaded images,
-go to the <a href=\"" . wfLocalUrlE( "Special:Imagelist" ) .
-"\">list of uploaded images</a>.
-Uploads and deletions are logged on the <a href=\"" .
-wfLocalUrlE( "$wgMetaNamespace:Upload_log" ) . "\">upload log</a>.
+go to the <a href=\"{{localurle:Special:Imagelist}}\">list of uploaded images</a>.
+Uploads and deletions are logged on the " .
+"<a href=\"{{localurle:Wikipedia:Upload_log}}\">upload log</a>.
 <p>Use the form below to upload new image files for use in
 illustrating your articles.
 On most browsers, you will see a \"Browse...\" button, which will
@@ -915,8 +1040,8 @@ All times shown are server time (UTC).
 "filesource" => "Source",
 "affirmation"  => "I affirm that the copyright holder of this file
 agrees to license it under the terms of the $1.",
-"copyrightpage" => "$wgMetaNamespace:Copyrights",
-"copyrightpagename" => "$wgSitename copyright",
+"copyrightpage" => "{{ns:4}}:Copyrights",
+"copyrightpagename" => "{{SITENAME}} copyright",
 "uploadedfiles"        => "Uploaded files",
 "noaffirmation" => "You must affirm that your upload does not violate
 any copyrights.",
@@ -955,7 +1080,7 @@ created and by whom, and anything else you may know about it.",
 "deleteimg"            => "del",
 "imghistlegend" => "Legend: (cur) = this is the current image, (del) = delete
 this old version, (rev) = revert to this old version.
-<br><i>Click on date to see image uploaded on that date</i>.",
+<br /><i>Click on date to see image uploaded on that date</i>.",
 "imagelinks"   => "Image links",
 "linkstoimage" => "The following pages link to this image:",
 "nolinkstoimage" => "There are no pages that link to this image.",
@@ -966,7 +1091,7 @@ this old version, (rev) = revert to this old version.
 "sitestats"            => "Site statistics",
 "userstats"            => "User statistics",
 "sitestatstext" => "There are <b>$1</b> total pages in the database.
-This includes \"talk\" pages, pages about $wgSitename, minimal \"stub\"
+This includes \"talk\" pages, pages about {{SITENAME}}, minimal \"stub\"
 pages, redirects, and others that probably don't qualify as articles.
 Excluding those, there are <b>$2</b> pages that are probably legitimate
 articles.<p>
@@ -982,10 +1107,10 @@ That comes to <b>$5</b> average edits per page, and <b>$6</b> views per edit.",
 "maintnancepagetext"   => "This page includes several handy tools for everyday maintenance. Some of these functions tend to stress the database, so please do not hit reload after every item you fixed ;-)",
 "maintenancebacklink"  => "Back to Maintenance Page",
 "disambiguations"      => "Disambiguation pages",
-"disambiguationspage"  => "$wgMetaNamespace:Links_to_disambiguating_pages",
-"disambiguationstext"  => "The following articles link to a <i>disambiguation page</i>. They should link to the appropriate topic instead.<br>A page is treated as dismbiguation if it is linked from $1.<br>Links from other namespaces are <i>not</i> listed here.",
+"disambiguationspage"  => "{{ns:4}}:Links_to_disambiguating_pages",
+"disambiguationstext"  => "The following articles link to a <i>disambiguation page</i>. They should link to the appropriate topic instead.<br />A page is treated as dismbiguation if it is linked from $1.<br />Links from other namespaces are <i>not</i> listed here.",
 "doubleredirects"      => "Double Redirects",
-"doubleredirectstext"  => "<b>Attention:</b> This list may contain false positives. That usually means there is additional text with links below the first #REDIRECT.<br>\nEach row contains links to the first and second redirect, as well as the first line of the second redirect text, usually giving the \"real\" taget article, which the first redirect should point to.",
+"doubleredirectstext"  => "<b>Attention:</b> This list may contain false positives. That usually means there is additional text with links below the first #REDIRECT.<br />\nEach row contains links to the first and second redirect, as well as the first line of the second redirect text, usually giving the \"real\" taget article, which the first redirect should point to.",
 "brokenredirects"      => "Broken Redirects",
 "brokenredirectstext"  => "The following redirects link to a non-existing article.",
 "selflinks"            => "Pages with Self Links",
@@ -1024,9 +1149,9 @@ That comes to <b>$5</b> average edits per page, and <b>$6</b> views per edit.",
 "newpages"             => "New pages",
 "ancientpages"         => "Oldest articles",
 "intl"         => "Interlanguage links",
+'move' => 'Move',
 "movethispage" => "Move this page",
-"unusedimagestext" => "<p>Please note that other web sites
-such as the international Wikipedias may link to an image with
+"unusedimagestext" => "<p>Please note that other web sites may link to an image with
 a direct URL, and so may still be listed here despite being
 in active use.",
 "booksources"  => "Book sources",
@@ -1034,18 +1159,17 @@ in active use.",
 "booksourcetext" => "Below is a list of links to other sites that
 sell new and used books, and may also have further information
 about books you are looking for.
-$wgSitename is not affiliated with any of these businesses, and
+{{SITENAME}} is not affiliated with any of these businesses, and
 this list should not be construed as an endorsement.",
+"rfcurl" =>  "http://www.faqs.org/rfcs/rfc$1.html",
 "alphaindexline" => "$1 to $2",
 "version"              => "Version",
 
 # Email this user
 #
 "mailnologin"  => "No send address",
-"mailnologintext" => "You must be <a href=\"" .
-  wfLocalUrl( "Special:Userlogin" ) . "\">logged in</a>
-and have a valid e-mail address in your <a href=\"" .
-  wfLocalUrl( "Special:Preferences" ) . "\">preferences</a>
+"mailnologintext" => "You must be <a href=\"{{localurl:Special:Userlogin\">logged in</a>
+and have a valid e-mail address in your <a href=\"{{localurl:Special:Preferences}}\">preferences</a>
 to send e-mail to other users.",
 "emailuser"            => "E-mail this user",
 "emailpage"            => "E-mail user",
@@ -1054,7 +1178,8 @@ his or her user preferences, the form below will send a single message.
 The e-mail address you entered in your user preferences will appear
 as the \"From\" address of the mail, so the recipient will be able
 to reply.",
-"defemailsubject"  => "$wgSitename e-mail",                                   
+"usermailererror" => "Mail object returned error: ",
+"defemailsubject"  => "{{SITENAME}} e-mail",                                  
 "noemailtitle" => "No e-mail address",
 "noemailtext"  => "This user has not specified a valid e-mail address,
 or has chosen not to receive e-mail from other users.",
@@ -1072,21 +1197,20 @@ or has chosen not to receive e-mail from other users.",
 "watchlistsub"         => "(for user \"$1\")",
 "nowatchlist"          => "You have no items on your watchlist.",
 "watchnologin"         => "Not logged in",
-"watchnologintext"     => "You must be <a href=\"" .
-  wfLocalUrl( "Special:Userlogin" ) . "\">logged in</a>
+"watchnologintext"     => "You must be <a href=\"{{localurl:Special:Userlogin}}\">logged in</a>
 to modify your watchlist.",
 "addedwatch"           => "Added to watchlist",
-"addedwatchtext"       => "The page \"$1\" has been added to your <a href=\"" .
-  wfLocalUrl( "Special:Watchlist" ) . "\">watchlist</a>.
+"addedwatchtext"       => "The page \"$1\" has been added to your <a href=\"{{localurl:Special:Watchlist}}\">watchlist</a>.
 Future changes to this page and its associated Talk page will be listed there,
-and the page will appear <b>bolded</b> in the <a href=\"" .
-  wfLocalUrl( "Special:Recentchanges" ) . "\">list of recent changes</a> to
+and the page will appear <b>bolded</b> in the <a href=\"{{localurl:Special:Recentchanges}}\">list of recent changes</a> to
 make it easier to pick out.</p>
 
 <p>If you want to remove the page from your watchlist later, click \"Stop watching\" in the sidebar.",
 "removedwatch"         => "Removed from watchlist",
 "removedwatchtext"     => "The page \"$1\" has been removed from your watchlist.",
+'watch' => 'Watch',
 "watchthispage"                => "Watch this page",
+'unwatch' => 'Unwatch',
 "unwatchthispage"      => "Stop watching",
 "notanarticle"         => "Not an article",
 "watchnochange"        => "None of your watched items were edited in the time period displayed.",
@@ -1124,7 +1248,7 @@ at the bottom of the screen.",
 or image along with all of its history from the database.
 Please confirm that you intend to do this, that you understand the
 consequences, and that you are doing this in accordance with
-[[$wgMetaNamespace:Policy]].",
+[[{{ns:4}}:Policy]].",
 "confirmcheck" => "Yes, I really want to delete this.",
 "actioncomplete" => "Action complete",
 "deletedtext"  => "\"$1\" has been deleted.
@@ -1141,6 +1265,7 @@ All times shown are server time (UTC).
 "deletecomment"        => "Reason for deletion",
 "imagereverted" => "Revert to earlier version was successful.",
 "rollback"             => "Roll back edits",
+'rollback_short' => 'Rollback',
 "rollbacklink" => "rollback",
 "rollbackfailed" => "Rollback failed",
 "cantrollback" => "Cannot revert edit; last contributor is only author of this article.",
@@ -1153,7 +1278,7 @@ Last edit was by [[User:$3|$3]] ([[User talk:$3|Talk]]). ",
 "revertpage"   => "Reverted edit of $2, changed back to last version by $1",
 "protectlogpage" => "Protection_log",
 "protectlogtext" => "Below is a list of page locks/unlocks.
-See [[$wgMetaNamespace:Protected page]] for more information.",
+See [[{{ns:4}}:Protected page]] for more information.",
 "protectedarticle" => "protected [[$1]]",
 "unprotectedarticle" => "unprotected [[$1]]",
 
@@ -1172,7 +1297,7 @@ will not be automatically replaced.",
 "undeletebtn" => "Restore!",
 "undeletedarticle" => "restored \"$1\"",
 "undeletedtext"   => "The article [[$1]] has been successfully restored.
-See [[$wgMetaNamespace:Deletion_log]] for a record of recent deletions and restorations.",
+See [[{{ns:4}}:Deletion_log]] for a record of recent deletions and restorations.",
 
 # Contributions
 #
@@ -1201,7 +1326,7 @@ to perform this function on.",
 "blockiptext"  => "Use the form below to block write access
 from a specific IP address or username.
 This should be done only only to prevent vandalism, and in
-accordance with [[$wgMetaNamespace:Policy|policy]].
+accordance with [[{{ns:4}}:Policy|policy]].
 Fill in a specific reason below (for example, citing particular
 pages that were vandalized).",
 "ipaddress"            => "IP Address/username",
@@ -1212,7 +1337,7 @@ pages that were vandalized).",
 "noblockreason" => "You must supply a reason for the block.",
 "blockipsuccesssub" => "Block succeeded",
 "blockipsuccesstext" => "\"$1\" has been blocked.
-<br>See [[Special:Ipblocklist|IP block list]] to review blocks.",
+<br />See [[Special:Ipblocklist|IP block list]] to review blocks.",
 "unblockip"            => "Unblock user",
 "unblockiptext"        => "Use the form below to restore write access
 to a previously blocked IP address or username.",
@@ -1233,6 +1358,9 @@ the list of currently operational bans and blocks.",
 "range_block_disabled" => "The sysop ability to create range blocks is disabled.",
 "ipb_expiry_invalid"   => "Expiry time invalid.",
 "ip_range_invalid"     => "Invalid IP range.\n",
+"proxyblocker" => "Proxy blocker",
+"proxyblockreason"     => "Your IP address has been blocked because it is an open proxy. Please contact your Internet service provider or tech support and inform them of this serious security problem.",
+"proxyblocksuccess"    => "Done.\n",
 
 # Developer tools
 #
@@ -1255,7 +1383,7 @@ Please confirm that this is what you intend to do.",
 "lockdbsuccesssub" => "Database lock succeeded",
 "unlockdbsuccesssub" => "Database lock removed",
 "lockdbsuccesstext" => "The database has been locked.
-<br>Remember to remove the lock after your maintenance is complete.",
+<br />Remember to remove the lock after your maintenance is complete.",
 "unlockdbsuccesstext" => "The database has been unlocked.",
 
 # SQL query
@@ -1278,11 +1406,16 @@ this function sparingly.",
 Type the name of the user in the box and press the button to make the user an administrator",
 "makesysopname"                => "Name of the user:",
 "makesysopsubmit"      => "Make this user into a sysop",
-"makesysopok"          => "<b>User '$1' is now a sysop</b>",
-"makesysopfail"                => "<b>User '$1' could not be made into a sysop. (Did you enter the name correctly?)</b>",
+"makesysopok"          => "<b>User \"$1\" is now a sysop</b>",
+"makesysopfail"                => "<b>User \"$1\" could not be made into a sysop. (Did you enter the name correctly?)</b>",
 "setbureaucratflag" => "Set bureaucrat flag",
 "bureaucratlog"                => "Bureaucrat_log",
-"bureaucratlogentry"   => " set $1: $2",
+"bureaucratlogentry"   => "Rights for user \"$1\" set \"$2\"",
+"rights"                       => "Rights:",
+"set_user_rights"      => "Set user rights",
+"user_rights_set"      => "<b>User rights for \"$1\" updated</b>",
+"set_rights_fail"      => "<b>User rights for \"$1\" could not be set. (Did you enter the name correctly?)</b>",
+"makesysop"         => "Make a user into a sysop",
 
 # Move page
 #
@@ -1313,8 +1446,7 @@ proceeding.",
 In those cases, you will have to move or merge the page manually if desired.",
 "movearticle"  => "Move page",
 "movenologin"  => "Not logged in",
-"movenologintext" => "You must be a registered user and <a href=\"" .
-  wfLocalUrl( "Special:Userlogin" ) . "\">logged in</a>
+"movenologintext" => "You must be a registered user and <a href=\"{{localurl:Special:Userlogin}}\">logged in</a>
 to move a page.",
 "newtitle"             => "To new title",
 "movepagebtn"  => "Move page",
@@ -1343,13 +1475,89 @@ amusement.",
 
 # Namespace 8 related
 
-"allmessages"  => "All_messages",
-"allmessagestext"      => "This is a list of all messages available in the MediaWiki: namespace",
+"allmessages"  => "All system messages",
+"allmessagestext"      => "This is a list of all system messages available in the MediaWiki: namespace.",
 
 # Thumbnails
 
-"thumbnail-more"      => "Enlarge"
-
+"thumbnail-more"       => "Enlarge",
+"missingimage"         => "<b>Missing image</b><br /><i>$1</i>\n",
+
+# Special:Import
+"import"       => "Import pages",
+"importtext"   => "Blah blah blah",
+"importfailed" => "Import failed: $1",
+"importnotext" => "Empty or no text",
+"importsuccess"        => "Import succeeded!",
+
+# Keyboard access keys for power users
+'accesskey-article' => 'a',
+'accesskey-talk' => 't',
+'accesskey-edit' => 'e',
+'accesskey-history' => 'h',
+'accesskey-protect' => 'p',
+'accesskey-delete' => 'd',
+'accesskey-move' => 'm',
+'accesskey-watch' => '',
+'accesskey-unwatch' => '',
+'accesskey-watchlist' => 'w',
+'accesskey-userpage' => '',
+'accesskey-mytalk' => '',
+'accesskey-preferences' => '',
+'accesskey-mycontris' => '',
+'accesskey-login' => 'l',
+'accesskey-search' => 's',
+'accesskey-mainpage' => '',
+'accesskey-randompage' => 'x',
+'accesskey-currentevents' => '',
+'accesskey-sitesupport' => '',
+'accesskey-help' => '',
+'accesskey-recentchanges' => 'r',
+'accesskey-recentchangeslinked' => 'c',
+'accesskey-whatlinkshere' => 'b',
+'accesskey-specialpages' => '',
+'accesskey-specialpage' => '',
+'accesskey-upload' => 'u',
+
+# tooltip help for the main actions
+'tooltip-article' => 'View the article [alt-a]',
+'tooltip-talk' => 'Discussion about the article [alt-t]',
+'tooltip-edit' => 'You can edit this page. Please use the preview button before saving. [alt-e]',
+'tooltip-history' => 'Past versions of this page, [alt-h]',
+'tooltip-protect' => 'Protect this page [alt-p]',
+'tooltip-delete' => 'Delete this page [alt-d]',
+'tooltip-move' => 'Move this page [alt-m]',
+'tooltip-nomove' => 'You don\'t have the permissions to move this page',
+'tooltip-watch' => 'Add this page to your watchlist',
+'tooltip-unwatch' => 'Remove this page from your watchlist',
+'tooltip-watchlist' => 'The watchlist is the list of pages you\'re monitoring for changes. [alt-w]',
+'tooltip-userpage' => 'My user page',
+'tooltip-mytalk' => 'My talk page',
+'tooltip-preferences' => 'My preferences',
+'tooltip-mycontris' => 'List of my contributions',
+'tooltip-login' => 'You are encouraged to log in before editing, it\'s not mandatory however.',
+'tooltip-logout' => 'The start button',
+'tooltip-search' => 'Search this wiki',
+'tooltip-mainpage' => 'Visit the Main Page',
+'tooltip-randompage' => 'Load a random page [alt-x]',
+'tooltip-currentevents' => 'Find background information on current events',
+'tooltip-sitesupport' => 'Support {{SITENAME}}',
+'tooltip-help' => 'The place to find out.',
+'tooltip-recentchanges' => 'The list of recent changes in the wiki. [alt-r]',
+'tooltip-recentchangeslinked' => 'Recent changes in pages linking to this page [alt-c]',
+'tooltip-whatlinkshere' => 'List of all wiki pages that link here [alt-b]',
+'tooltip-specialpages' => 'List of all special pages',
+'tooltip-upload' => 'Upload images or media files [alt-u]',
+'tooltip-specialpage' => 'This is a special page, you can\'t edit the page itself.',
+
+# Metadata
+"nodublincore" => "Dublin Core RDF metadata disabled for this server.",
+"nocreativecommons" => "Creative Commons RDF metadata disabled for this server.",
+"notacceptable" => "The wiki server can't provide data in a format your client can read.",
+
+# Attribution
+
+"anonymous" => "Anonymous user(s) of $wgSitename"
 );
 
 #--------------------------------------------------------------------------
@@ -1379,8 +1587,8 @@ class Language {
        function getDefaultUserOptions () {
                global $wgDefaultUserOptionsEn ;
                return $wgDefaultUserOptionsEn ;
-               }
-
+       }
+       
        function getBookstoreList () {
                global $wgBookstoreListEn ;
                return $wgBookstoreListEn ;
@@ -1474,7 +1682,7 @@ class Language {
        function userAdjust( $ts )
        {
                global $wgUser, $wgLocalTZoffset;
-
+               
                $tz = $wgUser->getOption( "timecorrection" );
                if ( $tz === "" ) {
                        $hrDiff = isset( $wgLocalTZoffset ) ? $wgLocalTZoffset : 0;
@@ -1513,31 +1721,26 @@ class Language {
                        $datePreference = $wgAmericanDates ? 1 : 2;
                }
                
-               if ( $datePreference == 1 ) {
-                       # MDY
-                       $d = $this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) .
-                         " " . (0 + substr( $ts, 6, 2 )) . ", " .
-                         substr( $ts, 0, 4 );
-               } else if ( $datePreference == 2 ) {
-                       #DMY
-                       $d = (0 + substr( $ts, 6, 2 )) . " " .
-                         $this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) . " " .
-                         substr( $ts, 0, 4 );
-               } else {
-                       #YMD
-                       $d = substr( $ts, 0, 4 ) . " " . $this->getMonthAbbreviation( substr( $ts, 4, 2 ) ) .
-                               " " . (0 + substr( $ts, 6, 2 ));
+               $month = $this->getMonthAbbreviation( substr( $ts, 4, 2 ) );
+               $day = $this->formatNum( 0 + substr( $ts, 6, 2 ) );
+               $year = $this->formatNum( substr( $ts, 0, 4 ) );
+               
+               switch( $datePreference ) {
+                       case 1: return "$month $day, $year";
+                       case 2: return "$day $month $year";
+                       default: return "$year $month $day";
                }
-
-               return $d;
        }
 
-       function time( $ts, $adj = false )
+       function time( $ts, $adj = false, $seconds = false )
        {
                if ( $adj ) { $ts = $this->userAdjust( $ts ); }
 
                $t = substr( $ts, 8, 2 ) . ":" . substr( $ts, 10, 2 );
-               return $t;
+               if ( $seconds ) { 
+                       $t .= ":" . substr( $ts, 12, 2 );
+               }
+               return $this->formatNum( $t );
        }
 
        function timeanddate( $ts, $adj = false )
@@ -1668,7 +1871,7 @@ class Language {
        function linkPrefixExtension() { return false; }
 
 
-       function getMagicWords() 
+       function &getMagicWords() 
        {
                global $wgMagicWordsEn;
                return $wgMagicWordsEn;
@@ -1677,8 +1880,8 @@ class Language {
        # Fill a MagicWord object with data from here
        function getMagic( &$mw )
        {
-               $raw = $this->getMagicWords(); # don't worry, it's reference counted not deep copy
-               $rawEntry = $raw[$mw->mId];
+               $raw =& $this->getMagicWords(); 
+        $rawEntry = $raw[$mw->mId];
                $mw->mCaseSensitive = $rawEntry[0];
                $mw->mSynonyms = array_slice( $rawEntry, 1 );
        }
@@ -1688,6 +1891,27 @@ class Language {
        {
                return "<em>$text</em>";
        }
+
+       # returns additional Regex for the tokenizer. See LanguageFr.php for an example
+       function tokenizerRegex()
+       {
+               return "";
+       }
+
+       # Process the token generated from the tokenizer by the above regex. Return
+       # NULL if the token is unknown, and the text to be added to the output otherwise
+       function processToken( &$token , &$tokenStack)
+       {
+               return NULL;
+       }
+       
+       # Normally we use the plain ASCII digits. Some languages such as Arabic will
+       # want to output numbers using script-appropriate characters: override this
+       # function with a translator. See LanguageAr.php for an example.
+       function formatNum( $number ) {
+               return $number;
+       }
+
 }
 
 @include_once( "Language" . ucfirst( $wgLanguageCode ) . ".php" );