Commits

pajoye  committed 0242f19

- update to 2008-05-05

  • Participants
  • Parent commits 2744271

Comments (0)

Files changed (92)

File wiki/VERSION

-rc2008-04-11
+2008-05-05

File wiki/bin/.htaccess

-order allow,deny
-deny from all
+order allow,deny
+deny from all

File wiki/inc/.htaccess

-## no access to the inc directory
-order allow,deny
-deny from all
+## no access to the inc directory
+order allow,deny
+deny from all

File wiki/inc/actions.php

     ptln('</head>');
     ptln('<body>');
     ptln('<div class="dokuwiki export">');
-    print p_wiki_xhtml($ID,$REV,false);
+    $html = p_wiki_xhtml($ID,$REV,false);
+    tpl_toc();
+    echo $html;
     ptln('</div>');
     ptln('</body>');
     ptln('</html>');
 
   // html body only
   if($act == 'export_xhtmlbody'){
-    print p_wiki_xhtml($ID,$REV,false);
+    $html = p_wiki_xhtml($ID,$REV,false);
+    tpl_toc();
+    echo $html;
     exit;
   }
 

File wiki/inc/confutils.php

     $disabled = array_map('trim',$disabled);
     if(isset($conf['openregister']) && !$conf['openregister']) $disabled[] = 'register';
     if(isset($conf['resendpasswd']) && !$conf['resendpasswd']) $disabled[] = 'resendpwd';
+    if(isset($conf['subscribers']) && !$conf['subscribers']) {
+        $disabled[] = 'subscribe';
+        $disabled[] = 'subscribens';
+    }
     $disabled = array_unique($disabled);
   }
 

File wiki/inc/html.php

     print '<a class="wikilink1" href="'.wl($ID).'">'.$ID.'</a> ';
 
     print ' &ndash; ';
-    print $INFO['sum'];
+    print htmlspecialchars($INFO['sum']);
     print ' <span class="user">';
-    print (empty($INFO['editor']))?('('.$lang['external_edit'].')'):$INFO['editor'];
+    print (empty($INFO['editor']))?('('.$lang['external_edit'].')'):htmlspecialchars($INFO['editor']);
     print '</span> ';
 
     print '('.$lang['current'].')';
     print htmlspecialchars($info['sum']);
     print ' <span class="user">';
     if($info['user']){
-      print $info['user'];
+      print htmlspecialchars($info['user']);
     }else{
       print $info['ip'];
     }
 
     print ' <span class="user">';
     if($recent['user']){
-      print $recent['user'];
+      print htmlspecialchars($recent['user']);
     }else{
       print $recent['ip'];
     }

File wiki/inc/init.php

   if(is_null($abs)) $abs = $conf['canonical'];
 
   if($conf['basedir']){
-    $dir = $conf['basedir'].'/';
+    $dir = $conf['basedir'];
   }elseif(substr($_SERVER['SCRIPT_NAME'],-4) == '.php'){
-    $dir = dirname($_SERVER['SCRIPT_NAME']).'/';
+    $dir = dirname($_SERVER['SCRIPT_NAME']);
   }elseif(substr($_SERVER['PHP_SELF'],-4) == '.php'){
-    $dir = dirname($_SERVER['PHP_SELF']).'/';
+    $dir = dirname($_SERVER['PHP_SELF']);
   }elseif($_SERVER['DOCUMENT_ROOT'] && $_SERVER['SCRIPT_FILENAME']){
     $dir = preg_replace ('/^'.preg_quote($_SERVER['DOCUMENT_ROOT'],'/').'/','',
                          $_SERVER['SCRIPT_FILENAME']);
-    $dir = dirname('/'.$dir).'/';
+    $dir = dirname('/'.$dir);
   }else{
-    $dir = './'; //probably wrong
+    $dir = '.'; //probably wrong
   }
 
-  $dir = str_replace('\\','/',$dir); #bugfix for weird WIN behaviour
-  $dir = preg_replace('#//+#','/',$dir);
+  $dir = str_replace('\\','/',$dir);             // bugfix for weird WIN behaviour
+  $dir = preg_replace('#//+#','/',"/$dir/");     // ensure leading and trailing slashes
 
   //handle script in lib/exe dir
   $dir = preg_replace('!lib/exe/$!','',$dir);
   //finish here for relative URLs
   if(!$abs) return $dir;
 
-  //use config option if available
-  if($conf['baseurl']) return $conf['baseurl'].$dir;
+  //use config option if available, trim any slash from end of baseurl to avoid multiple consecutive slashes in the path
+  if($conf['baseurl']) return rtrim($conf['baseurl'],'/').$dir;
 
   //split hostheader into host and port
   list($host,$port) = explode(':',$_SERVER['HTTP_HOST']);

File wiki/inc/lang/.htaccess

-## no access to the lang directory
-order allow,deny
-deny from all
+## no access to the lang directory
+order allow,deny
+deny from all

File wiki/inc/lang/da/lang.php

  * danish language file
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author     koeppe <koeppe@kazur.dk>
- * @author     Jon Bendtsen <bendtsen@diku.dk>
- * @author     Lars Næsbye Christensen <larsnaesbye@stud.ku.dk>
+ * @author koeppe <koeppe@kazur.dk>
+ * @author Jon Bendtsen <bendtsen@diku.dk>
+ * @author Lars Næsbye Christensen <larsnaesbye@stud.ku.dk>
+ * @author Kalle Sommer Nielsen <kalle@php.net>
  */
