diff options
| author | Michal Rezler <rezlemic@fel.cvut.cz> | 2011-03-23 10:39:45 +0100 |
|---|---|---|
| committer | Michal Rezler <rezlemic@fel.cvut.cz> | 2011-03-23 10:39:45 +0100 |
| commit | 35838d22a57707952f630eaf9f9e9ab4c6c3cfb0 (patch) | |
| tree | 3603e2e56314af40a4b7922e14e52c0bc06f6f9d /inc/lang/no | |
| parent | c4bb7947fcb2d4a5e5f8a15d9e3bbec333e44e13 (diff) | |
| parent | ee1214abb2c14cf0f86ff6d9a5b49536c6b01e18 (diff) | |
| download | rpg-35838d22a57707952f630eaf9f9e9ab4c6c3cfb0.tar.gz rpg-35838d22a57707952f630eaf9f9e9ab4c6c3cfb0.tar.bz2 | |
jQuery rewrite branch merged into master branch of whole project
Diffstat (limited to 'inc/lang/no')
| -rw-r--r-- | inc/lang/no/lang.php | 7 | ||||
| -rw-r--r-- | inc/lang/no/subscribermail.txt | 16 |
2 files changed, 3 insertions, 20 deletions
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php index ca63c0094..d2be945e6 100644 --- a/inc/lang/no/lang.php +++ b/inc/lang/no/lang.php @@ -5,17 +5,16 @@ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Reidar Mosvold <Reidar.Mosvold@hit.no> * @author Jorge Barrera Grandon <jorge@digitalwolves.org> - * @author Rune Rasmussen http://www.syntaxerror.no/ + * @author Rune Rasmussen [http://www.syntaxerror.no/] * @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> - * @author Jakob Vad Nielsen (me@jakobnielsen.net) + * @author Jakob Vad Nielsen <me@jakobnielsen.net> * @author Kjell Tore Næsgaard <kjell.t.nasgaard@ntnu.no> * @author Knut Staring <knutst@gmail.com> * @author Lisa Ditlefsen <lisa@vervesearch.com> * @author Erik Pedersen <erik.pedersen@shaw.ca> - * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca> */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -59,6 +58,7 @@ $lang['btn_draft'] = 'Rediger kladd'; $lang['btn_recover'] = 'Gjennvinn kladd'; $lang['btn_draftdel'] = 'Slett kladd'; $lang['btn_revert'] = 'Gjenopprette'; +$lang['btn_register'] = 'Registrer deg'; $lang['loggedinas'] = 'Innlogget som'; $lang['user'] = 'Brukernavn'; $lang['pass'] = 'Passord'; @@ -68,7 +68,6 @@ $lang['passchk'] = 'Bekreft passord'; $lang['remember'] = 'Husk meg'; $lang['fullname'] = 'Fullt navn'; $lang['email'] = 'E-post'; -$lang['register'] = 'Registrer deg'; $lang['profile'] = 'Brukerprofil'; $lang['badlogin'] = 'Ugyldig brukernavn og/eller passord.'; $lang['minoredit'] = 'Mindre endringer'; diff --git a/inc/lang/no/subscribermail.txt b/inc/lang/no/subscribermail.txt deleted file mode 100644 index 999f75787..000000000 --- a/inc/lang/no/subscribermail.txt +++ /dev/null @@ -1,16 +0,0 @@ -Hei! - -Siden @PAGE@ i @TITLE@-wikien har blitt endret. -Her er endringene: - --------------------------------------------------------- -@DIFF@ --------------------------------------------------------- - -For å avslutte abonnering på denne siden logg inn -på wikien på @DOKUWIKIURL@, besøk deretter @NEWPAGE@ -og velg 'Ikke abonner på endringer'. - --- -Denne mailen ble generert av DokuWiki på -@DOKUWIKIURL@
\ No newline at end of file |