diff options
author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-16 06:52:33 +0100 |
---|---|---|
committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-16 06:52:33 +0100 |
commit | c43f647049c78b594c90e95d06d12f29f300d5d3 (patch) | |
tree | a6b02ad763a5d539158721edbe8ca73e158d8ca4 /view | |
parent | a2ee5ebe427522228dc03dc81da11f348a399c4d (diff) | |
parent | e2ea341094c53e78ae7473a83d2b6c85b1cde4eb (diff) | |
download | volse-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')
-rw-r--r-- | view/de/profile_edit.tpl | 16 | ||||
-rw-r--r-- | view/de/settings.tpl | 6 | ||||
-rw-r--r-- | view/en/profile_edit.tpl | 16 | ||||
-rw-r--r-- | view/en/settings.tpl | 7 | ||||
-rw-r--r-- | view/fr/profile_edit.tpl | 16 | ||||
-rw-r--r-- | view/fr/settings.tpl | 5 | ||||
-rw-r--r-- | view/fr/strings.php | 12 | ||||
-rw-r--r-- | view/it/profile_edit.tpl | 16 | ||||
-rw-r--r-- | view/it/settings.tpl | 5 | ||||
-rw-r--r-- | view/theme/duepuntozero/style.css | 16 | ||||
-rw-r--r-- | view/theme/loozah/style.css | 16 |
11 files changed, 92 insertions, 39 deletions
diff --git a/view/de/profile_edit.tpl b/view/de/profile_edit.tpl index 09a761023..840597ddc 100644 --- a/view/de/profile_edit.tpl +++ b/view/de/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" >Keywords: </label> -<input type="text" size="32" name="keywords" id="profile-edit-keywords" title="Example: fishing photography software" value="$keywords" /> -</div><div id="profile-edit-keywords-desc">(Used for searching public profiles, never shown to others)</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 Keywords: </label> +<input type="text" size="32" name="pubkeywords" id="profile-edit-pubkeywords" title="Example: fishing photography 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" >Private Keywords: </label> +<input type="text" size="32" name="prvkeywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" /> +</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div> +<div id="profile-edit-prvkeywords-end"></div> <div class="profile-edit-submit-wrapper" > diff --git a/view/de/settings.tpl b/view/de/settings.tpl index 0ef50546f..675ef675f 100644 --- a/view/de/settings.tpl +++ b/view/de/settings.tpl @@ -78,7 +78,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');" >⇩ $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;" > @@ -89,6 +89,10 @@ $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="Submit" /> </div> diff --git a/view/en/profile_edit.tpl b/view/en/profile_edit.tpl index b0d4850d0..6c7d74daf 100644 --- a/view/en/profile_edit.tpl +++ b/view/en/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" >Keywords: </label> -<input type="text" size="32" name="keywords" id="profile-edit-keywords" title="Example: fishing photography software" value="$keywords" /> -</div><div id="profile-edit-keywords-desc">(Used for searching public profiles, never shown to others)</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 Keywords: </label> +<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography 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" >Private Keywords: </label> +<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" /> +</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div> +<div id="profile-edit-prvkeywords-end"></div> <div class="profile-edit-submit-wrapper" > diff --git a/view/en/settings.tpl b/view/en/settings.tpl index 97d67cbf6..39b18c126 100644 --- a/view/en/settings.tpl +++ b/view/en/settings.tpl @@ -76,9 +76,8 @@ $profile_in_dir $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');" >⇩ $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;" > @@ -89,6 +88,10 @@ $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="Submit" /> </div> diff --git a/view/fr/profile_edit.tpl b/view/fr/profile_edit.tpl index beff3b8bd..b28255188 100644 --- a/view/fr/profile_edit.tpl +++ b/view/fr/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" >Keywords: </label> -<input type="text" size="32" name="keywords" id="profile-edit-keywords" title="Example: fishing photography software" value="$keywords" /> -</div><div id="profile-edit-keywords-desc">(Used for searching public profiles, never shown to others)</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 Keywords: </label> +<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography 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" >Private Keywords: </label> +<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" /> +</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div> +<div id="profile-edit-prvkeywords-end"></div> <div class="profile-edit-submit-wrapper" > diff --git a/view/fr/settings.tpl b/view/fr/settings.tpl index 97d67cbf6..eb386579f 100644 --- a/view/fr/settings.tpl +++ b/view/fr/settings.tpl @@ -78,7 +78,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');" >⇩ $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;" > @@ -89,6 +89,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="Submit" /> </div> diff --git a/view/fr/strings.php b/view/fr/strings.php index 423645c86..d177c07b8 100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php @@ -16,14 +16,14 @@ $a->strings['last'] = 'last'; $a->strings['next'] = 'next'; $a->strings[' likes this.'] = ' aime ça.'; $a->strings[' doesn\'t like this.'] = ' n\'aime pas ça.'; -$a->strings['people'] = 'personne(s)'; -$a->strings['like this.'] = 'aime(nt) ça.'; -$a->strings['don\'t like this.'] = 'n\'aime(nt) pas ça.'; +$a->strings['people'] = 'personnes'; +$a->strings['like this.'] = 'aiment ça.'; +$a->strings['don\'t like this.'] = 'n\'aiment pas ça.'; $a->strings['and'] = 'et'; $a->strings[', and '] = ', et '; -$a->strings[' other people'] = ' autre(s) personne(s)'; -$a->strings[' like this.'] = ' aime(nt) ça.'; -$a->strings[' don\'t like this.'] = ' n\'aime(nt) pas ça.'; +$a->strings[' other people'] = ' autres personnes'; +$a->strings[' like this.'] = ' aiment ça.'; +$a->strings[' don\'t like this.'] = ' n\'aiment pas ça.'; $a->strings['No contacts'] = 'Aucun contact'; $a->strings['Contacts'] = 'Contacts'; $a->strings['View Contacts'] = 'Voir les contacts'; 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');" >⇩ $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> diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index c54b9835a..54a522881 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -373,6 +373,10 @@ input#dfrn-url { margin-bottom: 30px; } +#settings-expire-end { + margin-bottom: 30px; +} + #settings-username-end, #settings-email-end, #settings-nick-end, @@ -624,7 +628,8 @@ input#dfrn-url { #profile-edit-sexual-label, #profile-edit-politic-label, #profile-edit-religion-label, -#profile-edit-keywords-label, +#profile-edit-pubkeywords-label, +#profile-edit-prvkeywords-label, #profile-edit-homepage-label { float: left; width: 175px; @@ -644,7 +649,8 @@ input#dfrn-url { #sexual-select, #profile-edit-politic, #profile-edit-religion, -#profile-edit-keywords, +#profile-edit-pubkeywords, +#profile-edit-prvkeywords, #profile-in-dir-yes, #profile-in-dir-no, #profile-in-netdir-yes, @@ -698,7 +704,8 @@ input#dfrn-url { #profile-edit-pdesc-desc, -#profile-edit-keywords-desc { +#profile-edit-pubkeywords-desc, +#profile-edit-prvkeywords-desc { float: left; margin-left: 20px; } @@ -741,7 +748,8 @@ input#dfrn-url { #profile-edit-sexual-end, #profile-edit-politic-end, #profile-edit-religion-end, -#profile-edit-keywords-end, +#profile-edit-pubkeywords-end, +#profile-edit-prvkeywords-end, #profile-edit-homepage-end, #profile-in-dir-break, #profile-in-dir-end, diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 4461907bb..f1de801cb 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -506,6 +506,10 @@ input#dfrn-url { margin-bottom: 30px; } +#settings-expire-end { + margin-bottom: 30px; +} + #settings-username-end, #settings-email-end, #settings-nick-end, @@ -755,7 +759,8 @@ input#dfrn-url { #profile-edit-sexual-label, #profile-edit-politic-label, #profile-edit-religion-label, -#profile-edit-keywords-label, +#profile-edit-pubkeywords-label, +#profile-edit-prvkeywords-label, #profile-edit-homepage-label { float: left; width: 175px; @@ -775,7 +780,8 @@ input#dfrn-url { #sexual-select, #profile-edit-politic, #profile-edit-religion, -#profile-edit-keywords, +#profile-edit-pubkeywords, +#profile-edit-prvkeywords, #profile-in-dir-yes, #profile-in-dir-no, #profile-in-netdir-yes, @@ -806,7 +812,8 @@ input#dfrn-url { margin-left: 20px; } -#profile-edit-keywords-desc { +#profile-edit-pubkeywords-desc, +#profile-edit-prvkeywords-desc { float: left; margin-left: 20px; } @@ -864,7 +871,8 @@ input#dfrn-url { #profile-edit-sexual-end, #profile-edit-politic-end, #profile-edit-religion-end, -#profile-edit-keywords-end, +#profile-edit-pubkeywords-end, +#profile-edit-prvkeywords-end, #profile-edit-homepage-end, #profile-in-dir-break, #profile-in-dir-end, |