-$lang['encoding']   = 'utf-8';
-$lang['direction']  = 'ltr';
-$lang['doublequoteopening']  = '„';//&bdquo;
-$lang['doublequoteclosing']  = '“';//&ldquo;
-$lang['singlequoteopening']  = '‚';//&sbquo;
-$lang['singlequoteclosing']  = '‘';//&lsquo;
-
-$lang['btn_edit']   = 'Rediger dette dokument';
-$lang['btn_source'] = 'Vis kildekode';
-$lang['btn_show']   = 'Vis dokument';
-$lang['btn_create'] = 'Opret dette dokument';
-$lang['btn_search'] = 'Søg';
-$lang['btn_save']   = 'Gem';
-$lang['btn_preview']= 'Forhåndsvisning';
-$lang['btn_top']    = 'Tilbage til toppen';
-$lang['btn_newer']  = '<< forrige side';
-$lang['btn_older']  = 'næste side >>';
-$lang['btn_revs']   = 'Gamle udgaver';
-$lang['btn_recent'] = 'Nye ændringer';
-$lang['btn_upload'] = 'Upload';
-$lang['btn_cancel'] = 'Fortryd';
-$lang['btn_index']  = 'Indeks';
-$lang['btn_secedit']= 'Rediger';
-$lang['btn_login']  = 'Log ind';
-$lang['btn_logout'] = 'Log ud';
-$lang['btn_admin']  = 'Admin';
-$lang['btn_update'] = 'Opdater';
-$lang['btn_delete'] = 'Slet';
-$lang['btn_back']   = 'Tilbage';
-$lang['btn_backlink']    = "Henvisninger bagud";
-$lang['btn_backtomedia'] = 'Tilbage til valg af mediefil';
-$lang['btn_subscribe']   = 'Abonner på ændringer';
-$lang['btn_unsubscribe'] = 'Fjern abonnement på ændringer';
-$lang['btn_profile']    = 'Opdater profil';
-$lang['btn_reset']     = 'Nulstil';
-$lang['btn_resendpwd'] = 'Send nyt password';
-$lang['btn_draft']    = 'Rediger kladde';
-$lang['btn_recover']  = 'Gendan kladde';
-$lang['btn_draftdel'] = 'Slet kladde';
-
-$lang['loggedinas'] = 'Logget på som';
-$lang['user']       = 'Brugernavn';
-$lang['pass']       = 'Password';
-$lang['newpass']    = 'Nyt password';
-$lang['oldpass']    = 'Bekræft gammelt password';
-$lang['passchk']    = 'Gentag nyt password';
-$lang['remember']   = 'Log automatisk på';
-$lang['fullname']   = 'Navn';
-$lang['email']      = 'E-mail';
-$lang['register']   = 'Tilmeld';
-$lang['profile']    = 'Brugerprofil';
-$lang['badlogin']   = 'Forkert brugernavn eller password.';
-$lang['minoredit']  = 'Mindre ændringer';
-$lang['draftdate']  = 'Kladde automatisk gemt d.';
-
-$lang['regmissing'] = 'Du skal udfylde alle felter.';
-$lang['reguexists'] = 'Dette brugernavn er allerede i brug.';
-$lang['regsuccess'] = 'Du er nu oprettet som bruger. Dit password bliver sendt til dig i en e-mail.';
-$lang['regsuccess2']= 'Du er nu oprettet som bruger.';
-$lang['regmailfail']= 'Dit password blev ikke sendt. Kontakt venligst administratoren.';
-$lang['regbadmail'] = 'E-mail-adressen er ugyldig. Kontakt venligst administratoren, hvis du mener dette er en fejl.';
-$lang['regbadpass'] = 'De to passwords er ikke ens, vær venlig at prøve igen.';
-$lang['regpwmail']  = 'Dit DokuWiki password';
-$lang['reghere']    = 'Opret en DokuWiki-konto her';
-
-$lang['profna']       = 'Denne wiki understøtter ikke ændring af profiler';
-$lang['profnochange'] = 'Ingen ændringer, intet modificeret.';
-$lang['profnoempty']  = 'Tomt navn eller e-mail adresse er ikke tilladt.';
-$lang['profchanged']  = 'Brugerprofil opdateret korrekt.';
-
-$lang['pwdforget'] = 'Glemt dit password? Få et nyt';
-$lang['resendna']  = 'Denne wiki understøtter ikke udsendelse af nyt password.';
-$lang['resendpwd'] = 'Send nyt password for';
-$lang['resendpwdmissing'] = 'Du skal udfylde alle felter.';
-$lang['resendpwdnouser']  = 'Vi kan ikke finde denne bruger i vores database.';
-$lang['resendpwdbadauth'] = 'Beklager, denne autoriseringskode er ikke gyldig. Kontroller venligst at du benyttede det fulde link til bekræftelse.';
-$lang['resendpwdconfirm'] = 'Et link med bekræftelse er blevet sendt med email.';
-$lang['resendpwdsuccess'] = 'Dit nye password er blevet sendt med e-mail.';
-
-$lang['txt_upload']   = 'Vælg den fil der skal uploades';
-$lang['txt_filename'] = 'Indtast wikinavn (valgfrit)';
-$lang['txt_overwrt']  = 'Overskriv eksisterende fil';
-$lang['lockedby']     = 'Midlertidig låst af';
-$lang['lockexpire']   = 'Lås udløber kl.';
-$lang['willexpire']   = 'Din lås på dette dokument udløber om et minut.\nTryk på '.$lang['btn_preview'].'-knappen for at undgå konflikter.';
-
-$lang['notsavedyet'] = 'Der er lavet ændringer i dokumentet, hvis du fortsætter vil ændringerne gå tabt.\nØnsker du at fortsætte?';
-$lang['rssfailed']   = 'Der opstod en fejl ved indhentning af: ';
-$lang['nothingfound']= 'Søgningen gav intet resultat.';
-
-$lang['mediaselect'] = 'Vælg mediefil';
-$lang['fileupload']  = 'Upload mediefil';
-$lang['uploadsucc']  = 'Upload var en succes';
-$lang['uploadfail']  = 'Upload fejlede. Der er muligvis problemer med rettighederne';
-$lang['uploadwrong'] = 'Upload afvist. Filtypen er ikke tilladt';
-$lang['uploadexist'] = 'Filen eksisterer allerede.';
-$lang['uploadbadcontent'] = 'Upload indhold matchede ikke %s fil-endelsen.';
-$lang['uploadspam']  = 'Upload blev blokeret af spam sortlisten.';
-$lang['uploadxss']   = 'Upload blev blokeret på grund af mulig skadeligt indhold.';
-$lang['deletesucc']  = 'Filen "%s" er blevet slettet.';
-$lang['deletefail']  = '"%s" kunne ikke slettes - check rettighederne.';
-$lang['mediainuse']  = 'Filen "%s" er ikke slettet - den er stadig i brug.';
-$lang['namespaces']  = 'Navnerum';
-$lang['mediafiles']  = 'Tilgængelige filer i';
-
-$lang['js']['keepopen']    = 'Hold vindue åbent ved valg';
-$lang['js']['hidedetails'] = 'Skjul detaljer';
-$lang['mediausage']  = 'Brug den følgende syntaks til at henvise til denne fil:';
-$lang['mediaview']   = 'Vis oprindelig fil';
-$lang['mediaroot']   = 'rod';
-$lang['mediaupload'] = 'Upload en fil til det nuværende navnerum her. For at oprette under-navnerum, tilføj dem til "Upload som" filnavnet, adskilt af kolontegn.';
-$lang['mediaextchange'] = 'Filudvidelse ændret fra .%s til .%s!';
-
-$lang['reference']   = 'Henvisning til';
-$lang['ref_inuse']   = 'Filen kan ikke slettes, da den stadig er i brug på følgende sider:';
-$lang['ref_hidden']  = 'Nogle henvisninger er i dokumenter du ikke har læserettigheder til';
-
-$lang['hits']       = 'Hits';
-$lang['quickhits']  = 'Tilsvarende dokumentnavne';
-$lang['toc']        = 'Indholdsfortegnelse';
-$lang['current']    = 'nuværende';
-$lang['yours']      = 'Din version';
-$lang['diff']       = 'vis forskelle i forhold til den nuværende udgave';
-$lang['line']       = 'Linje';
-$lang['breadcrumb'] = 'Sti';
-$lang['youarehere'] = 'Du er her';
-$lang['lastmod']    = 'Sidst ændret';
-$lang['by']         = 'af';
-$lang['deleted']    = 'slettet';
-$lang['created']    = 'oprettet';
-$lang['restored']   = 'gammel udgave reetableret';
-$lang['external_edit'] = 'ekstern redigering';
-$lang['summary']    = 'Redigerings resume';
-
-$lang['mail_newpage'] = 'dokument tilføjet:';
-$lang['mail_changed'] = 'dokument ændret:';
-$lang['mail_new_user'] = 'Ny bruger';
-$lang['mail_upload'] = 'fil uploadet:';
-$lang['nosmblinks'] = 'Henvisninger til Windows shares virker kun i Microsoft Internet Explorer.\nDu kan stadig kopiere og indsætte linket.';
-
-$lang['qb_alert']   = 'Skriv den tekst du ønsker at formatere.\nDen vil blive tilføjet i slutningen af dokumentet.';
-$lang['qb_bold']    = 'Fed';
-$lang['qb_italic']  = 'Kursiv';
-$lang['qb_underl']  = 'Understregning';
-$lang['qb_code']    = 'Skrivemaskine tekst';
-$lang['qb_strike']  = 'Gennemstregning';
-$lang['qb_h1']      = 'Niveau 1 overskrift';
-$lang['qb_h2']      = 'Niveau 2 overskrift';
-$lang['qb_h3']      = 'Niveau 3 overskrift';
-$lang['qb_h4']      = 'Niveau 4 overskrift';
-$lang['qb_h5']      = 'Niveau 5 overskrift';
-$lang['qb_link']    = 'Intern henvisning';
-$lang['qb_extlink'] = 'Ekstern henvisning';
-$lang['qb_hr']      = 'Vandret linje';
-$lang['qb_ol']      = 'Nummereret liste';
-$lang['qb_ul']      = 'Unummereret liste';
-$lang['qb_media']   = 'Tilføj billeder og andre filer';
-$lang['qb_sig']     = 'Indsæt signatur';
-$lang['qb_smileys'] = 'Smileys';
-$lang['qb_chars']   = 'Specialtegn';
-
-$lang['del_confirm']= 'Slet valgte post(er)?';
-$lang['admin_register']= 'Tilføj ny bruger';
-
-$lang['metaedit']    = 'Rediger metadata';
-$lang['metasaveerr'] = 'Skrivning af metadata fejlede';
-$lang['metasaveok']  = 'Metadata gemt';
-$lang['img_backto']  = 'Tilbage til';
-$lang['img_title']   = 'Titel';
-$lang['img_caption'] = 'Billedtekst';
-$lang['img_date']    = 'Dato';
-$lang['img_fname']   = 'Filnavn';
-$lang['img_fsize']   = 'Størrelse';
-$lang['img_artist']  = 'Fotograf';
-$lang['img_copyr']   = 'Copyright';
-$lang['img_format']  = 'Format';
-$lang['img_camera']  = 'Kamera';
-$lang['img_keywords']= 'Emneord';
-
-$lang['subscribe_success']  = 'Tilføjet %s til abonnentliste for %s';
-$lang['subscribe_error']    = 'Fejl ved tilføjelse af %s til abonnentliste for %s';
-$lang['subscribe_noaddress']= 'Ingen adresse knyttet til dit login, du kan ikke tilføjes til abonnentlisten';
-$lang['unsubscribe_success']= 'Fjernet %s fra abonnentliste for %s';
-$lang['unsubscribe_error']  = 'Fejl ved fjernelse af %s fra abonnentliste for %s';
-
-/* auth.class language support */
-$lang['authmodfailed']   = 'Fejl i brugervalideringens konfiguration. Kontakt venligst wikiens administrator.';
-$lang['authtempfail']    = 'Brugervalidering er midlertidigt ude af drift. Hvis dette er vedvarende, kontakt venligst wikiens administrator.';
-
-/* installer strings */
-$lang['i_chooselang'] = 'Vælg dit sprog';
-$lang['i_installer']  = 'DokuWiki Installer';
-$lang['i_wikiname']   = 'Wiki Navn';
-$lang['i_enableacl']  = 'Brug ACL (foreslået)';
-$lang['i_superuser']  = 'Superbruger';
-$lang['i_problems']   = 'Installeren fandt nogle problemer, vist nedenunder. Du kan ikke fortsætte før du har rettet dem.';
-$lang['i_modified']   = 'Af sikkerheds hensyn vil dette script kun virke på en ny og umodificeret Dokuwiki installation.
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Rediger dette dokument';
+$lang['btn_source']            = 'Vis kildekode';
+$lang['btn_show']              = 'Vis dokument';
+$lang['btn_create']            = 'Opret dette dokument';
+$lang['btn_search']            = 'Søg';
+$lang['btn_save']              = 'Gem';
+$lang['btn_preview']           = 'Forhåndsvisning';
+$lang['btn_top']               = 'Tilbage til toppen';
+$lang['btn_newer']             = '<< forrige side';
+$lang['btn_older']             = 'næste side >>';
+$lang['btn_revs']              = 'Gamle udgaver';
+$lang['btn_recent']            = 'Nye ændringer';
+$lang['btn_upload']            = 'Upload';
+$lang['btn_cancel']            = 'Fortryd';
+$lang['btn_index']             = 'Indeks';
+$lang['btn_secedit']           = 'Rediger';
+$lang['btn_login']             = 'Log ind';
+$lang['btn_logout']            = 'Log ud';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Opdater';
+$lang['btn_delete']            = 'Slet';
+$lang['btn_back']              = 'Tilbage';
+$lang['btn_backlink']          = 'Henvisninger bagud';
+$lang['btn_backtomedia']       = 'Tilbage til valg af mediefil';
+$lang['btn_subscribe']         = 'Abonner på ændringer';
+$lang['btn_unsubscribe']       = 'Fjern abonnement på ændringer';
+$lang['btn_subscribens']       = 'Abonner på namespace ændringer';
+$lang['btn_unsubscribens']     = 'Fjern abonnement på namespace ændringer';
+$lang['btn_profile']           = 'Opdater profil';
+$lang['btn_reset']             = 'Nulstil';
+$lang['btn_resendpwd']         = 'Send nyt password';
+$lang['btn_draft']             = 'Rediger kladde';
+$lang['btn_recover']           = 'Gendan kladde';
+$lang['btn_draftdel']          = 'Slet kladde';
+$lang['loggedinas']            = 'Logget på som';
+$lang['user']                  = 'Brugernavn';
+$lang['pass']                  = 'Password';
+$lang['newpass']               = 'Nyt password';
+$lang['oldpass']               = 'Bekræft gammelt password';
+$lang['passchk']               = 'Gentag nyt password';
+$lang['remember']              = 'Log automatisk på';
+$lang['fullname']              = 'Navn';
+$lang['email']                 = 'E-mail';
+$lang['register']              = 'Tilmeld';
+$lang['profile']               = 'Brugerprofil';
+$lang['badlogin']              = 'Forkert brugernavn eller password.';
+$lang['minoredit']             = 'Mindre ændringer';
+$lang['draftdate']             = 'Kladde automatisk gemt d.';
+$lang['regmissing']            = 'Du skal udfylde alle felter.';
+$lang['reguexists']            = 'Dette brugernavn er allerede i brug.';
+$lang['regsuccess']            = 'Du er nu oprettet som bruger. Dit password bliver sendt til dig i en e-mail.';
+$lang['regsuccess2']           = 'Du er nu oprettet som bruger.';
+$lang['regmailfail']           = 'Dit password blev ikke sendt. Kontakt venligst administratoren.';
+$lang['regbadmail']            = 'E-mail-adressen er ugyldig. Kontakt venligst administratoren, hvis du mener dette er en fejl.';
+$lang['regbadpass']            = 'De to passwords er ikke ens, vær venlig at prøve igen.';
+$lang['regpwmail']             = 'Dit DokuWiki password';
+$lang['reghere']               = 'Opret en DokuWiki-konto her';
+$lang['profna']                = 'Denne wiki understøtter ikke ændring af profiler';
+$lang['profnochange']          = 'Ingen ændringer, intet modificeret.';
+$lang['profnoempty']           = 'Tomt navn eller e-mail adresse er ikke tilladt.';
+$lang['profchanged']           = 'Brugerprofil opdateret korrekt.';
+$lang['pwdforget']             = 'Glemt dit password? Få et nyt';
+$lang['resendna']              = 'Denne wiki understøtter ikke udsendelse af nyt password.';
+$lang['resendpwd']             = 'Send nyt password for';
+$lang['resendpwdmissing']      = 'Du skal udfylde alle felter.';
+$lang['resendpwdnouser']       = 'Vi kan ikke finde denne bruger i vores database.';
+$lang['resendpwdbadauth']      = 'Beklager, denne autoriseringskode er ikke gyldig. Kontroller venligst at du benyttede det fulde link til bekræftelse.';
+$lang['resendpwdconfirm']      = 'Et link med bekræftelse er blevet sendt med email.';
+$lang['resendpwdsuccess']      = 'Dit nye password er blevet sendt med e-mail.';
+$lang['txt_upload']            = 'Vælg den fil der skal uploades';
+$lang['txt_filename']          = 'Indtast wikinavn (valgfrit)';
+$lang['txt_overwrt']           = 'Overskriv eksisterende fil';
+$lang['lockedby']              = 'Midlertidig låst af';
+$lang['lockexpire']            = 'Lås udløber kl.';
+$lang['willexpire']            = 'Din lås på dette dokument udløber om et minut.\nTryk på Forhåndsvisning-knappen for at undgå konflikter.';
+$lang['notsavedyet']           = 'Der er lavet ændringer i dokumentet, hvis du fortsætter vil ændringerne gå tabt.\nØnsker du at fortsætte?';
+$lang['rssfailed']             = 'Der opstod en fejl ved indhentning af: ';
+$lang['nothingfound']          = 'Søgningen gav intet resultat.';
+$lang['mediaselect']           = 'Vælg mediefil';
+$lang['fileupload']            = 'Upload mediefil';
+$lang['uploadsucc']            = 'Upload var en succes';
+$lang['uploadfail']            = 'Upload fejlede. Der er muligvis problemer med rettighederne';
+$lang['uploadwrong']           = 'Upload afvist. Filtypen er ikke tilladt';
+$lang['uploadexist']           = 'Filen eksisterer allerede.';
+$lang['uploadbadcontent']      = 'Upload indhold matchede ikke %s fil-endelsen.';
+$lang['uploadspam']            = 'Upload blev blokeret af spam sortlisten.';
+$lang['uploadxss']             = 'Upload blev blokeret på grund af mulig skadeligt indhold.';
+$lang['deletesucc']            = 'Filen "%s" er blevet slettet.';
+$lang['deletefail']            = '"%s" kunne ikke slettes - check rettighederne.';
+$lang['mediainuse']            = 'Filen "%s" er ikke slettet - den er stadig i brug.';
+$lang['namespaces']            = 'Navnerum';
+$lang['mediafiles']            = 'Tilgængelige filer i';
+$lang['js']['keepopen']        = 'Hold vindue åbent ved valg';
+$lang['js']['hidedetails']     = 'Skjul detaljer';
+$lang['mediausage']            = 'Brug den følgende syntaks til at henvise til denne fil:';
+$lang['mediaview']             = 'Vis oprindelig fil';
+$lang['mediaroot']             = 'rod';
+$lang['mediaupload']           = 'Upload en fil til det nuværende navnerum her. For at oprette under-navnerum, tilføj dem til "Upload som" filnavnet, adskilt af kolontegn.';
+$lang['mediaextchange']        = 'Filudvidelse ændret fra .%s til .%s!';
+$lang['reference']             = 'Henvisning til';
+$lang['ref_inuse']             = 'Filen kan ikke slettes, da den stadig er i brug på følgende sider:';
+$lang['ref_hidden']            = 'Nogle henvisninger er i dokumenter du ikke har læserettigheder til';
+$lang['hits']                  = 'Hits';
+$lang['quickhits']             = 'Tilsvarende dokumentnavne';
+$lang['toc']                   = 'Indholdsfortegnelse';
+$lang['current']               = 'nuværende';
+$lang['yours']                 = 'Din version';
+$lang['diff']                  = 'Vis forskelle i forhold til den nuværende udgave';
+$lang['diff2']                 = 'Vis forskelle i forhold til de valgte revisioner';
+$lang['line']                  = 'Linje';
+$lang['breadcrumb']            = 'Sti';
+$lang['youarehere']            = 'Du er her';
+$lang['lastmod']               = 'Sidst ændret';
+$lang['by']                    = 'af';
+$lang['deleted']               = 'slettet';
+$lang['created']               = 'oprettet';
+$lang['restored']              = 'gammel udgave reetableret';
+$lang['external_edit']         = 'ekstern redigering';
+$lang['summary']               = 'Redigerings resume';
+$lang['mail_newpage']          = 'dokument tilføjet:';
+$lang['mail_changed']          = 'dokument ændret:';
+$lang['mail_new_user']         = 'Ny bruger';
+$lang['mail_upload']           = 'fil uploadet:';
+$lang['nosmblinks']            = 'Henvisninger til Windows shares virker kun i Microsoft Internet Explorer.\nDu kan stadig kopiere og indsætte linket.';
+$lang['qb_alert']              = 'Skriv den tekst du ønsker at formatere.\nDen vil blive tilføjet i slutningen af dokumentet.';
+$lang['qb_bold']               = 'Fed';
+$lang['qb_italic']             = 'Kursiv';
+$lang['qb_underl']             = 'Understregning';
+$lang['qb_code']               = 'Skrivemaskine tekst';
+$lang['qb_strike']             = 'Gennemstregning';
+$lang['qb_h1']                 = 'Niveau 1 overskrift';
+$lang['qb_h2']                 = 'Niveau 2 overskrift';
+$lang['qb_h3']                 = 'Niveau 3 overskrift';
+$lang['qb_h4']                 = 'Niveau 4 overskrift';
+$lang['qb_h5']                 = 'Niveau 5 overskrift';
+$lang['qb_link']               = 'Intern henvisning';
+$lang['qb_extlink']            = 'Ekstern henvisning';
+$lang['qb_hr']                 = 'Vandret linje';
+$lang['qb_ol']                 = 'Nummereret liste';
+$lang['qb_ul']                 = 'Unummereret liste';
+$lang['qb_media']              = 'Tilføj billeder og andre filer';
+$lang['qb_sig']                = 'Indsæt signatur';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Specialtegn';
+$lang['del_confirm']           = 'Slet valgte post(er)?';
+$lang['admin_register']        = 'Tilføj ny bruger';
+$lang['metaedit']              = 'Rediger metadata';
+$lang['metasaveerr']           = 'Skrivning af metadata fejlede';
+$lang['metasaveok']            = 'Metadata gemt';
+$lang['img_backto']            = 'Tilbage til';
+$lang['img_title']             = 'Titel';
+$lang['img_caption']           = 'Billedtekst';
+$lang['img_date']              = 'Dato';
+$lang['img_fname']             = 'Filnavn';
+$lang['img_fsize']             = 'Størrelse';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Emneord';
+$lang['subscribe_success']     = 'Tilføjet %s til abonnentliste for %s';
+$lang['subscribe_error']       = 'Fejl ved tilføjelse af %s til abonnentliste for %s';
+$lang['subscribe_noaddress']   = 'Ingen adresse knyttet til dit login, du kan ikke tilføjes til abonnentlisten';
+$lang['unsubscribe_success']   = 'Fjernet %s fra abonnentliste for %s';
+$lang['unsubscribe_error']     = 'Fejl ved fjernelse af %s fra abonnentliste for %s';
+$lang['authmodfailed']         = 'Fejl i brugervalideringens konfiguration. Kontakt venligst wikiens administrator.';
+$lang['authtempfail']          = 'Brugervalidering er midlertidigt ude af drift. Hvis dette er vedvarende, kontakt venligst wikiens administrator.';
+$lang['i_chooselang']          = 'Vælg dit sprog';
+$lang['i_installer']           = 'DokuWiki Installer';
+$lang['i_wikiname']            = 'Wiki Navn';
+$lang['i_enableacl']           = 'Brug ACL (foreslået)';
+$lang['i_superuser']           = 'Superbruger';
+$lang['i_problems']            = 'Installeren fandt nogle problemer, vist nedenunder. Du kan ikke fortsætte før du har rettet dem.';
+$lang['i_modified']            = 'Af sikkerheds hensyn vil dette script kun virke på en ny og umodificeret Dokuwiki installation.
                          Du burde enten gen-udpakke filerne fra den downloaded pakke eller tjekke den fuldstændige
                          <a href="http://wiki.splitbrain.org/wiki:install">DokuWiki installations instruktioner</a>';
