diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-02-03 22:57:45 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-02-03 22:57:45 +0100 |
| commit | 3da7921f08ecdda929466921ecc50698f1adf99e (patch) | |
| tree | 0e179e504399e874bfd785d0a95eec44b76d5952 /inc/lang/no/lang.php | |
| parent | 6cf2bbfa12b776cf47cb69ae40fb8862f715ad01 (diff) | |
| parent | cc4bb766fdac23358d7b586aa3830b9650eed7a8 (diff) | |
| download | rpg-3da7921f08ecdda929466921ecc50698f1adf99e.tar.gz rpg-3da7921f08ecdda929466921ecc50698f1adf99e.tar.bz2 | |
Merge branch 'master' into future
* master: (162 commits)
fixed revision JS for images
upgraded SimplePie to 1.3.1 FS#2708
removed obsolete browser plugin (migrate does it)
adjust spacing to match standard 1.4em grid
added comment on use of whitelist vs blacklist
Updated idfilter() function for IIS
use var and remove suggestions when needed Use variable for maximum number of suggestions for quicksearch. And hide suggestions when search field is emptied, or when no suggestion are found.
added 'home' class to first link in hierarchical breadcrumbs
reduced required max width to go into tablet mode
re-added linear gradients for firefox
added missing styling for disabled form elements (FS#2705)
fixed acronyms in italics (FS#2684)
improved print styles (includes fixes for FS#2645 and FS#2707)
basic styles improvements
Greek language update
Use list in acl help text, for more structure
Galician language update
touch the config on save, even if no changes were made
unwind the width narrowing commit
put some whitespace between form submit button and fieldset bottom border
...
Conflicts:
lib/plugins/config/admin.php
lib/plugins/config/settings/config.class.php
Diffstat (limited to 'inc/lang/no/lang.php')
| -rw-r--r-- | inc/lang/no/lang.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php index cc3d34aed..9aa11ac87 100644 --- a/inc/lang/no/lang.php +++ b/inc/lang/no/lang.php @@ -282,9 +282,9 @@ $lang['i_writeerr'] = 'Kunne ikke opprette <code>%s</code>. Du må sj $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>.'; + <a href="doku.php?id=wiki:welcome">din nye DokuWiki</a>.'; $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>.'; + du kan bruke <a href="doku.php?id=wiki:welcome">din nye DokuWiki</a>.'; $lang['i_policy'] = 'Innledende ACL-politikk'; $lang['i_pol0'] = 'Åpen Wiki (les, skriv og opplasting for alle)'; $lang['i_pol1'] = 'Offentlig Wiki (les for alle, skriving og opplasting bare for registrerte brukere)'; |