diff options
| author | Friendika <info@friendika.com> | 2011-03-24 04:36:53 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-03-24 04:36:53 -0700 |
| commit | 067626380db6d5ed71d68bd91481ff51cfa76915 (patch) | |
| tree | 15b24c4718891a5a8fbaa0ce9964b0714524c6ed /view/sv/settings_nick_subdir.tpl | |
| parent | 51447932f707e1d0177ee4700266285ed80be2f6 (diff) | |
| parent | ba99ce3d0ab77bd62971cd3962d964be1ddee205 (diff) | |
| download | volse-hubzilla-067626380db6d5ed71d68bd91481ff51cfa76915.tar.gz volse-hubzilla-067626380db6d5ed71d68bd91481ff51cfa76915.tar.bz2 volse-hubzilla-067626380db6d5ed71d68bd91481ff51cfa76915.zip | |
Merge branch 'erikl-master'
Conflicts:
view/sv/insecure_net.tpl
view/sv/jot-header.tpl
view/sv/msg-header.tpl
view/sv/profile_edit.tpl
view/sv/profile_tabs.tpl
view/sv/strings.php
Diffstat (limited to 'view/sv/settings_nick_subdir.tpl')
| -rw-r--r-- | view/sv/settings_nick_subdir.tpl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/view/sv/settings_nick_subdir.tpl b/view/sv/settings_nick_subdir.tpl index 303c24df7..2702708ab 100644 --- a/view/sv/settings_nick_subdir.tpl +++ b/view/sv/settings_nick_subdir.tpl @@ -1,6 +1,6 @@ <p> -It appears that your website is located in a subdirectory of the<br /> -$hostname website, so this setting may not work reliably.<br /> +Det verkar som att din webbsida finns i en undermapp på webbplatsen<br /> +$hostname, så eventuellt kommer inte denna inställning att fungera tillförlitligt.<br /> </p> -<p>If you have any issues, you may have better results using the profile<br /> address '<strong>$baseurl/profile/$nickname</strong>'. +<p>Om problem uppstår är det möjligt att problemen kan lösas genom att använda<br /> profiladressen '<strong>$baseurl/profile/$nickname</strong>' istället. </p>
\ No newline at end of file |