-$lang['i_funcna']     = 'PHP funtionen <code>%s</code> er ikke tilgængelig. Måske har din udbyder slået det fra af en eller anden grund?';
-$lang['i_phpver']     = 'Din PHP version <code>%s</code> er mindre en den nødvendige <code>%s</code>. Du er nød til at opgradere din PHP installation.';
-$lang['i_permfail']   = 'DokuWiki kan ikke skrive til <code>%s</code>. Du er nød til at rette tilladelses indstillingerne for denne mappe!';
-$lang['i_confexists'] = '<code>%s</code> eksisterer allerede';
-$lang['i_writeerr']   = 'Kunne ikke oprette <code>%s</code>. Du bliver nød til at tjekke mappe/fil- tilladelserne og oprette filen manuelt.';
-$lang['i_badhash']    = 'uigenkendelig eller modificeret dokuwiki.php (hash=<code>%s</code>)';
-$lang['i_badval']     = '<code>%s</code> - ulovlig eller tom værdi';
-$lang['i_success']    = 'Konfigurationen fulførtedes med success.  Du kan nu slette install.php filen. Forsæt til
+$lang['i_funcna']              = 'PHP funtionen <code>%s</code> er ikke tilgængelig. Måske har din udbyder slået det fra af en eller anden grund?';
+$lang['i_phpver']              = 'Din PHP version <code>%s</code> er mindre en den nødvendige <code>%s</code>. Du er nød til at opgradere din PHP installation.';
+$lang['i_permfail']            = 'DokuWiki kan ikke skrive til <code>%s</code>. Du er nød til at rette tilladelses indstillingerne for denne mappe!';
+$lang['i_confexists']          = '<code>%s</code> eksisterer allerede';
+$lang['i_writeerr']            = 'Kunne ikke oprette <code>%s</code>. Du bliver nød til at tjekke mappe/fil- tilladelserne og oprette filen manuelt.';
+$lang['i_badhash']             = 'uigenkendelig eller modificeret dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - ulovlig eller tom værdi';
+$lang['i_success']             = 'Konfigurationen fulførtedes med success.  Du kan nu slette install.php filen. Forsæt til
                         <a href="doku.php">din nye DokuWiki</a>.';
-$lang['i_failure']    = 'Nogle fejl forekom mens konfigurations filerne skulle skrives. Du er mulighvis nød til at fixe dem manuelt før
+$lang['i_failure']             = 'Nogle fejl forekom mens konfigurations filerne skulle skrives. Du er mulighvis nød til at fixe dem manuelt før
                          du kan bruge <a href="doku.php">din nye DokuWiki</a>.';
-$lang['i_policy']     = 'Begyndende ACL politik';
-$lang['i_pol0']       = 'Åben Wiki (alle kan læse, skrive og uploade)';
-$lang['i_pol1']       = 'Offentlig Wiki (alle kan læse, kun registrerede brugere kan skrive og uploade)';
-$lang['i_pol2']       = 'Lukket Wiki (kun for registerede brugere kan læse, skrive og uploade)';
-$lang['i_retry']      = 'Forsøg igen';
-
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+$lang['i_policy']              = 'Begyndende ACL politik';
+$lang['i_pol0']                = 'Åben Wiki (alle kan læse, skrive og uploade)';
+$lang['i_pol1']                = 'Offentlig Wiki (alle kan læse, kun registrerede brugere kan skrive og uploade)';
+$lang['i_pol2']                = 'Lukket Wiki (kun for registerede brugere kan læse, skrive og uploade)';
+$lang['i_retry']               = 'Forsøg igen';

File wiki/inc/lang/da/uploadmail.txt

 Dato        : @DATE@
 Browser     : @BROWSER@
 IP-adresse  : @IPADDRESS@
-V�rtsnavn   : @HOSTNAME@
-St�rrelse   : @SIZE@
+V�rtsnavn   : @HOSTNAME@
+St�rrelse   : @SIZE@
 MIME Type   : @MIME@
 Bruger      : @USER@
 
 --
-Denne e-mail blev genereret af DokuWiki p�
+Denne e-mail blev genereret af DokuWiki p�
 @DOKUWIKIURL@

File wiki/inc/lang/en/admin.txt

 ====== Administration ======
 
-Below you can find a list of administrative tasks available in
-DokuWiki.
+Below you can find a list of administrative tasks available in DokuWiki.
 

File wiki/inc/lang/en/conflict.txt

 ====== A newer version exists ======
 
-A newer version of the document you edited exists. This happens when another
-user changed the document while you were editing it.
+A newer version of the document you edited exists. This happens when another user changed the document while you were editing it.
 
-Examine the differences shown below thoroughly, then decide which version to
-keep. If you choose ''save'', your version will be saved. Hit ''cancel'' to
-keep the current version.
+Examine the differences shown below thoroughly, then decide which version to keep. If you choose ''save'', your version will be saved. Hit ''cancel'' to keep the current version.
 

File wiki/inc/lang/en/diff.txt

 ======Differences======
 
-This shows you the differences between the selected revision and the current
-version of the page.
+This shows you the differences between the selected revision and the current version of the page.
 

File wiki/inc/lang/en/draft.txt

 ====== Draft file found ======
 
-Your last edit session on this page was not completed correctly. DokuWiki
-automatically saved a draft during your work which you may now use to continue
-your editing. Below you can see the data that was saved from your last session.
+Your last edit session on this page was not completed correctly. DokuWiki automatically saved a draft during your work which you may now use to continue your editing. Below you can see the data that was saved from your last session.
 
-Please decide if you want to //recover// your lost edit session, //delete//
-the autosaved draft or //cancel// the editing process.
+Please decide if you want to //recover// your lost edit session, //delete// the autosaved draft or //cancel// the editing process.
 

File wiki/inc/lang/en/edit.txt

