diff options
| author | Guy Brand <gb@unistra.fr> | 2014-10-08 09:56:58 +0200 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2014-10-08 09:56:58 +0200 |
| commit | f256c70f224e3618a4a1af131d0fcba079534d40 (patch) | |
| tree | fcbb54cb26138a28e00f21e95b0563d9496ecbae /inc | |
| parent | fe2e5166213d288a2d135b2f440ed3adb0163aa9 (diff) | |
| parent | 7172294d0cc39ec10ad431dfdd0dd20e15a4ba35 (diff) | |
| download | rpg-f256c70f224e3618a4a1af131d0fcba079534d40.tar.gz rpg-f256c70f224e3618a4a1af131d0fcba079534d40.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/auth.php | 1 | ||||
| -rw-r--r-- | inc/lang/no/lang.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/inc/auth.php b/inc/auth.php index e938830ef..4b1e6ce31 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -335,7 +335,6 @@ function auth_browseruid() { $ip = clientIP(true); $uid = ''; $uid .= $INPUT->server->str('HTTP_USER_AGENT'); - $uid .= $INPUT->server->str('HTTP_ACCEPT_ENCODING'); $uid .= $INPUT->server->str('HTTP_ACCEPT_CHARSET'); $uid .= substr($ip, 0, strpos($ip, '.')); $uid = strtolower($uid); diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php index 5e508617e..aeea982f2 100644 --- a/inc/lang/no/lang.php +++ b/inc/lang/no/lang.php @@ -116,7 +116,7 @@ $lang['searchmedia_in'] = 'Søk i %s'; $lang['txt_upload'] = 'Velg fil som skal lastes opp:'; $lang['txt_filename'] = 'Skriv inn wikinavn (alternativt):'; $lang['txt_overwrt'] = 'Overskriv eksisterende fil'; -$lang['maxuploadsize'] = 'Opplast maks % per fil.'; +$lang['maxuploadsize'] = 'Opplast maks %s per fil.'; $lang['lockedby'] = 'Låst av:'; $lang['lockexpire'] = 'Låsingen utløper:'; $lang['js']['willexpire'] = 'Din redigeringslås for dette dokumentet kommer snart til å utløpe.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.'; |