aboutsummaryrefslogtreecommitdiffstats
path: root/view/it
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-03-16 06:52:33 +0100
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-03-16 06:52:33 +0100
commitc43f647049c78b594c90e95d06d12f29f300d5d3 (patch)
treea6b02ad763a5d539158721edbe8ca73e158d8ca4 /view/it
parenta2ee5ebe427522228dc03dc81da11f348a399c4d (diff)
parente2ea341094c53e78ae7473a83d2b6c85b1cde4eb (diff)
downloadvolse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.tar.gz
volse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.tar.bz2
volse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.zip
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'view/it')
-rw-r--r--view/it/profile_edit.tpl16
-rw-r--r--view/it/settings.tpl5
2 files changed, 15 insertions, 6 deletions
diff --git a/view/it/profile_edit.tpl b/view/it/profile_edit.tpl
index efdb5d448..9f2a13790 100644
--- a/view/it/profile_edit.tpl
+++ b/view/it/profile_edit.tpl
@@ -134,11 +134,17 @@ $sexual
</div>
<div id="profile-edit-religion-end"></div>
-<div id="profile-edit-keywords-wrapper" >
-<label id="profile-edit-keywords-label" for="profile-edit-keywords" >Parole chiave: </label>
-<input type="text" size="32" name="keywords" id="profile-edit-keywords" title="Esempio: pescare fotografia software" value="$keywords" />
-</div><div id="profile-edit-keywords-desc">(Usati per la ricerca dei profili pubblci, mai mostrati agli altri)</div>
-<div id="profile-edit-keywords-end"></div>
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >[Public] Parole chiave: </label>
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Esempio: pescare fotografia software" value="$pub_keywords" />
+</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Parole chiave: </label>
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Esempio: pescare fotografia software" value="$prv_keywords" />
+</div><div id="profile-edit-prvkeywords-desc">(Usati per la ricerca dei profili, mai mostrati agli altri)</div>
+<div id="profile-edit-prvkeywords-end"></div>
<div class="profile-edit-submit-wrapper" >
diff --git a/view/it/settings.tpl b/view/it/settings.tpl
index 3b68923cf..87f40f26f 100644
--- a/view/it/settings.tpl
+++ b/view/it/settings.tpl
@@ -79,7 +79,7 @@ $profile_in_net_dir
<div id="settings-default-perms" class="settings-default-perms" >
- <div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >&#x21e9; $permissions</div>
+ <div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
<div id="settings-default-perms-menu-end"></div>
<div id="settings-default-perms-select" style="display: none;" >
@@ -90,6 +90,9 @@ $profile_in_net_dir
</div>
<div id="settings-default-perms-end"></div>
+<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
+<div id="settings-expire-end"></div>
+
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
</div>