-Edit the page and hit ''Save''. See [[wiki:syntax]] for
-Wiki syntax. Please edit the page only if you can **improve** it. If you
-want to test some things, learn to make your first steps on the
-[[playground:playground|playground]].
+Edit the page and hit ''Save''. See [[wiki:syntax]] for Wiki syntax. Please edit the page only if you can **improve** it. If you want to test some things, learn to make your first steps on the [[playground:playground|playground]].
 

File wiki/inc/lang/en/editrev.txt

-**You've loaded an old revision of the document!** If you save it, you will create
-a new version with this data.
+**You've loaded an old revision of the document!** If you save it, you will create a new version with this data.
 ----

File wiki/inc/lang/en/locked.txt

 ====== Page locked ======
 
-This page is currently locked for editing by another user. You have to wait
-until this user finishes editing or the lock expires.
+This page is currently locked for editing by another user. You have to wait until this user finishes editing or the lock expires.

File wiki/inc/lang/en/login.txt

 ====== Login ======
 
-You are currently not logged in! Enter your authentication credentials below to log in.
-You need to have cookies enabled to log in.
+You are currently not logged in! Enter your authentication credentials below to log in. You need to have cookies enabled to log in.
 

File wiki/inc/lang/en/newpage.txt

 ======This topic does not exist yet======
 
-You've followed a link to a topic that doesn't exist yet.
-If permissions allow, you may create it by using the
-''Create this page'' button.
+You've followed a link to a topic that doesn't exist yet. If permissions allow, you may create it by using the ''Create this page'' button.
 

File wiki/inc/lang/en/register.txt

 ====== Register as new user ======
 
-Fill in all the information below to create a new account in this wiki.
-Make sure you supply a **valid e-mail address** - if you are not asked
-to enter a password here, a new one will be sent to that address.
-The login name should be a valid [[doku>wiki:pagename|pagename]].
+Fill in all the information below to create a new account in this wiki. Make sure you supply a **valid e-mail address** - if you are not asked to enter a password here, a new one will be sent to that address. The login name should be a valid [[doku>wiki:pagename|pagename]].
 

File wiki/inc/lang/en/resendpwd.txt

 ====== Send new password ======
 
-Please enter your user name in the form below to request a new password for your
-account in this wiki. A confirmation link will be sent to your registered email
-address.
+Please enter your user name in the form below to request a new password for your account in this wiki. A confirmation link will be sent to your registered email address.
 

File wiki/inc/lang/en/searchpage.txt

 ======Search======
 
-You can find the results of your search below. If you didn't find
-what you were looking for, you can create or edit the page named
-after your query with the appropriate button.
+You can find the results of your search below. If you didn't find what you were looking for, you can create or edit the page named after your query with the appropriate button.
 
 =====Results=====

File wiki/inc/lang/en/wordblock.txt

 ======SPAM blocked======
 
-Your changes were **not** saved because it contains one or more blocked words.
-If you tried to spam the Wiki -- Bad dog! If you think this is an error, contact
-the administrator of this Wiki.
+Your changes were **not** saved because it contains one or more blocked words. If you tried to spam the Wiki -- Bad dog! If you think this is an error, contact the administrator of this Wiki.
 

File wiki/inc/lang/es/lang.php

  * @author Miguel Pagano <miguel.pagano@gmail.com>
  * @author Oscar M. Lage <r0sk10@gmail.com>
  * @author Gabriel Castillo <gch@pumas.ii.unam.mx>
+ * @author oliver@samera.com.py
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
 $lang['btn_backtomedia']       = 'Vuelta a la selección de medios';
 $lang['btn_subscribe']         = 'Subscribirse a la notificación de cambios';
 $lang['btn_unsubscribe']       = 'Desubscribirse a la notificación de cambios';
+$lang['btn_subscribens']       = 'Subscribirse a cambios de un directorio';
+$lang['btn_unsubscribens']     = 'Desubscribirse de cambios de un directorio';
 $lang['btn_profile']           = 'Actualizar datos del usuario';
 $lang['btn_reset']             = 'Deshacer cambios';
 $lang['btn_resendpwd']         = 'Enviar nueva contraseña';

File wiki/inc/lang/ko/edit.txt_bak

-페이지를 편집하고 ''저장''을 누르십시오.  위키 구문은 [[wiki:syntax]] 를 
-참고하십시오. 이 페이지를 **개선**할 수 있을 때에만 편집하십시오. 실험을 
-하고 싶을 때에는, 먼저 [[wiki:playground]] 에 가서 연습해 보십시오.
-
+페이지를 편집하고 ''저장''을 누르십시오.  위키 구문은 [[wiki:syntax]] 를 
+참고하십시오. 이 페이지를 **개선**할 수 있을 때에만 편집하십시오. 실험을 
+하고 싶을 때에는, 먼저 [[wiki:playground]] 에 가서 연습해 보십시오.
+

File wiki/inc/lang/lv/lang.php

 $lang['i_writeerr']            = 'Nevar izveidot <code>%s</code>. Jāpārbauda direktorijas/faila tiesības un fails jāizveido pašam.';
 $lang['i_badhash']             = 'nepazīstams via izmainīts dokuwiki.php (hash=<code>%s</code>)';
 $lang['i_badval']              = '<code>%s</code> - neatļauta vai tukša vērtība';
-$lang['i_success']             = 'Konfigurēšana veiksmīgi pabeigta. Tagad vari nodzēst failu install.php. Tālā turpini <a href="doku.php">savā jaunajā DokuWiki</a>.';
+$lang['i_success']             = 'Konfigurēšana veiksmīgi pabeigta. Tagad vari nodzēst failu install.php. Tālāk turpini <a href="doku.php">savā jaunajā DokuWiki</a>.';
 $lang['i_failure']             = 'Rakstot konfigurācijas failu, gadījās dažas kļūmes. 
                          Pirms lieto <a href="doku.php">savu jauno DokuWiki</a>, tās varbūt jāizlabo.';
 $lang['i_policy']              = 'Sākotnējā ACL politika';

File wiki/inc/lang/lv/stopwords.txt

 # Šis ir to vārdu sarakstus, kurus indeksētājs neņem vērā. Katru vārdu savā rindā!
 # Labojot failu ievēro, ja jālieto UNIX rindu aplauzumi (single newline)
-# Nevajag likst sarakstā par 3 burtiem īsākus vārdus, tos tā pat neņem vērā
+# Nevajag likt sarakstā par 3 burtiem īsākus vārdus, tos tā pat neņem vērā
 # Angļu valodai saraksts ņemts no http://www.ranks.nl/stopwords/
 gar 
 par

File wiki/inc/lang/mg/admin.txt

-====== Administration ======
-
-Hitanao eo ambany lisitry ny asa fanaovana admin misy amin'ny
-DokuWiki.
-
+====== Administration ======
+
+Hitanao eo ambany lisitry ny asa fanaovana admin misy amin'ny
+DokuWiki.
+

File wiki/inc/lang/mg/admin_acl.txt

-====== Fitantanana fahazoan-dalana (Access Control List)  ======
-
-Eto amin'ity pejy ity dia afaka manampy sy mamafa alalana amin'ny pejy misokatra sy ireo [[doku>wiki:namespaces|namespaces]] misy ao. 
-Mila vakianao ny [[doku>wiki:acl|tahirin-kevitra ofisialy momba ny ACL]] mba hahafahanao mahazo ny fomba fiasan'ny ACL.
-
-Miseho eo amin'ny pejy ny alalana rehetra manan-kery ho an'ny pejy misokatra. Ny alalana momba ny pejy hafa dia tsy miseho -- mba hanamboarana
-azy ireny dia [[this>doku.php?do=index|sokafy]] aloha ilay pejy, ary ovay avy eo ny fitantanana ny ACL
-
+====== Fitantanana fahazoan-dalana (Access Control List)  ======
+
+Eto amin'ity pejy ity dia afaka manampy sy mamafa alalana amin'ny pejy misokatra sy ireo [[doku>wiki:namespaces|namespaces]] misy ao. 
+Mila vakianao ny [[doku>wiki:acl|tahirin-kevitra ofisialy momba ny ACL]] mba hahafahanao mahazo ny fomba fiasan'ny ACL.
+
+Miseho eo amin'ny pejy ny alalana rehetra manan-kery ho an'ny pejy misokatra. Ny alalana momba ny pejy hafa dia tsy miseho -- mba hanamboarana
+azy ireny dia [[this>doku.php?do=index|sokafy]] aloha ilay pejy, ary ovay avy eo ny fitantanana ny ACL
+

File wiki/inc/lang/mg/backlinks.txt

-====== Verindrohy ======
-
-Lisitr'ireo pejy misy rohy manondro amin'ity pejy ity.
-
-
+====== Verindrohy ======
+
+Lisitr'ireo pejy misy rohy manondro amin'ity pejy ity.
+
+

File wiki/inc/lang/mg/conflict.txt

-====== A newer version exists ======
-
-Efa misy kinova vaovao ny tahirin-kevitra novainao. Rehefa misy olona hafa nanova koa nandritra anao nanova no mitranga ny toy izao.
-
-Jereo ny tsy fitoviany miseho etsy ambany ireo, avy eo safidio izay kinova tianao hotazonina. Raha misafidy ny bokotra ''Raketo'' ianao, dia ny nataonao no horaketina. Ny bokotra ''Aoka ihany'' tsindriana raha hitazonana izay kinova misy ao.
-
+====== A newer version exists ======
+
+Efa misy kinova vaovao ny tahirin-kevitra novainao. Rehefa misy olona hafa nanova koa nandritra anao nanova no mitranga ny toy izao.
+
+Jereo ny tsy fitoviany miseho etsy ambany ireo, avy eo safidio izay kinova tianao hotazonina. Raha misafidy ny bokotra ''Raketo'' ianao, dia ny nataonao no horaketina. Ny bokotra ''Aoka ihany'' tsindriana raha hitazonana izay kinova misy ao.
+

File wiki/inc/lang/mg/denied.txt

-======Tsy tafiditra======
-
-Miala tsiny fa tsy manana alalana hanohizana mankany ianao. Angamba hadinonao ny niditra.
-
+======Tsy tafiditra======
+
+Miala tsiny fa tsy manana alalana hanohizana mankany ianao. Angamba hadinonao ny niditra.
+

File wiki/inc/lang/mg/diff.txt

-======Tsy fitoviana======
-
-Ireto ny maha-samihafa ny kinova nosafidiana sy ny kinovan'ny pejy amin'izao.
-
+======Tsy fitoviana======
+
+Ireto ny maha-samihafa ny kinova nosafidiana sy ny kinovan'ny pejy amin'izao.
+

File wiki/inc/lang/mg/edit.txt

-Rehefa avy manova ny pejy dia tsindrio ny bokotra ''Raketo''. Jereo ny [[wiki:syntax]] misy ny fomba fanoratana. 
-Raha misy zavatra tianao handramana dia ianaro ao amin'ny
-[[wiki:playground]].
-
+Rehefa avy manova ny pejy dia tsindrio ny bokotra ''Raketo''. Jereo ny [[wiki:syntax]] misy ny fomba fanoratana. 
+Raha misy zavatra tianao handramana dia ianaro ao amin'ny
+[[wiki:playground]].
+

File wiki/inc/lang/mg/editrev.txt

-**Kinovan'ny pejy taloha no nosokafanao!** Raha raketinao io, dia hanamboatra kinova vaovao miaraka amin'io ianao.
+**Kinovan'ny pejy taloha no nosokafanao!** Raha raketinao io, dia hanamboatra kinova vaovao miaraka amin'io ianao.
 ----

File wiki/inc/lang/mg/index.txt

-====== Index ======
-
-Ity misy index mahasarona ireo pejy misy milahatra arakaraka ny [[doku>wiki:namespaces|namespaces]].
-
+====== Index ======
+
+Ity misy index mahasarona ireo pejy misy milahatra arakaraka ny [[doku>wiki:namespaces|namespaces]].
+

File wiki/inc/lang/mg/lang.php

