diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-01-25 20:24:15 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-01-25 20:24:15 +0100 |
| commit | 8ffcd8ae653b6e080efb01adcc96482315496bab (patch) | |
| tree | 0d3ef49407be7b821f2b25f02305ad8bd7a9d6df /lib/plugins/acl/lang/no | |
| parent | 61d7a0b7204a0a21c3fdcd65c7d2661403c0a443 (diff) | |
| parent | 5371328c2ade9ee2c2e09db62992fe4cfaadbbf1 (diff) | |
| download | rpg-8ffcd8ae653b6e080efb01adcc96482315496bab.tar.gz rpg-8ffcd8ae653b6e080efb01adcc96482315496bab.tar.bz2 | |
Merge branch 'master' into stable
* master: (75 commits)
release preparations
Romanian language update
removed 'view original' button from new media manager again (was added in b8a84c03) and made a link around the image instead, as that is a more minor change (as it should be during the RC phase) and is what was originally planned
corrected old mediaupload introduction text
Removed obsolete Opera fix that now causes harm FS#2429
don't limit download sizes in plugin manager
Disable E_STRICT error reporting
Make Sitemapper functions static as they were used as static functions
Make this dummy file empty like all others
Update copyright year
Remove testing md5 hash from installer
Slovak language update
localization: removed strings from old flashuploader
Polish language update
readded missing "view original" button to the new media manager
always show full filename as tooltip in mediamanager
Fix sorting in media manager search (FS#2423)
make the installer check for new media dirs
do not rely on tmpfile() in the AJAX uploader backend FS#2417
Galician language update
...
Diffstat (limited to 'lib/plugins/acl/lang/no')
| -rw-r--r-- | lib/plugins/acl/lang/no/help.txt | 2 | ||||
| -rw-r--r-- | lib/plugins/acl/lang/no/lang.php | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/plugins/acl/lang/no/help.txt b/lib/plugins/acl/lang/no/help.txt index f02b6bdbd..c3d3688a9 100644 --- a/lib/plugins/acl/lang/no/help.txt +++ b/lib/plugins/acl/lang/no/help.txt @@ -1,4 +1,4 @@ -===Lynhjelp=== +=== Hurtighjelp: === På denne siden kan du legge til og fjerne tillatelser for navnerom og sider i din wiki. diff --git a/lib/plugins/acl/lang/no/lang.php b/lib/plugins/acl/lang/no/lang.php index 587f9c2fc..09d71937a 100644 --- a/lib/plugins/acl/lang/no/lang.php +++ b/lib/plugins/acl/lang/no/lang.php @@ -17,6 +17,7 @@ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca> * @author Rune Rasmussen syntaxerror.no@gmail.com * @author Jon Bøe <jonmagneboe@hotmail.com> + * @author Egil Hansen <egil@rosetta.no> */ $lang['admin_acl'] = 'Administrasjon av lister for adgangskontroll (ACL)'; $lang['acl_group'] = 'Gruppe'; @@ -34,10 +35,10 @@ $lang['p_choose_ns'] = '<b>Før inn en bruker eller gruppe</b> i skjem $lang['p_inherited'] = 'Merk: Disse tillatelser ble ikke eksplisitt satt, men ble arvet fra andre grupper eller høyere navnerom.'; $lang['p_isadmin'] = 'Merk: Den valgte gruppen eller bruker har altid fulle tillatelser fordi vedkommende er konfigurert som superbruker.'; $lang['p_include'] = 'Høyere tillgangsrettigheter inkluderer lavere. Rettigheter for å opprette, laste opp og slette gjelder bare for navnerom, ikke enkeltsider.'; -$lang['current'] = 'Någjeldende ACL-regler'; +$lang['current'] = 'Gjeldende ACL-regler'; $lang['where'] = 'Side/Navnerom'; $lang['who'] = 'Bruker/Gruppe'; -$lang['perm'] = 'Tillatelser'; +$lang['perm'] = 'Rettigheter'; $lang['acl_perm0'] = 'Ingen'; $lang['acl_perm1'] = 'Lese'; $lang['acl_perm2'] = 'Redigere'; @@ -45,4 +46,4 @@ $lang['acl_perm4'] = 'Opprette'; $lang['acl_perm8'] = 'Laste opp'; $lang['acl_perm16'] = 'Slette'; $lang['acl_new'] = 'Legg til ny oppføring'; -$lang['acl_mod'] = 'Modifiser oppføring'; +$lang['acl_mod'] = 'Endre oppføring'; |