diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-11-30 12:30:40 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-11-30 12:30:40 +0100 |
| commit | d14415e37072dbe16077efd700aee5bd33707b54 (patch) | |
| tree | 062c3c190039ac9490f56598b0ee116de18c2480 /inc/lang/sv/lang.php | |
| parent | 2ed38036a53a489d2fcadc46ce601f8c876fca31 (diff) | |
| parent | 38479cbba628ee76a92ff5f3c974cfa8e6ce9e61 (diff) | |
| download | rpg-d14415e37072dbe16077efd700aee5bd33707b54.tar.gz rpg-d14415e37072dbe16077efd700aee5bd33707b54.tar.bz2 | |
Merge branch 'master' into subscription
* master: (175 commits)
some coding style improvements
added .idea project folder to gitignore
use correct setUp method and parent calls.
Correct German plugin manager translation (download != install)
correct return in sendDigest()
Fix case-insensitive match in ACL checking
GeSHi update to 1.0.8.11
ignore empty header on mail sending
remove empty BCC/CC mail headers
Galician language update
some welcome page changes
Combine subsequent calls to strtr into a single transformation
changed semicolon to colon in link to welcome page to make it less confusing
fixed wrong sidebar showing in namespaces when sidebar is disabled
Typo fix for TL;DR
removed a bunch of outdated and irrelevant networking acronyms
added another place to look for logo to make it more consistent (FS#2656)
French language update
Czech language update
compat js findPosX/y more closely mimic historical function
...
Conflicts:
inc/auth.php
inc/common.php
inc/subscription.php
lib/exe/indexer.php
Diffstat (limited to 'inc/lang/sv/lang.php')
| -rw-r--r-- | inc/lang/sv/lang.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php index 0c8f3276d..1c3141da7 100644 --- a/inc/lang/sv/lang.php +++ b/inc/lang/sv/lang.php @@ -246,9 +246,9 @@ $lang['i_writeerr'] = 'Kan inte skapa <code>%s</code>. Kontrollera fi $lang['i_badhash'] = 'okänd eller ändrad dokuwiki.php (hash=<code>%s</code>)'; $lang['i_badval'] = '<code>%s</code> - felaktig eller blank'; $lang['i_success'] = 'Konfigurationen avslutades utan fel. Du kan radera filen install.php nu. Fortsätt till - <a href="doku.php">din nya DokuWiki</a>.'; + <a href="doku.php?id=wiki:welcome">din nya DokuWiki</a>.'; $lang['i_failure'] = 'Fel uppstod vid skrivning av konfigurationsfilerna. Du kan behöva ordna till dem manuellt innan - du kan använda <a href="doku.php">din nya DokuWiki</a>.'; + du kan använda <a href="doku.php?id=wiki:welcome">din nya DokuWiki</a>.'; $lang['i_policy'] = 'Initial ACL-policy'; $lang['i_pol0'] = 'Öppen wiki (alla får läsa, skriva och ladda upp filer)'; $lang['i_pol1'] = 'Publik wiki (alla får läsa, registrerade användare för skriva och ladda upp filer)'; |