-<?php
-/**
- * mg language file
- */
-$lang['encoding']   = 'utf-8';
-$lang['direction']  = 'ltr';
-
-$lang['btn_edit']   = 'Hanova ny pejy';
-$lang['btn_source'] = 'Asehoy ny source';
-$lang['btn_show']   = 'Asehoy ny pejy';
-$lang['btn_create'] = 'Amboary ity pejy';
-$lang['btn_search'] = 'Hikaroka';
-$lang['btn_save']   = 'Raketo';
-$lang['btn_preview']= 'Topi-maso';
-$lang['btn_top']    = 'Ho ery ambony';
-$lang['btn_newer']  = '<< taloha kokoa';
-$lang['btn_older']  = 'taoriana kokoa >>';
-$lang['btn_revs']   = 'Kinova taloha';
-$lang['btn_recent'] = 'Fiovana farany';
-$lang['btn_upload'] = 'Alefaso';
-$lang['btn_cancel'] = 'Aoka ihany';
-$lang['btn_index']  = 'Index';
-$lang['btn_secedit']= 'Edit';
-$lang['btn_login']  = 'Hiditra';
-$lang['btn_logout'] = 'Hivoaka';
-$lang['btn_admin']  = 'Admin';
-$lang['btn_update'] = 'Update';
-$lang['btn_delete'] = 'Fafao';
-$lang['btn_back']   = 'Miverina';
-$lang['btn_backtomedia'] = 'Fitsongana fichier Media';
-
-$lang['loggedinas'] = 'Anaranao:';
-$lang['user']       = 'Anarana';
-$lang['pass']       = 'Alahidy';
-$lang['passchk']    = 'Ataovy indray';
-$lang['remember']   = 'Tsarovy';
-$lang['fullname']   = 'Anarana feno';
-$lang['email']      = 'Imailaka';
-$lang['register']   = 'Hisoratra';
-$lang['badlogin']   = 'Miala tsiny fa misy diso ny anarana na ny alahidy.';
-
-$lang['regmissing'] = 'Tsy maintsy fenoina ny saha rehetra.';
-$lang['reguexists'] = 'Indrisy fa efa nisy namandrika io anarana io.';
-$lang['regsuccess'] = 'Voaforona ny kaontinao, halefa any imailaka ny alahidy.';
-$lang['regsuccess2']= 'Voaforona ilay kaonty.';
-$lang['regmailfail']= 'Ohatra ny nisy olana ny nandefasana imailaka. Miangavy anao hilaza ny Admin!';
-$lang['regbadmail'] = 'Toa tsy mandeha ny imailaka nomenao - Raha heverinao fa erreur io dia ilazao ny admin';
-$lang['regbadpass'] = 'Tsy mitovy ny alahidy roa nomenao, avereno indray.';
-$lang['regpwmail']  = 'Ny alahidy Wiki-nao';
-$lang['reghere']    = 'Mbola tsy manana kaonty ianao? Manaova vaovao';
-
-$lang['txt_upload']   = 'Misafidiana rakitra halefa';
-$lang['txt_filename'] = 'Ampidiro ny anaran\'ny wiki (tsy voatery)';
-$lang['txt_overwrt']  = 'Fafana izay rakitra efa misy?';
-$lang['lockedby']     = 'Mbola voahidin\'i';
-$lang['lockexpire']   = 'Afaka ny hidy amin\'ny';
-$lang['willexpire']   = 'Efa ho lany fotoana afaka iray minitra ny hidy ahafahanao manova ny pejy.\nMba hialana amin\'ny conflit dia ampiasao ny bokotra topi-maso hamerenana ny timer-n\'ny hidy.';
-
-$lang['notsavedyet'] = 'Misy fiovana tsy voarakitra, ho very izany ireo.\nAzo antoka fa hotohizana?';
-$lang['rssfailed']   = 'An error occured while fetching this feed: ';
-$lang['nothingfound']= 'Tsy nahitana n\'inon\'inona.';
-
-$lang['mediaselect'] = 'Safidy rakitra Media';
-$lang['fileupload']  = 'Fandefasana rakitra Media';
-$lang['uploadsucc']  = 'Voalefa soa aman-tsara';
-$lang['uploadfail']  = 'Tsy lasa ilay izy. Mety tsy fananana alalana?';
-$lang['uploadwrong'] = 'Nolavina ny lefa. Voarara io extension-na rakitra io!';
-$lang['uploadexist'] = 'Efa misy ilay rakitra. Tsy nisy inona natao.';
-$lang['deletesucc']  = 'Voafafa ny rakitra "%s" .';
-$lang['deletefail']  = 'Tsy afaka nofafana ny "%s" - Hamarino ny alalana.';
-$lang['mediainuse']  = 'Tsy voafafa ny rakitra "%s" - mbola misy mampiasa io.';
-$lang['namespaces']  = 'Namespaces';
-$lang['mediafiles']  = 'Rakitra misy amin\'ny';
-
-$lang['reference']   = 'References for';
-$lang['ref_inuse']   = 'Tsy afaka fafana io rakitra io, satria mbola ampiasain\'ireto pejy ireto:';
-$lang['ref_hidden']  = 'Misy references  vitsivitsy amina pejy tsy anananao alalana hamaky';
-
-$lang['hits']       = 'Hits';
-$lang['quickhits']  = 'Anaram-pejy mifanaraka';
-$lang['toc']        = 'Fizahan-takila';
-$lang['current']    = 'current';
-$lang['yours']      = 'Kinova-nao';
-$lang['diff']       = 'Asehoy ny tsy fitoviana amin\'ny kinova amin\'izao';
-$lang['line']       = 'Andalana';
-$lang['breadcrumb'] = 'Taiza ianao';
-$lang['lastmod']    = 'Novaina farany:';
-$lang['by']         = '/';
-$lang['deleted']    = 'voafafa';
-$lang['created']    = 'Voamboatra';
-$lang['restored']   = 'Naverina tamin\'ny kinova taloha';
-$lang['summary']    = 'Fanovana teo';
-
-$lang['mail_newpage'] = 'pejy niampy:';
-$lang['mail_changed'] = 'pejy niova:';
-
-$lang['nosmblinks'] = 'rohy mankamin\'ny fizarana Windows dia amin\'ny Microsoft Internet Explorer ihany no miasa.\nAzo atao ihany anefa ny manao dika-petaka ny rohy.';
-
-$lang['qb_alert']   = 'Ampidiro ny soratra tianao hamboarina format.\n Hiampy any @ farany izy avy eo.';
-$lang['qb_bold']    = 'Matavy';
-$lang['qb_italic']  = 'Mandry';
-$lang['qb_underl']  = 'Voatsipika';
-$lang['qb_code']    = 'Code programa';
-$lang['qb_strike']  = 'Disoina';
-$lang['qb_h1']      = 'Lohateny laharana 1';
-$lang['qb_h2']      = 'Lohateny laharana 2';
-$lang['qb_h3']      = 'Lohateny laharana 3';
-$lang['qb_h4']      = 'Lohateny laharana 4';
-$lang['qb_h5']      = 'Lohateny laharana 5';
-$lang['qb_link']    = 'Rohy ato anatiny';
-$lang['qb_extlink'] = 'Rohy mivoaka';
-$lang['qb_hr']      = 'Tsipika marindrano';
-$lang['qb_ol']      = 'Tanisa milahatra';
-$lang['qb_ul']      = 'Tanisa tsy milahatra';
-$lang['qb_media']   = 'Hanampy sary na rakitra hafa';
-$lang['qb_sig']     = 'Manisy sonia';
-
-$lang['del_confirm']= 'Hofafana ilay andalana?';
-
-$lang['admin_acl']  = 'Fitantanana ACL (Access Control List)...';
-$lang['admin_register']= 'Ampio mpampiasa vaovao...';
-
-$lang['acl_group']  = 'Vondrona';
-$lang['acl_user']   = 'Mpampiasa';
-$lang['acl_perms']  = 'Alalana @';
-$lang['page']       = 'Pejy';
-$lang['namespace']  = 'Namespace';
-
-$lang['acl_perm1']  = 'Mamaky';
-$lang['acl_perm2']  = 'Manova';
-$lang['acl_perm4']  = 'Manamboatra';
-$lang['acl_perm8']  = 'Mandefa rakitra';
-$lang['acl_perm16'] = 'Mamafa';
-$lang['acl_new']    = 'Ampio andalana vaovao';
-
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+<?php
+/**
+ * mg language file
+ */
+$lang['encoding']   = 'utf-8';
+$lang['direction']  = 'ltr';
+
+$lang['btn_edit']   = 'Hanova ny pejy';
+$lang['btn_source'] = 'Asehoy ny source';
+$lang['btn_show']   = 'Asehoy ny pejy';
+$lang['btn_create'] = 'Amboary ity pejy';
+$lang['btn_search'] = 'Hikaroka';
+$lang['btn_save']   = 'Raketo';
+$lang['btn_preview']= 'Topi-maso';
+$lang['btn_top']    = 'Ho ery ambony';
+$lang['btn_newer']  = '<< taloha kokoa';
+$lang['btn_older']  = 'taoriana kokoa >>';
+$lang['btn_revs']   = 'Kinova taloha';
+$lang['btn_recent'] = 'Fiovana farany';
+$lang['btn_upload'] = 'Alefaso';
+$lang['btn_cancel'] = 'Aoka ihany';
+$lang['btn_index']  = 'Index';
+$lang['btn_secedit']= 'Edit';
+$lang['btn_login']  = 'Hiditra';
+$lang['btn_logout'] = 'Hivoaka';
+$lang['btn_admin']  = 'Admin';
+$lang['btn_update'] = 'Update';
+$lang['btn_delete'] = 'Fafao';
+$lang['btn_back']   = 'Miverina';
+$lang['btn_backtomedia'] = 'Fitsongana fichier Media';
+
+$lang['loggedinas'] = 'Anaranao:';
+$lang['user']       = 'Anarana';
+$lang['pass']       = 'Alahidy';
+$lang['passchk']    = 'Ataovy indray';
+$lang['remember']   = 'Tsarovy';
+$lang['fullname']   = 'Anarana feno';
+$lang['email']      = 'Imailaka';
+$lang['register']   = 'Hisoratra';
+$lang['badlogin']   = 'Miala tsiny fa misy diso ny anarana na ny alahidy.';
+
+$lang['regmissing'] = 'Tsy maintsy fenoina ny saha rehetra.';
+$lang['reguexists'] = 'Indrisy fa efa nisy namandrika io anarana io.';
+$lang['regsuccess'] = 'Voaforona ny kaontinao, halefa any imailaka ny alahidy.';
+$lang['regsuccess2']= 'Voaforona ilay kaonty.';
+$lang['regmailfail']= 'Ohatra ny nisy olana ny nandefasana imailaka. Miangavy anao hilaza ny Admin!';
+$lang['regbadmail'] = 'Toa tsy mandeha ny imailaka nomenao - Raha heverinao fa erreur io dia ilazao ny admin';
+$lang['regbadpass'] = 'Tsy mitovy ny alahidy roa nomenao, avereno indray.';
+$lang['regpwmail']  = 'Ny alahidy Wiki-nao';
+$lang['reghere']    = 'Mbola tsy manana kaonty ianao? Manaova vaovao';
+
+$lang['txt_upload']   = 'Misafidiana rakitra halefa';
+$lang['txt_filename'] = 'Ampidiro ny anaran\'ny wiki (tsy voatery)';
+$lang['txt_overwrt']  = 'Fafana izay rakitra efa misy?';
+$lang['lockedby']     = 'Mbola voahidin\'i';
+$lang['lockexpire']   = 'Afaka ny hidy amin\'ny';
+$lang['willexpire']   = 'Efa ho lany fotoana afaka iray minitra ny hidy ahafahanao manova ny pejy.\nMba hialana amin\'ny conflit dia ampiasao ny bokotra topi-maso hamerenana ny timer-n\'ny hidy.';
+
+$lang['notsavedyet'] = 'Misy fiovana tsy voarakitra, ho very izany ireo.\nAzo antoka fa hotohizana?';
+$lang['rssfailed']   = 'An error occured while fetching this feed: ';
+$lang['nothingfound']= 'Tsy nahitana n\'inon\'inona.';
+
+$lang['mediaselect'] = 'Safidy rakitra Media';
+$lang['fileupload']  = 'Fandefasana rakitra Media';
+$lang['uploadsucc']  = 'Voalefa soa aman-tsara';
+$lang['uploadfail']  = 'Tsy lasa ilay izy. Mety tsy fananana alalana?';
+$lang['uploadwrong'] = 'Nolavina ny lefa. Voarara io extension-na rakitra io!';
+$lang['uploadexist'] = 'Efa misy ilay rakitra. Tsy nisy inona natao.';
+$lang['deletesucc']  = 'Voafafa ny rakitra "%s" .';
+$lang['deletefail']  = 'Tsy afaka nofafana ny "%s" - Hamarino ny alalana.';
+$lang['mediainuse']  = 'Tsy voafafa ny rakitra "%s" - mbola misy mampiasa io.';
+$lang['namespaces']  = 'Namespaces';
+$lang['mediafiles']  = 'Rakitra misy amin\'ny';
+
+$lang['reference']   = 'References for';
+$lang['ref_inuse']   = 'Tsy afaka fafana io rakitra io, satria mbola ampiasain\'ireto pejy ireto:';
+$lang['ref_hidden']  = 'Misy references  vitsivitsy amina pejy tsy anananao alalana hamaky';
+
+$lang['hits']       = 'Hits';
+$lang['quickhits']  = 'Anaram-pejy mifanaraka';
+$lang['toc']        = 'Fizahan-takila';
+$lang['current']    = 'current';
+$lang['yours']      = 'Kinova-nao';
+$lang['diff']       = 'Asehoy ny tsy fitoviana amin\'ny kinova amin\'izao';
+$lang['line']       = 'Andalana';
+$lang['breadcrumb'] = 'Taiza ianao';
+$lang['lastmod']    = 'Novaina farany:';
+$lang['by']         = '/';
+$lang['deleted']    = 'voafafa';
+$lang['created']    = 'Voamboatra';
+$lang['restored']   = 'Naverina tamin\'ny kinova taloha';
+$lang['summary']    = 'Fanovana teo';
+
+$lang['mail_newpage'] = 'pejy niampy:';
+$lang['mail_changed'] = 'pejy niova:';
+
+$lang['nosmblinks'] = 'rohy mankamin\'ny fizarana Windows dia amin\'ny Microsoft Internet Explorer ihany no miasa.\nAzo atao ihany anefa ny manao dika-petaka ny rohy.';
+
+$lang['qb_alert']   = 'Ampidiro ny soratra tianao hamboarina format.\n Hiampy any @ farany izy avy eo.';
+$lang['qb_bold']    = 'Matavy';
+$lang['qb_italic']  = 'Mandry';
+$lang['qb_underl']  = 'Voatsipika';
+$lang['qb_code']    = 'Code programa';
+$lang['qb_strike']  = 'Disoina';
+$lang['qb_h1']      = 'Lohateny laharana 1';
+$lang['qb_h2']      = 'Lohateny laharana 2';
+$lang['qb_h3']      = 'Lohateny laharana 3';
+$lang['qb_h4']      = 'Lohateny laharana 4';
+$lang['qb_h5']      = 'Lohateny laharana 5';
+$lang['qb_link']    = 'Rohy ato anatiny';
+$lang['qb_extlink'] = 'Rohy mivoaka';
+$lang['qb_hr']      = 'Tsipika marindrano';
+$lang['qb_ol']      = 'Tanisa milahatra';
+$lang['qb_ul']      = 'Tanisa tsy milahatra';
+$lang['qb_media']   = 'Hanampy sary na rakitra hafa';
+$lang['qb_sig']     = 'Manisy sonia';
+
+$lang['del_confirm']= 'Hofafana ilay andalana?';
+
+$lang['admin_acl']  = 'Fitantanana ACL (Access Control List)...';
+$lang['admin_register']= 'Ampio mpampiasa vaovao...';
+
+$lang['acl_group']  = 'Vondrona';
+$lang['acl_user']   = 'Mpampiasa';
+$lang['acl_perms']  = 'Alalana @';
+$lang['page']       = 'Pejy';
+$lang['namespace']  = 'Namespace';
+
+$lang['acl_perm1']  = 'Mamaky';
+$lang['acl_perm2']  = 'Manova';
+$lang['acl_perm4']  = 'Manamboatra';
+$lang['acl_perm8']  = 'Mandefa rakitra';
+$lang['acl_perm16'] = 'Mamafa';
+$lang['acl_new']    = 'Ampio andalana vaovao';
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :

