diff options
| author | Friendika <info@friendika.com> | 2011-04-04 15:46:33 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-04-04 15:46:33 -0700 |
| commit | 1bba63fb607c2cb5fb2c002e63ad7128ecf8b1ea (patch) | |
| tree | 0c34fbaa00d6eab272e6bd48a596d146d708cef8 /view/sv/profile_edit.tpl | |
| parent | 91588934d2e07d06ac9353ac899bcb470cc293f0 (diff) | |
| parent | a0d2747d527221fc517e5d277035d6e5b07ebf93 (diff) | |
| download | volse-hubzilla-1bba63fb607c2cb5fb2c002e63ad7128ecf8b1ea.tar.gz volse-hubzilla-1bba63fb607c2cb5fb2c002e63ad7128ecf8b1ea.tar.bz2 volse-hubzilla-1bba63fb607c2cb5fb2c002e63ad7128ecf8b1ea.zip | |
Merge branch 'erikl-master'
Conflicts:
view/sv/settings.tpl
Diffstat (limited to 'view/sv/profile_edit.tpl')
| -rw-r--r-- | view/sv/profile_edit.tpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/view/sv/profile_edit.tpl b/view/sv/profile_edit.tpl index 9b66f109e..5025fd5a8 100644 --- a/view/sv/profile_edit.tpl +++ b/view/sv/profile_edit.tpl @@ -101,7 +101,7 @@ $hide_friends <div class="profile-edit-submit-end"></div> <div id="profile-edit-marital-wrapper" > -<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">♥</span> Civilstatus: </label> +<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">♥</span> Civilstånd: </label> $marital </div> <label id="profile-edit-with-label" for="profile-edit-with" > Vem: (om aktuellt) </label> |