File wiki/inc/lang/mg/locked.txt

-====== Pejy voahidy ======
-
-Mbola ovain'olona hafa ity pejy ity ka voahidy aloha. Andraso kely ho vitany ny azy, na ho lany fotoana ilay hidy.
-
+====== Pejy voahidy ======
+
+Mbola ovain'olona hafa ity pejy ity ka voahidy aloha. Andraso kely ho vitany ny azy, na ho lany fotoana ilay hidy.
+

File wiki/inc/lang/mg/login.txt

-====== Login ======
-
-Mbola tsy niditra ianao izao! Ampidiro eto ambany ny anarana sy ny alahidy. Ilaina manaiky cookies ny navigateur-nao raha hiditra.
-
+====== Login ======
+
+Mbola tsy niditra ianao izao! Ampidiro eto ambany ny anarana sy ny alahidy. Ilaina manaiky cookies ny navigateur-nao raha hiditra.
+

File wiki/inc/lang/mg/mailtext.txt

-Nisy pejy niova tao amin'ny wiky. Ireto ny antsipiriany:
-
-Date        : @DATE@
-Browser     : @BROWSER@
-Adiresy IP  : @IPADDRESS@
-Hostname    : @HOSTNAME@
-Taloha      : @OLDPAGE@
-Vaovao      : @NEWPAGE@
-Fiovana     : @SUMMARY@
-Novain'i    : @USER@
-
-@DIFF@
-
-
--- 
-Ity imailaka ity dia navoakan'ny wiki tao amin'ny
-@DOKUWIKIURL@
+Nisy pejy niova tao amin'ny wiky. Ireto ny antsipiriany:
+
+Date        : @DATE@
+Browser     : @BROWSER@
+Adiresy IP  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Taloha      : @OLDPAGE@
+Vaovao      : @NEWPAGE@
+Fiovana     : @SUMMARY@
+Novain'i    : @USER@
+
+@DIFF@
+
+
+-- 
+Ity imailaka ity dia navoakan'ny wiki tao amin'ny
+@DOKUWIKIURL@

File wiki/inc/lang/mg/newpage.txt

-======Mbola tsy misy an'io pejy io======
-
-Nanindry rohy manondro pejy mbola tsy misy ianao. Afaka amboarinao io pejy io, tsindrio ny bokotra ''Amboary ity pejy''
+======Mbola tsy misy an'io pejy io======
+
+Nanindry rohy manondro pejy mbola tsy misy ianao. Afaka amboarinao io pejy io, tsindrio ny bokotra ''Amboary ity pejy''

File wiki/inc/lang/mg/norev.txt

-======Tsy misy io kinova io======
-
-Tsy misy ny kinova voalaza. Ampiasao ny bokotra ''Kinova taloha'' hampisehoana ireo karazana fanovana natao tamin'ity pejy ity.
-
+======Tsy misy io kinova io======
+
+Tsy misy ny kinova voalaza. Ampiasao ny bokotra ''Kinova taloha'' hampisehoana ireo karazana fanovana natao tamin'ity pejy ity.
+

File wiki/inc/lang/mg/password.txt

-Miarahaba an'i @FULLNAME@!
-
-Ireto ny momba anao ho an'ny @TITLE@ ao amin'ny @DOKUWIKIURL@
-
-Anarana    : @LOGIN@
-Alahidy    : @PASSWORD@
-
--- 
-Ity imailaka ity dia navoakan'ny wiki tao amin'ny
-@DOKUWIKIURL@
-
+Miarahaba an'i @FULLNAME@!
+
+Ireto ny momba anao ho an'ny @TITLE@ ao amin'ny @DOKUWIKIURL@
+
+Anarana    : @LOGIN@
+Alahidy    : @PASSWORD@
+
+-- 
+Ity imailaka ity dia navoakan'ny wiki tao amin'ny
+@DOKUWIKIURL@
+

File wiki/inc/lang/mg/preview.txt

-======Topi-maso======
-
-Topi-maso ahafahanao mijery ny fivoakan'ny soratra nataonao ity. Tandremo: Mbola **tsy voarakitra** io!
-
-
+======Topi-maso======
+
+Topi-maso ahafahanao mijery ny fivoakan'ny soratra nataonao ity. Tandremo: Mbola **tsy voarakitra** io!
+
+

File wiki/inc/lang/mg/read.txt

-Vakiana fotsiny ity pejy ity. Afaka jerenao ny source, saingy tsy afaka ovainao. Anontanio ny admin raha heverinao fa tsy mety izany.
-
-
+Vakiana fotsiny ity pejy ity. Afaka jerenao ny source, saingy tsy afaka ovainao. Anontanio ny admin raha heverinao fa tsy mety izany.
+
+

File wiki/inc/lang/mg/recent.txt

-======Fiovana farany======
-
-Ireto pejy ireto no niova vao haingana.
-
-
+======Fiovana farany======
+
+Ireto pejy ireto no niova vao haingana.
+
+

File wiki/inc/lang/mg/register.txt

-====== Hanokatra kaonty vaovao ======
-
-Fenoy ny saha rehetra eto ambany raha hanokatra kaonty amin'ity wiki ity. Hamarino fa adiresy imailaka mandeha no omenao - halefa any mantsy ny alahidy. Ny anarana dia tsy maintsy manaraka ny fepetran'ny [[doku>wiki:pagename|pagename]].
-
-
+====== Hanokatra kaonty vaovao ======
+
+Fenoy ny saha rehetra eto ambany raha hanokatra kaonty amin'ity wiki ity. Hamarino fa adiresy imailaka mandeha no omenao - halefa any mantsy ny alahidy. Ny anarana dia tsy maintsy manaraka ny fepetran'ny [[doku>wiki:pagename|pagename]].
+
+

File wiki/inc/lang/mg/revisions.txt

-======Kinova taloha======
-
-Ireto ny kinovan'ny pejy taloha. Raha te hamerina kinova taloha ianao, tsongay eo ambany izy hisokatra, avy eo tsindrio ny bokotra ''Hanova ny pejy'' ary ''Soraty''.
-
-
+======Kinova taloha======
+
+Ireto ny kinovan'ny pejy taloha. Raha te hamerina kinova taloha ianao, tsongay eo ambany izy hisokatra, avy eo tsindrio ny bokotra ''Hanova ny pejy'' ary ''Soraty''.
+
+

File wiki/inc/lang/mg/searchpage.txt

-======Karoka======
-
-Ireto ambany ireto ny valin'ny fikarohanao. 
-
-Raha tsy nahita izay notadiavinao ianao, dia afaka mamorona pejy vaovao avy amin'ny teny nanaovanao fikarohana; Ampiasao ny bokotra ''Hanova ny pejy''.
-
+======Karoka======
+
+Ireto ambany ireto ny valin'ny fikarohanao. 
+
+Raha tsy nahita izay notadiavinao ianao, dia afaka mamorona pejy vaovao avy amin'ny teny nanaovanao fikarohana; Ampiasao ny bokotra ''Hanova ny pejy''.
+
 =====Vokatry ny fikarohana=====

File wiki/inc/lang/mg/showrev.txt

-**Ity dia kinovan'ny pejy taloha!**
-----
+**Ity dia kinovan'ny pejy taloha!**
+----

File wiki/inc/lang/mg/wordblock.txt

-======SPAM Voasakana======
-
-Tsy voarakitra ny fanovana nataonao satria misy teny voarara ao. 
-Raha nanandrana nandefa spam ny wiki ianao dia -- Alika maty! 
-Raha heverinao fa error dia ilazao ny Admin.
-
-
+======SPAM Voasakana======
+
+Tsy voarakitra ny fanovana nataonao satria misy teny voarara ao. 
+Raha nanandrana nandefa spam ny wiki ianao dia -- Alika maty! 
+Raha heverinao fa error dia ilazao ny Admin.
+
+

File wiki/inc/lang/no/lang.php

  * @author Thomas Nygreen <nygreen@gmail.com>
  * @author Arild Burud <arildb@met.no>
  * @author Torkill Bruland <torkar-b@online.no>
+ * @author Rune M. Andersen <rune.andersen@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
 $lang['qb_underl']             = 'Understreket tekst';
 $lang['qb_code']               = 'Kodetekst';
 $lang['qb_strike']             = 'Gjennomstreket tekst';
-$lang['qb_h1']                 = 'Nivå 1 Rubrikk';
-$lang['qb_h2']                 = 'Nivå 2 Rubrikk';
-$lang['qb_h3']                 = 'Nivå 3 Rubrikk';
-$lang['qb_h4']                 = 'Nivå 4 Rubrikk';
-$lang['qb_h5']                 = 'Nivå 5 Rubrikk';
-$lang['qb_link']               = 'Intern Lenke';
-$lang['qb_extlink']            = 'Ekstern Lenke';
-$lang['qb_hr']                 = 'Horisontal strek';
-$lang['qb_ol']                 = 'Punkt for sortert punktliste';
-$lang['qb_ul']                 = 'Punkt for usortert punktliste';
+$lang['qb_h1']                 = 'Overskrift nivå 1';
+$lang['qb_h2']                 = 'Overskrift nivå 2';
+$lang['qb_h3']                 = 'Overskrift nivå 3';
+$lang['qb_h4']                 = 'Overskrift nivå 4';
+$lang['qb_h5']                 = 'Overskrift nivå 5';
+$lang['qb_link']               = 'Intern lenke';
+$lang['qb_extlink']            = 'Ekstern lenke';
+$lang['qb_hr']                 = 'Horisontal linje';
+$lang['qb_ol']                 = 'Sortert listepunkt';
+$lang['qb_ul']                 = 'Usortert listepunkt';
 $lang['qb_media']              = 'Legg til bilder og andre filer';
 $lang['qb_sig']                = 'Føy til signatur';
-$lang['qb_smileys']            = 'Humørfjes';
+$lang['qb_smileys']            = 'Smilefjes';
 $lang['qb_chars']              = 'Spesialtegn';
 $lang['del_confirm']           = 'Slett denne oppføringen?';
 $lang['admin_register']        = 'Legg til ny bruker';
-$lang['metaedit']              = 'Rediger Metadata';
+$lang['metaedit']              = 'Rediger metadata';
 $lang['metasaveerr']           = 'Skriving av metadata feilet';
 $lang['metasaveok']            = 'Metadata lagret';
 $lang['img_backto']            = 'Tilbake til';
 $lang['img_title']             = 'Tittel';
-$lang['img_caption']           = 'Billedtekst';
+$lang['img_caption']           = 'Bildetekst';
 $lang['img_date']              = 'Dato';
 $lang['img_fname']             = 'Filnavn';
 $lang['img_fsize']             = 'Størrelse';
 $lang['img_keywords']          = 'Nøkkelord';
 $lang['subscribe_success']     = 'Lagt til %s som abonnent av listen for %s';
 $lang['subscribe_error']       = 'En feil oppstod når %s skulle legges til som abonnent av listen for %s';
-$lang['subscribe_noaddress']   = 'Det er ingen adresse som er assosiert med din login. Du kan dermed ikke bli lagt til som abonnent av listen.';
+$lang['subscribe_noaddress']   = 'Det er ingen adresse assosiert med din login. Du kan dermed ikke bli lagt til som abonnent av listen.';
 $lang['unsubscribe_success']   = 'Fjernet %s som abonnent for listen %s';
 $lang['unsubscribe_error']     = 'En feil oppstod når %s skulle fjernes som abonnent fra listen for %s';
-$lang['authmodfailed']         = 'Dårlig konfigurert brukerautorisasjon. Vennligst innformer Wiki-admin.';
+$lang['authmodfailed']         = 'Feilkonfigurert brukerautorisasjon. Vennligst innformer Wiki-admin.';
 $lang['authtempfail']          = 'Brukerautorisasjon er midlertidig utilgjengelig. Om dette vedvarer, vennligst informer Wiki-admin.';
 $lang['i_chooselang']          = 'Velg ditt språk';
 $lang['i_installer']           = 'DokuWiki-installasjon';
 $lang['i_superuser']           = 'Superbruker';
 $lang['i_problems']            = 'Installasjonen oppdaget noen problemer, disse listes nedenfor. Du kan ikke fortsett før du har løst disse.';
 $lang['i_modified']            = 'For sikkerhets skyld vil dette skriptet bare virke med en ny og uendret Dokuwiki-installsjon.
-                         Du burde enten pakke ut filene på nytt fra den nedlastede pakken, eller konsultere den komplette
+                         Du bør enten pakke ut filene på nytt fra den nedlastede pakken, eller konsultere den komplette
                          <a href="http://wiki.splitbrain.org/wiki:install">Dokuwiki-installasjonsinstruksen</a>';
 $lang['i_funcna']              = 'PHP-funksjonen <code>%s</code> er ikke tilgjengelig. Kanskje din leverandør har deaktivert den av noen grunn?';
 $lang['i_phpver']              = 'Your PHP version <code>%s</code> is lower than the needed <code>%s</code>. You need to upgrade your PHP install.';
-$lang['i_permfail']            = '<code>%s</code> er ikke skrivbar for DokuWiki. Du behøver å fikse rettighetene for denne mappen!';
+$lang['i_permfail']            = '<code>%s</code> er ikke skrivbar for DokuWiki. Du må fikse rettighetene for denne mappen!';
 $lang['i_confexists']          = '<code>%s</code> eksisterer allerede';
 $lang['i_writeerr']            = 'Kunne ikke opprette <code>%s</code>. Du må sjekke mappe-/filrettigheter og opprette filen manuelt.';
 $lang['i_badhash']             = 'ikke gjenkjent eller modifisert dokuwiki.php (hash=<code>%s</code>)';
 $lang['i_badval']              = '<code>%s</code> - ugyldig eller tom verdi';
 $lang['i_success']             = 'Konfigurasjonen ble vellykket fullført. Du kan slette install.php filen nå. Fortsett til
                         <a href="doku.php">din nye DokuWiki</a>.';
-$lang['i_failure']             = 'Noen feil oppstod ved skriving til konfigurasjonsfilene. Du må kanskje fikse de manuelt før
+$lang['i_failure']             = 'En eller flere feil oppstod ved skriving til konfigurasjonsfilene. Du må kanskje fikse dem manuelt før
                          du kan bruke <a href="doku.php">din nye DokuWiki</a>.';
 $lang['i_policy']              = 'Innledende ACL-politikk';
 $lang['i_pol0']                = 'Åpen Wiki (les, skriv og opplasting for alle)';

File wiki/inc/lang/no/norev.txt

 ======Det fins ingen slik versjon======
 
-Den angitte versjonen fins ikke. Anvend ''**Historikk**'' for en oversikt over de versjoner som fins av dette dokumentet.
+Den angitte versjonen fins ikke. Bruk ''**Historikk**'' for en oversikt over de versjoner som fins av dette dokumentet.
 

File wiki/inc/lang/sv/lang.php

  * @author Joaquim Homrighausen <joho@webbplatsen.se>
  * @author Per Foreby <per@foreby.se>
  * @author Nicklas Henriksson <nicklas[at]nihe.se>
+ * @author Håkan Sandell <hakan.sandell[at]mydata.se>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
 $lang['btn_backtomedia']       = 'Tillbaka till val av Mediafil';
 $lang['btn_subscribe']         = 'Prenumerera på ändringar';
 $lang['btn_unsubscribe']       = 'Säg upp prenumeration på ändringar';
+$lang['btn_subscribens']       = 'Prenumerera på namnrymdsändringar';
+$lang['btn_unsubscribens']     = 'Sluta prenumerera på namnrymdsändringar
+';
 $lang['btn_profile']           = 'Uppdatera profil';
 $lang['btn_reset']             = 'Återställ';
 $lang['btn_resendpwd']         = 'Skicka nytt lösenord';

File wiki/inc/parserutils.php

 
   if($rev){
     if(@file_exists($file)){
-      $ret = p_render('xhtml',p_get_instructions(io_readfile($file)),$info); //no caching on old revisions
+      $ret = p_render('xhtml',p_get_instructions(io_readWikiPage($file,$id,$rev)),$info); //no caching on old revisions
     }elseif($excuse){
       $ret = p_locale_xhtml('norev');
     }
   if($rev){
     if(@file_exists($file)){
       //no caching on old revisions
-      $ins = p_get_instructions(io_readfile($file));
+      $ins = p_get_instructions(io_readWikiPage($file,$id,$rev));
     }elseif($excuse){
       $ret = p_locale_xhtml('norev');
       //restore ID (just in case)
     return $cache->retrieveCache();
   } else if (@file_exists($file)) {
     // no cache - do some work
-    $ins = p_get_instructions(io_readfile($file));
+    $ins = p_get_instructions(io_readWikiPage($file,$id));
     if ($cache->storeCache($ins)) {
       $run[$file] = true; // we won't rebuild these instructions in the same run again
     } else {
  * @param  string   $wrapper    html element to wrap the returned highlighted text
  *
  * @author Christopher Smith <chris@jalakai.co.uk>
+ * @author Andreas Gohr <andi@splitbrain.org>
  */
 function p_xhtml_cached_geshi($code, $language, $wrapper='pre') {
   global $conf;
+  $language = strtolower($language);
 
   // remove any leading or trailing blank lines
   $code = preg_replace('/^\s*?\n|\s*?\n$/','',$code);
 
   $cache = getCacheName($language.$code,".code");
-
-  if (@file_exists($cache) && !$_REQUEST['purge'] &&
-     (filemtime($cache) > filemtime(DOKU_INC . 'inc/geshi.php'))) {
-
+  $ctime = @filemtime($cache);
+  if($ctime && !$_REQUEST['purge'] &&
+     $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&
+     $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&
+     $ctime > filemtime(DOKU_CONF.'dokuwiki.php')){
     $highlighted_code = io_readFile($cache, false);
-    @touch($cache);
 
   } else {
 
     require_once(DOKU_INC . 'inc/geshi.php');
 
-    $geshi = new GeSHi($code, strtolower($language), DOKU_INC . 'inc/geshi');
+    $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
     $geshi->set_encoding('utf-8');
     $geshi->enable_classes();
     $geshi->set_header_type(GESHI_HEADER_PRE);

File wiki/inc/template.php

     if(is_array($TOC)){
         // if a TOC was prepared in global scope, always use it
         $toc = $TOC;
-    }elseif($ACT == 'show' && !$REV && $INFO['exists']){
+    }elseif(($ACT == 'show' || substr($ACT,0,6) == 'export') && !$REV && $INFO['exists']){
         // get TOC from metadata, render if neccessary
         $meta = p_get_metadata($ID, false, true);
         if(isset($meta['internal']['toc'])){

File wiki/install.php

     '2006-11-06'   => 'b3a8af76845977c2000d85d6990dd72b',
     '2007-05-24'   => 'd80f2740c84c4a6a791fd3c7a353536f',
     '2007-06-26'   => 'b3ca19c7a654823144119980be73cd77',
-    'rc2007-03-31' => '1e5c42eac3219d9e21927c39e3240aad',
+    '2008-05-04'   => '1e5c42eac3219d9e21927c39e3240aad',
 );
 
 
 
 function print_retry() {
   global $lang;
+  global $LC;
 ?>
     <form action="" method="get">
       <fieldset>
+        <input type="hidden" name="l" value="<?php echo $LC ?>" />
         <input class="button" type="submit" value="<?php echo $lang['i_retry'];?>" />
       </fieldset>
     </form>

File wiki/lib/exe/xmlrpc.php

             return new IXR_ERROR(1, 'Refusing to write an empty new wiki page');
         }
 
-        if(auth_quickaclcheck($id) < AUTH_WRITE)
+        if(auth_quickaclcheck($id) < AUTH_EDIT)
             return new IXR_Error(1, 'You are not allowed to edit this page');
 
         // Check, if page is locked

File wiki/lib/plugins/acl/admin.php

         echo $this->getLang('acl_perms').' ';
         $inl =  $this->_html_select();
         echo '<input type="text" name="acl_w" class="edit" value="'.(($inl)?'':hsc(ltrim($this->who,'@'))).'" />'.NL;
-        echo '<input type="submit" value="Select" class="button" />'.NL;
+        echo '<input type="submit" value="'.$this->getLang('btn_select').'" class="button" />'.NL;
         echo '</div>'.NL;
 
         echo '<div id="acl__info">';

File wiki/lib/plugins/acl/lang/da/lang.php

  * Danish language file
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author     koeppe <koeppe@kazur.dk>
- * @author     Jon Bendtsen <bendtsen@diku.dk>
- * @author     Lars Næsbye Christensen <larsnaesbye@stud.ku.dk>
+ * @author koeppe <koeppe@kazur.dk>
+ * @author Jon Bendtsen <bendtsen@diku.dk>
+ * @author Lars Næsbye Christensen <larsnaesbye@stud.ku.dk>
+ * @author Kalle Sommer Nielsen <kalle@php.net>
  */
-
-$lang['admin_acl']  = 'Rettighedsadministration';
-$lang['acl_group']  = 'Gruppe';
-$lang['acl_user']   = 'Bruger';
-$lang['acl_perms']  = 'Rettigheder for';
-$lang['page']       = 'Dokument';
-$lang['namespace']  = 'Navnerum';
-
-$lang['acl_perm1']  = 'Læs';
-$lang['acl_perm2']  = 'Skriv';
-$lang['acl_perm4']  = 'Opret';
-$lang['acl_perm8']  = 'Upload';
-$lang['acl_perm16'] = 'Slet';
-$lang['acl_new']    = 'Tilføj ny post';
-//Setup VIM: ex: et ts=2 enc=utf-8 :
+$lang['admin_acl']             = 'Rettighedsadministration';
+$lang['acl_group']             = 'Gruppe';
+$lang['acl_user']              = 'Bruger';
+$lang['acl_perms']             = 'Rettigheder for';
+$lang['page']                  = 'Dokument';
+$lang['namespace']             = 'Navnerum';
+$lang['p_user_id']             = 'Bruger <b class="acluser">%s</b> har følgende adgang på siden <b class="aclpage">%s</b>: <i>%s</i>';
+$lang['p_isadmin']             = 'Note: Den valgte gruppe eller bruger har altid fuldt adgang fordi den er konfigueret som en super gruppe/bruger';
+$lang['current']               = 'Aktuelle ACL regler';
+$lang['where']                 = 'Side/Namespace';
+$lang['who']                   = 'Bruger/Gruppe';
+$lang['perm']                  = 'Adgangsniveau';
+$lang['acl_perm0']             = 'Ingen';
+$lang['acl_perm1']             = 'Læs';
+$lang['acl_perm2']             = 'Skriv';
+$lang['acl_perm4']             = 'Opret';
+$lang['acl_perm8']             = 'Upload';
+$lang['acl_perm16']            = 'Slet';
+$lang['acl_new']               = 'Tilføj ny post';
+$lang['acl_mod']               = 'Ændre post';

File wiki/lib/plugins/acl/lang/de/lang.php

 $lang['acl_perms']             = 'Berechtigungen für';
 $lang['page']                  = 'Seite';
 $lang['namespace']             = 'Namensraum';
+$lang['btn_select']            = 'Auswählen';
 $lang['p_user_id']             = 'Nutzer <b class="acluser">%s</b> hat momentan folgende Berechtigungen für die Seite <b class="aclpage">%s</b>: <i>%s</i>.';
 $lang['p_user_ns']             = 'Nutzer <b class="acluser">%s</b> hat momentan folgende Berechtigungen im Namensraum <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_group_id']            = 'Mitglieder der Gruppe <b class="aclgroup">%s</b> haben momentan folgende Berechtigungen für die Seite <b class="aclpage">%s</b>: <i>%s</i>.';

File wiki/lib/plugins/acl/lang/en/lang.php

 $lang['page']       = 'Page';
 $lang['namespace']  = 'Namespace';
 
+$lang['btn_select']  = 'Select';
+
 $lang['p_user_id']    = 'User <b class="acluser">%s</b> currently has the following permissions on page <b class="aclpage">%s</b>: <i>%s</i>.';
 $lang['p_user_ns']    = 'User <b class="acluser">%s</b> currently has the following permissions in namespace <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_group_id']   = 'Members of group <b class="aclgroup">%s</b> currently have the following permissions on page <b class="aclpage">%s</b>: <i>%s</i>.';

File wiki/lib/plugins/acl/lang/es/lang.php

  * @author Miguel Pagano <miguel.pagano@gmail.com>
  * @author Oscar M. Lage <r0sk10@gmail.com>
  * @author Gabriel Castillo <gch@pumas.ii.unam.mx>
+ * @author oliver@samera.com.py
  */
 $lang['admin_acl']             = 'Administración de lista de control de acceso';
 $lang['acl_group']             = 'Grupo';

File wiki/lib/plugins/acl/lang/fr/lang.php

 $lang['acl_perms']             = 'Permission pour';
 $lang['page']                  = 'Page';
 $lang['namespace']             = 'Catégorie';
+$lang['btn_select']            = 'Sélectionner';
 $lang['p_user_id']             = 'Permissions actuelles de l\'utilisateur <b class="acluser">%s</b> sur la page <b class="aclpage">%s</b>: <i>%s</i>.';
 $lang['p_user_ns']             = 'Permissions actuelles de l\'utilisateur <b class="acluser">%s</b> sur la catégorie <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_group_id']            = 'Permissions actuelles des membres du groupe <b class="aclgroup">%s</b> sur la page <b class="aclpage">%s</b>: <i>%s</i>.';

File wiki/lib/plugins/acl/lang/lv/help.txt

 === Īsa palīdzība ===
 
-Šajā lapā var uzdot un noņemt tiesības uz lapām un nodalām.
+Šajā lapā var uzdot un noņemt tiesības uz lapām un nodaļām.
 
 Kreisajā pusē parādītas visas pieejamās nodaļas un lapas.
 
 Formā augšpusē var redzēt un grozīt norādītā lietotāja vai grupas tiesības .
 
 Apakšā tabulā  parādīts visu tiesību saraksts. 
-To var lietot, lia ātri mainītu vairākus pieejas tiesību noteikumus.
+To var lietot, lai ātri mainītu vairākus pieejas tiesību noteikumus.
 
-[[doku>wiki:acl|Officiālajos piekļuves tiesību noteikumu dokumentos]] var atrasts izvērtu informāciju, kā darbojas DokuWiki sistēmas piekļuves tiesību kontrole.
+[[doku>wiki:acl|Officiālajos piekļuves tiesību noteikumu dokumentos]] var atrast izvērstu informāciju, kā darbojas DokuWiki sistēmas piekļuves tiesību kontrole.

File wiki/lib/plugins/acl/lang/no/lang.php

  * @author Thomas Nygreen <nygreen@gmail.com>
  * @author Arild Burud <arildb@met.no>
  * @author Torkill Bruland <torkar-b@online.no>
+ * @author Rune M. Andersen <rune.andersen@gmail.com>
  */
 $lang['admin_acl']             = 'Administrasjon av lister for adgangskontroll (ACL)';
 $lang['acl_group']             = 'Gruppe';

File wiki/lib/plugins/acl/lang/pl/lang.php

 $lang['acl_perms']             = 'Uprawnienia użytkownika';
 $lang['page']                  = 'Strona';
 $lang['namespace']             = 'Katalog';
+$lang['btn_select']            = 'Wybierz';
 $lang['p_user_id']             = 'Użytkownik <b class="acluser">%s</b> posiada następujące uprawnienia do strony <b class="aclpage">%s</b>: <i>%s</i>.';
 $lang['p_user_ns']             = 'Użytkownik <b class="acluser">%s</b> posiada następujące uprawnienia do katalogów <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_group_id']            = 'Członkowie grupy <b class="aclgroup">%s</b> posiadają następujące uprawnienia do strony <b class="aclpage">%s</b>: <i>%s</i>.';

File wiki/lib/plugins/acl/lang/sv/lang.php

  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author Per Foreby <per@foreby.se>
  * @author Nicklas Henriksson <nicklas[at]nihe.se>
+ * @author Håkan Sandell <hakan.sandell[at]mydata.se>
  */
 $lang['admin_acl']             = 'Hantera behörighetslistan (ACL)';
 $lang['acl_group']             = 'Grupp';

File wiki/lib/plugins/config/lang/da/lang.php

  * Danish language file
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author     Lars Næsbye Christensen <larsnaesbye@stud.ku.dk>
+ * @author Lars Næsbye Christensen <larsnaesbye@stud.ku.dk>
+ * @author Kalle Sommer Nielsen <kalle@php.net>
  */
-
-// for admin plugins, the menu prompt to be displayed in the admin menu
-// if set here, the plugin doesn't need to override the getMenuText() method
-$lang['menu']       = 'Konfigurationsindstillinger'; 
-
-$lang['error']      = 'Indstillingerne blev ikke opdateret på grund af en ugyldig værdi, gennemse venligst dine ændringer og gem dem igen.
+$lang['menu']                  = 'Konfigurationsindstillinger';
+$lang['error']                 = 'Indstillingerne blev ikke opdateret på grund af en ugyldig værdi, gennemse venligst dine ændringer og gem dem igen.
                        <br />De(n) ugyldig(e) værdie(r) vil blive rammet ind med rødt.';
-$lang['updated']    = 'Indstillingerne blev opdateret korrekt.';
-$lang['nochoice']   = '(ingen andre valgmuligheder)';
-$lang['locked']     = 'Indstillingsfilen kunne ikke opdateres, hvis dette er en fejl, <br />
+$lang['updated']               = 'Indstillingerne blev opdateret korrekt.';
+$lang['nochoice']              = '(ingen andre valgmuligheder)';
+$lang['locked']                = 'Indstillingsfilen kunne ikke opdateres, hvis dette er en fejl, <br />
                        sørg da for at den lokale indstillingsfils navn og rettigheder er korrekte.';
-
-/* --- Config Setting Headers --- */
-$lang['_configuration_manager'] = 'Konfigurationsstyring'; //same as heading in intro.txt
-$lang['_header_dokuwiki'] = 'DokuWiki indstillinger';
-$lang['_header_plugin'] = 'Pluginindstillinger';
-$lang['_header_template'] = 'Skabelonindstillinger';
-$lang['_header_undefined'] = 'Udefinerede indstillinger';
-
-/* --- Config Setting Groups --- */
-$lang['_basic'] = 'Grundindstillinger';
-$lang['_display'] = 'Synlighedsindstillinger';
-$lang['_authentication'] = 'Bekræftelsesindstillinger';
-$lang['_anti_spam'] = 'Anti-spam indstillinger';
-$lang['_editing'] = 'Redigeringsindstillinger';
-$lang['_links'] = 'Linkindstillinger';
-$lang['_media'] = 'Medieindstillinger';
-$lang['_advanced'] = 'Avancerede indstillinger';
-$lang['_network'] = 'Netværksindstillinger';
-// The settings group name for plugins and templates can be set with
-// plugin_settings_name and template_settings_name respectively. If one
-// of these lang properties is not set, the group name will be generated
-// from the plugin or template name and the localized suffix.
-$lang['_plugin_sufix'] = 'Pluginindstillinger';
-$lang['_template_sufix'] = 'Skabelonindstillinger';
-
-/* --- Undefined Setting Messages --- */
+$lang['_configuration_manager'] = 'Konfigurationsstyring';
+$lang['_header_dokuwiki']      = 'DokuWiki indstillinger';
+$lang['_header_plugin']        = 'Pluginindstillinger';
+$lang['_header_template']      = 'Skabelonindstillinger';
+$lang['_header_undefined']     = 'Udefinerede indstillinger';
+$lang['_basic']                = 'Grundindstillinger';
+$lang['_display']              = 'Synlighedsindstillinger';
+$lang['_authentication']       = 'Bekræftelsesindstillinger';
+$lang['_anti_spam']            = 'Anti-spam indstillinger';
+$lang['_editing']              = 'Redigeringsindstillinger';
+$lang['_links']                = 'Linkindstillinger';
+$lang['_media']                = 'Medieindstillinger';