From 9817104ebcd0a99b929ff012a3436220112b6a6c Mon Sep 17 00:00:00 2001 From: rebeka-catalina Date: Wed, 14 Oct 2015 17:48:26 +0200 Subject: [PATCH 001/313] Clarified description of ignore --- doc/FAQ.md | 4 ++-- doc/de/FAQ.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/FAQ.md b/doc/FAQ.md index 9197c068c5..0343833a25 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -87,8 +87,8 @@ However their conversations with your friends will still be visible in your stre If you remove a contact completely, they can send you another friend request. Blocked contacts cannot do this. They cannot communicate with you directly, only through friends. -**Ignored contacts** are included in delivery - they will receive your posts. -However we do not import their posts to you. +**Ignored contacts** are included in delivery - they will receive your posts and private messages. +However we do not import their posts or private messages to you. Like blocking, you will still see this person's comments to posts made by your friends. A plugin called "blockem" can be installed to collapse/hide all posts from a particular person in your stream if you desire complete blocking of an individual, including his/her conversations with your other friends. diff --git a/doc/de/FAQ.md b/doc/de/FAQ.md index d5aa19e6c7..52d56dce8a 100644 --- a/doc/de/FAQ.md +++ b/doc/de/FAQ.md @@ -100,9 +100,9 @@ Wenn Du einen Kontakt komplett löschst, können sie Dir eine neue Freundschafts Blockierte Kontakte können das nicht machen. Sie können nicht mit Dir direkt kommunizieren, nur über Freunde. -Ignorierte Kontakte können weiterhin Beiträge von Dir erhalten. -Deren Beiträge werden allerdings nicht importiert. W -ie bei blockierten Beiträgen siehst Du auch hier weiterhin die Kommentare dieser Person zu anderen Beiträgen Deiner Freunde. +Ignorierte Kontakte können weiterhin Beiträge und private Nachrichten von Dir erhalten. +Deren Beiträge und private Nachrichten werden allerdings nicht importiert. +Wie bei blockierten Beiträgen siehst Du auch hier weiterhin die Kommentare dieser Person zu anderen Beiträgen Deiner Freunde. [Ein Plugin namens "blockem" kann installiert werden, um alle Beiträge einer bestimmten Person in Deinem Stream zu verstecken bzw. zu verkürzen. Dabei werden auch Kommentare dieser Person in Beiträgen Deiner Freunde blockiert.] From 642f3fca1a1e56bb1ed823538c0e7fb2ae0e1342 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Wed, 14 Oct 2015 19:48:57 +0200 Subject: [PATCH 002/313] fix translation bug for likers --- include/conversation.php | 65 ++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 0907b5dce2..8e1793d699 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1025,10 +1025,31 @@ function format_like($cnt,$arr,$type,$id) { $o = ''; $expanded = ''; - if($cnt == 1) + if($cnt == 1) { $likers = $arr[0]; - else { + // Phrase if there is only one liker. In other cases it will be uses for the expanded + // list which show all likers + switch($type) { + case 'like' : + $phrase = sprintf( t('%s likes this.'), $likers); + break; + case 'dislike' : + $phrase = sprintf( t('%s doesn\'t like this.'), $likers); + break; + case 'attendyes' : + $phrase = sprintf( t('%s attends.'), $likers); + break; + case 'attendno' : + $phrase = sprintf( t('%s doesn\'t attend.'), $likers); + break; + case 'attendmaybe' : + $phrase = sprintf( t('%s attends maybe.'), $likers); + break; + } + } + + if($cnt > 1) { $total = count($arr); if($total >= MAX_LIKERS) $arr = array_slice($arr, 0, MAX_LIKERS - 1); @@ -1043,55 +1064,33 @@ function format_like($cnt,$arr,$type,$id) { } $likers = $str; - } - - // Phrase if there is only one liker. In other cases it will be uses for the expanded - // list which show all likers - switch($type) { - case 'like' : - $phrase = sprintf( t('%s likes this.'), $likers); - break; - case 'dislike' : - $phrase = sprintf( t('%s doesn\'t like this.'), $likers); - break; - case 'attendyes' : - $phrase = sprintf( t('%s attends.'), $likers); - break; - case 'attendno' : - $phrase = sprintf( t('%s doesn\'t attend.'), $likers); - break; - case 'attendmaybe' : - $phrase = sprintf( t('%s attends maybe.'), $likers); - break; - } - - if($cnt > 1) { + $spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\""; - $expanded .= "\t" . ''; + switch($type) { case 'like': $phrase = sprintf( t('%2$d people like this'), $spanatts, $cnt); + $explikers = sprintf( t('%s like this.'), $likers); break; case 'dislike': $phrase = sprintf( t('%2$d people don\'t like this'), $spanatts, $cnt); + $explikers = sprintf( t('%s don\'t like this.'), $likers); break; case 'attendyes': $phrase = sprintf( t('%2$d people attend'), $spanatts, $cnt); + $explikers = sprintf( t('%s attend.'), $likers); break; case 'attendno': $phrase = sprintf( t('%2$d people don\'t attend'), $spanatts, $cnt); + $explikers = sprintf( t('%s don\'t attend.'), $likers); break; case 'attendmaybe': $phrase = sprintf( t('%2$d people anttend maybe'), $spanatts, $cnt); - case 'agree': - $phrase = sprintf( t('%2$d people agree'), $spanatts, $cnt); + $explikers = sprintf( t('%s anttend maybe.'), $likers); break; - case 'disagree': - $phrase = sprintf( t('%2$d people don\'t agree'), $spanatts, $cnt); - break; - case 'abstain': - $phrase = sprintf( t('%2$d people abstains'), $spanatts, $cnt); } + + $expanded .= "\t" . ''; } $phrase .= EOL ; From 6ebb21a935436bdca03f8e6c1f9286b650ac1dc4 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 16 Oct 2015 21:44:10 +0200 Subject: [PATCH 003/313] directory.php: move html to templates --- mod/directory.php | 79 ++++++++++++++--------------- view/templates/directory_header.tpl | 28 +++++++--- view/templates/directory_item.tpl | 14 ++--- 3 files changed, 67 insertions(+), 54 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index 6fd99256f0..2093b11863 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -31,7 +31,7 @@ function directory_content(&$a) { require_once("mod/proxy.php"); if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) || - (get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) { + (get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) { notice( t('Public access denied.') . EOL); return; } @@ -44,27 +44,12 @@ function directory_content(&$a) { else $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); - $tpl = get_markup_template('directory_header.tpl'); - - $globaldir = ''; - $gdirpath = get_config('system','directory'); - if(strlen($gdirpath)) { - $globaldir = ''; + $gdirpath = ''; + $dirurl = get_config('system','directory'); + if(strlen($dirurl)) { + $gdirpath = zrl($dirurl,true); } - $admin = ''; - - $o .= replace_macros($tpl, array( - '$search' => $search, - '$globaldir' => $globaldir, - '$desc' => t('Find on this site'), - '$admin' => $admin, - '$finding' => (strlen($search) ? '

' . t('Finding: ') . "'" . $search . "'" . '

' : ""), - '$sitedir' => t('Site Directory'), - '$submit' => t('Find') - )); - if($search) { $search = dbesc($search); @@ -159,8 +144,6 @@ function directory_content(&$a) { $about = ((x($profile,'about') == 1) ? t('About:') : False); - $tpl = get_markup_template('directory_item.tpl'); - if($a->theme['template_engine'] === 'internal') { $location_e = template_escape($location); } @@ -168,23 +151,23 @@ function directory_content(&$a) { $location_e = $location; } - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile_link' => $profile_link, - '$photo' => proxy_url($a->get_cached_avatar_image($rr[$photo]), false, PROXY_SIZE_THUMB), - '$alt_text' => $rr['name'], - '$name' => $rr['name'], - '$details' => $pdesc . $details, - '$page_type' => $page_type, - '$profile' => $profile, - '$location' => $location_e, - '$gender' => $gender, - '$pdesc' => $pdesc, - '$marital' => $marital, - '$homepage' => $homepage, - '$about' => $about, + $entry = array( + 'id' => $rr['id'], + 'profile_link' => $profile_link, + 'photo' => proxy_url($a->get_cached_avatar_image($rr[$photo]), false, PROXY_SIZE_THUMB), + 'alt_text' => $rr['name'], + 'name' => $rr['name'], + 'details' => $pdesc . $details, + 'page_type' => $page_type, + 'profile' => $profile, + 'location' => $location_e, + 'gender' => $gender, + 'pdesc' => $pdesc, + 'marital' => $marital, + 'homepage' => $homepage, + 'about' => $about, - )); + ); $arr = array('contact' => $rr, 'entry' => $entry); @@ -193,11 +176,27 @@ function directory_content(&$a) { unset($profile); unset($location); - $o .= $entry; + if(! $arr['entry']) + continue; + + $entries[] = $arr['entry']; } - $o .= "
\r\n"; + $tpl = get_markup_template('directory_header.tpl'); + + $o .= replace_macros($tpl, array( + '$search' => $search, + '$globaldir' => t('Global Directory'), + '$gdirpath' => $gdirpath, + '$desc' => t('Find on this site'), + '$entries' => $entries, + '$finding' => t('Finding:'), + '$findterm' => (strlen($search) ? $search : ""), + '$sitedir' => t('Site Directory'), + '$submit' => t('Find') + )); + $o .= paginate($a); } diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl index 2274f2e1f8..ef9aa04af5 100644 --- a/view/templates/directory_header.tpl +++ b/view/templates/directory_header.tpl @@ -1,17 +1,29 @@

{{$sitedir}}

-{{$globaldir}} -{{$admin}} +{{if $gdirpath}} + +{{/if}} -{{$finding}}
-
-{{$desc}} - - -
+
+ {{$desc}} + + +
+ +{{if $findterm}} +

{{$finding}} '{{$findterm}}'

+{{/if}} +
+{{foreach $entries as $entry}} + {{include file="directory_item.tpl"}} +{{/foreach}} + +
\ No newline at end of file diff --git a/view/templates/directory_item.tpl b/view/templates/directory_item.tpl index b43fcd28cf..4dbe8a951f 100644 --- a/view/templates/directory_item.tpl +++ b/view/templates/directory_item.tpl @@ -1,12 +1,14 @@ -
-
-
- {{$alt_text}} +
+
+
-
{{$name}}
-
{{$details}}
+
{{$entry.name}}
+
{{$entry.details}}
From fcc185a18261f5ae2addeb80bf32e3a9b69ca5ce Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 16 Oct 2015 23:50:34 +0200 Subject: [PATCH 004/313] Unsure to store the guid with new events --- include/event.php | 27 ++++++++++++++------------- include/items.php | 2 ++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/include/event.php b/include/event.php index fedbe24468..a87dba64fb 100644 --- a/include/event.php +++ b/include/event.php @@ -21,33 +21,33 @@ function format_event_html($ev) { $o .= '

' . t('Starts:') . ' ' - . (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), + . '" >' + . (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), $ev['start'] , $bd_format )) - : day_translate(datetime_convert('UTC', 'UTC', + : day_translate(datetime_convert('UTC', 'UTC', $ev['start'] , $bd_format))) . '

' . "\r\n"; if(! $ev['nofinish']) $o .= '

' . t('Finishes:') . ' ' - . (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), + . '" >' + . (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), $ev['finish'] , $bd_format )) - : day_translate(datetime_convert('UTC', 'UTC', + : day_translate(datetime_convert('UTC', 'UTC', $ev['finish'] , $bd_format ))) . '

' . "\r\n"; if(strlen($ev['location'])){ - $o .= '

' . t('Location:') . ' ' - . bbcode($ev['location']) + $o .= '

' . t('Location:') . ' ' + . bbcode($ev['location']) . '

' . "\r\n"; - + if (strpos($ev['location'], "[map")===False) { $map = generate_named_map($ev['location']); if ($map!==$ev['location']) $o.=$map; } - + } $o .= '
' . "\r\n"; @@ -137,7 +137,7 @@ function format_event_bbcode($ev) { if(($ev['finish']) && (! $ev['nofinish'])) $o .= '[event-finish]' . $ev['finish'] . '[/event-finish]'; - + if($ev['location']) $o .= '[event-location]' . $ev['location'] . '[/event-location]'; @@ -200,7 +200,7 @@ function ev_compare($a,$b) { if($date_a === $date_b) return strcasecmp($a['desc'],$b['desc']); - + return strcmp($date_a,$date_b); } @@ -324,7 +324,7 @@ function event_store($arr) { } else { - // New event. Store it. + // New event. Store it. $r = q("INSERT INTO `event` ( `uid`,`cid`,`uri`,`created`,`edited`,`start`,`finish`,`summary`, `desc`,`location`,`type`, `adjust`,`nofinish`,`allow_cid`,`allow_gid`,`deny_cid`,`deny_gid`) @@ -362,6 +362,7 @@ function event_store($arr) { $item_arr['contact-id'] = $arr['cid']; $item_arr['uri'] = $arr['uri']; $item_arr['parent-uri'] = $arr['uri']; + $item_arr['guid'] = $arr['guid']; $item_arr['type'] = 'activity'; $item_arr['wall'] = (($arr['cid']) ? 0 : 1); $item_arr['contact-id'] = $contact['id']; diff --git a/include/items.php b/include/items.php index 4e86a5200a..c14fcdcc99 100644 --- a/include/items.php +++ b/include/items.php @@ -2854,6 +2854,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) $ev['uri'] = $item_id; $ev['edited'] = $datarray['edited']; $ev['private'] = $datarray['private']; + $ev['guid'] = $datarray['guid']; if(is_array($contact)) $ev['cid'] = $contact['id']; @@ -4079,6 +4080,7 @@ function local_delivery($importer,$data) { $ev['uri'] = $item_id; $ev['edited'] = $datarray['edited']; $ev['private'] = $datarray['private']; + $ev['guid'] = $datarray['guid']; $r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($item_id), From 20bb16859f4ae23d268ef656029917c7277c59f7 Mon Sep 17 00:00:00 2001 From: rabuzarus Date: Sat, 17 Oct 2015 00:19:01 +0200 Subject: [PATCH 005/313] dirfind.php: move html to templates --- mod/dirfind.php | 35 +++++++++++---------- view/templates/match.tpl | 67 +++++++++++++++++++++------------------- 2 files changed, 55 insertions(+), 47 deletions(-) diff --git a/mod/dirfind.php b/mod/dirfind.php index 95f9bf53a8..39c13dcb73 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -38,10 +38,6 @@ function dirfind_content(&$a, $prefix = "") { $o = ''; - $o .= replace_macros(get_markup_template("section_title.tpl"),array( - '$title' => sprintf( t('People Search - %s'), $search) - )); - if($search) { if ($local) { @@ -121,7 +117,6 @@ function dirfind_content(&$a, $prefix = "") { $id = 0; - $tpl = get_markup_template('match.tpl'); foreach($j->results as $jj) { // If We already know this contact then don't show the "connect" button @@ -143,17 +138,26 @@ function dirfind_content(&$a, $prefix = "") { $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo); - $o .= replace_macros($tpl,array( - '$url' => zrl($jj->url), - '$name' => htmlentities($jj->name), - '$photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), - '$tags' => $jj->tags, - '$conntxt' => $conntxt, - '$connlnk' => $connlnk, - '$photo_menu' => $photo_menu, - '$id' => ++$id, - )); + $entry = array( + 'url' => zrl($jj->url), + 'name' => htmlentities($jj->name), + 'photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), + 'tags' => $jj->tags, + 'conntxt' => $conntxt, + 'connlnk' => $connlnk, + 'photo_menu' => $photo_menu, + 'id' => ++$id, + ); + $entries[] = $entry; } + + $tpl = get_markup_template('match.tpl'); + + $o .= replace_macros($tpl,array( + 'title' => sprintf( t('People Search - %s'), $search), + '$entries' => $entries, + )); + } else { info( t('No matches') . EOL); @@ -161,7 +165,6 @@ function dirfind_content(&$a, $prefix = "") { } - $o .= '
'; $o .= paginate($a); return $o; } diff --git a/view/templates/match.tpl b/view/templates/match.tpl index 3ebabf1854..db612e3dc5 100644 --- a/view/templates/match.tpl +++ b/view/templates/match.tpl @@ -1,33 +1,38 @@ +{{include file="section_title.tpl"}} -
-
- - {{$name}} - - {{if $photo_menu}} - menu -
-
    - {{foreach $photo_menu as $k=>$c}} - {{if $c.2}} -
  • {{$c.0}}
    • - {{else}} -
  • {{$c.0}}
    • - {{/if}} - {{/foreach}} -
-
- {{/if}} -
-
-
- {{$name}} -
-
- {{if $connlnk}} -
{{$conntxt}}
- {{/if}} +{{foreach $entries as $entry}} +
+
+ + {{$entry.name}} + + {{if $entry.photo_menu}} + menu +
+
    + {{foreach $entry.photo_menu as $k=>$c}} + {{if $c.2}} +
  • {{$c.0}}
    • + {{else}} +
  • {{$c.0}}
    • + {{/if}} + {{/foreach}} +
+
+ {{/if}} +
+
+
+ {{$entry.name}} +
+
+ {{if $entry.connlnk}} +
{{$entry.conntxt}}
+ {{/if}} -
+
+{{/foreach}} + +
From 67f699403a6df541c1eb9dc26008232858e8084a Mon Sep 17 00:00:00 2001 From: rabuzarus Date: Sat, 17 Oct 2015 00:39:50 +0200 Subject: [PATCH 006/313] match.php: restructure acdording to the change of match.tpl --- mod/match.php | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/mod/match.php b/mod/match.php index f31b0f67a4..30d057a0da 100644 --- a/mod/match.php +++ b/mod/match.php @@ -4,6 +4,15 @@ require_once('include/socgraph.php'); require_once('include/contact_widgets.php'); require_once('mod/proxy.php'); +/** + * @brief Controller for /match. + * + * It takes keywords from your profile and queries the directory server for + * matching keywords from other profiles. + * + * @param App &$a + * @return void|string + */ function match_content(&$a) { $o = ''; @@ -15,10 +24,6 @@ function match_content(&$a) { $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; - $o .= replace_macros(get_markup_template("section_title.tpl"),array( - '$title' => t('Profile Match') - )); - $r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1", intval(local_user()) ); @@ -27,7 +32,6 @@ function match_content(&$a) { if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) { notice( t('No keywords to match. Please add keywords to your default profile.') . EOL); return; - } $params = array(); @@ -52,9 +56,6 @@ function match_content(&$a) { if(count($j->results)) { - - - $tpl = get_markup_template('match.tpl'); foreach($j->results as $jj) { $match_nurl = normalise_link($jj->url); $match = q("SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1", @@ -63,24 +64,33 @@ function match_content(&$a) { if (!count($match)) { $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo); $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url; - $o .= replace_macros($tpl,array( - '$url' => zrl($jj->url), - '$name' => $jj->name, - '$photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), - '$inttxt' => ' ' . t('is interested in:'), - '$conntxt' => t('Connect'), - '$connlnk' => $connlnk, - '$tags' => $jj->tags - )); + $entry = array( + 'url' => zrl($jj->url), + 'name' => $jj->name, + 'photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), + 'inttxt' => ' ' . t('is interested in:'), + 'conntxt' => t('Connect'), + 'connlnk' => $connlnk, + 'tags' => $jj->tags + ); + $entries[] = $entry; } } - } else { + + $tpl = get_markup_template('match.tpl'); + + $o .= replace_macros($tpl,array( + '$title' => t('Profile Match'), + 'entries' => $entries, + )); + + } + else { info( t('No matches') . EOL); } } - $o .= cleardiv(); $o .= paginate($a); return $o; } From dd46a6ff680a42e2a8c826a99bf729f90c2afffc Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 17 Oct 2015 00:58:22 +0200 Subject: [PATCH 007/313] Store the event when a summary or a description is set --- include/items.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/items.php b/include/items.php index c14fcdcc99..795001bec6 100644 --- a/include/items.php +++ b/include/items.php @@ -2849,7 +2849,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) if((x($datarray,'object-type')) && ($datarray['object-type'] === ACTIVITY_OBJ_EVENT)) { $ev = bbtoevent($datarray['body']); - if(x($ev,'desc') && x($ev,'start')) { + if((x($ev,'desc') || x($ev,'summary')) && x($ev,'start')) { $ev['uid'] = $importer['uid']; $ev['uri'] = $item_id; $ev['edited'] = $datarray['edited']; @@ -4074,7 +4074,7 @@ function local_delivery($importer,$data) { if((x($datarray,'object-type')) && ($datarray['object-type'] === ACTIVITY_OBJ_EVENT)) { $ev = bbtoevent($datarray['body']); - if(x($ev,'desc') && x($ev,'start')) { + if((x($ev,'desc') || x($ev,'summary')) && x($ev,'start')) { $ev['cid'] = $importer['id']; $ev['uid'] = $importer['uid']; $ev['uri'] = $item_id; From 7f9711ffe631c4bca7abb6b5cda6365660e2b386 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 17 Oct 2015 01:25:25 +0200 Subject: [PATCH 008/313] Delete event when the item is deleted --- include/event.php | 6 ++++++ include/items.php | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/include/event.php b/include/event.php index a87dba64fb..d56388a77a 100644 --- a/include/event.php +++ b/include/event.php @@ -204,7 +204,13 @@ function ev_compare($a,$b) { return strcmp($date_a,$date_b); } +function event_delete($event_id) { + if ($event_id == 0) + return; + q("DELETE FROM `event` WHERE `id` = %d", intval($event_id)); + logger("Deleted event ".$event_id, LOGGER_DEBUG); +} function event_store($arr) { diff --git a/include/items.php b/include/items.php index 795001bec6..7d1ab1cb36 100644 --- a/include/items.php +++ b/include/items.php @@ -2558,6 +2558,11 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) if(! $item['deleted']) logger('consume_feed: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG); + if($item['object-type'] === ACTIVITY_OBJ_EVENT) { + logger("Deleting event ".$item['event-id'], LOGGER_DEBUG); + event_delete($item['event-id']); + } + if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) { $xo = parse_xml_string($item['object'],false); $xt = parse_xml_string($item['target'],false); @@ -3544,6 +3549,11 @@ function local_delivery($importer,$data) { logger('local_delivery: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG); + if($item['object-type'] === ACTIVITY_OBJ_EVENT) { + logger("Deleting event ".$item['event-id'], LOGGER_DEBUG); + event_delete($item['event-id']); + } + if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) { $xo = parse_xml_string($item['object'],false); $xt = parse_xml_string($item['target'],false); From 485e65871e109ccc51fccb91857e2dc296fdf379 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 17 Oct 2015 02:36:16 +0200 Subject: [PATCH 009/313] Avoid wrong birthdays --- include/diaspora.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/diaspora.php b/include/diaspora.php index 757cf1a6ba..c97abc28cd 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2421,7 +2421,8 @@ function diaspora_profile($importer,$xml,$msg) { $birthday = str_replace('1000','1901',$birthday); - $birthday = datetime_convert('UTC','UTC',$birthday,'Y-m-d'); + if ($birthday != "") + $birthday = datetime_convert('UTC','UTC',$birthday,'Y-m-d'); // this is to prevent multiple birthday notifications in a single year // if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year From 316276cb6d6ec61c1c839c81fbe6d96ed1705b49 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 17 Oct 2015 08:27:33 +0200 Subject: [PATCH 010/313] Editing an item with an event is now opeing the event edit form. --- mod/events.php | 4 ++++ object/Item.php | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/mod/events.php b/mod/events.php index bf53286c20..f2891a38d5 100644 --- a/mod/events.php +++ b/mod/events.php @@ -154,6 +154,7 @@ function events_post(&$a) { if(! $cid) proc_run('php',"include/notifier.php","event","$item_id"); + goaway($_SESSION['return_url']); } @@ -165,6 +166,9 @@ function events_content(&$a) { return; } + if($a->argc == 1) + $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; + if(($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) { $r = q("update event set ignore = 1 where id = %d and uid = %d", intval($a->argv[2]), diff --git a/object/Item.php b/object/Item.php index 3050365f92..04c1a707e3 100644 --- a/object/Item.php +++ b/object/Item.php @@ -117,9 +117,12 @@ class Item extends BaseObject { ? t('Private Message') : false); $shareable = ((($conv->get_profile_owner() == local_user()) && ($item['private'] != 1)) ? true : false); - if(local_user() && link_compare($a->contact['url'],$item['author-link'])) - $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit")); - else + if(local_user() && link_compare($a->contact['url'],$item['author-link'])) { + if ($item["event-id"] != 0) + $edpost = array($a->get_baseurl($ssl_state)."/events/event/".$item['event-id'], t("Edit")); + else + $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit")); + } else $edpost = false; if(($this->get_data_value('uid') == local_user()) || $this->is_visiting()) $dropping = true; From 2070c96dd1910cd16c36277b3ee3198a5f8eafbd Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 17 Oct 2015 08:46:45 +0200 Subject: [PATCH 011/313] Changing the acl does not work when editing posts - so it is disabled for events. --- mod/events.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mod/events.php b/mod/events.php index f2891a38d5..653ae489b8 100644 --- a/mod/events.php +++ b/mod/events.php @@ -509,7 +509,7 @@ function events_content(&$a) { else $sh_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && (! $orig_event['allow_gid']) && (! $orig_event['deny_cid']) && (! $orig_event['deny_gid'])) ? '' : ' checked="checked" ' ); - if($cid) + if($cid OR ($mode !== 'new')) $sh_checked .= ' disabled="disabled" '; @@ -540,6 +540,9 @@ function events_content(&$a) { require_once('include/acl_selectors.php'); + if ($mode === 'new') + $acl = (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user))); + $tpl = get_markup_template('event_form.tpl'); $o .= replace_macros($tpl,array( @@ -567,7 +570,7 @@ function events_content(&$a) { '$sh_text' => t('Share this event'), '$sh_checked' => $sh_checked, '$preview' => t('Preview'), - '$acl' => (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user))), + '$acl' => $acl, '$submit' => t('Submit') )); From 8395f67351b3ac2b3739a99967ba58bf8e731051 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 17 Oct 2015 09:41:58 +0200 Subject: [PATCH 012/313] Events on Diaspora now looking okay. --- include/bbcode.php | 2 +- include/event.php | 40 +++++++++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 2fcf6c3247..81536d3720 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1210,7 +1210,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal // start which is always required). Allow desc with a missing summary for compatibility. if((x($ev,'desc') || x($ev,'summary')) && x($ev,'start')) { - $sub = format_event_html($ev); + $sub = format_event_html($ev, $simplehtml); $Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/ism",'',$Text); $Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/ism",'',$Text); diff --git a/include/event.php b/include/event.php index d56388a77a..c4111dc0b1 100644 --- a/include/event.php +++ b/include/event.php @@ -3,7 +3,7 @@ require_once('include/bbcode.php'); require_once('include/map.php'); -function format_event_html($ev) { +function format_event_html($ev, $simple = false) { @@ -12,6 +12,32 @@ function format_event_html($ev) { $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM + $event_start = (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), + $ev['start'] , $bd_format )) + : day_translate(datetime_convert('UTC', 'UTC', + $ev['start'] , $bd_format))); + + $event_end = (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), + $ev['finish'] , $bd_format )) + : day_translate(datetime_convert('UTC', 'UTC', + $ev['finish'] , $bd_format ))); + + if ($simple) { + $o = "

".bbcode($ev['summary'])."

"; + + $o .= "

".bbcode($ev['desc'])."

"; + + $o .= "

".t('Starts:')."

".$event_start."

"; + + if(! $ev['nofinish']) + $o .= "

".t('Finishes:')."

".$event_end."

"; + + if(strlen($ev['location'])) + $o .= "

".t('Location:')."

".$ev['location']."

"; + + return $o; + } + $o = '
' . "\r\n"; @@ -21,21 +47,13 @@ function format_event_html($ev) { $o .= '

' . t('Starts:') . ' ' - . (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), - $ev['start'] , $bd_format )) - : day_translate(datetime_convert('UTC', 'UTC', - $ev['start'] , $bd_format))) + . '" >'.$event_start . '

' . "\r\n"; if(! $ev['nofinish']) $o .= '

' . t('Finishes:') . ' ' - . (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), - $ev['finish'] , $bd_format )) - : day_translate(datetime_convert('UTC', 'UTC', - $ev['finish'] , $bd_format ))) + . '" >'.$event_end . '

' . "\r\n"; if(strlen($ev['location'])){ From 8a79e1afb34cf8098bc0e34180bb3b17b826c824 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 17 Oct 2015 10:48:13 +0200 Subject: [PATCH 013/313] The datepicker is now localised --- include/datetime.php | 75 ++++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 30 deletions(-) diff --git a/include/datetime.php b/include/datetime.php index 6461298ba2..79964ef404 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -43,18 +43,18 @@ function select_timezone($current = 'America/Los_Angeles') { if($continent != t('Miscellaneous')) { $o .= ''; $continent = t('Miscellaneous'); - $o .= ''; + $o .= ''; } } $city = str_replace('_', ' ', t($city)); $selected = (($value == $current) ? " selected=\"selected\" " : ""); $o .= ""; - } + } $o .= ''; return $o; }} -// return a select using 'field_select_raw' template, with timezones +// return a select using 'field_select_raw' template, with timezones // groupped (primarily) by continent // arguments follow convetion as other field_* template array: // 'name', 'label', $value, 'help' @@ -63,12 +63,12 @@ function field_timezone($name='timezone', $label='', $current = 'America/Los_Ang $options = select_timezone($current); $options = str_replace('','', $options); - + $tpl = get_markup_template('field_select_raw.tpl'); return replace_macros($tpl, array( '$field' => array($name, $label, $current, $help, $options), )); - + }} // General purpose date parse/convert function. @@ -92,8 +92,8 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d // Slight hackish adjustment so that 'zero' datetime actually returns what is intended // otherwise we end up with -0001-11-30 ... - // add 32 days so that we at least get year 00, and then hack around the fact that - // months and days always start with 1. + // add 32 days so that we at least get year 00, and then hack around the fact that + // months and days always start with 1. if(substr($s,0,10) == '0000-00-00') { $d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC')); @@ -203,13 +203,25 @@ function timesel($format, $h, $m, $id='timepicker') { * set maximum date from picker with id $maxfrom (none by default) * @param boolean $required default false * @return string Parsed HTML output. - * + * * @todo Once browser support is better this could probably be replaced with * native HTML5 date picker. */ if(! function_exists('datetimesel')) { function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '', $required = false) { + $a = get_app(); + + // First day of the week (0 = Sunday) + $firstDay = get_pconfig(local_user(),'system','first_day_of_week'); + if ($firstDay === false) $firstDay=0; + + $lang = substr(get_browser_language(), 0, 2); + + // Check if the detected language is supported by the picker + if (!in_array($lang, array("ar", "ro", "id", "bg", "fa", "ru", "uk", "en", "el", "de", "nl", "tr", "fr", "es", "th", "pl", "pt", "ch", "se", "kr", "it", "da", "no", "ja", "vi", "sl", "cs", "hu"))) + $lang = ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en'); + $o = ''; $dateformat = ''; if($pickdate) $dateformat .= 'Y-m-d'; @@ -217,16 +229,17 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic if($picktime) $dateformat .= 'H:i'; $minjs = $min ? ",minDate: new Date({$min->getTimestamp()}*1000), yearStart: " . $min->format('Y') : ''; $maxjs = $max ? ",maxDate: new Date({$max->getTimestamp()}*1000), yearEnd: " . $max->format('Y') : ''; - + $input_text = $default ? 'value="' . date($dateformat, $default->getTimestamp()) . '"' : ''; $defaultdatejs = $default ? ",defaultDate: new Date({$default->getTimestamp()}*1000)" : ''; $pickers = ''; if(!$pickdate) $pickers .= ',datepicker: false'; if(!$picktime) $pickers .= ',timepicker: false'; $extra_js = ''; - if($minfrom != '') + $pickers .= ",dayOfWeekStart: ".$firstDay.",lang:'".$lang."'"; + if($minfrom != '') $extra_js .= "\$('#$minfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#$id').data('xdsoft_datetimepicker').setOptions({minDate: currentDateTime})}})"; - if($maxfrom != '') + if($maxfrom != '') $extra_js .= "\$('#$maxfrom').data('xdsoft_datetimepicker').setOptions({onChangeDateTime: function (currentDateTime) { \$('#$id').data('xdsoft_datetimepicker').setOptions({maxDate: currentDateTime})}})"; $readable_format = $dateformat; $readable_format = str_replace('Y','yyyy',$readable_format); @@ -236,7 +249,9 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic $readable_format = str_replace('i','MM',$readable_format); $o .= "
"; $o .= '
'; - $o .= ""; + $o .= ""; return $o; }} @@ -248,27 +263,27 @@ function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pic if(! function_exists('relative_date')) { function relative_date($posted_date,$format = null) { - $localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date); + $localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date); $abs = strtotime($localtime); - - if (is_null($posted_date) || $posted_date === '0000-00-00 00:00:00' || $abs === False) { + + if (is_null($posted_date) || $posted_date === '0000-00-00 00:00:00' || $abs === False) { return t('never'); } $etime = time() - $abs; - + if ($etime < 1) { return t('less than a second ago'); } - + /* $time_append = ''; if ($etime >= 86400) { $time_append = ' ('.$localtime.')'; } */ - + $a = array( 12 * 30 * 24 * 60 * 60 => array( t('year'), t('years')), 30 * 24 * 60 * 60 => array( t('month'), t('months')), 7 * 24 * 60 * 60 => array( t('week'), t('weeks')), @@ -277,7 +292,7 @@ function relative_date($posted_date,$format = null) { 60 => array( t('minute'), t('minutes')), 1 => array( t('second'), t('seconds')) ); - + foreach ($a as $secs => $str) { $d = $etime / $secs; if ($d >= 1) { @@ -295,13 +310,13 @@ function relative_date($posted_date,$format = null) { // Returns age in years, given a date of birth, // the timezone of the person whose date of birth is provided, // and the timezone of the person viewing the result. -// Why? Bear with me. Let's say I live in Mittagong, Australia, and my +// Why? Bear with me. Let's say I live in Mittagong, Australia, and my // birthday is on New Year's. You live in San Bruno, California. // When exactly are you going to see my age increase? -// A: 5:00 AM Dec 31 San Bruno time. That's precisely when I start -// celebrating and become a year older. If you wish me happy birthday -// on January 1 (San Bruno time), you'll be a day late. - +// A: 5:00 AM Dec 31 San Bruno time. That's precisely when I start +// celebrating and become a year older. If you wish me happy birthday +// on January 1 (San Bruno time), you'll be a day late. + function age($dob,$owner_tz = '',$viewer_tz = '') { if(! intval($dob)) return 0; @@ -357,7 +372,7 @@ function get_first_dim($y,$m) { // output a calendar for the given month, year. // if $links are provided (array), e.g. $links[12] => 'http://mylink' , -// date 12 will be linked appropriately. Today's date is also noted by +// date 12 will be linked appropriately. Today's date is also noted by // altering td class. // Months count from 1. @@ -376,7 +391,7 @@ function cal($y = 0,$m = 0, $links = false, $class='') { 'April','May','June', 'July','August','September', 'October','November','December' - ); + ); $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m'); @@ -427,8 +442,8 @@ function cal($y = 0,$m = 0, $links = false, $class='') { if($dow) for($a = $dow; $a < 7; $a ++) $o .= ' '; - $o .= ''."\r\n"; - + $o .= ''."\r\n"; + return $o; }} @@ -452,10 +467,10 @@ function update_contact_birthdays() { * * $bdtext is just a readable placeholder in case the event is shared * with others. We will replace it during presentation to our $importer - * to contain a sparkle link and perhaps a photo. + * to contain a sparkle link and perhaps a photo. * */ - + $bdtext = sprintf( t('%s\'s birthday'), $rr['name']); $bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]') ; From b75a3c894351b4e49cc53cbff2a312e40f7b6d13 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 17 Oct 2015 15:26:11 +0200 Subject: [PATCH 014/313] Automatically set the new configuration for the global directory when updating. --- update.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/update.php b/update.php index 06aab577a3..7c32f5819c 100644 --- a/update.php +++ b/update.php @@ -1648,3 +1648,14 @@ function update_1180() { return UPDATE_SUCCESS; } + +function update_1188() { + + if (strlen(get_config('system','directory_submit_url')) AND + !strlen(get_config('system','directory'))) { + set_config('system','directory', dirname(get_config('system','directory_submit_url'))); + del_config('system','directory_submit_url'); + } + + return UPDATE_SUCCESS; +} From 72896b0f6b1677a42970f432485df213318141e9 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 17 Oct 2015 19:45:57 +0200 Subject: [PATCH 015/313] unify directory page --- mod/directory.php | 4 +++- view/templates/directory_header.tpl | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index 2093b11863..d256c590aa 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -6,6 +6,8 @@ function directory_init(&$a) { if(local_user()) { require_once('include/contact_widgets.php'); + $a->page['aside'] .= follow_widget(); + $a->page['aside'] .= findpeople_widget(); } @@ -193,7 +195,7 @@ function directory_content(&$a) { '$entries' => $entries, '$finding' => t('Finding:'), '$findterm' => (strlen($search) ? $search : ""), - '$sitedir' => t('Site Directory'), + '$title' => t('Site Directory'), '$submit' => t('Find') )); diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl index ef9aa04af5..07d625ed4e 100644 --- a/view/templates/directory_header.tpl +++ b/view/templates/directory_header.tpl @@ -1,5 +1,5 @@ -

{{$sitedir}}

+{{include file="section_title.tpl"}} {{if $gdirpath}}
    From 9176e739a405a35e7283d61ea51018e96a534099 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 17 Oct 2015 21:25:21 +0200 Subject: [PATCH 016/313] sugest.php: themeable as whole page --- mod/suggest.php | 37 ++++++++++--------- view/templates/suggest_friends.tpl | 36 ++++++++++-------- .../templates/suggest_friends.tpl | 36 ++++++++++-------- .../theme/frost/templates/suggest_friends.tpl | 36 ++++++++++-------- 4 files changed, 82 insertions(+), 63 deletions(-) diff --git a/mod/suggest.php b/mod/suggest.php index 8bf31ca8e5..760bbf06ae 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -65,11 +65,6 @@ function suggest_content(&$a) { $a->page['aside'] .= findpeople_widget(); - $o .= replace_macros(get_markup_template("section_title.tpl"),array( - '$title' => t('Friend Suggestions') - )); - - $r = suggestion_query(local_user()); if(! count($r)) { @@ -77,25 +72,31 @@ function suggest_content(&$a) { return $o; } - $tpl = get_markup_template('suggest_friends.tpl'); - foreach($r as $rr) { $connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']); - $o .= replace_macros($tpl,array( - '$url' => zrl($rr['url']), - '$name' => $rr['name'], - '$photo' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB), - '$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'], - '$ignid' => $rr['id'], - '$conntxt' => t('Connect'), - '$connlnk' => $connlnk, - '$ignore' => t('Ignore/Hide') - )); + $entry = array( + 'url' => zrl($rr['url']), + 'url_clean' => $rr['url'], + 'name' => $rr['name'], + 'photo' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB), + 'ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'], + 'ignid' => $rr['id'], + 'conntxt' => t('Connect'), + 'connlnk' => $connlnk, + 'ignore' => t('Ignore/Hide') + ); + $entries[] = $entry; } - $o .= cleardiv(); + $tpl = get_markup_template('suggest_friends.tpl'); + + $o .= replace_macros($tpl,array( + '$title' => t('Friend Suggestions'), + '$entries' => $entries, + )); + // $o .= paginate($a); return $o; } diff --git a/view/templates/suggest_friends.tpl b/view/templates/suggest_friends.tpl index a64c05dd83..e7c9c1ac00 100644 --- a/view/templates/suggest_friends.tpl +++ b/view/templates/suggest_friends.tpl @@ -1,17 +1,23 @@ -
    - -
    - - {{$name}} - +{{include file="section_title.tpl"}} + +{{foreach $entries as $entry}} +
    + +
    + + {{$entry.name}} + +
    +
    +
    + {{$entry.name}} +
    +
    + {{if $entry.connlnk}} +
    {{$entry.conntxt}}
    + {{/if}}
    -
    -
    - {{$name}} -
    -
    - {{if $connlnk}} -
    {{$conntxt}}
    - {{/if}} -
    \ No newline at end of file +{{/foreach}} + +
    diff --git a/view/theme/frost-mobile/templates/suggest_friends.tpl b/view/theme/frost-mobile/templates/suggest_friends.tpl index e39cca6e59..a386f30d00 100644 --- a/view/theme/frost-mobile/templates/suggest_friends.tpl +++ b/view/theme/frost-mobile/templates/suggest_friends.tpl @@ -1,17 +1,23 @@ -
    -
    - - {{$name}} - +{{include file="section_title.tpl"}} + +{{foreach $entries as $entry}} +
    +
    + + {{$entry.name}} + +
    +
    +
    + {{$entry.name}} +
    +
    + {{if $entry.connlnk}} +
    {{$entry.conntxt}}
    + {{/if}} +
    -
    -
    - {{$name}} -
    -
    - {{if $connlnk}} -
    {{$conntxt}}
    - {{/if}} - -
    +{{/foreach}} + +
    diff --git a/view/theme/frost/templates/suggest_friends.tpl b/view/theme/frost/templates/suggest_friends.tpl index e39cca6e59..a386f30d00 100644 --- a/view/theme/frost/templates/suggest_friends.tpl +++ b/view/theme/frost/templates/suggest_friends.tpl @@ -1,17 +1,23 @@ -
    -
    - - {{$name}} - +{{include file="section_title.tpl"}} + +{{foreach $entries as $entry}} +
    +
    + + {{$entry.name}} + +
    +
    +
    + {{$entry.name}} +
    +
    + {{if $entry.connlnk}} +
    {{$entry.conntxt}}
    + {{/if}} +
    -
    -
    - {{$name}} -
    -
    - {{if $connlnk}} -
    {{$conntxt}}
    - {{/if}} - -
    +{{/foreach}} + +
    From 6d559bf8a9e36ae9695dc77617f6ae8f574c7fa6 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 17 Oct 2015 21:40:41 +0200 Subject: [PATCH 017/313] viewcontact: use section_title.tpl as headding --- view/templates/viewcontact_template.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/templates/viewcontact_template.tpl b/view/templates/viewcontact_template.tpl index ff33d65213..455551c680 100644 --- a/view/templates/viewcontact_template.tpl +++ b/view/templates/viewcontact_template.tpl @@ -1,5 +1,5 @@ -

    {{$title}}

    +{{include file="section_title.tpl"}} {{foreach $contacts as $contact}} {{include file="contact_template.tpl"}} From b9d9bf8ecdc4e82637524eb59386ff8a7f54de6c Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 17 Oct 2015 21:45:55 +0200 Subject: [PATCH 018/313] directory: move pagination into template --- mod/directory.php | 5 ++--- view/templates/directory_header.tpl | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index d256c590aa..46c4f38ad3 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -196,11 +196,10 @@ function directory_content(&$a) { '$finding' => t('Finding:'), '$findterm' => (strlen($search) ? $search : ""), '$title' => t('Site Directory'), - '$submit' => t('Find') + '$submit' => t('Find'), + '$paginate' => paginate($a), )); - $o .= paginate($a); - } else info( t("No entries \x28some entries may be hidden\x29.") . EOL); diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl index 07d625ed4e..eda887a898 100644 --- a/view/templates/directory_header.tpl +++ b/view/templates/directory_header.tpl @@ -26,4 +26,6 @@ {{include file="directory_item.tpl"}} {{/foreach}} -
    \ No newline at end of file +
    + +{{$paginate}} From 4b8ca578d1245c760a1c04bea6daf5b8582d0cbd Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 17 Oct 2015 22:09:19 +0200 Subject: [PATCH 019/313] dirfind: move pagination into template --- mod/dirfind.php | 2 +- mod/match.php | 2 +- view/templates/match.tpl | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/dirfind.php b/mod/dirfind.php index 39c13dcb73..9e02a47e20 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -156,6 +156,7 @@ function dirfind_content(&$a, $prefix = "") { $o .= replace_macros($tpl,array( 'title' => sprintf( t('People Search - %s'), $search), '$entries' => $entries, + '$paginate' => paginate($a), )); } @@ -165,6 +166,5 @@ function dirfind_content(&$a, $prefix = "") { } - $o .= paginate($a); return $o; } diff --git a/mod/match.php b/mod/match.php index 30d057a0da..380f6e74a4 100644 --- a/mod/match.php +++ b/mod/match.php @@ -82,6 +82,7 @@ function match_content(&$a) { $o .= replace_macros($tpl,array( '$title' => t('Profile Match'), 'entries' => $entries, + '$paginate' => paginate($a), )); } @@ -91,6 +92,5 @@ function match_content(&$a) { } - $o .= paginate($a); return $o; } diff --git a/view/templates/match.tpl b/view/templates/match.tpl index db612e3dc5..d269a253bc 100644 --- a/view/templates/match.tpl +++ b/view/templates/match.tpl @@ -36,3 +36,5 @@ {{/foreach}}
    + +{{$paginate}} From f9c0c1d6967bdefe4f00700a19b8eba44063e3f7 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sun, 18 Oct 2015 17:12:48 +0200 Subject: [PATCH 020/313] template rework: use viewcontact_template.tpl for contact dealing pages --- mod/contacts.php | 1 + mod/dirfind.php | 8 +++--- mod/match.php | 18 +++++++++---- mod/suggest.php | 24 ++++++++++++------ mod/viewcontacts.php | 2 +- view/templates/contact_template.tpl | 3 ++- view/templates/contacts-template.tpl | 2 +- view/theme/duepuntozero/style.css | 4 +++ view/theme/frost-mobile/style.css | 2 ++ .../templates/contact_template.tpl | 4 +-- .../templates/viewcontact_template.tpl | 12 +++++++++ view/theme/frost/style.css | 8 ++++-- .../frost/templates/contact_template.tpl | 12 ++++----- view/theme/quattro/dark/style.css | 25 +++++++++++++++++++ view/theme/quattro/green/style.css | 25 +++++++++++++++++++ view/theme/quattro/lilac/style.css | 25 +++++++++++++++++++ view/theme/quattro/quattro.less | 21 ++++++++++++++++ .../quattro/templates/contact_template.tpl | 7 +++++- view/theme/smoothly/style.css | 9 +++++-- view/theme/vier/style.css | 4 +++ .../theme/vier/templates/contact_template.tpl | 2 +- 21 files changed, 185 insertions(+), 33 deletions(-) create mode 100644 view/theme/frost-mobile/templates/viewcontact_template.tpl diff --git a/mod/contacts.php b/mod/contacts.php index c562c9822d..bdb25b022b 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -799,6 +799,7 @@ function contacts_content(&$a) { '$cmd' => $a->cmd, '$contacts' => $contacts, '$contact_drop_confirm' => t('Do you really want to delete this contact?'), + 'multiselect' => 1, '$batch_actions' => array( 'contacts_batch_update' => t('Update'), 'contacts_batch_block' => t('Block')."/".t("Unblock"), diff --git a/mod/dirfind.php b/mod/dirfind.php index 9e02a47e20..77e86c5db3 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -141,8 +141,8 @@ function dirfind_content(&$a, $prefix = "") { $entry = array( 'url' => zrl($jj->url), 'name' => htmlentities($jj->name), - 'photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), - 'tags' => $jj->tags, + 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), + 'img_hover' => $jj->tags, 'conntxt' => $conntxt, 'connlnk' => $connlnk, 'photo_menu' => $photo_menu, @@ -151,11 +151,11 @@ function dirfind_content(&$a, $prefix = "") { $entries[] = $entry; } - $tpl = get_markup_template('match.tpl'); + $tpl = get_markup_template('viewcontact_template.tpl'); $o .= replace_macros($tpl,array( 'title' => sprintf( t('People Search - %s'), $search), - '$entries' => $entries, + '$contacts' => $entries, '$paginate' => paginate($a), )); diff --git a/mod/match.php b/mod/match.php index 380f6e74a4..f6174da66c 100644 --- a/mod/match.php +++ b/mod/match.php @@ -56,32 +56,40 @@ function match_content(&$a) { if(count($j->results)) { + $id = 0; + foreach($j->results as $jj) { $match_nurl = normalise_link($jj->url); $match = q("SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1", intval(local_user()), dbesc($match_nurl)); + if (!count($match)) { $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo); $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url; + $photo_menu = array(array(t("View Profile"), zrl($jj->url))); + $photo_menu[] = array(t("Connect/Follow"), $connlnk); + $entry = array( 'url' => zrl($jj->url), 'name' => $jj->name, - 'photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), + 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), 'inttxt' => ' ' . t('is interested in:'), 'conntxt' => t('Connect'), 'connlnk' => $connlnk, - 'tags' => $jj->tags + 'img_hover' => $jj->tags, + 'photo_menu' => $photo_menu, + 'id' => ++$id, ); - $entries[] = $entry; } + $entries[] = $entry; } - $tpl = get_markup_template('match.tpl'); + $tpl = get_markup_template('viewcontact_template.tpl'); $o .= replace_macros($tpl,array( '$title' => t('Profile Match'), - 'entries' => $entries, + '$contacts' => $entries, '$paginate' => paginate($a), )); diff --git a/mod/suggest.php b/mod/suggest.php index 760bbf06ae..5241e485ee 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -72,31 +72,41 @@ function suggest_content(&$a) { return $o; } + require_once 'include/contact_selectors.php'; + foreach($r as $rr) { $connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']); + $ignlnk = $a->get_baseurl() . '/suggest?ignore=' . $rr['id']; + $photo_menu = array(array(t("View Profile"), zrl($jj->url))); + $photo_menu[] = array(t("Connect/Follow"), $connlnk); + $photo_menu[] = array(t('Ignore/Hide'), $ignlnk); $entry = array( 'url' => zrl($rr['url']), - 'url_clean' => $rr['url'], + 'itemurl' => $rr['url'], + 'img_hover' => $rr['url'], 'name' => $rr['name'], - 'photo' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB), - 'ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'], + 'thumb' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB), + 'ignlnk' => $ignlnk, 'ignid' => $rr['id'], 'conntxt' => t('Connect'), 'connlnk' => $connlnk, - 'ignore' => t('Ignore/Hide') + 'photo_menu' => $photo_menu, + 'ignore' => t('Ignore/Hide'), + 'network' => network_to_name($rr['network'], $rr['url']), + 'id' => ++$id, ); $entries[] = $entry; } - $tpl = get_markup_template('suggest_friends.tpl'); + $tpl = get_markup_template('viewcontact_template.tpl'); $o .= replace_macros($tpl,array( '$title' => t('Friend Suggestions'), - '$entries' => $entries, + '$contacts' => $entries, + )); -// $o .= paginate($a); return $o; } diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index a6bf74b288..927a597524 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -48,7 +48,7 @@ function viewcontacts_content(&$a) { if($rr['self']) continue; - $url = $rr['url']; + $url = $rr['url']; // route DFRN profiles through the redirect diff --git a/view/templates/contact_template.tpl b/view/templates/contact_template.tpl index d4f65f70f9..4e8c04297d 100644 --- a/view/templates/contact_template.tpl +++ b/view/templates/contact_template.tpl @@ -7,9 +7,10 @@ {{$contact.name}} - {{if !$no_contacts_checkbox}} + {{if $multiselect}} {{/if}} + {{if $contact.photo_menu}} menu
    diff --git a/view/templates/contacts-template.tpl b/view/templates/contacts-template.tpl index 896f9af4c9..bec295924e 100644 --- a/view/templates/contacts-template.tpl +++ b/view/templates/contacts-template.tpl @@ -1,5 +1,5 @@ -

    {{$header}}{{if $total}} ({{$total}}){{/if}}

    +

    {{$header}}{{if $total}} ({{$total}}){{/if}}

    {{if $finding}}

    {{$finding}}

    {{/if}} diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index ae2530b6a2..7220b4c47f 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -891,6 +891,10 @@ input#dfrn-url { .contact-entry-photo img { border: none; } +.contact-entry-photo a img { + width: 80px; + height: 80px; +} .contact-entry-photo-end { clear: both; } diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index f4b46fed84..ef030c5f3a 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -1124,6 +1124,8 @@ input#dfrn-url { .contact-entry-photo img { border: none; + width: 80px; + height: 80px; } .contact-entry-photo-end { clear: both; diff --git a/view/theme/frost-mobile/templates/contact_template.tpl b/view/theme/frost-mobile/templates/contact_template.tpl index a2506fc17e..42f4b7372a 100644 --- a/view/theme/frost-mobile/templates/contact_template.tpl +++ b/view/theme/frost-mobile/templates/contact_template.tpl @@ -29,8 +29,8 @@
    -
    {{$contact.name}}

    -{{if $contact.alt_text}}
    {{$contact.alt_text}}
    {{/if}} +
    {{$contact.name}}

    + {{if $contact.alt_text}}
    {{$contact.alt_text}}
    {{/if}}
    {{$contact.network}}
    diff --git a/view/theme/frost-mobile/templates/viewcontact_template.tpl b/view/theme/frost-mobile/templates/viewcontact_template.tpl new file mode 100644 index 0000000000..3b68410f95 --- /dev/null +++ b/view/theme/frost-mobile/templates/viewcontact_template.tpl @@ -0,0 +1,12 @@ + +{{include file="section_title.tpl"}} + +
    +{{foreach $contacts as $contact}} + {{include file="contact_template.tpl"}} +{{/foreach}} +
    + +
    + +{{$paginate}} diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 8b87c3bd42..66121baf34 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -1093,15 +1093,19 @@ input#dfrn-url { .contact-entry-photo img { border: none; } +.contact-entry-photo a img { + width: 80px; + height: 80px; +} .contact-entry-photo-end { clear: both; } .contact-entry-name { - float: left; + /*float: left;*/ margin-left: 0px; margin-right: 10px; padding-bottom: 5px; - width: 120px; + /*width: 120px;*/ font-weight: 600; overflow: hidden; } diff --git a/view/theme/frost/templates/contact_template.tpl b/view/theme/frost/templates/contact_template.tpl index 7a29bd0455..1ed1471a6e 100644 --- a/view/theme/frost/templates/contact_template.tpl +++ b/view/theme/frost/templates/contact_template.tpl @@ -10,8 +10,8 @@ {{if $contact.photo_menu}} menu -
    -
      +
      +
        {{foreach $contact.photo_menu as $c}} {{if $c.2}}
      • {{$c.0}}
        • @@ -19,15 +19,15 @@
      • {{$c.0}}
        • {{/if}} {{/foreach}} -
      -
      +
    +
    {{/if}}
    -
    {{$contact.name}}

    -{{if $contact.alt_text}}
    {{$contact.alt_text}}
    {{/if}} +
    {{$contact.name}}
    + {{if $contact.alt_text}}
    {{$contact.alt_text}}
    {{/if}}
    {{$contact.network}}
    diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 1eda67de13..b0489af808 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -1543,6 +1543,31 @@ span[id^="showmore-wrap"] { left: 0px; top: 63px; } +.contact-wrapper .drop { + background-image: url('../../../images/icons/22/delete.png'); + display: block; + width: 22px; + height: 22px; + position: relative; + top: 10px; + left: -10px; + z-index: 99; +} +.contact-wrapper .drophide { + background-image: url('../../../images/icons/22/delete.png'); + display: block; + width: 22px; + height: 22px; + opacity: 0.3; + position: relative; + top: 10px; + left: -10px; + z-index: 99; +} +.contact-wrapper .contact-entry-connect { + padding-top: 5px; + font-weight: bold; +} .directory-item { float: left; width: 200px; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 71569971e5..0c7050045d 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -1543,6 +1543,31 @@ span[id^="showmore-wrap"] { left: 0px; top: 63px; } +.contact-wrapper .drop { + background-image: url('../../../images/icons/22/delete.png'); + display: block; + width: 22px; + height: 22px; + position: relative; + top: 10px; + left: -10px; + z-index: 99; +} +.contact-wrapper .drophide { + background-image: url('../../../images/icons/22/delete.png'); + display: block; + width: 22px; + height: 22px; + opacity: 0.3; + position: relative; + top: 10px; + left: -10px; + z-index: 99; +} +.contact-wrapper .contact-entry-connect { + padding-top: 5px; + font-weight: bold; +} .directory-item { float: left; width: 200px; diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index 55b81e5daf..c5f655427a 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -1543,6 +1543,31 @@ span[id^="showmore-wrap"] { left: 0px; top: 63px; } +.contact-wrapper .drop { + background-image: url('../../../images/icons/22/delete.png'); + display: block; + width: 22px; + height: 22px; + position: relative; + top: 10px; + left: -10px; + z-index: 99; +} +.contact-wrapper .drophide { + background-image: url('../../../images/icons/22/delete.png'); + display: block; + width: 22px; + height: 22px; + opacity: 0.3; + position: relative; + top: 10px; + left: -10px; + z-index: 99; +} +.contact-wrapper .contact-entry-connect { + padding-top: 5px; + font-weight: bold; +} .directory-item { float: left; width: 200px; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 3c9915576f..cd604b656a 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -877,6 +877,27 @@ span[id^="showmore-wrap"] { left: 0px; top: 63px; } + .drop { + background-image: url('../../../images/icons/22/delete.png'); + display: block; width: 22px; height: 22px; + position: relative; + top: 10px; + left: -10px; + z-index: 99; + } + .drophide { + background-image: url('../../../images/icons/22/delete.png'); + display: block; width: 22px; height: 22px; + opacity: 0.3; + position: relative; + top: 10px; + left: -10px; + z-index: 99; + } + .contact-entry-connect { + padding-top: 5px; + font-weight: bold; + } } .directory-item { float: left; diff --git a/view/theme/quattro/templates/contact_template.tpl b/view/theme/quattro/templates/contact_template.tpl index 0f0207b2bf..634630d9ab 100644 --- a/view/theme/quattro/templates/contact_template.tpl +++ b/view/theme/quattro/templates/contact_template.tpl @@ -1,5 +1,6 @@
    + {{if $contact.ignlnk}}{{/if}}
    {{$contact.name}} - {{if !$no_contacts_checkbox}} + {{if $multiselect}} {{/if}} {{if $contact.photo_menu}} @@ -30,6 +31,10 @@
    {{$contact.itemurl}}
    {{$contact.network}}
    + {{if $contact.connlnk}} +
    {{$contact.conntxt}}
    + {{/if}} +
    diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 46d8902aeb..3fe04c0649 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -291,7 +291,7 @@ section { margin: 10px 0 0 230px; } -.login-form, +.login-form { margin-top: 10px; } @@ -2784,7 +2784,7 @@ margin-left: 0px; font-weight: bold; } -.contact-entry-name { +.contact-entry-name, .contact-entry-connect { width: 100px; overflow: hidden; font: #999; @@ -2805,6 +2805,11 @@ margin-left: 0px; -webkit-box-shadow: 0 0 8px #BDBDBD;*/ } +.contact-entry-photo a img { + width: 80px; + height: 80px; +} + .contact-entry-edit-links .icon { border: 1px solid #babdb6; border-radius: 3px; diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 1c03edc6bf..d914d944a2 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -2282,6 +2282,10 @@ aside #id_password { float: left; margin: 0px 10px 10px 0px; } +.contact-entry-photo a img { + width: 80px; + height: 80px; +} /* profile match wrapper */ .profile-match-wrapper { float: left; diff --git a/view/theme/vier/templates/contact_template.tpl b/view/theme/vier/templates/contact_template.tpl index 5271112d83..a065b8fbf4 100644 --- a/view/theme/vier/templates/contact_template.tpl +++ b/view/theme/vier/templates/contact_template.tpl @@ -7,7 +7,7 @@ {{$contact.name}} - {{if !$no_contacts_checkbox}} + {{if $multiselect}} {{/if}} {{if $contact.photo_menu}} From c652aec9704996db7d07883c0796cea200ec12df Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 19 Oct 2015 07:58:13 +0200 Subject: [PATCH 021/313] Updates to the documentations --- doc/Chats.md | 9 ++++--- doc/Developers-Intro.md | 2 ++ doc/Install.md | 60 +++++++++++++++++++++++------------------ doc/de/Chats.md | 44 +++++++++++++++--------------- doc/de/Developers.md | 11 +++++--- 5 files changed, 71 insertions(+), 55 deletions(-) diff --git a/doc/Chats.md b/doc/Chats.md index 77b21833a5..3698ad15da 100644 --- a/doc/Chats.md +++ b/doc/Chats.md @@ -23,7 +23,7 @@ The following window shows some text while connecting. This text isn't importend for you, just wait for the next window. The first line shows your name and your current IP address. The right part of the window shows all users. -The lower part of the window contains an input field. +The lower part of the window contains an input field. Jappix Mini --- @@ -41,7 +41,7 @@ You can use several servers to create an account: At first you have to get the current version. You can either pull it from [Github](https://github.com) like so: - $> cd /var/www/virtual/YOURSPACE/html/addon; git pull + $> cd /var/www/virtual/YOURSPACE/html/addon; git pull Or you can download a tar archive here: [jappixmini.tgz](https://github.com/friendica/friendica-addons/blob/master/jappixmini.tgz) (click at „view raw“). @@ -63,9 +63,10 @@ At first you have to activate the addon. Now add your Jabber/XMPP name, the domain/server (without "http"; just "jappix.com"). For „Jabber BOSH Host“ you could use "https://bind.jappix.com/". +Note that you need another BOSH server if you do not use jappix.com for your XMPP account. You can find further information in the „Configuration Help“-section below this fields. At last you have enter your password (there are some more optional options, you can choose). -Finish these steps with "send" to save the entries. +Finish these steps with "send" to save the entries. Now, you should find the chatbox at the lower right corner of your browser window. -If you want to add contacts manually, you can click "add contact". +If you want to add contacts manually, you can click "add contact". diff --git a/doc/Developers-Intro.md b/doc/Developers-Intro.md index ff8c3c54c2..7e5caae2b3 100644 --- a/doc/Developers-Intro.md +++ b/doc/Developers-Intro.md @@ -54,6 +54,8 @@ Have a look at our [issue tracker](https://github.com/friendica/friendica) on gi * Try to reproduce a bug that needs more inquries and write down what you find out. * If a bug looks fixed, ask the bug reporters for feedback to find out if the bug can be closed. * Fix a bug if you can. Please make the pull request against the *develop* branch of the repository. + * There is a *Junior Job* label for issues we think might be a good point to start with. + But you don't have to limit yourself to those issues. ###Web interface diff --git a/doc/Install.md b/doc/Install.md index bd15f10b5a..5afd5a22c1 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -10,9 +10,11 @@ Not every PHP/MySQL hosting provider will be able to support Friendica. Many will. But **please** review the requirements and confirm these with your hosting provider prior to installation. -Also if you encounter installation issues, please let us know via the [helper]() or the [developer]() forum or [file an issue](https://github.com/friendica/friendica/issues). +Also if you encounter installation issues, please let us know via the [helper](http://helpers.pyxis.uberspace.de/profile/helpers) or the [developer](https://friendika.openmindspace.org/profile/friendicadevelopers) forum or [file an issue](https://github.com/friendica/friendica/issues). Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future. -Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues. +Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues. +If you do not have a Friendica account yet, you can register a temporary one at [tryfriendica.de](https://tryfriendica.de) and join the forums mentioned above from there. +The account will expire after 7 days, but you can ask the server admin to keep your account longer, should the problem not be resolved after that. Before you begin: Choose a domain name or subdomain name for your server. Put some thought into this. Changing it after installation is currently not supported. @@ -29,7 +31,7 @@ Requirements * curl, gd, mysql, hash and openssl extensions * some form of email server or email gateway such that PHP mail() works * mcrypt (optional; used for server-to-server message encryption) -* Mysql 5.x +* Mysql 5.x or an equivalant alternative for MySQL (MariaDB etc.) * the ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks (Windows) (Note: other options are presented in Section 7 of this document.) * Installation into a top-level domain or sub-domain (without a directory/path component in the URL) is preferred. Directory paths will not be as convenient to use and have not been thoroughly tested. * If your hosting provider doesn't allow Unix shell access, you might have trouble getting everything to work. @@ -42,23 +44,23 @@ Installation procedure Unpack the Friendica files into the root of your web server document area. If you are able to do so, we recommend using git to clone the source repository rather than to use a packaged tar or zip file. This makes the software much easier to update. -The Linux command to clone the repository into a directory "mywebsite" would be +The Linux command to clone the repository into a directory "mywebsite" would be + + git clone https://github.com/friendica/friendica.git mywebsite - git clone https://github.com/friendica/friendica.git mywebsite - Make sure the folder *view/smarty3* exists and is writable by the webserver user - - mkdir view/smarty3 - chmod 777 view/smarty3 - + + mkdir view/smarty3 + chmod 777 view/smarty3 + Get the addons by going into your website folder. - - cd mywebsite - + + cd mywebsite + Clone the addon repository (separately): - - git clone https://github.com/friendica/friendica-addons.git addon - + + git clone https://github.com/friendica/friendica-addons.git addon + If you copy the directory tree to your webserver, make sure that you also copy .htaccess - as "dot" files are often hidden and aren't normally copied. ###Create a database @@ -87,14 +89,14 @@ You might wish to move/rename .htconfig.php to another name and empty (called 'd Set up a cron job or scheduled task to run the poller once every 5-10 minutes in order to perform background processing. Example: - cd /base/directory; /path/to/php include/poller.php + cd /base/directory; /path/to/php include/poller.php Change "/base/directory", and "/path/to/php" as appropriate for your situation. If you are using a Linux server, run "crontab -e" and add a line like the one shown, substituting for your unique paths and settings: - */10 * * * * cd /home/myname/mywebsite; /usr/bin/php include/poller.php + */10 * * * * cd /home/myname/mywebsite; /usr/bin/php include/poller.php You can generally find the location of PHP by executing "which php". If you run into trouble with this section please contact your hosting provider for assistance. @@ -104,25 +106,31 @@ Alternative: You may be able to use the 'poormancron' plugin to perform this ste To do this, edit the file ".htconfig.php" and look for a line describing your plugins. On a fresh installation, it will look like this: - $a->config['system']['addon'] = 'js_upload'; + $a->config['system']['addon'] = 'js_upload'; It indicates the "js_upload" addon module is enabled. You may add additional addons/plugins using this same line in the configuration file. Change it to read - $a->config['system']['addon'] = 'js_upload,poormancron'; + $a->config['system']['addon'] = 'js_upload,poormancron'; -and save your changes. +and save your changes. + +Once you have installed Friendica and created an admin account as part of the process, you can access the admin panel of your installation and do most of the server wide configuration from there Updating your installation with git --- You can get the latest changes at any time with - cd mywebsite - git pull + cd mywebsite + git pull + +The default branch to use it the ``master`` branch, which is the stable version of Friendica. +If you want to use and test bleeding edge code please checkout the ``develop`` branch. +The new features and fixes will be merged from ``develop`` into ``master`` when they are stable approx four times a year. The addon tree has to be updated separately like so: - - cd mywebsite/addon - git pull + + cd mywebsite/addon + git pull diff --git a/doc/de/Chats.md b/doc/de/Chats.md index a2d06f3c4e..ae239a675b 100644 --- a/doc/de/Chats.md +++ b/doc/de/Chats.md @@ -3,33 +3,33 @@ Chats * [Zur Startseite der Hilfe](help) -Du hast derzeit zwei Möglichkeiten, einen Chat auf Deiner Friendica-Seite zu betreiben +Du hast derzeit zwei Möglichkeiten, einen Chat auf Deiner Friendica-Seite zu betreiben * IRC - Internet Relay Chat * Jappix ##IRC Plugin -Sobald das Plugin aktiviert ist, kannst Du den Chat unter [deineSeite.de/irc](../irc) finden. -Beachte aber, dass dieser Chat auch ohne Anmeldung auf Deiner Seite zugänglich ist und somit auch Fremde diesen Chat mitnutzen können. +Sobald das Plugin aktiviert ist, kannst Du den Chat unter [deineSeite.de/irc](../irc) finden. +Beachte aber, dass dieser Chat auch ohne Anmeldung auf Deiner Seite zugänglich ist und somit auch Fremde diesen Chat mitnutzen können. -Wenn Du dem Link folgst, dann kommst Du zum Anmeldefenster des IR-Chats. -Wähle nun einen Spitznamen (Nickname) und wähle einen Raum aus, in dem Du chatten willst. -Hier kannst Du jeden Namen eingeben. -Es kann also auch #tollerChatdessenNamenurichkenne sein. +Wenn Du dem Link folgst, dann kommst Du zum Anmeldefenster des IR-Chats. +Wähle nun einen Spitznamen (Nickname) und wähle einen Raum aus, in dem Du chatten willst. +Hier kannst Du jeden Namen eingeben. +Es kann also auch #tollerChatdessenNamenurichkenne sein. Gib als nächstes noch die Captchas ein, um zu zeigen, dass es sich bei Dir um einen Menschen handelt und klicke auf "Connect". -Im nächsten Fenster siehst Du zunächst viel Text beim Verbindungsaufbau, der allerdings für Dich nicht weiter von Bedeutung ist. -Anschließend öffnet sich das Chat-Fenster. -In den ersten Zeilen wird Dir Dein Name und Deine aktuelle IP-Adresse angezeigt. -Rechts im Fenster siehst Du alle Teilnehmer des Chats. +Im nächsten Fenster siehst Du zunächst viel Text beim Verbindungsaufbau, der allerdings für Dich nicht weiter von Bedeutung ist. +Anschließend öffnet sich das Chat-Fenster. +In den ersten Zeilen wird Dir Dein Name und Deine aktuelle IP-Adresse angezeigt. +Rechts im Fenster siehst Du alle Teilnehmer des Chats. Unten hast Du ein Eingabefeld, um Beiträge zu schreiben. Weiter Informationen zu IRC findest Du zum Beispiel auf ubuntuusers.de, in Wikipedia oder bei icrhelp.org (in Englisch). ##Jappix Mini -Das Jappix Mini Plugin erlaubt das Erstellen einer Chatbox für Jabber/XMPP-Kontakte. +Das Jappix Mini Plugin erlaubt das Erstellen einer Chatbox für Jabber/XMPP-Kontakte. Ein Jabber/XMPP Account sollte vor der Installation bereits vorhanden sein. Die ausführliche Anleitung dazu und eine Kontrolle, ob Du nicht sogar schon über Deinen E-Mail Anbieter einen Jabber-Account hast, findest Du unter einfachjabber.de. @@ -53,29 +53,29 @@ oder als normaler Download von hier: https://github.com/friendica/friendica-addo Entpacke diese Datei (ggf. den entpackten Ordner in „jappixmini“ umbenennen) und lade sowohl den entpackten Ordner komplett als auch die .tgz Datei in den Addon Ordner Deiner Friendica Installation hoch. -Nach dem Upload gehts in den Friendica Adminbereich und dort zu den Plugins. +Nach dem Upload gehts in den Friendica Adminbereich und dort zu den Plugins. Aktiviere das Jappixmini Addon und gehe anschließend über die Plugins Seitenleiste (dort wo auch die Twitter-, Impressums-, GNU Social-, usw. Einstellungen gemacht werden) zu den Jappix Grundeinstellungen. -Setze hier den Haken zur Aktivierung des BOSH Proxys. +Setze hier den Haken zur Aktivierung des BOSH Proxys. Weiter gehts in den Einstellungen Deines Friendica Accounts. 2. Einstellungen -Gehe bitte zu den Plugin-Einstellungen in Deinen Konto-Einstellungen (Account Settings). +Gehe bitte zu den Plugin-Einstellungen in Deinen Konto-Einstellungen (Account Settings). Scrolle ein Stück hinunter bis zu den Jappix Mini Addon settings. Aktiviere hier zuerst das Addon. -Trage nun Deinen Jabber/XMPP Namen ein, ebenfalls die entsprechende Domain bzw. den Server (ohne http, also zb einfach so: jappix.com). +Trage nun Deinen Jabber/XMPP Namen ein, ebenfalls die entsprechende Domain bzw. den Server (ohne http, also zb einfach so: jappix.com). Um das JavaScript Applet zum Chatten im Browser verwenden zu können, benötigst du einen BOSH Proxy. Entweder betreibst du deinen eigenen (s. Dokumentation deines XMPP Servers) oder du verwendest einen öffentlichen BOSH Proxy. Beachte aber, dass der Betreiber dieses Proxies den kompletten Datenverkehr über den Proxy mitlesen kann. -Siehe dazu auch die „Configuration Help“ weiter unten. -Gebe danach noch Dein Passwort an, und damit ist eigentlich schon fast alles geschafft. -Die weiteren Einstellmöglichkeiten bleiben Dir überlassen, sind also optional. +Siehe dazu auch die „Configuration Help“ unter den Eingabefeldern. +Gebe danach noch Dein Passwort an, und damit ist eigentlich schon fast alles geschafft. +Die weiteren Einstellmöglichkeiten bleiben Dir überlassen, sind also optional. Jetzt noch auf „senden“ klicken und fertig. -Deine Chatbox sollte jetzt irgendwo unten rechts im Browserfenster „kleben“. -Falls Du manuell Kontakte hinzufügen möchtest, einfach den „Add Contact“-Knopf nutzen. +Deine Chatbox sollte jetzt irgendwo unten rechts im Browserfenster „kleben“. +Falls Du manuell Kontakte hinzufügen möchtest, einfach den „Add Contact“-Knopf nutzen. -Viel Spass beim Chatten! +Viel Spass beim Chatten! diff --git a/doc/de/Developers.md b/doc/de/Developers.md index b1d118fd59..2b44e405ff 100644 --- a/doc/de/Developers.md +++ b/doc/de/Developers.md @@ -7,18 +7,23 @@ Hier erfährst Du, wie Du bei uns mitmachen kannst: Zunächst erstelle Dir per 'git clone https://github.com/friendica/friendica.git' ein funktionierendes Git-Paket auf Deinem System, auf dem Du die Entwicklung durchführst, und einen eigenen Github-Account. -Erstelle Deine eigene Kopie (fork) der Ursprungsdaten auf Github, an der Du dann entspannt arbeiten kannst. +Erstelle Deine eigene Kopie (fork) der Ursprungsdaten auf Github, an der Du dann entspannt arbeiten kannst. Deine Arbeiten sollten mit einem neuen Arbeitszweig (branch) beginnen, den du vom develop Zweig des Repositories beginnst. Die Anleitung unter [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) erklärt Dir genau, wie Du das tun musst. Gehe dann nach getaner Arbeit zu Deiner Github-Seite und erstelle eine "Pull request", um Deine Änderungen in das Hauptprojekt einzugliedern (merge). +Solltest du keine Idee haben, an welcher Stelle du einsteigen könntest. +Wir haben einige Aufgaben auf github mit dem Schlagwort *Junior Job* versehen. +Bei diesen Aufgaben gehen wir davon aus, dass sie geeignete Einstiegsstellen sind. +Du musst dich aber natürlich nicht mit diesen Aufgaben beschäftigen um den Friendica Code zu verbeesern. + **Wichtig** -Bitte hole Dir alle Änderungen aus dem Projektverzeichnis und führe sie mit Deiner Arbeit zusammen, **bevor** Du Deine "pull request" erstellst. Wir behalten es uns vor, Patches abzulehnen, die eine große Anzahl an Fehlern hervorrufen. +Bitte hole Dir alle Änderungen aus dem Projektverzeichnis und führe sie mit Deiner Arbeit zusammen, **bevor** Du Deine "pull request" erstellst. Wir behalten es uns vor, Patches abzulehnen, die eine große Anzahl an Fehlern hervorrufen. Dies gilt vor allem für Übersetzungen, da wir hier möglicherweise nicht alle feinen Unterschiede in konfliktären Versionen erkennen können. -Außerdem: **teste Deine Änderungen!** Vergiss nicht, dass eine simple Fehlerlösung einen anderen Fehler auslösen kann. +Außerdem: **teste Deine Änderungen!** Vergiss nicht, dass eine simple Fehlerlösung einen anderen Fehler auslösen kann. Lass Deine Änderungen von einem erfahrenen Friendica-Entwickler gegenprüfen. Eine ausführliche Anleitung zu Git findest Du unter https://git-scm.com/book/de/v1. From 891ad5b39d2fd09a88622c4d7fd9f996ff3f7d97 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 19 Oct 2015 19:03:11 +0200 Subject: [PATCH 022/313] Support for additional passwords for ejabberd --- include/auth_ejabberd.php | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/include/auth_ejabberd.php b/include/auth_ejabberd.php index 8b18a02c58..5d69f1de7f 100755 --- a/include/auth_ejabberd.php +++ b/include/auth_ejabberd.php @@ -108,7 +108,7 @@ class exAuth // ovdje provjeri je li korisnik OK $sUser = str_replace(array("%20", "(a)"), array(" ", "@"), $aCommand[1]); $this->writeDebugLog("[debug] checking isuser for ". $sUser); - $sQuery = "select * from user where nickname='". $db->escape($sUser) ."'"; + $sQuery = "SELECT `uid` FROM `user` WHERE `nickname`='". $db->escape($sUser) ."'"; $this->writeDebugLog("[debug] using query ". $sQuery); if ($oResult = q($sQuery)){ if ($oResult) { @@ -120,7 +120,7 @@ class exAuth $this->writeLog("[exAuth] invalid user: ". $sUser); fwrite(STDOUT, pack("nn", 2, 0)); } - $oResult->close(); + //$oResult->close(); } else { $this->writeLog("[MySQL] invalid query: ". $sQuery); fwrite(STDOUT, pack("nn", 2, 0)); @@ -136,10 +136,13 @@ class exAuth // ovdje provjeri prijavu $sUser = str_replace(array("%20", "(a)"), array(" ", "@"), $aCommand[1]); $this->writeDebugLog("[debug] doing auth for ". $sUser); - $sQuery = "select * from user where password='".hash('whirlpool',$aCommand[3])."' and nickname='". $db->escape($sUser) ."'"; + //$sQuery = "SELECT `uid`, `password` FROM `user` WHERE `password`='".hash('whirlpool',$aCommand[3])."' AND `nickname`='". $db->escape($sUser) ."'"; + $sQuery = "SELECT `uid`, `password` FROM `user` WHERE `nickname`='". $db->escape($sUser) ."'"; $this->writeDebugLog("[debug] using query ". $sQuery); if ($oResult = q($sQuery)){ - if ($oResult) { + $Error = ($oResult[0]["password"] != hash('whirlpool',$aCommand[3])); +/* + if ($oResult[0]["password"] == hash('whirlpool',$aCommand[3])) { // korisnik OK $this->writeLog("[exAuth] authentificated user ". $sUser ."@". $aCommand[2]); fwrite(STDOUT, pack("nn", 2, 1)); @@ -149,9 +152,23 @@ class exAuth fwrite(STDOUT, pack("nn", 2, 0)); } $oResult->close(); +*/ } else { $this->writeLog("[MySQL] invalid query: ". $sQuery); + $Error = true; + } + if ($Error) { + $oConfig = q("SELECT `v` FROM `pconfig` WHERE `uid`=1 AND `cat` = 'xmpp' AND `k`='password' LIMIT 1;"); + $this->writeLog("[exAuth] got password ".$oConfig[0]["v"]); + $Error = ($aCommand[3] != $oConfig[0]["v"]); + } + + if ($Error) { + $this->writeLog("[exAuth] authentification failed for user ". $sUser ."@". $aCommand[2]); fwrite(STDOUT, pack("nn", 2, 0)); + } else { + $this->writeLog("[exAuth] authentificated user ". $sUser ."@". $aCommand[2]); + fwrite(STDOUT, pack("nn", 2, 1)); } } break; From 2aad62190fd2c0d85e636d01b7e6607a2510906b Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Thu, 22 Oct 2015 22:48:49 +0200 Subject: [PATCH 023/313] template rework: use viewcontact_template.tpl also for directory --- mod/directory.php | 8 ++++---- view/templates/contact_template.tpl | 2 ++ view/templates/directory_header.tpl | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index 46c4f38ad3..8ed4c22007 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -155,9 +155,9 @@ function directory_content(&$a) { $entry = array( 'id' => $rr['id'], - 'profile_link' => $profile_link, - 'photo' => proxy_url($a->get_cached_avatar_image($rr[$photo]), false, PROXY_SIZE_THUMB), - 'alt_text' => $rr['name'], + 'url' => $profile_link, + 'thumb' => proxy_url($a->get_cached_avatar_image($rr[$photo]), false, PROXY_SIZE_THUMB), + 'img_hover' => $rr['name'], 'name' => $rr['name'], 'details' => $pdesc . $details, 'page_type' => $page_type, @@ -192,7 +192,7 @@ function directory_content(&$a) { '$globaldir' => t('Global Directory'), '$gdirpath' => $gdirpath, '$desc' => t('Find on this site'), - '$entries' => $entries, + '$contacts' => $entries, '$finding' => t('Finding:'), '$findterm' => (strlen($search) ? $search : ""), '$title' => t('Site Directory'), diff --git a/view/templates/contact_template.tpl b/view/templates/contact_template.tpl index 4e8c04297d..39502c91af 100644 --- a/view/templates/contact_template.tpl +++ b/view/templates/contact_template.tpl @@ -1,3 +1,5 @@ +{{* todo: better layout and implement $contact.details and other variables *}} +
    diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl index eda887a898..46f17de40e 100644 --- a/view/templates/directory_header.tpl +++ b/view/templates/directory_header.tpl @@ -22,8 +22,8 @@
    -{{foreach $entries as $entry}} - {{include file="directory_item.tpl"}} +{{foreach $contacts as $contact}} + {{include file="contact_template.tpl"}} {{/foreach}}
    From 0c3979720f0a2509cbc50662b4eba992ff81af13 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 23 Oct 2015 00:12:00 +0200 Subject: [PATCH 024/313] template rework: rearrange sidebar widgets for contact related pages --- mod/contacts.php | 16 +++++++++------- mod/directory.php | 4 ++-- mod/dirfind.php | 4 ++-- mod/match.php | 2 +- mod/suggest.php | 2 +- view/templates/contacts-widget-sidebar.tpl | 2 +- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/mod/contacts.php b/mod/contacts.php index bdb25b022b..3ace870904 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -27,6 +27,9 @@ function contacts_init(&$a) { require_once('include/group.php'); require_once('include/contact_widgets.php'); + if ($_GET['nets'] == "all") + $_GET['nets'] = ""; + if(! x($a->page,'aside')) $a->page['aside'] = ''; @@ -35,29 +38,28 @@ function contacts_init(&$a) { $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array( '$name' => htmlentities($a->data['contact']['name']), '$photo' => $a->data['contact']['photo'], - '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? $a->get_baseurl()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url'] + '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? $a->get_baseurl()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url'] )); $follow_widget = ''; + $networks_widget = ''; } else { $vcard_widget = ''; + $networks_widget .= networks_widget('contacts',$_GET['nets']); if (isset($_GET['add'])) $follow_widget = follow_widget($_GET['add']); else $follow_widget = follow_widget(); } - if ($_GET['nets'] == "all") - $_GET['nets'] = ""; - - $groups_widget .= group_side('contacts','group',false,0,$contact_id); $findpeople_widget .= findpeople_widget(); - $networks_widget .= networks_widget('contacts',$_GET['nets']); + $groups_widget .= group_side('contacts','group',false,0,$contact_id); + $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array( '$vcard_widget' => $vcard_widget, + '$findpeople_widget' => $findpeople_widget, '$follow_widget' => $follow_widget, '$groups_widget' => $groups_widget, - '$findpeople_widget' => $findpeople_widget, '$networks_widget' => $networks_widget )); diff --git a/mod/directory.php b/mod/directory.php index 8ed4c22007..ef80b082a4 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -6,10 +6,10 @@ function directory_init(&$a) { if(local_user()) { require_once('include/contact_widgets.php'); - $a->page['aside'] .= follow_widget(); - $a->page['aside'] .= findpeople_widget(); + $a->page['aside'] .= follow_widget(); + } else { unset($_SESSION['theme']); diff --git a/mod/dirfind.php b/mod/dirfind.php index 77e86c5db3..bbd3badebf 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -13,9 +13,9 @@ function dirfind_init(&$a) { if(! x($a->page,'aside')) $a->page['aside'] = ''; - $a->page['aside'] .= follow_widget(); - $a->page['aside'] .= findpeople_widget(); + + $a->page['aside'] .= follow_widget(); } diff --git a/mod/match.php b/mod/match.php index f6174da66c..5da1e036c3 100644 --- a/mod/match.php +++ b/mod/match.php @@ -19,8 +19,8 @@ function match_content(&$a) { if(! local_user()) return; - $a->page['aside'] .= follow_widget(); $a->page['aside'] .= findpeople_widget(); + $a->page['aside'] .= follow_widget(); $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; diff --git a/mod/suggest.php b/mod/suggest.php index 5241e485ee..8870c65df8 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -61,8 +61,8 @@ function suggest_content(&$a) { $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; - $a->page['aside'] .= follow_widget(); $a->page['aside'] .= findpeople_widget(); + $a->page['aside'] .= follow_widget(); $r = suggestion_query(local_user()); diff --git a/view/templates/contacts-widget-sidebar.tpl b/view/templates/contacts-widget-sidebar.tpl index 5c52f4329a..5b0610fcbd 100644 --- a/view/templates/contacts-widget-sidebar.tpl +++ b/view/templates/contacts-widget-sidebar.tpl @@ -1,7 +1,7 @@ {{$vcard_widget}} +{{$findpeople_widget}} {{$follow_widget}} {{$groups_widget}} -{{$findpeople_widget}} {{$networks_widget}} From b2bb600f3a878409f925524e1de90d0239b662b0 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 23 Oct 2015 01:04:47 +0200 Subject: [PATCH 025/313] template rework: delete unused css --- view/theme/duepuntozero/style.css | 24 +----------------------- view/theme/frost-mobile/style.css | 26 -------------------------- view/theme/frost/style.css | 26 -------------------------- view/theme/quattro/dark/style.css | 13 ------------- view/theme/quattro/green/style.css | 13 ------------- view/theme/quattro/lilac/style.css | 13 ------------- view/theme/quattro/quattro.less | 9 --------- view/theme/smoothly/style.css | 19 ------------------- view/theme/vier/style.css | 13 ------------- 9 files changed, 1 insertion(+), 155 deletions(-) diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 7220b4c47f..acdcd61c12 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -963,7 +963,7 @@ input#dfrn-url { } .wall-item-content-wrapper.comment { -# margin-left: 50px; +/* margin-left: 50px;*/ background: #EEEEEE; } @@ -1446,24 +1446,6 @@ blockquote.shared_content { .directory-end { clear: both; } -.directory-name { - text-align: center; -} -.directory-photo { - margin-left: 25px; -} -.directory-details { - font-size: 0.7em; - text-align: center; - margin-left: 5px; - margin-right: 5px; -} -.directory-item { - float: left; - width: 225px; - height: 260px; - overflow: auto; -} #directory-search-wrapper { margin-top: 20px; @@ -1474,10 +1456,6 @@ blockquote.shared_content { #directory-search-end { } -.directory-photo-img { - border: none; -} - .pager { padding: 10px; diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index ef030c5f3a..80848e2dc2 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -1779,27 +1779,6 @@ input#profile-jot-email { .directory-end { clear: both; } -.directory-name { - text-align: center; -} -.directory-photo { - margin-left: 15px; -} -.directory-details { - font-size: 0.7em; - text-align: center; - margin-left: 5px; - margin-right: 5px; -} -.directory-item { - float: left; -/* width: 225px; - height: 260px;*/ - padding-left: 15px; - width: 130px; - height: 235px; - overflow: auto; -} #directory-search-wrapper { margin-top: 20px; @@ -1810,11 +1789,6 @@ input#profile-jot-email { #directory-search-end { } -.directory-photo-img { - width: 125px; - border: none; -} - .pager { margin-top: 30px; diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 66121baf34..fe839dee1a 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -1723,27 +1723,6 @@ input#dfrn-url { .directory-end { clear: both; } -.directory-name { - text-align: center; -} -.directory-photo { - margin-left: 25px; -} -.directory-details { - font-size: 0.7em; - text-align: center; - margin-left: 5px; - margin-right: 5px; -} -.directory-item { - float: left; -/* width: 225px; - height: 260px;*/ - padding-left: 25px; - width: 150px; - height: 225px; - overflow: auto; -} #directory-search-wrapper { margin-top: 20px; @@ -1754,11 +1733,6 @@ input#dfrn-url { #directory-search-end { } -.directory-photo-img { - width: 125px; - border: none; -} - /* NOTE: The order of the "pager" items here is very important! * The concern is maintaining a decent-looking pager for people who still use * the numbers, while also having a nice-looking pager for people who use the diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index b0489af808..57df374206 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -1568,19 +1568,6 @@ span[id^="showmore-wrap"] { padding-top: 5px; font-weight: bold; } -.directory-item { - float: left; - width: 200px; - height: 200px; -} -.directory-item .contact-photo { - width: 175px; - height: 175px; -} -.directory-item .contact-photo img { - width: 175px; - height: 175px; -} .contact-name { font-weight: bold; padding-top: 15px; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 0c7050045d..dbc48c1e43 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -1568,19 +1568,6 @@ span[id^="showmore-wrap"] { padding-top: 5px; font-weight: bold; } -.directory-item { - float: left; - width: 200px; - height: 200px; -} -.directory-item .contact-photo { - width: 175px; - height: 175px; -} -.directory-item .contact-photo img { - width: 175px; - height: 175px; -} .contact-name { font-weight: bold; padding-top: 15px; diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index c5f655427a..fcfe7c0ec3 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -1568,19 +1568,6 @@ span[id^="showmore-wrap"] { padding-top: 5px; font-weight: bold; } -.directory-item { - float: left; - width: 200px; - height: 200px; -} -.directory-item .contact-photo { - width: 175px; - height: 175px; -} -.directory-item .contact-photo img { - width: 175px; - height: 175px; -} .contact-name { font-weight: bold; padding-top: 15px; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index cd604b656a..777ee8ccc1 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -899,15 +899,6 @@ span[id^="showmore-wrap"] { font-weight: bold; } } -.directory-item { - float: left; - width: 200px; - height: 200px; - .contact-photo { - width: 175px; height: 175px; - img { width: 175px; height: 175px; } - } -} .contact-name { font-weight: bold; padding-top: 15px; } .contact-details { color: @Grey3; white-space: nowrap; diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 3fe04c0649..ef2be2fff4 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -3656,25 +3656,6 @@ margin-left: 0px; margin-top: 10px; } -/* ============= */ -/* = Directory = */ -/* ============= */ - -.directory-item { - float: left; - margin: 50px 50px 0px 0px; -} - -.directory-details { - font-size: 0.9em; - width: 160px; -} - -.directory-name { - font-size: 1em; - width: 150px; -} - /* ========= */ /* = Admin = */ /* ========= */ diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index d914d944a2..3757d79e2d 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -2687,19 +2687,6 @@ a.mail-list-link { left: 0px; top: 63px; } -.directory-item { - float: left; - width: 200px; - height: 200px; -} -.directory-item .contact-photo { - width: 175px; - height: 175px; -} -.directory-item .contact-photo img { - width: 175px; - height: 175px; -} .contact-name { text-align: center; font-weight: bold; From efb12aed20231670107f475c6926aecf6ad07d1f Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 23 Oct 2015 01:32:03 +0200 Subject: [PATCH 026/313] template rework: little theme specific changes (frost, quattro) --- .../templates/suggest_friends.tpl | 23 ------------------- .../theme/frost/templates/suggest_friends.tpl | 23 ------------------- .../quattro/templates/contact_template.tpl | 5 ++-- 3 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 view/theme/frost-mobile/templates/suggest_friends.tpl delete mode 100644 view/theme/frost/templates/suggest_friends.tpl diff --git a/view/theme/frost-mobile/templates/suggest_friends.tpl b/view/theme/frost-mobile/templates/suggest_friends.tpl deleted file mode 100644 index a386f30d00..0000000000 --- a/view/theme/frost-mobile/templates/suggest_friends.tpl +++ /dev/null @@ -1,23 +0,0 @@ - -{{include file="section_title.tpl"}} - -{{foreach $entries as $entry}} -
    -
    - - {{$entry.name}} - -
    -
    -
    - {{$entry.name}} -
    -
    - {{if $entry.connlnk}} -
    {{$entry.conntxt}}
    - {{/if}} - -
    -{{/foreach}} - -
    diff --git a/view/theme/frost/templates/suggest_friends.tpl b/view/theme/frost/templates/suggest_friends.tpl deleted file mode 100644 index a386f30d00..0000000000 --- a/view/theme/frost/templates/suggest_friends.tpl +++ /dev/null @@ -1,23 +0,0 @@ - -{{include file="section_title.tpl"}} - -{{foreach $entries as $entry}} -
    -
    - - {{$entry.name}} - -
    -
    -
    - {{$entry.name}} -
    -
    - {{if $entry.connlnk}} -
    {{$entry.conntxt}}
    - {{/if}} - -
    -{{/foreach}} - -
    diff --git a/view/theme/quattro/templates/contact_template.tpl b/view/theme/quattro/templates/contact_template.tpl index 634630d9ab..7060505e9f 100644 --- a/view/theme/quattro/templates/contact_template.tpl +++ b/view/theme/quattro/templates/contact_template.tpl @@ -28,8 +28,9 @@
    {{$contact.name}}
    {{if $contact.alt_text}}
    {{$contact.alt_text}}
    {{/if}} -
    {{$contact.itemurl}}
    -
    {{$contact.network}}
    + {{if $contact.itemurl}}
    {{$contact.itemurl}}
    {{/if}} + {{if $contact.network}}
    {{$contact.network}}
    {{/if}} + {{if $contact.details}}
    {{$contact.details}}
    {{/if}} {{if $contact.connlnk}}
    {{$contact.conntxt}}
    From fad8ebc355c74d8ff06768342cdd8ecc609ece93 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 23 Oct 2015 15:18:05 +0200 Subject: [PATCH 027/313] template rework: two row contact page for vier --- view/theme/vier/style.css | 43 ++++++++++++++++--- .../theme/vier/templates/contact_template.tpl | 16 +++++-- 2 files changed, 48 insertions(+), 11 deletions(-) diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 3757d79e2d..d6e47da010 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -351,7 +351,7 @@ code { margin: 0px; padding: 1em; list-style: none; - border: 3px solid #364e59; + /*border: 3px solid #364e59;*/ z-index: 100000; box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); } @@ -2270,12 +2270,40 @@ aside #id_password { float: left; } /* contacts */ -.contact-entry-wrapper { +/*.contact-entry-wrapper { width: 120px; height: 130px; float: left; -/* overflow: hidden; */ + overflow: hidden; margin-left: 5px; +}*/ + +.contact-entry-wrapper { + float: left; + width: 363px; + height: 90px; + padding-right: 10px; + margin: 0 10px 10px 0px; +} +.contact-entry-wrapper .contact-entry-photo-wrapper { + float: left; + margin-right: 10px; +} +.contact-entry-photo-wrapper { + position: relative; +} +.contact-entry-desc { + overflow: hidden; +} +.contact-entry-name { + font-weight: bold; +} +.contact-entry-details { + font-size: 13px; + color: #999999; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } /* photo */ .lframe { @@ -2323,14 +2351,15 @@ aside #id_password { } .contact-photo-menu { width: 11em; - border: 3px solid #364e59; + /*border: 3px solid #364e59;*/ color: #2d2d2d; background: #FFFFFF; -/* position: absolute;*/ - position: relative; - left: 0px; top: 0px; + position: absolute; + /*position: relative;*/ + left: 0px; /*top: 0px;*/ display: none; z-index: 10000; + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); } .contact-photo-menu ul { margin:0px; padding: 0px; list-style: none } .contact-photo-menu li a { diff --git a/view/theme/vier/templates/contact_template.tpl b/view/theme/vier/templates/contact_template.tpl index a065b8fbf4..add2eff5c1 100644 --- a/view/theme/vier/templates/contact_template.tpl +++ b/view/theme/vier/templates/contact_template.tpl @@ -13,12 +13,12 @@ {{if $contact.photo_menu}}
    -
    -
    {{$contact.name}}
    + +
    +
    {{$contact.name}}
    + {{if $contact.alt_text}}
    {{$contact.alt_text}}
    {{/if}} + {{if $contact.itemurl}}
    {{$contact.itemurl}}
    {{/if}} + {{if $contact.network}}
    {{$contact.network}}
    {{/if}} + {{if $contact.details}}
    {{$contact.details}}
    {{/if}} +
    +
    From 7c9df689645f9674d13dd887ad53e838464b40a1 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 23 Oct 2015 15:23:00 +0200 Subject: [PATCH 028/313] template rework: revert #b2bb600 for vier (is needed for right sidebar) --- view/theme/vier/style.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index d6e47da010..d494cf459c 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -2716,6 +2716,19 @@ a.mail-list-link { left: 0px; top: 63px; } +.directory-item { + float: left; + width: 200px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} .contact-name { text-align: center; font-weight: bold; From b6cceda131abe24ec1ba56ef8d6cf6a27a8c310d Mon Sep 17 00:00:00 2001 From: rabuzarus Date: Fri, 23 Oct 2015 15:41:49 +0200 Subject: [PATCH 029/313] template rework: revert commit because plugin community home uses the css classes --- view/theme/duepuntozero/style.css | 24 +++++++++++++++++++++++- view/theme/frost-mobile/style.css | 26 ++++++++++++++++++++++++++ view/theme/frost/style.css | 26 ++++++++++++++++++++++++++ view/theme/quattro/dark/style.css | 13 +++++++++++++ view/theme/quattro/green/style.css | 13 +++++++++++++ view/theme/quattro/lilac/style.css | 13 +++++++++++++ view/theme/quattro/quattro.less | 9 +++++++++ view/theme/smoothly/style.css | 19 +++++++++++++++++++ 8 files changed, 142 insertions(+), 1 deletion(-) diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index acdcd61c12..7220b4c47f 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -963,7 +963,7 @@ input#dfrn-url { } .wall-item-content-wrapper.comment { -/* margin-left: 50px;*/ +# margin-left: 50px; background: #EEEEEE; } @@ -1446,6 +1446,24 @@ blockquote.shared_content { .directory-end { clear: both; } +.directory-name { + text-align: center; +} +.directory-photo { + margin-left: 25px; +} +.directory-details { + font-size: 0.7em; + text-align: center; + margin-left: 5px; + margin-right: 5px; +} +.directory-item { + float: left; + width: 225px; + height: 260px; + overflow: auto; +} #directory-search-wrapper { margin-top: 20px; @@ -1456,6 +1474,10 @@ blockquote.shared_content { #directory-search-end { } +.directory-photo-img { + border: none; +} + .pager { padding: 10px; diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index 80848e2dc2..ef030c5f3a 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -1779,6 +1779,27 @@ input#profile-jot-email { .directory-end { clear: both; } +.directory-name { + text-align: center; +} +.directory-photo { + margin-left: 15px; +} +.directory-details { + font-size: 0.7em; + text-align: center; + margin-left: 5px; + margin-right: 5px; +} +.directory-item { + float: left; +/* width: 225px; + height: 260px;*/ + padding-left: 15px; + width: 130px; + height: 235px; + overflow: auto; +} #directory-search-wrapper { margin-top: 20px; @@ -1789,6 +1810,11 @@ input#profile-jot-email { #directory-search-end { } +.directory-photo-img { + width: 125px; + border: none; +} + .pager { margin-top: 30px; diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index fe839dee1a..66121baf34 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -1723,6 +1723,27 @@ input#dfrn-url { .directory-end { clear: both; } +.directory-name { + text-align: center; +} +.directory-photo { + margin-left: 25px; +} +.directory-details { + font-size: 0.7em; + text-align: center; + margin-left: 5px; + margin-right: 5px; +} +.directory-item { + float: left; +/* width: 225px; + height: 260px;*/ + padding-left: 25px; + width: 150px; + height: 225px; + overflow: auto; +} #directory-search-wrapper { margin-top: 20px; @@ -1733,6 +1754,11 @@ input#dfrn-url { #directory-search-end { } +.directory-photo-img { + width: 125px; + border: none; +} + /* NOTE: The order of the "pager" items here is very important! * The concern is maintaining a decent-looking pager for people who still use * the numbers, while also having a nice-looking pager for people who use the diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 57df374206..b0489af808 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -1568,6 +1568,19 @@ span[id^="showmore-wrap"] { padding-top: 5px; font-weight: bold; } +.directory-item { + float: left; + width: 200px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} .contact-name { font-weight: bold; padding-top: 15px; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index dbc48c1e43..0c7050045d 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -1568,6 +1568,19 @@ span[id^="showmore-wrap"] { padding-top: 5px; font-weight: bold; } +.directory-item { + float: left; + width: 200px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} .contact-name { font-weight: bold; padding-top: 15px; diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index fcfe7c0ec3..c5f655427a 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -1568,6 +1568,19 @@ span[id^="showmore-wrap"] { padding-top: 5px; font-weight: bold; } +.directory-item { + float: left; + width: 200px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} .contact-name { font-weight: bold; padding-top: 15px; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 777ee8ccc1..cd604b656a 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -899,6 +899,15 @@ span[id^="showmore-wrap"] { font-weight: bold; } } +.directory-item { + float: left; + width: 200px; + height: 200px; + .contact-photo { + width: 175px; height: 175px; + img { width: 175px; height: 175px; } + } +} .contact-name { font-weight: bold; padding-top: 15px; } .contact-details { color: @Grey3; white-space: nowrap; diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index ef2be2fff4..3fe04c0649 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -3656,6 +3656,25 @@ margin-left: 0px; margin-top: 10px; } +/* ============= */ +/* = Directory = */ +/* ============= */ + +.directory-item { + float: left; + margin: 50px 50px 0px 0px; +} + +.directory-details { + font-size: 0.9em; + width: 160px; +} + +.directory-name { + font-size: 1em; + width: 150px; +} + /* ========= */ /* = Admin = */ /* ========= */ From eaf5d05030e4c8d09d0fd221b0aa2657c69b0c0d Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 23 Oct 2015 16:48:32 +0200 Subject: [PATCH 030/313] template rework: display more infos for match and dirfind --- mod/dirfind.php | 8 ++++++-- mod/match.php | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mod/dirfind.php b/mod/dirfind.php index bbd3badebf..492f39d5a6 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -2,6 +2,7 @@ require_once('include/contact_widgets.php'); require_once('include/socgraph.php'); require_once('include/Contact.php'); +require_once('include/contact_selectors.php'); function dirfind_init(&$a) { @@ -57,7 +58,7 @@ function dirfind_content(&$a, $prefix = "") { dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search))); - $results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`keywords` + $results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`network` , `gcontact`.`keywords` FROM `gcontact` LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl` AND `contact`.`uid` = %d AND NOT `contact`.`blocked` @@ -76,7 +77,7 @@ function dirfind_content(&$a, $prefix = "") { $j = new stdClass(); $j->total = $count[0]["total"]; $j->items_page = $perpage; - $j->page = $a->pager['page']; + $j->page = $a->pager['page']; foreach ($results AS $result) { if (poco_alternate_ostatus_url($result["url"])) continue; @@ -92,6 +93,7 @@ function dirfind_content(&$a, $prefix = "") { $objresult->url = $result["url"]; $objresult->photo = $result["photo"]; $objresult->tags = $result["keywords"]; + $objresult->network = $result["network"]; $j->results[] = $objresult; } @@ -140,12 +142,14 @@ function dirfind_content(&$a, $prefix = "") { $entry = array( 'url' => zrl($jj->url), + 'itemurl' => $jj->url, 'name' => htmlentities($jj->name), 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), 'img_hover' => $jj->tags, 'conntxt' => $conntxt, 'connlnk' => $connlnk, 'photo_menu' => $photo_menu, + 'network' => network_to_name($jj->network, $jj->url), 'id' => ++$id, ); $entries[] = $entry; diff --git a/mod/match.php b/mod/match.php index 5da1e036c3..ed7c21e4eb 100644 --- a/mod/match.php +++ b/mod/match.php @@ -72,6 +72,7 @@ function match_content(&$a) { $entry = array( 'url' => zrl($jj->url), + 'itemurl' => $jj->url, 'name' => $jj->name, 'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB), 'inttxt' => ' ' . t('is interested in:'), From 86f94570efb1577bbeaa591f8b7648114c78c1b5 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 23 Oct 2015 16:49:12 +0200 Subject: [PATCH 031/313] template rework: delete unused templates --- view/templates/match.tpl | 40 ------------------------------ view/templates/suggest_friends.tpl | 23 ----------------- 2 files changed, 63 deletions(-) delete mode 100644 view/templates/match.tpl delete mode 100644 view/templates/suggest_friends.tpl diff --git a/view/templates/match.tpl b/view/templates/match.tpl deleted file mode 100644 index d269a253bc..0000000000 --- a/view/templates/match.tpl +++ /dev/null @@ -1,40 +0,0 @@ -{{include file="section_title.tpl"}} - -{{foreach $entries as $entry}} -
    -
    - - {{$entry.name}} - - {{if $entry.photo_menu}} - menu -
    -
      - {{foreach $entry.photo_menu as $k=>$c}} - {{if $c.2}} -
    • {{$c.0}}
      • - {{else}} -
    • {{$c.0}}
      • - {{/if}} - {{/foreach}} -
    -
    - {{/if}} -
    -
    -
    - {{$entry.name}} -
    -
    - {{if $entry.connlnk}} -
    {{$entry.conntxt}}
    - {{/if}} - -
    -{{/foreach}} - -
    - -{{$paginate}} diff --git a/view/templates/suggest_friends.tpl b/view/templates/suggest_friends.tpl deleted file mode 100644 index e7c9c1ac00..0000000000 --- a/view/templates/suggest_friends.tpl +++ /dev/null @@ -1,23 +0,0 @@ - -{{include file="section_title.tpl"}} - -{{foreach $entries as $entry}} -
    - -
    - - {{$entry.name}} - -
    -
    -
    - {{$entry.name}} -
    -
    - {{if $entry.connlnk}} -
    {{$entry.conntxt}}
    - {{/if}} -
    -{{/foreach}} - -
    From 442d59abc4c7c54abfee6b0d1d6583634b04ccf1 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 23 Oct 2015 21:45:16 +0200 Subject: [PATCH 032/313] template rework: multi-row view for the other themes --- view/templates/contact_template.tpl | 12 ++++--- view/theme/duepuntozero/style.css | 21 +++++++---- view/theme/frost-mobile/style.css | 18 +++++++--- .../templates/contact_template.tpl | 12 ++++--- .../templates/contacts-template.tpl | 3 +- .../templates/viewcontact_template.tpl | 12 ------- view/theme/frost/style.css | 20 +++++++---- .../frost/templates/contact_template.tpl | 12 ++++--- view/theme/smoothly/style.css | 35 +++++++++++++++---- 9 files changed, 96 insertions(+), 49 deletions(-) delete mode 100644 view/theme/frost-mobile/templates/viewcontact_template.tpl diff --git a/view/templates/contact_template.tpl b/view/templates/contact_template.tpl index 39502c91af..75f49653b0 100644 --- a/view/templates/contact_template.tpl +++ b/view/templates/contact_template.tpl @@ -1,5 +1,3 @@ -{{* todo: better layout and implement $contact.details and other variables *}} -
    @@ -30,8 +28,14 @@
    -
    -
    {{$contact.name}}
    + +
    +
    {{$contact.name}}
    + {{if $contact.alt_text}}
    {{$contact.alt_text}}
    {{/if}} + {{if $contact.itemurl}}
    {{$contact.itemurl}}
    {{/if}} + {{if $contact.network}}
    {{$contact.network}}
    {{/if}} + {{if $contact.details}}
    {{$contact.details}}
    {{/if}} +
    diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 7220b4c47f..4db523c5ba 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -876,8 +876,14 @@ input#dfrn-url { .contact-entry-wrapper { float: left; - width: 120px; - height: 120px; + min-width: 363px; + height: 90px; + padding-right: 10px; + margin: 0 10px 10px 0px; +} +.contact-entry-wrapper .contact-entry-photo-wrapper { + float: left; + margin-right: 10px; } #contacts-search-end { margin-bottom: 10px; @@ -899,11 +905,14 @@ input#dfrn-url { clear: both; } .contact-entry-name { - float: left; - margin-left: 0px; - margin-right: 10px; - width: 120px; + font-weight: bold; +} +.contact-entry-details { + font-size: 13px; + color: #999999; + white-space: nowrap; overflow: hidden; + text-overflow: ellipsis; } .contact-entry-edit-links { margin-top: 6px; diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index ef030c5f3a..46fe48caf3 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -1110,8 +1110,13 @@ input#dfrn-url { height: 120px;*/ padding-left: 15px; padding-right: 15px; - width: 95px; - height: 200px; + max-width: 262px; + height: 90px; + margin: 0 10px 10px 0px; +} +.contact-entry-wrapper .contact-entry-photo-wrapper { + float: left; + margin-right: 10px; } #contacts-search-end { margin-bottom: 10px; @@ -1130,8 +1135,10 @@ input#dfrn-url { .contact-entry-photo-end { clear: both; } +.contact-entry-desc { + overflow: hidden; +} .contact-entry-name { - float: left; margin-left: 0px; margin-right: 10px; padding-bottom: 5px; @@ -1143,6 +1150,9 @@ input#dfrn-url { font-style: italic; font-size: 10px; font-weight: 500; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .contact-entry-network { font-size: 10px; @@ -2137,7 +2147,7 @@ input#profile-jot-email { border: 1px solid #AAA; background: #FFFFFF; position: absolute; - left: -30px; top: 80px; + /*left: -30px;*/ top: 80px; display: none; z-index: 101; -moz-box-shadow: 3px 3px 5px #555; diff --git a/view/theme/frost-mobile/templates/contact_template.tpl b/view/theme/frost-mobile/templates/contact_template.tpl index 42f4b7372a..198b24746f 100644 --- a/view/theme/frost-mobile/templates/contact_template.tpl +++ b/view/theme/frost-mobile/templates/contact_template.tpl @@ -28,10 +28,14 @@
    -
    -
    {{$contact.name}}

    - {{if $contact.alt_text}}
    {{$contact.alt_text}}
    {{/if}} -
    {{$contact.network}}
    + +
    +
    {{$contact.name}}
    + {{if $contact.alt_text}}
    {{$contact.alt_text}}
    {{/if}} + {{if $contact.itemurl}}
    {{$contact.itemurl}}
    {{/if}} + {{if $contact.network}}
    {{$contact.network}}
    {{/if}} + {{if $contact.details}}
    {{$contact.details}}
    {{/if}} +
diff --git a/view/theme/frost-mobile/templates/contacts-template.tpl b/view/theme/frost-mobile/templates/contacts-template.tpl index 94e9afbe56..f776222f32 100644 --- a/view/theme/frost-mobile/templates/contacts-template.tpl +++ b/view/theme/frost-mobile/templates/contacts-template.tpl @@ -15,11 +15,10 @@ {{$tabs}} -
+ {{foreach $contacts as $contact}} {{include file="contact_template.tpl"}} {{/foreach}} -
{{$paginate}} diff --git a/view/theme/frost-mobile/templates/viewcontact_template.tpl b/view/theme/frost-mobile/templates/viewcontact_template.tpl deleted file mode 100644 index 3b68410f95..0000000000 --- a/view/theme/frost-mobile/templates/viewcontact_template.tpl +++ /dev/null @@ -1,12 +0,0 @@ - -{{include file="section_title.tpl"}} - -
-{{foreach $contacts as $contact}} - {{include file="contact_template.tpl"}} -{{/foreach}} -
- -
- -{{$paginate}} diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 66121baf34..b35c414053 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -1074,12 +1074,14 @@ input#dfrn-url { .contact-entry-wrapper { float: left; -/* width: 120px; - height: 120px;*/ - padding-left: 8px; - padding-right: 8px; - width: 95px; - height: 170px; + width: 262px; + height: 90px; + padding-right: 10px; + margin: 0 10px 10px 0px; +} +.contact-entry-wrapper .contact-entry-photo-wrapper { + float: left; + margin-right: 10px; } #contacts-search-end { margin-bottom: 10px; @@ -1100,6 +1102,9 @@ input#dfrn-url { .contact-entry-photo-end { clear: both; } +.contact-entry-desc { + overflow: hidden; +} .contact-entry-name { /*float: left;*/ margin-left: 0px; @@ -1113,6 +1118,9 @@ input#dfrn-url { font-style: italic; font-size: 10px; font-weight: 500; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .contact-entry-network { font-size: 10px; diff --git a/view/theme/frost/templates/contact_template.tpl b/view/theme/frost/templates/contact_template.tpl index 1ed1471a6e..777ed50179 100644 --- a/view/theme/frost/templates/contact_template.tpl +++ b/view/theme/frost/templates/contact_template.tpl @@ -25,10 +25,14 @@
-
-
{{$contact.name}}
- {{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}} -
{{$contact.network}}
+ +
+
{{$contact.name}}
+ {{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}} + {{if $contact.itemurl}}
{{$contact.itemurl}}
{{/if}} + {{if $contact.network}}
{{$contact.network}}
{{/if}} + {{if $contact.details}}
{{$contact.details}}
{{/if}} +
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 3fe04c0649..ae670cf3ad 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -115,6 +115,10 @@ input[type=submit]:active { #search-save { } +#directory-search-end { + clear: both; +} + .dirsearch-desc { } @@ -2753,11 +2757,10 @@ margin-left: 0px; .view-contact-wrapper, .contact-entry-wrapper { float: left; - margin-right: 30px; - margin-bottom: 20px; - width: 88px; + padding-right: 10px; + width: 345px; height: 120px; - position: relative; + margin: 0 10px 10px 0px; } #view-contact-end { @@ -2768,6 +2771,10 @@ margin-left: 0px; margin-top: 15px; } +.contact-entry-wrapper .contact-entry-photo-wrapper { + float: left; + margin-right: 10px; +} .contact-entry-direction-wrapper { position: absolute; top: 20px; @@ -2784,17 +2791,27 @@ margin-left: 0px; font-weight: bold; } +.contact-entry-desc { + overflow: hidden; +} + .contact-entry-name, .contact-entry-connect { - width: 100px; overflow: hidden; font: #999; font-size: 12px; - text-align: center; font-weight: bold; margin-top: 5px; } -.contact-entry-photo { +.contact-entry-details { + font-size: 13px; + color: #999999; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.contact-entry-photo-wrapper { position: relative; /*border: 1px solid #7C7D7B; border-radius: 3px; @@ -2805,6 +2822,10 @@ margin-left: 0px; -webkit-box-shadow: 0 0 8px #BDBDBD;*/ } +.contact-entry-photo { + width: 80px; +} + .contact-entry-photo a img { width: 80px; height: 80px; From 87ecd8f6585d1d02ecb851c4acbfe6a09c8dd003 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 24 Oct 2015 15:04:27 +0200 Subject: [PATCH 033/313] tabs have now an ID --- mod/contacts.php | 11 ++++++++ mod/network.php | 71 +++++++++++++++++++++++++++--------------------- 2 files changed, 51 insertions(+), 31 deletions(-) diff --git a/mod/contacts.php b/mod/contacts.php index c562c9822d..0ecc5a76db 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -550,6 +550,7 @@ function contacts_content(&$a) { 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block', 'sel' => '', 'title' => t('Toggle Blocked status'), + 'id' => 'toggle-block-tab', 'accesskey' => 'b', ), array( @@ -557,6 +558,7 @@ function contacts_content(&$a) { 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore', 'sel' => '', 'title' => t('Toggle Ignored status'), + 'id' => 'toggle-ignore-tab', 'accesskey' => 'i', ), @@ -565,6 +567,7 @@ function contacts_content(&$a) { 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive', 'sel' => '', 'title' => t('Toggle Archive status'), + 'id' => 'toggle-archive-tab', 'accesskey' => 'v', ), array( @@ -572,6 +575,7 @@ function contacts_content(&$a) { 'url' => $a->get_baseurl(true) . '/crepair/' . $contact_id, 'sel' => '', 'title' => t('Advanced Contact Settings'), + 'id' => 'repair-tab', 'accesskey' => 'r', ) ); @@ -693,6 +697,7 @@ function contacts_content(&$a) { 'url' => $a->get_baseurl(true) . '/suggest', 'sel' => '', 'title' => t('Suggest potential friends'), + 'id' => 'suggestions-tab', 'accesskey' => 'g', ), array( @@ -700,6 +705,7 @@ function contacts_content(&$a) { 'url' => $a->get_baseurl(true) . '/contacts/all', 'sel' => ($all) ? 'active' : '', 'title' => t('Show all contacts'), + 'id' => 'showall-tab', 'accesskey' => 'l', ), array( @@ -707,6 +713,7 @@ function contacts_content(&$a) { 'url' => $a->get_baseurl(true) . '/contacts', 'sel' => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored) && (! $archived)) ? 'active' : '', 'title' => t('Only show unblocked contacts'), + 'id' => 'showunblocked-tab', 'accesskey' => 'o', ), @@ -715,6 +722,7 @@ function contacts_content(&$a) { 'url' => $a->get_baseurl(true) . '/contacts/blocked', 'sel' => ($blocked) ? 'active' : '', 'title' => t('Only show blocked contacts'), + 'id' => 'showblocked-tab', 'accesskey' => 'b', ), @@ -723,6 +731,7 @@ function contacts_content(&$a) { 'url' => $a->get_baseurl(true) . '/contacts/ignored', 'sel' => ($ignored) ? 'active' : '', 'title' => t('Only show ignored contacts'), + 'id' => 'showignored-tab', 'accesskey' => 'i', ), @@ -731,6 +740,7 @@ function contacts_content(&$a) { 'url' => $a->get_baseurl(true) . '/contacts/archived', 'sel' => ($archived) ? 'active' : '', 'title' => t('Only show archived contacts'), + 'id' => 'showarchived-tab', 'accesskey' => 'y', ), @@ -739,6 +749,7 @@ function contacts_content(&$a) { 'url' => $a->get_baseurl(true) . '/contacts/hidden', 'sel' => ($hidden) ? 'active' : '', 'title' => t('Only show hidden contacts'), + 'id' => 'showhidden-tab', 'accesskey' => 'h', ), diff --git a/mod/network.php b/mod/network.php index dfd7c01300..639d868fa2 100644 --- a/mod/network.php +++ b/mod/network.php @@ -119,19 +119,19 @@ function network_init(&$a) { $search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : ''); if(x($_GET,'save')) { - $r = q("select * from `search` where `uid` = %d and `term` = '%s' limit 1", + $r = q("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1", intval(local_user()), dbesc($search) ); if(! count($r)) { - q("insert into `search` ( `uid`,`term` ) values ( %d, '%s') ", + q("INSERT INTO `search` ( `uid`,`term` ) VALUES ( %d, '%s') ", intval(local_user()), dbesc($search) ); } } if(x($_GET,'remove')) { - q("delete from `search` where `uid` = %d and `term` = '%s'", + q("DELETE FROM `search` WHERE `uid` = %d AND `term` = '%s'", intval(local_user()), dbesc($search) ); @@ -172,7 +172,7 @@ function saved_searches($search) { $o = ''; - $r = q("select `id`,`term` from `search` WHERE `uid` = %d", + $r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d", intval(local_user()) ); @@ -355,57 +355,63 @@ function network_content(&$a, $update = 0) { // tabs $tabs = array( array( - 'label' => t('Commented Order'), - 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), - 'sel'=>$all_active, - 'title'=> t('Sort by Comment Date'), + 'label' => t('Commented Order'), + 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), + 'sel' => $all_active, + 'title' => t('Sort by Comment Date'), + 'id' => 'commented-order-tab', 'accesskey' => "e", ), array( - 'label' => t('Posted Order'), - 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), - 'sel'=>$postord_active, - 'title' => t('Sort by Post Date'), + 'label' => t('Posted Order'), + 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), + 'sel' => $postord_active, + 'title' => t('Sort by Post Date'), + 'id' => 'posted-order-tab', 'accesskey' => "t", ), ); if(feature_enabled(local_user(),'personal_tab')) { $tabs[] = array( - 'label' => t('Personal'), - 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1', - 'sel' => $conv_active, - 'title' => t('Posts that mention or involve you'), + 'label' => t('Personal'), + 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1', + 'sel' => $conv_active, + 'title' => t('Posts that mention or involve you'), + 'id' => 'personal-tab', 'accesskey' => "r", ); } if(feature_enabled(local_user(),'new_tab')) { $tabs[] = array( - 'label' => t('New'), - 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ($len_naked_cmd ? '/' : '') . 'new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''), - 'sel' => $new_active, - 'title' => t('Activity Stream - by date'), + 'label' => t('New'), + 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ($len_naked_cmd ? '/' : '') . 'new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''), + 'sel' => $new_active, + 'title' => t('Activity Stream - by date'), + 'id' => 'activitiy-by-date-tab', 'accesskey' => "w", ); } if(feature_enabled(local_user(),'link_tab')) { $tabs[] = array( - 'label' => t('Shared Links'), - 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1', - 'sel'=>$bookmarked_active, - 'title'=> t('Interesting Links'), + 'label' => t('Shared Links'), + 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1', + 'sel' => $bookmarked_active, + 'title' => t('Interesting Links'), + 'id' => 'shared-links-tab', 'accesskey' => "b", ); } if(feature_enabled(local_user(),'star_posts')) { $tabs[] = array( - 'label' => t('Starred'), - 'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1', - 'sel'=>$starred_active, - 'title' => t('Favourite Posts'), + 'label' => t('Starred'), + 'url' => $a->get_baseurl(true) . '/' . str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1', + 'sel' => $starred_active, + 'title' => t('Favourite Posts'), + 'id' => 'starred-posts-tab', 'accesskey' => "m", ); } @@ -446,7 +452,7 @@ function network_content(&$a, $update = 0) { $def_acl = array('allow_cid' => '<' . intval($cid) . '>'); if($nets) { - $r = q("select id from contact where uid = %d and network = '%s' and self = 0", + $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND network = '%s' AND `self` = 0", intval(local_user()), dbesc($nets) ); @@ -475,7 +481,10 @@ function network_content(&$a, $update = 0) { $content = ""; if ($cid) { - $contact = q("SELECT `nick` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `forum`", intval($cid), intval(local_user())); + $contact = q("SELECT `nick` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `forum`", + intval($cid), + intval(local_user()) + ); if ($contact) $content = "@".$contact[0]["nick"]."+".$cid; } @@ -569,7 +578,7 @@ function network_content(&$a, $update = 0) { ); if(count($r)) { $sql_post_table = " INNER JOIN (SELECT DISTINCT(`parent`) FROM `item` - WHERE 1 $sql_options AND `contact-id` = ".intval($cid)." and deleted = 0 + WHERE 1 $sql_options AND `contact-id` = ".intval($cid)." AND `deleted` = 0 ORDER BY `item`.`received` DESC) AS `temp1` ON $sql_table.$sql_parent = `temp1`.`parent` "; $sql_extra = ""; From ea2b3b2f762a323ca5a7a820857c4bea51d22637 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 24 Oct 2015 15:57:46 +0200 Subject: [PATCH 034/313] move html from crepair.php to template --- mod/crepair.php | 26 +++++++++++++++----------- view/templates/crepair.tpl | 11 +++++++++++ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/mod/crepair.php b/mod/crepair.php index 686be3948f..4f00190990 100644 --- a/mod/crepair.php +++ b/mod/crepair.php @@ -137,16 +137,10 @@ function crepair_content(&$a) { $contact = $r[0]; - $msg1 = t('Repair Contact Settings'); + $warning = t('WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working.'); + $info = t('Please use your browser \'Back\' button now if you are uncertain what to do on this page.'); - $msg2 = t('WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working.'); - $msg3 = t('Please use your browser \'Back\' button now if you are uncertain what to do on this page.'); - - $o .= '

' . $msg1 . '

'; - - $o .= '
' . $msg2 . EOL . EOL. $msg3 . '
'; - - $o .= EOL . '' . t('Return to contact editor') . '' . EOL; + $returnaddr = "contacts/$cid"; $allow_remote_self = get_config('system','allow_users_remote_self'); @@ -165,6 +159,11 @@ function crepair_content(&$a) { $tpl = get_markup_template('crepair.tpl'); $o .= replace_macros($tpl, array( + '$title' => t('Repair Contact Settings'), + '$warning' => $warning, + '$info' => $info, + '$returnaddr' => $returnaddr, + '$return' => t('Return to contact editor'), '$update_profile' => update_profile, '$udprofilenow' => t('Refetch contact data'), '$label_name' => t('Name'), @@ -178,7 +177,12 @@ function crepair_content(&$a) { '$label_photo' => t('New photo from this URL'), '$label_remote_self' => t('Remote Self'), '$allow_remote_self' => $allow_remote_self, - '$remote_self' => array('remote_self', t('Mirror postings from this contact'), $contact['remote_self'], t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'), $remote_self_options), + '$remote_self' => array('remote_self', + t('Mirror postings from this contact'), + $contact['remote_self'], + t('Mark this contact as remote_self, this will cause friendica to repost new entries from this contact.'), + $remote_self_options + ), '$contact_name' => htmlentities($contact['name']), '$contact_nick' => htmlentities($contact['nick']), '$contact_id' => $contact['id'], @@ -189,7 +193,7 @@ function crepair_content(&$a) { '$poll' => $contact['poll'], '$contact_attag' => $contact['attag'], '$lbl_submit' => t('Submit') - )); + )); return $o; diff --git a/view/templates/crepair.tpl b/view/templates/crepair.tpl index 5b3a6281eb..91c85303ce 100644 --- a/view/templates/crepair.tpl +++ b/view/templates/crepair.tpl @@ -1,3 +1,14 @@ + +{{include file="section_title.tpl"}} + +
+ {{$warning}} + {{$info}}
+
+ {{$return}} +
+
+

{{$contact_name}}

From eb33698556350fde10a4a2f9bba7c52971f6212d Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 24 Oct 2015 16:01:55 +0200 Subject: [PATCH 035/313] some minor changes in crepair.tpl --- view/templates/crepair.tpl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/view/templates/crepair.tpl b/view/templates/crepair.tpl index 91c85303ce..d500f04720 100644 --- a/view/templates/crepair.tpl +++ b/view/templates/crepair.tpl @@ -1,10 +1,9 @@ {{include file="section_title.tpl"}} -
- {{$warning}} - {{$info}}
-
+
{{$warning}}

+
+ {{$info}}
{{$return}}

From 8f92b6eea478db950610df2978e3d4fd47025e6b Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 24 Oct 2015 19:51:58 +0200 Subject: [PATCH 036/313] some work on poke template --- mod/poke.php | 49 +++++++++++++-------------- view/templates/poke_content.tpl | 54 ++++++++++++++++-------------- view/templates/poke_head.tpl | 18 ++++++++++ view/theme/duepuntozero/style.css | 15 +++++++++ view/theme/frost-mobile/style.css | 16 +++++++++ view/theme/frost/style.css | 16 +++++++++ view/theme/quattro/dark/style.css | 14 ++++++++ view/theme/quattro/green/style.css | 14 ++++++++ view/theme/quattro/lilac/style.css | 14 ++++++++ view/theme/quattro/quattro.less | 12 +++++++ view/theme/smoothly/style.css | 19 +++++++++++ view/theme/vier/style.css | 16 +++++++++ 12 files changed, 206 insertions(+), 51 deletions(-) create mode 100644 view/templates/poke_head.tpl diff --git a/mod/poke.php b/mod/poke.php index db1c949636..45a577cda6 100644 --- a/mod/poke.php +++ b/mod/poke.php @@ -1,4 +1,18 @@ -get_baseurl(); - $a->page['htmlhead'] .= ''; - $a->page['htmlhead'] .= <<< EOT + $head_tpl = get_markup_template('poke_head.tpl'); + $a->page['htmlhead'] .= replace_macros($head_tpl,array( + '$baseurl' => $a->get_baseurl(true), + '$base' => $base + )); - -EOT; $parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0'); - $verbs = get_poke_verbs(); $shortlist = array(); diff --git a/view/templates/poke_content.tpl b/view/templates/poke_content.tpl index 857dfb2003..18191de03f 100644 --- a/view/templates/poke_content.tpl +++ b/view/templates/poke_content.tpl @@ -3,31 +3,33 @@
{{$desc}}
- -
-
-
{{$clabel}}
-
- - - -
-
-
{{$choice}}
-
-
- -
-
-
{{$prv_desc}}
- -
-
- - +
+
+ +
+
{{$clabel}}
+ + + +
+ +
+
{{$choice}}
+ +
+ +
+
{{$prv_desc}}
+ +
+ + + +
+
diff --git a/view/templates/poke_head.tpl b/view/templates/poke_head.tpl new file mode 100644 index 0000000000..6e30eb7fee --- /dev/null +++ b/view/templates/poke_head.tpl @@ -0,0 +1,18 @@ + + + \ No newline at end of file diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index ae2530b6a2..087104123a 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2022,6 +2022,21 @@ a.mail-list-link { .message-links-end { clear: both; } +#poke-desc { + margin: 5px 0 10px; +} + +#poke-wrapper { + padding: 10px 0 20px; +} + +#poke-recipient, #poke-action, #poke-privacy-settings { + margin: 10px 0 30px; +} + +#poke-recip-label, #poke-action-label, #prvmail-message-label { + margin: 10px 0 10px; +} #sidebar-group-list ul { list-style-type: none; diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index f4b46fed84..22460b0590 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -2500,6 +2500,22 @@ a.mail-list-link { clear: both; } +#poke-desc { + margin: 5px 0 10px; +} + +#poke-wrapper { + padding: 10px 0 0px; +} + +#poke-recipient, #poke-action, #poke-privacy-settings { + margin: 10px 0 30px; +} + +#poke-recip-label, #poke-action-label, #prvmail-message-label { + margin: 10px 0 10px; +} + #sidebar-group-list ul { list-style-type: none; } diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 8b87c3bd42..396f32cf97 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -2315,6 +2315,22 @@ a.mail-list-link { clear: both; } +#poke-desc { + margin: 5px 0 10px; +} + +#poke-wrapper { + padding: 10px 0 20px; +} + +#poke-recipient, #poke-action, #poke-privacy-settings { + margin: 10px 0 30px; +} + +#poke-recip-label, #poke-action-label, #prvmail-message-label { + margin: 10px 0 10px; +} + #sidebar-group-list ul { list-style-type: none; } diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 1eda67de13..aaeb74e752 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -2267,6 +2267,20 @@ ul.tabs li .active { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } +/* poke */ +#poke-desc { + margin: 5px 0 25px; +} +#poke-recipient, +#poke-action, +#poke-privacy-settings { + margin: 10px 0 30px; +} +#poke-recip-label, +#poke-action-label, +#prvmail-message-label { + margin: 10px 0 10px; +} /* theme screenshot */ .screenshot, #theme-preview { diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 71569971e5..ef408b4cd2 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -2267,6 +2267,20 @@ ul.tabs li .active { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } +/* poke */ +#poke-desc { + margin: 5px 0 25px; +} +#poke-recipient, +#poke-action, +#poke-privacy-settings { + margin: 10px 0 30px; +} +#poke-recip-label, +#poke-action-label, +#prvmail-message-label { + margin: 10px 0 10px; +} /* theme screenshot */ .screenshot, #theme-preview { diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index 55b81e5daf..e31a427468 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -2267,6 +2267,20 @@ ul.tabs li .active { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } +/* poke */ +#poke-desc { + margin: 5px 0 25px; +} +#poke-recipient, +#poke-action, +#poke-privacy-settings { + margin: 10px 0 30px; +} +#poke-recip-label, +#poke-action-label, +#prvmail-message-label { + margin: 10px 0 10px; +} /* theme screenshot */ .screenshot, #theme-preview { diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 3c9915576f..19847ad2de 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -1525,6 +1525,18 @@ ul.tabs { &:hover .mail-delete { .opaque(1); } } +/* poke */ +#poke-desc { + margin: 5px 0 25px; +} + +#poke-recipient, #poke-action, #poke-privacy-settings { + margin: 10px 0 30px; +} + +#poke-recip-label, #poke-action-label, #prvmail-message-label { + margin: 10px 0 10px; +} /* theme screenshot */ .screenshot, #theme-preview { diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 46d8902aeb..da180ae61e 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -2693,6 +2693,25 @@ margin-left: 0px; border: 1px solid #7C7D7B; } +/* ========== */ +/* = Poke = */ +/* ========== */ +#poke-desc { + margin: 5px 0 20px; +} +#poke-wrapper { + margin: 40px 0 20px; +} +#poke-recipient, #poke-action, #poke-privacy-settings { + margin: 10px 0 30px; +} +#poke-recip-label, #poke-action-label, #prvmail-message-label { + margin: 10px 0 20px; +} +#poke-recip { + float: none; +} + /* ================= */ /* = Notifications = */ /* ================= */ diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 1c03edc6bf..a6a27832f5 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -2496,6 +2496,22 @@ a.mail-list-link { border: none; } +/* ========== */ +/* = Poke = */ +/* ========== */ +#poke-desc { + margin: 10px 0 20px; +} +#poke-wrapper { + margin: 40px 0 20px; +} +#poke-recipient, #poke-action, #poke-privacy-settings { + margin: 10px 0 30px; +} +#poke-recip-label, #poke-action-label, #prvmail-message-label { + margin: 10px 0 20px; +} + /* ========== */ /* = Events = */ /* ========== */ From ddc8f069f2f4a6571b162061497e91e0497103b3 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 24 Oct 2015 20:41:21 +0200 Subject: [PATCH 037/313] Workaround for bad configured servers --- include/socgraph.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/socgraph.php b/include/socgraph.php index b0f0c8672f..225acda4a2 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -748,8 +748,11 @@ function poco_check_server($server_url, $network = "", $force = false) { } if (!$serverret["success"] OR ($serverret["body"] == "") OR (sizeof($xmlobj) == 0) OR !is_object($xmlobj)) { - $last_failure = datetime_convert(); - $failure = true; + // Workaround for bad configured servers (known nginx problem) + if ($serverret["debug"]["http_code"] != "403") { + $last_failure = datetime_convert(); + $failure = true; + } } elseif ($network == NETWORK_DIASPORA) $last_contact = datetime_convert(); From ecf65e52eec44a2e06ed1fa40248cb1b7889cc32 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 24 Oct 2015 20:42:47 +0200 Subject: [PATCH 038/313] OStatus: send the coordinates in an additional field --- include/items.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/items.php b/include/items.php index 7d1ab1cb36..ebda49e9ad 100644 --- a/include/items.php +++ b/include/items.php @@ -4392,7 +4392,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') { } -function atom_author($tag,$name,$uri,$h,$w,$photo) { +function atom_author($tag,$name,$uri,$h,$w,$photo,$geo) { $o = ''; if(! $tag) return $o; @@ -4410,6 +4410,10 @@ function atom_author($tag,$name,$uri,$h,$w,$photo) { $o .= "\t".'' . "\r\n"; if ($tag == "author") { + + if($geo) + $o .= ''.xmlify($geo).''."\r\n"; + $r = q("SELECT `profile`.`locality`, `profile`.`region`, `profile`.`country-name`, `profile`.`name`, `profile`.`pub_keywords`, `profile`.`about`, `profile`.`homepage`,`contact`.`nick` FROM `profile` @@ -4473,11 +4477,11 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) { $o = "\r\n\r\n\r\n"; if(is_array($author)) - $o .= atom_author('author',$author['name'],$author['url'],80,80,$author['thumb']); + $o .= atom_author('author',$author['name'],$author['url'],80,80,$author['thumb'], $item['coord']); else - $o .= atom_author('author',(($item['author-name']) ? $item['author-name'] : $item['name']),(($item['author-link']) ? $item['author-link'] : $item['url']),80,80,(($item['author-avatar']) ? $item['author-avatar'] : $item['thumb'])); + $o .= atom_author('author',(($item['author-name']) ? $item['author-name'] : $item['name']),(($item['author-link']) ? $item['author-link'] : $item['url']),80,80,(($item['author-avatar']) ? $item['author-avatar'] : $item['thumb']), $item['coord']); if(strlen($item['owner-name'])) - $o .= atom_author('dfrn:owner',$item['owner-name'],$item['owner-link'],80,80,$item['owner-avatar']); + $o .= atom_author('dfrn:owner',$item['owner-name'],$item['owner-link'],80,80,$item['owner-avatar'], $item['coord']); if(($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) { $parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"])); From a11833e2486382be9c996bdbd4e5081d8f54a0f3 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 24 Oct 2015 20:44:18 +0200 Subject: [PATCH 039/313] Statusnet is now GNU Social --- include/contact_selectors.php | 2 +- mod/uimport.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/contact_selectors.php b/include/contact_selectors.php index f0ac87a09f..f104866232 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -88,7 +88,7 @@ function network_to_name($s, $profile = "") { NETWORK_PUMPIO => t('pump.io'), NETWORK_TWITTER => t('Twitter'), NETWORK_DIASPORA2 => t('Diaspora Connector'), - NETWORK_STATUSNET => t('Statusnet'), + NETWORK_STATUSNET => t('GNU Social'), NETWORK_APPNET => t('App.net') ); diff --git a/mod/uimport.php b/mod/uimport.php index f61eab0a1b..ffa4f3ed72 100644 --- a/mod/uimport.php +++ b/mod/uimport.php @@ -57,8 +57,8 @@ function uimport_content(&$a) { unset($_SESSION['theme']); if(x($_SESSION,'mobile-theme')) unset($_SESSION['mobile-theme']); - - + + $tpl = get_markup_template("uimport.tpl"); return replace_macros($tpl, array( '$regbutt' => t('Import'), @@ -66,8 +66,8 @@ function uimport_content(&$a) { 'title' => t("Move account"), 'intro' => t("You can import an account from another Friendica server."), 'instruct' => t("You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."), - 'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"), + 'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"), 'field' => array('accountfile', t('Account file'),'', t('To export your account, go to "Settings->Export your personal data" and select "Export account"')), - ), + ), )); } From 4631c13d083b49753acc8a8eae18503ea554afe3 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 25 Oct 2015 09:15:36 +0100 Subject: [PATCH 040/313] Profile data are now reduced to only the most important fields --- mod/profiles.php | 45 ++++--- view/templates/profile_edit.tpl | 124 +++++++++++++++++++ view/theme/vier/templates/profile_edit.tpl | 133 ++++++++++++++++++++- 3 files changed, 284 insertions(+), 18 deletions(-) diff --git a/mod/profiles.php b/mod/profiles.php index 6c1a82c7bb..3ba57c8831 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -206,7 +206,7 @@ function profiles_post(&$a) { if($ignore_year) $dob = '0000-' . $dob; } - + $name = notags(trim($_POST['name'])); if(! strlen($name)) { @@ -327,7 +327,7 @@ function profiles_post(&$a) { $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); - + set_pconfig(local_user(),'system','detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0)); $changes = array(); $value = ''; @@ -540,7 +540,7 @@ function profile_activity($changed, $value) { return; $arr = array(); - $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), local_user()); + $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), local_user()); $arr['uid'] = local_user(); $arr['contact-id'] = $self[0]['id']; $arr['wall'] = 1; @@ -552,7 +552,7 @@ function profile_activity($changed, $value) { $arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb']; $arr['verb'] = ACTIVITY_UPDATE; $arr['object-type'] = ACTIVITY_OBJ_PROFILE; - + $A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]'; @@ -570,7 +570,7 @@ function profile_activity($changed, $value) { $changes .= $ch; } - $prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]'; + $prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . t('public profile') . '[/url]'; if($t == 1 && strlen($value)) { $message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value); @@ -578,9 +578,9 @@ function profile_activity($changed, $value) { } else $message = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes); - - $arr['body'] = $message; + + $arr['body'] = $message; $arr['object'] = '' . ACTIVITY_OBJ_PROFILE . '' . $self[0]['name'] . '' . '' . $self[0]['url'] . '/' . $self[0]['name'] . ''; @@ -664,8 +664,10 @@ function profiles_content(&$a) { '$no_selected' => (($r[0]['hide-friends'] == 0) ? " checked=\"checked\" " : "") )); + $personal_account = !(in_array($a->user["page-flags"], + array(PAGE_COMMUNITY, PAGE_PRVGROUP))); - + $detailled_profile = (get_pconfig(local_user(),'system','detailled_profile') AND $personal_account); $f = get_config('system','birthday_input_format'); if(! $f) @@ -674,6 +676,17 @@ function profiles_content(&$a) { $is_default = (($r[0]['is-default']) ? 1 : 0); $tpl = get_markup_template("profile_edit.tpl"); $o .= replace_macros($tpl,array( + '$personal_account' => $personal_account, + '$detailled_profile' => $detailled_profile, + + '$details' => array( + 'detailled_profile', //Name + t('Show more profile fields:'), //Label + $detailled_profile, //Value + '', //Help string + array(t('No'),t('Yes')) //Off - On strings + ), + '$multi_profiles' => feature_enabled(local_user(),'multi_profiles'), '$form_security_token' => get_form_security_token("profile_edit"), '$form_security_token_photo' => get_form_security_token("profile_photo"), @@ -775,10 +788,10 @@ function profiles_content(&$a) { return $o; } - + //Profiles list. else { - + //If we don't support multi profiles, don't display this list. if(!feature_enabled(local_user(),'multi_profiles')){ $r = q( @@ -790,11 +803,11 @@ function profiles_content(&$a) { goaway($a->get_baseurl(true) . '/profiles/'.$r[0]['id']); } } - + $r = q("SELECT * FROM `profile` WHERE `uid` = %d", local_user()); if(count($r)) { - + $tpl_header = get_markup_template('profile_listing_header.tpl'); $o .= replace_macros($tpl_header,array( '$header' => t('Edit/Manage Profiles'), @@ -802,17 +815,17 @@ function profiles_content(&$a) { '$cr_new' => t('Create New Profile'), '$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new") )); - - + + $tpl = get_markup_template('profile_entry.tpl'); - + foreach($r as $rr) { $o .= replace_macros($tpl, array( '$photo' => $a->get_cached_avatar_image($rr['thumb']), '$id' => $rr['id'], '$alt' => t('Profile Image'), '$profile_name' => $rr['profile-name'], - '$visible' => (($rr['is-default']) ? '' . t('visible to everybody') . '' + '$visible' => (($rr['is-default']) ? '' . t('visible to everybody') . '' : '' . t('Edit visibility') . '') )); } diff --git a/view/templates/profile_edit.tpl b/view/templates/profile_edit.tpl index 480add4404..76445685d5 100644 --- a/view/templates/profile_edit.tpl +++ b/view/templates/profile_edit.tpl @@ -21,6 +21,8 @@
+{{if $detailled_profile}} +{{include file="field_yesno.tpl" field=$details}}
*
@@ -318,7 +320,129 @@
+{{else}} +{{if $personal_account}} +{{include file="field_yesno.tpl" field=$details}} +{{/if}} +
+ +
*
+
+
+
+ + +
+
+ +{{if $personal_account}} +
+ +{{$gender}} +
+
+ +
+ +
+{{$dob}} {{$age}} +
+
+
+{{/if}} + +
+ + +
+
+ +{{$hide_friends}} + +
+ + +
+
+ +
+ + +
+
+ + +
+ + +
+
+ +
+ + +
+
+ +
+ + +
+
+ +
+ + +
{{$lbl_pubdsc}}
+
+ +
+ + +
{{$lbl_prvdsc}}
+
+ +
+

+{{$lbl_about}} +

+ + + +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + +{{/if}}
diff --git a/view/theme/vier/templates/profile_edit.tpl b/view/theme/vier/templates/profile_edit.tpl index db512eb7f9..9270410561 100644 --- a/view/theme/vier/templates/profile_edit.tpl +++ b/view/theme/vier/templates/profile_edit.tpl @@ -32,9 +32,11 @@ +{{if $detailled_profile}}
{{$lbl_picture_section}} »
- +{{/if}}
- + +{{if $detailled_profile}}
{{$lbl_basic_section}} » +{{else}} + +{{if $personal_account}} +{{include file="field_yesno.tpl" field=$details}} +{{/if}} +
+ +
*
+
+
+ +
+ + +
+
+ +{{if $personal_account}} +
+ +{{$gender}} +
+
+ +
+ +
+{{$dob}} {{$age}} +
+
+
+{{/if}} + +
+ + +
+
+ +{{$hide_friends}} + +
+ + +
+
+ +
+ + +
+
+ + +
+ + +
+
+ +
+ + +
+
+
+ + +
+
+ +
+ + +
{{$lbl_pubdsc}}
+
+ +
+ + +
{{$lbl_prvdsc}}
+
+ +
+

+{{$lbl_about}} +

+ + + +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + +{{/if}}
From c7205ea705797dd1ad27dc5ae7e87d4e98169801 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 25 Oct 2015 10:17:23 +0100 Subject: [PATCH 041/313] Bugfix: Authorization at ejabberd only worked for uid=1 --- include/auth_ejabberd.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/auth_ejabberd.php b/include/auth_ejabberd.php index 5d69f1de7f..9a9d9accad 100755 --- a/include/auth_ejabberd.php +++ b/include/auth_ejabberd.php @@ -140,6 +140,7 @@ class exAuth $sQuery = "SELECT `uid`, `password` FROM `user` WHERE `nickname`='". $db->escape($sUser) ."'"; $this->writeDebugLog("[debug] using query ". $sQuery); if ($oResult = q($sQuery)){ + $uid = $oResult[0]["uid"]; $Error = ($oResult[0]["password"] != hash('whirlpool',$aCommand[3])); /* if ($oResult[0]["password"] == hash('whirlpool',$aCommand[3])) { @@ -156,9 +157,10 @@ class exAuth } else { $this->writeLog("[MySQL] invalid query: ". $sQuery); $Error = true; + $uid = -1; } if ($Error) { - $oConfig = q("SELECT `v` FROM `pconfig` WHERE `uid`=1 AND `cat` = 'xmpp' AND `k`='password' LIMIT 1;"); + $oConfig = q("SELECT `v` FROM `pconfig` WHERE `uid`=%d AND `cat` = 'xmpp' AND `k`='password' LIMIT 1;", intval($uid)); $this->writeLog("[exAuth] got password ".$oConfig[0]["v"]); $Error = ($aCommand[3] != $oConfig[0]["v"]); } From e0e6762ed8074ad24e4a066d8b4ae22d0eafc2db Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sun, 25 Oct 2015 14:00:08 +0100 Subject: [PATCH 042/313] some inital work to have profile pics on manage page --- mod/manage.php | 11 ++++++++++- view/templates/manage.tpl | 22 +++++++++++++++++++--- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/mod/manage.php b/mod/manage.php index 5513ebe08d..236a3fb054 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -98,7 +98,16 @@ function manage_content(&$a) { } $identities = $a->identities; - foreach($identities as $key=>$id) { + + //getting profile pics for delegates + foreach ($identities as $key=>$id) { + $thumb = q("SELECT `thumb` FROM `contact` WHERE `uid` = %d AND `name` = '%s' AND `nick` = '%s' AND (network = 'dfrn' OR self = 1)", + intval($a->user['uid']), + dbesc($id['username']), + dbesc($id['nickname']) + ); + $identities[$key][thumb] = $thumb[0][thumb]; + $identities[$key]['selected'] = (($id['nickname'] === $a->user['nickname']) ? ' selected="selected" ' : ''); } diff --git a/view/templates/manage.tpl b/view/templates/manage.tpl index 80477bc40b..d82ddb6d73 100644 --- a/view/templates/manage.tpl +++ b/view/templates/manage.tpl @@ -2,7 +2,7 @@

{{$title}}

{{$desc}}
{{$choose}}
-
+{{*
- {{**}} -
+ + +
*}} +
+
+ + + {{foreach $identities as $id}} + + {{/foreach}} + + + + {{**}} +
+
+ + \ No newline at end of file From 5b93bff6dad386dc85662f45fab58d239444a19d Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sun, 25 Oct 2015 14:40:56 +0100 Subject: [PATCH 043/313] poke template: make use of global.css --- view/global.css | 17 +++++++++++++++++ view/theme/duepuntozero/style.css | 17 +---------------- view/theme/frost-mobile/style.css | 2 +- view/theme/quattro/dark/style.css | 14 -------------- view/theme/quattro/green/style.css | 14 -------------- view/theme/quattro/lilac/style.css | 14 -------------- view/theme/quattro/quattro.less | 12 ------------ view/theme/smoothly/style.css | 14 +------------- view/theme/vier/style.css | 15 --------------- 9 files changed, 20 insertions(+), 99 deletions(-) diff --git a/view/global.css b/view/global.css index c2f5840039..55f44ee51b 100644 --- a/view/global.css +++ b/view/global.css @@ -212,3 +212,20 @@ a { clip: rect(0,0,0,0); border: 0; } + +/* poke */ +#poke-desc { + margin: 5px 0 10px; +} + +#poke-wrapper { + padding: 10px 0 0px; +} + +#poke-recipient, #poke-action, #poke-privacy-settings { + margin: 10px 0 30px; +} + +#poke-recip-label, #poke-action-label, #prvmail-message-label { + margin: 10px 0 10px; +} diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 087104123a..16c01c6df4 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -959,7 +959,7 @@ input#dfrn-url { } .wall-item-content-wrapper.comment { -# margin-left: 50px; + /*margin-left: 50px;*/ background: #EEEEEE; } @@ -2022,21 +2022,6 @@ a.mail-list-link { .message-links-end { clear: both; } -#poke-desc { - margin: 5px 0 10px; -} - -#poke-wrapper { - padding: 10px 0 20px; -} - -#poke-recipient, #poke-action, #poke-privacy-settings { - margin: 10px 0 30px; -} - -#poke-recip-label, #poke-action-label, #prvmail-message-label { - margin: 10px 0 10px; -} #sidebar-group-list ul { list-style-type: none; diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index 22460b0590..5f78cfc4b7 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -4233,7 +4233,7 @@ ul.notifications-menu-popup { #recip { } -.autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; } +.autocomplete-w1 { background: #ffffff no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; } .autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px; _margin:0; _overflow-x:hidden; } .autocomplete .selected { background:#F0F0F0; } .autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; } diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index aaeb74e752..1eda67de13 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -2267,20 +2267,6 @@ ul.tabs li .active { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -/* poke */ -#poke-desc { - margin: 5px 0 25px; -} -#poke-recipient, -#poke-action, -#poke-privacy-settings { - margin: 10px 0 30px; -} -#poke-recip-label, -#poke-action-label, -#prvmail-message-label { - margin: 10px 0 10px; -} /* theme screenshot */ .screenshot, #theme-preview { diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index ef408b4cd2..71569971e5 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -2267,20 +2267,6 @@ ul.tabs li .active { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -/* poke */ -#poke-desc { - margin: 5px 0 25px; -} -#poke-recipient, -#poke-action, -#poke-privacy-settings { - margin: 10px 0 30px; -} -#poke-recip-label, -#poke-action-label, -#prvmail-message-label { - margin: 10px 0 10px; -} /* theme screenshot */ .screenshot, #theme-preview { diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index e31a427468..55b81e5daf 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -2267,20 +2267,6 @@ ul.tabs li .active { -ms-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; } -/* poke */ -#poke-desc { - margin: 5px 0 25px; -} -#poke-recipient, -#poke-action, -#poke-privacy-settings { - margin: 10px 0 30px; -} -#poke-recip-label, -#poke-action-label, -#prvmail-message-label { - margin: 10px 0 10px; -} /* theme screenshot */ .screenshot, #theme-preview { diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 19847ad2de..3c9915576f 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -1525,18 +1525,6 @@ ul.tabs { &:hover .mail-delete { .opaque(1); } } -/* poke */ -#poke-desc { - margin: 5px 0 25px; -} - -#poke-recipient, #poke-action, #poke-privacy-settings { - margin: 10px 0 30px; -} - -#poke-recip-label, #poke-action-label, #prvmail-message-label { - margin: 10px 0 10px; -} /* theme screenshot */ .screenshot, #theme-preview { diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index da180ae61e..bcb47367f9 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -291,7 +291,7 @@ section { margin: 10px 0 0 230px; } -.login-form, +.login-form { margin-top: 10px; } @@ -2696,18 +2696,6 @@ margin-left: 0px; /* ========== */ /* = Poke = */ /* ========== */ -#poke-desc { - margin: 5px 0 20px; -} -#poke-wrapper { - margin: 40px 0 20px; -} -#poke-recipient, #poke-action, #poke-privacy-settings { - margin: 10px 0 30px; -} -#poke-recip-label, #poke-action-label, #prvmail-message-label { - margin: 10px 0 20px; -} #poke-recip { float: none; } diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index a6a27832f5..a35e6d21df 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -2496,21 +2496,6 @@ a.mail-list-link { border: none; } -/* ========== */ -/* = Poke = */ -/* ========== */ -#poke-desc { - margin: 10px 0 20px; -} -#poke-wrapper { - margin: 40px 0 20px; -} -#poke-recipient, #poke-action, #poke-privacy-settings { - margin: 10px 0 30px; -} -#poke-recip-label, #poke-action-label, #prvmail-message-label { - margin: 10px 0 20px; -} /* ========== */ /* = Events = */ From bac61cf596c143a15a430b5ba15d9f3a8dfe21e5 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sun, 25 Oct 2015 16:49:45 +0100 Subject: [PATCH 044/313] manage-selector: some cleanup and css work --- mod/manage.php | 9 +++--- view/global.css | 45 ++++++++++++++++++++++++++++++ view/templates/manage.tpl | 35 +++++++++++------------ view/theme/frost-mobile/style.css | 46 ++++++++++++++++++++++++++----- view/theme/frost/style.css | 46 ++++++++++++++++++++++++++----- 5 files changed, 144 insertions(+), 37 deletions(-) diff --git a/mod/manage.php b/mod/manage.php index 236a3fb054..3f553dfa6b 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -99,16 +99,17 @@ function manage_content(&$a) { $identities = $a->identities; - //getting profile pics for delegates + //getting additinal information for each identity foreach ($identities as $key=>$id) { - $thumb = q("SELECT `thumb` FROM `contact` WHERE `uid` = %d AND `name` = '%s' AND `nick` = '%s' AND (network = 'dfrn' OR self = 1)", + $thumb = q("SELECT `thumb` FROM `contact` WHERE `uid` = %d AND `name` = '%s' AND `nick` = '%s' AND (`network` = '%s' OR `self` = 1)", intval($a->user['uid']), dbesc($id['username']), - dbesc($id['nickname']) + dbesc($id['nickname']), + dbesc(NETWORK_DFRN) ); $identities[$key][thumb] = $thumb[0][thumb]; - $identities[$key]['selected'] = (($id['nickname'] === $a->user['nickname']) ? ' selected="selected" ' : ''); + $identities[$key]['selected'] = (($id['nickname'] === $a->user['nickname']) ? true : false); } $o = replace_macros(get_markup_template('manage.tpl'), array( diff --git a/view/global.css b/view/global.css index c2f5840039..d1c07d60aa 100644 --- a/view/global.css +++ b/view/global.css @@ -212,3 +212,48 @@ a { clip: rect(0,0,0,0); border: 0; } + +.itentity-match-wrapper { + float: left; + padding: 10px; + width: 120px; + height: 140px; + margin-bottom: 20px; +} + +.identity-match-photo { + float: left; + text-align: center; + width: 120px; +} + +.identity-match-name { + text-align: center; +} + +.identity-match-details { + float: left; + text-align: center; + width: 120px; + overflow: hidden; + font-size: 10px; + font-weight: 500; + color: #999999; +} + +.identity-match-break, .identity-match-end { + clear: both; +} + +.identity-match-photo button { + border: none; + padding: 0; + margin: 0; + background: none; + height: 80px; + width: 80px; +} + +.selected-identity img { + border: 2px solid #ff0000; +} \ No newline at end of file diff --git a/view/templates/manage.tpl b/view/templates/manage.tpl index d82ddb6d73..8a7922d7be 100644 --- a/view/templates/manage.tpl +++ b/view/templates/manage.tpl @@ -2,32 +2,29 @@

{{$title}}

{{$desc}}
{{$choose}}
-{{*
-
- -
- - -
-
*}}
- {{foreach $identities as $id}} - +
+
+ +
+ +
+ +
+
{{$id.username}}
+
({{$id.nickname}})
+
+ +
+
{{/foreach}} - - - {{**}}
diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index f4b46fed84..7d47c0b987 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -3234,17 +3234,49 @@ aside input[type='text'] { margin: 10px; } -#identity-manage-desc { - margin-top:15px; - margin-bottom: 15px; +.itentity-match-wrapper { + float: left; + padding: 10px; + width: 120px; + height: 140px; + margin-bottom: 20px; } -#identity-manage-choose { - margin-bottom: 15px; +.identity-match-photo { + float: left; + text-align: center; + width: 120px; } -#identity-submit { - margin-top: 20px; +.identity-match-name { + text-align: center; +} + +.identity-match-details { + float: left; + text-align: center; + width: 120px; + overflow: hidden; + font-size: 10px; + font-weight: 500; + color: #999999; +} + +.identity-match-break, .identity-match-end { + clear: both; +} + +.identity-match-photo button { + border: none; + padding: 0; + margin: 0; + background: none; + height: 80px; + width: 80px; +} + +.selected-identity img { + border: 2px solid #ff0000; } #photo-nav { diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 8b87c3bd42..5f3ea646ec 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -3006,17 +3006,49 @@ aside input[type='text'] { margin: 10px; } -#identity-manage-desc { - margin-top:15px; - margin-bottom: 15px; +.itentity-match-wrapper { + float: left; + padding: 10px; + width: 120px; + height: 140px; + margin-bottom: 20px; } -#identity-manage-choose { - margin-bottom: 15px; +.identity-match-photo { + float: left; + text-align: center; + width: 120px; } -#identity-submit { - margin-top: 20px; +.identity-match-name { + text-align: center; +} + +.identity-match-details { + float: left; + text-align: center; + width: 120px; + overflow: hidden; + font-size: 10px; + font-weight: 500; + color: #999999; +} + +.identity-match-break, .identity-match-end { + clear: both; +} + +.identity-match-photo button { + border: none; + padding: 0; + margin: 0; + background: none; + height: 80px; + width: 80px; +} + +.selected-identity img { + border: 2px solid #ff0000; } #photo-prev-link, #photo-next-link { From 87c559d60504ed7069f1fdb4784303437f11eb8f Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sun, 25 Oct 2015 18:04:20 +0100 Subject: [PATCH 045/313] manage-selector: sql - check for same baseurl --- mod/manage.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mod/manage.php b/mod/manage.php index 3f553dfa6b..37d7542fe5 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -101,10 +101,12 @@ function manage_content(&$a) { //getting additinal information for each identity foreach ($identities as $key=>$id) { - $thumb = q("SELECT `thumb` FROM `contact` WHERE `uid` = %d AND `name` = '%s' AND `nick` = '%s' AND (`network` = '%s' OR `self` = 1)", + $thumb = q("SELECT `thumb` FROM `contact` WHERE `uid` = %d AND `name` = '%s' AND `nick` = '%s' AND `nurl` = '%s' + AND (`network` = '%s' OR `self` = 1)", intval($a->user['uid']), dbesc($id['username']), dbesc($id['nickname']), + dbesc(normalise_link($a->get_baseurl() . '/profile/' . $id['nickname'])), dbesc(NETWORK_DFRN) ); $identities[$key][thumb] = $thumb[0][thumb]; From 4f9ec8efacad833918bd96a950e57d86f49e9426 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 25 Oct 2015 21:01:39 +0100 Subject: [PATCH 046/313] Vier: The usability with a touch device is improved --- view/theme/vier/style.css | 7 +++---- view/theme/vier/templates/search_item.tpl | 3 +-- view/theme/vier/templates/wall_item_tag.tpl | 3 +-- view/theme/vier/templates/wall_thread.tpl | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index a35e6d21df..eed93b7ed9 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -268,8 +268,8 @@ div.pager { /* global */ body { - /* font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; */ - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; +/* font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; */ + font-family: system, -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", sans-serif; font-size: 14px; /* font-size: 13px; line-height: 19.5px; */ @@ -1109,7 +1109,6 @@ section { line-height: 19.5px;*/ font-size: 14.95px; line-height: 21px; - /* font-family: Quodana,Verdana,DejaVu Sans,Bitstream Vera Sans,Helvetica,sans-serif; */ display: table-cell; vertical-align: top; top: 32px; @@ -2944,7 +2943,7 @@ a.mail-list-link { border:1px solid #dcdcdc; display:inline-block; color:#777777; - font-family:Arial; + font-family:Arial, sans-serif; font-size:15px; font-weight:bold; font-style:normal; diff --git a/view/theme/vier/templates/search_item.tpl b/view/theme/vier/templates/search_item.tpl index d8cad5cd0c..73e37e5613 100644 --- a/view/theme/vier/templates/search_item.tpl +++ b/view/theme/vier/templates/search_item.tpl @@ -12,9 +12,8 @@
- + {{$item.name}} -
{{$contact_block}} - - diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 25102ba31d..785b527b27 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -838,6 +838,7 @@ aside #profile-extra-links li { margin: 0px; list-style: none; } +aside #subscribe-feed-link, aside #wallmessage-link { display: block; -moz-border-radius: 5px 5px 5px 5px; @@ -850,6 +851,7 @@ aside #wallmessage-link { padding: 4px 2px 2px 35px; margin-top: 3px; } +aside #subscribe-feed:hover, aside #wallmessage-link:hover { text-decoration: none; background-color: #19aeff; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 78de886542..7335440319 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -854,6 +854,7 @@ aside #wallmessage-link:hover { text-decoration: none; background-color: #ccff42; } +aside #subscribe-feed-link, aside #dfrn-request-link { display: block; -moz-border-radius: 5px 5px 5px 5px; @@ -865,6 +866,7 @@ aside #dfrn-request-link { text-transform: uppercase; padding: 4px 2px 2px 35px; } +aside #subscribe-feed-link:hover, aside #dfrn-request-link:hover { text-decoration: none; background-color: #ccff42; diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index 1ca27b895c..c5027928b2 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -854,6 +854,7 @@ aside #wallmessage-link:hover { text-decoration: none; background-color: #86608e; } +aside #subscribe-feed-link, aside #dfrn-request-link { display: block; -moz-border-radius: 5px 5px 5px 5px; @@ -865,6 +866,7 @@ aside #dfrn-request-link { text-transform: uppercase; padding: 4px 2px 2px 35px; } +aside #subscribe-feed-link:hover, aside #dfrn-request-link:hover { text-decoration: none; background-color: #86608e; diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl index dfa6d0445d..7a06e7588f 100644 --- a/view/theme/quattro/templates/profile_vcard.tpl +++ b/view/theme/quattro/templates/profile_vcard.tpl @@ -73,6 +73,9 @@ {{if $wallmessage}}
  • {{$wallmessage}}
    • {{/if}} + {{if $subscribe_feed}} +
  • {{$subscribe_feed}}
    • + {{/if}} diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index ba0c4bff6e..06f32abcdf 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -690,6 +690,7 @@ aside h4 { list-style: none; } +#subscribe-feed-link, #dfrn-request-link { box-shadow: inset 0px 1px 0px 0px #a65151; -moz-box-shadow: inset 0px 1px 0px 0px #a65151; @@ -725,6 +726,7 @@ aside h4 { background-color: #3465a4; } +#subscribe-feed-link:hover, #dfrn-request-link:hover { background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) ); background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); @@ -732,6 +734,7 @@ aside h4 { background-color: #1873a2; } +#subscribe-feed-link:active, #dfrn-request-link:active { position: relative; top: 1px; diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index ecbb2ad96c..07d72c0dde 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -1004,9 +1004,11 @@ aside #profile-extra-links ul { } aside #profile-extra-links li { padding: 0px; + padding-bottom: 4px; margin: 0px; list-style: none; } +aside #subscribe-feed-link, aside #dfrn-request-link, aside #wallmessage-link { display: block; @@ -1019,6 +1021,7 @@ aside #wallmessage-link { text-transform: uppercase; padding: 4px 2px 2px 35px; } +aside #subscribe-feed-link:hover, aside #dfrn-request-link:hover, aside #wallmessage-link:hover { text-decoration: none; diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl index c5a51ccbaf..1882c15583 100644 --- a/view/theme/vier/templates/profile_vcard.tpl +++ b/view/theme/vier/templates/profile_vcard.tpl @@ -66,6 +66,9 @@ {{if $wallmessage}}
  • {{$wallmessage}}
    • {{/if}} + {{if $subscribe_feed}} +
  • {{$subscribe_feed}}
    • + {{/if}} From 25c0c5d4ad9e155dd5329e197c7a19212d20b578 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 28 Nov 2015 18:49:37 +0100 Subject: [PATCH 231/313] Issue 1925 - display nickname@hostname.com --- include/text.php | 7 +++++-- mod/viewcontacts.php | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/text.php b/include/text.php index f210bff721..73c441e26a 100644 --- a/include/text.php +++ b/include/text.php @@ -943,6 +943,9 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { if($class) $class = ' ' . $class; + if ($contact["addr"] == "") + $contact["addr"] = $contact["url"]; + $url = $contact['url']; $sparkle = ''; $redir = false; @@ -966,7 +969,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { . (($click) ? ' fakelink' : '') . '" ' . (($redir) ? ' target="redir" ' : '') . (($url) ? ' href="' . $url . '"' : '') . $click - . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name'] + . '" title="' . $contact['name'] . ' [' . $contact['addr'] . ']" alt="' . $contact['name'] . '" >'. $contact['name'] . '' . "\r\n"; } else { @@ -974,7 +977,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { . (($click) ? ' fakelink' : '') . '" ' . (($redir) ? ' target="redir" ' : '') . (($url) ? ' href="' . $url . '"' : '') . $click . ' >' . $contact['name'] + . proxy_url($contact['micro'], false, PROXY_SIZE_THUMB) . '' . "\r\n"; } }} diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index c7f139e1e4..c3bf3964f7 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -64,6 +64,7 @@ function viewcontacts_content(&$a) { $contacts[] = array( 'id' => $rr['id'], 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $rr['name'], $rr['url']), + 'photo_menu' => contact_photo_menu($rr), 'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB), 'name' => htmlentities(substr($rr['name'],0,20)), 'username' => htmlentities($rr['name']), From cd16eb14af967648cdefaee4f420d483ed9aa309 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 28 Nov 2015 19:42:18 +0100 Subject: [PATCH 232/313] Show the name instead of the nick in the feed --- include/ostatus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ostatus.php b/include/ostatus.php index 750952e908..ebd5741e51 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -1237,7 +1237,7 @@ function ostatus_add_author($doc, $owner, $profile) { $author = $doc->createElement("author"); xml_add_element($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON); xml_add_element($doc, $author, "uri", $owner["url"]); - xml_add_element($doc, $author, "name", $owner["nick"]); + xml_add_element($doc, $author, "name", $profile["name"]); $attributes = array("rel" => "alternate", "type" => "text/html", "href" => $owner["url"]); xml_add_element($doc, $author, "link", "", $attributes); From a3059d02d40684f2bc1a0439c979ca7f79d8f10f Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 28 Nov 2015 20:09:28 +0100 Subject: [PATCH 233/313] group_side - unify look with forumlist --- include/group.php | 34 ++++++++++++------ mod/contacts.php | 2 +- mod/group.php | 2 +- mod/network.php | 2 +- mod/nogroup.php | 2 +- view/templates/group_side.tpl | 68 ++++++++++++++++++----------------- view/theme/smoothly/style.css | 3 +- view/theme/vier/style.css | 13 ++++--- 8 files changed, 74 insertions(+), 52 deletions(-) diff --git a/include/group.php b/include/group.php index fe29d39f1a..862d06818d 100644 --- a/include/group.php +++ b/include/group.php @@ -213,9 +213,20 @@ function mini_group_select($uid,$gid = 0) { } - - -function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = 0) { +/** + * @brief Create group sidebar widget + * + * @param string $every + * @param string $each + * @param string $editmode + * 'standard' => include link 'Edit groups' + * 'extended' => include link 'Create new group' + * 'full' => include link 'Create new group' and provide for each group a link to edit this group + * @param int $group_id + * @param int $cid + * @return string + */ +function group_side($every="contacts",$each="group",$editmode = "standard", $group_id = 0, $cid = 0) { $o = ''; @@ -239,13 +250,13 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0 $member_of = array(); if($cid) { $member_of = groups_containing(local_user(),$cid); - } + } if(count($r)) { foreach($r as $rr) { $selected = (($group_id == $rr['id']) ? ' group-selected' : ''); - if ($edit) { + if ($editmode == "full") { $groupedit = array( 'href' => "group/".$rr['id'], 'title' => t('edit'), @@ -269,14 +280,17 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0 $tpl = get_markup_template("group_side.tpl"); $o = replace_macros($tpl, array( - '$title' => t('Groups'), + '$title' => t('Groups'), + 'newgroup' => (($editmode == "extended") || ($editmode == "full") ? 1 : ''), + '$editgroupstext' => t('Edit groups'), + 'grouppage' => "group/", '$edittext' => t('Edit group'), '$createtext' => t('Create a new group'), - '$creategroup' => t('Group Name: '), - '$form_security_token' => get_form_security_token("group_edit"), + '$creategroup' => t('Group Name: '), + '$form_security_token' => get_form_security_token("group_edit"), '$ungrouped' => (($every === 'contacts') ? t('Contacts not in any group') : ''), - '$groups' => $groups, - '$add' => t('add'), + '$groups' => $groups, + '$add' => t('add'), )); diff --git a/mod/contacts.php b/mod/contacts.php index 017b1d6435..1dc886363a 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -55,7 +55,7 @@ function contacts_init(&$a) { $findpeople_widget .= findpeople_widget(); } - $groups_widget .= group_side('contacts','group',false,0,$contact_id); + $groups_widget .= group_side('contacts','group','full',0,$contact_id); $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array( '$vcard_widget' => $vcard_widget, diff --git a/mod/group.php b/mod/group.php index 263586e2e9..e9f9561f46 100644 --- a/mod/group.php +++ b/mod/group.php @@ -7,7 +7,7 @@ function validate_members(&$item) { function group_init(&$a) { if(local_user()) { require_once('include/group.php'); - $a->page['aside'] = group_side('contacts','group',false,(($a->argc > 1) ? intval($a->argv[1]) : 0)); + $a->page['aside'] = group_side('contacts','group','extended',(($a->argc > 1) ? intval($a->argv[1]) : 0)); } } diff --git a/mod/network.php b/mod/network.php index 903ee41548..fd22f3e192 100644 --- a/mod/network.php +++ b/mod/network.php @@ -145,7 +145,7 @@ function network_init(&$a) { )); } - $a->page['aside'] .= (feature_enabled(local_user(),'groups') ? group_side('network/0','network',true,$group_id) : ''); + $a->page['aside'] .= (feature_enabled(local_user(),'groups') ? group_side('network/0','network','standard',$group_id) : ''); $a->page['aside'] .= (feature_enabled(local_user(),'forumlist_widget') ? widget_forumlist($a) : ''); $a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false); $a->page['aside'] .= networks_widget($a->get_baseurl(true) . '/network',(x($_GET, 'nets') ? $_GET['nets'] : '')); diff --git a/mod/nogroup.php b/mod/nogroup.php index 06fa730e0d..9f6e978433 100644 --- a/mod/nogroup.php +++ b/mod/nogroup.php @@ -15,7 +15,7 @@ function nogroup_init(&$a) { if(! x($a->page,'aside')) $a->page['aside'] = ''; - $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id); + $a->page['aside'] .= group_side('contacts','group','extended',0,$contact_id); } diff --git a/view/templates/group_side.tpl b/view/templates/group_side.tpl index 4905c2fa1a..466882370f 100644 --- a/view/templates/group_side.tpl +++ b/view/templates/group_side.tpl @@ -1,38 +1,42 @@
    -

    {{$title}}

    +

    {{$title}}

    - diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index ba0c4bff6e..3b6b73dc6e 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -854,7 +854,8 @@ li.widget-list { padding: 3px 24px; } -#sidebar-new-group { +#sidebar-new-group, +#sidebar-edit-groups { padding: 7px; width: 165px; margin: auto; diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index ecbb2ad96c..5bd475759f 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -347,7 +347,7 @@ code { display: inline-block; min-width: 10px; padding: 3px 7px; - font-size: 12px; + font-size: 10px; font-weight: 700; line-height: 1; color: #fff; @@ -382,7 +382,7 @@ code { #sidebar-group-list .tool:hover { background: #EEE; } -#sidebar-group-list .notify { +/*#sidebar-group-list .notify { min-width: 10px; text-align: center; color: #FFF; @@ -391,6 +391,9 @@ code { padding: 3px; border-radius: 10px; display: none; +}*/ +#sidebar-group-list .notify { + display: none; } #sidebar-group-list .notify.show { display: inline-block; } .tool .label { @@ -416,7 +419,7 @@ code { opacity: 1; } -.sidebar-group-li:hover, #sidebar-new-group:hover, #forum-widget-collapse:hover, +.sidebar-group-li:hover, #sidebar-new-group:hover, #sidebar-edit-groups:hover, #forum-widget-collapse:hover, #sidebar-ungrouped:hover, .side-link:hover, .nets-ul li:hover, #forumlist-sidebar li:hover, #forumlist-sidebar-right li:hover, .nets-all:hover, .saved-search-li:hover, li.tool:hover, .admin.link:hover, aside h4 a:hover, right_aside h4 a:hover, #message-new:hover { /* background-color: #ddd; */ @@ -436,7 +439,7 @@ code { font-weight: bold; } -#forum-widget-showmore, #sidebar-new-group, #forum-widget-collapse, #forumlist-rsidebar-right, #sidebar-ungrouped, +#forum-widget-showmore, #sidebar-new-group, #sidebar-edit-groups, #forum-widget-collapse, #forumlist-rsidebar-right, #sidebar-ungrouped, .side-link, #peoplefind-desc, #connect-desc, .nets-all, .admin.link, #message-new { padding-left: 10px; padding-top: 3px; @@ -464,7 +467,7 @@ code { display: inline-block; } -a.nets-link, .side-link a, #sidebar-new-group a, a.savedsearchterm, a.fileas-link, aside h4 a, right_aside h4 a { +a.nets-link, .side-link a, #sidebar-new-group a, #sidebar-edit-groups a, a.savedsearchterm, a.fileas-link, aside h4 a, right_aside h4 a { display: block; color: #737373; } From aa047e16d7b95788f1efdf216960e16c09e17754 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 28 Nov 2015 21:12:44 +0100 Subject: [PATCH 234/313] directory - reduce the number of queries --- mod/contacts.php | 3 +++ mod/directory.php | 17 +++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mod/contacts.php b/mod/contacts.php index 13f316aa17..83388ed4ed 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -830,6 +830,9 @@ function contacts_content(&$a) { } function _contact_detail_for_template($rr){ + + $community = ''; + switch($rr['rel']) { case CONTACT_IS_FRIEND: $dir_icon = 'images/lrarrow.gif'; diff --git a/mod/directory.php b/mod/directory.php index b0f1cb716b..4695ca6b82 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -85,9 +85,11 @@ function directory_content(&$a) { $limit = intval($a->pager['start']).",".intval($a->pager['itemspage']); - $r = $db->q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags` FROM `profile` + $r = $db->q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`, + `contact`.`addr` AS faddr, `contact`.`url` AS profile_url FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` - WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT ".$limit); + INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` + WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit); if(count($r)) { if(in_array('small', $a->argv)) @@ -98,14 +100,9 @@ function directory_content(&$a) { foreach($r as $rr) { $community = ''; + $itemurl= ''; - // get the friendica address and the profile url of the user - $p = q("SELECT `addr` AS faddr, `url` AS profile_url FROM `contact` WHERE `uid` = %d AND `self`", - intval($rr['uid']) - ); - - if(count($p)) - $itemurl = (($p['0']['faddr'] != "") ? $p['0']['faddr'] : $p['0']['profile_url']); + $itemurl = (($rr['faddr'] != "") ? $rr['faddr'] : $rr['profile_url']); $profile_link = z_root() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); @@ -135,7 +132,7 @@ function directory_content(&$a) { // show if account is a community account // ToDo the other should be also respected, but first we need a good translatiion // and systemwide consistency for displaying the page type - if(intval($rr['page-flags']) == PAGE_COMMUNITY OR intval($rr['page-flags']) == PAGE_PRVGROUP) + if((intval($rr['page-flags']) == PAGE_COMMUNITY) OR (intval($rr['page-flags']) == PAGE_PRVGROUP)) $community = true; $profile = $rr; From 3067663909e7a5553d55d0dc385d02998c1961a0 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 28 Nov 2015 22:56:48 +0100 Subject: [PATCH 235/313] The manage page now shows the unread notifications --- mod/manage.php | 14 ++++++++++++++ view/templates/manage.tpl | 2 +- view/theme/vier/plus.css | 6 ++++++ view/theme/vier/style.css | 19 +++++++++++++++++++ 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/mod/manage.php b/mod/manage.php index c0eedc2ba0..3f2023b7e3 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -114,6 +114,20 @@ function manage_content(&$a) { $identities[$key][thumb] = $thumb[0][thumb]; $identities[$key]['selected'] = (($id['nickname'] === $a->user['nickname']) ? true : false); + + $notifications = 0; + + $r = q("SELECT DISTINCT(`parent`) FROM `notify` WHERE `uid` = %d AND NOT `seen` AND NOT (`type` IN (%d, %d))", + intval($id['uid']), intval(NOTIFY_INTRO), intval(NOTIFY_MAIL)); + if ($r) + $notifications = sizeof($r); + + $r = q("SELECT DISTINCT(`convid`) FROM `mail` WHERE `uid` = %d AND NOT `seen`", + intval($id['uid'])); + if ($r) + $notifications = $notifications + sizeof($r); + + $identities[$key]['notifications'] = $notifications; } $o = replace_macros(get_markup_template('manage.tpl'), array( diff --git a/view/templates/manage.tpl b/view/templates/manage.tpl index e23c402754..dd27092e9b 100644 --- a/view/templates/manage.tpl +++ b/view/templates/manage.tpl @@ -11,6 +11,7 @@
    @@ -22,7 +23,6 @@
    ({{$id.nickname}})
    -
    {{/foreach}} diff --git a/view/theme/vier/plus.css b/view/theme/vier/plus.css index 5faf069c22..8e1865a869 100644 --- a/view/theme/vier/plus.css +++ b/view/theme/vier/plus.css @@ -17,6 +17,12 @@ nav a:hover, color: #000; } +.manage-notify { + background-color: #CB4437; + border-radius: 10px; + font: bold 11px/16px Arial; +} + nav .nav-notify { /* background-color: #427FED; */ background-color: #CB4437; diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 5bd475759f..a9c5e7ec8e 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -667,6 +667,7 @@ nav .nav-menu img { margin-top: -3px; margin-right: 4px; } + nav .nav-menu-icon .nav-notify { top: 3px; } @@ -701,6 +702,23 @@ nav .nav-menu:hover { /* background: #4c619c; */ text-decoration: none; } + +.manage-notify { + background-color: #F80; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + font-size: 10px; + padding: 1px 3px; + top: 0px; + min-width: 15px; + text-align: center; + color: white; + float: right; + margin-top: -14px; + margin-right: -20px; +} + nav .nav-notify { display: none; position: absolute; @@ -720,6 +738,7 @@ nav .nav-notify { text-align: center; color: white; } + nav .nav-notify.show { display: block; } From 58a261a29a3445afad1fe47ee7175fbce669a976 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 28 Nov 2015 23:18:01 +0100 Subject: [PATCH 236/313] Other themes are now supported as well --- view/theme/duepuntozero/style.css | 11 +++++++++++ view/theme/frost/style.css | 16 ++++++++++++++++ view/theme/smoothly/style.css | 11 +++++++++++ 3 files changed, 38 insertions(+) diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 255a1d089a..2729e01278 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -3312,6 +3312,17 @@ div.jGrowl div.info { } /* notifications popup menu */ +.manage-notify { + font-size: 10px; + padding: 1px 3px; + top: 0px; + min-width: 15px; + text-align: center; + float: right; + margin-top: -14px; + margin-right: -20px; +} + .nav-notify { display: none; position: absolute; diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 24fe47559a..0e51128e29 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -4040,6 +4040,22 @@ div.jGrowl-notification { } /* notifications popup menu */ +.manage-notify { + padding: 1px 3px; + top: 0px; + min-width: 15px; + text-align: center; + float: right; + margin-top: -14px; + margin-right: -20px; + + font-size: 0.8em; + border-radius: 4px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + background-color: gold !important; +} + .nav-notify { display: none; position: absolute; diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 3b6b73dc6e..f441ea5412 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -4216,6 +4216,17 @@ a.active { } /* notifications popup menu */ +.manage-notify { + font-size: 10px; + padding: 1px 3px; + top: 0px; + min-width: 15px; + text-align: center; + float: right; + margin-top: -14px; + margin-right: -20px; +} + .nav-notify { display: none; position: absolute; From 68916689de86eabde434aaf1349aab0ca32a3b00 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 28 Nov 2015 23:35:02 +0100 Subject: [PATCH 237/313] Introductions are now added as well --- mod/manage.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mod/manage.php b/mod/manage.php index 3f2023b7e3..adcc3d787a 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -127,6 +127,11 @@ function manage_content(&$a) { if ($r) $notifications = $notifications + sizeof($r); + $r = q("SELECT COUNT(*) AS `introductions` FROM `intro` WHERE NOT `blocked` AND NOT `ignore` AND `uid` = %d", + intval($id['uid'])); + if ($r) + $notifications = $notifications + $r[0]["introductions"]; + $identities[$key]['notifications'] = $notifications; } From f5597da059b126b6910cfeee7f5d154fa49cdf0b Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 28 Nov 2015 23:52:12 +0100 Subject: [PATCH 238/313] forumlist - mark selected forum as selected --- include/forums.php | 15 ++++-- mod/network.php | 4 +- view/templates/widget_forumlist.tpl | 4 +- view/theme/duepuntozero/style.css | 2 +- view/theme/frost-mobile/style.css | 2 +- view/theme/frost/style.css | 2 +- .../quattro/templates/widget_forumlist.tpl | 46 +++++++++++++++++++ view/theme/vier/style.css | 2 +- .../vier/templates/widget_forumlist_right.tpl | 8 ++-- view/theme/vier/theme.php | 10 +++- 10 files changed, 77 insertions(+), 18 deletions(-) create mode 100644 view/theme/quattro/templates/widget_forumlist.tpl diff --git a/include/forums.php b/include/forums.php index 59bf5a6b07..995a29cad1 100644 --- a/include/forums.php +++ b/include/forums.php @@ -60,10 +60,12 @@ function get_forumlist($uid, $showhidden = true, $lastitem, $showprivate = false * Sidebar widget to show subcribed friendica forums. If activated * in the settings, it appears at the notwork page sidebar * - * @param App $a + * @param int $uid + * @param int $cid + * The contact id which is used to mark a forum as "selected" * @return string */ -function widget_forumlist($a) { +function widget_forumlist($uid,$cid = 0) { if(! intval(feature_enabled(local_user(),'forumlist_widget'))) return; @@ -73,7 +75,7 @@ function widget_forumlist($a) { //sort by last updated item $lastitem = true; - $contacts = get_forumlist($a->user['uid'],true,$lastitem, true); + $contacts = get_forumlist($uid,true,$lastitem, true); $total = count($contacts); $visible_forums = 10; @@ -83,11 +85,14 @@ function widget_forumlist($a) { foreach($contacts as $contact) { + $selected = (($cid == $contact['id']) ? ' forum-selected' : ''); + $entry = array( - 'url' => $a->get_baseurl() . '/network?f=&cid=' . $contact['id'], - 'external_url' => $a->get_baseurl() . '/redir/' . $contact['id'], + 'url' => z_root() . '/network?f=&cid=' . $contact['id'], + 'external_url' => z_root() . '/redir/' . $contact['id'], 'name' => $contact['name'], 'cid' => $contact['id'], + 'selected' => $selected, 'micro' => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO), 'id' => ++$id, ); diff --git a/mod/network.php b/mod/network.php index fd22f3e192..f18e3001d0 100644 --- a/mod/network.php +++ b/mod/network.php @@ -6,6 +6,8 @@ function network_init(&$a) { } $is_a_date_query = false; + if(x($_GET['cid']) && intval($_GET['cid']) != 0) + $cid = $_GET['cid']; if($a->argc > 1) { for($x = 1; $x < $a->argc; $x ++) { @@ -146,7 +148,7 @@ function network_init(&$a) { } $a->page['aside'] .= (feature_enabled(local_user(),'groups') ? group_side('network/0','network','standard',$group_id) : ''); - $a->page['aside'] .= (feature_enabled(local_user(),'forumlist_widget') ? widget_forumlist($a) : ''); + $a->page['aside'] .= (feature_enabled(local_user(),'forumlist_widget') ? widget_forumlist(local_user(),$cid) : ''); $a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false); $a->page['aside'] .= networks_widget($a->get_baseurl(true) . '/network',(x($_GET, 'nets') ? $_GET['nets'] : '')); $a->page['aside'] .= saved_searches($search); diff --git a/view/templates/widget_forumlist.tpl b/view/templates/widget_forumlist.tpl index 54d7df82d2..32da71f816 100644 --- a/view/templates/widget_forumlist.tpl +++ b/view/templates/widget_forumlist.tpl @@ -24,7 +24,7 @@ function showHideForumlist() { {{$forum.link_desc}} - {{$forum.name}} + {{$forum.name}} {{/if}} @@ -34,7 +34,7 @@ function showHideForumlist() { {{$forum.link_desc}} - {{$forum.name}} + {{$forum.name}} {{/if}} {{/foreach}} diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 255a1d089a..cbf0410359 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -340,7 +340,7 @@ div.wall-item-content-wrapper.shiny { margin-bottom: 10px; } -.group-selected, .nets-selected, .fileas-selected, .categories-selected { +.group-selected, .nets-selected, .fileas-selected, .categories-selected, .forum-selected { padding: 3px; -moz-border-radius: 3px; border-radius: 3px; diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index 4485c056ff..9a0c50e1e7 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -511,7 +511,7 @@ footer { margin-bottom: 10px; } -.group-selected, .nets-selected, .fileas-selected, .categories-selected { +.group-selected, .nets-selected, .fileas-selected, .categories-selected, .forum-selected { padding: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 24fe47559a..c0e85facb0 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -489,7 +489,7 @@ div.wall-item-content-wrapper.shiny { margin-bottom: 10px; } -.group-selected, .nets-selected, .fileas-selected, .categories-selected { +.group-selected, .nets-selected, .fileas-selected, .categories-selected, .forum-selected { padding: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; diff --git a/view/theme/quattro/templates/widget_forumlist.tpl b/view/theme/quattro/templates/widget_forumlist.tpl new file mode 100644 index 0000000000..35c54bc690 --- /dev/null +++ b/view/theme/quattro/templates/widget_forumlist.tpl @@ -0,0 +1,46 @@ + + +
    +

    {{$title}}

    + + +
    diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 5bd475759f..fcc6c7b8cc 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -435,7 +435,7 @@ code { /* color: #000; */ } -.group-selected, .nets-selected, .fileas-selected { +.group-selected, .nets-selected, .fileas-selected, .forum-selected { font-weight: bold; } diff --git a/view/theme/vier/templates/widget_forumlist_right.tpl b/view/theme/vier/templates/widget_forumlist_right.tpl index 49e7723e8e..93f8e8f105 100644 --- a/view/theme/vier/templates/widget_forumlist_right.tpl +++ b/view/theme/vier/templates/widget_forumlist_right.tpl @@ -20,21 +20,21 @@ function showHideForumlist() { {{foreach $forums as $forum}} {{if $forum.id <= $visible_forums}} {{/if}} {{if $forum.id > $visible_forums}} {{/if}} {{/foreach}} diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index 789ba1daf1..91c384f805 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -222,6 +222,9 @@ function vier_community_info() { require_once('include/forums.php'); + if(x($_GET['cid']) && intval($_GET['cid']) != 0) + $cid = $_GET['cid']; + //sort by last updated item $lastitem = true; @@ -235,11 +238,14 @@ function vier_community_info() { foreach($contacts as $contact) { + $selected = (($cid == $contact['id']) ? ' forum-selected' : ''); + $entry = array( - 'url' => $a->get_baseurl() . '/network?f=&cid=' . $contact['id'], - 'external_url' => $a->get_baseurl() . '/redir/' . $contact['id'], + 'url' => z_root() . '/network?f=&cid=' . $contact['id'], + 'external_url' => z_root() . '/redir/' . $contact['id'], 'name' => $contact['name'], 'cid' => $contact['id'], + 'selected' => $selected, 'micro' => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO), 'id' => ++$id, ); From 73dbd73990b0b31d9fe47146c2dbb2714c4d7b05 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sun, 29 Nov 2015 00:09:09 +0100 Subject: [PATCH 239/313] directory - little change in the sql query --- mod/directory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/directory.php b/mod/directory.php index 4695ca6b82..bedc71907e 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -88,7 +88,7 @@ function directory_content(&$a) { $r = $db->q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`, `contact`.`addr` AS faddr, `contact`.`url` AS profile_url FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` - INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` + LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit); if(count($r)) { From 1a0cb99d56de2700f5cab4fb62cee12bbf87feae Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sun, 29 Nov 2015 04:57:42 +0100 Subject: [PATCH 240/313] redesign the network page header when cid selected --- mod/network.php | 31 ++++++++++++++++++++----------- view/theme/vier/style.css | 15 +++++++++++++++ 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/mod/network.php b/mod/network.php index fd22f3e192..3e841d2759 100644 --- a/mod/network.php +++ b/mod/network.php @@ -152,14 +152,14 @@ function network_init(&$a) { $a->page['aside'] .= saved_searches($search); $a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : '')); - if(x($_GET['cid']) && intval($_GET['cid']) != 0) { - $r = q("SELECT `url` FROM `contact` WHERE `id` = %d", - intval($_GET['cid'])); - if ($r) { - $a->page['aside'] = ""; - profile_load($a, "", 0, get_contact_details_by_url($r[0]["url"])); - } - } +// if(x($_GET['cid']) && intval($_GET['cid']) != 0) { +// $r = q("SELECT `url` FROM `contact` WHERE `id` = %d", +// intval($_GET['cid'])); +// if ($r) { +// $a->page['aside'] = ""; +// profile_load($a, "", 0, get_contact_details_by_url($r[0]["url"])); +// } +// } } function saved_searches($search) { @@ -583,7 +583,7 @@ function network_content(&$a, $update = 0) { } elseif($cid) { - $r = q("SELECT `id`,`name`,`network`,`writable`,`nurl` FROM `contact` WHERE `id` = %d + $r = q("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0 LIMIT 1", intval($cid) ); @@ -594,8 +594,17 @@ function network_content(&$a, $update = 0) { ON $sql_table.$sql_parent = `temp1`.`parent` "; $sql_extra = ""; - $o = replace_macros(get_markup_template("section_title.tpl"),array( - '$title' => sprintf( t('Contact: %s'), htmlentities($r[0]['name'])) + $entries[0] = array( + 'id' => 'network', + 'name' => htmlentities($r[0]['name']), + 'itemurl' => (($r[0]['addr']) ? ($r[0]['addr']) : ($r[0]['nurl'])), + 'thumb' => proxy_url($r[0]['thumb'], false, PROXY_SIZE_THUMB), + 'account_type' => (($r[0]['forum']) || ($r[0]['prv']) ? t('Forum') : ''), + 'details' => $r[0]['location'], + ); + + $o = replace_macros(get_markup_template("viewcontact_template.tpl"),array( + 'contacts' => $entries, )) . $o; if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) { diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 5bd475759f..d4da5e2d6c 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -1199,6 +1199,21 @@ section.minimal { height: 100%; } +#contact-entry-wrapper-network { + float: none; + width: 100%; + background-color: #FAFAFA; + box-shadow: 1px 2px 0px 0px #D8D8D8; + border-bottom: 1px solid #D2D2D2; + padding: 10px 10px 0 10px; + width: 745px; +} +#contact-entry-accounttype-network { + font-size: 20px; +} +#contact-entry-name-network { + font-size: 24.5px; +} /* wall item */ .tread-wrapper { /* border-bottom: 1px solid #BDCDD4; */ From 00cc409461c07852afbd7449ccea4a39e77df00f Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 29 Nov 2015 09:35:35 +0100 Subject: [PATCH 241/313] The photo menu now respects if the local users differs from the contact owner --- include/Contact.php | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/include/Contact.php b/include/Contact.php index b98c9f7056..fe73557de3 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -286,7 +286,7 @@ function get_contact_details_by_url($url, $uid = -1) { } if(! function_exists('contact_photo_menu')){ -function contact_photo_menu($contact) { +function contact_photo_menu($contact, $uid = 0) { $a = get_app(); @@ -298,6 +298,33 @@ function contact_photo_menu($contact) { $contact_drop_link = ""; $poke_link=""; + if ($uid == 0) + $uid = local_user(); + + if ($contact["uid"] != $uid) { + if ($uid == 0) { + $profile_link = zrl($contact['url']); + $menu = Array('profile' => array(t("View Profile"), $profile_link, true)); + + return $menu; + } + + $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `network` = '%s' AND `uid` = %d", + dbesc($contact["nurl"]), dbesc($contact["network"]), intval($uid)); + if ($r) + return contact_photo_menu($r[0], $uid); + else { + $profile_link = zrl($contact['url']); + $connlnk = 'follow/?url='.$contact['url']; + $menu = Array( + 'profile' => array(t("View Profile"), $profile_link, true), + 'follow' => array(t("Connect/Follow"), $connlnk, true) + ); + + return $menu; + } + } + $sparkle = false; if($contact['network'] === NETWORK_DFRN) { $sparkle = true; From c77ef0c4938144e5d7764664e6029c1f0ec49d67 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 29 Nov 2015 09:56:34 +0100 Subject: [PATCH 242/313] Viewcontacts now only shows native contacts (no more connector contacts) --- mod/viewcontacts.php | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index c3bf3964f7..d16a48e349 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -26,19 +26,30 @@ function viewcontacts_content(&$a) { } - $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 ", - intval($a->profile['uid']) + $r = q("SELECT COUNT(*) AS `total` FROM `contact` + WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 + AND `network` IN ('%s', '%s', '%s')", + intval($a->profile['uid']), + dbesc(NETWORK_DFRN), + dbesc(NETWORK_DIASPORA), + dbesc(NETWORK_OSTATUS) ); if(count($r)) $a->set_pager_total($r[0]['total']); - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 ORDER BY `name` ASC LIMIT %d , %d ", + $r = q("SELECT * FROM `contact` + WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 + AND `network` IN ('%s', '%s', '%s') + ORDER BY `name` ASC LIMIT %d, %d", intval($a->profile['uid']), + dbesc(NETWORK_DFRN), + dbesc(NETWORK_DIASPORA), + dbesc(NETWORK_OSTATUS), intval($a->pager['start']), intval($a->pager['itemspage']) ); - if(! count($r)) { - info( t('No contacts.') . EOL ); + if(!count($r)) { + info(t('No contacts.').EOL); return $o; } From ba441789b903b3da8e992f0617874dfa705c86ce Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 29 Nov 2015 11:18:32 +0100 Subject: [PATCH 243/313] followup for #2110 putting the styling in less file and recompile css --- view/theme/quattro/dark/style.css | 17 +++++++++++++++-- view/theme/quattro/green/style.css | 17 +++++++++++++++-- view/theme/quattro/lilac/style.css | 17 +++++++++++++++-- view/theme/quattro/quattro.less | 11 +++++++++++ 4 files changed, 56 insertions(+), 6 deletions(-) diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 785b527b27..7b20b4797a 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -838,7 +838,6 @@ aside #profile-extra-links li { margin: 0px; list-style: none; } -aside #subscribe-feed-link, aside #wallmessage-link { display: block; -moz-border-radius: 5px 5px 5px 5px; @@ -851,7 +850,6 @@ aside #wallmessage-link { padding: 4px 2px 2px 35px; margin-top: 3px; } -aside #subscribe-feed:hover, aside #wallmessage-link:hover { text-decoration: none; background-color: #19aeff; @@ -871,6 +869,21 @@ aside #dfrn-request-link:hover { text-decoration: none; background-color: #19aeff; } +aside #subscribe-feed-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #005c94 url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; +} +aside #subscribe-feed-link:hover { + text-decoration: none; + background-color: #19aeff; +} aside #profiles-menu { width: 20em; } diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 7335440319..c29e9bfbc4 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -854,7 +854,6 @@ aside #wallmessage-link:hover { text-decoration: none; background-color: #ccff42; } -aside #subscribe-feed-link, aside #dfrn-request-link { display: block; -moz-border-radius: 5px 5px 5px 5px; @@ -866,11 +865,25 @@ aside #dfrn-request-link { text-transform: uppercase; padding: 4px 2px 2px 35px; } -aside #subscribe-feed-link:hover, aside #dfrn-request-link:hover { text-decoration: none; background-color: #ccff42; } +aside #subscribe-feed-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #009100 url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; +} +aside #subscribe-feed-link:hover { + text-decoration: none; + background-color: #ccff42; +} aside #profiles-menu { width: 20em; } diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index c5027928b2..b672edaa97 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -854,7 +854,6 @@ aside #wallmessage-link:hover { text-decoration: none; background-color: #86608e; } -aside #subscribe-feed-link, aside #dfrn-request-link { display: block; -moz-border-radius: 5px 5px 5px 5px; @@ -866,11 +865,25 @@ aside #dfrn-request-link { text-transform: uppercase; padding: 4px 2px 2px 35px; } -aside #subscribe-feed-link:hover, aside #dfrn-request-link:hover { text-decoration: none; background-color: #86608e; } +aside #subscribe-feed-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #521f5c url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; +} +aside #subscribe-feed-link:hover { + text-decoration: none; + background-color: #86608e; +} aside #profiles-menu { width: 20em; } diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index db1f42d769..c2410244f9 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -352,6 +352,17 @@ aside { &:hover { text-decoration: none; background-color: @AsideConnectHoverBg; } } + #subscribe-feed-link { + display: block; + .rounded(); + color: @AsideConnect; + background: @AsideConnectBg url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform:uppercase; + padding: 4px 2px 2px 35px; + + &:hover { text-decoration: none; background-color: @AsideConnectHoverBg; } + } #profiles-menu { width: 20em; } From 1cd06df5fa4e620efee726ab83c02861752a14b7 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 29 Nov 2015 12:02:14 +0100 Subject: [PATCH 244/313] Bugfix: Only show the feed link for local profiles --- include/identity.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/identity.php b/include/identity.php index 0282b2d9a5..48fd5056dc 100644 --- a/include/identity.php +++ b/include/identity.php @@ -218,15 +218,15 @@ if(! function_exists('profile_sidebar')) { if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect'])) $connect = false; - if ($connect) + if (isset($profile['remoteconnect'])) + $remoteconnect = $profile['remoteconnect']; + + if ($connect AND ($profile['network'] == NETWORK_DFRN) AND !isset($remoteconnect)) $subscribe_feed = t("Atom feed"); else $subscribe_feed = false; - if (isset($profile['remoteconnect'])) - $remoteconnect = $profile['remoteconnect']; - - if( get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()) ) + if(get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user())) $wallmessage = t('Message'); else $wallmessage = false; From 8b23e771714c1a2687460120bf6006430458c1f8 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 29 Nov 2015 13:37:24 +0100 Subject: [PATCH 245/313] Only show supported networks in sidebar and contact list --- include/acl_selectors.php | 3 +++ include/contact_widgets.php | 43 ++++++++++++++++++++++++++++++++++--- mod/contacts.php | 5 +++-- 3 files changed, 46 insertions(+), 5 deletions(-) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index a1154399a7..4ef3d05ea3 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -1,6 +1,7 @@ page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array( '$vcard_widget' => $vcard_widget, '$findpeople_widget' => $findpeople_widget, @@ -786,8 +786,9 @@ function contacts_content(&$a) { $total = $r[0]['total']; } + $sql_extra3 = unavailable_networks(); - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ", + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 $sql_extra3 ORDER BY `name` ASC LIMIT %d , %d ", intval($_SESSION['uid']), intval($a->pager['start']), intval($a->pager['itemspage']) From 2fabde5d2d06f2e9a8e6c3a84b3e3fdd19fdda6a Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 29 Nov 2015 13:42:31 +0100 Subject: [PATCH 246/313] Added the old Facebook addon for addon check --- include/contact_widgets.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index a7c82c33cf..bbbd941b56 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -20,12 +20,12 @@ function findpeople_widget() { if(get_config('system','invitation_only')) { $x = get_pconfig(local_user(),'system','invites_remaining'); if($x || is_site_admin()) { - $a->page['aside'] .= '
    From 42d903dd6845c4895656e9c5aac7f78f810222a5 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 29 Nov 2015 23:22:05 +0100 Subject: [PATCH 249/313] Redesign of the contact pages, new tab for contact statuses --- include/Contact.php | 2 +- include/conversation.php | 2 +- mod/contacts.php | 164 +++++++++++++++++++++++--------- mod/crepair.php | 15 ++- view/global.css | 12 +++ view/templates/contact_edit.tpl | 1 + view/templates/crepair.tpl | 7 +- 7 files changed, 150 insertions(+), 53 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index b98c9f7056..a30a3c6c7a 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -322,7 +322,7 @@ function contact_photo_menu($contact) { $poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id']; $contact_url = $a->get_baseurl() . '/contacts/' . $contact['id']; - $posts_link = $a->get_baseurl() . '/network/0?nets=all&cid=' . $contact['id']; + $posts_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/posts'; $contact_drop_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/drop?confirm=1'; diff --git a/include/conversation.php b/include/conversation.php index 3b2eb54bde..476ae80bea 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -891,7 +891,7 @@ function item_photo_menu($item){ if(($cid) && (! $item['self'])) { $poke_link = $a->get_baseurl($ssl_state) . '/poke/?f=&c=' . $cid; $contact_url = $a->get_baseurl($ssl_state) . '/contacts/' . $cid; - $posts_link = $a->get_baseurl($ssl_state) . '/network/0?nets=all&cid=' . $cid; + $posts_link = $a->get_baseurl($ssl_state) . '/contacts/' . $cid . '/posts'; $clean_url = normalise_link($item['author-link']); diff --git a/mod/contacts.php b/mod/contacts.php index def07db93a..c3720d2176 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -13,7 +13,7 @@ function contacts_init(&$a) { $contact_id = 0; - if(($a->argc == 2) && intval($a->argv[1])) { + if((($a->argc == 2) && intval($a->argv[1])) OR (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts"))) { $contact_id = intval($a->argv[1]); $r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1", intval(local_user()), @@ -55,7 +55,8 @@ function contacts_init(&$a) { $findpeople_widget .= findpeople_widget(); } - $groups_widget .= group_side('contacts','group','full',0,$contact_id); + if ($a->argv[2] != "posts") + $groups_widget .= group_side('contacts','group','full',0,$contact_id); $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array( '$vcard_widget' => $vcard_widget, @@ -464,6 +465,9 @@ function contacts_content(&$a) { goaway($a->get_baseurl(true) . '/contacts'); return; // NOTREACHED } + if($cmd === 'posts') { + return contact_posts($a, $contact_id); + } } @@ -548,51 +552,7 @@ function contacts_content(&$a) { $all_friends = (($x) ? t('View all contacts') : ''); // tabs - $tabs = array( - array( - 'label'=>t('Network Posts'), - 'url' => "network/0?nets=all&cid=".$contact["id"], - 'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''), - 'title' => t('Status Messages and Posts'), - 'id' => 'status-tab', - 'accesskey' => 'm', - ), - array( - 'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ), - 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block', - 'sel' => '', - 'title' => t('Toggle Blocked status'), - 'id' => 'toggle-block-tab', - 'accesskey' => 'b', - ), - array( - 'label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ), - 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore', - 'sel' => '', - 'title' => t('Toggle Ignored status'), - 'id' => 'toggle-ignore-tab', - 'accesskey' => 'i', - ), - - array( - 'label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ), - 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive', - 'sel' => '', - 'title' => t('Toggle Archive status'), - 'id' => 'toggle-archive-tab', - 'accesskey' => 'v', - ), - array( - 'label' => t('Repair'), - 'url' => $a->get_baseurl(true) . '/crepair/' . $contact_id, - 'sel' => '', - 'title' => t('Advanced Contact Settings'), - 'id' => 'repair-tab', - 'accesskey' => 'r', - ) - ); - $tab_tpl = get_markup_template('common_tabs.tpl'); - $tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs)); + $tab_str = contact_tabs($a, $contact_id, 2); $lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : ''); @@ -853,6 +813,116 @@ function contacts_content(&$a) { return $o; } +function contact_tabs($a, $contact_id, $active_tab) { + // tabs + $tabs = array( + array( + 'label'=>t('Status'), + 'url' => "contacts/".$contact_id."/posts", + 'sel' => (($active_tab == 1)?'active':''), + 'title' => t('Status Messages and Posts'), + 'id' => 'status-tab', + 'accesskey' => 'm', + ), + array( + 'label'=>t('Profile'), + 'url' => "contacts/".$contact_id, + 'sel' => (($active_tab == 2)?'active':''), + 'title' => t('Profile Details'), + 'id' => 'status-tab', + 'accesskey' => 'r', + ), + array( + 'label' => t('Repair'), + 'url' => $a->get_baseurl(true) . '/crepair/' . $contact_id, + 'sel' => (($active_tab == 3)?'active':''), + 'title' => t('Advanced Contact Settings'), + 'id' => 'repair-tab', + 'accesskey' => 'r', + ), + array( + 'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ), + 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block', + 'sel' => '', + 'title' => t('Toggle Blocked status'), + 'id' => 'toggle-block-tab', + 'accesskey' => 'b', + ), + array( + 'label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ), + 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore', + 'sel' => '', + 'title' => t('Toggle Ignored status'), + 'id' => 'toggle-ignore-tab', + 'accesskey' => 'i', + ), + array( + 'label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ), + 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive', + 'sel' => '', + 'title' => t('Toggle Archive status'), + 'id' => 'toggle-archive-tab', + 'accesskey' => 'v', + ) + ); + $tab_tpl = get_markup_template('common_tabs.tpl'); + $tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs)); + + return $tab_str; +} + +function contact_posts($a, $contact_id) { + + require_once('include/conversation.php'); + + $r = q("SELECT * FROM `contact` WHERE `id` = %d", intval($contact_id)); + if ($r) { + $contact = $r[0]; + $a->page['aside'] = ""; + profile_load($a, "", 0, get_contact_details_by_url($contact["url"])); + } + + $r = q("SELECT COUNT(*) AS `total` FROM `item` + WHERE `item`.`uid` = %d AND `contact-id` = %d AND `item`.`id` = `item`.`parent`", + intval(local_user()), intval($contact_id)); + + $a->set_pager_total($r[0]['total']); + + $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, + `author-name` AS `name`, `owner-avatar` AS `photo`, + `owner-link` AS `url`, `owner-avatar` AS `thumb` + FROM `item` WHERE `item`.`uid` = %d AND `contact-id` = %d AND `item`.`id` = `item`.`parent` + ORDER BY `item`.`created` DESC LIMIT %d, %d", + intval(local_user()), + intval($contact_id), + intval($a->pager['start']), + intval($a->pager['itemspage']) + ); + + $tab_str = contact_tabs($a, $contact_id, 1); + + $header = $contact["name"]; + + if ($contact["addr"] != "") + $header .= " <".$contact["addr"].">"; + + $header .= " (".network_to_name($contact['network'], $contact['url']).")"; + +//{{include file="section_title.tpl"}} + + $o = "

    ".htmlentities($header)."

    ".$tab_str; + + $o .= conversation($a,$r,'community',false); + + if(!get_config('system', 'old_pager')) { + $o .= alt_pager($a,count($r)); + } else { + $o .= paginate($a); + } + + return $o; +} + function _contact_detail_for_template($rr){ switch($rr['rel']) { case CONTACT_IS_FRIEND: diff --git a/mod/crepair.php b/mod/crepair.php index 4f00190990..d16adf8c74 100644 --- a/mod/crepair.php +++ b/mod/crepair.php @@ -1,4 +1,6 @@ "; + + $header .= " (".network_to_name($contact['network'], $contact['url']).")"; + $tpl = get_markup_template('crepair.tpl'); $o .= replace_macros($tpl, array( - '$title' => t('Repair Contact Settings'), + //'$title' => t('Repair Contact Settings'), + '$title' => htmlentities($header), + '$tab_str' => $tab_str, '$warning' => $warning, '$info' => $info, '$returnaddr' => $returnaddr, diff --git a/view/global.css b/view/global.css index 115fab2711..63575ff21b 100644 --- a/view/global.css +++ b/view/global.css @@ -301,3 +301,15 @@ ul.credits li { #forum-widget-collapse:hover { opacity: 1.0; } + +.crepair-label { + margin-top: 10px; + float: left; + width: 250px; +} + +.crepair-input { + margin-top: 10px; + float: left; + width: 200px; +} diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl index 9d49780259..0733c9e187 100644 --- a/view/templates/contact_edit.tpl +++ b/view/templates/contact_edit.tpl @@ -62,6 +62,7 @@
    +
    diff --git a/view/templates/crepair.tpl b/view/templates/crepair.tpl index d500f04720..1d20983310 100644 --- a/view/templates/crepair.tpl +++ b/view/templates/crepair.tpl @@ -1,16 +1,17 @@ - {{include file="section_title.tpl"}} +{{$tab_str}} +
    {{$warning}}

    {{$info}}
    - {{$return}} +

    -

    {{$contact_name}}

    +
    {{if $update_profile}} From a7ea6ef09639a76a04ebb9d68360144f65264a00 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 29 Nov 2015 23:33:32 +0100 Subject: [PATCH 250/313] Use the template for the header. --- mod/contacts.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mod/contacts.php b/mod/contacts.php index c3720d2176..6e1bbe05b8 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -908,9 +908,12 @@ function contact_posts($a, $contact_id) { $header .= " (".network_to_name($contact['network'], $contact['url']).")"; -//{{include file="section_title.tpl"}} + $tpl = get_markup_template("section_title.tpl"); + $o = replace_macros($tpl,array( + '$title' => htmlentities($header) + )); - $o = "

    ".htmlentities($header)."

    ".$tab_str; + $o .= $tab_str; $o .= conversation($a,$r,'community',false); From 91011b71903a059d65b9eb9cc62c3e73fbfe3c7a Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 29 Nov 2015 23:36:19 +0100 Subject: [PATCH 251/313] Removing of useless code --- mod/contacts.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mod/contacts.php b/mod/contacts.php index 6e1bbe05b8..3cb5454a64 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -55,8 +55,7 @@ function contacts_init(&$a) { $findpeople_widget .= findpeople_widget(); } - if ($a->argv[2] != "posts") - $groups_widget .= group_side('contacts','group','full',0,$contact_id); + $groups_widget .= group_side('contacts','group','full',0,$contact_id); $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array( '$vcard_widget' => $vcard_widget, From a638417ab58e7b0379679e1b4f7682389fddf060 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 29 Nov 2015 23:46:10 +0100 Subject: [PATCH 252/313] Show contact comments in the post --- mod/contacts.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mod/contacts.php b/mod/contacts.php index 3cb5454a64..48d9c87e83 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -890,14 +890,18 @@ function contact_posts($a, $contact_id) { $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, `author-name` AS `name`, `owner-avatar` AS `photo`, `owner-link` AS `url`, `owner-avatar` AS `thumb` - FROM `item` WHERE `item`.`uid` = %d AND `contact-id` = %d AND `item`.`id` = `item`.`parent` + FROM `item` WHERE `item`.`uid` = %d AND `contact-id` = %d + AND ((`item`.`id` = `item`.`parent`) OR (`author-link` = '%s')) ORDER BY `item`.`created` DESC LIMIT %d, %d", intval(local_user()), intval($contact_id), + dbesc($contact["url"]), intval($a->pager['start']), intval($a->pager['itemspage']) ); + + $tab_str = contact_tabs($a, $contact_id, 1); $header = $contact["name"]; From a6aac8f950cd7a5d73ce32ee079156f14b8990ec Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Mon, 30 Nov 2015 01:24:22 +0100 Subject: [PATCH 253/313] networkheader: do css work the other supported themes --- mod/network.php | 9 +------ view/templates/viewcontact_template.tpl | 2 ++ view/theme/duepuntozero/deriv/darkzero.css | 3 +++ view/theme/duepuntozero/deriv/easterbunny.css | 4 ++- view/theme/duepuntozero/deriv/greenzero.css | 1 + view/theme/duepuntozero/deriv/purplezero.css | 3 ++- view/theme/duepuntozero/style.css | 25 +++++++++++++++++++ view/theme/frost-mobile/style.css | 21 ++++++++++++++++ view/theme/frost/style.css | 21 ++++++++++++++++ view/theme/quattro/dark/style.css | 23 +++++++++++++++++ view/theme/quattro/green/style.css | 23 +++++++++++++++++ view/theme/quattro/lilac/style.css | 23 +++++++++++++++++ view/theme/quattro/quattro.less | 17 ++++++++++++- view/theme/smoothly/style.css | 24 ++++++++++++++++++ view/theme/vier/breathe.css | 4 +++ view/theme/vier/dark.css | 6 ++++- view/theme/vier/flat.css | 5 ++++ view/theme/vier/style.css | 18 ++++++++++--- 18 files changed, 216 insertions(+), 16 deletions(-) diff --git a/mod/network.php b/mod/network.php index 3e841d2759..fb48bba738 100644 --- a/mod/network.php +++ b/mod/network.php @@ -152,14 +152,6 @@ function network_init(&$a) { $a->page['aside'] .= saved_searches($search); $a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : '')); -// if(x($_GET['cid']) && intval($_GET['cid']) != 0) { -// $r = q("SELECT `url` FROM `contact` WHERE `id` = %d", -// intval($_GET['cid'])); -// if ($r) { -// $a->page['aside'] = ""; -// profile_load($a, "", 0, get_contact_details_by_url($r[0]["url"])); -// } -// } } function saved_searches($search) { @@ -605,6 +597,7 @@ function network_content(&$a, $update = 0) { $o = replace_macros(get_markup_template("viewcontact_template.tpl"),array( 'contacts' => $entries, + 'id' => 'network', )) . $o; if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) { diff --git a/view/templates/viewcontact_template.tpl b/view/templates/viewcontact_template.tpl index 455551c680..205ad736d5 100644 --- a/view/templates/viewcontact_template.tpl +++ b/view/templates/viewcontact_template.tpl @@ -1,9 +1,11 @@ {{include file="section_title.tpl"}} +
    {{foreach $contacts as $contact}} {{include file="contact_template.tpl"}} {{/foreach}} +
    diff --git a/view/theme/duepuntozero/deriv/darkzero.css b/view/theme/duepuntozero/deriv/darkzero.css index fe2ad73cf2..908574f706 100644 --- a/view/theme/duepuntozero/deriv/darkzero.css +++ b/view/theme/duepuntozero/deriv/darkzero.css @@ -20,6 +20,9 @@ div.wall-item-content-wrapper.shiny { background-image: url('ingdarkzero/shiny. nav #banner #logo-text a { color: #ffffff; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network {background-image: url('imgdarkzero/head.jpg');} + .wall-item-content-wrapper { border: 1px solid #444444; background: #444444; diff --git a/view/theme/duepuntozero/deriv/easterbunny.css b/view/theme/duepuntozero/deriv/easterbunny.css index 0619644eaf..34bf58f460 100644 --- a/view/theme/duepuntozero/deriv/easterbunny.css +++ b/view/theme/duepuntozero/deriv/easterbunny.css @@ -25,8 +25,10 @@ section { background: #EEFFFF; } a, a:visited { color: #0000FF; text-decoration: none; } a:hover {text-decoration: underline; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { background: #FFDDFF; } -aside( background-image: url('imgeasterbunny/border.jpg'); } +aside { background-image: url('imgeasterbunny/border.jpg'); } .tabs { background-image: url('imgeasterbunny/head.jpg'); } div.wall-item-content-wrapper.shiny { background-image: url('imgeasterbunny/shiny.png'); } diff --git a/view/theme/duepuntozero/deriv/greenzero.css b/view/theme/duepuntozero/deriv/greenzero.css index 0f6f7881ed..d446a61611 100644 --- a/view/theme/duepuntozero/deriv/greenzero.css +++ b/view/theme/duepuntozero/deriv/greenzero.css @@ -21,6 +21,7 @@ body { background-image: url('imggreenzero/head.jpg'); } aside { background-image: url('imggreenzero/border.jpg'); } section { background-image: url('imggreenzero/border.jpg'); } .tabs { background-image: url('imggreenzero/head.jpg'); } +#viewcontact_wrapper-network { background: #DBEAD7; } div.wall-item-content-wrapper.shiny { background-image: url('imggreenzero/shiny.png'); } .fakelink, .fakelink:visited, .fakelink:hover, .fakelink:link { diff --git a/view/theme/duepuntozero/deriv/purplezero.css b/view/theme/duepuntozero/deriv/purplezero.css index d59cf5dcab..2971857683 100644 --- a/view/theme/duepuntozero/deriv/purplezero.css +++ b/view/theme/duepuntozero/deriv/purplezero.css @@ -3,8 +3,9 @@ a:hover {text-decoration: underline; } body { background-image: url('imgpurplezero/head.jpg'); } -aside( background-image: url('imgpurplezero/border.jpg'); } +aside { background-image: url('imgpurplezero/border.jpg'); } section { background-image: url('imgpurplezero/border.jpg'); } +#viewcontact_wrapper-network { background: #ECCAEB; } .tabs { background-image: url('imgpurplezero/head.jpg'); } div.wall-item-content-wrapper.shiny { background-image: url('imgpurplezero/shiny.png'); } diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 255a1d089a..83f131af60 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -277,6 +277,31 @@ div.wall-item-content-wrapper.shiny { margin: 15px 0 15px 150px; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 100px; + background-color: #DBE6F1; + border-bottom: 1px solid #babdb6; +} +#contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; + margin: 0px +} +#contact-entry-accounttype-network { + font-size: 20px; +} +#contact-entry-name-network { + font-size: 24.5px; +} +/*#contact-entry-name-network>.contact-entry-details, #contact-entry-url-network, +#contact-entry-details-network, contact-entry-network-network { + color: #000; +}*/ + /* from default */ #jot-perms-icon, #profile-location, diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index 4485c056ff..c41c2aa27c 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -421,6 +421,27 @@ section { clear: both; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 100px; + background-color: #FAFAFA; + border: 1px solid #DDDDDD; + border-radius: 5px; +} +#contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; + margin: 0; +} +#contact-entry-accounttype-network { + font-size: 0.9em; +} +#contact-entry-name-network { + font-size: 1.5em; +} /* footer */ footer { diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 24fe47559a..3bfca31ee4 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -383,6 +383,27 @@ section { padding-top: 3em; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 100px; + background-color: #FAFAFA; + border: 1px solid #DDDDDD; + border-radius: 5px; +} +#contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; + margin: 0; +} +#contact-entry-accounttype-network { + font-size: 0.9em; +} +#contact-entry-name-network { + font-size: 1.5em; +} /* footer */ footer { diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 25102ba31d..5792c09e6d 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -791,6 +791,29 @@ ul.menu-popup .toolbar a:hover { color: #9eabb0; display: block; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 100px; + background-color: #eff0f1; + border-bottom: 1px solid #cccccc; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-accounttype-network { + font-size: 22px; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-name-network { + font-size: 24.5px; + font-weight: normal; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network .contact-details { + font-size: 12px; +} /* aside 230px*/ aside { display: table-cell; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 78de886542..1aafb26710 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -791,6 +791,29 @@ ul.menu-popup .toolbar a:hover { color: #9eabb0; display: block; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 100px; + background-color: #eff0f1; + border-bottom: 1px solid #cccccc; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-accounttype-network { + font-size: 22px; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-name-network { + font-size: 24.5px; + font-weight: normal; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network .contact-details { + font-size: 12px; +} /* aside 230px*/ aside { display: table-cell; diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index 1ca27b895c..089dd227ce 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -791,6 +791,29 @@ ul.menu-popup .toolbar a:hover { color: #9eabb0; display: block; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 100px; + background-color: #eff0f1; + border-bottom: 1px solid #cccccc; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-accounttype-network { + font-size: 22px; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-name-network { + font-size: 24.5px; + font-weight: normal; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network .contact-details { + font-size: 12px; +} /* aside 230px*/ aside { display: table-cell; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index db1f42d769..3fa74de36e 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -301,7 +301,22 @@ ul.menu-popup { .notif-when { font-size: 10px; color: @MenuItemDetail; display: block; } } - +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 100px; + background-color: #eff0f1; + border-bottom: 1px solid #cccccc; + #contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; + #contact-entry-accounttype-network { font-size: 22px; } + #contact-entry-name-network { font-size: 24.5px; font-weight: normal; } + .contact-details { font-size: 12px; } + } +} /* aside 230px*/ diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 3b6b73dc6e..f68fd45f96 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -149,6 +149,30 @@ section { padding-bottom: 2em; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 110px; + background-color: #FAFAFA; + box-shadow: 0 0 8px #BDBDBD; + border-bottom: 1px solid #dedede; + border: 1px solid #7C7D7B; + border-radius: 5px; +} +#contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; + margin: 0; +} +#contact-entry-accounttype-network { + font-size: 20px; +} +#contact-entry-name-network { + font-size: 24.5px; +} + .lframe { border: 1px solid #7C7D7B; box-shadow: 3px 3px 6px #959494; diff --git a/view/theme/vier/breathe.css b/view/theme/vier/breathe.css index 049c1bf4b6..5a36de03e0 100644 --- a/view/theme/vier/breathe.css +++ b/view/theme/vier/breathe.css @@ -122,3 +122,7 @@ div.pager, ul.tabs { .mail-list-wrapper { border-radius: 5px; } + +#viewcontact_wrapper-network { + border-radius: 5px; +} diff --git a/view/theme/vier/dark.css b/view/theme/vier/dark.css index 01045b6ff4..8e128ae27f 100644 --- a/view/theme/vier/dark.css +++ b/view/theme/vier/dark.css @@ -57,5 +57,9 @@ input#side-peoplefind-submit, input#side-follow-submit { } li :hover { - color: #767676 !important; + color: #767676 !important; +} + +#viewcontact_wrapper-network { + background-color: #343434; } diff --git a/view/theme/vier/flat.css b/view/theme/vier/flat.css index a00d19c39c..03e18f1070 100644 --- a/view/theme/vier/flat.css +++ b/view/theme/vier/flat.css @@ -16,3 +16,8 @@ aside { right_aside { border-left: 1px solid #D2D2D2; } + +#viewcontact_wrapper-network { + background-color: #FFF; + border-bottom: 1px solid #D2D2D2; +} \ No newline at end of file diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index d4da5e2d6c..a62f9e80c6 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -1199,14 +1199,20 @@ section.minimal { height: 100%; } -#contact-entry-wrapper-network { - float: none; +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { width: 100%; + min-height: 100px; background-color: #FAFAFA; box-shadow: 1px 2px 0px 0px #D8D8D8; border-bottom: 1px solid #D2D2D2; - padding: 10px 10px 0 10px; - width: 745px; +} +#contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; + margin: 0; } #contact-entry-accounttype-network { font-size: 20px; @@ -1214,6 +1220,10 @@ section.minimal { #contact-entry-name-network { font-size: 24.5px; } +.contact-entry-photo img { + border-radius: 4px; +} + /* wall item */ .tread-wrapper { /* border-bottom: 1px solid #BDCDD4; */ From 45c2a4868efbf8f457914f87bee8553cc28fa77f Mon Sep 17 00:00:00 2001 From: rabuzarus Date: Mon, 30 Nov 2015 03:25:23 +0100 Subject: [PATCH 254/313] make viewcontacts part of the profile tab --- include/identity.php | 10 ++++++++++ mod/viewcontacts.php | 24 ++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/include/identity.php b/include/identity.php index 48fd5056dc..8abcce27c6 100644 --- a/include/identity.php +++ b/include/identity.php @@ -700,6 +700,16 @@ if(! function_exists('profile_tabs')){ ); } + if ((! $is_owner) && ((count($a->profile)) || (! $a->profile['hide-friends']))) { + $tabs[] = array( + 'label' => t('Contacts'), + 'url' => $a->get_baseurl() . '/viewcontacts/' . $nickname, + 'sel' => ((!isset($tab)&&$a->argv[0]=='viewcontacts')?'active':''), + 'title' => t('Contacts'), + 'id' => 'viewcontacts-tab', + 'accesskey' => 's', + ); + } $arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs); call_hooks('profile_tabs', $arr); diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index d16a48e349..04520e0d93 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -8,7 +8,23 @@ function viewcontacts_init(&$a) { return; } - profile_load($a,$a->argv[1]); + nav_set_selected('home'); + + if($a->argc > 1) { + $nick = $a->argv[1]; + $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1", + dbesc($nick) + ); + + if(! count($r)) + return; + + $a->data['user'] = $r[0]; + $a->profile_uid = $r[0]['uid']; + $is_owner = (local_user() && (local_user() == $a->profile_uid)); + + profile_load($a,$a->argv[1]); + } } @@ -25,6 +41,10 @@ function viewcontacts_content(&$a) { return; } + $o = ""; + + // tabs + $o .= profile_tabs($a,$is_owner, $a->data['user']['nickname']); $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 @@ -93,7 +113,7 @@ function viewcontacts_content(&$a) { $tpl = get_markup_template("viewcontact_template.tpl"); $o .= replace_macros($tpl, array( - '$title' => t('View Contacts'), + '$title' => t('Contacts'), '$contacts' => $contacts, '$paginate' => paginate($a), )); From 8c35304013dad110a240978ef21f6e1d0ee3e06d Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 30 Nov 2015 08:25:11 +0100 Subject: [PATCH 255/313] Some SQL improvements --- mod/contacts.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/mod/contacts.php b/mod/contacts.php index 48d9c87e83..0c0b88a823 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -881,17 +881,20 @@ function contact_posts($a, $contact_id) { profile_load($a, "", 0, get_contact_details_by_url($contact["url"])); } - $r = q("SELECT COUNT(*) AS `total` FROM `item` - WHERE `item`.`uid` = %d AND `contact-id` = %d AND `item`.`id` = `item`.`parent`", - intval(local_user()), intval($contact_id)); + if(get_config('system', 'old_pager')) { + $r = q("SELECT COUNT(*) AS `total` FROM `item` + WHERE `item`.`uid` = %d AND (`author-link` = '%s')", + intval(local_user()), dbesc($contact["url"])); - $a->set_pager_total($r[0]['total']); + $a->set_pager_total($r[0]['total']); + } $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`, `author-name` AS `name`, `owner-avatar` AS `photo`, `owner-link` AS `url`, `owner-avatar` AS `thumb` - FROM `item` WHERE `item`.`uid` = %d AND `contact-id` = %d - AND ((`item`.`id` = `item`.`parent`) OR (`author-link` = '%s')) + FROM `item` FORCE INDEX (uid_contactid_created) + WHERE `item`.`uid` = %d AND `contact-id` = %d + AND (`author-link` = '%s') ORDER BY `item`.`created` DESC LIMIT %d, %d", intval(local_user()), intval($contact_id), @@ -900,8 +903,6 @@ function contact_posts($a, $contact_id) { intval($a->pager['itemspage']) ); - - $tab_str = contact_tabs($a, $contact_id, 1); $header = $contact["name"]; From 50c004aa5ff14a4d65fd57e4ca8231de3546b569 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 30 Nov 2015 13:16:23 +0100 Subject: [PATCH 256/313] regenerated credits.txt --- util/credits.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/credits.txt b/util/credits.txt index d31c741d53..a0890ef3d9 100644 --- a/util/credits.txt +++ b/util/credits.txt @@ -6,6 +6,7 @@ Alex Alexander Kampmann AlfredSK Andi Stadler +Andreas H. André Lohan Anthronaut Arian - Cazare Muncitori @@ -114,6 +115,7 @@ Rabuzarus Radek Rafael Rainulf Pineda +Ralph rcmaniac rebeka-catalina repat From 6da6504738e29decf3129b1f7f0f9271a4fc1bc1 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 30 Nov 2015 13:16:46 +0100 Subject: [PATCH 257/313] regenerated master messages.po file --- util/messages.po | 1647 ++++++++++++++++++++++++---------------------- 1 file changed, 870 insertions(+), 777 deletions(-) diff --git a/util/messages.po b/util/messages.po index 5388b94daf..7dcd971931 100644 --- a/util/messages.po +++ b/util/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-08 21:46+0100\n" +"POT-Creation-Date: 2015-11-30 13:14+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -37,13 +37,13 @@ msgstr "" msgid "Contact updated." msgstr "" -#: mod/contacts.php:198 mod/dfrn_request.php:576 +#: mod/contacts.php:198 mod/dfrn_request.php:578 msgid "Failed to update contact record." msgstr "" #: mod/contacts.php:354 mod/manage.php:96 mod/display.php:496 -#: mod/profile_photo.php:19 mod/profile_photo.php:169 mod/profile_photo.php:180 -#: mod/profile_photo.php:193 mod/ostatus_subscribe.php:9 mod/follow.php:10 +#: mod/profile_photo.php:19 mod/profile_photo.php:175 mod/profile_photo.php:186 +#: mod/profile_photo.php:199 mod/ostatus_subscribe.php:9 mod/follow.php:10 #: mod/follow.php:72 mod/follow.php:137 mod/item.php:169 mod/item.php:185 #: mod/group.php:19 mod/dfrn_confirm.php:55 mod/fsuggest.php:78 #: mod/wall_upload.php:77 mod/wall_upload.php:80 mod/viewcontacts.php:24 @@ -58,7 +58,7 @@ msgstr "" #: mod/api.php:31 mod/notes.php:22 mod/poke.php:149 mod/repair_ostatus.php:9 #: mod/invite.php:15 mod/invite.php:101 mod/photos.php:163 mod/photos.php:1097 #: mod/regmod.php:110 mod/uimport.php:23 mod/attach.php:33 -#: include/items.php:5103 index.php:382 +#: include/items.php:5041 index.php:382 msgid "Permission denied." msgstr "" @@ -86,7 +86,7 @@ msgstr "" msgid "Contact has been unarchived" msgstr "" -#: mod/contacts.php:443 mod/contacts.php:816 +#: mod/contacts.php:443 mod/contacts.php:817 msgid "Do you really want to delete this contact?" msgstr "" @@ -95,18 +95,18 @@ msgstr "" #: mod/settings.php:1109 mod/settings.php:1114 mod/settings.php:1120 #: mod/settings.php:1126 mod/settings.php:1132 mod/settings.php:1158 #: mod/settings.php:1159 mod/settings.php:1160 mod/settings.php:1161 -#: mod/settings.php:1162 mod/dfrn_request.php:848 mod/register.php:235 +#: mod/settings.php:1162 mod/dfrn_request.php:850 mod/register.php:238 #: mod/suggest.php:29 mod/profiles.php:658 mod/profiles.php:661 -#: mod/profiles.php:687 mod/api.php:105 include/items.php:4935 +#: mod/profiles.php:687 mod/api.php:105 include/items.php:4873 msgid "Yes" msgstr "" #: mod/contacts.php:448 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:116 #: mod/videos.php:123 mod/message.php:219 mod/fbrowser.php:93 #: mod/fbrowser.php:128 mod/settings.php:649 mod/settings.php:675 -#: mod/dfrn_request.php:862 mod/suggest.php:32 mod/editpost.php:147 +#: mod/dfrn_request.php:864 mod/suggest.php:32 mod/editpost.php:147 #: mod/photos.php:239 mod/photos.php:328 include/conversation.php:1221 -#: include/items.php:4938 +#: include/items.php:4876 msgid "Cancel" msgstr "" @@ -133,7 +133,7 @@ msgstr "" msgid "Private communications are not available for this contact." msgstr "" -#: mod/contacts.php:530 mod/admin.php:643 +#: mod/contacts.php:530 mod/admin.php:645 msgid "Never" msgstr "" @@ -154,7 +154,7 @@ msgstr "" msgid "Network type: %s" msgstr "" -#: mod/contacts.php:543 include/contact_widgets.php:200 +#: mod/contacts.php:543 include/contact_widgets.php:237 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" @@ -165,13 +165,13 @@ msgstr[1] "" msgid "View all contacts" msgstr "" -#: mod/contacts.php:553 mod/contacts.php:636 mod/contacts.php:820 -#: mod/admin.php:1114 +#: mod/contacts.php:553 mod/contacts.php:636 mod/contacts.php:821 +#: mod/admin.php:1117 msgid "Unblock" msgstr "" -#: mod/contacts.php:553 mod/contacts.php:636 mod/contacts.php:820 -#: mod/admin.php:1113 +#: mod/contacts.php:553 mod/contacts.php:636 mod/contacts.php:821 +#: mod/admin.php:1116 msgid "Block" msgstr "" @@ -179,11 +179,11 @@ msgstr "" msgid "Toggle Blocked status" msgstr "" -#: mod/contacts.php:561 mod/contacts.php:637 mod/contacts.php:821 +#: mod/contacts.php:561 mod/contacts.php:637 mod/contacts.php:822 msgid "Unignore" msgstr "" -#: mod/contacts.php:561 mod/contacts.php:637 mod/contacts.php:821 +#: mod/contacts.php:561 mod/contacts.php:637 mod/contacts.php:822 #: mod/notifications.php:54 mod/notifications.php:179 mod/notifications.php:259 msgid "Ignore" msgstr "" @@ -192,11 +192,11 @@ msgstr "" msgid "Toggle Ignored status" msgstr "" -#: mod/contacts.php:570 mod/contacts.php:822 +#: mod/contacts.php:570 mod/contacts.php:823 msgid "Unarchive" msgstr "" -#: mod/contacts.php:570 mod/contacts.php:822 +#: mod/contacts.php:570 mod/contacts.php:823 msgid "Archive" msgstr "" @@ -220,7 +220,7 @@ msgstr "" msgid "Fetch further information for feeds" msgstr "" -#: mod/contacts.php:593 mod/admin.php:652 +#: mod/contacts.php:593 mod/admin.php:654 msgid "Disabled" msgstr "" @@ -236,17 +236,17 @@ msgstr "" msgid "Contact Editor" msgstr "" -#: mod/contacts.php:608 mod/manage.php:124 mod/fsuggest.php:107 +#: mod/contacts.php:608 mod/manage.php:143 mod/fsuggest.php:107 #: mod/message.php:342 mod/message.php:525 mod/crepair.php:195 -#: mod/events.php:574 mod/content.php:712 mod/install.php:253 -#: mod/install.php:291 mod/mood.php:137 mod/profiles.php:696 +#: mod/events.php:574 mod/content.php:712 mod/install.php:261 +#: mod/install.php:299 mod/mood.php:137 mod/profiles.php:696 #: mod/localtime.php:45 mod/poke.php:198 mod/invite.php:140 mod/photos.php:1129 #: mod/photos.php:1253 mod/photos.php:1571 mod/photos.php:1622 #: mod/photos.php:1670 mod/photos.php:1758 object/Item.php:710 #: view/theme/cleanzero/config.php:80 view/theme/dispy/config.php:70 #: view/theme/quattro/config.php:64 view/theme/diabook/config.php:148 -#: view/theme/diabook/theme.php:633 view/theme/vier/config.php:107 -#: view/theme/duepuntozero/config.php:59 +#: view/theme/diabook/theme.php:633 view/theme/clean/config.php:83 +#: view/theme/vier/config.php:107 view/theme/duepuntozero/config.php:59 msgid "Submit" msgstr "" @@ -269,7 +269,7 @@ msgstr "" msgid "Edit contact notes" msgstr "" -#: mod/contacts.php:617 mod/contacts.php:860 mod/viewcontacts.php:66 +#: mod/contacts.php:617 mod/contacts.php:861 mod/viewcontacts.php:77 #: mod/nogroup.php:41 #, php-format msgid "Visit %s's profile [%s]" @@ -303,13 +303,13 @@ msgstr "" msgid "Update public posts" msgstr "" -#: mod/contacts.php:631 mod/admin.php:1650 +#: mod/contacts.php:631 mod/admin.php:1653 msgid "Update now" msgstr "" #: mod/contacts.php:633 mod/dirfind.php:190 mod/allfriends.php:67 #: mod/match.php:71 mod/suggest.php:82 include/contact_widgets.php:32 -#: include/conversation.php:924 +#: include/Contact.php:321 include/conversation.php:924 msgid "Connect/Follow" msgstr "" @@ -412,46 +412,46 @@ msgstr "" msgid "Only show hidden contacts" msgstr "" -#: mod/contacts.php:807 include/text.php:1005 include/nav.php:123 +#: mod/contacts.php:808 include/text.php:1012 include/nav.php:123 #: include/nav.php:187 view/theme/diabook/theme.php:125 msgid "Contacts" msgstr "" -#: mod/contacts.php:811 +#: mod/contacts.php:812 msgid "Search your contacts" msgstr "" -#: mod/contacts.php:812 +#: mod/contacts.php:813 msgid "Finding: " msgstr "" -#: mod/contacts.php:813 mod/directory.php:202 include/contact_widgets.php:34 +#: mod/contacts.php:814 mod/directory.php:202 include/contact_widgets.php:34 msgid "Find" msgstr "" -#: mod/contacts.php:819 mod/settings.php:146 mod/settings.php:674 +#: mod/contacts.php:820 mod/settings.php:146 mod/settings.php:674 msgid "Update" msgstr "" -#: mod/contacts.php:823 mod/group.php:171 mod/admin.php:1112 +#: mod/contacts.php:824 mod/group.php:171 mod/admin.php:1115 #: mod/content.php:440 mod/content.php:743 mod/settings.php:711 #: mod/photos.php:1715 object/Item.php:134 include/conversation.php:635 msgid "Delete" msgstr "" -#: mod/contacts.php:836 +#: mod/contacts.php:837 msgid "Mutual Friendship" msgstr "" -#: mod/contacts.php:840 +#: mod/contacts.php:841 msgid "is a fan of yours" msgstr "" -#: mod/contacts.php:844 +#: mod/contacts.php:845 msgid "you are a fan of" msgstr "" -#: mod/contacts.php:861 mod/nogroup.php:42 +#: mod/contacts.php:862 mod/nogroup.php:42 msgid "Edit contact" msgstr "" @@ -459,17 +459,17 @@ msgstr "" msgid "No profile" msgstr "" -#: mod/manage.php:120 +#: mod/manage.php:139 msgid "Manage Identities and/or Pages" msgstr "" -#: mod/manage.php:121 +#: mod/manage.php:140 msgid "" "Toggle between different identities or community/group pages which share " "your account details or which you have been granted \"manage\" permissions" msgstr "" -#: mod/manage.php:122 +#: mod/manage.php:141 msgid "Select an identity to manage: " msgstr "" @@ -489,8 +489,8 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: mod/profperm.php:104 mod/newmember.php:32 include/identity.php:530 -#: include/identity.php:611 include/identity.php:641 include/nav.php:76 +#: mod/profperm.php:104 mod/newmember.php:32 include/identity.php:542 +#: include/identity.php:628 include/identity.php:658 include/nav.php:76 #: view/theme/diabook/theme.php:124 msgid "Profile" msgstr "" @@ -508,13 +508,13 @@ msgid "All Contacts (with secure profile access)" msgstr "" #: mod/display.php:82 mod/display.php:283 mod/display.php:500 -#: mod/viewsrc.php:15 mod/admin.php:196 mod/admin.php:1157 mod/admin.php:1378 -#: mod/notice.php:15 include/items.php:4894 +#: mod/viewsrc.php:15 mod/admin.php:196 mod/admin.php:1160 mod/admin.php:1381 +#: mod/notice.php:15 include/items.php:4832 msgid "Item not found." msgstr "" #: mod/display.php:211 mod/videos.php:189 mod/viewcontacts.php:19 -#: mod/community.php:18 mod/dfrn_request.php:777 mod/search.php:93 +#: mod/community.php:18 mod/dfrn_request.php:779 mod/search.php:93 #: mod/search.php:99 mod/directory.php:37 mod/photos.php:968 msgid "Public access denied." msgstr "" @@ -558,7 +558,7 @@ msgid "" "join." msgstr "" -#: mod/newmember.php:22 mod/admin.php:1209 mod/admin.php:1454 +#: mod/newmember.php:22 mod/admin.php:1212 mod/admin.php:1457 #: mod/settings.php:99 include/nav.php:182 view/theme/diabook/theme.php:544 #: view/theme/diabook/theme.php:648 msgid "Settings" @@ -583,7 +583,7 @@ msgid "" "potential friends know exactly how to find you." msgstr "" -#: mod/newmember.php:36 mod/profile_photo.php:244 mod/profiles.php:709 +#: mod/newmember.php:36 mod/profile_photo.php:250 mod/profiles.php:709 msgid "Upload Profile Photo" msgstr "" @@ -682,7 +682,7 @@ msgid "" "hours." msgstr "" -#: mod/newmember.php:66 include/group.php:272 +#: mod/newmember.php:66 include/group.php:283 msgid "Groups" msgstr "" @@ -740,86 +740,86 @@ msgid "Image uploaded but image cropping failed." msgstr "" #: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88 -#: mod/profile_photo.php:204 mod/profile_photo.php:296 -#: mod/profile_photo.php:305 mod/photos.php:70 mod/photos.php:184 +#: mod/profile_photo.php:210 mod/profile_photo.php:302 +#: mod/profile_photo.php:311 mod/photos.php:70 mod/photos.php:184 #: mod/photos.php:767 mod/photos.php:1237 mod/photos.php:1260 -#: mod/photos.php:1854 include/user.php:343 include/user.php:350 -#: include/user.php:357 view/theme/diabook/theme.php:500 +#: mod/photos.php:1854 include/user.php:345 include/user.php:352 +#: include/user.php:359 view/theme/diabook/theme.php:500 msgid "Profile Photos" msgstr "" #: mod/profile_photo.php:77 mod/profile_photo.php:84 mod/profile_photo.php:91 -#: mod/profile_photo.php:308 +#: mod/profile_photo.php:314 #, php-format msgid "Image size reduction [%s] failed." msgstr "" -#: mod/profile_photo.php:118 +#: mod/profile_photo.php:124 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." msgstr "" -#: mod/profile_photo.php:128 +#: mod/profile_photo.php:134 msgid "Unable to process image" msgstr "" -#: mod/profile_photo.php:144 mod/wall_upload.php:151 mod/photos.php:803 +#: mod/profile_photo.php:150 mod/wall_upload.php:151 mod/photos.php:803 #, php-format msgid "Image exceeds size limit of %s" msgstr "" -#: mod/profile_photo.php:153 mod/wall_upload.php:183 mod/photos.php:843 +#: mod/profile_photo.php:159 mod/wall_upload.php:183 mod/photos.php:843 msgid "Unable to process image." msgstr "" -#: mod/profile_photo.php:242 +#: mod/profile_photo.php:248 msgid "Upload File:" msgstr "" -#: mod/profile_photo.php:243 +#: mod/profile_photo.php:249 msgid "Select a profile:" msgstr "" -#: mod/profile_photo.php:245 +#: mod/profile_photo.php:251 msgid "Upload" msgstr "" -#: mod/profile_photo.php:248 +#: mod/profile_photo.php:254 msgid "or" msgstr "" -#: mod/profile_photo.php:248 +#: mod/profile_photo.php:254 msgid "skip this step" msgstr "" -#: mod/profile_photo.php:248 +#: mod/profile_photo.php:254 msgid "select a photo from your photo albums" msgstr "" -#: mod/profile_photo.php:262 +#: mod/profile_photo.php:268 msgid "Crop Image" msgstr "" -#: mod/profile_photo.php:263 +#: mod/profile_photo.php:269 msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: mod/profile_photo.php:265 +#: mod/profile_photo.php:271 msgid "Done Editing" msgstr "" -#: mod/profile_photo.php:299 +#: mod/profile_photo.php:305 msgid "Image uploaded successfully." msgstr "" -#: mod/profile_photo.php:301 mod/wall_upload.php:216 mod/photos.php:870 +#: mod/profile_photo.php:307 mod/wall_upload.php:216 mod/photos.php:870 msgid "Image upload failed." msgstr "" #: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:168 #: include/conversation.php:130 include/conversation.php:266 -#: include/text.php:1988 include/diaspora.php:2140 +#: include/text.php:1995 include/diaspora.php:2140 #: view/theme/diabook/theme.php:471 msgid "photo" msgstr "" @@ -897,11 +897,11 @@ msgstr "" msgid "- select -" msgstr "" -#: mod/filer.php:31 mod/editpost.php:108 mod/notes.php:61 include/text.php:997 +#: mod/filer.php:31 mod/editpost.php:108 mod/notes.php:61 include/text.php:1004 msgid "Save" msgstr "" -#: mod/follow.php:18 mod/dfrn_request.php:861 +#: mod/follow.php:18 mod/dfrn_request.php:863 msgid "Submit Request" msgstr "" @@ -921,11 +921,11 @@ msgstr "" msgid "The network type couldn't be detected. Contact can't be added." msgstr "" -#: mod/follow.php:104 mod/dfrn_request.php:847 +#: mod/follow.php:104 mod/dfrn_request.php:849 msgid "Please answer the following:" msgstr "" -#: mod/follow.php:105 mod/dfrn_request.php:848 +#: mod/follow.php:105 mod/dfrn_request.php:850 #, php-format msgid "Does %s know you?" msgstr "" @@ -934,32 +934,32 @@ msgstr "" #: mod/settings.php:1105 mod/settings.php:1109 mod/settings.php:1114 #: mod/settings.php:1120 mod/settings.php:1126 mod/settings.php:1132 #: mod/settings.php:1158 mod/settings.php:1159 mod/settings.php:1160 -#: mod/settings.php:1161 mod/settings.php:1162 mod/dfrn_request.php:848 -#: mod/register.php:236 mod/profiles.php:658 mod/profiles.php:662 +#: mod/settings.php:1161 mod/settings.php:1162 mod/dfrn_request.php:850 +#: mod/register.php:239 mod/profiles.php:658 mod/profiles.php:662 #: mod/profiles.php:687 mod/api.php:106 msgid "No" msgstr "" -#: mod/follow.php:106 mod/dfrn_request.php:852 +#: mod/follow.php:106 mod/dfrn_request.php:854 msgid "Add a personal note:" msgstr "" -#: mod/follow.php:112 mod/dfrn_request.php:858 +#: mod/follow.php:112 mod/dfrn_request.php:860 msgid "Your Identity Address:" msgstr "" #: mod/follow.php:125 mod/notifications.php:244 mod/events.php:566 -#: mod/directory.php:139 include/identity.php:268 include/bb2diaspora.php:170 +#: mod/directory.php:139 include/identity.php:278 include/bb2diaspora.php:170 #: include/event.php:36 include/event.php:60 msgid "Location:" msgstr "" #: mod/follow.php:127 mod/notifications.php:246 mod/directory.php:147 -#: include/identity.php:277 include/identity.php:582 +#: include/identity.php:287 include/identity.php:594 msgid "About:" msgstr "" -#: mod/follow.php:129 mod/notifications.php:248 include/identity.php:576 +#: mod/follow.php:129 mod/notifications.php:248 include/identity.php:588 msgid "Tags:" msgstr "" @@ -975,34 +975,34 @@ msgstr "" msgid "Empty post discarded." msgstr "" -#: mod/item.php:461 mod/wall_upload.php:213 mod/wall_upload.php:227 +#: mod/item.php:460 mod/wall_upload.php:213 mod/wall_upload.php:227 #: mod/wall_upload.php:234 include/Photo.php:954 include/Photo.php:969 #: include/Photo.php:976 include/Photo.php:998 include/message.php:145 msgid "Wall Photos" msgstr "" -#: mod/item.php:835 +#: mod/item.php:834 msgid "System error. Post not saved." msgstr "" -#: mod/item.php:964 +#: mod/item.php:963 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social network." msgstr "" -#: mod/item.php:966 +#: mod/item.php:965 #, php-format msgid "You may visit them online at %s" msgstr "" -#: mod/item.php:967 +#: mod/item.php:966 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: mod/item.php:971 +#: mod/item.php:970 #, php-format msgid "%s posted an update." msgstr "" @@ -1031,7 +1031,7 @@ msgstr "" msgid "Create a group of contacts/friends." msgstr "" -#: mod/group.php:94 mod/group.php:178 include/group.php:275 +#: mod/group.php:94 mod/group.php:178 include/group.php:289 msgid "Group Name: " msgstr "" @@ -1149,7 +1149,7 @@ msgstr "" msgid "Unable to update your contact profile details on our system" msgstr "" -#: mod/dfrn_confirm.php:753 mod/dfrn_request.php:732 include/items.php:4313 +#: mod/dfrn_confirm.php:753 mod/dfrn_request.php:734 include/items.php:4244 msgid "[Name Withheld]" msgstr "" @@ -1158,7 +1158,7 @@ msgstr "" msgid "%1$s has joined %2$s" msgstr "" -#: mod/profile.php:21 include/identity.php:77 +#: mod/profile.php:21 include/identity.php:82 msgid "Requested profile is not available." msgstr "" @@ -1182,7 +1182,7 @@ msgstr "" msgid "Access to this item is restricted." msgstr "" -#: mod/videos.php:375 include/text.php:1458 +#: mod/videos.php:375 include/text.php:1465 msgid "View Video" msgstr "" @@ -1218,7 +1218,7 @@ msgstr "" #: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86 #: mod/wall_upload.php:122 mod/wall_upload.php:125 mod/wall_attach.php:17 -#: mod/wall_attach.php:25 mod/wall_attach.php:76 include/api.php:1702 +#: mod/wall_attach.php:25 mod/wall_attach.php:76 include/api.php:1711 msgid "Invalid request." msgstr "" @@ -1353,7 +1353,7 @@ msgid "Reset" msgstr "" #: mod/like.php:170 include/conversation.php:122 include/conversation.php:258 -#: include/text.php:1986 view/theme/diabook/theme.php:463 +#: include/text.php:1993 view/theme/diabook/theme.php:463 msgid "event" msgstr "" @@ -1383,23 +1383,28 @@ msgstr "" msgid "%1$s may attend %2$s's %3$s" msgstr "" -#: mod/ping.php:257 +#: mod/ping.php:273 msgid "{0} wants to be your friend" msgstr "" -#: mod/ping.php:272 +#: mod/ping.php:288 msgid "{0} sent you a message" msgstr "" -#: mod/ping.php:287 +#: mod/ping.php:303 msgid "{0} requested registration" msgstr "" -#: mod/viewcontacts.php:41 +#: mod/viewcontacts.php:52 msgid "No contacts." msgstr "" -#: mod/viewcontacts.php:83 include/text.php:917 +#: mod/viewcontacts.php:85 mod/dirfind.php:208 mod/network.php:596 +#: mod/allfriends.php:79 mod/match.php:82 mod/common.php:122 mod/suggest.php:95 +msgid "Forum" +msgstr "" + +#: mod/viewcontacts.php:96 include/text.php:921 msgid "View Contacts" msgstr "" @@ -1419,7 +1424,7 @@ msgstr "" msgid "Network" msgstr "" -#: mod/notifications.php:93 mod/network.php:385 +#: mod/notifications.php:93 mod/network.php:381 msgid "Personal" msgstr "" @@ -1461,7 +1466,7 @@ msgstr "" msgid "if applicable" msgstr "" -#: mod/notifications.php:176 mod/notifications.php:257 mod/admin.php:1110 +#: mod/notifications.php:176 mod/notifications.php:257 mod/admin.php:1113 msgid "Approve" msgstr "" @@ -1511,8 +1516,8 @@ msgstr "" msgid "New Follower" msgstr "" -#: mod/notifications.php:250 mod/directory.php:141 include/identity.php:270 -#: include/identity.php:541 +#: mod/notifications.php:250 mod/directory.php:141 include/identity.php:280 +#: include/identity.php:553 msgid "Gender:" msgstr "" @@ -1822,8 +1827,8 @@ msgstr "" msgid "Refetch contact data" msgstr "" -#: mod/crepair.php:169 mod/admin.php:1108 mod/admin.php:1120 mod/admin.php:1121 -#: mod/admin.php:1134 mod/settings.php:650 mod/settings.php:676 +#: mod/crepair.php:169 mod/admin.php:1111 mod/admin.php:1123 mod/admin.php:1124 +#: mod/admin.php:1137 mod/settings.php:650 mod/settings.php:676 msgid "Name" msgstr "" @@ -1885,27 +1890,28 @@ msgstr "" msgid "Access denied." msgstr "" -#: mod/dirfind.php:188 mod/allfriends.php:82 mod/match.php:84 -#: mod/suggest.php:97 include/contact_widgets.php:10 include/identity.php:188 +#: mod/dirfind.php:188 mod/allfriends.php:82 mod/match.php:85 +#: mod/suggest.php:98 include/contact_widgets.php:10 include/identity.php:193 msgid "Connect" msgstr "" #: mod/dirfind.php:189 mod/allfriends.php:66 mod/match.php:70 -#: mod/directory.php:156 mod/suggest.php:81 include/Contact.php:335 -#: include/conversation.php:912 include/conversation.php:926 +#: mod/directory.php:156 mod/suggest.php:81 include/Contact.php:307 +#: include/Contact.php:320 include/Contact.php:362 include/conversation.php:912 +#: include/conversation.php:926 msgid "View Profile" msgstr "" -#: mod/dirfind.php:217 +#: mod/dirfind.php:218 #, php-format msgid "People Search - %s" msgstr "" -#: mod/dirfind.php:224 mod/match.php:104 +#: mod/dirfind.php:225 mod/match.php:105 msgid "No matches" msgstr "" -#: mod/fbrowser.php:32 include/identity.php:649 include/nav.php:77 +#: mod/fbrowser.php:32 include/identity.php:666 include/nav.php:77 #: view/theme/diabook/theme.php:126 msgid "Photos" msgstr "" @@ -1928,19 +1934,19 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: mod/admin.php:127 mod/admin.php:709 +#: mod/admin.php:127 mod/admin.php:711 msgid "Site" msgstr "" -#: mod/admin.php:128 mod/admin.php:653 mod/admin.php:1103 mod/admin.php:1118 +#: mod/admin.php:128 mod/admin.php:655 mod/admin.php:1106 mod/admin.php:1121 msgid "Users" msgstr "" -#: mod/admin.php:129 mod/admin.php:1207 mod/admin.php:1267 mod/settings.php:66 +#: mod/admin.php:129 mod/admin.php:1210 mod/admin.php:1270 mod/settings.php:66 msgid "Plugins" msgstr "" -#: mod/admin.php:130 mod/admin.php:1452 mod/admin.php:1503 +#: mod/admin.php:130 mod/admin.php:1455 mod/admin.php:1506 msgid "Themes" msgstr "" @@ -1952,7 +1958,7 @@ msgstr "" msgid "Inspect Queue" msgstr "" -#: mod/admin.php:147 mod/admin.php:156 mod/admin.php:1591 +#: mod/admin.php:147 mod/admin.php:156 mod/admin.php:1594 msgid "Logs" msgstr "" @@ -1980,9 +1986,9 @@ msgstr "" msgid "User registrations waiting for confirmation" msgstr "" -#: mod/admin.php:222 mod/admin.php:272 mod/admin.php:708 mod/admin.php:1102 -#: mod/admin.php:1206 mod/admin.php:1266 mod/admin.php:1451 mod/admin.php:1502 -#: mod/admin.php:1590 +#: mod/admin.php:222 mod/admin.php:272 mod/admin.php:710 mod/admin.php:1105 +#: mod/admin.php:1209 mod/admin.php:1269 mod/admin.php:1454 mod/admin.php:1505 +#: mod/admin.php:1593 msgid "Administration" msgstr "" @@ -2013,19 +2019,19 @@ msgid "" "eventually deleted if the delivery fails permanently." msgstr "" -#: mod/admin.php:243 mod/admin.php:1056 +#: mod/admin.php:243 mod/admin.php:1059 msgid "Normal Account" msgstr "" -#: mod/admin.php:244 mod/admin.php:1057 +#: mod/admin.php:244 mod/admin.php:1060 msgid "Soapbox Account" msgstr "" -#: mod/admin.php:245 mod/admin.php:1058 +#: mod/admin.php:245 mod/admin.php:1061 msgid "Community/Celebrity Account" msgstr "" -#: mod/admin.php:246 mod/admin.php:1059 +#: mod/admin.php:246 mod/admin.php:1062 msgid "Automatic Friend Account" msgstr "" @@ -2065,615 +2071,625 @@ msgstr "" msgid "Can not parse base url. Must have at least ://" msgstr "" -#: mod/admin.php:585 +#: mod/admin.php:587 msgid "RINO2 needs mcrypt php extension to work." msgstr "" -#: mod/admin.php:593 +#: mod/admin.php:595 msgid "Site settings updated." msgstr "" -#: mod/admin.php:617 mod/settings.php:901 +#: mod/admin.php:619 mod/settings.php:901 msgid "No special theme for mobile devices" msgstr "" -#: mod/admin.php:636 +#: mod/admin.php:638 msgid "No community page" msgstr "" -#: mod/admin.php:637 +#: mod/admin.php:639 msgid "Public postings from users of this site" msgstr "" -#: mod/admin.php:638 +#: mod/admin.php:640 msgid "Global community page" msgstr "" -#: mod/admin.php:644 +#: mod/admin.php:646 msgid "At post arrival" msgstr "" -#: mod/admin.php:645 include/contact_selectors.php:56 +#: mod/admin.php:647 include/contact_selectors.php:56 msgid "Frequently" msgstr "" -#: mod/admin.php:646 include/contact_selectors.php:57 +#: mod/admin.php:648 include/contact_selectors.php:57 msgid "Hourly" msgstr "" -#: mod/admin.php:647 include/contact_selectors.php:58 +#: mod/admin.php:649 include/contact_selectors.php:58 msgid "Twice daily" msgstr "" -#: mod/admin.php:648 include/contact_selectors.php:59 +#: mod/admin.php:650 include/contact_selectors.php:59 msgid "Daily" msgstr "" -#: mod/admin.php:654 +#: mod/admin.php:656 msgid "Users, Global Contacts" msgstr "" -#: mod/admin.php:655 +#: mod/admin.php:657 msgid "Users, Global Contacts/fallback" msgstr "" -#: mod/admin.php:659 +#: mod/admin.php:661 msgid "One month" msgstr "" -#: mod/admin.php:660 +#: mod/admin.php:662 msgid "Three months" msgstr "" -#: mod/admin.php:661 +#: mod/admin.php:663 msgid "Half a year" msgstr "" -#: mod/admin.php:662 +#: mod/admin.php:664 msgid "One year" msgstr "" -#: mod/admin.php:667 +#: mod/admin.php:669 msgid "Multi user instance" msgstr "" -#: mod/admin.php:690 +#: mod/admin.php:692 msgid "Closed" msgstr "" -#: mod/admin.php:691 +#: mod/admin.php:693 msgid "Requires approval" msgstr "" -#: mod/admin.php:692 +#: mod/admin.php:694 msgid "Open" msgstr "" -#: mod/admin.php:696 +#: mod/admin.php:698 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: mod/admin.php:697 +#: mod/admin.php:699 msgid "Force all links to use SSL" msgstr "" -#: mod/admin.php:698 +#: mod/admin.php:700 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: mod/admin.php:710 mod/admin.php:1268 mod/admin.php:1504 mod/admin.php:1592 +#: mod/admin.php:712 mod/admin.php:1271 mod/admin.php:1507 mod/admin.php:1595 #: mod/settings.php:648 mod/settings.php:758 mod/settings.php:802 #: mod/settings.php:871 mod/settings.php:957 mod/settings.php:1192 msgid "Save Settings" msgstr "" -#: mod/admin.php:711 mod/register.php:260 +#: mod/admin.php:713 mod/register.php:263 msgid "Registration" msgstr "" -#: mod/admin.php:712 +#: mod/admin.php:714 msgid "File upload" msgstr "" -#: mod/admin.php:713 +#: mod/admin.php:715 msgid "Policies" msgstr "" -#: mod/admin.php:714 +#: mod/admin.php:716 msgid "Advanced" msgstr "" -#: mod/admin.php:715 +#: mod/admin.php:717 msgid "Auto Discovered Contact Directory" msgstr "" -#: mod/admin.php:716 +#: mod/admin.php:718 msgid "Performance" msgstr "" -#: mod/admin.php:717 +#: mod/admin.php:719 msgid "" "Relocate - WARNING: advanced function. Could make this server unreachable." msgstr "" -#: mod/admin.php:720 +#: mod/admin.php:722 msgid "Site name" msgstr "" -#: mod/admin.php:721 +#: mod/admin.php:723 msgid "Host name" msgstr "" -#: mod/admin.php:722 +#: mod/admin.php:724 msgid "Sender Email" msgstr "" -#: mod/admin.php:722 +#: mod/admin.php:724 msgid "" "The email address your server shall use to send notification emails from." msgstr "" -#: mod/admin.php:723 +#: mod/admin.php:725 msgid "Banner/Logo" msgstr "" -#: mod/admin.php:724 +#: mod/admin.php:726 msgid "Shortcut icon" msgstr "" -#: mod/admin.php:724 +#: mod/admin.php:726 msgid "Link to an icon that will be used for browsers." msgstr "" -#: mod/admin.php:725 +#: mod/admin.php:727 msgid "Touch icon" msgstr "" -#: mod/admin.php:725 +#: mod/admin.php:727 msgid "Link to an icon that will be used for tablets and mobiles." msgstr "" -#: mod/admin.php:726 +#: mod/admin.php:728 msgid "Additional Info" msgstr "" -#: mod/admin.php:726 +#: mod/admin.php:728 #, php-format msgid "" "For public servers: you can add additional information here that will be " "listed at %s/siteinfo." msgstr "" -#: mod/admin.php:727 +#: mod/admin.php:729 msgid "System language" msgstr "" -#: mod/admin.php:728 +#: mod/admin.php:730 msgid "System theme" msgstr "" -#: mod/admin.php:728 +#: mod/admin.php:730 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: mod/admin.php:729 +#: mod/admin.php:731 msgid "Mobile system theme" msgstr "" -#: mod/admin.php:729 +#: mod/admin.php:731 msgid "Theme for mobile devices" msgstr "" -#: mod/admin.php:730 +#: mod/admin.php:732 msgid "SSL link policy" msgstr "" -#: mod/admin.php:730 +#: mod/admin.php:732 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: mod/admin.php:731 +#: mod/admin.php:733 msgid "Force SSL" msgstr "" -#: mod/admin.php:731 +#: mod/admin.php:733 msgid "" "Force all Non-SSL requests to SSL - Attention: on some systems it could lead " "to endless loops." msgstr "" -#: mod/admin.php:732 +#: mod/admin.php:734 msgid "Old style 'Share'" msgstr "" -#: mod/admin.php:732 +#: mod/admin.php:734 msgid "Deactivates the bbcode element 'share' for repeating items." msgstr "" -#: mod/admin.php:733 +#: mod/admin.php:735 msgid "Hide help entry from navigation menu" msgstr "" -#: mod/admin.php:733 +#: mod/admin.php:735 msgid "" "Hides the menu entry for the Help pages from the navigation menu. You can " "still access it calling /help directly." msgstr "" -#: mod/admin.php:734 +#: mod/admin.php:736 msgid "Single user instance" msgstr "" -#: mod/admin.php:734 +#: mod/admin.php:736 msgid "Make this instance multi-user or single-user for the named user" msgstr "" -#: mod/admin.php:735 +#: mod/admin.php:737 msgid "Maximum image size" msgstr "" -#: mod/admin.php:735 +#: mod/admin.php:737 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: mod/admin.php:736 +#: mod/admin.php:738 msgid "Maximum image length" msgstr "" -#: mod/admin.php:736 +#: mod/admin.php:738 msgid "" "Maximum length in pixels of the longest side of uploaded images. Default is " "-1, which means no limits." msgstr "" -#: mod/admin.php:737 +#: mod/admin.php:739 msgid "JPEG image quality" msgstr "" -#: mod/admin.php:737 +#: mod/admin.php:739 msgid "" "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " "100, which is full quality." msgstr "" -#: mod/admin.php:739 +#: mod/admin.php:741 msgid "Register policy" msgstr "" -#: mod/admin.php:740 +#: mod/admin.php:742 msgid "Maximum Daily Registrations" msgstr "" -#: mod/admin.php:740 +#: mod/admin.php:742 msgid "" "If registration is permitted above, this sets the maximum number of new user " "registrations to accept per day. If register is set to closed, this setting " "has no effect." msgstr "" -#: mod/admin.php:741 +#: mod/admin.php:743 msgid "Register text" msgstr "" -#: mod/admin.php:741 +#: mod/admin.php:743 msgid "Will be displayed prominently on the registration page." msgstr "" -#: mod/admin.php:742 +#: mod/admin.php:744 msgid "Accounts abandoned after x days" msgstr "" -#: mod/admin.php:742 +#: mod/admin.php:744 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: mod/admin.php:743 +#: mod/admin.php:745 msgid "Allowed friend domains" msgstr "" -#: mod/admin.php:743 +#: mod/admin.php:745 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: mod/admin.php:744 +#: mod/admin.php:746 msgid "Allowed email domains" msgstr "" -#: mod/admin.php:744 +#: mod/admin.php:746 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: mod/admin.php:745 +#: mod/admin.php:747 msgid "Block public" msgstr "" -#: mod/admin.php:745 +#: mod/admin.php:747 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: mod/admin.php:746 +#: mod/admin.php:748 msgid "Force publish" msgstr "" -#: mod/admin.php:746 +#: mod/admin.php:748 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: mod/admin.php:747 +#: mod/admin.php:749 msgid "Global directory URL" msgstr "" -#: mod/admin.php:747 +#: mod/admin.php:749 msgid "" "URL to the global directory. If this is not set, the global directory is " "completely unavailable to the application." msgstr "" -#: mod/admin.php:748 +#: mod/admin.php:750 msgid "Allow threaded items" msgstr "" -#: mod/admin.php:748 +#: mod/admin.php:750 msgid "Allow infinite level threading for items on this site." msgstr "" -#: mod/admin.php:749 +#: mod/admin.php:751 msgid "Private posts by default for new users" msgstr "" -#: mod/admin.php:749 +#: mod/admin.php:751 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." msgstr "" -#: mod/admin.php:750 +#: mod/admin.php:752 msgid "Don't include post content in email notifications" msgstr "" -#: mod/admin.php:750 +#: mod/admin.php:752 msgid "" "Don't include the content of a post/comment/private message/etc. in the " "email notifications that are sent out from this site, as a privacy measure." msgstr "" -#: mod/admin.php:751 +#: mod/admin.php:753 msgid "Disallow public access to addons listed in the apps menu." msgstr "" -#: mod/admin.php:751 +#: mod/admin.php:753 msgid "" "Checking this box will restrict addons listed in the apps menu to members " "only." msgstr "" -#: mod/admin.php:752 +#: mod/admin.php:754 msgid "Don't embed private images in posts" msgstr "" -#: mod/admin.php:752 +#: mod/admin.php:754 msgid "" "Don't replace locally-hosted private photos in posts with an embedded copy " "of the image. This means that contacts who receive posts containing private " "photos will have to authenticate and load each image, which may take a while." msgstr "" -#: mod/admin.php:753 +#: mod/admin.php:755 msgid "Allow Users to set remote_self" msgstr "" -#: mod/admin.php:753 +#: mod/admin.php:755 msgid "" "With checking this, every user is allowed to mark every contact as a " "remote_self in the repair contact dialog. Setting this flag on a contact " "causes mirroring every posting of that contact in the users stream." msgstr "" -#: mod/admin.php:754 +#: mod/admin.php:756 msgid "Block multiple registrations" msgstr "" -#: mod/admin.php:754 +#: mod/admin.php:756 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: mod/admin.php:755 +#: mod/admin.php:757 msgid "OpenID support" msgstr "" -#: mod/admin.php:755 +#: mod/admin.php:757 msgid "OpenID support for registration and logins." msgstr "" -#: mod/admin.php:756 +#: mod/admin.php:758 msgid "Fullname check" msgstr "" -#: mod/admin.php:756 +#: mod/admin.php:758 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: mod/admin.php:757 +#: mod/admin.php:759 msgid "UTF-8 Regular expressions" msgstr "" -#: mod/admin.php:757 +#: mod/admin.php:759 msgid "Use PHP UTF8 regular expressions" msgstr "" -#: mod/admin.php:758 +#: mod/admin.php:760 msgid "Community Page Style" msgstr "" -#: mod/admin.php:758 +#: mod/admin.php:760 msgid "" "Type of community page to show. 'Global community' shows every public " "posting from an open distributed network that arrived on this server." msgstr "" -#: mod/admin.php:759 +#: mod/admin.php:761 msgid "Posts per user on community page" msgstr "" -#: mod/admin.php:759 +#: mod/admin.php:761 msgid "" "The maximum number of posts per user on the community page. (Not valid for " "'Global Community')" msgstr "" -#: mod/admin.php:760 +#: mod/admin.php:762 msgid "Enable OStatus support" msgstr "" -#: mod/admin.php:760 +#: mod/admin.php:762 msgid "" "Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "" -#: mod/admin.php:761 +#: mod/admin.php:763 msgid "OStatus conversation completion interval" msgstr "" -#: mod/admin.php:761 +#: mod/admin.php:763 msgid "" "How often shall the poller check for new entries in OStatus conversations? " "This can be a very ressource task." msgstr "" -#: mod/admin.php:762 +#: mod/admin.php:764 msgid "OStatus support can only be enabled if threading is enabled." msgstr "" -#: mod/admin.php:764 +#: mod/admin.php:766 msgid "" "Diaspora support can't be enabled because Friendica was installed into a sub " "directory." msgstr "" -#: mod/admin.php:765 +#: mod/admin.php:767 msgid "Enable Diaspora support" msgstr "" -#: mod/admin.php:765 +#: mod/admin.php:767 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: mod/admin.php:766 +#: mod/admin.php:768 msgid "Only allow Friendica contacts" msgstr "" -#: mod/admin.php:766 +#: mod/admin.php:768 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: mod/admin.php:767 +#: mod/admin.php:769 msgid "Verify SSL" msgstr "" -#: mod/admin.php:767 +#: mod/admin.php:769 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: mod/admin.php:768 +#: mod/admin.php:770 msgid "Proxy user" msgstr "" -#: mod/admin.php:769 +#: mod/admin.php:771 msgid "Proxy URL" msgstr "" -#: mod/admin.php:770 +#: mod/admin.php:772 msgid "Network timeout" msgstr "" -#: mod/admin.php:770 +#: mod/admin.php:772 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: mod/admin.php:771 +#: mod/admin.php:773 msgid "Delivery interval" msgstr "" -#: mod/admin.php:771 +#: mod/admin.php:773 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: mod/admin.php:772 +#: mod/admin.php:774 msgid "Poll interval" msgstr "" -#: mod/admin.php:772 +#: mod/admin.php:774 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: mod/admin.php:773 +#: mod/admin.php:775 msgid "Maximum Load Average" msgstr "" -#: mod/admin.php:773 +#: mod/admin.php:775 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: mod/admin.php:774 +#: mod/admin.php:776 msgid "Maximum Load Average (Frontend)" msgstr "" -#: mod/admin.php:774 +#: mod/admin.php:776 msgid "Maximum system load before the frontend quits service - default 50." msgstr "" -#: mod/admin.php:776 +#: mod/admin.php:777 +msgid "Maximum table size for optimization" +msgstr "" + +#: mod/admin.php:777 +msgid "" +"Maximum table size (in MB) for the automatic optimization - default 100 MB. " +"Enter -1 to disable it." +msgstr "" + +#: mod/admin.php:779 msgid "Periodical check of global contacts" msgstr "" -#: mod/admin.php:776 +#: mod/admin.php:779 msgid "" "If enabled, the global contacts are checked periodically for missing or " "outdated data and the vitality of the contacts and servers." msgstr "" -#: mod/admin.php:777 +#: mod/admin.php:780 msgid "Days between requery" msgstr "" -#: mod/admin.php:777 +#: mod/admin.php:780 msgid "Number of days after which a server is requeried for his contacts." msgstr "" -#: mod/admin.php:778 +#: mod/admin.php:781 msgid "Discover contacts from other servers" msgstr "" -#: mod/admin.php:778 +#: mod/admin.php:781 msgid "" "Periodically query other servers for contacts. You can choose between " "'users': the users on the remote system, 'Global Contacts': active contacts " @@ -2683,32 +2699,32 @@ msgid "" "Global Contacts'." msgstr "" -#: mod/admin.php:779 +#: mod/admin.php:782 msgid "Timeframe for fetching global contacts" msgstr "" -#: mod/admin.php:779 +#: mod/admin.php:782 msgid "" "When the discovery is activated, this value defines the timeframe for the " "activity of the global contacts that are fetched from other servers." msgstr "" -#: mod/admin.php:780 +#: mod/admin.php:783 msgid "Search the local directory" msgstr "" -#: mod/admin.php:780 +#: mod/admin.php:783 msgid "" "Search the local directory instead of the global directory. When searching " "locally, every search will be executed on the global directory in the " "background. This improves the search results when the search is repeated." msgstr "" -#: mod/admin.php:782 +#: mod/admin.php:785 msgid "Publish server information" msgstr "" -#: mod/admin.php:782 +#: mod/admin.php:785 msgid "" "If enabled, general server and usage data will be published. The data " "contains the name and version of the server, number of users with public " @@ -2716,204 +2732,204 @@ msgid "" "href='http://the-federation.info/'>the-federation.info for details." msgstr "" -#: mod/admin.php:784 +#: mod/admin.php:787 msgid "Use MySQL full text engine" msgstr "" -#: mod/admin.php:784 +#: mod/admin.php:787 msgid "" "Activates the full text engine. Speeds up search - but can only search for " "four and more characters." msgstr "" -#: mod/admin.php:785 +#: mod/admin.php:788 msgid "Suppress Language" msgstr "" -#: mod/admin.php:785 +#: mod/admin.php:788 msgid "Suppress language information in meta information about a posting." msgstr "" -#: mod/admin.php:786 +#: mod/admin.php:789 msgid "Suppress Tags" msgstr "" -#: mod/admin.php:786 +#: mod/admin.php:789 msgid "Suppress showing a list of hashtags at the end of the posting." msgstr "" -#: mod/admin.php:787 +#: mod/admin.php:790 msgid "Path to item cache" msgstr "" -#: mod/admin.php:787 +#: mod/admin.php:790 msgid "The item caches buffers generated bbcode and external images." msgstr "" -#: mod/admin.php:788 +#: mod/admin.php:791 msgid "Cache duration in seconds" msgstr "" -#: mod/admin.php:788 +#: mod/admin.php:791 msgid "" "How long should the cache files be hold? Default value is 86400 seconds (One " "day). To disable the item cache, set the value to -1." msgstr "" -#: mod/admin.php:789 +#: mod/admin.php:792 msgid "Maximum numbers of comments per post" msgstr "" -#: mod/admin.php:789 +#: mod/admin.php:792 msgid "How much comments should be shown for each post? Default value is 100." msgstr "" -#: mod/admin.php:790 +#: mod/admin.php:793 msgid "Path for lock file" msgstr "" -#: mod/admin.php:790 +#: mod/admin.php:793 msgid "" "The lock file is used to avoid multiple pollers at one time. Only define a " "folder here." msgstr "" -#: mod/admin.php:791 +#: mod/admin.php:794 msgid "Temp path" msgstr "" -#: mod/admin.php:791 +#: mod/admin.php:794 msgid "" "If you have a restricted system where the webserver can't access the system " "temp path, enter another path here." msgstr "" -#: mod/admin.php:792 +#: mod/admin.php:795 msgid "Base path to installation" msgstr "" -#: mod/admin.php:792 +#: mod/admin.php:795 msgid "" "If the system cannot detect the correct path to your installation, enter the " "correct path here. This setting should only be set if you are using a " "restricted system and symbolic links to your webroot." msgstr "" -#: mod/admin.php:793 +#: mod/admin.php:796 msgid "Disable picture proxy" msgstr "" -#: mod/admin.php:793 +#: mod/admin.php:796 msgid "" "The picture proxy increases performance and privacy. It shouldn't be used on " "systems with very low bandwith." msgstr "" -#: mod/admin.php:794 +#: mod/admin.php:797 msgid "Enable old style pager" msgstr "" -#: mod/admin.php:794 +#: mod/admin.php:797 msgid "" "The old style pager has page numbers but slows down massively the page speed." msgstr "" -#: mod/admin.php:795 +#: mod/admin.php:798 msgid "Only search in tags" msgstr "" -#: mod/admin.php:795 +#: mod/admin.php:798 msgid "On large systems the text search can slow down the system extremely." msgstr "" -#: mod/admin.php:797 +#: mod/admin.php:800 msgid "New base url" msgstr "" -#: mod/admin.php:797 +#: mod/admin.php:800 msgid "" "Change base url for this server. Sends relocate message to all DFRN contacts " "of all users." msgstr "" -#: mod/admin.php:799 +#: mod/admin.php:802 msgid "RINO Encryption" msgstr "" -#: mod/admin.php:799 +#: mod/admin.php:802 msgid "Encryption layer between nodes." msgstr "" -#: mod/admin.php:800 +#: mod/admin.php:803 msgid "Embedly API key" msgstr "" -#: mod/admin.php:800 +#: mod/admin.php:803 msgid "" "Embedly is used to fetch additional data for " "web pages. This is an optional parameter." msgstr "" -#: mod/admin.php:818 +#: mod/admin.php:821 msgid "Update has been marked successful" msgstr "" -#: mod/admin.php:826 -#, php-format -msgid "Database structure update %s was successfully applied." -msgstr "" - #: mod/admin.php:829 #, php-format -msgid "Executing of database structure update %s failed with error: %s" +msgid "Database structure update %s was successfully applied." msgstr "" -#: mod/admin.php:841 +#: mod/admin.php:832 #, php-format -msgid "Executing %s failed with error: %s" +msgid "Executing of database structure update %s failed with error: %s" msgstr "" #: mod/admin.php:844 #, php-format +msgid "Executing %s failed with error: %s" +msgstr "" + +#: mod/admin.php:847 +#, php-format msgid "Update %s was successfully applied." msgstr "" -#: mod/admin.php:848 +#: mod/admin.php:851 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: mod/admin.php:850 +#: mod/admin.php:853 #, php-format msgid "There was no additional update function %s that needed to be called." msgstr "" -#: mod/admin.php:869 +#: mod/admin.php:872 msgid "No failed updates." msgstr "" -#: mod/admin.php:870 +#: mod/admin.php:873 msgid "Check database structure" msgstr "" -#: mod/admin.php:875 +#: mod/admin.php:878 msgid "Failed Updates" msgstr "" -#: mod/admin.php:876 +#: mod/admin.php:879 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "" -#: mod/admin.php:877 +#: mod/admin.php:880 msgid "Mark success (if update was manually applied)" msgstr "" -#: mod/admin.php:878 +#: mod/admin.php:881 msgid "Attempt to execute this update step automatically" msgstr "" -#: mod/admin.php:910 +#: mod/admin.php:913 #, php-format msgid "" "\n" @@ -2921,7 +2937,7 @@ msgid "" "\t\t\t\tthe administrator of %2$s has set up an account for you." msgstr "" -#: mod/admin.php:913 +#: mod/admin.php:916 #, php-format msgid "" "\n" @@ -2957,295 +2973,295 @@ msgid "" "\t\t\tThank you and welcome to %4$s." msgstr "" -#: mod/admin.php:945 include/user.php:421 +#: mod/admin.php:948 include/user.php:423 #, php-format msgid "Registration details for %s" msgstr "" -#: mod/admin.php:957 +#: mod/admin.php:960 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: mod/admin.php:964 +#: mod/admin.php:967 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: mod/admin.php:1003 +#: mod/admin.php:1006 #, php-format msgid "User '%s' deleted" msgstr "" -#: mod/admin.php:1011 +#: mod/admin.php:1014 #, php-format msgid "User '%s' unblocked" msgstr "" -#: mod/admin.php:1011 +#: mod/admin.php:1014 #, php-format msgid "User '%s' blocked" msgstr "" -#: mod/admin.php:1104 +#: mod/admin.php:1107 msgid "Add User" msgstr "" -#: mod/admin.php:1105 +#: mod/admin.php:1108 msgid "select all" msgstr "" -#: mod/admin.php:1106 +#: mod/admin.php:1109 msgid "User registrations waiting for confirm" msgstr "" -#: mod/admin.php:1107 +#: mod/admin.php:1110 msgid "User waiting for permanent deletion" msgstr "" -#: mod/admin.php:1108 +#: mod/admin.php:1111 msgid "Request date" msgstr "" -#: mod/admin.php:1108 mod/admin.php:1120 mod/admin.php:1121 mod/admin.php:1136 +#: mod/admin.php:1111 mod/admin.php:1123 mod/admin.php:1124 mod/admin.php:1139 #: include/contact_selectors.php:79 include/contact_selectors.php:86 msgid "Email" msgstr "" -#: mod/admin.php:1109 +#: mod/admin.php:1112 msgid "No registrations." msgstr "" -#: mod/admin.php:1111 +#: mod/admin.php:1114 msgid "Deny" msgstr "" -#: mod/admin.php:1115 +#: mod/admin.php:1118 msgid "Site admin" msgstr "" -#: mod/admin.php:1116 +#: mod/admin.php:1119 msgid "Account expired" msgstr "" -#: mod/admin.php:1119 +#: mod/admin.php:1122 msgid "New User" msgstr "" -#: mod/admin.php:1120 mod/admin.php:1121 +#: mod/admin.php:1123 mod/admin.php:1124 msgid "Register date" msgstr "" -#: mod/admin.php:1120 mod/admin.php:1121 +#: mod/admin.php:1123 mod/admin.php:1124 msgid "Last login" msgstr "" -#: mod/admin.php:1120 mod/admin.php:1121 +#: mod/admin.php:1123 mod/admin.php:1124 msgid "Last item" msgstr "" -#: mod/admin.php:1120 +#: mod/admin.php:1123 msgid "Deleted since" msgstr "" -#: mod/admin.php:1121 mod/settings.php:41 +#: mod/admin.php:1124 mod/settings.php:41 msgid "Account" msgstr "" -#: mod/admin.php:1123 +#: mod/admin.php:1126 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: mod/admin.php:1124 +#: mod/admin.php:1127 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: mod/admin.php:1134 +#: mod/admin.php:1137 msgid "Name of the new user." msgstr "" -#: mod/admin.php:1135 +#: mod/admin.php:1138 msgid "Nickname" msgstr "" -#: mod/admin.php:1135 +#: mod/admin.php:1138 msgid "Nickname of the new user." msgstr "" -#: mod/admin.php:1136 +#: mod/admin.php:1139 msgid "Email address of the new user." msgstr "" -#: mod/admin.php:1169 +#: mod/admin.php:1172 #, php-format msgid "Plugin %s disabled." msgstr "" -#: mod/admin.php:1173 +#: mod/admin.php:1176 #, php-format msgid "Plugin %s enabled." msgstr "" -#: mod/admin.php:1183 mod/admin.php:1407 +#: mod/admin.php:1186 mod/admin.php:1410 msgid "Disable" msgstr "" -#: mod/admin.php:1185 mod/admin.php:1409 +#: mod/admin.php:1188 mod/admin.php:1412 msgid "Enable" msgstr "" -#: mod/admin.php:1208 mod/admin.php:1453 +#: mod/admin.php:1211 mod/admin.php:1456 msgid "Toggle" msgstr "" -#: mod/admin.php:1216 mod/admin.php:1463 +#: mod/admin.php:1219 mod/admin.php:1466 msgid "Author: " msgstr "" -#: mod/admin.php:1217 mod/admin.php:1464 +#: mod/admin.php:1220 mod/admin.php:1467 msgid "Maintainer: " msgstr "" -#: mod/admin.php:1269 +#: mod/admin.php:1272 msgid "Reload active plugins" msgstr "" -#: mod/admin.php:1367 +#: mod/admin.php:1370 msgid "No themes found." msgstr "" -#: mod/admin.php:1445 +#: mod/admin.php:1448 msgid "Screenshot" msgstr "" -#: mod/admin.php:1505 +#: mod/admin.php:1508 msgid "Reload active themes" msgstr "" -#: mod/admin.php:1509 +#: mod/admin.php:1512 msgid "[Experimental]" msgstr "" -#: mod/admin.php:1510 +#: mod/admin.php:1513 msgid "[Unsupported]" msgstr "" -#: mod/admin.php:1537 +#: mod/admin.php:1540 msgid "Log settings updated." msgstr "" -#: mod/admin.php:1593 +#: mod/admin.php:1596 msgid "Clear" msgstr "" -#: mod/admin.php:1599 +#: mod/admin.php:1602 msgid "Enable Debugging" msgstr "" -#: mod/admin.php:1600 +#: mod/admin.php:1603 msgid "Log file" msgstr "" -#: mod/admin.php:1600 +#: mod/admin.php:1603 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: mod/admin.php:1601 +#: mod/admin.php:1604 msgid "Log level" msgstr "" -#: mod/admin.php:1651 include/acl_selectors.php:347 +#: mod/admin.php:1654 include/acl_selectors.php:348 msgid "Close" msgstr "" -#: mod/admin.php:1657 +#: mod/admin.php:1660 msgid "FTP Host" msgstr "" -#: mod/admin.php:1658 +#: mod/admin.php:1661 msgid "FTP Path" msgstr "" -#: mod/admin.php:1659 +#: mod/admin.php:1662 msgid "FTP User" msgstr "" -#: mod/admin.php:1660 +#: mod/admin.php:1663 msgid "FTP Password" msgstr "" -#: mod/network.php:143 +#: mod/network.php:146 #, php-format msgid "Search Results For: %s" msgstr "" -#: mod/network.php:195 mod/search.php:25 +#: mod/network.php:191 mod/search.php:25 msgid "Remove term" msgstr "" -#: mod/network.php:204 mod/search.php:34 include/features.php:43 +#: mod/network.php:200 mod/search.php:34 include/features.php:79 msgid "Saved Searches" msgstr "" -#: mod/network.php:205 include/group.php:279 +#: mod/network.php:201 include/group.php:293 msgid "add" msgstr "" -#: mod/network.php:366 +#: mod/network.php:362 msgid "Commented Order" msgstr "" -#: mod/network.php:369 +#: mod/network.php:365 msgid "Sort by Comment Date" msgstr "" -#: mod/network.php:374 +#: mod/network.php:370 msgid "Posted Order" msgstr "" -#: mod/network.php:377 +#: mod/network.php:373 msgid "Sort by Post Date" msgstr "" -#: mod/network.php:388 +#: mod/network.php:384 msgid "Posts that mention or involve you" msgstr "" -#: mod/network.php:396 +#: mod/network.php:392 msgid "New" msgstr "" -#: mod/network.php:399 +#: mod/network.php:395 msgid "Activity Stream - by date" msgstr "" -#: mod/network.php:407 +#: mod/network.php:403 msgid "Shared Links" msgstr "" -#: mod/network.php:410 +#: mod/network.php:406 msgid "Interesting Links" msgstr "" -#: mod/network.php:418 +#: mod/network.php:414 msgid "Starred" msgstr "" -#: mod/network.php:421 +#: mod/network.php:417 msgid "Favourite Posts" msgstr "" -#: mod/network.php:480 +#: mod/network.php:476 #, php-format msgid "Warning: This group contains %s member from an insecure network." msgid_plural "" @@ -3253,33 +3269,28 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: mod/network.php:483 +#: mod/network.php:479 msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: mod/network.php:550 mod/content.php:119 +#: mod/network.php:546 mod/content.php:119 msgid "No such group" msgstr "" -#: mod/network.php:567 mod/content.php:130 +#: mod/network.php:563 mod/content.php:130 msgid "Group is empty" msgstr "" -#: mod/network.php:578 mod/content.php:135 +#: mod/network.php:574 mod/content.php:135 #, php-format msgid "Group: %s" msgstr "" -#: mod/network.php:596 -#, php-format -msgid "Contact: %s" -msgstr "" - -#: mod/network.php:600 +#: mod/network.php:606 msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: mod/network.php:605 +#: mod/network.php:611 msgid "Invalid contact." msgstr "" @@ -3287,10 +3298,6 @@ msgstr "" msgid "No friends to display." msgstr "" -#: mod/allfriends.php:79 mod/common.php:122 -msgid "Forum" -msgstr "" - #: mod/allfriends.php:92 #, php-format msgid "Friends of %s" @@ -3332,31 +3339,31 @@ msgstr "" msgid "Sat" msgstr "" -#: mod/events.php:208 mod/settings.php:936 include/text.php:1267 +#: mod/events.php:208 mod/settings.php:936 include/text.php:1274 msgid "Sunday" msgstr "" -#: mod/events.php:209 mod/settings.php:936 include/text.php:1267 +#: mod/events.php:209 mod/settings.php:936 include/text.php:1274 msgid "Monday" msgstr "" -#: mod/events.php:210 include/text.php:1267 +#: mod/events.php:210 include/text.php:1274 msgid "Tuesday" msgstr "" -#: mod/events.php:211 include/text.php:1267 +#: mod/events.php:211 include/text.php:1274 msgid "Wednesday" msgstr "" -#: mod/events.php:212 include/text.php:1267 +#: mod/events.php:212 include/text.php:1274 msgid "Thursday" msgstr "" -#: mod/events.php:213 include/text.php:1267 +#: mod/events.php:213 include/text.php:1274 msgid "Friday" msgstr "" -#: mod/events.php:214 include/text.php:1267 +#: mod/events.php:214 include/text.php:1274 msgid "Saturday" msgstr "" @@ -3376,7 +3383,7 @@ msgstr "" msgid "Apr" msgstr "" -#: mod/events.php:219 mod/events.php:231 include/text.php:1271 +#: mod/events.php:219 mod/events.php:231 include/text.php:1278 msgid "May" msgstr "" @@ -3408,47 +3415,47 @@ msgstr "" msgid "Dec" msgstr "" -#: mod/events.php:227 include/text.php:1271 +#: mod/events.php:227 include/text.php:1278 msgid "January" msgstr "" -#: mod/events.php:228 include/text.php:1271 +#: mod/events.php:228 include/text.php:1278 msgid "February" msgstr "" -#: mod/events.php:229 include/text.php:1271 +#: mod/events.php:229 include/text.php:1278 msgid "March" msgstr "" -#: mod/events.php:230 include/text.php:1271 +#: mod/events.php:230 include/text.php:1278 msgid "April" msgstr "" -#: mod/events.php:232 include/text.php:1271 +#: mod/events.php:232 include/text.php:1278 msgid "June" msgstr "" -#: mod/events.php:233 include/text.php:1271 +#: mod/events.php:233 include/text.php:1278 msgid "July" msgstr "" -#: mod/events.php:234 include/text.php:1271 +#: mod/events.php:234 include/text.php:1278 msgid "August" msgstr "" -#: mod/events.php:235 include/text.php:1271 +#: mod/events.php:235 include/text.php:1278 msgid "September" msgstr "" -#: mod/events.php:236 include/text.php:1271 +#: mod/events.php:236 include/text.php:1278 msgid "October" msgstr "" -#: mod/events.php:237 include/text.php:1271 +#: mod/events.php:237 include/text.php:1278 msgid "November" msgstr "" -#: mod/events.php:238 include/text.php:1271 +#: mod/events.php:238 include/text.php:1278 msgid "December" msgstr "" @@ -3476,11 +3483,11 @@ msgstr "" msgid "Edit event" msgstr "" -#: mod/events.php:421 include/text.php:1714 include/text.php:1721 +#: mod/events.php:421 include/text.php:1721 include/text.php:1728 msgid "link to source" msgstr "" -#: mod/events.php:456 include/identity.php:669 include/nav.php:79 +#: mod/events.php:456 include/identity.php:686 include/nav.php:79 #: include/nav.php:140 view/theme/diabook/theme.php:127 msgid "Events" msgstr "" @@ -3493,7 +3500,7 @@ msgstr "" msgid "Previous" msgstr "" -#: mod/events.php:459 mod/install.php:212 +#: mod/events.php:459 mod/install.php:220 msgid "Next" msgstr "" @@ -3583,14 +3590,15 @@ msgstr[0] "" msgstr[1] "" #: mod/content.php:607 object/Item.php:421 object/Item.php:434 -#: include/text.php:1992 +#: include/text.php:1999 msgid "comment" msgid_plural "comments" msgstr[0] "" msgstr[1] "" #: mod/content.php:608 boot.php:773 object/Item.php:422 -#: include/contact_widgets.php:205 include/items.php:5214 +#: include/contact_widgets.php:242 include/forums.php:110 +#: include/items.php:5152 view/theme/vier/theme.php:264 msgid "show more" msgstr "" @@ -3719,105 +3727,105 @@ msgstr "" msgid "Please enter your password for verification:" msgstr "" -#: mod/install.php:120 +#: mod/install.php:128 msgid "Friendica Communications Server - Setup" msgstr "" -#: mod/install.php:126 +#: mod/install.php:134 msgid "Could not connect to database." msgstr "" -#: mod/install.php:130 +#: mod/install.php:138 msgid "Could not create table." msgstr "" -#: mod/install.php:136 +#: mod/install.php:144 msgid "Your Friendica site database has been installed." msgstr "" -#: mod/install.php:141 +#: mod/install.php:149 msgid "" "You may need to import the file \"database.sql\" manually using phpmyadmin " "or mysql." msgstr "" -#: mod/install.php:142 mod/install.php:211 mod/install.php:569 +#: mod/install.php:150 mod/install.php:219 mod/install.php:577 msgid "Please see the file \"INSTALL.txt\"." msgstr "" -#: mod/install.php:154 +#: mod/install.php:162 msgid "Database already in use." msgstr "" -#: mod/install.php:208 +#: mod/install.php:216 msgid "System check" msgstr "" -#: mod/install.php:213 +#: mod/install.php:221 msgid "Check again" msgstr "" -#: mod/install.php:232 +#: mod/install.php:240 msgid "Database connection" msgstr "" -#: mod/install.php:233 +#: mod/install.php:241 msgid "" "In order to install Friendica we need to know how to connect to your " "database." msgstr "" -#: mod/install.php:234 +#: mod/install.php:242 msgid "" "Please contact your hosting provider or site administrator if you have " "questions about these settings." msgstr "" -#: mod/install.php:235 +#: mod/install.php:243 msgid "" "The database you specify below should already exist. If it does not, please " "create it before continuing." msgstr "" -#: mod/install.php:239 +#: mod/install.php:247 msgid "Database Server Name" msgstr "" -#: mod/install.php:240 +#: mod/install.php:248 msgid "Database Login Name" msgstr "" -#: mod/install.php:241 +#: mod/install.php:249 msgid "Database Login Password" msgstr "" -#: mod/install.php:242 +#: mod/install.php:250 msgid "Database Name" msgstr "" -#: mod/install.php:243 mod/install.php:282 +#: mod/install.php:251 mod/install.php:290 msgid "Site administrator email address" msgstr "" -#: mod/install.php:243 mod/install.php:282 +#: mod/install.php:251 mod/install.php:290 msgid "" "Your account email address must match this in order to use the web admin " "panel." msgstr "" -#: mod/install.php:247 mod/install.php:285 +#: mod/install.php:255 mod/install.php:293 msgid "Please select a default timezone for your website" msgstr "" -#: mod/install.php:272 +#: mod/install.php:280 msgid "Site settings" msgstr "" -#: mod/install.php:326 +#: mod/install.php:334 msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: mod/install.php:327 +#: mod/install.php:335 msgid "" "If you don't have a command line version of PHP installed on server, you " "will not be able to run background polling via cron. See 'Setup the poller'" msgstr "" -#: mod/install.php:331 +#: mod/install.php:339 msgid "PHP executable path" msgstr "" -#: mod/install.php:331 +#: mod/install.php:339 msgid "" "Enter full path to php executable. You can leave this blank to continue the " "installation." msgstr "" -#: mod/install.php:336 +#: mod/install.php:344 msgid "Command line PHP" msgstr "" -#: mod/install.php:345 +#: mod/install.php:353 msgid "PHP executable is not the php cli binary (could be cgi-fgci version)" msgstr "" -#: mod/install.php:346 +#: mod/install.php:354 msgid "Found PHP version: " msgstr "" -#: mod/install.php:348 +#: mod/install.php:356 msgid "PHP cli binary" msgstr "" -#: mod/install.php:359 +#: mod/install.php:367 msgid "" "The command line version of PHP on your system does not have " "\"register_argc_argv\" enabled." msgstr "" -#: mod/install.php:360 +#: mod/install.php:368 msgid "This is required for message delivery to work." msgstr "" -#: mod/install.php:362 +#: mod/install.php:370 msgid "PHP register_argc_argv" msgstr "" -#: mod/install.php:383 +#: mod/install.php:391 msgid "" "Error: the \"openssl_pkey_new\" function on this system is not able to " "generate encryption keys" msgstr "" -#: mod/install.php:384 +#: mod/install.php:392 msgid "" "If running under Windows, please see \"http://www.php.net/manual/en/openssl." "installation.php\"." msgstr "" -#: mod/install.php:386 +#: mod/install.php:394 msgid "Generate encryption keys" msgstr "" -#: mod/install.php:393 +#: mod/install.php:401 msgid "libCurl PHP module" msgstr "" -#: mod/install.php:394 +#: mod/install.php:402 msgid "GD graphics PHP module" msgstr "" -#: mod/install.php:395 +#: mod/install.php:403 msgid "OpenSSL PHP module" msgstr "" -#: mod/install.php:396 +#: mod/install.php:404 msgid "mysqli PHP module" msgstr "" -#: mod/install.php:397 +#: mod/install.php:405 msgid "mb_string PHP module" msgstr "" -#: mod/install.php:398 +#: mod/install.php:406 msgid "mcrypt PHP module" msgstr "" -#: mod/install.php:403 mod/install.php:405 +#: mod/install.php:411 mod/install.php:413 msgid "Apache mod_rewrite module" msgstr "" -#: mod/install.php:403 +#: mod/install.php:411 msgid "" "Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: mod/install.php:411 +#: mod/install.php:419 msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: mod/install.php:415 +#: mod/install.php:423 msgid "" "Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: mod/install.php:419 +#: mod/install.php:427 msgid "Error: openssl PHP module required but not installed." msgstr "" -#: mod/install.php:423 +#: mod/install.php:431 msgid "Error: mysqli PHP module required but not installed." msgstr "" -#: mod/install.php:427 +#: mod/install.php:435 msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: mod/install.php:431 +#: mod/install.php:439 msgid "Error: mcrypt PHP module required but not installed." msgstr "" -#: mod/install.php:443 +#: mod/install.php:451 msgid "" "Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 " "encryption layer." msgstr "" -#: mod/install.php:445 +#: mod/install.php:453 msgid "mcrypt_create_iv() function" msgstr "" -#: mod/install.php:461 +#: mod/install.php:469 msgid "" "The web installer needs to be able to create a file called \".htconfig.php\" " "in the top folder of your web server and it is unable to do so." msgstr "" -#: mod/install.php:462 +#: mod/install.php:470 msgid "" "This is most often a permission setting, as the web server may not be able " "to write files in your folder - even if you can." msgstr "" -#: mod/install.php:463 +#: mod/install.php:471 msgid "" "At the end of this procedure, we will give you a text to save in a file " "named .htconfig.php in your Friendica top folder." msgstr "" -#: mod/install.php:464 +#: mod/install.php:472 msgid "" "You can alternatively skip this procedure and perform a manual installation. " "Please see the file \"INSTALL.txt\" for instructions." msgstr "" -#: mod/install.php:467 +#: mod/install.php:475 msgid ".htconfig.php is writable" msgstr "" -#: mod/install.php:477 +#: mod/install.php:485 msgid "" "Friendica uses the Smarty3 template engine to render its web views. Smarty3 " "compiles templates to PHP to speed up rendering." msgstr "" -#: mod/install.php:478 +#: mod/install.php:486 msgid "" "In order to store these compiled templates, the web server needs to have " "write access to the directory view/smarty3/ under the Friendica top level " "folder." msgstr "" -#: mod/install.php:479 +#: mod/install.php:487 msgid "" "Please ensure that the user that your web server runs as (e.g. www-data) has " "write access to this folder." msgstr "" -#: mod/install.php:480 +#: mod/install.php:488 msgid "" "Note: as a security measure, you should give the web server write access to " "view/smarty3/ only--not the template files (.tpl) that it contains." msgstr "" -#: mod/install.php:483 +#: mod/install.php:491 msgid "view/smarty3 is writable" msgstr "" -#: mod/install.php:499 +#: mod/install.php:507 msgid "" "Url rewrite in .htaccess is not working. Check your server configuration." msgstr "" -#: mod/install.php:501 +#: mod/install.php:509 msgid "Url rewrite is working" msgstr "" -#: mod/install.php:518 +#: mod/install.php:526 msgid "ImageMagick PHP extension is installed" msgstr "" -#: mod/install.php:520 +#: mod/install.php:528 msgid "ImageMagick supports GIF" msgstr "" -#: mod/install.php:528 +#: mod/install.php:536 msgid "" "The database configuration file \".htconfig.php\" could not be written. " "Please use the enclosed text to create a configuration file in your web " "server root." msgstr "" -#: mod/install.php:567 +#: mod/install.php:575 msgid "

    What next

    " msgstr "" -#: mod/install.php:568 +#: mod/install.php:576 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" @@ -4063,7 +4071,7 @@ msgstr "" msgid "Help:" msgstr "" -#: mod/help.php:36 include/nav.php:113 view/theme/vier/theme.php:273 +#: mod/help.php:36 include/nav.php:113 view/theme/vier/theme.php:302 msgid "Help" msgstr "" @@ -4106,11 +4114,11 @@ msgstr "" msgid "No keywords to match. Please add keywords to your default profile." msgstr "" -#: mod/match.php:83 +#: mod/match.php:84 msgid "is interested in:" msgstr "" -#: mod/match.php:97 +#: mod/match.php:98 msgid "Profile Match" msgstr "" @@ -4341,7 +4349,7 @@ msgstr "" msgid "Built-in support for %s connectivity is %s" msgstr "" -#: mod/settings.php:809 mod/dfrn_request.php:856 +#: mod/settings.php:809 mod/dfrn_request.php:858 #: include/contact_selectors.php:80 msgid "Diaspora" msgstr "" @@ -4482,8 +4490,8 @@ msgstr "" #: mod/settings.php:973 view/theme/cleanzero/config.php:82 #: view/theme/dispy/config.php:72 view/theme/quattro/config.php:66 -#: view/theme/diabook/config.php:150 view/theme/vier/config.php:109 -#: view/theme/duepuntozero/config.php:61 +#: view/theme/diabook/config.php:150 view/theme/clean/config.php:85 +#: view/theme/vier/config.php:109 view/theme/duepuntozero/config.php:61 msgid "Theme settings" msgstr "" @@ -4555,7 +4563,7 @@ msgstr "" msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "" -#: mod/settings.php:1109 include/acl_selectors.php:330 +#: mod/settings.php:1109 include/acl_selectors.php:331 msgid "Hide your profile details from unknown viewers?" msgstr "" @@ -4634,11 +4642,11 @@ msgstr "" msgid "Password Settings" msgstr "" -#: mod/settings.php:1199 mod/register.php:271 +#: mod/settings.php:1199 mod/register.php:274 msgid "New Password:" msgstr "" -#: mod/settings.php:1200 mod/register.php:272 +#: mod/settings.php:1200 mod/register.php:275 msgid "Confirm:" msgstr "" @@ -4662,7 +4670,7 @@ msgstr "" msgid "Basic Settings" msgstr "" -#: mod/settings.php:1207 include/identity.php:539 +#: mod/settings.php:1207 include/identity.php:551 msgid "Full Name:" msgstr "" @@ -4834,147 +4842,147 @@ msgstr "" msgid "This introduction has already been accepted." msgstr "" -#: mod/dfrn_request.php:120 mod/dfrn_request.php:518 +#: mod/dfrn_request.php:120 mod/dfrn_request.php:519 msgid "Profile location is not valid or does not contain profile information." msgstr "" -#: mod/dfrn_request.php:125 mod/dfrn_request.php:523 +#: mod/dfrn_request.php:125 mod/dfrn_request.php:524 msgid "Warning: profile location has no identifiable owner name." msgstr "" -#: mod/dfrn_request.php:127 mod/dfrn_request.php:525 +#: mod/dfrn_request.php:127 mod/dfrn_request.php:526 msgid "Warning: profile location has no profile photo." msgstr "" -#: mod/dfrn_request.php:130 mod/dfrn_request.php:528 +#: mod/dfrn_request.php:130 mod/dfrn_request.php:529 #, php-format msgid "%d required parameter was not found at the given location" msgid_plural "%d required parameters were not found at the given location" msgstr[0] "" msgstr[1] "" -#: mod/dfrn_request.php:172 +#: mod/dfrn_request.php:173 msgid "Introduction complete." msgstr "" -#: mod/dfrn_request.php:214 +#: mod/dfrn_request.php:215 msgid "Unrecoverable protocol error." msgstr "" -#: mod/dfrn_request.php:242 +#: mod/dfrn_request.php:243 msgid "Profile unavailable." msgstr "" -#: mod/dfrn_request.php:267 +#: mod/dfrn_request.php:268 #, php-format msgid "%s has received too many connection requests today." msgstr "" -#: mod/dfrn_request.php:268 +#: mod/dfrn_request.php:269 msgid "Spam protection measures have been invoked." msgstr "" -#: mod/dfrn_request.php:269 +#: mod/dfrn_request.php:270 msgid "Friends are advised to please try again in 24 hours." msgstr "" -#: mod/dfrn_request.php:331 +#: mod/dfrn_request.php:332 msgid "Invalid locator" msgstr "" -#: mod/dfrn_request.php:340 +#: mod/dfrn_request.php:341 msgid "Invalid email address." msgstr "" -#: mod/dfrn_request.php:367 +#: mod/dfrn_request.php:368 msgid "This account has not been configured for email. Request failed." msgstr "" -#: mod/dfrn_request.php:463 +#: mod/dfrn_request.php:464 msgid "Unable to resolve your name at the provided location." msgstr "" -#: mod/dfrn_request.php:476 +#: mod/dfrn_request.php:477 msgid "You have already introduced yourself here." msgstr "" -#: mod/dfrn_request.php:480 +#: mod/dfrn_request.php:481 #, php-format msgid "Apparently you are already friends with %s." msgstr "" -#: mod/dfrn_request.php:501 +#: mod/dfrn_request.php:502 msgid "Invalid profile URL." msgstr "" -#: mod/dfrn_request.php:507 include/follow.php:72 +#: mod/dfrn_request.php:508 include/follow.php:72 msgid "Disallowed profile URL." msgstr "" -#: mod/dfrn_request.php:597 +#: mod/dfrn_request.php:599 msgid "Your introduction has been sent." msgstr "" -#: mod/dfrn_request.php:650 +#: mod/dfrn_request.php:652 msgid "Please login to confirm introduction." msgstr "" -#: mod/dfrn_request.php:660 +#: mod/dfrn_request.php:662 msgid "" "Incorrect identity currently logged in. Please login to this profile." msgstr "" -#: mod/dfrn_request.php:674 mod/dfrn_request.php:691 +#: mod/dfrn_request.php:676 mod/dfrn_request.php:693 msgid "Confirm" msgstr "" -#: mod/dfrn_request.php:686 +#: mod/dfrn_request.php:688 msgid "Hide this contact" msgstr "" -#: mod/dfrn_request.php:689 +#: mod/dfrn_request.php:691 #, php-format msgid "Welcome home %s." msgstr "" -#: mod/dfrn_request.php:690 +#: mod/dfrn_request.php:692 #, php-format msgid "Please confirm your introduction/connection request to %s." msgstr "" -#: mod/dfrn_request.php:819 +#: mod/dfrn_request.php:821 msgid "" "Please enter your 'Identity Address' from one of the following supported " "communications networks:" msgstr "" -#: mod/dfrn_request.php:840 +#: mod/dfrn_request.php:842 #, php-format msgid "" "If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today." msgstr "" -#: mod/dfrn_request.php:845 +#: mod/dfrn_request.php:847 msgid "Friend/Connection Request" msgstr "" -#: mod/dfrn_request.php:846 +#: mod/dfrn_request.php:848 msgid "" "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " "testuser@identi.ca" msgstr "" -#: mod/dfrn_request.php:854 include/contact_selectors.php:76 +#: mod/dfrn_request.php:856 include/contact_selectors.php:76 msgid "Friendica" msgstr "" -#: mod/dfrn_request.php:855 +#: mod/dfrn_request.php:857 msgid "StatusNet/Federated Social Web" msgstr "" -#: mod/dfrn_request.php:857 +#: mod/dfrn_request.php:859 #, php-format msgid "" " - please do not use this form. Instead, enter %s into your Diaspora search " @@ -4993,80 +5001,84 @@ msgid "" "password: %s

    You can change your password after login." msgstr "" -#: mod/register.php:107 +#: mod/register.php:104 +msgid "Registration successful." +msgstr "" + +#: mod/register.php:110 msgid "Your registration can not be processed." msgstr "" -#: mod/register.php:150 +#: mod/register.php:153 msgid "Your registration is pending approval by the site owner." msgstr "" -#: mod/register.php:188 mod/uimport.php:50 +#: mod/register.php:191 mod/uimport.php:50 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: mod/register.php:216 +#: mod/register.php:219 msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " "and clicking 'Register'." msgstr "" -#: mod/register.php:217 +#: mod/register.php:220 msgid "" "If you are not familiar with OpenID, please leave that field blank and fill " "in the rest of the items." msgstr "" -#: mod/register.php:218 +#: mod/register.php:221 msgid "Your OpenID (optional): " msgstr "" -#: mod/register.php:232 +#: mod/register.php:235 msgid "Include your profile in member directory?" msgstr "" -#: mod/register.php:256 +#: mod/register.php:259 msgid "Membership on this site is by invitation only." msgstr "" -#: mod/register.php:257 +#: mod/register.php:260 msgid "Your invitation ID: " msgstr "" -#: mod/register.php:268 +#: mod/register.php:271 msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " msgstr "" -#: mod/register.php:269 +#: mod/register.php:272 msgid "Your Email Address: " msgstr "" -#: mod/register.php:271 +#: mod/register.php:274 msgid "Leave empty for an auto generated password." msgstr "" -#: mod/register.php:273 +#: mod/register.php:276 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be 'nickname@$sitename'." msgstr "" -#: mod/register.php:274 +#: mod/register.php:277 msgid "Choose a nickname: " msgstr "" -#: mod/register.php:277 boot.php:1256 include/nav.php:108 +#: mod/register.php:280 boot.php:1256 include/nav.php:108 msgid "Register" msgstr "" -#: mod/register.php:283 mod/uimport.php:64 +#: mod/register.php:286 mod/uimport.php:64 msgid "Import" msgstr "" -#: mod/register.php:284 +#: mod/register.php:287 msgid "Import your profile to this friendica instance" msgstr "" @@ -5086,7 +5098,7 @@ msgstr "" msgid "Only one search per minute is permitted for not logged in users." msgstr "" -#: mod/search.php:126 include/text.php:996 include/nav.php:118 +#: mod/search.php:126 include/text.php:1003 include/nav.php:118 msgid "Search" msgstr "" @@ -5108,16 +5120,16 @@ msgstr "" msgid "Gender: " msgstr "" -#: mod/directory.php:143 include/identity.php:273 include/identity.php:561 +#: mod/directory.php:143 include/identity.php:283 include/identity.php:573 msgid "Status:" msgstr "" -#: mod/directory.php:145 include/identity.php:275 include/identity.php:572 +#: mod/directory.php:145 include/identity.php:285 include/identity.php:584 msgid "Homepage:" msgstr "" #: mod/directory.php:195 view/theme/diabook/theme.php:525 -#: view/theme/vier/theme.php:191 +#: view/theme/vier/theme.php:205 msgid "Global Directory" msgstr "" @@ -5224,12 +5236,12 @@ msgid "" "hours." msgstr "" -#: mod/suggest.php:83 mod/suggest.php:100 +#: mod/suggest.php:83 mod/suggest.php:101 msgid "Ignore/Hide" msgstr "" -#: mod/suggest.php:110 include/contact_widgets.php:35 -#: view/theme/diabook/theme.php:527 view/theme/vier/theme.php:193 +#: mod/suggest.php:111 include/contact_widgets.php:35 +#: view/theme/diabook/theme.php:527 view/theme/vier/theme.php:207 msgid "Friend Suggestions" msgstr "" @@ -5444,7 +5456,7 @@ msgstr "" msgid "Since [date]:" msgstr "" -#: mod/profiles.php:724 include/identity.php:570 +#: mod/profiles.php:724 include/identity.php:582 msgid "Sexual Preference:" msgstr "" @@ -5452,11 +5464,11 @@ msgstr "" msgid "Homepage URL:" msgstr "" -#: mod/profiles.php:726 include/identity.php:574 +#: mod/profiles.php:726 include/identity.php:586 msgid "Hometown:" msgstr "" -#: mod/profiles.php:727 include/identity.php:578 +#: mod/profiles.php:727 include/identity.php:590 msgid "Political Views:" msgstr "" @@ -5472,11 +5484,11 @@ msgstr "" msgid "Private Keywords:" msgstr "" -#: mod/profiles.php:731 include/identity.php:586 +#: mod/profiles.php:731 include/identity.php:598 msgid "Likes:" msgstr "" -#: mod/profiles.php:732 include/identity.php:588 +#: mod/profiles.php:732 include/identity.php:600 msgid "Dislikes:" msgstr "" @@ -5542,23 +5554,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: mod/profiles.php:814 include/identity.php:231 include/identity.php:257 +#: mod/profiles.php:814 include/identity.php:241 include/identity.php:267 msgid "Change profile photo" msgstr "" -#: mod/profiles.php:815 include/identity.php:232 +#: mod/profiles.php:815 include/identity.php:242 msgid "Create New Profile" msgstr "" -#: mod/profiles.php:826 include/identity.php:242 +#: mod/profiles.php:826 include/identity.php:252 msgid "Profile Image" msgstr "" -#: mod/profiles.php:828 include/identity.php:245 +#: mod/profiles.php:828 include/identity.php:255 msgid "visible to everybody" msgstr "" -#: mod/profiles.php:829 include/identity.php:246 +#: mod/profiles.php:829 include/identity.php:256 msgid "Edit visibility" msgstr "" @@ -5622,7 +5634,7 @@ msgstr "" msgid "Permission settings" msgstr "" -#: mod/editpost.php:132 include/acl_selectors.php:343 +#: mod/editpost.php:132 include/acl_selectors.php:344 msgid "CC: email addresses" msgstr "" @@ -5638,7 +5650,7 @@ msgstr "" msgid "Categories (comma-separated list)" msgstr "" -#: mod/editpost.php:139 include/acl_selectors.php:344 +#: mod/editpost.php:139 include/acl_selectors.php:345 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -5704,7 +5716,7 @@ msgstr "" msgid "Visible to:" msgstr "" -#: mod/notes.php:46 include/identity.php:677 +#: mod/notes.php:46 include/identity.php:694 msgid "Personal Notes" msgstr "" @@ -5861,7 +5873,7 @@ msgid "" "important, please visit http://friendica.com" msgstr "" -#: mod/photos.php:91 include/identity.php:652 +#: mod/photos.php:91 include/identity.php:669 msgid "Photo Albums" msgstr "" @@ -5935,7 +5947,7 @@ msgstr "" msgid "Do not show a status post for this upload" msgstr "" -#: mod/photos.php:1182 mod/photos.php:1567 include/acl_selectors.php:346 +#: mod/photos.php:1182 mod/photos.php:1567 include/acl_selectors.php:347 msgid "Permissions" msgstr "" @@ -6036,7 +6048,7 @@ msgid "Share" msgstr "" #: mod/photos.php:1640 include/conversation.php:509 -#: include/conversation.php:1405 +#: include/conversation.php:1414 msgid "Attending" msgid_plural "Attending" msgstr[0] "" @@ -6279,7 +6291,7 @@ msgid "Examples: Robert Morgenstein, Fishing" msgstr "" #: include/contact_widgets.php:36 view/theme/diabook/theme.php:526 -#: view/theme/vier/theme.php:192 +#: view/theme/vier/theme.php:206 msgid "Similar Interests" msgstr "" @@ -6288,205 +6300,221 @@ msgid "Random Profile" msgstr "" #: include/contact_widgets.php:38 view/theme/diabook/theme.php:528 -#: view/theme/vier/theme.php:194 +#: view/theme/vier/theme.php:208 msgid "Invite Friends" msgstr "" -#: include/contact_widgets.php:71 +#: include/contact_widgets.php:108 msgid "Networks" msgstr "" -#: include/contact_widgets.php:74 +#: include/contact_widgets.php:111 msgid "All Networks" msgstr "" -#: include/contact_widgets.php:104 include/features.php:61 +#: include/contact_widgets.php:141 include/features.php:97 msgid "Saved Folders" msgstr "" -#: include/contact_widgets.php:107 include/contact_widgets.php:139 +#: include/contact_widgets.php:144 include/contact_widgets.php:176 msgid "Everything" msgstr "" -#: include/contact_widgets.php:136 +#: include/contact_widgets.php:173 msgid "Categories" msgstr "" -#: include/features.php:23 +#: include/features.php:58 msgid "General Features" msgstr "" -#: include/features.php:25 +#: include/features.php:60 msgid "Multiple Profiles" msgstr "" -#: include/features.php:25 +#: include/features.php:60 msgid "Ability to create multiple profiles" msgstr "" -#: include/features.php:26 +#: include/features.php:61 msgid "Photo Location" msgstr "" -#: include/features.php:26 +#: include/features.php:61 msgid "" "Photo metadata is normally stripped. This extracts the location (if present) " "prior to stripping metadata and links it to a map." msgstr "" -#: include/features.php:31 +#: include/features.php:66 msgid "Post Composition Features" msgstr "" -#: include/features.php:32 +#: include/features.php:67 msgid "Richtext Editor" msgstr "" -#: include/features.php:32 +#: include/features.php:67 msgid "Enable richtext editor" msgstr "" -#: include/features.php:33 +#: include/features.php:68 msgid "Post Preview" msgstr "" -#: include/features.php:33 +#: include/features.php:68 msgid "Allow previewing posts and comments before publishing them" msgstr "" -#: include/features.php:34 +#: include/features.php:69 msgid "Auto-mention Forums" msgstr "" -#: include/features.php:34 +#: include/features.php:69 msgid "" "Add/remove mention when a fourm page is selected/deselected in ACL window." msgstr "" -#: include/features.php:39 +#: include/features.php:74 msgid "Network Sidebar Widgets" msgstr "" -#: include/features.php:40 +#: include/features.php:75 msgid "Search by Date" msgstr "" -#: include/features.php:40 +#: include/features.php:75 msgid "Ability to select posts by date ranges" msgstr "" -#: include/features.php:41 +#: include/features.php:76 include/features.php:106 +msgid "List Forums" +msgstr "" + +#: include/features.php:76 +msgid "Enable widget to display the forums your are connected with" +msgstr "" + +#: include/features.php:77 msgid "Group Filter" msgstr "" -#: include/features.php:41 +#: include/features.php:77 msgid "Enable widget to display Network posts only from selected group" msgstr "" -#: include/features.php:42 +#: include/features.php:78 msgid "Network Filter" msgstr "" -#: include/features.php:42 +#: include/features.php:78 msgid "Enable widget to display Network posts only from selected network" msgstr "" -#: include/features.php:43 +#: include/features.php:79 msgid "Save search terms for re-use" msgstr "" -#: include/features.php:48 +#: include/features.php:84 msgid "Network Tabs" msgstr "" -#: include/features.php:49 +#: include/features.php:85 msgid "Network Personal Tab" msgstr "" -#: include/features.php:49 +#: include/features.php:85 msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: include/features.php:50 +#: include/features.php:86 msgid "Network New Tab" msgstr "" -#: include/features.php:50 +#: include/features.php:86 msgid "Enable tab to display only new Network posts (from the last 12 hours)" msgstr "" -#: include/features.php:51 +#: include/features.php:87 msgid "Network Shared Links Tab" msgstr "" -#: include/features.php:51 +#: include/features.php:87 msgid "Enable tab to display only Network posts with links in them" msgstr "" -#: include/features.php:56 +#: include/features.php:92 msgid "Post/Comment Tools" msgstr "" -#: include/features.php:57 +#: include/features.php:93 msgid "Multiple Deletion" msgstr "" -#: include/features.php:57 +#: include/features.php:93 msgid "Select and delete multiple posts/comments at once" msgstr "" -#: include/features.php:58 +#: include/features.php:94 msgid "Edit Sent Posts" msgstr "" -#: include/features.php:58 +#: include/features.php:94 msgid "Edit and correct posts and comments after sending" msgstr "" -#: include/features.php:59 +#: include/features.php:95 msgid "Tagging" msgstr "" -#: include/features.php:59 +#: include/features.php:95 msgid "Ability to tag existing posts" msgstr "" -#: include/features.php:60 +#: include/features.php:96 msgid "Post Categories" msgstr "" -#: include/features.php:60 +#: include/features.php:96 msgid "Add categories to your posts" msgstr "" -#: include/features.php:61 +#: include/features.php:97 msgid "Ability to file posts under folders" msgstr "" -#: include/features.php:62 +#: include/features.php:98 msgid "Dislike Posts" msgstr "" -#: include/features.php:62 +#: include/features.php:98 msgid "Ability to dislike posts/comments" msgstr "" -#: include/features.php:63 +#: include/features.php:99 msgid "Star Posts" msgstr "" -#: include/features.php:63 +#: include/features.php:99 msgid "Ability to mark special posts with a star indicator" msgstr "" -#: include/features.php:64 +#: include/features.php:100 msgid "Mute Post Notifications" msgstr "" -#: include/features.php:64 +#: include/features.php:100 msgid "Ability to mute notifications for a thread" msgstr "" +#: include/features.php:105 +msgid "Advanced Profile Settings" +msgstr "" + +#: include/features.php:106 +msgid "Show visitors public community forums at the Advanced Profile Page" +msgstr "" + #: include/follow.php:77 msgid "Connect URL missing." msgstr "" @@ -6553,23 +6581,27 @@ msgstr "" msgid "Default privacy group for new contacts" msgstr "" -#: include/group.php:228 +#: include/group.php:239 msgid "Everybody" msgstr "" -#: include/group.php:251 +#: include/group.php:262 msgid "edit" msgstr "" -#: include/group.php:273 +#: include/group.php:285 +msgid "Edit groups" +msgstr "" + +#: include/group.php:287 msgid "Edit group" msgstr "" -#: include/group.php:274 +#: include/group.php:288 msgid "Create a new group" msgstr "" -#: include/group.php:277 +#: include/group.php:291 msgid "Contacts not in any group" msgstr "" @@ -6638,176 +6670,184 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: include/datetime.php:474 include/items.php:2484 +#: include/datetime.php:474 include/items.php:2444 #, php-format msgid "%s's birthday" msgstr "" -#: include/datetime.php:475 include/items.php:2485 +#: include/datetime.php:475 include/items.php:2445 #, php-format msgid "Happy Birthday %s" msgstr "" -#: include/identity.php:38 +#: include/identity.php:43 msgid "Requested account is not available." msgstr "" -#: include/identity.php:121 include/identity.php:255 include/identity.php:608 +#: include/identity.php:126 include/identity.php:265 include/identity.php:625 msgid "Edit profile" msgstr "" -#: include/identity.php:220 +#: include/identity.php:225 +msgid "Atom feed" +msgstr "" + +#: include/identity.php:230 msgid "Message" msgstr "" -#: include/identity.php:226 include/nav.php:185 +#: include/identity.php:236 include/nav.php:185 msgid "Profiles" msgstr "" -#: include/identity.php:226 +#: include/identity.php:236 msgid "Manage/edit profiles" msgstr "" -#: include/identity.php:342 +#: include/identity.php:353 msgid "Network:" msgstr "" -#: include/identity.php:374 include/identity.php:460 +#: include/identity.php:385 include/identity.php:471 msgid "g A l F d" msgstr "" -#: include/identity.php:375 include/identity.php:461 +#: include/identity.php:386 include/identity.php:472 msgid "F d" msgstr "" -#: include/identity.php:420 include/identity.php:507 +#: include/identity.php:431 include/identity.php:518 msgid "[today]" msgstr "" -#: include/identity.php:432 +#: include/identity.php:443 msgid "Birthday Reminders" msgstr "" -#: include/identity.php:433 +#: include/identity.php:444 msgid "Birthdays this week:" msgstr "" -#: include/identity.php:494 +#: include/identity.php:505 msgid "[No description]" msgstr "" -#: include/identity.php:518 +#: include/identity.php:529 msgid "Event Reminders" msgstr "" -#: include/identity.php:519 +#: include/identity.php:530 msgid "Events this week:" msgstr "" -#: include/identity.php:546 +#: include/identity.php:558 msgid "j F, Y" msgstr "" -#: include/identity.php:547 +#: include/identity.php:559 msgid "j F" msgstr "" -#: include/identity.php:554 +#: include/identity.php:566 msgid "Birthday:" msgstr "" -#: include/identity.php:558 +#: include/identity.php:570 msgid "Age:" msgstr "" -#: include/identity.php:567 +#: include/identity.php:579 #, php-format msgid "for %1$d %2$s" msgstr "" -#: include/identity.php:580 +#: include/identity.php:592 msgid "Religion:" msgstr "" -#: include/identity.php:584 +#: include/identity.php:596 msgid "Hobbies/Interests:" msgstr "" -#: include/identity.php:591 +#: include/identity.php:603 msgid "Contact information and Social Networks:" msgstr "" -#: include/identity.php:593 +#: include/identity.php:605 msgid "Musical interests:" msgstr "" -#: include/identity.php:595 +#: include/identity.php:607 msgid "Books, literature:" msgstr "" -#: include/identity.php:597 +#: include/identity.php:609 msgid "Television:" msgstr "" -#: include/identity.php:599 +#: include/identity.php:611 msgid "Film/dance/culture/entertainment:" msgstr "" -#: include/identity.php:601 +#: include/identity.php:613 msgid "Love/Romance:" msgstr "" -#: include/identity.php:603 +#: include/identity.php:615 msgid "Work/employment:" msgstr "" -#: include/identity.php:605 +#: include/identity.php:617 msgid "School/education:" msgstr "" -#: include/identity.php:633 include/nav.php:75 +#: include/identity.php:621 +msgid "Forums:" +msgstr "" + +#: include/identity.php:650 include/nav.php:75 msgid "Status" msgstr "" -#: include/identity.php:636 +#: include/identity.php:653 msgid "Status Messages and Posts" msgstr "" -#: include/identity.php:644 +#: include/identity.php:661 msgid "Profile Details" msgstr "" -#: include/identity.php:657 include/identity.php:660 include/nav.php:78 +#: include/identity.php:674 include/identity.php:677 include/nav.php:78 msgid "Videos" msgstr "" -#: include/identity.php:672 include/nav.php:140 +#: include/identity.php:689 include/nav.php:140 msgid "Events and Calendar" msgstr "" -#: include/identity.php:680 +#: include/identity.php:697 msgid "Only You Can See This" msgstr "" -#: include/acl_selectors.php:324 +#: include/acl_selectors.php:325 msgid "Post to Email" msgstr "" -#: include/acl_selectors.php:329 +#: include/acl_selectors.php:330 #, php-format msgid "Connectors disabled, since \"%s\" is enabled." msgstr "" -#: include/acl_selectors.php:335 +#: include/acl_selectors.php:336 msgid "Visible to everybody" msgstr "" -#: include/acl_selectors.php:336 view/theme/diabook/config.php:142 +#: include/acl_selectors.php:337 view/theme/diabook/config.php:142 #: view/theme/diabook/theme.php:621 view/theme/vier/config.php:103 msgid "show" msgstr "" -#: include/acl_selectors.php:337 view/theme/diabook/config.php:142 +#: include/acl_selectors.php:338 view/theme/diabook/config.php:142 #: view/theme/diabook/theme.php:621 view/theme/vier/config.php:103 msgid "don't show" msgstr "" @@ -6820,31 +6860,31 @@ msgstr "" msgid "stopped following" msgstr "" -#: include/Contact.php:334 include/conversation.php:911 +#: include/Contact.php:361 include/conversation.php:911 msgid "View Status" msgstr "" -#: include/Contact.php:336 include/conversation.php:913 +#: include/Contact.php:363 include/conversation.php:913 msgid "View Photos" msgstr "" -#: include/Contact.php:337 include/conversation.php:914 +#: include/Contact.php:364 include/conversation.php:914 msgid "Network Posts" msgstr "" -#: include/Contact.php:338 include/conversation.php:915 +#: include/Contact.php:365 include/conversation.php:915 msgid "Edit Contact" msgstr "" -#: include/Contact.php:339 +#: include/Contact.php:366 msgid "Drop Contact" msgstr "" -#: include/Contact.php:340 include/conversation.php:916 +#: include/Contact.php:367 include/conversation.php:916 msgid "Send PM" msgstr "" -#: include/Contact.php:341 include/conversation.php:920 +#: include/Contact.php:368 include/conversation.php:920 msgid "Poke" msgstr "" @@ -7031,278 +7071,283 @@ msgstr "" msgid "Private post" msgstr "" -#: include/conversation.php:1377 +#: include/conversation.php:1386 msgid "View all" msgstr "" -#: include/conversation.php:1399 +#: include/conversation.php:1408 msgid "Like" msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:1402 +#: include/conversation.php:1411 msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:1408 +#: include/conversation.php:1417 msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:1411 include/profile_selectors.php:6 +#: include/conversation.php:1420 include/profile_selectors.php:6 msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" +#: include/forums.php:105 include/text.php:1015 include/nav.php:126 +#: view/theme/vier/theme.php:259 +msgid "Forums" +msgstr "" + +#: include/forums.php:107 view/theme/vier/theme.php:261 +msgid "External link to forum" +msgstr "" + #: include/network.php:967 msgid "view full size" msgstr "" -#: include/text.php:299 +#: include/text.php:303 msgid "newer" msgstr "" -#: include/text.php:301 +#: include/text.php:305 msgid "older" msgstr "" -#: include/text.php:306 +#: include/text.php:310 msgid "prev" msgstr "" -#: include/text.php:308 +#: include/text.php:312 msgid "first" msgstr "" -#: include/text.php:340 +#: include/text.php:344 msgid "last" msgstr "" -#: include/text.php:343 +#: include/text.php:347 msgid "next" msgstr "" -#: include/text.php:398 +#: include/text.php:402 msgid "Loading more entries..." msgstr "" -#: include/text.php:399 +#: include/text.php:403 msgid "The end" msgstr "" -#: include/text.php:890 +#: include/text.php:894 msgid "No contacts" msgstr "" -#: include/text.php:905 +#: include/text.php:909 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: include/text.php:1003 include/nav.php:121 +#: include/text.php:1010 include/nav.php:121 msgid "Full Text" msgstr "" -#: include/text.php:1004 include/nav.php:122 +#: include/text.php:1011 include/nav.php:122 msgid "Tags" msgstr "" -#: include/text.php:1008 include/nav.php:126 -msgid "Forums" -msgstr "" - -#: include/text.php:1059 +#: include/text.php:1066 msgid "poke" msgstr "" -#: include/text.php:1059 +#: include/text.php:1066 msgid "poked" msgstr "" -#: include/text.php:1060 +#: include/text.php:1067 msgid "ping" msgstr "" -#: include/text.php:1060 +#: include/text.php:1067 msgid "pinged" msgstr "" -#: include/text.php:1061 +#: include/text.php:1068 msgid "prod" msgstr "" -#: include/text.php:1061 +#: include/text.php:1068 msgid "prodded" msgstr "" -#: include/text.php:1062 +#: include/text.php:1069 msgid "slap" msgstr "" -#: include/text.php:1062 +#: include/text.php:1069 msgid "slapped" msgstr "" -#: include/text.php:1063 +#: include/text.php:1070 msgid "finger" msgstr "" -#: include/text.php:1063 +#: include/text.php:1070 msgid "fingered" msgstr "" -#: include/text.php:1064 +#: include/text.php:1071 msgid "rebuff" msgstr "" -#: include/text.php:1064 +#: include/text.php:1071 msgid "rebuffed" msgstr "" -#: include/text.php:1078 +#: include/text.php:1085 msgid "happy" msgstr "" -#: include/text.php:1079 +#: include/text.php:1086 msgid "sad" msgstr "" -#: include/text.php:1080 +#: include/text.php:1087 msgid "mellow" msgstr "" -#: include/text.php:1081 +#: include/text.php:1088 msgid "tired" msgstr "" -#: include/text.php:1082 +#: include/text.php:1089 msgid "perky" msgstr "" -#: include/text.php:1083 +#: include/text.php:1090 msgid "angry" msgstr "" -#: include/text.php:1084 +#: include/text.php:1091 msgid "stupified" msgstr "" -#: include/text.php:1085 +#: include/text.php:1092 msgid "puzzled" msgstr "" -#: include/text.php:1086 +#: include/text.php:1093 msgid "interested" msgstr "" -#: include/text.php:1087 +#: include/text.php:1094 msgid "bitter" msgstr "" -#: include/text.php:1088 +#: include/text.php:1095 msgid "cheerful" msgstr "" -#: include/text.php:1089 +#: include/text.php:1096 msgid "alive" msgstr "" -#: include/text.php:1090 +#: include/text.php:1097 msgid "annoyed" msgstr "" -#: include/text.php:1091 +#: include/text.php:1098 msgid "anxious" msgstr "" -#: include/text.php:1092 +#: include/text.php:1099 msgid "cranky" msgstr "" -#: include/text.php:1093 +#: include/text.php:1100 msgid "disturbed" msgstr "" -#: include/text.php:1094 +#: include/text.php:1101 msgid "frustrated" msgstr "" -#: include/text.php:1095 +#: include/text.php:1102 msgid "motivated" msgstr "" -#: include/text.php:1096 +#: include/text.php:1103 msgid "relaxed" msgstr "" -#: include/text.php:1097 +#: include/text.php:1104 msgid "surprised" msgstr "" -#: include/text.php:1490 +#: include/text.php:1497 msgid "bytes" msgstr "" -#: include/text.php:1522 include/text.php:1534 +#: include/text.php:1529 include/text.php:1541 msgid "Click to open/close" msgstr "" -#: include/text.php:1708 +#: include/text.php:1715 msgid "View on separate page" msgstr "" -#: include/text.php:1709 +#: include/text.php:1716 msgid "view on separate page" msgstr "" -#: include/text.php:1990 +#: include/text.php:1997 msgid "activity" msgstr "" -#: include/text.php:1993 +#: include/text.php:2000 msgid "post" msgstr "" -#: include/text.php:2161 +#: include/text.php:2168 msgid "Item filed" msgstr "" -#: include/bbcode.php:474 include/bbcode.php:1132 include/bbcode.php:1133 +#: include/bbcode.php:483 include/bbcode.php:1143 include/bbcode.php:1144 msgid "Image/photo" msgstr "" -#: include/bbcode.php:572 +#: include/bbcode.php:581 #, php-format msgid "%2$s %3$s" msgstr "" -#: include/bbcode.php:606 +#: include/bbcode.php:615 #, php-format msgid "" "%s wrote the following post" msgstr "" -#: include/bbcode.php:1092 include/bbcode.php:1112 +#: include/bbcode.php:1103 include/bbcode.php:1123 msgid "$1 wrote:" msgstr "" -#: include/bbcode.php:1141 include/bbcode.php:1142 +#: include/bbcode.php:1152 include/bbcode.php:1153 msgid "Encrypted content" msgstr "" -#: include/notifier.php:840 include/delivery.php:456 +#: include/notifier.php:843 include/delivery.php:458 msgid "(no subject)" msgstr "" -#: include/notifier.php:850 include/delivery.php:467 include/enotify.php:37 +#: include/notifier.php:853 include/delivery.php:469 include/enotify.php:37 msgid "noreply" msgstr "" @@ -7395,7 +7440,7 @@ msgstr "" msgid "Redmatrix" msgstr "" -#: include/Scrape.php:603 +#: include/Scrape.php:610 msgid " on Last.fm" msgstr "" @@ -7407,15 +7452,15 @@ msgstr "" msgid "Finishes:" msgstr "" -#: include/plugin.php:458 include/plugin.php:460 +#: include/plugin.php:522 include/plugin.php:524 msgid "Click here to upgrade." msgstr "" -#: include/plugin.php:466 +#: include/plugin.php:530 msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: include/plugin.php:471 +#: include/plugin.php:535 msgid "This action is not available under your subscription plan." msgstr "" @@ -7572,42 +7617,42 @@ msgid "Site map" msgstr "" #: include/api.php:321 include/api.php:332 include/api.php:441 -#: include/api.php:1151 include/api.php:1153 +#: include/api.php:1160 include/api.php:1162 msgid "User not found." msgstr "" -#: include/api.php:799 +#: include/api.php:808 #, php-format msgid "Daily posting limit of %d posts reached. The post was rejected." msgstr "" -#: include/api.php:818 +#: include/api.php:827 #, php-format msgid "Weekly posting limit of %d posts reached. The post was rejected." msgstr "" -#: include/api.php:837 +#: include/api.php:846 #, php-format msgid "Monthly posting limit of %d posts reached. The post was rejected." msgstr "" -#: include/api.php:1360 +#: include/api.php:1369 msgid "There is no status with this id." msgstr "" -#: include/api.php:1434 +#: include/api.php:1443 msgid "There is no conversation with this id." msgstr "" -#: include/api.php:1713 +#: include/api.php:1722 msgid "Invalid item." msgstr "" -#: include/api.php:1723 +#: include/api.php:1732 msgid "Invalid action. " msgstr "" -#: include/api.php:1731 +#: include/api.php:1740 msgid "DB error" msgstr "" @@ -7655,37 +7700,38 @@ msgstr "" msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"." msgstr "" -#: include/user.php:146 include/user.php:244 +#: include/user.php:147 include/user.php:245 msgid "Nickname is already registered. Please choose another." msgstr "" -#: include/user.php:156 +#: include/user.php:157 msgid "" "Nickname was once registered here and may not be re-used. Please choose " "another." msgstr "" -#: include/user.php:172 +#: include/user.php:173 msgid "SERIOUS ERROR: Generation of security keys failed." msgstr "" -#: include/user.php:230 +#: include/user.php:231 msgid "An error occurred during registration. Please try again." msgstr "" -#: include/user.php:255 view/theme/duepuntozero/config.php:44 +#: include/user.php:256 view/theme/clean/config.php:56 +#: view/theme/duepuntozero/config.php:44 msgid "default" msgstr "" -#: include/user.php:265 +#: include/user.php:266 msgid "An error occurred creating your default profile. Please try again." msgstr "" -#: include/user.php:297 include/user.php:301 include/profile_selectors.php:42 +#: include/user.php:299 include/user.php:303 include/profile_selectors.php:42 msgid "Friends" msgstr "" -#: include/user.php:385 +#: include/user.php:387 #, php-format msgid "" "\n" @@ -7694,7 +7740,7 @@ msgid "" "\t" msgstr "" -#: include/user.php:389 +#: include/user.php:391 #, php-format msgid "" "\n" @@ -7737,11 +7783,11 @@ msgstr "" msgid "Attachments:" msgstr "" -#: include/items.php:4933 +#: include/items.php:4871 msgid "Do you really want to delete this item?" msgstr "" -#: include/items.php:5208 +#: include/items.php:5146 msgid "Archives" msgstr "" @@ -8319,6 +8365,7 @@ msgid "Set theme width" msgstr "" #: view/theme/cleanzero/config.php:86 view/theme/quattro/config.php:68 +#: view/theme/clean/config.php:88 msgid "Color scheme" msgstr "" @@ -8372,7 +8419,7 @@ msgstr "" #: view/theme/diabook/config.php:158 view/theme/diabook/theme.php:130 #: view/theme/diabook/theme.php:544 view/theme/diabook/theme.php:624 -#: view/theme/vier/config.php:111 view/theme/vier/theme.php:230 +#: view/theme/vier/config.php:111 msgid "Community Pages" msgstr "" @@ -8383,7 +8430,7 @@ msgstr "" #: view/theme/diabook/config.php:160 view/theme/diabook/theme.php:391 #: view/theme/diabook/theme.php:626 view/theme/vier/config.php:112 -#: view/theme/vier/theme.php:142 +#: view/theme/vier/theme.php:156 msgid "Community Profiles" msgstr "" @@ -8394,19 +8441,19 @@ msgstr "" #: view/theme/diabook/config.php:162 view/theme/diabook/theme.php:606 #: view/theme/diabook/theme.php:628 view/theme/vier/config.php:114 -#: view/theme/vier/theme.php:348 +#: view/theme/vier/theme.php:377 msgid "Connect Services" msgstr "" #: view/theme/diabook/config.php:163 view/theme/diabook/theme.php:523 #: view/theme/diabook/theme.php:629 view/theme/vier/config.php:115 -#: view/theme/vier/theme.php:189 +#: view/theme/vier/theme.php:203 msgid "Find Friends" msgstr "" #: view/theme/diabook/config.php:164 view/theme/diabook/theme.php:412 #: view/theme/diabook/theme.php:630 view/theme/vier/config.php:116 -#: view/theme/vier/theme.php:171 +#: view/theme/vier/theme.php:185 msgid "Last users" msgstr "" @@ -8428,7 +8475,7 @@ msgstr "" msgid "Your personal photos" msgstr "" -#: view/theme/diabook/theme.php:524 view/theme/vier/theme.php:190 +#: view/theme/diabook/theme.php:524 view/theme/vier/theme.php:204 msgid "Local Directory" msgstr "" @@ -8440,6 +8487,56 @@ msgstr "" msgid "Show/hide boxes at right-hand column:" msgstr "" +#: view/theme/clean/config.php:57 +msgid "Midnight" +msgstr "" + +#: view/theme/clean/config.php:58 +msgid "Zenburn" +msgstr "" + +#: view/theme/clean/config.php:59 +msgid "Bootstrap" +msgstr "" + +#: view/theme/clean/config.php:60 +msgid "Shades of Pink" +msgstr "" + +#: view/theme/clean/config.php:61 +msgid "Lime and Orange" +msgstr "" + +#: view/theme/clean/config.php:62 +msgid "GeoCities Retro" +msgstr "" + +#: view/theme/clean/config.php:86 +msgid "Background Image" +msgstr "" + +#: view/theme/clean/config.php:86 +msgid "" +"The URL to a picture (e.g. from your photo album) that should be used as " +"background image." +msgstr "" + +#: view/theme/clean/config.php:87 +msgid "Background Color" +msgstr "" + +#: view/theme/clean/config.php:87 +msgid "HEX value for the background color. Don't include the #" +msgstr "" + +#: view/theme/clean/config.php:89 +msgid "font size" +msgstr "" + +#: view/theme/clean/config.php:89 +msgid "base font size for your interface" +msgstr "" + #: view/theme/vier/config.php:64 msgid "Comma separated list of helper forums" msgstr "" @@ -8448,11 +8545,7 @@ msgstr "" msgid "Set style" msgstr "" -#: view/theme/vier/theme.php:234 -msgid "External link to forum" -msgstr "" - -#: view/theme/vier/theme.php:266 +#: view/theme/vier/theme.php:295 msgid "Quick Start" msgstr "" From 39b85c848615f1b19c61292736913d6acad3292e Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Mon, 30 Nov 2015 16:00:41 +0100 Subject: [PATCH 258/313] vier event_form: include bb-tags for editing --- view/templates/event_form.tpl | 7 +-- view/templates/event_head.tpl | 4 ++ view/theme/vier/style.css | 7 +++ view/theme/vier/templates/event_form.tpl | 74 ++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 view/theme/vier/templates/event_form.tpl diff --git a/view/templates/event_form.tpl b/view/templates/event_form.tpl index 63d1e827ba..1c065477b2 100644 --- a/view/templates/event_form.tpl +++ b/view/templates/event_form.tpl @@ -29,15 +29,15 @@
    {{$t_text}}
    - +
    {{$d_text}}
    - +
    {{$l_text}}
    - +
    @@ -51,4 +51,3 @@ - diff --git a/view/templates/event_head.tpl b/view/templates/event_head.tpl index ceb251a9e2..745327e992 100644 --- a/view/templates/event_head.tpl +++ b/view/templates/event_head.tpl @@ -138,6 +138,10 @@ } }); + + $(document).ready(function() { + $('.comment-edit-bb').hide(); + }); {{else}} diff --git a/view/theme/quattro/templates/events-js.tpl b/view/theme/quattro/templates/events-js.tpl new file mode 100644 index 0000000000..ec8aa586cc --- /dev/null +++ b/view/theme/quattro/templates/events-js.tpl @@ -0,0 +1,7 @@ + +{{$tabs}} +

    {{$title}} {{$new_event.1}}

    + + + +
    diff --git a/view/theme/quattro/templates/events.tpl b/view/theme/quattro/templates/events.tpl new file mode 100644 index 0000000000..7a50498ebd --- /dev/null +++ b/view/theme/quattro/templates/events.tpl @@ -0,0 +1,24 @@ + +{{$tabs}} +

    {{$title}} {{$new_event.1}}

    + + +
    + + {{$calendar}} + +
    +
    + + +{{foreach $events as $event}} +
    + {{if $event.is_first}}
    {{$event.d}}
    {{/if}} + {{if $event.item.author_name}}{{$event.item.author_name}}{{/if}} + {{$event.html}} + {{if $event.item.plink}}{{/if}} + {{if $event.edit}}{{/if}} +
    +
    + +{{/foreach}} From 37a70d3204358bb6f55126ef3c47959cddb656e7 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 4 Dec 2015 19:49:09 +0000 Subject: [PATCH 292/313] modified: include/dbstructure.php removed uneeded break; It causes errors with php 7.0. --- include/dbstructure.php | 1 - 1 file changed, 1 deletion(-) diff --git a/include/dbstructure.php b/include/dbstructure.php index 0dd74ab15f..2078c208a2 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -62,7 +62,6 @@ function update_fail($update_id, $error_message){ */ //try the logger logger("CRITICAL: Database structure update failed: ".$retval); - break; } From f849ff0155b1119523227cdb2a8bfa5707ae02a9 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 4 Dec 2015 21:31:33 +0100 Subject: [PATCH 293/313] SV messages.po regenerated from strings.php --- view/sv/messages.po | 3988 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 3988 insertions(+) create mode 100644 view/sv/messages.po diff --git a/view/sv/messages.po b/view/sv/messages.po new file mode 100644 index 0000000000..9bd0b732fc --- /dev/null +++ b/view/sv/messages.po @@ -0,0 +1,3988 @@ +# FRIENDICA Distributed Social Network +# Copyright (C) 2010, 2011, 2012, 2013 the Friendica Project +# This file is distributed under the same license as the Friendica package. +# +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-04 20:30:51+0000\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "Not Found" +msgstr "Hittar inte" + +msgid "Page not found." +msgstr "Sidan hittades inte." + +msgid "Permission denied" +msgstr "Åtkomst nekad" + +msgid "Permission denied." +msgstr "Åtkomst nekad." + +msgid "Delete this item?" +msgstr "Ta bort?" + +msgid "Comment" +msgstr "Kommentera" + +msgid "Create a New Account" +msgstr "Skapa nytt konto" + +msgid "Register" +msgstr "Registrera" + +msgid "Notifications" +msgstr "Aviseringar" + +msgid "Nickname or Email address: " +msgstr "Användarnamn eller e-postadress: " + +msgid "Password: " +msgstr "Lösenord: " + +msgid "Login" +msgstr "Logga in" + +msgid "Nickname/Email/OpenID: " +msgstr "Användarnamn/e-post/OpenID: " + +msgid "Password (if not OpenID): " +msgstr "Lösenord (om inget OpenID): " + +msgid "Forgot your password?" +msgstr "Har du glömt lösenordet?" + +msgid "Password Reset" +msgstr "Glömt lösenordet?" + +msgid "Logout" +msgstr "Logga ut" + +msgid "prev" +msgstr "föreg" + +msgid "first" +msgstr "första" + +msgid "last" +msgstr "sista" + +msgid "next" +msgstr "nästa" + +msgid "No contacts" +msgstr "Inga kontakter" + +msgid "View Contacts" +msgstr "Visa kontakter" + +msgid "Search" +msgstr "Sök" + +msgid "No profile" +msgstr "Ingen profil" + +msgid "Connect" +msgstr "Skicka kontaktförfrågan" + +msgid "Location:" +msgstr "Plats:" + +msgid ", " +msgstr ", " + +msgid "Gender:" +msgstr "Kön:" + +msgid "Status:" +msgstr "Status:" + +msgid "Homepage:" +msgstr "Hemsida:" + +msgid "Monday" +msgstr "måndag" + +msgid "Tuesday" +msgstr "tisdag" + +msgid "Wednesday" +msgstr "onsdag" + +msgid "Thursday" +msgstr "torsdag" + +msgid "Friday" +msgstr "fredag" + +msgid "Saturday" +msgstr "lördag" + +msgid "Sunday" +msgstr "söndag" + +msgid "January" +msgstr "januari" + +msgid "February" +msgstr "februari" + +msgid "March" +msgstr "mars" + +msgid "April" +msgstr "april" + +msgid "May" +msgstr "maj" + +msgid "June" +msgstr "juni" + +msgid "July" +msgstr "juli" + +msgid "August" +msgstr "augusti" + +msgid "September" +msgstr "september" + +msgid "October" +msgstr "oktober" + +msgid "November" +msgstr "november" + +msgid "December" +msgstr "december" + +msgid "g A l F d" +msgstr "g A l F d" + +msgid "Birthday Reminders" +msgstr "Födelsedagspåminnelser" + +msgid "Birthdays this week:" +msgstr "Födelsedagar denna vecka:" + +msgid "(Adjusted for local time)" +msgstr "(Justerat till lokal tid)" + +msgid "[today]" +msgstr "[idag]" + +msgid "link to source" +msgstr "länk till källa" + +#, php-format +msgid "%d Contact" +msgid_plural "%d Contacts" +msgstr[0] "%d kontakt" +msgstr[1] "%d kontakter" + +msgid "Normal View" +msgstr "Byt till normalvy" + +msgid "New Item View" +msgstr "Visa nya inlägg överst" + +#, php-format +msgid "Warning: This group contains %s from an insecure network." +msgstr "Varning! Gruppen innehåller %s på osäkra nätverk." + +msgid "Private messages to this group are at risk of public disclosure." +msgstr "Meddelanden kan komma att bli synliga för vem som helst på internet." + +msgid "Please enter a link URL:" +msgstr "Ange en länk (URL):" + +msgid "Please enter a YouTube link:" +msgstr "Ange en YouTube-länk:" + +msgid "Please enter a video(.ogg) link/URL:" +msgstr "Ange länk/URL till video (.ogg):" + +msgid "Please enter an audio(.ogg) link/URL:" +msgstr "Ange länk/URL till ljud (.ogg):" + +msgid "Where are you right now?" +msgstr "Var är du just nu?" + +msgid "Enter a title for this item" +msgstr "Ange en rubrik på inlägget" + +msgid "Share" +msgstr "Publicera" + +msgid "Upload photo" +msgstr "Ladda upp bild" + +msgid "Insert web link" +msgstr "Infoga länk" + +msgid "Insert YouTube video" +msgstr "Infoga video från YouTube" + +msgid "Insert Vorbis [.ogg] video" +msgstr "Lägg in video i format Vorbis [.ogg]" + +msgid "Insert Vorbis [.ogg] audio" +msgstr "Lägg in ljud i format Vorbis [.ogg]" + +msgid "Set your location" +msgstr "Ange plats" + +msgid "Clear browser location" +msgstr "Clear browser location" + +msgid "Set title" +msgstr "Ange rubrik" + +msgid "Please wait" +msgstr "Vänta" + +msgid "Permission settings" +msgstr "Åtkomstinställningar" + +msgid "CC: email addresses" +msgstr "Kopia: e-postadresser" + +msgid "Example: bob@example.com, mary@example.com" +msgstr "Exempel: adam@exempel.com, bertil@exempel.com" + +msgid "No such group" +msgstr "Gruppen finns inte" + +msgid "Group is empty" +msgstr "Gruppen är tom" + +msgid "Group: " +msgstr "Grupp: " + +msgid "Shared content is covered by the Creative Commons Attribution 3.0 license." +msgstr "Innehållet omfattas av licensen Creative Commons Attribution 3.0." + +#, php-format +msgid "%d member" +msgid_plural "%d member" +msgstr[0] "%d medlem" +msgstr[1] "%d medlemmar" + +msgid "Applications" +msgstr "Applikationer" + +msgid "Invite Friends" +msgstr "Bjud in folk du känner" + +msgid "Find People With Shared Interests" +msgstr "Sök personer som har samma intressen som du" + +msgid "Connect/Follow" +msgstr "Gör till kontakt/Följ" + +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "Exempel: adam@exempel.com, http://exempel.com/bertil" + +msgid "Follow" +msgstr "Följ" + +msgid "Could not access contact record." +msgstr "Hittar inte information om kontakten." + +msgid "Could not locate selected profile." +msgstr "Hittar inte vald profil." + +msgid "Contact updated." +msgstr "Kontakten har uppdaterats." + +msgid "Failed to update contact record." +msgstr "Det blev fel när kontakten skulle uppdateras." + +msgid "Contact has been " +msgstr "Kontakten " + +msgid "blocked" +msgstr "spärrad" + +msgid "unblocked" +msgstr "inte längre spärrad" + +msgid "Contact has been blocked" +msgstr "Kontakten har spärrats" + +msgid "Contact has been unblocked" +msgstr "Kontakten är inte längre spärrad" + +msgid "Contact has been ignored" +msgstr "Kontakten ignoreras" + +msgid "Contact has been unignored" +msgstr "Kontakten ignoreras inte längre" + +msgid "stopped following" +msgstr "följer inte längre" + +msgid "Contact has been removed." +msgstr "Kontakten har tagits bort." + +msgid "Contact not found." +msgstr "Kontakten hittades inte." + +msgid "Mutual Friendship" +msgstr "Ömsesidig vänskap" + +msgid "is a fan of yours" +msgstr "är ett fan till dig" + +msgid "you are a fan of" +msgstr "du är fan till" + +msgid "Privacy Unavailable" +msgstr "Inte tillgängligt" + +msgid "Private communications are not available for this contact." +msgstr "Det går inte att utbyta personliga meddelanden med den här kontakten." + +msgid "Never" +msgstr "Aldrig" + +msgid "(Update was successful)" +msgstr "(Uppdateringen lyckades)" + +msgid "(Update was not successful)" +msgstr "(Uppdateringen lyckades inte)" + +msgid "Contact Editor" +msgstr "Ändra kontakter" + +msgid "Submit" +msgstr "Spara" + +msgid "Profile Visibility" +msgstr "Visning av profil" + +#, php-format +msgid "Please choose the profile you would like to display to %s when viewing your profile securely." +msgstr "Välj vilken profil som ska visas för %s när han/hon besöker din sida." + +msgid "Contact Information / Notes" +msgstr "Kontaktuppgifter/Anteckningar" + +msgid "Online Reputation" +msgstr "Rykte online" + +msgid "Occasionally your friends may wish to inquire about this person's online legitimacy." +msgstr "Dina kontakter kanske vill veta något om den här personens rykte online innan de tar kontakt." + +msgid "You may help them choose whether or not to interact with this person by providing a reputation to guide them." +msgstr "Du kan vara till hjälp genom att ange personens rykte online." + +msgid "Please take a moment to elaborate on this selection if you feel it could be helpful to others." +msgstr "Ägna gärna en stund åt att ange detta för att hjälpa andra." + +msgid "Visit $name's profile" +msgstr "Besök $name " + +msgid "Block/Unblock contact" +msgstr "Spärra kontakt eller häv spärr" + +msgid "Ignore contact" +msgstr "Ignorera kontakt" + +msgid "Repair contact URL settings" +msgstr "Repair contact URL settings" + +msgid "Repair contact URL settings (WARNING: Advanced)" +msgstr "Repair contact URL settings (WARNING: Advanced)" + +msgid "Delete contact" +msgstr "Ta bort kontakt" + +msgid "Last updated: " +msgstr "Uppdaterad senast: " + +msgid "Update public posts: " +msgstr "Uppdatera offentliga inlägg: " + +msgid "Update now" +msgstr "Updatera nu" + +msgid "Unblock this contact" +msgstr "Häv spärr för kontakt" + +msgid "Block this contact" +msgstr "Spärra kontakt" + +msgid "Unignore this contact" +msgstr "Ignorera inte längre kontakt" + +msgid "Ignore this contact" +msgstr "Ignorera kontakt" + +msgid "Currently blocked" +msgstr "Spärrad" + +msgid "Currently ignored" +msgstr "Ignoreras" + +msgid "Contacts" +msgstr "Kontakter" + +msgid "Show Blocked Connections" +msgstr "Visa spärrade kontakter" + +msgid "Hide Blocked Connections" +msgstr "Dölj spärrade kontakter" + +msgid "Finding: " +msgstr "Hittar: " + +msgid "Find" +msgstr "Sök" + +msgid "Visit $username's profile" +msgstr "Gå till profilen som tillhör $username" + +msgid "Edit contact" +msgstr "Ändra kontakt" + +msgid "Contact settings applied." +msgstr "Inställningar för kontakter har sparats." + +msgid "Contact update failed." +msgstr "Det gick inte att uppdatera kontakt." + +msgid "Repair Contact Settings" +msgstr "Repair Contact Settings" + +msgid "WARNING: This is highly advanced and if you enter incorrect information your communications with this contact will stop working." +msgstr "VARNING! Det här är en avancerad inställning och om du anger felaktig information kommer kommunikationen med den här kontakten att sluta fungera." + +msgid "Please use your browser 'Back' button now if you are uncertain what to do on this page." +msgstr "Använd webbläsarens bakåtknapp nu om du är osäker på vad man gör på den här sidan." + +msgid "Name" +msgstr "Namn" + +msgid "Profile not found." +msgstr "Profilen hittades inte." + +msgid "Response from remote site was not understood." +msgstr "Kunde inte tolka svaret från fjärrsajten." + +msgid "Unexpected response from remote site: " +msgstr "Oväntat svar från fjärrsajten: " + +msgid "Confirmation completed successfully." +msgstr "Bekräftat." + +msgid "Remote site reported: " +msgstr "Meddelande från fjärrsajten: " + +msgid "Temporary failure. Please wait and try again." +msgstr "Tillfälligt fel. Försök igen lite senare." + +msgid "Introduction failed or was revoked." +msgstr "Kontaktförfrågan gick inte fram eller har återkallats." + +msgid "Unable to set contact photo." +msgstr "Det gick inte att byta profilbild." + +msgid "is now friends with" +msgstr "är nu vän med" + +msgid "Our site encryption key is apparently messed up." +msgstr "Det är något fel på webbplatsens krypteringsnyckel." + +msgid "Empty site URL was provided or URL could not be decrypted by us." +msgstr "Empty site URL was provided or URL could not be decrypted by us." + +msgid "Contact record was not found for you on our site." +msgstr "Det gick inte att hitta efterfrågad information på vår webbplats." + +msgid "The ID provided by your system is a duplicate on our system. It should work if you try again." +msgstr "Det ID som angavs av ditt system är samma som på vårt system. Det borde fungera om du provar igen." + +msgid "Unable to set your contact credentials on our system." +msgstr "Unable to set your contact credentials on our system." + +msgid "Unable to update your contact profile details on our system" +msgstr "Unable to update your contact profile details on our system" + +#, php-format +msgid "Connection accepted at %s" +msgstr "Kontaktförfrågan beviljad - %s" + +msgid "Administrator" +msgstr "Admin" + +msgid "noreply" +msgstr "noreply" + +#, php-format +msgid "%s commented on an item at %s" +msgstr "%s har kommenterat ett inlägg på %s" + +msgid "This introduction has already been accepted." +msgstr "Den här förfrågan har redan beviljats." + +msgid "Profile location is not valid or does not contain profile information." +msgstr "Profiladressen är ogiltig eller innehåller ingen profilinformation." + +msgid "Warning: profile location has no identifiable owner name." +msgstr "Varning! Hittar inget namn som identifierar profilen." + +msgid "Warning: profile location has no profile photo." +msgstr "Varning! Profilen innehåller inte någon profilbild." + +msgid "Introduction complete." +msgstr "Kontaktförfrågan/Presentationen är klar." + +msgid "Unrecoverable protocol error." +msgstr "Protokollfel." + +msgid "Profile unavailable." +msgstr "Profilen är inte tillgänglig." + +#, php-format +msgid "%s has received too many connection requests today." +msgstr "%s har fått för många kontaktförfrågningar idag." + +msgid "Spam protection measures have been invoked." +msgstr "Åtgärder för spamskydd har vidtagits." + +msgid "Friends are advised to please try again in 24 hours." +msgstr "Dina vänner kan prova igen om ett dygn." + +msgid "Invalid locator" +msgstr "Invalid locator" + +msgid "Unable to resolve your name at the provided location." +msgstr "Unable to resolve your name at the provided location." + +msgid "You have already introduced yourself here." +msgstr "Du har redan presenterat dig här." + +#, php-format +msgid "Apparently you are already friends with %s." +msgstr "Du och %s är redan kontakter." + +msgid "Invalid profile URL." +msgstr "Ogiltig profil-URL." + +msgid "Disallowed profile URL." +msgstr "Otillåten profil-URL." + +msgid "Your introduction has been sent." +msgstr "Kontaktförfrågan/Presentationen har skickats." + +msgid "Please login to confirm introduction." +msgstr "Logga in för att acceptera förfrågan." + +msgid "Incorrect identity currently logged in. Please login to this profile." +msgstr "Inloggad med fel identitet. Logga in med den här profilen." + +#, php-format +msgid "Welcome home %s." +msgstr "Välkommen hem %s." + +#, php-format +msgid "Please confirm your introduction/connection request to %s." +msgstr "Bekräfta att du vill skicka kontaktförfrågan till %s." + +msgid "Confirm" +msgstr "Bekräfta" + +msgid "[Name Withheld]" +msgstr "[Namnet visas inte]" + +msgid "Introduction received at " +msgstr "Inkommen kontaktförfrågan/presentation - " + +msgid "Friend/Connection Request" +msgstr "Vän- eller kontaktförfrågan" + +msgid "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca" +msgstr "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca" + +msgid "Please answer the following:" +msgstr "Var vänlig besvara följande:" + +msgid "Does $name know you?" +msgstr "Känner $name dig?" + +msgid "Yes" +msgstr "Ja" + +msgid "No" +msgstr "Nej" + +msgid "Add a personal note:" +msgstr "Lägg till ett personligt meddelande:" + +msgid "Please enter your 'Identity Address' from one of the following supported social networks:" +msgstr "Ange din adress, ditt ID, på ett av följande sociala nätverk:" + +msgid "Friendica" +msgstr "Friendica" + +msgid "StatusNet/Federated Social Web" +msgstr "StatusNet/Federated Social Web" + +msgid "Private (secure) network" +msgstr "Privat (säkert) nätverk" + +msgid "Public (insecure) network" +msgstr "Offentligt (osäkert) nätverk" + +msgid "Your Identity Address:" +msgstr "Din adress (ditt ID):" + +msgid "Submit Request" +msgstr "Skicka förfrågan" + +msgid "Cancel" +msgstr "Avbryt" + +#, php-format +msgid "%d required parameter was not found at the given location" +msgid_plural "%d required parameters were not found at the given location" +msgstr[0] "%d required parameter was not found at the given location" +msgstr[1] "%d required parameters were not found at the given location" + +msgid "Global Directory" +msgstr "Medlemskatalog för flera sajter (global)" + +msgid "Site Directory" +msgstr "Medlemskatalog" + +msgid "Age: " +msgstr "Ålder: " + +msgid "Gender: " +msgstr "Kön: " + +msgid "No entries (some entries may be hidden)." +msgstr "Inget att visa. (Man kan välja att inte synas här)" + +msgid "Item not found." +msgstr "Hittar inte." + +msgid "Item has been removed." +msgstr "Har tagits bort." + +msgid "Item not found" +msgstr "Hittades inte" + +msgid "Edit post" +msgstr "Ändra inlägg" + +msgid "Edit" +msgstr "Ändra" + +msgid "The profile address specified does not provide adequate information." +msgstr "Angiven profiladress ger inte tillräcklig information." + +msgid "Limited profile. This person will be unable to receive direct/personal notifications from you." +msgstr "Begränsad profil. Den här personen kommer inte att kunna ta emot personliga meddelanden från dig." + +msgid "Unable to retrieve contact information." +msgstr "Det gick inte att komma åt kontaktinformationen." + +msgid "following" +msgstr "följer" + +msgid "This is Friendica version" +msgstr "Det här är Friendica version" + +msgid "running at web location" +msgstr "som körs på" + +msgid "Shared content within the Friendica network is provided under the Creative Commons Attribution 3.0 license" +msgstr "Innehåll som publiceras inom Friendicanätverket omfattas av licensen Creative Commons Attribution 3.0 license" + +msgid "Please visit Project.Friendica.com to learn more about the Friendica project." +msgstr "Gå till Project.Friendica.com om du vill läsa mer om friendicaprojektet." + +msgid "Bug reports and issues: please visit" +msgstr "Anmäl buggar eller andra problem, gå till" + +msgid "Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com" +msgstr "Förslag, beröm, donationer, etc. - skicka e-post till \"info at friendica punkt com\" " + +msgid "Installed plugins/addons/apps" +msgstr "Installerade insticksprogram/applikationer" + +msgid "No installed plugins/addons/apps" +msgstr "Inga installerade insticksprogram/applikationer" + +msgid "Group created." +msgstr "Gruppen har skapats." + +msgid "Could not create group." +msgstr "Det gick inte att skapa gruppen." + +msgid "Group not found." +msgstr "Gruppen hittades inte." + +msgid "Group name changed." +msgstr "Gruppens namn har ändrats." + +msgid "Create a group of contacts/friends." +msgstr "Skapa en grupp med kontakter/vänner." + +msgid "Group Name: " +msgstr "Gruppens namn: " + +msgid "Group removed." +msgstr "Gruppen har tagits bort." + +msgid "Unable to remove group." +msgstr "Det gick inte att ta bort gruppen." + +msgid "Delete" +msgstr "Ta bort" + +msgid "Click on a contact to add or remove." +msgstr "Klicka på en kontakt för att lägga till eller ta bort." + +msgid "Group Editor" +msgstr "Ändra i grupper" + +msgid "Members" +msgstr "Medlemmar" + +msgid "All Contacts" +msgstr "Alla kontakter" + +msgid "Help:" +msgstr "Hjälp:" + +msgid "Help" +msgstr "Hjälp" + +#, php-format +msgid "Welcome to %s" +msgstr "Välkommen till %s" + +msgid "Could not create/connect to database." +msgstr "Det gick inte att skapa eller ansluta till databasen." + +msgid "Connected to database." +msgstr "Ansluten till databasen." + +msgid "Proceed with Installation" +msgstr "Fortsätt med installationen" + +msgid "Your Friendica site database has been installed." +msgstr "Databasen för din friendicasajt har installerats." + +msgid "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." +msgstr "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." + +msgid "Please see the file \"INSTALL.txt\"." +msgstr "Se filen \"INSTALL.txt\"." + +msgid "Proceed to registration" +msgstr "Gå vidare till registreringen" + +msgid "Database import failed." +msgstr "Det gick inte att importera databasen." + +msgid "You may need to import the file \"database.sql\" manually using phpmyadmin or mysql." +msgstr "Du kanske måste importera filen \"database.sql\" manuellt med phpmyadmin eller mysql." + +msgid "Welcome to Friendica." +msgstr "Välkommen till Friendica." + +msgid "Friendica Social Network" +msgstr "Det sociala nätverket Friendica" + +msgid "Installation" +msgstr "Installation" + +msgid "In order to install Friendica we need to know how to contact your database." +msgstr "In order to install Friendica we need to know how to contact your database." + +msgid "Please contact your hosting provider or site administrator if you have questions about these settings." +msgstr "Please contact your hosting provider or site administrator if you have questions about these settings." + +msgid "The database you specify below must already exist. If it does not, please create it before continuing." +msgstr "The database you specify below must already exist. If it does not, please create it before continuing." + +msgid "Database Server Name" +msgstr "Database Server Name" + +msgid "Database Login Name" +msgstr "Database Login Name" + +msgid "Database Login Password" +msgstr "Database Login Password" + +msgid "Database Name" +msgstr "Database Name" + +msgid "Please select a default timezone for your website" +msgstr "Please select a default timezone for your website" + +msgid "Could not find a command line version of PHP in the web server PATH." +msgstr "Could not find a command line version of PHP in the web server PATH." + +msgid "This is required. Please adjust the configuration file .htconfig.php accordingly." +msgstr "This is required. Please adjust the configuration file .htconfig.php accordingly." + +msgid "The command line version of PHP on your system does not have \"register_argc_argv\" enabled." +msgstr "The command line version of PHP on your system does not have \"register_argc_argv\" enabled." + +msgid "This is required for message delivery to work." +msgstr "Det krävs för att meddelanden ska kunna levereras." + +msgid "Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys" +msgstr "Fel: funktionen \"openssl_pkey_new\" kan inte skapa krypteringsnycklar" + +msgid "If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"." +msgstr "Läs mer på \"http://www.php.net/manual/en/openssl.installation.php\" om du kör Windows." + +msgid "Error: Apache webserver mod-rewrite module is required but not installed." +msgstr "Error: Apache webserver mod-rewrite module is required but not installed." + +msgid "Error: libCURL PHP module required but not installed." +msgstr "Error: libCURL PHP module required but not installed." + +msgid "Error: GD graphics PHP module with JPEG support required but not installed." +msgstr "Error: GD graphics PHP module with JPEG support required but not installed." + +msgid "Error: openssl PHP module required but not installed." +msgstr "Error: openssl PHP module required but not installed." + +msgid "Error: mysqli PHP module required but not installed." +msgstr "Error: mysqli PHP module required but not installed." + +msgid "The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so." +msgstr "The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so." + +msgid "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can." +msgstr "This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can." + +msgid "Please check with your site documentation or support people to see if this situation can be corrected." +msgstr "Please check with your site documentation or support people to see if this situation can be corrected." + +msgid "If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions." +msgstr "If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions." + +msgid "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root." +msgstr "The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root." + +msgid "Errors encountered creating database tables." +msgstr "Fel vid skapandet av databastabeller." + +#, php-format +msgid "%s : Not a valid email address." +msgstr "%s : Ogiltig e-postadress." + +#, php-format +msgid "%s : Message delivery failed." +msgstr "%s : Meddelandet kom inte fram." + +msgid "Send invitations" +msgstr "Skicka inbjudningar" + +msgid "Enter email addresses, one per line:" +msgstr "Ange e-postadresser, en per rad:" + +msgid "Your message:" +msgstr "Meddelande:" + +msgid "To accept this invitation, please visit:" +msgstr "Gå hit för att tacka ja till inbjudan:" + +msgid "Once you have registered, please connect with me via my profile page at:" +msgstr "Vi kan bli kontakter via min profil. Besök min profil här när du har registrerat dig:" + +#, php-format +msgid "%d message sent." +msgid_plural "%d messages sent." +msgstr[0] "%d meddelande har skickats." +msgstr[1] "%d meddelanden har skickats." + +msgid "Unable to locate original post." +msgstr "Hittar inte det ursprungliga inlägget." + +msgid "Empty post discarded." +msgstr "Tomt inlägg. Inte sparat." + +msgid "Wall Photos" +msgstr "Loggbilder" + +#, php-format +msgid "%s commented on your item at %s" +msgstr "%s har kommenterat ditt inlägg på %s" + +#, php-format +msgid "%s posted on your profile wall at %s" +msgstr "%s har gjort ett inlägg på din logg på %s" + +msgid "System error. Post not saved." +msgstr "Något gick fel. Inlägget sparades inte." + +msgid "You may visit them online at" +msgstr "Besök online på" + +msgid "Please contact the sender by replying to this post if you do not wish to receive these messages." +msgstr "Kontakta avsändaren genom att svara på det här meddelandet om du inte vill ha sådana här meddelanden." + +#, php-format +msgid "%s posted an update." +msgstr "%s har gjort ett inlägg." + +msgid "photo" +msgstr "bild" + +msgid "status" +msgstr "status" + +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "%1$s gillar %2$s's %3$s" + +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "%1$s ogillar %2$s's %3$s" + +msgid "Remote privacy information not available." +msgstr "Remote privacy information not available." + +msgid "Visible to:" +msgstr "Synlig för:" + +msgid "Password reset request issued. Check your email." +msgstr "Nytt lösenord har begärts. Kolla din mail." + +#, php-format +msgid "Password reset requested at %s" +msgstr "Nytt lösenord på %s har begärts" + +msgid "Request could not be verified. (You may have previously submitted it.) Password reset failed." +msgstr "Begäran kunde inte verifieras. (Du kanske redan skickat den?) Det gick inte att byta lösenord." + +msgid "Your password has been reset as requested." +msgstr "Nu har du fått ett nytt lösenord." + +msgid "Your new password is" +msgstr "Det nya lösenordet är" + +msgid "Save or copy your new password - and then" +msgstr "Spara eller kopiera lösenordet och" + +msgid "click here to login" +msgstr "klicka här för att logga in" + +msgid "Your password may be changed from the Settings page after successful login." +msgstr "När du loggat in kan du byta lösenord på sidan Inställningar." + +msgid "Forgot your Password?" +msgstr "Glömt lösenordet?" + +msgid "Enter your email address and submit to have your password reset. Then check your email for further instructions." +msgstr "Ange din e-postadress för att få ett nytt lösenord. Du kommer att få ett meddelande med vidare instruktioner via e-post." + +msgid "Nickname or Email: " +msgstr "Användarnamn eller e-post:" + +msgid "Reset" +msgstr "Skicka" + +#, php-format +msgid "Welcome back %s" +msgstr "Välkommen tillbaka %s" + +msgid "Manage Identities and/or Pages" +msgstr "Hantera identiteter eller sidor" + +msgid "(Toggle between different identities or community/group pages which share your account details.)" +msgstr "(Växla mellan olika identiteter eller gemenskaper/gruppsidor som är kopplade till ditt konto.)" + +msgid "Select an identity to manage: " +msgstr "Välj vilken identitet du vill hantera: " + +msgid "Profile Match" +msgstr "Matcha profiler" + +msgid "No matches" +msgstr "Ingen träff" + +msgid "No recipient selected." +msgstr "Ingen mottagare har valts." + +msgid "[no subject]" +msgstr "[ingen rubrik]" + +msgid "Unable to locate contact information." +msgstr "Det gick inte att hitta kontaktuppgifterna." + +msgid "Message sent." +msgstr "Meddelandet har skickats." + +msgid "Message could not be sent." +msgstr "Det gick inte att skicka meddelandet." + +msgid "Messages" +msgstr "Meddelanden" + +msgid "Inbox" +msgstr "Inkorg" + +msgid "Outbox" +msgstr "Utkorg" + +msgid "New Message" +msgstr "Nytt meddelande" + +msgid "Message deleted." +msgstr "Meddelandet togs bort." + +msgid "Conversation removed." +msgstr "Konversationen togs bort." + +msgid "Send Private Message" +msgstr "Skicka personligt meddelande" + +msgid "To:" +msgstr "Till:" + +msgid "Subject:" +msgstr "Rubrik:" + +msgid "No messages." +msgstr "Inga meddelanden." + +msgid "Delete conversation" +msgstr "Ta bort konversation" + +msgid "D, d M Y - g:i A" +msgstr "D, d M Y - g:i A" + +msgid "Message not available." +msgstr "Meddelandet är inte tillgängligt." + +msgid "Delete message" +msgstr "Ta bort meddelande" + +msgid "Send Reply" +msgstr "Skicka svar" + +msgid "Invalid request identifier." +msgstr "Invalid request identifier." + +msgid "Discard" +msgstr "Ta bort" + +msgid "Ignore" +msgstr "Ignorera" + +msgid "Pending Friend/Connect Notifications" +msgstr "Väntande kontaktförfrågningar" + +msgid "Show Ignored Requests" +msgstr "Visa förfrågningar du ignorerat" + +msgid "Hide Ignored Requests" +msgstr "Dölj förfrågningar du ignorerat" + +msgid "Claims to be known to you: " +msgstr "Hävdar att du vet vem han/hon är: " + +msgid "yes" +msgstr "ja" + +msgid "no" +msgstr "nej" + +msgid "Approve as: " +msgstr "Godkänn och lägg till som: " + +msgid "Friend" +msgstr "Vän" + +msgid "Fan/Admirer" +msgstr "Fan/Beundrare" + +msgid "Notification type: " +msgstr "Typ av avisering: " + +msgid "Friend/Connect Request" +msgstr "Vän- eller kontaktförfrågan" + +msgid "New Follower" +msgstr "En som vill följa dig" + +msgid "Approve" +msgstr "Godkänn" + +msgid "No notifications." +msgstr "Inga aviseringar." + +msgid "User registrations waiting for confirm" +msgstr "Användare som registrerat sig och inväntar godkännande" + +msgid "Deny" +msgstr "Avslå" + +msgid "No registrations." +msgstr "Inga registreringar." + +msgid "Post successful." +msgstr "Inlagt." + +msgid "Login failed." +msgstr "Inloggningen misslyckades." + +msgid "Welcome back " +msgstr "Välkommen tillbaka " + +msgid "Photo Albums" +msgstr "Fotoalbum" + +msgid "Contact Photos" +msgstr "Dina kontakters bilder" + +msgid "Contact information unavailable" +msgstr "Kommer inte åt kontaktuppgifter." + +msgid "Profile Photos" +msgstr "Profilbilder" + +msgid "Album not found." +msgstr "Albumet finns inte." + +msgid "Delete Album" +msgstr "Ta bort album" + +msgid "Delete Photo" +msgstr "Ta bort bild" + +msgid "was tagged in a" +msgstr "har taggats i" + +msgid "by" +msgstr "av" + +msgid "Image exceeds size limit of " +msgstr "Bilden överskrider den tillåtna storleken " + +msgid "Unable to process image." +msgstr "Det gick inte att behandla bilden." + +msgid "Image upload failed." +msgstr "Fel vid bilduppladdning." + +msgid "No photos selected" +msgstr "Inga bilder har valts" + +msgid "Upload Photos" +msgstr "Ladda upp bilder" + +msgid "New album name: " +msgstr "Nytt album med namn: " + +msgid "or existing album name: " +msgstr "eller befintligt album med namn: " + +msgid "Permissions" +msgstr "Åtkomst" + +msgid "Edit Album" +msgstr "Redigera album" + +msgid "View Photo" +msgstr "Visa bild" + +msgid "Photo not available" +msgstr "Bilden är inte tillgänglig" + +msgid "Edit photo" +msgstr "Hantera bild" + +msgid "Private Message" +msgstr "Personligt meddelande" + +msgid "<< Prev" +msgstr "<< Föreg" + +msgid "View Full Size" +msgstr "Visa fullstor" + +msgid "Next >>" +msgstr "Nästa >>" + +msgid "Tags: " +msgstr "Taggar: " + +msgid "[Remove any tag]" +msgstr "[Remove any tag]" + +msgid "New album name" +msgstr "Nytt album med namn" + +msgid "Caption" +msgstr "Caption" + +msgid "Add a Tag" +msgstr "Lägg till tagg" + +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +msgstr "Exempel: @adam, @Anna_Andersson, @johan@exempel.com, #Stockholm, #camping" + +msgid "I like this (toggle)" +msgstr "Jag gillar det här (växla)" + +msgid "I don't like this (toggle)" +msgstr "Jag ogillar det här (växla)" + +msgid "This is you" +msgstr "Det här är du" + +msgid "Recent Photos" +msgstr "Nyligen tillagda bilder" + +msgid "Upload New Photos" +msgstr "Ladda upp bilder" + +msgid "View Album" +msgstr "Titta i album" + +msgid "Status" +msgstr "Status" + +msgid "Profile" +msgstr "Profil" + +msgid "Photos" +msgstr "Bilder" + +msgid "Image uploaded but image cropping failed." +msgstr "Bilden laddades upp men det blev fel när den skulle beskäras." + +msgid "Unable to process image" +msgstr "Det gick inte att behandla bilden" + +msgid "Upload File:" +msgstr "Ladda upp fil:" + +msgid "Upload Profile Photo" +msgstr "Ladda upp profilbild" + +msgid "Upload" +msgstr "Ladda upp" + +msgid "or" +msgstr "eller" + +msgid "select a photo from your photo albums" +msgstr "välj en bild från ett album" + +msgid "Crop Image" +msgstr "Beskär bild" + +msgid "Please adjust the image cropping for optimum viewing." +msgstr "Välj hur bilden ska beskäras för att bli så bra som möjligt." + +msgid "Done Editing" +msgstr "Spara" + +msgid "Image uploaded successfully." +msgstr "Bilden har laddats upp." + +msgid "Profile Name is required." +msgstr "Profilen måste ha ett namn." + +msgid "Profile updated." +msgstr "Profilen har uppdaterats." + +msgid "Profile deleted." +msgstr "Profilen har tagits bort." + +msgid "Profile-" +msgstr "Profil-" + +msgid "New profile created." +msgstr "En ny profil har skapats." + +msgid "Profile unavailable to clone." +msgstr "Det gick inte att klona profilen." + +msgid "Hide my contact/friend list from viewers of this profile?" +msgstr "Dölj min kontaktlista för personer som ser den här profilen?" + +msgid "Edit Profile Details" +msgstr "Ändra profilen" + +msgid "View this profile" +msgstr "Titta på profilen" + +msgid "Create a new profile using these settings" +msgstr "Skapa en ny profil med dessa inställningar" + +msgid "Clone this profile" +msgstr "Kopiera profil" + +msgid "Delete this profile" +msgstr "Ta bort profil" + +msgid "Profile Name:" +msgstr "Profilens namn:" + +msgid "Your Full Name:" +msgstr "Fullständigt namn:" + +msgid "Title/Description:" +msgstr "Titel/Beskrivning:" + +msgid "Your Gender:" +msgstr "Kön:" + +msgid "Birthday (y/m/d):" +msgstr "Födelsedag (y/m/d):" + +msgid "Street Address:" +msgstr "Gatuadress:" + +msgid "Locality/City:" +msgstr "Plats/Stad:" + +msgid "Postal/Zip Code:" +msgstr "Postnummer:" + +msgid "Country:" +msgstr "Land:" + +msgid "Region/State:" +msgstr "Region:" + +msgid "♥ Marital Status:" +msgstr "♥ Civilstånd:" + +msgid "Who: (if applicable)" +msgstr "Vem: (om tillämpligt)" + +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "Exempel: kalle123, Johanna Johansson, pelle@exempel.com" + +msgid "Sexual Preference:" +msgstr "Sexualitet" + +msgid "Homepage URL:" +msgstr "Hemsida: (URL)" + +msgid "Political Views:" +msgstr "Politisk åskådning:" + +msgid "Religious Views:" +msgstr "Religion:" + +msgid "Public Keywords:" +msgstr "Offentliga nyckelord:" + +msgid "Private Keywords:" +msgstr "Privata nyckelord:" + +msgid "Example: fishing photography software" +msgstr "Exempel: fiske fotografering programmering" + +msgid "(Used for suggesting potential friends, can be seen by others)" +msgstr "(Obs, synliga för andra. Används för att föreslå potentiella vänner.)" + +msgid "(Used for searching profiles, never shown to others)" +msgstr "(Obs, kan ge sökträffar vid sökning av profiler. Visas annars inte för andra.)" + +msgid "Tell us about yourself..." +msgstr "Beskriv dig själv..." + +msgid "Hobbies/Interests" +msgstr "Hobbys/Intressen" + +msgid "Contact information and Social Networks" +msgstr "Kontaktuppgifter och sociala nätverk" + +msgid "Musical interests" +msgstr "Musik" + +msgid "Books, literature" +msgstr "Böcker, litteratur" + +msgid "Television" +msgstr "TV" + +msgid "Film/dance/culture/entertainment" +msgstr "Film/Dans/Kultur/Nöje" + +msgid "Love/romance" +msgstr "Kärlek/Romantik" + +msgid "Work/employment" +msgstr "Arbete" + +msgid "School/education" +msgstr "Skola/Utbildning" + +msgid "This is your public profile.
    It may be visible to anybody using the internet." +msgstr "Det här är din offentliga profil.
    Den kan vara synlig för vem som helst på internet." + +msgid "Profiles" +msgstr "Profiler" + +msgid "Change profile photo" +msgstr "Byt profilbild" + +msgid "Create New Profile" +msgstr "Skapa ny profil" + +msgid "Profile Image" +msgstr "Profilbild" + +msgid "Visible to everybody" +msgstr "Synlig för alla" + +msgid "Edit visibility" +msgstr "Ända vilka som ska kunna se" + +msgid "Invalid profile identifier." +msgstr "Ogiltigt profil-ID." + +msgid "Profile Visibility Editor" +msgstr "Ända vilka som ska kunna se profil" + +msgid "Visible To" +msgstr "Synlig för" + +msgid "All Contacts (with secure profile access)" +msgstr "Alla kontakter (med säker tillgång till din profil)" + +msgid "Invalid OpenID url" +msgstr "Ogiltig OpenID-URL" + +msgid "Please enter the required information." +msgstr "Fyll i alla obligatoriska fält." + +msgid "Please use a shorter name." +msgstr "Välj ett kortare namn." + +msgid "Name too short." +msgstr "Namnet är för kort." + +msgid "That doesn't appear to be your full (First Last) name." +msgstr "Du verkar inte ha angett ditt fullständiga namn." + +msgid "Your email domain is not among those allowed on this site." +msgstr "Din e-postdomän är inte tillåten på den här webbplatsen." + +msgid "Not a valid email address." +msgstr "Ogiltig e-postadress." + +msgid "Cannot use that email." +msgstr "Otillåten e-postadress." + +msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter." +msgstr "Ditt användarnamn får bara innehålla a-z, 0-9, - och _, och måste dessutom börja med en bokstav." + +msgid "Nickname is already registered. Please choose another." +msgstr "Användarnamnet är upptaget. Välj ett annat." + +msgid "SERIOUS ERROR: Generation of security keys failed." +msgstr "SERIOUS ERROR: Generation of security keys failed." + +msgid "An error occurred during registration. Please try again." +msgstr "Något gick fel vid registreringen. Försök igen." + +msgid "An error occurred creating your default profile. Please try again." +msgstr "Det blev fel när din standardprofil skulle skapas. Prova igen." + +msgid "Registration successful. Please check your email for further instructions." +msgstr "Registrering klar. Kolla din e-post för vidare information." + +msgid "Failed to send email message. Here is the message that failed." +msgstr "Det gick inte att skicka e-brevet. Här är meddelandet som inte kunde skickas." + +msgid "Your registration can not be processed." +msgstr "Det går inte att behandla registreringen." + +msgid "Your registration is pending approval by the site owner." +msgstr "Din registrering inväntar godkännande av webbplatsens ägare." + +msgid "You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'." +msgstr "Om du vill kan du fylla i detta formulär via OpenID genom att ange ditt OpenID och klicka på Registrera." + +msgid "If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items." +msgstr "Om du inte vet vad OpenID är, eller inte vill använda det, kan du lämna det fältet tomt och fylla i resten." + +msgid "Your OpenID (optional): " +msgstr "OpenID (om du vill): " + +msgid "Members of this network prefer to communicate with real people who use their real names." +msgstr "Medlemmarna i det här nätverket föredrar att kommunicera med riktiga människor som använder sina riktiga namn." + +msgid "Include your profile in member directory?" +msgstr "Ta med profilen i medlemskatalogen?" + +msgid "Registration" +msgstr "Registrering" + +msgid "Your Full Name (e.g. Joe Smith): " +msgstr "Fullständigt namn (t. ex. Karl Karlsson): " + +msgid "Your Email Address: " +msgstr "E-postadress: " + +msgid "Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be 'nickname@$sitename'." +msgstr "Välj ett användarnamn. Det måste inledas med en bokstav. Din profiladress på den här webbplatsen blir 'användarnamn@$sitename'." + +msgid "Choose a nickname: " +msgstr "Välj ett användarnamn: " + +msgid "Please login." +msgstr "Logga in." + +msgid "Account approved." +msgstr "Kontot har godkänts." + +msgid "Remove My Account" +msgstr "Ta bort mitt konto" + +msgid "This will completely remove your account. Once this has been done it is not recoverable." +msgstr "Detta kommer att ta bort kontot helt och hållet. Efter att det är gjort går det inte att återställa." + +msgid "Please enter your password for verification:" +msgstr "Ange lösenordet igen för säkerhets skull:" + +msgid "No results." +msgstr "Inga resultat." + +msgid "Passwords do not match. Password unchanged." +msgstr "Lösenorden skiljer sig åt. Lösenordet ändras inte." + +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "Lösenordet får inte vara blankt. Lösenordet ändras inte." + +msgid "Password changed." +msgstr "Lösenordet har ändrats." + +msgid "Password update failed. Please try again." +msgstr "Det blev fel när lösenordet skulle ändras. Försök igen." + +msgid " Please use a shorter name." +msgstr " Använd ett kortare namn." + +msgid " Name too short." +msgstr " Namnet är för kort." + +msgid " Not valid email." +msgstr " Ogiltig e-postadress." + +msgid " Cannot change to that email." +msgstr " Ändring till den e-postadressen görs inte." + +msgid "Settings updated." +msgstr "Inställningarna har uppdaterats." + +msgid "Plugin Settings" +msgstr "Inställningar för insticksprogram" + +msgid "Account Settings" +msgstr "Kontoinställningar" + +msgid "No Plugin settings configured" +msgstr "Det finns inga inställningar för insticksprogram" + +msgid "Normal Account" +msgstr "Vanligt konto" + +msgid "This account is a normal personal profile" +msgstr "Kontot är ett vanligt personligt konto" + +msgid "Soapbox Account" +msgstr "Konto med envägskommunikation" + +msgid "Automatically approve all connection/friend requests as read-only fans" +msgstr "Kontaktförfrågningar godkänns automatiskt som fans. De kan se vad du skriver men har inte samma rättigheter som vänner." + +msgid "Community/Celebrity Account" +msgstr "Gemenskap eller kändiskonto." + +msgid "Automatically approve all connection/friend requests as read-write fans" +msgstr "Kontaktförfrågningar godkänns automatiskt som fans med fullständig tvåvägskommunikation." + +msgid "Automatic Friend Account" +msgstr "Konto med automatiskt godkännande av vänner." + +msgid "Automatically approve all connection/friend requests as friends" +msgstr "Kontaktförfrågningar godkänns automatiskt som vänner." + +msgid "OpenID: " +msgstr "OpenID: " + +msgid " (Optional) Allow this OpenID to login to this account." +msgstr " (Valfritt) Tillåt inloggning med detta OpenID på det här kontot." + +msgid "Publish your default profile in site directory?" +msgstr "Vill du att din standardprofil ska synas i den här sajtens medlemskatalog?" + +msgid "Publish your default profile in global social directory?" +msgstr "Vill du att din standardprofil ska synas i den globala medlemskatalogen?" + +msgid "Profile is not published." +msgstr "Profilen är inte publicerad." + +msgid "Your Identity Address is" +msgstr "Din adress, ditt ID, är" + +msgid "Export Personal Data" +msgstr "Exportera personlig information" + +msgid "Basic Settings" +msgstr "Grundläggande inställningar" + +msgid "Full Name:" +msgstr "Fullständigt namn:" + +msgid "Email Address:" +msgstr "E-postadress:" + +msgid "Your Timezone:" +msgstr "Tidszon:" + +msgid "Default Post Location:" +msgstr "Default Post Location:" + +msgid "Use Browser Location:" +msgstr "Använd webbläsarens positionering:" + +msgid "Display Theme:" +msgstr "Tema/utseende:" + +msgid "Security and Privacy Settings" +msgstr "Inställningar för säkerhet och sekretess" + +msgid "Maximum Friend Requests/Day:" +msgstr "Maximalt antal kontaktförfrågningar per dygn:" + +msgid "(to prevent spam abuse)" +msgstr "(för att motverka spam)" + +msgid "Allow friends to post to your profile page:" +msgstr "Låt kontakter göra inlägg på din profilsida:" + +msgid "Automatically expire (delete) posts older than" +msgstr "Ta automatiskt bort inlägg som är äldre än" + +msgid "days" +msgstr "dagar" + +msgid "Notification Settings" +msgstr "Aviseringsinställningar" + +msgid "Send a notification email when:" +msgstr "Skicka ett aviseringsmail när:" + +msgid "You receive an introduction" +msgstr "En kontaktförfrågan anländer" + +msgid "Your introductions are confirmed" +msgstr "Dina förfrågningar godkänns" + +msgid "Someone writes on your profile wall" +msgstr "Någon gör inlägg på din profilsida" + +msgid "Someone writes a followup comment" +msgstr "Någon gör ett inlägg i samma tråd som du" + +msgid "You receive a private message" +msgstr "Du får personliga meddelanden" + +msgid "Password Settings" +msgstr "Lösenordsinställningar" + +msgid "Leave password fields blank unless changing" +msgstr "Lämna fältet tomt om du inte vill byta lösenord" + +msgid "New Password:" +msgstr "Nytt lösenord" + +msgid "Confirm:" +msgstr "Bekräfta (repetera):" + +msgid "Advanced Page Settings" +msgstr "Avancerat" + +msgid "Default Post Permissions" +msgstr "Standardåtkomst för inlägg" + +msgid "(click to open/close)" +msgstr "(klicka för att öppna/stänga)" + +msgid "Tag removed" +msgstr "Taggen har tagits bort" + +msgid "Remove Item Tag" +msgstr "Ta bort tagg" + +msgid "Select a tag to remove: " +msgstr "Välj vilken tagg som ska tas bort: " + +msgid "Remove" +msgstr "Ta bort" + +msgid "No contacts." +msgstr "Inga kontakter." + +msgid "Visible To:" +msgstr "Synlig för:" + +msgid "Groups" +msgstr "Grupper" + +msgid "Except For:" +msgstr "Utom för:" + +msgid "Logged out." +msgstr "Utloggad." + +msgid "Unknown | Not categorised" +msgstr "Okänd | Inte kategoriserad" + +msgid "Block immediately" +msgstr "Spärra omedelbart" + +msgid "Shady, spammer, self-marketer" +msgstr "Skum, spammare, reklamspridare" + +msgid "Known to me, but no opinion" +msgstr "Jag vet vem det är, men har ingen åsikt" + +msgid "OK, probably harmless" +msgstr "OK, antagligen harmlös" + +msgid "Reputable, has my trust" +msgstr "Pålitlig, jag litar på personen" + +msgid "Frequently" +msgstr "Ofta" + +msgid "Hourly" +msgstr "En gång i timmen" + +msgid "Twice daily" +msgstr "Två gånger om dagen" + +msgid "Daily" +msgstr "Dagligen" + +msgid "Weekly" +msgstr "Veckovis" + +msgid "Monthly" +msgstr "Månadsvis" + +#, php-format +msgid "View %s's profile" +msgstr "Gå till profilen som tillhör %s " + +msgid "View in context" +msgstr "Visa i sitt sammanhang" + +msgid "See more posts like this" +msgstr "Leta inlägg som liknar det här" + +#, php-format +msgid "See all %d comments" +msgstr "Visa alla %d kommentarer" + +msgid "to" +msgstr "till" + +msgid "Wall-to-Wall" +msgstr "Profil-till-profil" + +msgid "via Wall-To-Wall:" +msgstr "via profil-till-profil:" + +#, php-format +msgid "%s likes this." +msgstr "%s gillar det här." + +#, php-format +msgid "%s doesn't like this." +msgstr "%s ogillar det här." + +#, php-format +msgid "%2$d people like this." +msgstr "%2$d personer gillar det här." + +#, php-format +msgid "%2$d people don't like this." +msgstr "%2$d personer ogillar det här." + +msgid "and" +msgstr "och" + +#, php-format +msgid ", and %d other people" +msgstr ", och ytterligare %d personer" + +#, php-format +msgid "%s like this." +msgstr "%s gillar det här." + +#, php-format +msgid "%s don't like this." +msgstr "%s ogillar det här." + +msgid "Miscellaneous" +msgstr "Blandat" + +msgid "less than a second ago" +msgstr "för mindre än en sekund sedan" + +msgid "year" +msgstr "år" + +msgid "years" +msgstr "år" + +msgid "month" +msgstr "månad" + +msgid "months" +msgstr "månader" + +msgid "week" +msgstr "vecka" + +msgid "weeks" +msgstr "veckor" + +msgid "day" +msgstr "dag" + +msgid "hour" +msgstr "timme" + +msgid "hours" +msgstr "timmar" + +msgid "minute" +msgstr "minut" + +msgid "minutes" +msgstr "minuter" + +msgid "second" +msgstr "sekund" + +msgid "seconds" +msgstr "sekunder" + +msgid " ago" +msgstr " sedan" + +#, php-format +msgid "Cannot locate DNS info for database server '%s'" +msgstr "Cannot locate DNS info for database server '%s'" + +msgid "Create a new group" +msgstr "Skapa ny grupp" + +msgid "Everybody" +msgstr "Alla" + +msgid "Birthday:" +msgstr "Födelsedatum:" + +msgid "Home" +msgstr "Hem" + +msgid "Apps" +msgstr "Apps" + +msgid "Directory" +msgstr "Medlemskatalog" + +msgid "Network" +msgstr "Nätverk" + +msgid "Manage" +msgstr "Hantera" + +msgid "Settings" +msgstr "Inställningar" + +msgid "Embedding disabled" +msgstr "Funktionen bädda in är avstängd" + +msgid "j F, Y" +msgstr "j F, Y" + +msgid "j F" +msgstr "j F" + +msgid "Age:" +msgstr "Ålder:" + +msgid "♥ Status:" +msgstr "♥ Civilstånd:" + +msgid "Religion:" +msgstr "Religion:" + +msgid "About:" +msgstr "Om:" + +msgid "Hobbies/Interests:" +msgstr "Hobbys/Intressen:" + +msgid "Contact information and Social Networks:" +msgstr "Kontaktuppgifter och sociala nätverk:" + +msgid "Musical interests:" +msgstr "Musik:" + +msgid "Books, literature:" +msgstr "Böcker/Litteratur:" + +msgid "Television:" +msgstr "TV:" + +msgid "Film/dance/culture/entertainment:" +msgstr "Film/Dans/Kultur/Underhållning:" + +msgid "Love/Romance:" +msgstr "Kärlek/Romantik:" + +msgid "Work/employment:" +msgstr "Arbete:" + +msgid "School/education:" +msgstr "Skola/Utbildning:" + +msgid "Male" +msgstr "Man" + +msgid "Female" +msgstr "Kvinna" + +msgid "Currently Male" +msgstr "För närvarande man" + +msgid "Currently Female" +msgstr "För närvarande kvinna" + +msgid "Mostly Male" +msgstr "Mestadels man" + +msgid "Mostly Female" +msgstr "Mestadels kvinna" + +msgid "Transgender" +msgstr "Transgender" + +msgid "Intersex" +msgstr "Intersex" + +msgid "Transsexual" +msgstr "Transsexuell" + +msgid "Hermaphrodite" +msgstr "Hermafrodit" + +msgid "Neuter" +msgstr "Könslös" + +msgid "Non-specific" +msgstr "Oklart" + +msgid "Other" +msgstr "Annat" + +msgid "Undecided" +msgstr "Obestämt" + +msgid "Males" +msgstr "Män" + +msgid "Females" +msgstr "Kvinnor" + +msgid "Gay" +msgstr "Bög" + +msgid "Lesbian" +msgstr "Lesbisk" + +msgid "No Preference" +msgstr "No Preference" + +msgid "Bisexual" +msgstr "Bisexuell" + +msgid "Autosexual" +msgstr "Autosexual" + +msgid "Abstinent" +msgstr "Abstinent" + +msgid "Virgin" +msgstr "Oskuld" + +msgid "Deviant" +msgstr "Avvikande" + +msgid "Fetish" +msgstr "Fetisch" + +msgid "Oodles" +msgstr "Massor" + +msgid "Nonsexual" +msgstr "Asexuell" + +msgid "Single" +msgstr "Singel" + +msgid "Lonely" +msgstr "Ensam" + +msgid "Available" +msgstr "Tillgänglig" + +msgid "Unavailable" +msgstr "Upptagen" + +msgid "Dating" +msgstr "Dejtar" + +msgid "Unfaithful" +msgstr "Otrogen" + +msgid "Sex Addict" +msgstr "Sexmissbrukare" + +msgid "Friends" +msgstr "Vänner" + +msgid "Friends/Benefits" +msgstr "Friends/Benefits" + +msgid "Casual" +msgstr "Casual" + +msgid "Engaged" +msgstr "Förlovad" + +msgid "Married" +msgstr "Gift" + +msgid "Partners" +msgstr "I partnerskap" + +msgid "Cohabiting" +msgstr "Cohabiting" + +msgid "Happy" +msgstr "Nöjd" + +msgid "Not Looking" +msgstr "Letar inte" + +msgid "Swinger" +msgstr "Swinger" + +msgid "Betrayed" +msgstr "Bedragen" + +msgid "Separated" +msgstr "Separerat" + +msgid "Unstable" +msgstr "Instabilt" + +msgid "Divorced" +msgstr "Skiljd" + +msgid "Widowed" +msgstr "Änka/änkling" + +msgid "Uncertain" +msgstr "Oklart" + +msgid "Complicated" +msgstr "Komplicerat" + +msgid "Don't care" +msgstr "Bryr mig inte" + +msgid "Ask me" +msgstr "Fråga mig" + +msgid "Facebook disabled" +msgstr "Facebook inaktiverat" + +msgid "Facebook API key is missing." +msgstr "Facebook API key is missing." + +msgid "Facebook Connect" +msgstr "Facebook Connect" + +msgid "Install Facebook post connector" +msgstr "Install Facebook post connector" + +msgid "Remove Facebook post connector" +msgstr "Remove Facebook post connector" + +msgid "Post to Facebook by default" +msgstr "Lägg alltid in inläggen på Facebook" + +msgid "Facebook" +msgstr "Facebook" + +msgid "Facebook Connector Settings" +msgstr "Facebook Connector Settings" + +msgid "Post to Facebook" +msgstr "Lägg in på Facebook" + +msgid "Image: " +msgstr "Bild: " + +msgid "Select files to upload: " +msgstr "Välj filer att ladda upp: " + +msgid "Use the following controls only if the Java uploader [above] fails to launch." +msgstr "Använd följande bara om javauppladdaren ovanför inte startar." + +msgid "Upload a file" +msgstr "Ladda upp en fil" + +msgid "Drop files here to upload" +msgstr "Dra filer som ska laddas upp hit" + +msgid "Failed" +msgstr "Misslyckades" + +msgid "No files were uploaded." +msgstr "Inga filer laddades upp." + +msgid "Uploaded file is empty" +msgstr "Den uppladdade filen är tom" + +msgid "Uploaded file is too large" +msgstr "Den uppladdade filen är för stor" + +msgid "File has an invalid extension, it should be one of " +msgstr "Otillåten filnamnsändelse, det ska vara " + +msgid "Upload was cancelled, or server error encountered" +msgstr "Serverfel eller avbruten uppladdning" + +msgid "Randplace Settings" +msgstr "Randplace Settings" + +msgid "Enable Randplace Plugin" +msgstr "Enable Randplace Plugin" + +msgid "Post to StatusNet" +msgstr "Lägg in på StatusNet" + +msgid "StatusNet Posting Settings" +msgstr "Inställningar för inlägg på StatusNet" + +msgid "No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
    Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation." +msgstr "No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.
    Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation." + +msgid "OAuth Consumer Key" +msgstr "OAuth Consumer Key" + +msgid "OAuth Consumer Secret" +msgstr "OAuth Consumer Secret" + +msgid "Base API Path (remember the trailing /)" +msgstr "Base API Path (remember the trailing /)" + +msgid "To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet." +msgstr "To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your public posts will be posted to StatusNet." + +msgid "Log in with StatusNet" +msgstr "Logga in med StatusNet" + +msgid "Copy the security code from StatusNet here" +msgstr "Ange säkerhetskoden från StatusNet här" + +msgid "Currently connected to: " +msgstr "Ansluten till: " + +msgid "If enabled all your public postings will be posted to the associated StatusNet account as well." +msgstr "If enabled all your public postings will be posted to the associated StatusNet account as well." + +msgid "Send public postings to StatusNet" +msgstr "Send public postings to StatusNet" + +msgid "Clear OAuth configuration" +msgstr "Clear OAuth configuration" + +msgid "Three Dimensional Tic-Tac-Toe" +msgstr "Tredimensionellt luffarschack" + +msgid "3D Tic-Tac-Toe" +msgstr "3D-luffarschack" + +msgid "New game" +msgstr "Ny spelomgång" + +msgid "New game with handicap" +msgstr "Ny spelomgång med handikapp" + +msgid "Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. " +msgstr "Det tredimensionella luffarschacket är precis som vanligt luffarschack förutom att det spelas i flera nivåer samtidigt. " + +msgid "In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels." +msgstr "Här är det tre nivåer. Man vinner om man får tre i rad på vilken nivå som helst, eller uppåt, nedåt eller diagonalt på flera nivåer." + +msgid "The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage." +msgstr "Om man spelar med handikapp så stängs mittenpositionen på mittennivån av eftersom spelare som väljer den positionen ofta får övertaget." + +msgid "You go first..." +msgstr "Du börjar..." + +msgid "I'm going first this time..." +msgstr "Jag börjar den här gången..." + +msgid "You won!" +msgstr "Du vann!" + +msgid "\"Cat\" game!" +msgstr "\"Cat\" game!" + +msgid "I won!" +msgstr "Jag vann!" + +msgid "Post to Twitter" +msgstr "Lägg in på Twitter" + +msgid "Twitter Posting Settings" +msgstr "Inställningar för inlägg på Twitter" + +msgid "No consumer key pair for Twitter found. Please contact your site administrator." +msgstr "No consumer key pair for Twitter found. Please contact your site administrator." + +msgid "At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter." +msgstr "At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter." + +msgid "Copy the PIN from Twitter here" +msgstr "Ange PIN-koden från Twitter här" + +msgid "If enabled all your public postings will be posted to the associated Twitter account as well." +msgstr "If enabled all your public postings will be posted to the associated Twitter account as well." + +msgid "Send public postings to Twitter" +msgstr "Send public postings to Twitter" + +msgid "Africa/Abidjan" +msgstr "Afrika/Abidjan" + +msgid "Africa/Accra" +msgstr "Afrika/Accra" + +msgid "Africa/Addis_Ababa" +msgstr "Afrika/Addis_Ababa" + +msgid "Africa/Algiers" +msgstr "Afrika/Algiers" + +msgid "Africa/Asmara" +msgstr "Afrika/Asmara" + +msgid "Africa/Asmera" +msgstr "Afrika/Asmera" + +msgid "Africa/Bamako" +msgstr "Afrika/Bamako" + +msgid "Africa/Bangui" +msgstr "Afrika/Bangui" + +msgid "Africa/Banjul" +msgstr "Afrika/Banjul" + +msgid "Africa/Bissau" +msgstr "Afrika/Bissau" + +msgid "Africa/Blantyre" +msgstr "Afrika/Blantyre" + +msgid "Africa/Brazzaville" +msgstr "Afrika/Brazzaville" + +msgid "Africa/Bujumbura" +msgstr "Afrika/Bujumbura" + +msgid "Africa/Cairo" +msgstr "Afrika/Cairo" + +msgid "Africa/Casablanca" +msgstr "Afrika/Casablanca" + +msgid "Africa/Ceuta" +msgstr "Afrika/Ceuta" + +msgid "Africa/Conakry" +msgstr "Afrika/Conakry" + +msgid "Africa/Dakar" +msgstr "Afrika/Dakar" + +msgid "Africa/Dar_es_Salaam" +msgstr "Afrika/Dar_es_Salaam" + +msgid "Africa/Djibouti" +msgstr "Afrika/Djibouti" + +msgid "Africa/Douala" +msgstr "Afrika/Douala" + +msgid "Africa/El_Aaiun" +msgstr "Afrika/El_Aaiun" + +msgid "Africa/Freetown" +msgstr "Afrika/Freetown" + +msgid "Africa/Gaborone" +msgstr "Afrika/Gaborone" + +msgid "Africa/Harare" +msgstr "Afrika/Harare" + +msgid "Africa/Johannesburg" +msgstr "Afrika/Johannesburg" + +msgid "Africa/Kampala" +msgstr "Afrika/Kampala" + +msgid "Africa/Khartoum" +msgstr "Afrika/Khartoum" + +msgid "Africa/Kigali" +msgstr "Afrika/Kigali" + +msgid "Africa/Kinshasa" +msgstr "Afrika/Kinshasa" + +msgid "Africa/Lagos" +msgstr "Afrika/Lagos" + +msgid "Africa/Libreville" +msgstr "Afrika/Libreville" + +msgid "Africa/Lome" +msgstr "Afrika/Lome" + +msgid "Africa/Luanda" +msgstr "Afrika/Luanda" + +msgid "Africa/Lubumbashi" +msgstr "Afrika/Lubumbashi" + +msgid "Africa/Lusaka" +msgstr "Afrika/Lusaka" + +msgid "Africa/Malabo" +msgstr "Afrika/Malabo" + +msgid "Africa/Maputo" +msgstr "Afrika/Maputo" + +msgid "Africa/Maseru" +msgstr "Afrika/Maseru" + +msgid "Africa/Mbabane" +msgstr "Afrika/Mbabane" + +msgid "Africa/Mogadishu" +msgstr "Afrika/Mogadishu" + +msgid "Africa/Monrovia" +msgstr "Afrika/Monrovia" + +msgid "Africa/Nairobi" +msgstr "Afrika/Nairobi" + +msgid "Africa/Ndjamena" +msgstr "Afrika/Ndjamena" + +msgid "Africa/Niamey" +msgstr "Afrika/Niamey" + +msgid "Africa/Nouakchott" +msgstr "Afrika/Nouakchott" + +msgid "Africa/Ouagadougou" +msgstr "Afrika/Ouagadougou" + +msgid "Africa/Porto-Novo" +msgstr "Afrika/Porto-Novo" + +msgid "Africa/Sao_Tome" +msgstr "Afrika/Sao_Tome" + +msgid "Africa/Timbuktu" +msgstr "Afrika/Timbuktu" + +msgid "Africa/Tripoli" +msgstr "Afrika/Tripoli" + +msgid "Africa/Tunis" +msgstr "Afrika/Tunis" + +msgid "Africa/Windhoek" +msgstr "Afrika/Windhoek" + +msgid "America/Adak" +msgstr "Amerika/Adak" + +msgid "America/Anchorage" +msgstr "Amerika/Anchorage" + +msgid "America/Anguilla" +msgstr "Amerika/Anguilla" + +msgid "America/Antigua" +msgstr "Amerika/Antigua" + +msgid "America/Araguaina" +msgstr "Amerika/Araguaina" + +msgid "America/Argentina/Buenos_Aires" +msgstr "Amerika/Argentina/Buenos_Aires" + +msgid "America/Argentina/Catamarca" +msgstr "Amerika/Argentina/Catamarca" + +msgid "America/Argentina/ComodRivadavia" +msgstr "Amerika/Argentina/ComodRivadavia" + +msgid "America/Argentina/Cordoba" +msgstr "Amerika/Argentina/Cordoba" + +msgid "America/Argentina/Jujuy" +msgstr "Amerika/Argentina/Jujuy" + +msgid "America/Argentina/La_Rioja" +msgstr "Amerika/Argentina/La_Rioja" + +msgid "America/Argentina/Mendoza" +msgstr "Amerika/Argentina/Mendoza" + +msgid "America/Argentina/Rio_Gallegos" +msgstr "Amerika/Argentina/Rio_Gallegos" + +msgid "America/Argentina/Salta" +msgstr "Amerika/Argentina/Salta" + +msgid "America/Argentina/San_Juan" +msgstr "Amerika/Argentina/San_Juan" + +msgid "America/Argentina/San_Luis" +msgstr "Amerika/Argentina/San_Luis" + +msgid "America/Argentina/Tucuman" +msgstr "Amerika/Argentina/Tucuman" + +msgid "America/Argentina/Ushuaia" +msgstr "Amerika/Argentina/Ushuaia" + +msgid "America/Aruba" +msgstr "Amerika/Aruba" + +msgid "America/Asuncion" +msgstr "Amerika/Asuncion" + +msgid "America/Atikokan" +msgstr "Amerika/Atikokan" + +msgid "America/Atka" +msgstr "Amerika/Atka" + +msgid "America/Bahia" +msgstr "Amerika/Bahia" + +msgid "America/Barbados" +msgstr "Amerika/Barbados" + +msgid "America/Belem" +msgstr "Amerika/Belem" + +msgid "America/Belize" +msgstr "Amerika/Belize" + +msgid "America/Blanc-Sablon" +msgstr "Amerika/Blanc-Sablon" + +msgid "America/Boa_Vista" +msgstr "Amerika/Boa_Vista" + +msgid "America/Bogota" +msgstr "Amerika/Bogota" + +msgid "America/Boise" +msgstr "Amerika/Boise" + +msgid "America/Buenos_Aires" +msgstr "Amerika/Buenos_Aires" + +msgid "America/Cambridge_Bay" +msgstr "Amerika/Cambridge_Bay" + +msgid "America/Campo_Grande" +msgstr "Amerika/Campo_Grande" + +msgid "America/Cancun" +msgstr "Amerika/Cancun" + +msgid "America/Caracas" +msgstr "Amerika/Caracas" + +msgid "America/Catamarca" +msgstr "Amerika/Catamarca" + +msgid "America/Cayenne" +msgstr "Amerika/Cayenne" + +msgid "America/Cayman" +msgstr "Amerika/Cayman" + +msgid "America/Chicago" +msgstr "Amerika/Chicago" + +msgid "America/Chihuahua" +msgstr "Amerika/Chihuahua" + +msgid "America/Coral_Harbour" +msgstr "Amerika/Coral_Harbour" + +msgid "America/Cordoba" +msgstr "Amerika/Cordoba" + +msgid "America/Costa_Rica" +msgstr "Amerika/Costa_Rica" + +msgid "America/Cuiaba" +msgstr "Amerika/Cuiaba" + +msgid "America/Curacao" +msgstr "Amerika/Curacao" + +msgid "America/Danmarkshavn" +msgstr "Amerika/Danmarkshavn" + +msgid "America/Dawson" +msgstr "Amerika/Dawson" + +msgid "America/Dawson_Creek" +msgstr "Amerika/Dawson_Creek" + +msgid "America/Denver" +msgstr "Amerika/Denver" + +msgid "America/Detroit" +msgstr "Amerika/Detroit" + +msgid "America/Dominica" +msgstr "Amerika/Dominica" + +msgid "America/Edmonton" +msgstr "Amerika/Edmonton" + +msgid "America/Eirunepe" +msgstr "Amerika/Eirunepe" + +msgid "America/El_Salvador" +msgstr "Amerika/El_Salvador" + +msgid "America/Ensenada" +msgstr "Amerika/Ensenada" + +msgid "America/Fort_Wayne" +msgstr "Amerika/Fort_Wayne" + +msgid "America/Fortaleza" +msgstr "Amerika/Fortaleza" + +msgid "America/Glace_Bay" +msgstr "Amerika/Glace_Bay" + +msgid "America/Godthab" +msgstr "Amerika/Godthab" + +msgid "America/Goose_Bay" +msgstr "Amerika/Goose_Bay" + +msgid "America/Grand_Turk" +msgstr "Amerika/Grand_Turk" + +msgid "America/Grenada" +msgstr "Amerika/Grenada" + +msgid "America/Guadeloupe" +msgstr "Amerika/Guadeloupe" + +msgid "America/Guatemala" +msgstr "Amerika/Guatemala" + +msgid "America/Guayaquil" +msgstr "Amerika/Guayaquil" + +msgid "America/Guyana" +msgstr "Amerika/Guyana" + +msgid "America/Halifax" +msgstr "Amerika/Halifax" + +msgid "America/Havana" +msgstr "Amerika/Havana" + +msgid "America/Hermosillo" +msgstr "Amerika/Hermosillo" + +msgid "America/Indiana/Indianapolis" +msgstr "Amerika/Indiana/Indianapolis" + +msgid "America/Indiana/Knox" +msgstr "Amerika/Indiana/Knox" + +msgid "America/Indiana/Marengo" +msgstr "Amerika/Indiana/Marengo" + +msgid "America/Indiana/Petersburg" +msgstr "Amerika/Indiana/Petersburg" + +msgid "America/Indiana/Tell_City" +msgstr "Amerika/Indiana/Tell_City" + +msgid "America/Indiana/Vevay" +msgstr "Amerika/Indiana/Vevay" + +msgid "America/Indiana/Vincennes" +msgstr "Amerika/Indiana/Vincennes" + +msgid "America/Indiana/Winamac" +msgstr "Amerika/Indiana/Winamac" + +msgid "America/Indianapolis" +msgstr "Amerika/Indianapolis" + +msgid "America/Inuvik" +msgstr "Amerika/Inuvik" + +msgid "America/Iqaluit" +msgstr "Amerika/Iqaluit" + +msgid "America/Jamaica" +msgstr "Amerika/Jamaica" + +msgid "America/Jujuy" +msgstr "Amerika/Jujuy" + +msgid "America/Juneau" +msgstr "Amerika/Juneau" + +msgid "America/Kentucky/Louisville" +msgstr "Amerika/Kentucky/Louisville" + +msgid "America/Kentucky/Monticello" +msgstr "Amerika/Kentucky/Monticello" + +msgid "America/Knox_IN" +msgstr "Amerika/Knox_IN" + +msgid "America/La_Paz" +msgstr "Amerika/La_Paz" + +msgid "America/Lima" +msgstr "Amerika/Lima" + +msgid "America/Los_Angeles" +msgstr "Amerika/Los_Angeles" + +msgid "America/Louisville" +msgstr "Amerika/Louisville" + +msgid "America/Maceio" +msgstr "Amerika/Maceio" + +msgid "America/Managua" +msgstr "Amerika/Managua" + +msgid "America/Manaus" +msgstr "Amerika/Manaus" + +msgid "America/Marigot" +msgstr "Amerika/Marigot" + +msgid "America/Martinique" +msgstr "Amerika/Martinique" + +msgid "America/Matamoros" +msgstr "Amerika/Matamoros" + +msgid "America/Mazatlan" +msgstr "Amerika/Mazatlan" + +msgid "America/Mendoza" +msgstr "Amerika/Mendoza" + +msgid "America/Menominee" +msgstr "Amerika/Menominee" + +msgid "America/Merida" +msgstr "Amerika/Merida" + +msgid "America/Mexico_City" +msgstr "Amerika/Mexico_City" + +msgid "America/Miquelon" +msgstr "Amerika/Miquelon" + +msgid "America/Moncton" +msgstr "Amerika/Moncton" + +msgid "America/Monterrey" +msgstr "Amerika/Monterrey" + +msgid "America/Montevideo" +msgstr "Amerika/Montevideo" + +msgid "America/Montreal" +msgstr "Amerika/Montreal" + +msgid "America/Montserrat" +msgstr "Amerika/Montserrat" + +msgid "America/Nassau" +msgstr "Amerika/Nassau" + +msgid "America/New_York" +msgstr "Amerika/New_York" + +msgid "America/Nipigon" +msgstr "Amerika/Nipigon" + +msgid "America/Nome" +msgstr "Amerika/Nome" + +msgid "America/Noronha" +msgstr "Amerika/Noronha" + +msgid "America/North_Dakota/Center" +msgstr "Amerika/North_Dakota/Center" + +msgid "America/North_Dakota/New_Salem" +msgstr "Amerika/North_Dakota/New_Salem" + +msgid "America/Ojinaga" +msgstr "Amerika/Ojinaga" + +msgid "America/Panama" +msgstr "Amerika/Panama" + +msgid "America/Pangnirtung" +msgstr "Amerika/Pangnirtung" + +msgid "America/Paramaribo" +msgstr "Amerika/Paramaribo" + +msgid "America/Phoenix" +msgstr "Amerika/Phoenix" + +msgid "America/Port-au-Prince" +msgstr "Amerika/Port-au-Prince" + +msgid "America/Port_of_Spain" +msgstr "Amerika/Port_of_Spain" + +msgid "America/Porto_Acre" +msgstr "Amerika/Porto_Acre" + +msgid "America/Porto_Velho" +msgstr "Amerika/Porto_Velho" + +msgid "America/Puerto_Rico" +msgstr "Amerika/Puerto_Rico" + +msgid "America/Rainy_River" +msgstr "Amerika/Rainy_River" + +msgid "America/Rankin_Inlet" +msgstr "Amerika/Rankin_Inlet" + +msgid "America/Recife" +msgstr "Amerika/Recife" + +msgid "America/Regina" +msgstr "Amerika/Regina" + +msgid "America/Resolute" +msgstr "Amerika/Resolute" + +msgid "America/Rio_Branco" +msgstr "Amerika/Rio_Branco" + +msgid "America/Rosario" +msgstr "Amerika/Rosario" + +msgid "America/Santa_Isabel" +msgstr "Amerika/Santa_Isabel" + +msgid "America/Santarem" +msgstr "Amerika/Santarem" + +msgid "America/Santiago" +msgstr "Amerika/Santiago" + +msgid "America/Santo_Domingo" +msgstr "Amerika/Santo_Domingo" + +msgid "America/Sao_Paulo" +msgstr "Amerika/Sao_Paulo" + +msgid "America/Scoresbysund" +msgstr "Amerika/Scoresbysund" + +msgid "America/Shiprock" +msgstr "Amerika/Shiprock" + +msgid "America/St_Barthelemy" +msgstr "Amerika/St_Barthelemy" + +msgid "America/St_Johns" +msgstr "Amerika/St_Johns" + +msgid "America/St_Kitts" +msgstr "Amerika/St_Kitts" + +msgid "America/St_Lucia" +msgstr "Amerika/St_Lucia" + +msgid "America/St_Thomas" +msgstr "Amerika/St_Thomas" + +msgid "America/St_Vincent" +msgstr "Amerika/St_Vincent" + +msgid "America/Swift_Current" +msgstr "Amerika/Swift_Current" + +msgid "America/Tegucigalpa" +msgstr "Amerika/Tegucigalpa" + +msgid "America/Thule" +msgstr "Amerika/Thule" + +msgid "America/Thunder_Bay" +msgstr "Amerika/Thunder_Bay" + +msgid "America/Tijuana" +msgstr "Amerika/Tijuana" + +msgid "America/Toronto" +msgstr "Amerika/Toronto" + +msgid "America/Tortola" +msgstr "Amerika/Tortola" + +msgid "America/Vancouver" +msgstr "Amerika/Vancouver" + +msgid "America/Virgin" +msgstr "Amerika/Virgin" + +msgid "America/Whitehorse" +msgstr "Amerika/Whitehorse" + +msgid "America/Winnipeg" +msgstr "Amerika/Winnipeg" + +msgid "America/Yakutat" +msgstr "Amerika/Yakutat" + +msgid "America/Yellowknife" +msgstr "Amerika/Yellowknife" + +msgid "Antarctica/Casey" +msgstr "Antarctica/Casey" + +msgid "Antarctica/Davis" +msgstr "Antarctica/Davis" + +msgid "Antarctica/DumontDUrville" +msgstr "Antarctica/DumontDUrville" + +msgid "Antarctica/Macquarie" +msgstr "Antarctica/Macquarie" + +msgid "Antarctica/Mawson" +msgstr "Antarctica/Mawson" + +msgid "Antarctica/McMurdo" +msgstr "Antarctica/McMurdo" + +msgid "Antarctica/Palmer" +msgstr "Antarctica/Palmer" + +msgid "Antarctica/Rothera" +msgstr "Antarctica/Rothera" + +msgid "Antarctica/South_Pole" +msgstr "Antarctica/South_Pole" + +msgid "Antarctica/Syowa" +msgstr "Antarctica/Syowa" + +msgid "Antarctica/Vostok" +msgstr "Antarctica/Vostok" + +msgid "Arctic/Longyearbyen" +msgstr "Arctic/Longyearbyen" + +msgid "Asia/Aden" +msgstr "Asien/Aden" + +msgid "Asia/Almaty" +msgstr "Asien/Almaty" + +msgid "Asia/Amman" +msgstr "Asien/Amman" + +msgid "Asia/Anadyr" +msgstr "Asien/Anadyr" + +msgid "Asia/Aqtau" +msgstr "Asien/Aqtau" + +msgid "Asia/Aqtobe" +msgstr "Asien/Aqtobe" + +msgid "Asia/Ashgabat" +msgstr "Asien/Ashgabat" + +msgid "Asia/Ashkhabad" +msgstr "Asien/Ashkhabad" + +msgid "Asia/Baghdad" +msgstr "Asien/Baghdad" + +msgid "Asia/Bahrain" +msgstr "Asien/Bahrain" + +msgid "Asia/Baku" +msgstr "Asien/Baku" + +msgid "Asia/Bangkok" +msgstr "Asien/Bangkok" + +msgid "Asia/Beirut" +msgstr "Asien/Beirut" + +msgid "Asia/Bishkek" +msgstr "Asien/Bishkek" + +msgid "Asia/Brunei" +msgstr "Asien/Brunei" + +msgid "Asia/Calcutta" +msgstr "Asien/Calcutta" + +msgid "Asia/Choibalsan" +msgstr "Asien/Choibalsan" + +msgid "Asia/Chongqing" +msgstr "Asien/Chongqing" + +msgid "Asia/Chungking" +msgstr "Asien/Chungking" + +msgid "Asia/Colombo" +msgstr "Asien/Colombo" + +msgid "Asia/Dacca" +msgstr "Asien/Dacca" + +msgid "Asia/Damascus" +msgstr "Asien/Damascus" + +msgid "Asia/Dhaka" +msgstr "Asien/Dhaka" + +msgid "Asia/Dili" +msgstr "Asien/Dili" + +msgid "Asia/Dubai" +msgstr "Asien/Dubai" + +msgid "Asia/Dushanbe" +msgstr "Asien/Dushanbe" + +msgid "Asia/Gaza" +msgstr "Asien/Gaza" + +msgid "Asia/Harbin" +msgstr "Asien/Harbin" + +msgid "Asia/Ho_Chi_Minh" +msgstr "Asien/Ho_Chi_Minh" + +msgid "Asia/Hong_Kong" +msgstr "Asien/Hong_Kong" + +msgid "Asia/Hovd" +msgstr "Asien/Hovd" + +msgid "Asia/Irkutsk" +msgstr "Asien/Irkutsk" + +msgid "Asia/Istanbul" +msgstr "Asien/Istanbul" + +msgid "Asia/Jakarta" +msgstr "Asien/Jakarta" + +msgid "Asia/Jayapura" +msgstr "Asien/Jayapura" + +msgid "Asia/Jerusalem" +msgstr "Asien/Jerusalem" + +msgid "Asia/Kabul" +msgstr "Asien/Kabul" + +msgid "Asia/Kamchatka" +msgstr "Asien/Kamchatka" + +msgid "Asia/Karachi" +msgstr "Asien/Karachi" + +msgid "Asia/Kashgar" +msgstr "Asien/Kashgar" + +msgid "Asia/Kathmandu" +msgstr "Asien/Kathmandu" + +msgid "Asia/Katmandu" +msgstr "Asien/Katmandu" + +msgid "Asia/Kolkata" +msgstr "Asien/Kolkata" + +msgid "Asia/Krasnoyarsk" +msgstr "Asien/Krasnoyarsk" + +msgid "Asia/Kuala_Lumpur" +msgstr "Asien/Kuala_Lumpur" + +msgid "Asia/Kuching" +msgstr "Asien/Kuching" + +msgid "Asia/Kuwait" +msgstr "Asien/Kuwait" + +msgid "Asia/Macao" +msgstr "Asien/Macao" + +msgid "Asia/Macau" +msgstr "Asien/Macau" + +msgid "Asia/Magadan" +msgstr "Asien/Magadan" + +msgid "Asia/Makassar" +msgstr "Asien/Makassar" + +msgid "Asia/Manila" +msgstr "Asien/Manila" + +msgid "Asia/Muscat" +msgstr "Asien/Muscat" + +msgid "Asia/Nicosia" +msgstr "Asien/Nicosia" + +msgid "Asia/Novokuznetsk" +msgstr "Asien/Novokuznetsk" + +msgid "Asia/Novosibirsk" +msgstr "Asien/Novosibirsk" + +msgid "Asia/Omsk" +msgstr "Asien/Omsk" + +msgid "Asia/Oral" +msgstr "Asien/Oral" + +msgid "Asia/Phnom_Penh" +msgstr "Asien/Phnom_Penh" + +msgid "Asia/Pontianak" +msgstr "Asien/Pontianak" + +msgid "Asia/Pyongyang" +msgstr "Asien/Pyongyang" + +msgid "Asia/Qatar" +msgstr "Asien/Qatar" + +msgid "Asia/Qyzylorda" +msgstr "Asien/Qyzylorda" + +msgid "Asia/Rangoon" +msgstr "Asien/Rangoon" + +msgid "Asia/Riyadh" +msgstr "Asien/Riyadh" + +msgid "Asia/Saigon" +msgstr "Asien/Saigon" + +msgid "Asia/Sakhalin" +msgstr "Asien/Sakhalin" + +msgid "Asia/Samarkand" +msgstr "Asien/Samarkand" + +msgid "Asia/Seoul" +msgstr "Asien/Seoul" + +msgid "Asia/Shanghai" +msgstr "Asien/Shanghai" + +msgid "Asia/Singapore" +msgstr "Asien/Singapore" + +msgid "Asia/Taipei" +msgstr "Asien/Taipei" + +msgid "Asia/Tashkent" +msgstr "Asien/Tashkent" + +msgid "Asia/Tbilisi" +msgstr "Asien/Tbilisi" + +msgid "Asia/Tehran" +msgstr "Asien/Tehran" + +msgid "Asia/Tel_Aviv" +msgstr "Asien/Tel_Aviv" + +msgid "Asia/Thimbu" +msgstr "Asien/Thimbu" + +msgid "Asia/Thimphu" +msgstr "Asien/Thimphu" + +msgid "Asia/Tokyo" +msgstr "Asien/Tokyo" + +msgid "Asia/Ujung_Pandang" +msgstr "Asien/Ujung_Pandang" + +msgid "Asia/Ulaanbaatar" +msgstr "Asien/Ulaanbaatar" + +msgid "Asia/Ulan_Bator" +msgstr "Asien/Ulan_Bator" + +msgid "Asia/Urumqi" +msgstr "Asien/Urumqi" + +msgid "Asia/Vientiane" +msgstr "Asien/Vientiane" + +msgid "Asia/Vladivostok" +msgstr "Asien/Vladivostok" + +msgid "Asia/Yakutsk" +msgstr "Asien/Yakutsk" + +msgid "Asia/Yekaterinburg" +msgstr "Asien/Yekaterinburg" + +msgid "Asia/Yerevan" +msgstr "Asien/Yerevan" + +msgid "Atlantic/Azores" +msgstr "Atlantic/Azores" + +msgid "Atlantic/Bermuda" +msgstr "Atlantic/Bermuda" + +msgid "Atlantic/Canary" +msgstr "Atlantic/Canary" + +msgid "Atlantic/Cape_Verde" +msgstr "Atlantic/Cape_Verde" + +msgid "Atlantic/Faeroe" +msgstr "Atlantic/Faeroe" + +msgid "Atlantic/Faroe" +msgstr "Atlantic/Faroe" + +msgid "Atlantic/Jan_Mayen" +msgstr "Atlantic/Jan_Mayen" + +msgid "Atlantic/Madeira" +msgstr "Atlantic/Madeira" + +msgid "Atlantic/Reykjavik" +msgstr "Atlantic/Reykjavik" + +msgid "Atlantic/South_Georgia" +msgstr "Atlantic/South_Georgia" + +msgid "Atlantic/St_Helena" +msgstr "Atlantic/St_Helena" + +msgid "Atlantic/Stanley" +msgstr "Atlantic/Stanley" + +msgid "Australia/ACT" +msgstr "Australien/ACT" + +msgid "Australia/Adelaide" +msgstr "Australien/Adelaide" + +msgid "Australia/Brisbane" +msgstr "Australien/Brisbane" + +msgid "Australia/Broken_Hill" +msgstr "Australien/Broken_Hill" + +msgid "Australia/Canberra" +msgstr "Australien/Canberra" + +msgid "Australia/Currie" +msgstr "Australien/Currie" + +msgid "Australia/Darwin" +msgstr "Australien/Darwin" + +msgid "Australia/Eucla" +msgstr "Australien/Eucla" + +msgid "Australia/Hobart" +msgstr "Australien/Hobart" + +msgid "Australia/LHI" +msgstr "Australien/LHI" + +msgid "Australia/Lindeman" +msgstr "Australien/Lindeman" + +msgid "Australia/Lord_Howe" +msgstr "Australien/Lord_Howe" + +msgid "Australia/Melbourne" +msgstr "Australien/Melbourne" + +msgid "Australia/North" +msgstr "Australien/North" + +msgid "Australia/NSW" +msgstr "Australien/NSW" + +msgid "Australia/Perth" +msgstr "Australien/Perth" + +msgid "Australia/Queensland" +msgstr "Australien/Queensland" + +msgid "Australia/South" +msgstr "Australien/South" + +msgid "Australia/Sydney" +msgstr "Australien/Sydney" + +msgid "Australia/Tasmania" +msgstr "Australien/Tasmania" + +msgid "Australia/Victoria" +msgstr "Australien/Victoria" + +msgid "Australia/West" +msgstr "Australien/West" + +msgid "Australia/Yancowinna" +msgstr "Australien/Yancowinna" + +msgid "Brazil/Acre" +msgstr "Brasilien/Acre" + +msgid "Brazil/DeNoronha" +msgstr "Brasilien/DeNoronha" + +msgid "Brazil/East" +msgstr "Brasilien/East" + +msgid "Brazil/West" +msgstr "Brasilien/West" + +msgid "Canada/Atlantic" +msgstr "Kanada/Atlantic" + +msgid "Canada/Central" +msgstr "Kanada/Central" + +msgid "Canada/East-Saskatchewan" +msgstr "Kanada/East-Saskatchewan" + +msgid "Canada/Eastern" +msgstr "Kanada/Eastern" + +msgid "Canada/Mountain" +msgstr "Kanada/Mountain" + +msgid "Canada/Newfoundland" +msgstr "Kanada/Newfoundland" + +msgid "Canada/Pacific" +msgstr "Kanada/Pacific" + +msgid "Canada/Saskatchewan" +msgstr "Kanada/Saskatchewan" + +msgid "Canada/Yukon" +msgstr "Kanada/Yukon" + +msgid "CET" +msgstr "CET" + +msgid "Chile/Continental" +msgstr "Chile/Continental" + +msgid "Chile/EasterIsland" +msgstr "Chile/EasterIsland" + +msgid "CST6CDT" +msgstr "CST6CDT" + +msgid "Cuba" +msgstr "Cuba" + +msgid "EET" +msgstr "EET" + +msgid "Egypt" +msgstr "Egypten" + +msgid "Eire" +msgstr "Eire" + +msgid "EST" +msgstr "EST" + +msgid "EST5EDT" +msgstr "EST5EDT" + +msgid "Etc/GMT" +msgstr "Etc/GMT" + +msgid "Etc/GMT+0" +msgstr "Etc/GMT+0" + +msgid "Etc/GMT+1" +msgstr "Etc/GMT+1" + +msgid "Etc/GMT+10" +msgstr "Etc/GMT+10" + +msgid "Etc/GMT+11" +msgstr "Etc/GMT+11" + +msgid "Etc/GMT+12" +msgstr "Etc/GMT+12" + +msgid "Etc/GMT+2" +msgstr "Etc/GMT+2" + +msgid "Etc/GMT+3" +msgstr "Etc/GMT+3" + +msgid "Etc/GMT+4" +msgstr "Etc/GMT+4" + +msgid "Etc/GMT+5" +msgstr "Etc/GMT+5" + +msgid "Etc/GMT+6" +msgstr "Etc/GMT+6" + +msgid "Etc/GMT+7" +msgstr "Etc/GMT+7" + +msgid "Etc/GMT+8" +msgstr "Etc/GMT+8" + +msgid "Etc/GMT+9" +msgstr "Etc/GMT+9" + +msgid "Etc/GMT-0" +msgstr "Etc/GMT-0" + +msgid "Etc/GMT-1" +msgstr "Etc/GMT-1" + +msgid "Etc/GMT-10" +msgstr "Etc/GMT-10" + +msgid "Etc/GMT-11" +msgstr "Etc/GMT-11" + +msgid "Etc/GMT-12" +msgstr "Etc/GMT-12" + +msgid "Etc/GMT-13" +msgstr "Etc/GMT-13" + +msgid "Etc/GMT-14" +msgstr "Etc/GMT-14" + +msgid "Etc/GMT-2" +msgstr "Etc/GMT-2" + +msgid "Etc/GMT-3" +msgstr "Etc/GMT-3" + +msgid "Etc/GMT-4" +msgstr "Etc/GMT-4" + +msgid "Etc/GMT-5" +msgstr "Etc/GMT-5" + +msgid "Etc/GMT-6" +msgstr "Etc/GMT-6" + +msgid "Etc/GMT-7" +msgstr "Etc/GMT-7" + +msgid "Etc/GMT-8" +msgstr "Etc/GMT-8" + +msgid "Etc/GMT-9" +msgstr "Etc/GMT-9" + +msgid "Etc/GMT0" +msgstr "Etc/GMT0" + +msgid "Etc/Greenwich" +msgstr "Etc/Greenwich" + +msgid "Etc/UCT" +msgstr "Etc/UCT" + +msgid "Etc/Universal" +msgstr "Etc/Universal" + +msgid "Etc/UTC" +msgstr "Etc/UTC" + +msgid "Etc/Zulu" +msgstr "Etc/Zulu" + +msgid "Europe/Amsterdam" +msgstr "Europa/Amsterdam" + +msgid "Europe/Andorra" +msgstr "Europa/Andorra" + +msgid "Europe/Athens" +msgstr "Europa/Aten" + +msgid "Europe/Belfast" +msgstr "Europa/Belfast" + +msgid "Europe/Belgrade" +msgstr "Europa/Belgrad" + +msgid "Europe/Berlin" +msgstr "Europa/Berlin" + +msgid "Europe/Bratislava" +msgstr "Europa/Bratislava" + +msgid "Europe/Brussels" +msgstr "Europa/Bryssel" + +msgid "Europe/Bucharest" +msgstr "Europa/Bucharest" + +msgid "Europe/Budapest" +msgstr "Europa/Budapest" + +msgid "Europe/Chisinau" +msgstr "Europa/Chisinau" + +msgid "Europe/Copenhagen" +msgstr "Europa/Köpenhamn" + +msgid "Europe/Dublin" +msgstr "Europa/Dublin" + +msgid "Europe/Gibraltar" +msgstr "Europa/Gibraltar" + +msgid "Europe/Guernsey" +msgstr "Europa/Guernsey" + +msgid "Europe/Helsinki" +msgstr "Europa/Helsingfors" + +msgid "Europe/Isle_of_Man" +msgstr "Europa/Isle_of_Man" + +msgid "Europe/Istanbul" +msgstr "Europa/Istanbul" + +msgid "Europe/Jersey" +msgstr "Europa/Jersey" + +msgid "Europe/Kaliningrad" +msgstr "Europa/Kaliningrad" + +msgid "Europe/Kiev" +msgstr "Europa/Kiev" + +msgid "Europe/Lisbon" +msgstr "Europa/Lisabon" + +msgid "Europe/Ljubljana" +msgstr "Europa/Ljubljana" + +msgid "Europe/London" +msgstr "Europa/London" + +msgid "Europe/Luxembourg" +msgstr "Europa/Luxemburg" + +msgid "Europe/Madrid" +msgstr "Europa/Madrid" + +msgid "Europe/Malta" +msgstr "Europa/Malta" + +msgid "Europe/Mariehamn" +msgstr "Europa/Mariehamn" + +msgid "Europe/Minsk" +msgstr "Europa/Minsk" + +msgid "Europe/Monaco" +msgstr "Europa/Monaco" + +msgid "Europe/Moscow" +msgstr "Europa/Moskva" + +msgid "Europe/Nicosia" +msgstr "Europa/Nicosia" + +msgid "Europe/Oslo" +msgstr "Europa/Oslo" + +msgid "Europe/Paris" +msgstr "Europa/Paris" + +msgid "Europe/Podgorica" +msgstr "Europa/Podgorica" + +msgid "Europe/Prague" +msgstr "Europa/Prag" + +msgid "Europe/Riga" +msgstr "Europa/Riga" + +msgid "Europe/Rome" +msgstr "Europa/Rom" + +msgid "Europe/Samara" +msgstr "Europa/Samara" + +msgid "Europe/San_Marino" +msgstr "Europa/San_Marino" + +msgid "Europe/Sarajevo" +msgstr "Europa/Sarajevo" + +msgid "Europe/Simferopol" +msgstr "Europa/Simferopol" + +msgid "Europe/Skopje" +msgstr "Europa/Skopje" + +msgid "Europe/Sofia" +msgstr "Europa/Sofia" + +msgid "Europe/Stockholm" +msgstr "Europa/Stockholm" + +msgid "Europe/Tallinn" +msgstr "Europa/Tallinn" + +msgid "Europe/Tirane" +msgstr "Europa/Tirane" + +msgid "Europe/Tiraspol" +msgstr "Europa/Tiraspol" + +msgid "Europe/Uzhgorod" +msgstr "Europa/Uzhgorod" + +msgid "Europe/Vaduz" +msgstr "Europa/Vaduz" + +msgid "Europe/Vatican" +msgstr "Europa/Vatikanen" + +msgid "Europe/Vienna" +msgstr "Europa/Wien" + +msgid "Europe/Vilnius" +msgstr "Europa/Vilnius" + +msgid "Europe/Volgograd" +msgstr "Europa/Volgograd" + +msgid "Europe/Warsaw" +msgstr "Europa/Warsawa" + +msgid "Europe/Zagreb" +msgstr "Europa/Zagreb" + +msgid "Europe/Zaporozhye" +msgstr "Europa/Zaporozhye" + +msgid "Europe/Zurich" +msgstr "Europa/Zürich" + +msgid "Factory" +msgstr "Factory" + +msgid "GB" +msgstr "GB" + +msgid "GB-Eire" +msgstr "GB-Eire" + +msgid "GMT" +msgstr "GMT" + +msgid "GMT+0" +msgstr "GMT+0" + +msgid "GMT-0" +msgstr "GMT-0" + +msgid "GMT0" +msgstr "GMT0" + +msgid "Greenwich" +msgstr "Greenwich" + +msgid "Hongkong" +msgstr "Hongkong" + +msgid "HST" +msgstr "HST" + +msgid "Iceland" +msgstr "Iceland" + +msgid "Indian/Antananarivo" +msgstr "Indian/Antananarivo" + +msgid "Indian/Chagos" +msgstr "Indian/Chagos" + +msgid "Indian/Christmas" +msgstr "Indian/Christmas" + +msgid "Indian/Cocos" +msgstr "Indian/Cocos" + +msgid "Indian/Comoro" +msgstr "Indian/Comoro" + +msgid "Indian/Kerguelen" +msgstr "Indian/Kerguelen" + +msgid "Indian/Mahe" +msgstr "Indian/Mahe" + +msgid "Indian/Maldives" +msgstr "Indian/Maldives" + +msgid "Indian/Mauritius" +msgstr "Indian/Mauritius" + +msgid "Indian/Mayotte" +msgstr "Indian/Mayotte" + +msgid "Indian/Reunion" +msgstr "Indian/Reunion" + +msgid "Iran" +msgstr "Iran" + +msgid "Israel" +msgstr "Israel" + +msgid "Jamaica" +msgstr "Jamaica" + +msgid "Japan" +msgstr "Japan" + +msgid "Kwajalein" +msgstr "Kwajalein" + +msgid "Libya" +msgstr "Libyen" + +msgid "MET" +msgstr "MET" + +msgid "Mexico/BajaNorte" +msgstr "Mexico/BajaNorte" + +msgid "Mexico/BajaSur" +msgstr "Mexico/BajaSur" + +msgid "Mexico/General" +msgstr "Mexico/General" + +msgid "MST" +msgstr "MST" + +msgid "MST7MDT" +msgstr "MST7MDT" + +msgid "Navajo" +msgstr "Navajo" + +msgid "NZ" +msgstr "NZ" + +msgid "NZ-CHAT" +msgstr "NZ-CHAT" + +msgid "Pacific/Apia" +msgstr "Pacific/Apia" + +msgid "Pacific/Auckland" +msgstr "Pacific/Auckland" + +msgid "Pacific/Chatham" +msgstr "Pacific/Chatham" + +msgid "Pacific/Easter" +msgstr "Pacific/Easter" + +msgid "Pacific/Efate" +msgstr "Pacific/Efate" + +msgid "Pacific/Enderbury" +msgstr "Pacific/Enderbury" + +msgid "Pacific/Fakaofo" +msgstr "Pacific/Fakaofo" + +msgid "Pacific/Fiji" +msgstr "Pacific/Fiji" + +msgid "Pacific/Funafuti" +msgstr "Pacific/Funafuti" + +msgid "Pacific/Galapagos" +msgstr "Pacific/Galapagos" + +msgid "Pacific/Gambier" +msgstr "Pacific/Gambier" + +msgid "Pacific/Guadalcanal" +msgstr "Pacific/Guadalcanal" + +msgid "Pacific/Guam" +msgstr "Pacific/Guam" + +msgid "Pacific/Honolulu" +msgstr "Pacific/Honolulu" + +msgid "Pacific/Johnston" +msgstr "Pacific/Johnston" + +msgid "Pacific/Kiritimati" +msgstr "Pacific/Kiritimati" + +msgid "Pacific/Kosrae" +msgstr "Pacific/Kosrae" + +msgid "Pacific/Kwajalein" +msgstr "Pacific/Kwajalein" + +msgid "Pacific/Majuro" +msgstr "Pacific/Majuro" + +msgid "Pacific/Marquesas" +msgstr "Pacific/Marquesas" + +msgid "Pacific/Midway" +msgstr "Pacific/Midway" + +msgid "Pacific/Nauru" +msgstr "Pacific/Nauru" + +msgid "Pacific/Niue" +msgstr "Pacific/Niue" + +msgid "Pacific/Norfolk" +msgstr "Pacific/Norfolk" + +msgid "Pacific/Noumea" +msgstr "Pacific/Noumea" + +msgid "Pacific/Pago_Pago" +msgstr "Pacific/Pago_Pago" + +msgid "Pacific/Palau" +msgstr "Pacific/Palau" + +msgid "Pacific/Pitcairn" +msgstr "Pacific/Pitcairn" + +msgid "Pacific/Ponape" +msgstr "Pacific/Ponape" + +msgid "Pacific/Port_Moresby" +msgstr "Pacific/Port_Moresby" + +msgid "Pacific/Rarotonga" +msgstr "Pacific/Rarotonga" + +msgid "Pacific/Saipan" +msgstr "Pacific/Saipan" + +msgid "Pacific/Samoa" +msgstr "Pacific/Samoa" + +msgid "Pacific/Tahiti" +msgstr "Pacific/Tahiti" + +msgid "Pacific/Tarawa" +msgstr "Pacific/Tarawa" + +msgid "Pacific/Tongatapu" +msgstr "Pacific/Tongatapu" + +msgid "Pacific/Truk" +msgstr "Pacific/Truk" + +msgid "Pacific/Wake" +msgstr "Pacific/Wake" + +msgid "Pacific/Wallis" +msgstr "Pacific/Wallis" + +msgid "Pacific/Yap" +msgstr "Pacific/Yap" + +msgid "Poland" +msgstr "Polen" + +msgid "Portugal" +msgstr "Portugal" + +msgid "PRC" +msgstr "PRC" + +msgid "PST8PDT" +msgstr "PST8PDT" + +msgid "ROC" +msgstr "ROC" + +msgid "ROK" +msgstr "ROK" + +msgid "Singapore" +msgstr "Singapore" + +msgid "Turkey" +msgstr "Turkiet" + +msgid "UCT" +msgstr "UCT" + +msgid "Universal" +msgstr "Universal" + +msgid "US/Alaska" +msgstr "USA/Alaska" + +msgid "US/Aleutian" +msgstr "USA/Aleutian" + +msgid "US/Arizona" +msgstr "USA/Arizona" + +msgid "US/Central" +msgstr "USA/Central" + +msgid "US/East-Indiana" +msgstr "USA/East-Indiana" + +msgid "US/Eastern" +msgstr "USA/Eastern" + +msgid "US/Hawaii" +msgstr "USA/Hawaii" + +msgid "US/Indiana-Starke" +msgstr "USA/Indiana-Starke" + +msgid "US/Michigan" +msgstr "USA/Michigan" + +msgid "US/Mountain" +msgstr "USA/Mountain" + +msgid "US/Pacific" +msgstr "USA/Pacific" + +msgid "US/Pacific-New" +msgstr "USA/Pacific-New" + +msgid "US/Samoa" +msgstr "USA/Samoa" + +msgid "UTC" +msgstr "UTC" + +msgid "W-SU" +msgstr "W-SU" + +msgid "WET" +msgstr "WET" + +msgid "Zulu" +msgstr "Zulu" + From b57ae80206088ab9edeb04bde7f0e0aa51169720 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 5 Dec 2015 23:05:48 +0100 Subject: [PATCH 294/313] Issue 2122: Make sure to always return the correct number of entries --- include/socgraph.php | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/include/socgraph.php b/include/socgraph.php index 69d3308986..47df52f380 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -1188,14 +1188,15 @@ function suggestion_query($uid, $start = 0, $limit = 80) { $sql_network = "'".$sql_network."'"; $r = q("SELECT count(glink.gcid) as `total`, gcontact.* from gcontact - INNER JOIN glink on glink.gcid = gcontact.id + INNER JOIN `glink` ON `glink`.`gcid` = `gcontact`.`id` where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d ) - and not gcontact.name in ( select name from contact where uid = %d ) - and not gcontact.id in ( select gcid from gcign where uid = %d ) + AND NOT `gcontact`.`name` IN (SELECT `name` FROM `contact` WHERE `uid` = %d) + AND NOT `gcontact`.`id` IN (SELECT `gcid` FROM `gcign` WHERE `uid` = %d) AND `gcontact`.`updated` != '0000-00-00 00:00:00' AND `gcontact`.`last_contact` >= `gcontact`.`last_failure` AND `gcontact`.`network` IN (%s) - group by glink.gcid order by gcontact.updated desc,total desc limit %d, %d ", + AND NOT `gcontact`.`id` IN (SELECT `gcid` FROM `gcign` WHERE `uid` = %d) + GROUP BY `glink`.`gcid` ORDER BY `gcontact`.`updated` DESC,`total` DESC LIMIT %d, %d", intval($uid), intval($uid), intval($uid), @@ -1208,14 +1209,15 @@ function suggestion_query($uid, $start = 0, $limit = 80) { if(count($r) && count($r) >= ($limit -1)) return $r; - $r2 = q("SELECT gcontact.* from gcontact - INNER JOIN glink on glink.gcid = gcontact.id - where glink.uid = 0 and glink.cid = 0 and glink.zcid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d ) - and not gcontact.name in ( select name from contact where uid = %d ) - and not gcontact.id in ( select gcid from gcign where uid = %d ) + $r2 = q("SELECT gcontact.* FROM gcontact + INNER JOIN `glink` ON `glink`.`gcid` = `gcontact`.`id` + WHERE `glink`.`uid` = 0 AND `glink`.`cid` = 0 AND `glink`.`zcid` = 0 AND NOT `gcontact`.`nurl` IN (SELECT `nurl` FROM `contact` WHERE `uid` = %d) + AND NOT `gcontact`.`name` IN (SELECT `name` FROM `contact` WHERE `uid` = %d) + AND NOT `gcontact`.`id` IN (SELECT `gcid` FROM `gcign` WHERE `uid` = %d) AND `gcontact`.`updated` != '0000-00-00 00:00:00' + AND `gcontact`.`last_contact` >= `gcontact`.`last_failure` AND `gcontact`.`network` IN (%s) - order by rand() limit %d, %d ", + ORDER BY rand() LIMIT %d, %d", intval($uid), intval($uid), intval($uid), @@ -1231,6 +1233,9 @@ function suggestion_query($uid, $start = 0, $limit = 80) { foreach ($r AS $suggestion) $list[$suggestion["nurl"]] = $suggestion; + while (sizeof($list) > ($limit)) + array_pop($list); + return $list; } From 01c9d13927da443995f57d38ac2fcf53cc9a0794 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 5 Dec 2015 23:29:42 +0100 Subject: [PATCH 295/313] Issue 1871: Show an information if a group is empty --- mod/group.php | 3 ++- view/templates/groupeditor.tpl | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mod/group.php b/mod/group.php index e9f9561f46..5b28784f56 100644 --- a/mod/group.php +++ b/mod/group.php @@ -190,6 +190,7 @@ function group_content(&$a) { 'label_members' => t('Members'), 'members' => array(), 'label_contacts' => t('All Contacts'), + 'group_is_empty' => t('Group is empty'), 'contacts' => array(), ); @@ -204,7 +205,7 @@ function group_content(&$a) { group_rmv_member(local_user(),$group['name'],$member['id']); } - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0 ORDER BY `name` ASC", + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `self` ORDER BY `name` ASC", intval(local_user()) ); diff --git a/view/templates/groupeditor.tpl b/view/templates/groupeditor.tpl index b0f267dde9..86458ded2e 100644 --- a/view/templates/groupeditor.tpl +++ b/view/templates/groupeditor.tpl @@ -2,7 +2,11 @@

    {{$groupeditor.label_members}}

    -{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}} +{{if $groupeditor.members }} + {{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}} +{{else}} +{{$groupeditor.group_is_empty}} +{{/if}}
    From f406e5ddbd4f0e1184f7d7f04c45c70c2ad3fb65 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 6 Dec 2015 00:18:59 +0100 Subject: [PATCH 296/313] Issue 1921: Disable the auto update --- boot.php | 5 +++++ mod/settings.php | 13 ++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/boot.php b/boot.php index fb65eff22c..19cfd71a8a 100644 --- a/boot.php +++ b/boot.php @@ -734,6 +734,11 @@ if(! class_exists('App')) { function init_pagehead() { $interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000); + + // If the update is "deactivated" set it to the highest integer number (~24 days) + if ($interval < 0) + $interval = 2147483647; + if($interval < 10000) $interval = 40000; diff --git a/mod/settings.php b/mod/settings.php index 77a5755855..02a6955a00 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -289,9 +289,11 @@ function settings_post(&$a) { $infinite_scroll = ((x($_POST,'infinite_scroll')) ? intval($_POST['infinite_scroll']) : 0); $no_auto_update = ((x($_POST,'no_auto_update')) ? intval($_POST['no_auto_update']) : 0); $browser_update = ((x($_POST,'browser_update')) ? intval($_POST['browser_update']) : 0); - $browser_update = $browser_update * 1000; - if($browser_update < 10000) - $browser_update = 10000; + if ($browser_update != -1) { + $browser_update = $browser_update * 1000; + if ($browser_update < 10000) + $browser_update = 10000; + } $itemspage_network = ((x($_POST,'itemspage_network')) ? intval($_POST['itemspage_network']) : 40); if($itemspage_network > 100) @@ -921,7 +923,8 @@ function settings_content(&$a) { $mobile_theme_selected = (!x($_SESSION,'mobile-theme')? $default_mobile_theme : $_SESSION['mobile-theme']); $browser_update = intval(get_pconfig(local_user(), 'system','update_interval')); - $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds + if (intval($browser_update) != -1) + $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds $itemspage_network = intval(get_pconfig(local_user(), 'system','itemspage_network')); $itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items @@ -960,7 +963,7 @@ function settings_content(&$a) { '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes, true), '$mobile_theme' => array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false), - '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds, no maximum')), + '$ajaxint' => array('browser_update', t("Update browser every xx seconds"), $browser_update, t('Minimum of 10 seconds. Enter -1 to disable it.')), '$itemspage_network' => array('itemspage_network', t("Number of items to display per page:"), $itemspage_network, t('Maximum of 100 items')), '$itemspage_mobile_network' => array('itemspage_mobile_network', t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, t('Maximum of 100 items')), '$nosmile' => array('nosmile', t("Don't show emoticons"), $nosmile, ''), From 7c7baa77d67b1e4fa82d77081e969a70e4094237 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 6 Dec 2015 12:15:31 +0100 Subject: [PATCH 297/313] probe_url: Only cache successful results --- include/Scrape.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/Scrape.php b/include/Scrape.php index 4f9d675c18..af90a07506 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -831,7 +831,7 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) { } // Only store into the cache if the value seems to be valid - if ($result['network'] != NETWORK_FEED) + if ($result['network'] != NETWORK_PHANTOM) Cache::set("probe_url:".$mode.":".$url,serialize($result), CACHE_DAY); return $result; From 54085508e5a6d7971158771f60845aa293de1d46 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 6 Dec 2015 16:28:28 +0100 Subject: [PATCH 298/313] Double check for maximum number of workers --- include/poller.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/include/poller.php b/include/poller.php index 45740dab62..3b348531c5 100644 --- a/include/poller.php +++ b/include/poller.php @@ -56,12 +56,17 @@ function poller_run(&$argv, &$argc){ // But: Update processes (like the database update) mustn't be killed } - } else - // Sleep two seconds before checking for running processes to avoid having too many workers + } else { + // Checking the number of workers + if (poller_too_much_workers(1)) + return; + + // Sleep four seconds before checking for running processes again to avoid having too many workers sleep(4); + } // Checking number of workers - if (poller_too_much_workers()) + if (poller_too_much_workers(2)) return; $starttime = time(); @@ -114,13 +119,13 @@ function poller_run(&$argv, &$argc){ return; // Count active workers and compare them with a maximum value that depends on the load - if (poller_too_much_workers()) + if (poller_too_much_workers(3)) return; } } -function poller_too_much_workers() { +function poller_too_much_workers($stage) { $queues = get_config("system", "worker_queues"); @@ -144,7 +149,7 @@ function poller_too_much_workers() { $slope = $maxworkers / pow($maxsysload, $exponent); $queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent)); - logger("Current load: ".$load." - maximum: ".$maxsysload." - current queues: ".$active." - maximum: ".$queues, LOGGER_DEBUG); + logger("Current load stage ".$stage.": ".$load." - maximum: ".$maxsysload." - current queues: ".$active." - maximum: ".$queues, LOGGER_DEBUG); } From 9f8da37c99db9b66c164d4fbeb7b4e15bec19d32 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 6 Dec 2015 16:40:31 +0100 Subject: [PATCH 299/313] Move the process check at the beginning of the script --- include/poller.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/include/poller.php b/include/poller.php index 3b348531c5..06a5314a4f 100644 --- a/include/poller.php +++ b/include/poller.php @@ -38,6 +38,10 @@ function poller_run(&$argv, &$argc){ } } + // Checking the number of workers + if (poller_too_much_workers(1)) + return; + if(($argc <= 1) OR ($argv[1] != "no_cron")) { // Run the cron job that calls all other jobs proc_run("php","include/cron.php"); @@ -56,14 +60,9 @@ function poller_run(&$argv, &$argc){ // But: Update processes (like the database update) mustn't be killed } - } else { - // Checking the number of workers - if (poller_too_much_workers(1)) - return; - + } else // Sleep four seconds before checking for running processes again to avoid having too many workers sleep(4); - } // Checking number of workers if (poller_too_much_workers(2)) From f880bdd33b44667959a04dd9e44eacbf31d42f3a Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 6 Dec 2015 18:52:19 +0100 Subject: [PATCH 300/313] Workaround for misconfigured Friendica servers --- include/Scrape.php | 42 ++++++++++++++++++++++++++++++++++++++++-- mod/noscrape.php | 1 + 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/include/Scrape.php b/include/Scrape.php index af90a07506..b7df8e04fe 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -632,9 +632,7 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) { if ($connectornetworks) $check_feed = false; - if($check_feed) { - $feedret = scrape_feed(($poll) ? $poll : $url); logger('probe_url: scrape_feed ' . (($poll)? $poll : $url) . ' returns: ' . print_r($feedret,true), LOGGER_DATA); @@ -726,6 +724,46 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) { } } + // Workaround for misconfigured Friendica servers + if (($network == "") AND (strstr($url, "/profile/"))) { + $noscrape = str_replace("/profile/", "/noscrape/", $url); + $noscrapejson = fetch_url($noscrape); + if ($noscrapejson) { + + $network = NETWORK_DFRN; + + $poco = str_replace("/profile/", "/poco/", $url); + + $noscrapedata = json_decode($noscrapejson, true); + + if (isset($noscrapedata["addr"])) + $addr = $noscrapedata["addr"]; + + if (isset($noscrapedata["fn"])) + $vcard["fn"] = $noscrapedata["fn"]; + + if (isset($noscrapedata["key"])) + $pubkey = $noscrapedata["key"]; + + if (isset($noscrapedata["photo"])) + $vcard["photo"] = $noscrapedata["photo"]; + + if (isset($noscrapedata["dfrn-request"])) + $request = $noscrapedata["dfrn-request"]; + + if (isset($noscrapedata["dfrn-confirm"])) + $confirm = $noscrapedata["dfrn-confirm"]; + + if (isset($noscrapedata["dfrn-notify"])) + $notify = $noscrapedata["dfrn-notify"]; + + if (isset($noscrapedata["dfrn-poll"])) + $poll = $noscrapedata["dfrn-poll"]; + +// print_r($noscrapedata); + } + } + if((! $vcard['photo']) && strlen($email)) $vcard['photo'] = avatar_img($email); if($poll === $profile) diff --git a/mod/noscrape.php b/mod/noscrape.php index 34d5254fc0..51bd7234cf 100644 --- a/mod/noscrape.php +++ b/mod/noscrape.php @@ -24,6 +24,7 @@ function noscrape_init(&$a) { $json_info = array( 'fn' => $a->profile['name'], + 'addr' => $a->profile['addr'], 'key' => $a->profile['pubkey'], 'homepage' => $a->get_baseurl()."/profile/{$which}", 'comm' => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY), From d06717798b717c0b754d7a5051fa437d22b07067 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 6 Dec 2015 18:57:23 +0100 Subject: [PATCH 301/313] Code beautification --- include/Scrape.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/Scrape.php b/include/Scrape.php index b7df8e04fe..6ee3dabfca 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -632,7 +632,9 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) { if ($connectornetworks) $check_feed = false; + if($check_feed) { + $feedret = scrape_feed(($poll) ? $poll : $url); logger('probe_url: scrape_feed ' . (($poll)? $poll : $url) . ' returns: ' . print_r($feedret,true), LOGGER_DATA); @@ -760,7 +762,6 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) { if (isset($noscrapedata["dfrn-poll"])) $poll = $noscrapedata["dfrn-poll"]; -// print_r($noscrapedata); } } From fbbba6828b16cffaa6f9c70f5902d98b80678640 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 6 Dec 2015 20:04:33 +0100 Subject: [PATCH 302/313] Some better logging --- include/poller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/poller.php b/include/poller.php index 06a5314a4f..8c102a66b9 100644 --- a/include/poller.php +++ b/include/poller.php @@ -104,10 +104,10 @@ function poller_run(&$argv, &$argc){ $funcname=str_replace(".php", "", basename($argv[0]))."_run"; if (function_exists($funcname)) { - logger("Process ".getmypid().": ".$funcname." ".$r[0]["parameter"]); + logger("Process ".getmypid()." - ID ".$r[0]["id"].": ".$funcname." ".$r[0]["parameter"]); $funcname($argv, $argc); - logger("Process ".getmypid().": ".$funcname." - done"); + logger("Process ".getmypid()." - ID ".$r[0]["id"].": ".$funcname." - done"); q("DELETE FROM `workerqueue` WHERE `id` = %d", intval($r[0]["id"])); } else From 6b0b9481cb028f0acf8904d4f3c2c06b4a1384f1 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 6 Dec 2015 20:05:57 +0100 Subject: [PATCH 303/313] Bugfix for pull request #2147 (Fix for issue #2122) --- include/socgraph.php | 1 - 1 file changed, 1 deletion(-) diff --git a/include/socgraph.php b/include/socgraph.php index 47df52f380..559b1832b2 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -1195,7 +1195,6 @@ function suggestion_query($uid, $start = 0, $limit = 80) { AND `gcontact`.`updated` != '0000-00-00 00:00:00' AND `gcontact`.`last_contact` >= `gcontact`.`last_failure` AND `gcontact`.`network` IN (%s) - AND NOT `gcontact`.`id` IN (SELECT `gcid` FROM `gcign` WHERE `uid` = %d) GROUP BY `glink`.`gcid` ORDER BY `gcontact`.`updated` DESC,`total` DESC LIMIT %d, %d", intval($uid), intval($uid), From bcf7e673c99610acc3f3cdcdb8513062f7d9255b Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 6 Dec 2015 22:01:20 +0100 Subject: [PATCH 304/313] Issue 1924: New configuration value for permitting crawler access --- doc/htconfig.md | 2 ++ mod/search.php | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/doc/htconfig.md b/doc/htconfig.md index d46abb3a0b..4764c287c8 100644 --- a/doc/htconfig.md +++ b/doc/htconfig.md @@ -44,6 +44,8 @@ line to your .htconfig.php: * ostatus_poll_timeframe - Defines how old an item can be to try to complete the conversation with it. * paranoia (Boolean) - Log out users if their IP address changed. * permit_crawling (Boolean) - Restricts the search for not logged in users to one search per minute. +* free_crawls - Number of "free" searches when "permit_crawling" is activated (Default value is 10) +* crawl_permit_period - Period in seconds between allowed searches when the number of free searches is reached and "permit_crawling" is activated (Default value is 60) * png_quality - Default value is 8. * proc_windows (Boolean) - Should be enabled if Friendica is running under Windows. * proxy_cache_time - Time after which the cache is cleared. Default value is one day. diff --git a/mod/search.php b/mod/search.php index c15dfae3fe..7c78339c70 100644 --- a/mod/search.php +++ b/mod/search.php @@ -104,20 +104,30 @@ function search_content(&$a) { } if (get_config('system','permit_crawling') AND !local_user()) { - // To-Do: - // - 10 requests are "free", after the 11th only a call per minute is allowed + // Default values: + // 10 requests are "free", after the 11th only a call per minute is allowed + + $free_crawls = intval(get_config('system','free_crawls')); + if ($free_crawls == 0) + $free_crawls = 10; + + $crawl_permit_period = intval(get_config('system','crawl_permit_period')); + if ($crawl_permit_period == 0) + $crawl_permit_period = 10; $remote = $_SERVER["REMOTE_ADDR"]; $result = Cache::get("remote_search:".$remote); if (!is_null($result)) { - if ($result > (time() - 60)) { + $resultdata = json_decode($result); + if (($resultdata->time > (time() - $crawl_permit_period)) AND ($resultdata->accesses > $free_crawls)) { http_status_exit(429, array("title" => t("Too Many Requests"), "description" => t("Only one search per minute is permitted for not logged in users."))); killme(); } - } - Cache::set("remote_search:".$remote, time(), CACHE_HOUR); + Cache::set("remote_search:".$remote, json_encode(array("time" => time(), "accesses" => $resultdata->accesses + 1)), CACHE_HOUR); + } else + Cache::set("remote_search:".$remote, json_encode(array("time" => time(), "accesses" => 1)), CACHE_HOUR); } nav_set_selected('search'); From 8128a28a6c1a3f6bda903cda1672050729c4c1f7 Mon Sep 17 00:00:00 2001 From: Gerhard Seeber Date: Mon, 7 Dec 2015 19:37:14 +0100 Subject: [PATCH 305/313] new API calls for managing contact groups --- include/api.php | 223 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 220 insertions(+), 3 deletions(-) diff --git a/include/api.php b/include/api.php index 2d680dc678..19833566ed 100644 --- a/include/api.php +++ b/include/api.php @@ -2,6 +2,27 @@ /* To-Do: - Automatically detect if incoming data is HTML or BBCode */ + +/* Contact details: + Gerhard Seeber Mail: gerhard@seeber.at Friendica: http://mozartweg.dyndns.org/friendica/gerhard + + */ + + +/* + * Change history: + Gerhard Seeber 2015-NOV-25 Add API call /users/group_show to return all or a single group + with the containing contacts (necessary for Windows 10 Universal app) + Gerhard Seeber 2015-NOV-27 Add API call /users/group_delete to delete the specified group id + (necessary for Windows 10 Universal app) + Gerhard Seeber 2015-DEC-01 Add API call /users/group_create to create a group with the specified + name and the given list of contacts (necessary for Windows 10 Universal + app) + Gerhard Seeber 2015-DEC-07 Add API call /users/group_update to update a group with the given list of + contacts (necessary for Windows 10 Universal app) + * + */ + require_once("include/bbcode.php"); require_once("include/datetime.php"); require_once("include/conversation.php"); @@ -16,6 +37,7 @@ require_once('mod/wall_upload.php'); require_once("mod/proxy.php"); require_once("include/message.php"); + require_once("include/group.php"); /* @@ -3012,10 +3034,205 @@ function api_best_nickname(&$contacts) { $contacts = array($contacts[0]); } - function api_users_groups_show() { - } - api_register_func('api/users/groups_show', 'api_users_groups_show', true); + // return all or a specified group of the user with the containing contacts + function api_users_group_show(&$a, $type) { + if (api_user()===false) return false; + // params + $user_info = api_get_user($a); + $gid = (x($_REQUEST,'gid') ? $_REQUEST['gid'] : 0); + $uid = $user_info['uid']; + + // get data of the specified group id or all groups if not specified + if ($gid != 0) { + $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d AND `id` = %d", + intval($uid), + intval($gid)); + // error message if specified gid is not in database + if (count($r) == 0) + die(api_error($a, $type, 'gid not available')); + } + else + $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d", + intval($uid)); + + // loop through all groups and retrieve all members for adding data in the user array + foreach ($r as $rr) { + $members = group_get_members($rr['id']); + $users = array(); + foreach ($members as $member) { + $user = api_get_user($a, $member['nurl']); + $users[] = $user; + } + $grps[] = array('name' => $rr['name'], 'gid' => $rr['id'], 'user' => $users); + } + return api_apply_template("group_show", $type, array('$groups' => $grps)); + } + api_register_func('api/users/group_show', 'api_users_group_show', true); + + + // delete the specified group of the user + function api_users_group_delete(&$a, $type) { + if (api_user()===false) return false; + + // params + $user_info = api_get_user($a); + $gid = (x($_REQUEST,'gid') ? $_REQUEST['gid'] : 0); + $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : ""); + $uid = $user_info['uid']; + + // error if no gid specified + if ($gid == 0 || $name == "") + die(api_error($a, $type, 'gid or name not specified')); + + // get data of the specified group id + $r = q("SELECT * FROM `group` WHERE `uid` = %d AND `id` = %d", + intval($uid), + intval($gid)); + // error message if specified gid is not in database + if (count($r) == 0) + die(api_error($a, $type, 'gid not available')); + + // get data of the specified group id and group name + $rname = q("SELECT * FROM `group` WHERE `uid` = %d AND `id` = %d AND `name` = '%s'", + intval($uid), + intval($gid), + dbesc($name)); + // error message if specified gid is not in database + if (count($rname) == 0) + die(api_error($a, $type, 'wrong group name')); + + // delete group + $ret = group_rmv($uid, $name); + if ($ret) { + // return success + $success = array('success' => $ret, 'gid' => $gid, 'name' => $name, 'status' => 'deleted', 'wrong users' => array()); + return api_apply_template("group_delete", $type, array('$result' => $success)); + } + else + die(api_error($a, $type, 'other API error')); + } + api_register_func('api/users/group_delete', 'api_users_group_delete', true); + + + // create the specified group with the posted array of contacts + function api_users_group_create(&$a, $type) { + if (api_user()===false) return false; + + // params + $user_info = api_get_user($a); + $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : ""); + $uid = $user_info['uid']; + $json = json_decode($_POST['json'], true); + $users = $json['user']; + + // error if no name specified + if ($name == "") + die(api_error($a, $type, 'group name not specified')); + + // get data of the specified group name + $rname = q("SELECT * FROM `group` WHERE `uid` = %d AND `name` = '%s' AND `deleted` = 0", + intval($uid), + dbesc($name)); + // error message if specified group name already exists + if (count($rname) != 0) + die(api_error($a, $type, 'group name already exists')); + + // check if specified group name is a deleted group + $rname = q("SELECT * FROM `group` WHERE `uid` = %d AND `name` = '%s' AND `deleted` = 1", + intval($uid), + dbesc($name)); + // error message if specified group name already exists + if (count($rname) != 0) + $reactivate_group = true; + + // create group + $ret = group_add($uid, $name); + if ($ret) + $gid = group_byname($uid, $name); + else + die(api_error($a, $type, 'other API error')); + + // add members + $erroraddinguser = false; + $errorusers = array(); + foreach ($users as $user) { + $cid = $user['cid']; + // check if user really exists as contact + $contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d", + intval($cid), + intval($uid)); + if (count($contact)) + $result = group_add_member($uid, $name, $cid, $gid); + else { + $erroraddinguser = true; + $errorusers[] = $cid; + } + } + + // return success message incl. missing users in array + $status = ($erroraddinguser ? "missing user" : ($reactivate_group ? "reactivated" : "ok")); + $success = array('success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers); + return api_apply_template("group_create", $type, array('result' => $success)); + } + api_register_func('api/users/group_create', 'api_users_group_create', true); + + + // update the specified group with the posted array of contacts + function api_users_group_update(&$a, $type) { + if (api_user()===false) return false; + + // params + $user_info = api_get_user($a); + $uid = $user_info['uid']; + $gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0); + $name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : ""); + $json = json_decode($_POST['json'], true); + $users = $json['user']; + + // error if no name specified + if ($name == "") + die(api_error($a, $type, 'group name not specified')); + + // error if no gid specified + if ($gid == "") + die(api_error($a, $type, 'gid not specified')); + + // remove members + $members = group_get_members($gid); + foreach ($members as $member) { + $cid = $member['id']; + foreach ($users as $user) { + $found = ($user['cid'] == $cid ? true : false); + } + if (!$found) { + $ret = group_rmv_member($uid, $name, $cid); + } + } + + // add members + $erroraddinguser = false; + $errorusers = array(); + foreach ($users as $user) { + $cid = $user['cid']; + // check if user really exists as contact + $contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d", + intval($cid), + intval($uid)); + if (count($contact)) + $result = group_add_member($uid, $name, $cid, $gid); + else { + $erroraddinguser = true; + $errorusers[] = $cid; + } + } + + // return success message incl. missing users in array + $status = ($erroraddinguser ? "missing user" : "ok"); + $success = array('success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers); + return api_apply_template("group_update", $type, array('result' => $success)); + } + api_register_func('api/users/group_update', 'api_users_group_update', true); /* To.Do: From 1fb636ba1ef406c2ea6913479f9cd314f58a9b03 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 7 Dec 2015 21:45:33 +0100 Subject: [PATCH 306/313] Vier: The line-height seems to make problems with windows --- view/theme/vier/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 1b4fc450bf..befe47ad6b 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -958,7 +958,7 @@ right_aside { font-size: 13px; overflow-y: auto; z-index: 2; - line-height: 17px; + /* line-height: 17px; */ color: #737373; box-shadow: 1px 2px 0px 0px #D8D8D8; top: 32px; @@ -983,7 +983,7 @@ aside { top: 32px; overflow-y: auto; z-index: 2; - line-height: 17px; + /* line-height: 17px; */ position: fixed; /* overflow: auto; */ height: 100%; From 77f13571233fbad04132f375bf596d74a2bc2e88 Mon Sep 17 00:00:00 2001 From: gerhard6380 Date: Mon, 7 Dec 2015 22:07:20 +0100 Subject: [PATCH 307/313] Update api.md add documentation for new API calls for Managing groups --- doc/api.md | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/doc/api.md b/doc/api.md index 147c8b7513..478ef6d2b9 100644 --- a/doc/api.md +++ b/doc/api.md @@ -346,6 +346,79 @@ Friendica doesn't allow showing followers of other users. Friendica doesn't allow showing friends of other users. + +## Implemented API calls (not compatible with other API’s) + +### users/group_show +Return all or a specified group of the user with the containing contacts as array. + +#### Parameters +* gid: optional, if not given, API returns all groups of the user + +#### Return values +Array of: +* name: name of the group +* gid: id of the group +* user: array of group members (return from api_get_user() function for each member) + + +### users/group_delete +delete the specified group of contacts; API call need to include the correct gid AND name of the group to be deleted. + +### Parameters +* gid: id of the group to be deleted +* name: name of the group to be deleted + +#### Return values +Array of: +* success: true if successfully deleted +* gid: gid of the deleted group +* name: name of the deleted group +* status: „deleted“ if successfully deleted +* wrong users: empty array + + +### users/group_create +Create the group with the posted array of contacts as members. +#### Parameters +* name: name of the group to be created + +#### POST data +JSON data as Array like the result of „users/group_show“: +* gid +* name +* array of users + +#### Return values +Array of: +* success: true if successfully created or reactivated +* gid: gid of the created group +* name: name of the created group +* status: „missing user“ | „reactivated“ | „ok“ +* wrong users: array of users, which were not available in the contact table + + +### users/group_update +Update the group with the posted array of contacts as members (post all members of the group to the call; function will remove members not posted). +#### Parameters +* gid: id of the group to be changed +* name: name of the group to be changed + +#### POST data +JSON data as array like the result of „users/group_show“: +* gid +* name +* array of users + +#### Return values +Array of: +* success: true if successfully updated +* gid: gid of the changed group +* name: name of the changed group +* status: „missing user“ | „ok“ +* wrong users: array of users, which were not available in the contact table + + ## Not Implemented API calls The following API calls are implemented in GNU Social but not in Friendica: (incomplete) From e1c6d80c01fadbf26879dab0f9aa58adb5096d8a Mon Sep 17 00:00:00 2001 From: root Date: Mon, 7 Dec 2015 22:18:55 +0100 Subject: [PATCH 308/313] change api/user/group_* to api/friendica/group_* --- include/api.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/include/api.php b/include/api.php index 19833566ed..ff8127829b 100644 --- a/include/api.php +++ b/include/api.php @@ -11,15 +11,15 @@ /* * Change history: - Gerhard Seeber 2015-NOV-25 Add API call /users/group_show to return all or a single group + Gerhard Seeber 2015-NOV-25 Add API call /friendica/group_show to return all or a single group with the containing contacts (necessary for Windows 10 Universal app) - Gerhard Seeber 2015-NOV-27 Add API call /users/group_delete to delete the specified group id + Gerhard Seeber 2015-NOV-27 Add API call /friendica/group_delete to delete the specified group id (necessary for Windows 10 Universal app) - Gerhard Seeber 2015-DEC-01 Add API call /users/group_create to create a group with the specified + Gerhard Seeber 2015-DEC-01 Add API call /friendica/group_create to create a group with the specified name and the given list of contacts (necessary for Windows 10 Universal app) - Gerhard Seeber 2015-DEC-07 Add API call /users/group_update to update a group with the given list of - contacts (necessary for Windows 10 Universal app) + Gerhard Seeber 2015-DEC-07 Add API call /friendica/group_update to update a group with the given + list of contacts (necessary for Windows 10 Universal app) * */ @@ -3035,7 +3035,7 @@ function api_best_nickname(&$contacts) { } // return all or a specified group of the user with the containing contacts - function api_users_group_show(&$a, $type) { + function api_friendica_group_show(&$a, $type) { if (api_user()===false) return false; // params @@ -3068,11 +3068,11 @@ function api_best_nickname(&$contacts) { } return api_apply_template("group_show", $type, array('$groups' => $grps)); } - api_register_func('api/users/group_show', 'api_users_group_show', true); + api_register_func('api/friendica/group_show', 'api_friendica_group_show', true); // delete the specified group of the user - function api_users_group_delete(&$a, $type) { + function api_friendica_group_delete(&$a, $type) { if (api_user()===false) return false; // params @@ -3112,11 +3112,11 @@ function api_best_nickname(&$contacts) { else die(api_error($a, $type, 'other API error')); } - api_register_func('api/users/group_delete', 'api_users_group_delete', true); + api_register_func('api/friendica/group_delete', 'api_friendica_group_delete', true); // create the specified group with the posted array of contacts - function api_users_group_create(&$a, $type) { + function api_friendica_group_create(&$a, $type) { if (api_user()===false) return false; // params @@ -3175,11 +3175,11 @@ function api_best_nickname(&$contacts) { $success = array('success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers); return api_apply_template("group_create", $type, array('result' => $success)); } - api_register_func('api/users/group_create', 'api_users_group_create', true); + api_register_func('api/friendica/group_create', 'api_friendica_group_create', true); // update the specified group with the posted array of contacts - function api_users_group_update(&$a, $type) { + function api_friendica_group_update(&$a, $type) { if (api_user()===false) return false; // params @@ -3232,7 +3232,7 @@ function api_best_nickname(&$contacts) { $success = array('success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers); return api_apply_template("group_update", $type, array('result' => $success)); } - api_register_func('api/users/group_update', 'api_users_group_update', true); + api_register_func('api/friendica/group_update', 'api_friendica_group_update', true); /* To.Do: From 1d3b61c3b92b6d840a2db39019febcc6e61e7af3 Mon Sep 17 00:00:00 2001 From: gerhard6380 Date: Mon, 7 Dec 2015 22:42:43 +0100 Subject: [PATCH 309/313] Update api.md changed from api/users/group_* to api/friendica/group_* --- doc/api.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/api.md b/doc/api.md index 478ef6d2b9..aa02aac6f5 100644 --- a/doc/api.md +++ b/doc/api.md @@ -349,7 +349,7 @@ Friendica doesn't allow showing friends of other users. ## Implemented API calls (not compatible with other API’s) -### users/group_show +### friendica/group_show Return all or a specified group of the user with the containing contacts as array. #### Parameters @@ -362,7 +362,7 @@ Array of: * user: array of group members (return from api_get_user() function for each member) -### users/group_delete +### friendica/group_delete delete the specified group of contacts; API call need to include the correct gid AND name of the group to be deleted. ### Parameters @@ -378,7 +378,7 @@ Array of: * wrong users: empty array -### users/group_create +### friendica/group_create Create the group with the posted array of contacts as members. #### Parameters * name: name of the group to be created @@ -398,7 +398,7 @@ Array of: * wrong users: array of users, which were not available in the contact table -### users/group_update +### friendica/group_update Update the group with the posted array of contacts as members (post all members of the group to the call; function will remove members not posted). #### Parameters * gid: id of the group to be changed From fb66f27e8fc388eede2a5b63b673582087bd1d1f Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 13 Dec 2015 08:55:17 +0100 Subject: [PATCH 310/313] regenerated messages.po --- util/messages.po | 2208 +++++++++++++++++++++++++++------------------- 1 file changed, 1293 insertions(+), 915 deletions(-) diff --git a/util/messages.po b/util/messages.po index 7dcd971931..b6e579b1a7 100644 --- a/util/messages.po +++ b/util/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-30 13:14+0100\n" +"POT-Creation-Date: 2015-12-13 08:51+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,440 +18,491 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" -#: mod/contacts.php:118 +#: mod/contacts.php:50 include/identity.php:380 +msgid "Network:" +msgstr "" + +#: mod/contacts.php:51 mod/contacts.php:986 mod/videos.php:37 +#: mod/viewcontacts.php:105 mod/dirfind.php:208 mod/network.php:596 +#: mod/allfriends.php:72 mod/match.php:82 mod/directory.php:172 +#: mod/common.php:124 mod/suggest.php:95 mod/photos.php:41 +#: include/identity.php:295 +msgid "Forum" +msgstr "" + +#: mod/contacts.php:128 #, php-format msgid "%d contact edited." msgid_plural "%d contacts edited" msgstr[0] "" msgstr[1] "" -#: mod/contacts.php:149 mod/contacts.php:372 +#: mod/contacts.php:159 mod/contacts.php:382 msgid "Could not access contact record." msgstr "" -#: mod/contacts.php:163 +#: mod/contacts.php:173 msgid "Could not locate selected profile." msgstr "" -#: mod/contacts.php:196 +#: mod/contacts.php:206 msgid "Contact updated." msgstr "" -#: mod/contacts.php:198 mod/dfrn_request.php:578 +#: mod/contacts.php:208 mod/dfrn_request.php:578 msgid "Failed to update contact record." msgstr "" -#: mod/contacts.php:354 mod/manage.php:96 mod/display.php:496 +#: mod/contacts.php:364 mod/manage.php:96 mod/display.php:496 #: mod/profile_photo.php:19 mod/profile_photo.php:175 mod/profile_photo.php:186 #: mod/profile_photo.php:199 mod/ostatus_subscribe.php:9 mod/follow.php:10 #: mod/follow.php:72 mod/follow.php:137 mod/item.php:169 mod/item.php:185 #: mod/group.php:19 mod/dfrn_confirm.php:55 mod/fsuggest.php:78 -#: mod/wall_upload.php:77 mod/wall_upload.php:80 mod/viewcontacts.php:24 +#: mod/wall_upload.php:77 mod/wall_upload.php:80 mod/viewcontacts.php:40 #: mod/notifications.php:69 mod/message.php:45 mod/message.php:181 -#: mod/crepair.php:120 mod/dirfind.php:11 mod/nogroup.php:25 mod/network.php:4 -#: mod/allfriends.php:11 mod/events.php:165 mod/wallmessage.php:9 +#: mod/crepair.php:117 mod/dirfind.php:11 mod/nogroup.php:25 mod/network.php:4 +#: mod/allfriends.php:12 mod/events.php:165 mod/wallmessage.php:9 #: mod/wallmessage.php:33 mod/wallmessage.php:79 mod/wallmessage.php:103 #: mod/wall_attach.php:67 mod/wall_attach.php:70 mod/settings.php:20 -#: mod/settings.php:116 mod/settings.php:635 mod/register.php:42 -#: mod/delegate.php:12 mod/common.php:17 mod/mood.php:114 mod/suggest.php:58 +#: mod/settings.php:116 mod/settings.php:637 mod/register.php:42 +#: mod/delegate.php:12 mod/common.php:18 mod/mood.php:114 mod/suggest.php:58 #: mod/profiles.php:165 mod/profiles.php:615 mod/editpost.php:10 mod/api.php:26 #: mod/api.php:31 mod/notes.php:22 mod/poke.php:149 mod/repair_ostatus.php:9 -#: mod/invite.php:15 mod/invite.php:101 mod/photos.php:163 mod/photos.php:1097 +#: mod/invite.php:15 mod/invite.php:101 mod/photos.php:171 mod/photos.php:1105 #: mod/regmod.php:110 mod/uimport.php:23 mod/attach.php:33 -#: include/items.php:5041 index.php:382 +#: include/items.php:5067 addons-extra/fbgroup/fbgroup.php:168 +#: addons-extra/fbgroup/fbgroup.php:174 index.php:382 msgid "Permission denied." msgstr "" -#: mod/contacts.php:393 +#: mod/contacts.php:403 msgid "Contact has been blocked" msgstr "" -#: mod/contacts.php:393 +#: mod/contacts.php:403 msgid "Contact has been unblocked" msgstr "" -#: mod/contacts.php:404 +#: mod/contacts.php:414 msgid "Contact has been ignored" msgstr "" -#: mod/contacts.php:404 +#: mod/contacts.php:414 msgid "Contact has been unignored" msgstr "" -#: mod/contacts.php:416 +#: mod/contacts.php:426 msgid "Contact has been archived" msgstr "" -#: mod/contacts.php:416 +#: mod/contacts.php:426 msgid "Contact has been unarchived" msgstr "" -#: mod/contacts.php:443 mod/contacts.php:817 +#: mod/contacts.php:453 mod/contacts.php:801 msgid "Do you really want to delete this contact?" msgstr "" -#: mod/contacts.php:445 mod/follow.php:105 mod/message.php:216 -#: mod/settings.php:1091 mod/settings.php:1097 mod/settings.php:1105 -#: mod/settings.php:1109 mod/settings.php:1114 mod/settings.php:1120 -#: mod/settings.php:1126 mod/settings.php:1132 mod/settings.php:1158 -#: mod/settings.php:1159 mod/settings.php:1160 mod/settings.php:1161 -#: mod/settings.php:1162 mod/dfrn_request.php:850 mod/register.php:238 +#: mod/contacts.php:455 mod/follow.php:105 mod/message.php:216 +#: mod/settings.php:1094 mod/settings.php:1100 mod/settings.php:1108 +#: mod/settings.php:1112 mod/settings.php:1117 mod/settings.php:1123 +#: mod/settings.php:1129 mod/settings.php:1135 mod/settings.php:1161 +#: mod/settings.php:1162 mod/settings.php:1163 mod/settings.php:1164 +#: mod/settings.php:1165 mod/dfrn_request.php:850 mod/register.php:238 #: mod/suggest.php:29 mod/profiles.php:658 mod/profiles.php:661 -#: mod/profiles.php:687 mod/api.php:105 include/items.php:4873 +#: mod/profiles.php:687 mod/api.php:105 include/items.php:4899 msgid "Yes" msgstr "" -#: mod/contacts.php:448 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:116 -#: mod/videos.php:123 mod/message.php:219 mod/fbrowser.php:93 -#: mod/fbrowser.php:128 mod/settings.php:649 mod/settings.php:675 -#: mod/dfrn_request.php:864 mod/suggest.php:32 mod/editpost.php:147 -#: mod/photos.php:239 mod/photos.php:328 include/conversation.php:1221 -#: include/items.php:4876 +#: mod/contacts.php:458 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:116 +#: mod/videos.php:131 mod/message.php:219 mod/fbrowser.php:93 +#: mod/fbrowser.php:128 mod/settings.php:651 mod/settings.php:677 +#: mod/dfrn_request.php:864 mod/suggest.php:32 mod/editpost.php:148 +#: mod/photos.php:247 mod/photos.php:336 include/conversation.php:1221 +#: include/items.php:4902 msgid "Cancel" msgstr "" -#: mod/contacts.php:460 +#: mod/contacts.php:470 msgid "Contact has been removed." msgstr "" -#: mod/contacts.php:498 +#: mod/contacts.php:511 #, php-format msgid "You are mutual friends with %s" msgstr "" -#: mod/contacts.php:502 +#: mod/contacts.php:515 #, php-format msgid "You are sharing with %s" msgstr "" -#: mod/contacts.php:507 +#: mod/contacts.php:520 #, php-format msgid "%s is sharing with you" msgstr "" -#: mod/contacts.php:527 +#: mod/contacts.php:540 msgid "Private communications are not available for this contact." msgstr "" -#: mod/contacts.php:530 mod/admin.php:645 +#: mod/contacts.php:543 mod/admin.php:647 msgid "Never" msgstr "" -#: mod/contacts.php:534 +#: mod/contacts.php:547 msgid "(Update was successful)" msgstr "" -#: mod/contacts.php:534 +#: mod/contacts.php:547 msgid "(Update was not successful)" msgstr "" -#: mod/contacts.php:536 +#: mod/contacts.php:549 msgid "Suggest friends" msgstr "" -#: mod/contacts.php:540 +#: mod/contacts.php:553 #, php-format msgid "Network type: %s" msgstr "" -#: mod/contacts.php:543 include/contact_widgets.php:237 -#, php-format -msgid "%d contact in common" -msgid_plural "%d contacts in common" -msgstr[0] "" -msgstr[1] "" - -#: mod/contacts.php:548 -msgid "View all contacts" -msgstr "" - -#: mod/contacts.php:553 mod/contacts.php:636 mod/contacts.php:821 -#: mod/admin.php:1117 -msgid "Unblock" -msgstr "" - -#: mod/contacts.php:553 mod/contacts.php:636 mod/contacts.php:821 -#: mod/admin.php:1116 -msgid "Block" -msgstr "" - -#: mod/contacts.php:556 -msgid "Toggle Blocked status" -msgstr "" - -#: mod/contacts.php:561 mod/contacts.php:637 mod/contacts.php:822 -msgid "Unignore" -msgstr "" - -#: mod/contacts.php:561 mod/contacts.php:637 mod/contacts.php:822 -#: mod/notifications.php:54 mod/notifications.php:179 mod/notifications.php:259 -msgid "Ignore" -msgstr "" - -#: mod/contacts.php:564 -msgid "Toggle Ignored status" -msgstr "" - -#: mod/contacts.php:570 mod/contacts.php:823 -msgid "Unarchive" -msgstr "" - -#: mod/contacts.php:570 mod/contacts.php:823 -msgid "Archive" -msgstr "" - -#: mod/contacts.php:573 -msgid "Toggle Archive status" -msgstr "" - -#: mod/contacts.php:578 -msgid "Repair" -msgstr "" - -#: mod/contacts.php:581 -msgid "Advanced Contact Settings" -msgstr "" - -#: mod/contacts.php:589 +#: mod/contacts.php:566 msgid "Communications lost with this contact!" msgstr "" -#: mod/contacts.php:592 +#: mod/contacts.php:569 msgid "Fetch further information for feeds" msgstr "" -#: mod/contacts.php:593 mod/admin.php:654 +#: mod/contacts.php:570 mod/admin.php:656 msgid "Disabled" msgstr "" -#: mod/contacts.php:593 +#: mod/contacts.php:570 msgid "Fetch information" msgstr "" -#: mod/contacts.php:593 +#: mod/contacts.php:570 msgid "Fetch information and keywords" msgstr "" -#: mod/contacts.php:606 -msgid "Contact Editor" -msgstr "" - -#: mod/contacts.php:608 mod/manage.php:143 mod/fsuggest.php:107 -#: mod/message.php:342 mod/message.php:525 mod/crepair.php:195 +#: mod/contacts.php:586 mod/manage.php:143 mod/fsuggest.php:107 +#: mod/message.php:342 mod/message.php:525 mod/crepair.php:196 #: mod/events.php:574 mod/content.php:712 mod/install.php:261 #: mod/install.php:299 mod/mood.php:137 mod/profiles.php:696 -#: mod/localtime.php:45 mod/poke.php:198 mod/invite.php:140 mod/photos.php:1129 -#: mod/photos.php:1253 mod/photos.php:1571 mod/photos.php:1622 -#: mod/photos.php:1670 mod/photos.php:1758 object/Item.php:710 -#: view/theme/cleanzero/config.php:80 view/theme/dispy/config.php:70 -#: view/theme/quattro/config.php:64 view/theme/diabook/config.php:148 -#: view/theme/diabook/theme.php:633 view/theme/clean/config.php:83 -#: view/theme/vier/config.php:107 view/theme/duepuntozero/config.php:59 +#: mod/localtime.php:45 mod/poke.php:198 mod/invite.php:140 mod/photos.php:1137 +#: mod/photos.php:1261 mod/photos.php:1579 mod/photos.php:1630 +#: mod/photos.php:1678 mod/photos.php:1766 object/Item.php:710 +#: addons-extra/etherpadlite/etherpadlite.php:63 +#: addons-extra/fbgroup/fbgroup.php:278 +#: addons-extra/maya_locations/maya_locations.php:159 +#: addons-extra/lasttweets/lasttweets.php:102 +#: addons-extra/cthulhu_mythos_locations/cthulhu_mythos_locations.php:158 +#: addons-extra/donate/donate.php:60 view/theme/cleanzero/config.php:80 +#: view/theme/dispy/config.php:70 view/theme/quattro/config.php:64 +#: view/theme/diabook/config.php:148 view/theme/diabook/theme.php:633 +#: view/theme/clean/config.php:83 view/theme/vier/config.php:107 +#: view/theme/duepuntozero/config.php:59 msgid "Submit" msgstr "" -#: mod/contacts.php:609 +#: mod/contacts.php:587 msgid "Profile Visibility" msgstr "" -#: mod/contacts.php:610 +#: mod/contacts.php:588 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: mod/contacts.php:611 +#: mod/contacts.php:589 msgid "Contact Information / Notes" msgstr "" -#: mod/contacts.php:612 +#: mod/contacts.php:590 msgid "Edit contact notes" msgstr "" -#: mod/contacts.php:617 mod/contacts.php:861 mod/viewcontacts.php:77 +#: mod/contacts.php:595 mod/contacts.php:977 mod/viewcontacts.php:97 #: mod/nogroup.php:41 #, php-format msgid "Visit %s's profile [%s]" msgstr "" -#: mod/contacts.php:618 +#: mod/contacts.php:596 msgid "Block/Unblock contact" msgstr "" -#: mod/contacts.php:619 +#: mod/contacts.php:597 msgid "Ignore contact" msgstr "" -#: mod/contacts.php:620 +#: mod/contacts.php:598 msgid "Repair URL settings" msgstr "" -#: mod/contacts.php:621 +#: mod/contacts.php:599 msgid "View conversations" msgstr "" -#: mod/contacts.php:623 +#: mod/contacts.php:601 msgid "Delete contact" msgstr "" -#: mod/contacts.php:627 +#: mod/contacts.php:605 msgid "Last update:" msgstr "" -#: mod/contacts.php:629 +#: mod/contacts.php:607 msgid "Update public posts" msgstr "" -#: mod/contacts.php:631 mod/admin.php:1653 +#: mod/contacts.php:609 mod/admin.php:1656 msgid "Update now" msgstr "" -#: mod/contacts.php:633 mod/dirfind.php:190 mod/allfriends.php:67 +#: mod/contacts.php:611 mod/dirfind.php:190 mod/allfriends.php:60 #: mod/match.php:71 mod/suggest.php:82 include/contact_widgets.php:32 #: include/Contact.php:321 include/conversation.php:924 msgid "Connect/Follow" msgstr "" -#: mod/contacts.php:640 +#: mod/contacts.php:614 mod/contacts.php:805 mod/contacts.php:864 +#: mod/admin.php:1120 +msgid "Unblock" +msgstr "" + +#: mod/contacts.php:614 mod/contacts.php:805 mod/contacts.php:864 +#: mod/admin.php:1119 +msgid "Block" +msgstr "" + +#: mod/contacts.php:615 mod/contacts.php:806 mod/contacts.php:871 +msgid "Unignore" +msgstr "" + +#: mod/contacts.php:615 mod/contacts.php:806 mod/contacts.php:871 +#: mod/notifications.php:54 mod/notifications.php:179 mod/notifications.php:259 +msgid "Ignore" +msgstr "" + +#: mod/contacts.php:618 msgid "Currently blocked" msgstr "" -#: mod/contacts.php:641 +#: mod/contacts.php:619 msgid "Currently ignored" msgstr "" -#: mod/contacts.php:642 +#: mod/contacts.php:620 msgid "Currently archived" msgstr "" -#: mod/contacts.php:643 mod/notifications.php:172 mod/notifications.php:251 +#: mod/contacts.php:621 mod/notifications.php:172 mod/notifications.php:251 msgid "Hide this contact from others" msgstr "" -#: mod/contacts.php:643 +#: mod/contacts.php:621 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: mod/contacts.php:644 +#: mod/contacts.php:622 msgid "Notification for new posts" msgstr "" -#: mod/contacts.php:644 +#: mod/contacts.php:622 msgid "Send a notification of every new post of this contact" msgstr "" -#: mod/contacts.php:647 +#: mod/contacts.php:625 msgid "Blacklisted keywords" msgstr "" -#: mod/contacts.php:647 +#: mod/contacts.php:625 msgid "" "Comma separated list of keywords that should not be converted to hashtags, " "when \"Fetch information and keywords\" is selected" msgstr "" -#: mod/contacts.php:654 mod/follow.php:121 mod/notifications.php:255 +#: mod/contacts.php:632 mod/follow.php:121 mod/notifications.php:255 msgid "Profile URL" msgstr "" -#: mod/contacts.php:700 +#: mod/contacts.php:635 mod/follow.php:125 mod/notifications.php:244 +#: mod/events.php:566 mod/directory.php:145 include/identity.php:304 +#: include/bb2diaspora.php:170 include/event.php:36 include/event.php:60 +msgid "Location:" +msgstr "" + +#: mod/contacts.php:637 mod/follow.php:127 mod/notifications.php:246 +#: mod/directory.php:153 include/identity.php:313 include/identity.php:621 +msgid "About:" +msgstr "" + +#: mod/contacts.php:639 mod/follow.php:129 mod/notifications.php:248 +#: include/identity.php:615 +msgid "Tags:" +msgstr "" + +#: mod/contacts.php:684 msgid "Suggestions" msgstr "" -#: mod/contacts.php:703 +#: mod/contacts.php:687 msgid "Suggest potential friends" msgstr "" -#: mod/contacts.php:708 mod/group.php:192 +#: mod/contacts.php:692 mod/group.php:192 msgid "All Contacts" msgstr "" -#: mod/contacts.php:711 +#: mod/contacts.php:695 msgid "Show all contacts" msgstr "" -#: mod/contacts.php:716 +#: mod/contacts.php:700 msgid "Unblocked" msgstr "" -#: mod/contacts.php:719 +#: mod/contacts.php:703 msgid "Only show unblocked contacts" msgstr "" -#: mod/contacts.php:725 +#: mod/contacts.php:709 msgid "Blocked" msgstr "" -#: mod/contacts.php:728 +#: mod/contacts.php:712 msgid "Only show blocked contacts" msgstr "" -#: mod/contacts.php:734 +#: mod/contacts.php:718 msgid "Ignored" msgstr "" -#: mod/contacts.php:737 +#: mod/contacts.php:721 msgid "Only show ignored contacts" msgstr "" -#: mod/contacts.php:743 +#: mod/contacts.php:727 msgid "Archived" msgstr "" -#: mod/contacts.php:746 +#: mod/contacts.php:730 msgid "Only show archived contacts" msgstr "" -#: mod/contacts.php:752 +#: mod/contacts.php:736 msgid "Hidden" msgstr "" -#: mod/contacts.php:755 +#: mod/contacts.php:739 msgid "Only show hidden contacts" msgstr "" -#: mod/contacts.php:808 include/text.php:1012 include/nav.php:123 -#: include/nav.php:187 view/theme/diabook/theme.php:125 +#: mod/contacts.php:792 mod/contacts.php:840 mod/viewcontacts.php:116 +#: include/identity.php:732 include/identity.php:735 include/text.php:1012 +#: include/nav.php:123 include/nav.php:187 view/theme/diabook/theme.php:125 msgid "Contacts" msgstr "" -#: mod/contacts.php:812 +#: mod/contacts.php:796 msgid "Search your contacts" msgstr "" -#: mod/contacts.php:813 +#: mod/contacts.php:797 msgid "Finding: " msgstr "" -#: mod/contacts.php:814 mod/directory.php:202 include/contact_widgets.php:34 +#: mod/contacts.php:798 mod/directory.php:210 include/contact_widgets.php:34 msgid "Find" msgstr "" -#: mod/contacts.php:820 mod/settings.php:146 mod/settings.php:674 +#: mod/contacts.php:804 mod/settings.php:146 mod/settings.php:676 msgid "Update" msgstr "" -#: mod/contacts.php:824 mod/group.php:171 mod/admin.php:1115 -#: mod/content.php:440 mod/content.php:743 mod/settings.php:711 -#: mod/photos.php:1715 object/Item.php:134 include/conversation.php:635 +#: mod/contacts.php:807 mod/contacts.php:878 +msgid "Archive" +msgstr "" + +#: mod/contacts.php:807 mod/contacts.php:878 +msgid "Unarchive" +msgstr "" + +#: mod/contacts.php:808 mod/group.php:171 mod/admin.php:1118 +#: mod/content.php:440 mod/content.php:743 mod/settings.php:713 +#: mod/photos.php:1723 object/Item.php:134 include/conversation.php:635 msgid "Delete" msgstr "" -#: mod/contacts.php:837 +#: mod/contacts.php:821 include/identity.php:677 include/nav.php:75 +msgid "Status" +msgstr "" + +#: mod/contacts.php:824 include/identity.php:680 +msgid "Status Messages and Posts" +msgstr "" + +#: mod/contacts.php:829 mod/profperm.php:104 mod/newmember.php:32 +#: include/identity.php:569 include/identity.php:655 include/identity.php:685 +#: include/nav.php:76 view/theme/diabook/theme.php:124 +msgid "Profile" +msgstr "" + +#: mod/contacts.php:832 include/identity.php:688 +msgid "Profile Details" +msgstr "" + +#: mod/contacts.php:843 +msgid "View all contacts" +msgstr "" + +#: mod/contacts.php:849 mod/common.php:135 +msgid "Common Friends" +msgstr "" + +#: mod/contacts.php:852 +msgid "View all common friends" +msgstr "" + +#: mod/contacts.php:856 +msgid "Repair" +msgstr "" + +#: mod/contacts.php:859 +msgid "Advanced Contact Settings" +msgstr "" + +#: mod/contacts.php:867 +msgid "Toggle Blocked status" +msgstr "" + +#: mod/contacts.php:874 +msgid "Toggle Ignored status" +msgstr "" + +#: mod/contacts.php:881 +msgid "Toggle Archive status" +msgstr "" + +#: mod/contacts.php:949 msgid "Mutual Friendship" msgstr "" -#: mod/contacts.php:841 +#: mod/contacts.php:953 msgid "is a fan of yours" msgstr "" -#: mod/contacts.php:845 +#: mod/contacts.php:957 msgid "you are a fan of" msgstr "" -#: mod/contacts.php:862 mod/nogroup.php:42 +#: mod/contacts.php:978 mod/nogroup.php:42 msgid "Edit contact" msgstr "" @@ -489,13 +540,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: mod/profperm.php:104 mod/newmember.php:32 include/identity.php:542 -#: include/identity.php:628 include/identity.php:658 include/nav.php:76 -#: view/theme/diabook/theme.php:124 -msgid "Profile" -msgstr "" - -#: mod/profperm.php:106 mod/group.php:222 +#: mod/profperm.php:106 mod/group.php:223 msgid "Click on a contact to add or remove." msgstr "" @@ -508,14 +553,14 @@ msgid "All Contacts (with secure profile access)" msgstr "" #: mod/display.php:82 mod/display.php:283 mod/display.php:500 -#: mod/viewsrc.php:15 mod/admin.php:196 mod/admin.php:1160 mod/admin.php:1381 -#: mod/notice.php:15 include/items.php:4832 +#: mod/viewsrc.php:15 mod/admin.php:196 mod/admin.php:1163 mod/admin.php:1384 +#: mod/notice.php:15 include/items.php:4858 msgid "Item not found." msgstr "" -#: mod/display.php:211 mod/videos.php:189 mod/viewcontacts.php:19 +#: mod/display.php:211 mod/videos.php:197 mod/viewcontacts.php:35 #: mod/community.php:18 mod/dfrn_request.php:779 mod/search.php:93 -#: mod/search.php:99 mod/directory.php:37 mod/photos.php:968 +#: mod/search.php:99 mod/directory.php:37 mod/photos.php:976 msgid "Public access denied." msgstr "" @@ -558,7 +603,7 @@ msgid "" "join." msgstr "" -#: mod/newmember.php:22 mod/admin.php:1212 mod/admin.php:1457 +#: mod/newmember.php:22 mod/admin.php:1215 mod/admin.php:1460 #: mod/settings.php:99 include/nav.php:182 view/theme/diabook/theme.php:544 #: view/theme/diabook/theme.php:648 msgid "Settings" @@ -682,7 +727,7 @@ msgid "" "hours." msgstr "" -#: mod/newmember.php:66 include/group.php:283 +#: mod/newmember.php:66 include/group.php:283 addons-extra/groups/groups.php:19 msgid "Groups" msgstr "" @@ -741,9 +786,9 @@ msgstr "" #: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88 #: mod/profile_photo.php:210 mod/profile_photo.php:302 -#: mod/profile_photo.php:311 mod/photos.php:70 mod/photos.php:184 -#: mod/photos.php:767 mod/photos.php:1237 mod/photos.php:1260 -#: mod/photos.php:1854 include/user.php:345 include/user.php:352 +#: mod/profile_photo.php:311 mod/photos.php:78 mod/photos.php:192 +#: mod/photos.php:775 mod/photos.php:1245 mod/photos.php:1268 +#: mod/photos.php:1862 include/user.php:345 include/user.php:352 #: include/user.php:359 view/theme/diabook/theme.php:500 msgid "Profile Photos" msgstr "" @@ -764,12 +809,12 @@ msgstr "" msgid "Unable to process image" msgstr "" -#: mod/profile_photo.php:150 mod/wall_upload.php:151 mod/photos.php:803 +#: mod/profile_photo.php:150 mod/wall_upload.php:151 mod/photos.php:811 #, php-format msgid "Image exceeds size limit of %s" msgstr "" -#: mod/profile_photo.php:159 mod/wall_upload.php:183 mod/photos.php:843 +#: mod/profile_photo.php:159 mod/wall_upload.php:183 mod/photos.php:851 msgid "Unable to process image." msgstr "" @@ -813,13 +858,13 @@ msgstr "" msgid "Image uploaded successfully." msgstr "" -#: mod/profile_photo.php:307 mod/wall_upload.php:216 mod/photos.php:870 +#: mod/profile_photo.php:307 mod/wall_upload.php:216 mod/photos.php:878 msgid "Image upload failed." msgstr "" #: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:168 #: include/conversation.php:130 include/conversation.php:266 -#: include/text.php:1995 include/diaspora.php:2140 +#: include/text.php:1993 include/diaspora.php:2146 #: view/theme/diabook/theme.php:471 msgid "photo" msgstr "" @@ -827,8 +872,8 @@ msgstr "" #: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:168 mod/like.php:346 #: include/conversation.php:125 include/conversation.php:134 #: include/conversation.php:261 include/conversation.php:270 -#: include/diaspora.php:2140 view/theme/diabook/theme.php:466 -#: view/theme/diabook/theme.php:475 +#: include/diaspora.php:2146 addons-extra/fbgroup/fbgroup.php:1441 +#: view/theme/diabook/theme.php:466 view/theme/diabook/theme.php:475 msgid "status" msgstr "" @@ -897,7 +942,8 @@ msgstr "" msgid "- select -" msgstr "" -#: mod/filer.php:31 mod/editpost.php:108 mod/notes.php:61 include/text.php:1004 +#: mod/filer.php:31 mod/editpost.php:109 mod/notes.php:61 include/text.php:1004 +#: addons-extra/fbgroup/fbgroup.php:320 msgid "Save" msgstr "" @@ -930,11 +976,11 @@ msgstr "" msgid "Does %s know you?" msgstr "" -#: mod/follow.php:105 mod/settings.php:1091 mod/settings.php:1097 -#: mod/settings.php:1105 mod/settings.php:1109 mod/settings.php:1114 -#: mod/settings.php:1120 mod/settings.php:1126 mod/settings.php:1132 -#: mod/settings.php:1158 mod/settings.php:1159 mod/settings.php:1160 -#: mod/settings.php:1161 mod/settings.php:1162 mod/dfrn_request.php:850 +#: mod/follow.php:105 mod/settings.php:1094 mod/settings.php:1100 +#: mod/settings.php:1108 mod/settings.php:1112 mod/settings.php:1117 +#: mod/settings.php:1123 mod/settings.php:1129 mod/settings.php:1135 +#: mod/settings.php:1161 mod/settings.php:1162 mod/settings.php:1163 +#: mod/settings.php:1164 mod/settings.php:1165 mod/dfrn_request.php:850 #: mod/register.php:239 mod/profiles.php:658 mod/profiles.php:662 #: mod/profiles.php:687 mod/api.php:106 msgid "No" @@ -948,21 +994,6 @@ msgstr "" msgid "Your Identity Address:" msgstr "" -#: mod/follow.php:125 mod/notifications.php:244 mod/events.php:566 -#: mod/directory.php:139 include/identity.php:278 include/bb2diaspora.php:170 -#: include/event.php:36 include/event.php:60 -msgid "Location:" -msgstr "" - -#: mod/follow.php:127 mod/notifications.php:246 mod/directory.php:147 -#: include/identity.php:287 include/identity.php:594 -msgid "About:" -msgstr "" - -#: mod/follow.php:129 mod/notifications.php:248 include/identity.php:588 -msgid "Tags:" -msgstr "" - #: mod/follow.php:162 msgid "Contact added" msgstr "" @@ -1051,6 +1082,10 @@ msgstr "" msgid "Members" msgstr "" +#: mod/group.php:193 mod/network.php:563 mod/content.php:130 +msgid "Group is empty" +msgstr "" + #: mod/apps.php:7 index.php:225 msgid "You must be logged in to use addons. " msgstr "" @@ -1069,7 +1104,7 @@ msgid "Profile not found." msgstr "" #: mod/dfrn_confirm.php:120 mod/fsuggest.php:20 mod/fsuggest.php:92 -#: mod/crepair.php:134 +#: mod/crepair.php:131 msgid "Contact not found." msgstr "" @@ -1149,7 +1184,7 @@ msgstr "" msgid "Unable to update your contact profile details on our system" msgstr "" -#: mod/dfrn_confirm.php:753 mod/dfrn_request.php:734 include/items.php:4244 +#: mod/dfrn_confirm.php:753 mod/dfrn_request.php:734 include/items.php:4270 msgid "[Name Withheld]" msgstr "" @@ -1158,7 +1193,7 @@ msgstr "" msgid "%1$s has joined %2$s" msgstr "" -#: mod/profile.php:21 include/identity.php:82 +#: mod/profile.php:21 include/identity.php:52 msgid "Requested profile is not available." msgstr "" @@ -1166,35 +1201,35 @@ msgstr "" msgid "Tips for New Members" msgstr "" -#: mod/videos.php:115 +#: mod/videos.php:123 msgid "Do you really want to delete this video?" msgstr "" -#: mod/videos.php:120 +#: mod/videos.php:128 msgid "Delete Video" msgstr "" -#: mod/videos.php:199 +#: mod/videos.php:207 msgid "No videos selected" msgstr "" -#: mod/videos.php:300 mod/photos.php:1079 +#: mod/videos.php:308 mod/photos.php:1087 msgid "Access to this item is restricted." msgstr "" -#: mod/videos.php:375 include/text.php:1465 +#: mod/videos.php:383 include/text.php:1465 msgid "View Video" msgstr "" -#: mod/videos.php:382 mod/photos.php:1882 +#: mod/videos.php:390 mod/photos.php:1890 msgid "View Album" msgstr "" -#: mod/videos.php:391 +#: mod/videos.php:399 msgid "Recent Videos" msgstr "" -#: mod/videos.php:393 +#: mod/videos.php:401 msgid "Upload New Videos" msgstr "" @@ -1276,7 +1311,7 @@ msgid "" "Password reset failed." msgstr "" -#: mod/lostpass.php:109 boot.php:1295 +#: mod/lostpass.php:109 boot.php:1310 msgid "Password Reset" msgstr "" @@ -1353,11 +1388,11 @@ msgid "Reset" msgstr "" #: mod/like.php:170 include/conversation.php:122 include/conversation.php:258 -#: include/text.php:1993 view/theme/diabook/theme.php:463 +#: include/text.php:1991 view/theme/diabook/theme.php:463 msgid "event" msgstr "" -#: mod/like.php:187 include/conversation.php:141 include/diaspora.php:2156 +#: mod/like.php:187 include/conversation.php:141 include/diaspora.php:2162 #: view/theme/diabook/theme.php:480 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -1383,31 +1418,22 @@ msgstr "" msgid "%1$s may attend %2$s's %3$s" msgstr "" -#: mod/ping.php:273 +#: mod/ping.php:265 msgid "{0} wants to be your friend" msgstr "" -#: mod/ping.php:288 +#: mod/ping.php:280 msgid "{0} sent you a message" msgstr "" -#: mod/ping.php:303 +#: mod/ping.php:295 msgid "{0} requested registration" msgstr "" -#: mod/viewcontacts.php:52 +#: mod/viewcontacts.php:72 msgid "No contacts." msgstr "" -#: mod/viewcontacts.php:85 mod/dirfind.php:208 mod/network.php:596 -#: mod/allfriends.php:79 mod/match.php:82 mod/common.php:122 mod/suggest.php:95 -msgid "Forum" -msgstr "" - -#: mod/viewcontacts.php:96 include/text.php:921 -msgid "View Contacts" -msgstr "" - #: mod/notifications.php:29 msgid "Invalid request identifier." msgstr "" @@ -1466,7 +1492,7 @@ msgstr "" msgid "if applicable" msgstr "" -#: mod/notifications.php:176 mod/notifications.php:257 mod/admin.php:1113 +#: mod/notifications.php:176 mod/notifications.php:257 mod/admin.php:1116 msgid "Approve" msgstr "" @@ -1516,8 +1542,8 @@ msgstr "" msgid "New Follower" msgstr "" -#: mod/notifications.php:250 mod/directory.php:141 include/identity.php:280 -#: include/identity.php:553 +#: mod/notifications.php:250 mod/directory.php:147 include/identity.php:306 +#: include/identity.php:580 msgid "Gender:" msgstr "" @@ -1710,18 +1736,18 @@ msgid "Your message:" msgstr "" #: mod/message.php:339 mod/message.php:523 mod/wallmessage.php:154 -#: mod/editpost.php:109 include/conversation.php:1184 +#: mod/editpost.php:110 include/conversation.php:1184 msgid "Upload photo" msgstr "" #: mod/message.php:340 mod/message.php:524 mod/wallmessage.php:155 -#: mod/editpost.php:113 include/conversation.php:1188 +#: mod/editpost.php:114 include/conversation.php:1188 msgid "Insert web link" msgstr "" #: mod/message.php:341 mod/message.php:526 mod/content.php:501 -#: mod/content.php:885 mod/wallmessage.php:156 mod/editpost.php:123 -#: mod/photos.php:1602 object/Item.php:396 include/conversation.php:713 +#: mod/content.php:885 mod/wallmessage.php:156 mod/editpost.php:124 +#: mod/photos.php:1610 object/Item.php:396 include/conversation.php:713 #: include/conversation.php:1202 msgid "Please wait" msgstr "" @@ -1783,102 +1809,98 @@ msgstr[1] "" msgid "[Embedded content - reload page to view]" msgstr "" -#: mod/crepair.php:107 +#: mod/crepair.php:104 msgid "Contact settings applied." msgstr "" -#: mod/crepair.php:109 +#: mod/crepair.php:106 msgid "Contact update failed." msgstr "" -#: mod/crepair.php:140 +#: mod/crepair.php:137 msgid "" "WARNING: This is highly advanced and if you enter incorrect " "information your communications with this contact may stop working." msgstr "" -#: mod/crepair.php:141 +#: mod/crepair.php:138 msgid "" "Please use your browser 'Back' button now if you are " "uncertain what to do on this page." msgstr "" -#: mod/crepair.php:154 mod/crepair.php:156 +#: mod/crepair.php:151 mod/crepair.php:153 msgid "No mirroring" msgstr "" -#: mod/crepair.php:154 +#: mod/crepair.php:151 msgid "Mirror as forwarded posting" msgstr "" -#: mod/crepair.php:154 mod/crepair.php:156 +#: mod/crepair.php:151 mod/crepair.php:153 msgid "Mirror as my own posting" msgstr "" -#: mod/crepair.php:162 -msgid "Repair Contact Settings" -msgstr "" - -#: mod/crepair.php:166 +#: mod/crepair.php:167 msgid "Return to contact editor" msgstr "" -#: mod/crepair.php:168 +#: mod/crepair.php:169 msgid "Refetch contact data" msgstr "" -#: mod/crepair.php:169 mod/admin.php:1111 mod/admin.php:1123 mod/admin.php:1124 -#: mod/admin.php:1137 mod/settings.php:650 mod/settings.php:676 +#: mod/crepair.php:170 mod/admin.php:1114 mod/admin.php:1126 mod/admin.php:1127 +#: mod/admin.php:1140 mod/settings.php:652 mod/settings.php:678 msgid "Name" msgstr "" -#: mod/crepair.php:170 +#: mod/crepair.php:171 msgid "Account Nickname" msgstr "" -#: mod/crepair.php:171 +#: mod/crepair.php:172 msgid "@Tagname - overrides Name/Nickname" msgstr "" -#: mod/crepair.php:172 +#: mod/crepair.php:173 msgid "Account URL" msgstr "" -#: mod/crepair.php:173 +#: mod/crepair.php:174 msgid "Friend Request URL" msgstr "" -#: mod/crepair.php:174 +#: mod/crepair.php:175 msgid "Friend Confirm URL" msgstr "" -#: mod/crepair.php:175 +#: mod/crepair.php:176 msgid "Notification Endpoint URL" msgstr "" -#: mod/crepair.php:176 +#: mod/crepair.php:177 msgid "Poll/Feed URL" msgstr "" -#: mod/crepair.php:177 +#: mod/crepair.php:178 msgid "New photo from this URL" msgstr "" -#: mod/crepair.php:178 +#: mod/crepair.php:179 msgid "Remote Self" msgstr "" -#: mod/crepair.php:181 +#: mod/crepair.php:182 msgid "Mirror postings from this contact" msgstr "" -#: mod/crepair.php:183 +#: mod/crepair.php:184 msgid "" "Mark this contact as remote_self, this will cause friendica to repost new " "entries from this contact." msgstr "" -#: mod/bookmarklet.php:12 boot.php:1281 include/nav.php:91 +#: mod/bookmarklet.php:12 boot.php:1296 include/nav.php:91 msgid "Login" msgstr "" @@ -1890,13 +1912,13 @@ msgstr "" msgid "Access denied." msgstr "" -#: mod/dirfind.php:188 mod/allfriends.php:82 mod/match.php:85 -#: mod/suggest.php:98 include/contact_widgets.php:10 include/identity.php:193 +#: mod/dirfind.php:188 mod/allfriends.php:75 mod/match.php:85 +#: mod/suggest.php:98 include/contact_widgets.php:10 include/identity.php:209 msgid "Connect" msgstr "" -#: mod/dirfind.php:189 mod/allfriends.php:66 mod/match.php:70 -#: mod/directory.php:156 mod/suggest.php:81 include/Contact.php:307 +#: mod/dirfind.php:189 mod/allfriends.php:59 mod/match.php:70 +#: mod/directory.php:162 mod/suggest.php:81 include/Contact.php:307 #: include/Contact.php:320 include/Contact.php:362 include/conversation.php:912 #: include/conversation.php:926 msgid "View Profile" @@ -1911,14 +1933,14 @@ msgstr "" msgid "No matches" msgstr "" -#: mod/fbrowser.php:32 include/identity.php:666 include/nav.php:77 +#: mod/fbrowser.php:32 include/identity.php:693 include/nav.php:77 #: view/theme/diabook/theme.php:126 msgid "Photos" msgstr "" -#: mod/fbrowser.php:41 mod/fbrowser.php:62 mod/photos.php:54 mod/photos.php:184 -#: mod/photos.php:1111 mod/photos.php:1237 mod/photos.php:1260 -#: mod/photos.php:1830 mod/photos.php:1842 view/theme/diabook/theme.php:499 +#: mod/fbrowser.php:41 mod/fbrowser.php:62 mod/photos.php:62 mod/photos.php:192 +#: mod/photos.php:1119 mod/photos.php:1245 mod/photos.php:1268 +#: mod/photos.php:1838 mod/photos.php:1850 view/theme/diabook/theme.php:499 msgid "Contact Photos" msgstr "" @@ -1934,19 +1956,19 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: mod/admin.php:127 mod/admin.php:711 +#: mod/admin.php:127 mod/admin.php:713 msgid "Site" msgstr "" -#: mod/admin.php:128 mod/admin.php:655 mod/admin.php:1106 mod/admin.php:1121 +#: mod/admin.php:128 mod/admin.php:657 mod/admin.php:1109 mod/admin.php:1124 msgid "Users" msgstr "" -#: mod/admin.php:129 mod/admin.php:1210 mod/admin.php:1270 mod/settings.php:66 +#: mod/admin.php:129 mod/admin.php:1213 mod/admin.php:1273 mod/settings.php:66 msgid "Plugins" msgstr "" -#: mod/admin.php:130 mod/admin.php:1455 mod/admin.php:1506 +#: mod/admin.php:130 mod/admin.php:1458 mod/admin.php:1509 msgid "Themes" msgstr "" @@ -1958,7 +1980,7 @@ msgstr "" msgid "Inspect Queue" msgstr "" -#: mod/admin.php:147 mod/admin.php:156 mod/admin.php:1594 +#: mod/admin.php:147 mod/admin.php:156 mod/admin.php:1597 msgid "Logs" msgstr "" @@ -1986,9 +2008,9 @@ msgstr "" msgid "User registrations waiting for confirmation" msgstr "" -#: mod/admin.php:222 mod/admin.php:272 mod/admin.php:710 mod/admin.php:1105 -#: mod/admin.php:1209 mod/admin.php:1269 mod/admin.php:1454 mod/admin.php:1505 -#: mod/admin.php:1593 +#: mod/admin.php:222 mod/admin.php:272 mod/admin.php:712 mod/admin.php:1108 +#: mod/admin.php:1212 mod/admin.php:1272 mod/admin.php:1457 mod/admin.php:1508 +#: mod/admin.php:1596 msgid "Administration" msgstr "" @@ -2019,19 +2041,19 @@ msgid "" "eventually deleted if the delivery fails permanently." msgstr "" -#: mod/admin.php:243 mod/admin.php:1059 +#: mod/admin.php:243 mod/admin.php:1062 msgid "Normal Account" msgstr "" -#: mod/admin.php:244 mod/admin.php:1060 +#: mod/admin.php:244 mod/admin.php:1063 msgid "Soapbox Account" msgstr "" -#: mod/admin.php:245 mod/admin.php:1061 +#: mod/admin.php:245 mod/admin.php:1064 msgid "Community/Celebrity Account" msgstr "" -#: mod/admin.php:246 mod/admin.php:1062 +#: mod/admin.php:246 mod/admin.php:1065 msgid "Automatic Friend Account" msgstr "" @@ -2071,625 +2093,635 @@ msgstr "" msgid "Can not parse base url. Must have at least ://" msgstr "" -#: mod/admin.php:587 +#: mod/admin.php:589 msgid "RINO2 needs mcrypt php extension to work." msgstr "" -#: mod/admin.php:595 +#: mod/admin.php:597 msgid "Site settings updated." msgstr "" -#: mod/admin.php:619 mod/settings.php:901 +#: mod/admin.php:621 mod/settings.php:903 msgid "No special theme for mobile devices" msgstr "" -#: mod/admin.php:638 +#: mod/admin.php:640 msgid "No community page" msgstr "" -#: mod/admin.php:639 +#: mod/admin.php:641 msgid "Public postings from users of this site" msgstr "" -#: mod/admin.php:640 +#: mod/admin.php:642 msgid "Global community page" msgstr "" -#: mod/admin.php:646 +#: mod/admin.php:648 msgid "At post arrival" msgstr "" -#: mod/admin.php:647 include/contact_selectors.php:56 +#: mod/admin.php:649 include/contact_selectors.php:56 msgid "Frequently" msgstr "" -#: mod/admin.php:648 include/contact_selectors.php:57 +#: mod/admin.php:650 include/contact_selectors.php:57 msgid "Hourly" msgstr "" -#: mod/admin.php:649 include/contact_selectors.php:58 +#: mod/admin.php:651 include/contact_selectors.php:58 msgid "Twice daily" msgstr "" -#: mod/admin.php:650 include/contact_selectors.php:59 +#: mod/admin.php:652 include/contact_selectors.php:59 msgid "Daily" msgstr "" -#: mod/admin.php:656 +#: mod/admin.php:658 msgid "Users, Global Contacts" msgstr "" -#: mod/admin.php:657 +#: mod/admin.php:659 msgid "Users, Global Contacts/fallback" msgstr "" -#: mod/admin.php:661 +#: mod/admin.php:663 msgid "One month" msgstr "" -#: mod/admin.php:662 +#: mod/admin.php:664 msgid "Three months" msgstr "" -#: mod/admin.php:663 +#: mod/admin.php:665 msgid "Half a year" msgstr "" -#: mod/admin.php:664 +#: mod/admin.php:666 msgid "One year" msgstr "" -#: mod/admin.php:669 +#: mod/admin.php:671 msgid "Multi user instance" msgstr "" -#: mod/admin.php:692 +#: mod/admin.php:694 msgid "Closed" msgstr "" -#: mod/admin.php:693 +#: mod/admin.php:695 msgid "Requires approval" msgstr "" -#: mod/admin.php:694 +#: mod/admin.php:696 msgid "Open" msgstr "" -#: mod/admin.php:698 +#: mod/admin.php:700 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: mod/admin.php:699 +#: mod/admin.php:701 msgid "Force all links to use SSL" msgstr "" -#: mod/admin.php:700 +#: mod/admin.php:702 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: mod/admin.php:712 mod/admin.php:1271 mod/admin.php:1507 mod/admin.php:1595 -#: mod/settings.php:648 mod/settings.php:758 mod/settings.php:802 -#: mod/settings.php:871 mod/settings.php:957 mod/settings.php:1192 +#: mod/admin.php:714 mod/admin.php:1274 mod/admin.php:1510 mod/admin.php:1598 +#: mod/settings.php:650 mod/settings.php:760 mod/settings.php:804 +#: mod/settings.php:873 mod/settings.php:960 mod/settings.php:1195 msgid "Save Settings" msgstr "" -#: mod/admin.php:713 mod/register.php:263 +#: mod/admin.php:715 mod/register.php:263 msgid "Registration" msgstr "" -#: mod/admin.php:714 +#: mod/admin.php:716 msgid "File upload" msgstr "" -#: mod/admin.php:715 +#: mod/admin.php:717 msgid "Policies" msgstr "" -#: mod/admin.php:716 +#: mod/admin.php:718 msgid "Advanced" msgstr "" -#: mod/admin.php:717 +#: mod/admin.php:719 msgid "Auto Discovered Contact Directory" msgstr "" -#: mod/admin.php:718 +#: mod/admin.php:720 msgid "Performance" msgstr "" -#: mod/admin.php:719 +#: mod/admin.php:721 msgid "" "Relocate - WARNING: advanced function. Could make this server unreachable." msgstr "" -#: mod/admin.php:722 +#: mod/admin.php:724 msgid "Site name" msgstr "" -#: mod/admin.php:723 +#: mod/admin.php:725 msgid "Host name" msgstr "" -#: mod/admin.php:724 +#: mod/admin.php:726 msgid "Sender Email" msgstr "" -#: mod/admin.php:724 +#: mod/admin.php:726 msgid "" "The email address your server shall use to send notification emails from." msgstr "" -#: mod/admin.php:725 +#: mod/admin.php:727 msgid "Banner/Logo" msgstr "" -#: mod/admin.php:726 +#: mod/admin.php:728 msgid "Shortcut icon" msgstr "" -#: mod/admin.php:726 +#: mod/admin.php:728 msgid "Link to an icon that will be used for browsers." msgstr "" -#: mod/admin.php:727 +#: mod/admin.php:729 msgid "Touch icon" msgstr "" -#: mod/admin.php:727 +#: mod/admin.php:729 msgid "Link to an icon that will be used for tablets and mobiles." msgstr "" -#: mod/admin.php:728 +#: mod/admin.php:730 msgid "Additional Info" msgstr "" -#: mod/admin.php:728 +#: mod/admin.php:730 #, php-format msgid "" "For public servers: you can add additional information here that will be " "listed at %s/siteinfo." msgstr "" -#: mod/admin.php:729 +#: mod/admin.php:731 msgid "System language" msgstr "" -#: mod/admin.php:730 +#: mod/admin.php:732 msgid "System theme" msgstr "" -#: mod/admin.php:730 +#: mod/admin.php:732 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: mod/admin.php:731 +#: mod/admin.php:733 msgid "Mobile system theme" msgstr "" -#: mod/admin.php:731 +#: mod/admin.php:733 msgid "Theme for mobile devices" msgstr "" -#: mod/admin.php:732 +#: mod/admin.php:734 msgid "SSL link policy" msgstr "" -#: mod/admin.php:732 +#: mod/admin.php:734 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: mod/admin.php:733 +#: mod/admin.php:735 msgid "Force SSL" msgstr "" -#: mod/admin.php:733 +#: mod/admin.php:735 msgid "" "Force all Non-SSL requests to SSL - Attention: on some systems it could lead " "to endless loops." msgstr "" -#: mod/admin.php:734 +#: mod/admin.php:736 msgid "Old style 'Share'" msgstr "" -#: mod/admin.php:734 +#: mod/admin.php:736 msgid "Deactivates the bbcode element 'share' for repeating items." msgstr "" -#: mod/admin.php:735 +#: mod/admin.php:737 msgid "Hide help entry from navigation menu" msgstr "" -#: mod/admin.php:735 +#: mod/admin.php:737 msgid "" "Hides the menu entry for the Help pages from the navigation menu. You can " "still access it calling /help directly." msgstr "" -#: mod/admin.php:736 +#: mod/admin.php:738 msgid "Single user instance" msgstr "" -#: mod/admin.php:736 +#: mod/admin.php:738 msgid "Make this instance multi-user or single-user for the named user" msgstr "" -#: mod/admin.php:737 +#: mod/admin.php:739 msgid "Maximum image size" msgstr "" -#: mod/admin.php:737 +#: mod/admin.php:739 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: mod/admin.php:738 +#: mod/admin.php:740 msgid "Maximum image length" msgstr "" -#: mod/admin.php:738 +#: mod/admin.php:740 msgid "" "Maximum length in pixels of the longest side of uploaded images. Default is " "-1, which means no limits." msgstr "" -#: mod/admin.php:739 +#: mod/admin.php:741 msgid "JPEG image quality" msgstr "" -#: mod/admin.php:739 +#: mod/admin.php:741 msgid "" "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " "100, which is full quality." msgstr "" -#: mod/admin.php:741 +#: mod/admin.php:743 msgid "Register policy" msgstr "" -#: mod/admin.php:742 +#: mod/admin.php:744 msgid "Maximum Daily Registrations" msgstr "" -#: mod/admin.php:742 +#: mod/admin.php:744 msgid "" "If registration is permitted above, this sets the maximum number of new user " "registrations to accept per day. If register is set to closed, this setting " "has no effect." msgstr "" -#: mod/admin.php:743 +#: mod/admin.php:745 msgid "Register text" msgstr "" -#: mod/admin.php:743 +#: mod/admin.php:745 msgid "Will be displayed prominently on the registration page." msgstr "" -#: mod/admin.php:744 +#: mod/admin.php:746 msgid "Accounts abandoned after x days" msgstr "" -#: mod/admin.php:744 +#: mod/admin.php:746 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: mod/admin.php:745 +#: mod/admin.php:747 msgid "Allowed friend domains" msgstr "" -#: mod/admin.php:745 +#: mod/admin.php:747 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: mod/admin.php:746 +#: mod/admin.php:748 msgid "Allowed email domains" msgstr "" -#: mod/admin.php:746 +#: mod/admin.php:748 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: mod/admin.php:747 +#: mod/admin.php:749 msgid "Block public" msgstr "" -#: mod/admin.php:747 +#: mod/admin.php:749 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: mod/admin.php:748 +#: mod/admin.php:750 msgid "Force publish" msgstr "" -#: mod/admin.php:748 +#: mod/admin.php:750 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: mod/admin.php:749 +#: mod/admin.php:751 msgid "Global directory URL" msgstr "" -#: mod/admin.php:749 +#: mod/admin.php:751 msgid "" "URL to the global directory. If this is not set, the global directory is " "completely unavailable to the application." msgstr "" -#: mod/admin.php:750 +#: mod/admin.php:752 msgid "Allow threaded items" msgstr "" -#: mod/admin.php:750 +#: mod/admin.php:752 msgid "Allow infinite level threading for items on this site." msgstr "" -#: mod/admin.php:751 +#: mod/admin.php:753 msgid "Private posts by default for new users" msgstr "" -#: mod/admin.php:751 +#: mod/admin.php:753 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." msgstr "" -#: mod/admin.php:752 +#: mod/admin.php:754 msgid "Don't include post content in email notifications" msgstr "" -#: mod/admin.php:752 +#: mod/admin.php:754 msgid "" "Don't include the content of a post/comment/private message/etc. in the " "email notifications that are sent out from this site, as a privacy measure." msgstr "" -#: mod/admin.php:753 +#: mod/admin.php:755 msgid "Disallow public access to addons listed in the apps menu." msgstr "" -#: mod/admin.php:753 +#: mod/admin.php:755 msgid "" "Checking this box will restrict addons listed in the apps menu to members " "only." msgstr "" -#: mod/admin.php:754 +#: mod/admin.php:756 msgid "Don't embed private images in posts" msgstr "" -#: mod/admin.php:754 +#: mod/admin.php:756 msgid "" "Don't replace locally-hosted private photos in posts with an embedded copy " "of the image. This means that contacts who receive posts containing private " "photos will have to authenticate and load each image, which may take a while." msgstr "" -#: mod/admin.php:755 +#: mod/admin.php:757 msgid "Allow Users to set remote_self" msgstr "" -#: mod/admin.php:755 +#: mod/admin.php:757 msgid "" "With checking this, every user is allowed to mark every contact as a " "remote_self in the repair contact dialog. Setting this flag on a contact " "causes mirroring every posting of that contact in the users stream." msgstr "" -#: mod/admin.php:756 +#: mod/admin.php:758 msgid "Block multiple registrations" msgstr "" -#: mod/admin.php:756 +#: mod/admin.php:758 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: mod/admin.php:757 +#: mod/admin.php:759 msgid "OpenID support" msgstr "" -#: mod/admin.php:757 +#: mod/admin.php:759 msgid "OpenID support for registration and logins." msgstr "" -#: mod/admin.php:758 +#: mod/admin.php:760 msgid "Fullname check" msgstr "" -#: mod/admin.php:758 +#: mod/admin.php:760 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: mod/admin.php:759 +#: mod/admin.php:761 msgid "UTF-8 Regular expressions" msgstr "" -#: mod/admin.php:759 +#: mod/admin.php:761 msgid "Use PHP UTF8 regular expressions" msgstr "" -#: mod/admin.php:760 +#: mod/admin.php:762 msgid "Community Page Style" msgstr "" -#: mod/admin.php:760 +#: mod/admin.php:762 msgid "" "Type of community page to show. 'Global community' shows every public " "posting from an open distributed network that arrived on this server." msgstr "" -#: mod/admin.php:761 +#: mod/admin.php:763 msgid "Posts per user on community page" msgstr "" -#: mod/admin.php:761 +#: mod/admin.php:763 msgid "" "The maximum number of posts per user on the community page. (Not valid for " "'Global Community')" msgstr "" -#: mod/admin.php:762 +#: mod/admin.php:764 msgid "Enable OStatus support" msgstr "" -#: mod/admin.php:762 +#: mod/admin.php:764 msgid "" "Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "" -#: mod/admin.php:763 +#: mod/admin.php:765 msgid "OStatus conversation completion interval" msgstr "" -#: mod/admin.php:763 +#: mod/admin.php:765 msgid "" "How often shall the poller check for new entries in OStatus conversations? " "This can be a very ressource task." msgstr "" -#: mod/admin.php:764 +#: mod/admin.php:766 msgid "OStatus support can only be enabled if threading is enabled." msgstr "" -#: mod/admin.php:766 +#: mod/admin.php:768 msgid "" "Diaspora support can't be enabled because Friendica was installed into a sub " "directory." msgstr "" -#: mod/admin.php:767 +#: mod/admin.php:769 msgid "Enable Diaspora support" msgstr "" -#: mod/admin.php:767 +#: mod/admin.php:769 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: mod/admin.php:768 +#: mod/admin.php:770 msgid "Only allow Friendica contacts" msgstr "" -#: mod/admin.php:768 +#: mod/admin.php:770 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: mod/admin.php:769 +#: mod/admin.php:771 msgid "Verify SSL" msgstr "" -#: mod/admin.php:769 +#: mod/admin.php:771 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: mod/admin.php:770 +#: mod/admin.php:772 msgid "Proxy user" msgstr "" -#: mod/admin.php:771 +#: mod/admin.php:773 msgid "Proxy URL" msgstr "" -#: mod/admin.php:772 +#: mod/admin.php:774 msgid "Network timeout" msgstr "" -#: mod/admin.php:772 +#: mod/admin.php:774 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: mod/admin.php:773 +#: mod/admin.php:775 msgid "Delivery interval" msgstr "" -#: mod/admin.php:773 +#: mod/admin.php:775 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: mod/admin.php:774 +#: mod/admin.php:776 msgid "Poll interval" msgstr "" -#: mod/admin.php:774 +#: mod/admin.php:776 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: mod/admin.php:775 +#: mod/admin.php:777 msgid "Maximum Load Average" msgstr "" -#: mod/admin.php:775 +#: mod/admin.php:777 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: mod/admin.php:776 +#: mod/admin.php:778 msgid "Maximum Load Average (Frontend)" msgstr "" -#: mod/admin.php:776 +#: mod/admin.php:778 msgid "Maximum system load before the frontend quits service - default 50." msgstr "" -#: mod/admin.php:777 +#: mod/admin.php:779 msgid "Maximum table size for optimization" msgstr "" -#: mod/admin.php:777 +#: mod/admin.php:779 msgid "" "Maximum table size (in MB) for the automatic optimization - default 100 MB. " "Enter -1 to disable it." msgstr "" -#: mod/admin.php:779 +#: mod/admin.php:780 +msgid "Minimum level of fragmentation" +msgstr "" + +#: mod/admin.php:780 +msgid "" +"Minimum fragmenation level to start the automatic optimization - default " +"value is 30%." +msgstr "" + +#: mod/admin.php:782 msgid "Periodical check of global contacts" msgstr "" -#: mod/admin.php:779 +#: mod/admin.php:782 msgid "" "If enabled, the global contacts are checked periodically for missing or " "outdated data and the vitality of the contacts and servers." msgstr "" -#: mod/admin.php:780 +#: mod/admin.php:783 msgid "Days between requery" msgstr "" -#: mod/admin.php:780 +#: mod/admin.php:783 msgid "Number of days after which a server is requeried for his contacts." msgstr "" -#: mod/admin.php:781 +#: mod/admin.php:784 msgid "Discover contacts from other servers" msgstr "" -#: mod/admin.php:781 +#: mod/admin.php:784 msgid "" "Periodically query other servers for contacts. You can choose between " "'users': the users on the remote system, 'Global Contacts': active contacts " @@ -2699,32 +2731,32 @@ msgid "" "Global Contacts'." msgstr "" -#: mod/admin.php:782 +#: mod/admin.php:785 msgid "Timeframe for fetching global contacts" msgstr "" -#: mod/admin.php:782 +#: mod/admin.php:785 msgid "" "When the discovery is activated, this value defines the timeframe for the " "activity of the global contacts that are fetched from other servers." msgstr "" -#: mod/admin.php:783 +#: mod/admin.php:786 msgid "Search the local directory" msgstr "" -#: mod/admin.php:783 +#: mod/admin.php:786 msgid "" "Search the local directory instead of the global directory. When searching " "locally, every search will be executed on the global directory in the " "background. This improves the search results when the search is repeated." msgstr "" -#: mod/admin.php:785 +#: mod/admin.php:788 msgid "Publish server information" msgstr "" -#: mod/admin.php:785 +#: mod/admin.php:788 msgid "" "If enabled, general server and usage data will be published. The data " "contains the name and version of the server, number of users with public " @@ -2732,204 +2764,204 @@ msgid "" "href='http://the-federation.info/'>the-federation.info for details." msgstr "" -#: mod/admin.php:787 +#: mod/admin.php:790 msgid "Use MySQL full text engine" msgstr "" -#: mod/admin.php:787 +#: mod/admin.php:790 msgid "" "Activates the full text engine. Speeds up search - but can only search for " "four and more characters." msgstr "" -#: mod/admin.php:788 +#: mod/admin.php:791 msgid "Suppress Language" msgstr "" -#: mod/admin.php:788 +#: mod/admin.php:791 msgid "Suppress language information in meta information about a posting." msgstr "" -#: mod/admin.php:789 +#: mod/admin.php:792 msgid "Suppress Tags" msgstr "" -#: mod/admin.php:789 +#: mod/admin.php:792 msgid "Suppress showing a list of hashtags at the end of the posting." msgstr "" -#: mod/admin.php:790 +#: mod/admin.php:793 msgid "Path to item cache" msgstr "" -#: mod/admin.php:790 +#: mod/admin.php:793 msgid "The item caches buffers generated bbcode and external images." msgstr "" -#: mod/admin.php:791 +#: mod/admin.php:794 msgid "Cache duration in seconds" msgstr "" -#: mod/admin.php:791 +#: mod/admin.php:794 msgid "" "How long should the cache files be hold? Default value is 86400 seconds (One " "day). To disable the item cache, set the value to -1." msgstr "" -#: mod/admin.php:792 +#: mod/admin.php:795 msgid "Maximum numbers of comments per post" msgstr "" -#: mod/admin.php:792 +#: mod/admin.php:795 msgid "How much comments should be shown for each post? Default value is 100." msgstr "" -#: mod/admin.php:793 +#: mod/admin.php:796 msgid "Path for lock file" msgstr "" -#: mod/admin.php:793 +#: mod/admin.php:796 msgid "" "The lock file is used to avoid multiple pollers at one time. Only define a " "folder here." msgstr "" -#: mod/admin.php:794 +#: mod/admin.php:797 msgid "Temp path" msgstr "" -#: mod/admin.php:794 +#: mod/admin.php:797 msgid "" "If you have a restricted system where the webserver can't access the system " "temp path, enter another path here." msgstr "" -#: mod/admin.php:795 +#: mod/admin.php:798 msgid "Base path to installation" msgstr "" -#: mod/admin.php:795 +#: mod/admin.php:798 msgid "" "If the system cannot detect the correct path to your installation, enter the " "correct path here. This setting should only be set if you are using a " "restricted system and symbolic links to your webroot." msgstr "" -#: mod/admin.php:796 +#: mod/admin.php:799 msgid "Disable picture proxy" msgstr "" -#: mod/admin.php:796 +#: mod/admin.php:799 msgid "" "The picture proxy increases performance and privacy. It shouldn't be used on " "systems with very low bandwith." msgstr "" -#: mod/admin.php:797 +#: mod/admin.php:800 msgid "Enable old style pager" msgstr "" -#: mod/admin.php:797 +#: mod/admin.php:800 msgid "" "The old style pager has page numbers but slows down massively the page speed." msgstr "" -#: mod/admin.php:798 +#: mod/admin.php:801 msgid "Only search in tags" msgstr "" -#: mod/admin.php:798 +#: mod/admin.php:801 msgid "On large systems the text search can slow down the system extremely." msgstr "" -#: mod/admin.php:800 +#: mod/admin.php:803 msgid "New base url" msgstr "" -#: mod/admin.php:800 +#: mod/admin.php:803 msgid "" "Change base url for this server. Sends relocate message to all DFRN contacts " "of all users." msgstr "" -#: mod/admin.php:802 +#: mod/admin.php:805 msgid "RINO Encryption" msgstr "" -#: mod/admin.php:802 +#: mod/admin.php:805 msgid "Encryption layer between nodes." msgstr "" -#: mod/admin.php:803 +#: mod/admin.php:806 msgid "Embedly API key" msgstr "" -#: mod/admin.php:803 +#: mod/admin.php:806 msgid "" "Embedly is used to fetch additional data for " "web pages. This is an optional parameter." msgstr "" -#: mod/admin.php:821 +#: mod/admin.php:824 msgid "Update has been marked successful" msgstr "" -#: mod/admin.php:829 -#, php-format -msgid "Database structure update %s was successfully applied." -msgstr "" - #: mod/admin.php:832 #, php-format -msgid "Executing of database structure update %s failed with error: %s" +msgid "Database structure update %s was successfully applied." msgstr "" -#: mod/admin.php:844 +#: mod/admin.php:835 #, php-format -msgid "Executing %s failed with error: %s" +msgid "Executing of database structure update %s failed with error: %s" msgstr "" #: mod/admin.php:847 #, php-format +msgid "Executing %s failed with error: %s" +msgstr "" + +#: mod/admin.php:850 +#, php-format msgid "Update %s was successfully applied." msgstr "" -#: mod/admin.php:851 +#: mod/admin.php:854 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: mod/admin.php:853 +#: mod/admin.php:856 #, php-format msgid "There was no additional update function %s that needed to be called." msgstr "" -#: mod/admin.php:872 +#: mod/admin.php:875 msgid "No failed updates." msgstr "" -#: mod/admin.php:873 +#: mod/admin.php:876 msgid "Check database structure" msgstr "" -#: mod/admin.php:878 +#: mod/admin.php:881 msgid "Failed Updates" msgstr "" -#: mod/admin.php:879 +#: mod/admin.php:882 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "" -#: mod/admin.php:880 +#: mod/admin.php:883 msgid "Mark success (if update was manually applied)" msgstr "" -#: mod/admin.php:881 +#: mod/admin.php:884 msgid "Attempt to execute this update step automatically" msgstr "" -#: mod/admin.php:913 +#: mod/admin.php:916 #, php-format msgid "" "\n" @@ -2937,7 +2969,7 @@ msgid "" "\t\t\t\tthe administrator of %2$s has set up an account for you." msgstr "" -#: mod/admin.php:916 +#: mod/admin.php:919 #, php-format msgid "" "\n" @@ -2973,230 +3005,231 @@ msgid "" "\t\t\tThank you and welcome to %4$s." msgstr "" -#: mod/admin.php:948 include/user.php:423 +#: mod/admin.php:951 include/user.php:423 #, php-format msgid "Registration details for %s" msgstr "" -#: mod/admin.php:960 +#: mod/admin.php:963 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: mod/admin.php:967 +#: mod/admin.php:970 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: mod/admin.php:1006 +#: mod/admin.php:1009 #, php-format msgid "User '%s' deleted" msgstr "" -#: mod/admin.php:1014 +#: mod/admin.php:1017 #, php-format msgid "User '%s' unblocked" msgstr "" -#: mod/admin.php:1014 +#: mod/admin.php:1017 #, php-format msgid "User '%s' blocked" msgstr "" -#: mod/admin.php:1107 +#: mod/admin.php:1110 msgid "Add User" msgstr "" -#: mod/admin.php:1108 +#: mod/admin.php:1111 msgid "select all" msgstr "" -#: mod/admin.php:1109 +#: mod/admin.php:1112 msgid "User registrations waiting for confirm" msgstr "" -#: mod/admin.php:1110 +#: mod/admin.php:1113 msgid "User waiting for permanent deletion" msgstr "" -#: mod/admin.php:1111 +#: mod/admin.php:1114 msgid "Request date" msgstr "" -#: mod/admin.php:1111 mod/admin.php:1123 mod/admin.php:1124 mod/admin.php:1139 +#: mod/admin.php:1114 mod/admin.php:1126 mod/admin.php:1127 mod/admin.php:1142 #: include/contact_selectors.php:79 include/contact_selectors.php:86 msgid "Email" msgstr "" -#: mod/admin.php:1112 +#: mod/admin.php:1115 msgid "No registrations." msgstr "" -#: mod/admin.php:1114 +#: mod/admin.php:1117 msgid "Deny" msgstr "" -#: mod/admin.php:1118 +#: mod/admin.php:1121 msgid "Site admin" msgstr "" -#: mod/admin.php:1119 +#: mod/admin.php:1122 msgid "Account expired" msgstr "" -#: mod/admin.php:1122 +#: mod/admin.php:1125 msgid "New User" msgstr "" -#: mod/admin.php:1123 mod/admin.php:1124 +#: mod/admin.php:1126 mod/admin.php:1127 msgid "Register date" msgstr "" -#: mod/admin.php:1123 mod/admin.php:1124 +#: mod/admin.php:1126 mod/admin.php:1127 msgid "Last login" msgstr "" -#: mod/admin.php:1123 mod/admin.php:1124 +#: mod/admin.php:1126 mod/admin.php:1127 msgid "Last item" msgstr "" -#: mod/admin.php:1123 +#: mod/admin.php:1126 msgid "Deleted since" msgstr "" -#: mod/admin.php:1124 mod/settings.php:41 +#: mod/admin.php:1127 mod/settings.php:41 msgid "Account" msgstr "" -#: mod/admin.php:1126 +#: mod/admin.php:1129 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: mod/admin.php:1127 +#: mod/admin.php:1130 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: mod/admin.php:1137 +#: mod/admin.php:1140 msgid "Name of the new user." msgstr "" -#: mod/admin.php:1138 +#: mod/admin.php:1141 msgid "Nickname" msgstr "" -#: mod/admin.php:1138 +#: mod/admin.php:1141 msgid "Nickname of the new user." msgstr "" -#: mod/admin.php:1139 +#: mod/admin.php:1142 msgid "Email address of the new user." msgstr "" -#: mod/admin.php:1172 +#: mod/admin.php:1175 #, php-format msgid "Plugin %s disabled." msgstr "" -#: mod/admin.php:1176 +#: mod/admin.php:1179 #, php-format msgid "Plugin %s enabled." msgstr "" -#: mod/admin.php:1186 mod/admin.php:1410 +#: mod/admin.php:1189 mod/admin.php:1413 msgid "Disable" msgstr "" -#: mod/admin.php:1188 mod/admin.php:1412 +#: mod/admin.php:1191 mod/admin.php:1415 msgid "Enable" msgstr "" -#: mod/admin.php:1211 mod/admin.php:1456 +#: mod/admin.php:1214 mod/admin.php:1459 msgid "Toggle" msgstr "" -#: mod/admin.php:1219 mod/admin.php:1466 +#: mod/admin.php:1222 mod/admin.php:1469 msgid "Author: " msgstr "" -#: mod/admin.php:1220 mod/admin.php:1467 +#: mod/admin.php:1223 mod/admin.php:1470 msgid "Maintainer: " msgstr "" -#: mod/admin.php:1272 +#: mod/admin.php:1275 +#: view/smarty3/compiled/f835364006028b1061f37be121c9bd9db5fa50a9.file.admin_plugins.tpl.php:42 msgid "Reload active plugins" msgstr "" -#: mod/admin.php:1370 +#: mod/admin.php:1373 msgid "No themes found." msgstr "" -#: mod/admin.php:1448 +#: mod/admin.php:1451 msgid "Screenshot" msgstr "" -#: mod/admin.php:1508 +#: mod/admin.php:1511 msgid "Reload active themes" msgstr "" -#: mod/admin.php:1512 +#: mod/admin.php:1515 msgid "[Experimental]" msgstr "" -#: mod/admin.php:1513 +#: mod/admin.php:1516 msgid "[Unsupported]" msgstr "" -#: mod/admin.php:1540 +#: mod/admin.php:1543 msgid "Log settings updated." msgstr "" -#: mod/admin.php:1596 +#: mod/admin.php:1599 msgid "Clear" msgstr "" -#: mod/admin.php:1602 +#: mod/admin.php:1605 msgid "Enable Debugging" msgstr "" -#: mod/admin.php:1603 +#: mod/admin.php:1606 msgid "Log file" msgstr "" -#: mod/admin.php:1603 +#: mod/admin.php:1606 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: mod/admin.php:1604 +#: mod/admin.php:1607 msgid "Log level" msgstr "" -#: mod/admin.php:1654 include/acl_selectors.php:348 +#: mod/admin.php:1657 include/acl_selectors.php:348 msgid "Close" msgstr "" -#: mod/admin.php:1660 +#: mod/admin.php:1663 msgid "FTP Host" msgstr "" -#: mod/admin.php:1661 +#: mod/admin.php:1664 msgid "FTP Path" msgstr "" -#: mod/admin.php:1662 +#: mod/admin.php:1665 msgid "FTP User" msgstr "" -#: mod/admin.php:1663 +#: mod/admin.php:1666 msgid "FTP Password" msgstr "" @@ -3277,10 +3310,6 @@ msgstr "" msgid "No such group" msgstr "" -#: mod/network.php:563 mod/content.php:130 -msgid "Group is empty" -msgstr "" - #: mod/network.php:574 mod/content.php:135 #, php-format msgid "Group: %s" @@ -3294,15 +3323,10 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: mod/allfriends.php:45 +#: mod/allfriends.php:38 msgid "No friends to display." msgstr "" -#: mod/allfriends.php:92 -#, php-format -msgid "Friends of %s" -msgstr "" - #: mod/events.php:71 mod/events.php:73 msgid "Event can not end before it has started." msgstr "" @@ -3339,11 +3363,11 @@ msgstr "" msgid "Sat" msgstr "" -#: mod/events.php:208 mod/settings.php:936 include/text.php:1274 +#: mod/events.php:208 mod/settings.php:939 include/text.php:1274 msgid "Sunday" msgstr "" -#: mod/events.php:209 mod/settings.php:936 include/text.php:1274 +#: mod/events.php:209 mod/settings.php:939 include/text.php:1274 msgid "Monday" msgstr "" @@ -3487,7 +3511,7 @@ msgstr "" msgid "link to source" msgstr "" -#: mod/events.php:456 include/identity.php:686 include/nav.php:79 +#: mod/events.php:456 include/identity.php:713 include/nav.php:79 #: include/nav.php:140 view/theme/diabook/theme.php:127 msgid "Events" msgstr "" @@ -3544,8 +3568,8 @@ msgstr "" msgid "Share this event" msgstr "" -#: mod/events.php:572 mod/content.php:721 mod/editpost.php:144 -#: mod/photos.php:1623 mod/photos.php:1671 mod/photos.php:1759 +#: mod/events.php:572 mod/content.php:721 mod/editpost.php:145 +#: mod/photos.php:1631 mod/photos.php:1679 mod/photos.php:1767 #: object/Item.php:719 include/conversation.php:1217 msgid "Preview" msgstr "" @@ -3561,7 +3585,7 @@ msgid "" "code or the translation of Friendica. Thank you all!" msgstr "" -#: mod/content.php:439 mod/content.php:742 mod/photos.php:1714 +#: mod/content.php:439 mod/content.php:742 mod/photos.php:1722 #: object/Item.php:133 include/conversation.php:634 msgid "Select" msgstr "" @@ -3590,23 +3614,23 @@ msgstr[0] "" msgstr[1] "" #: mod/content.php:607 object/Item.php:421 object/Item.php:434 -#: include/text.php:1999 +#: include/text.php:1997 msgid "comment" msgid_plural "comments" msgstr[0] "" msgstr[1] "" -#: mod/content.php:608 boot.php:773 object/Item.php:422 +#: mod/content.php:608 boot.php:788 object/Item.php:422 #: include/contact_widgets.php:242 include/forums.php:110 -#: include/items.php:5152 view/theme/vier/theme.php:264 +#: include/items.php:5178 view/theme/vier/theme.php:264 msgid "show more" msgstr "" -#: mod/content.php:622 mod/photos.php:1410 object/Item.php:117 +#: mod/content.php:622 mod/photos.php:1418 object/Item.php:117 msgid "Private Message" msgstr "" -#: mod/content.php:686 mod/photos.php:1599 object/Item.php:253 +#: mod/content.php:686 mod/photos.php:1607 object/Item.php:253 msgid "I like this (toggle)" msgstr "" @@ -3614,7 +3638,7 @@ msgstr "" msgid "like" msgstr "" -#: mod/content.php:687 mod/photos.php:1600 object/Item.php:254 +#: mod/content.php:687 mod/photos.php:1608 object/Item.php:254 msgid "I don't like this (toggle)" msgstr "" @@ -3630,13 +3654,13 @@ msgstr "" msgid "share" msgstr "" -#: mod/content.php:709 mod/photos.php:1619 mod/photos.php:1667 -#: mod/photos.php:1755 object/Item.php:707 +#: mod/content.php:709 mod/photos.php:1627 mod/photos.php:1675 +#: mod/photos.php:1763 object/Item.php:707 msgid "This is you" msgstr "" -#: mod/content.php:711 mod/photos.php:1621 mod/photos.php:1669 -#: mod/photos.php:1757 boot.php:772 object/Item.php:393 object/Item.php:709 +#: mod/content.php:711 mod/photos.php:1629 mod/photos.php:1677 +#: mod/photos.php:1765 boot.php:787 object/Item.php:393 object/Item.php:709 msgid "Comment" msgstr "" @@ -3672,7 +3696,7 @@ msgstr "" msgid "Video" msgstr "" -#: mod/content.php:730 mod/settings.php:710 object/Item.php:122 +#: mod/content.php:730 mod/settings.php:712 object/Item.php:122 #: object/Item.php:124 msgid "Edit" msgstr "" @@ -4135,11 +4159,11 @@ msgstr "" msgid "Community" msgstr "" -#: mod/community.php:62 mod/community.php:71 mod/search.php:218 +#: mod/community.php:62 mod/community.php:71 mod/search.php:228 msgid "No results." msgstr "" -#: mod/settings.php:34 mod/photos.php:109 +#: mod/settings.php:34 mod/photos.php:117 msgid "everybody" msgstr "" @@ -4151,7 +4175,7 @@ msgstr "" msgid "Display" msgstr "" -#: mod/settings.php:60 mod/settings.php:853 +#: mod/settings.php:60 mod/settings.php:855 msgid "Social Networks" msgstr "" @@ -4187,654 +4211,656 @@ msgstr "" msgid "Features updated" msgstr "" -#: mod/settings.php:341 +#: mod/settings.php:343 msgid "Relocate message has been send to your contacts" msgstr "" -#: mod/settings.php:355 include/user.php:39 +#: mod/settings.php:357 include/user.php:39 msgid "Passwords do not match. Password unchanged." msgstr "" -#: mod/settings.php:360 +#: mod/settings.php:362 msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: mod/settings.php:368 +#: mod/settings.php:370 msgid "Wrong password." msgstr "" -#: mod/settings.php:379 +#: mod/settings.php:381 msgid "Password changed." msgstr "" -#: mod/settings.php:381 +#: mod/settings.php:383 msgid "Password update failed. Please try again." msgstr "" -#: mod/settings.php:450 +#: mod/settings.php:452 msgid " Please use a shorter name." msgstr "" -#: mod/settings.php:452 +#: mod/settings.php:454 msgid " Name too short." msgstr "" -#: mod/settings.php:461 +#: mod/settings.php:463 msgid "Wrong Password" msgstr "" -#: mod/settings.php:466 +#: mod/settings.php:468 msgid " Not valid email." msgstr "" -#: mod/settings.php:472 +#: mod/settings.php:474 msgid " Cannot change to that email." msgstr "" -#: mod/settings.php:528 +#: mod/settings.php:530 msgid "Private forum has no privacy permissions. Using default privacy group." msgstr "" -#: mod/settings.php:532 +#: mod/settings.php:534 msgid "Private forum has no privacy permissions and no default privacy group." msgstr "" -#: mod/settings.php:571 +#: mod/settings.php:573 addons-extra/etherpadlite/etherpadlite.php:70 +#: addons-extra/fbgroup/fbgroup.php:153 addons-extra/donate/donate.php:55 msgid "Settings updated." msgstr "" -#: mod/settings.php:647 mod/settings.php:673 mod/settings.php:709 +#: mod/settings.php:649 mod/settings.php:675 mod/settings.php:711 msgid "Add application" msgstr "" -#: mod/settings.php:651 mod/settings.php:677 +#: mod/settings.php:653 mod/settings.php:679 msgid "Consumer Key" msgstr "" -#: mod/settings.php:652 mod/settings.php:678 +#: mod/settings.php:654 mod/settings.php:680 msgid "Consumer Secret" msgstr "" -#: mod/settings.php:653 mod/settings.php:679 +#: mod/settings.php:655 mod/settings.php:681 msgid "Redirect" msgstr "" -#: mod/settings.php:654 mod/settings.php:680 +#: mod/settings.php:656 mod/settings.php:682 msgid "Icon url" msgstr "" -#: mod/settings.php:665 +#: mod/settings.php:667 msgid "You can't edit this application." msgstr "" -#: mod/settings.php:708 +#: mod/settings.php:710 msgid "Connected Apps" msgstr "" -#: mod/settings.php:712 +#: mod/settings.php:714 msgid "Client key starts with" msgstr "" -#: mod/settings.php:713 +#: mod/settings.php:715 msgid "No name" msgstr "" -#: mod/settings.php:714 +#: mod/settings.php:716 msgid "Remove authorization" msgstr "" -#: mod/settings.php:726 +#: mod/settings.php:728 msgid "No Plugin settings configured" msgstr "" -#: mod/settings.php:734 +#: mod/settings.php:736 msgid "Plugin Settings" msgstr "" -#: mod/settings.php:748 +#: mod/settings.php:750 msgid "Off" msgstr "" -#: mod/settings.php:748 +#: mod/settings.php:750 msgid "On" msgstr "" -#: mod/settings.php:756 +#: mod/settings.php:758 msgid "Additional Features" msgstr "" -#: mod/settings.php:766 mod/settings.php:770 +#: mod/settings.php:768 mod/settings.php:772 msgid "General Social Media Settings" msgstr "" -#: mod/settings.php:776 +#: mod/settings.php:778 msgid "Disable intelligent shortening" msgstr "" -#: mod/settings.php:778 +#: mod/settings.php:780 msgid "" "Normally the system tries to find the best link to add to shortened posts. " "If this option is enabled then every shortened post will always point to the " "original friendica post." msgstr "" -#: mod/settings.php:784 +#: mod/settings.php:786 msgid "Automatically follow any GNU Social (OStatus) followers/mentioners" msgstr "" -#: mod/settings.php:786 +#: mod/settings.php:788 msgid "" "If you receive a message from an unknown OStatus user, this option decides " "what to do. If it is checked, a new contact will be created for every " "unknown user." msgstr "" -#: mod/settings.php:795 +#: mod/settings.php:797 msgid "Your legacy GNU Social account" msgstr "" -#: mod/settings.php:797 +#: mod/settings.php:799 msgid "" "If you enter your old GNU Social/Statusnet account name here (in the format " "user@domain.tld), your contacts will be added automatically. The field will " "be emptied when done." msgstr "" -#: mod/settings.php:800 +#: mod/settings.php:802 msgid "Repair OStatus subscriptions" msgstr "" -#: mod/settings.php:809 mod/settings.php:810 +#: mod/settings.php:811 mod/settings.php:812 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: mod/settings.php:809 mod/dfrn_request.php:858 +#: mod/settings.php:811 mod/dfrn_request.php:858 #: include/contact_selectors.php:80 msgid "Diaspora" msgstr "" -#: mod/settings.php:809 mod/settings.php:810 +#: mod/settings.php:811 mod/settings.php:812 msgid "enabled" msgstr "" -#: mod/settings.php:809 mod/settings.php:810 +#: mod/settings.php:811 mod/settings.php:812 msgid "disabled" msgstr "" -#: mod/settings.php:810 +#: mod/settings.php:812 msgid "GNU Social (OStatus)" msgstr "" -#: mod/settings.php:846 +#: mod/settings.php:848 msgid "Email access is disabled on this site." msgstr "" -#: mod/settings.php:858 +#: mod/settings.php:860 msgid "Email/Mailbox Setup" msgstr "" -#: mod/settings.php:859 +#: mod/settings.php:861 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "" -#: mod/settings.php:860 +#: mod/settings.php:862 msgid "Last successful email check:" msgstr "" -#: mod/settings.php:862 +#: mod/settings.php:864 msgid "IMAP server name:" msgstr "" -#: mod/settings.php:863 +#: mod/settings.php:865 msgid "IMAP port:" msgstr "" -#: mod/settings.php:864 +#: mod/settings.php:866 msgid "Security:" msgstr "" -#: mod/settings.php:864 mod/settings.php:869 +#: mod/settings.php:866 mod/settings.php:871 +#: addons-extra/fbgroup/fbgroup.php:253 addons-extra/fbgroup/fbgroup.php:255 msgid "None" msgstr "" -#: mod/settings.php:865 +#: mod/settings.php:867 msgid "Email login name:" msgstr "" -#: mod/settings.php:866 +#: mod/settings.php:868 msgid "Email password:" msgstr "" -#: mod/settings.php:867 +#: mod/settings.php:869 msgid "Reply-to address:" msgstr "" -#: mod/settings.php:868 +#: mod/settings.php:870 msgid "Send public posts to all email contacts:" msgstr "" -#: mod/settings.php:869 +#: mod/settings.php:871 msgid "Action after import:" msgstr "" -#: mod/settings.php:869 +#: mod/settings.php:871 msgid "Mark as seen" msgstr "" -#: mod/settings.php:869 +#: mod/settings.php:871 msgid "Move to folder" msgstr "" -#: mod/settings.php:870 +#: mod/settings.php:872 msgid "Move to folder:" msgstr "" -#: mod/settings.php:955 +#: mod/settings.php:958 msgid "Display Settings" msgstr "" -#: mod/settings.php:961 mod/settings.php:979 +#: mod/settings.php:964 mod/settings.php:982 msgid "Display Theme:" msgstr "" -#: mod/settings.php:962 +#: mod/settings.php:965 msgid "Mobile Theme:" msgstr "" -#: mod/settings.php:963 +#: mod/settings.php:966 msgid "Update browser every xx seconds" msgstr "" -#: mod/settings.php:963 -msgid "Minimum of 10 seconds, no maximum" -msgstr "" - -#: mod/settings.php:964 -msgid "Number of items to display per page:" -msgstr "" - -#: mod/settings.php:964 mod/settings.php:965 -msgid "Maximum of 100 items" -msgstr "" - -#: mod/settings.php:965 -msgid "Number of items to display per page when viewed from mobile device:" -msgstr "" - #: mod/settings.php:966 -msgid "Don't show emoticons" +msgid "Minimum of 10 seconds. Enter -1 to disable it." msgstr "" #: mod/settings.php:967 -msgid "Calendar" +msgid "Number of items to display per page:" +msgstr "" + +#: mod/settings.php:967 mod/settings.php:968 +msgid "Maximum of 100 items" msgstr "" #: mod/settings.php:968 -msgid "Beginning of week:" +msgid "Number of items to display per page when viewed from mobile device:" msgstr "" #: mod/settings.php:969 -msgid "Don't show notices" +msgid "Don't show emoticons" msgstr "" #: mod/settings.php:970 -msgid "Infinite scroll" +msgid "Calendar" msgstr "" #: mod/settings.php:971 +msgid "Beginning of week:" +msgstr "" + +#: mod/settings.php:972 +msgid "Don't show notices" +msgstr "" + +#: mod/settings.php:973 +msgid "Infinite scroll" +msgstr "" + +#: mod/settings.php:974 msgid "Automatic updates only at the top of the network page" msgstr "" -#: mod/settings.php:973 view/theme/cleanzero/config.php:82 +#: mod/settings.php:976 view/theme/cleanzero/config.php:82 #: view/theme/dispy/config.php:72 view/theme/quattro/config.php:66 #: view/theme/diabook/config.php:150 view/theme/clean/config.php:85 #: view/theme/vier/config.php:109 view/theme/duepuntozero/config.php:61 msgid "Theme settings" msgstr "" -#: mod/settings.php:1050 +#: mod/settings.php:1053 msgid "User Types" msgstr "" -#: mod/settings.php:1051 +#: mod/settings.php:1054 msgid "Community Types" msgstr "" -#: mod/settings.php:1052 +#: mod/settings.php:1055 msgid "Normal Account Page" msgstr "" -#: mod/settings.php:1053 +#: mod/settings.php:1056 msgid "This account is a normal personal profile" msgstr "" -#: mod/settings.php:1056 +#: mod/settings.php:1059 msgid "Soapbox Page" msgstr "" -#: mod/settings.php:1057 +#: mod/settings.php:1060 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: mod/settings.php:1060 +#: mod/settings.php:1063 msgid "Community Forum/Celebrity Account" msgstr "" -#: mod/settings.php:1061 +#: mod/settings.php:1064 msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: mod/settings.php:1064 +#: mod/settings.php:1067 msgid "Automatic Friend Page" msgstr "" -#: mod/settings.php:1065 +#: mod/settings.php:1068 msgid "Automatically approve all connection/friend requests as friends" msgstr "" -#: mod/settings.php:1068 +#: mod/settings.php:1071 msgid "Private Forum [Experimental]" msgstr "" -#: mod/settings.php:1069 +#: mod/settings.php:1072 msgid "Private forum - approved members only" msgstr "" -#: mod/settings.php:1081 +#: mod/settings.php:1084 msgid "OpenID:" msgstr "" -#: mod/settings.php:1081 +#: mod/settings.php:1084 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: mod/settings.php:1091 +#: mod/settings.php:1094 msgid "Publish your default profile in your local site directory?" msgstr "" -#: mod/settings.php:1097 +#: mod/settings.php:1100 msgid "Publish your default profile in the global social directory?" msgstr "" -#: mod/settings.php:1105 +#: mod/settings.php:1108 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "" -#: mod/settings.php:1109 include/acl_selectors.php:331 +#: mod/settings.php:1112 include/acl_selectors.php:331 msgid "Hide your profile details from unknown viewers?" msgstr "" -#: mod/settings.php:1109 +#: mod/settings.php:1112 msgid "" "If enabled, posting public messages to Diaspora and other networks isn't " "possible." msgstr "" -#: mod/settings.php:1114 +#: mod/settings.php:1117 msgid "Allow friends to post to your profile page?" msgstr "" -#: mod/settings.php:1120 +#: mod/settings.php:1123 msgid "Allow friends to tag your posts?" msgstr "" -#: mod/settings.php:1126 +#: mod/settings.php:1129 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: mod/settings.php:1132 +#: mod/settings.php:1135 msgid "Permit unknown people to send you private mail?" msgstr "" -#: mod/settings.php:1140 +#: mod/settings.php:1143 msgid "Profile is not published." msgstr "" -#: mod/settings.php:1148 +#: mod/settings.php:1151 #, php-format msgid "Your Identity Address is '%s' or '%s'." msgstr "" -#: mod/settings.php:1155 +#: mod/settings.php:1158 msgid "Automatically expire posts after this many days:" msgstr "" -#: mod/settings.php:1155 +#: mod/settings.php:1158 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: mod/settings.php:1156 +#: mod/settings.php:1159 msgid "Advanced expiration settings" msgstr "" -#: mod/settings.php:1157 +#: mod/settings.php:1160 msgid "Advanced Expiration" msgstr "" -#: mod/settings.php:1158 +#: mod/settings.php:1161 msgid "Expire posts:" msgstr "" -#: mod/settings.php:1159 +#: mod/settings.php:1162 msgid "Expire personal notes:" msgstr "" -#: mod/settings.php:1160 +#: mod/settings.php:1163 msgid "Expire starred posts:" msgstr "" -#: mod/settings.php:1161 +#: mod/settings.php:1164 msgid "Expire photos:" msgstr "" -#: mod/settings.php:1162 +#: mod/settings.php:1165 msgid "Only expire posts by others:" msgstr "" -#: mod/settings.php:1190 +#: mod/settings.php:1193 msgid "Account Settings" msgstr "" -#: mod/settings.php:1198 +#: mod/settings.php:1201 msgid "Password Settings" msgstr "" -#: mod/settings.php:1199 mod/register.php:274 +#: mod/settings.php:1202 mod/register.php:274 msgid "New Password:" msgstr "" -#: mod/settings.php:1200 mod/register.php:275 +#: mod/settings.php:1203 mod/register.php:275 msgid "Confirm:" msgstr "" -#: mod/settings.php:1200 +#: mod/settings.php:1203 msgid "Leave password fields blank unless changing" msgstr "" -#: mod/settings.php:1201 +#: mod/settings.php:1204 msgid "Current Password:" msgstr "" -#: mod/settings.php:1201 mod/settings.php:1202 +#: mod/settings.php:1204 mod/settings.php:1205 msgid "Your current password to confirm the changes" msgstr "" -#: mod/settings.php:1202 +#: mod/settings.php:1205 msgid "Password:" msgstr "" -#: mod/settings.php:1206 +#: mod/settings.php:1209 msgid "Basic Settings" msgstr "" -#: mod/settings.php:1207 include/identity.php:551 +#: mod/settings.php:1210 include/identity.php:578 msgid "Full Name:" msgstr "" -#: mod/settings.php:1208 +#: mod/settings.php:1211 msgid "Email Address:" msgstr "" -#: mod/settings.php:1209 +#: mod/settings.php:1212 msgid "Your Timezone:" msgstr "" -#: mod/settings.php:1210 +#: mod/settings.php:1213 msgid "Your Language:" msgstr "" -#: mod/settings.php:1210 +#: mod/settings.php:1213 msgid "" "Set the language we use to show you friendica interface and to send you " "emails" msgstr "" -#: mod/settings.php:1211 +#: mod/settings.php:1214 msgid "Default Post Location:" msgstr "" -#: mod/settings.php:1212 +#: mod/settings.php:1215 msgid "Use Browser Location:" msgstr "" -#: mod/settings.php:1215 +#: mod/settings.php:1218 msgid "Security and Privacy Settings" msgstr "" -#: mod/settings.php:1217 +#: mod/settings.php:1220 msgid "Maximum Friend Requests/Day:" msgstr "" -#: mod/settings.php:1217 mod/settings.php:1247 +#: mod/settings.php:1220 mod/settings.php:1250 msgid "(to prevent spam abuse)" msgstr "" -#: mod/settings.php:1218 +#: mod/settings.php:1221 msgid "Default Post Permissions" msgstr "" -#: mod/settings.php:1219 +#: mod/settings.php:1222 msgid "(click to open/close)" msgstr "" -#: mod/settings.php:1228 mod/photos.php:1191 mod/photos.php:1576 +#: mod/settings.php:1231 mod/photos.php:1199 mod/photos.php:1584 msgid "Show to Groups" msgstr "" -#: mod/settings.php:1229 mod/photos.php:1192 mod/photos.php:1577 +#: mod/settings.php:1232 mod/photos.php:1200 mod/photos.php:1585 msgid "Show to Contacts" msgstr "" -#: mod/settings.php:1230 +#: mod/settings.php:1233 msgid "Default Private Post" msgstr "" -#: mod/settings.php:1231 +#: mod/settings.php:1234 msgid "Default Public Post" msgstr "" -#: mod/settings.php:1235 +#: mod/settings.php:1238 msgid "Default Permissions for New Posts" msgstr "" -#: mod/settings.php:1247 +#: mod/settings.php:1250 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: mod/settings.php:1250 +#: mod/settings.php:1253 msgid "Notification Settings" msgstr "" -#: mod/settings.php:1251 +#: mod/settings.php:1254 msgid "By default post a status message when:" msgstr "" -#: mod/settings.php:1252 +#: mod/settings.php:1255 msgid "accepting a friend request" msgstr "" -#: mod/settings.php:1253 +#: mod/settings.php:1256 msgid "joining a forum/community" msgstr "" -#: mod/settings.php:1254 +#: mod/settings.php:1257 msgid "making an interesting profile change" msgstr "" -#: mod/settings.php:1255 +#: mod/settings.php:1258 msgid "Send a notification email when:" msgstr "" -#: mod/settings.php:1256 +#: mod/settings.php:1259 msgid "You receive an introduction" msgstr "" -#: mod/settings.php:1257 +#: mod/settings.php:1260 msgid "Your introductions are confirmed" msgstr "" -#: mod/settings.php:1258 +#: mod/settings.php:1261 msgid "Someone writes on your profile wall" msgstr "" -#: mod/settings.php:1259 +#: mod/settings.php:1262 msgid "Someone writes a followup comment" msgstr "" -#: mod/settings.php:1260 +#: mod/settings.php:1263 msgid "You receive a private message" msgstr "" -#: mod/settings.php:1261 +#: mod/settings.php:1264 msgid "You receive a friend suggestion" msgstr "" -#: mod/settings.php:1262 +#: mod/settings.php:1265 msgid "You are tagged in a post" msgstr "" -#: mod/settings.php:1263 +#: mod/settings.php:1266 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: mod/settings.php:1265 +#: mod/settings.php:1268 msgid "Activate desktop notifications" msgstr "" -#: mod/settings.php:1265 +#: mod/settings.php:1268 msgid "Show desktop popup on new notifications" msgstr "" -#: mod/settings.php:1267 +#: mod/settings.php:1270 msgid "Text-only notification emails" msgstr "" -#: mod/settings.php:1269 +#: mod/settings.php:1272 msgid "Send text only notification emails, without the html part" msgstr "" -#: mod/settings.php:1271 +#: mod/settings.php:1274 msgid "Advanced Account/Page Type Settings" msgstr "" -#: mod/settings.php:1272 +#: mod/settings.php:1275 msgid "Change the behaviour of this account for special situations" msgstr "" -#: mod/settings.php:1275 +#: mod/settings.php:1278 msgid "Relocate" msgstr "" -#: mod/settings.php:1276 +#: mod/settings.php:1279 msgid "" "If you have moved this profile from another server, and some of your " "contacts don't receive your updates, try pushing this button." msgstr "" -#: mod/settings.php:1277 +#: mod/settings.php:1280 msgid "Resend relocate message to contacts" msgstr "" @@ -5070,7 +5096,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: mod/register.php:280 boot.php:1256 include/nav.php:108 +#: mod/register.php:280 boot.php:1271 include/nav.php:108 msgid "Register" msgstr "" @@ -5090,62 +5116,54 @@ msgstr "" msgid "Only logged in users are permitted to perform a search." msgstr "" -#: mod/search.php:115 +#: mod/search.php:124 msgid "Too Many Requests" msgstr "" -#: mod/search.php:116 +#: mod/search.php:125 msgid "Only one search per minute is permitted for not logged in users." msgstr "" -#: mod/search.php:126 include/text.php:1003 include/nav.php:118 +#: mod/search.php:136 include/text.php:1003 include/nav.php:118 msgid "Search" msgstr "" -#: mod/search.php:224 +#: mod/search.php:234 #, php-format msgid "Items tagged with: %s" msgstr "" -#: mod/search.php:226 +#: mod/search.php:236 #, php-format msgid "Search results for: %s" msgstr "" -#: mod/directory.php:116 mod/profiles.php:760 -msgid "Age: " -msgstr "" - -#: mod/directory.php:119 -msgid "Gender: " -msgstr "" - -#: mod/directory.php:143 include/identity.php:283 include/identity.php:573 +#: mod/directory.php:149 include/identity.php:309 include/identity.php:600 msgid "Status:" msgstr "" -#: mod/directory.php:145 include/identity.php:285 include/identity.php:584 +#: mod/directory.php:151 include/identity.php:311 include/identity.php:611 msgid "Homepage:" msgstr "" -#: mod/directory.php:195 view/theme/diabook/theme.php:525 +#: mod/directory.php:203 view/theme/diabook/theme.php:525 #: view/theme/vier/theme.php:205 msgid "Global Directory" msgstr "" -#: mod/directory.php:197 +#: mod/directory.php:205 msgid "Find on this site" msgstr "" -#: mod/directory.php:199 +#: mod/directory.php:207 msgid "Finding:" msgstr "" -#: mod/directory.php:201 +#: mod/directory.php:209 msgid "Site Directory" msgstr "" -#: mod/directory.php:208 +#: mod/directory.php:216 msgid "No entries (some entries may be hidden)." msgstr "" @@ -5184,14 +5202,10 @@ msgstr "" msgid "No entries." msgstr "" -#: mod/common.php:85 +#: mod/common.php:87 msgid "No contacts in common." msgstr "" -#: mod/common.php:133 -msgid "Common Friends" -msgstr "" - #: mod/uexport.php:77 msgid "Export account" msgstr "" @@ -5273,11 +5287,11 @@ msgstr "" msgid "Romantic Partner" msgstr "" -#: mod/profiles.php:344 mod/photos.php:1639 include/conversation.php:508 +#: mod/profiles.php:344 mod/photos.php:1647 include/conversation.php:508 msgid "Likes" msgstr "" -#: mod/profiles.php:348 mod/photos.php:1639 include/conversation.php:508 +#: mod/profiles.php:348 mod/photos.php:1647 include/conversation.php:508 msgid "Dislikes" msgstr "" @@ -5456,7 +5470,7 @@ msgstr "" msgid "Since [date]:" msgstr "" -#: mod/profiles.php:724 include/identity.php:582 +#: mod/profiles.php:724 include/identity.php:609 msgid "Sexual Preference:" msgstr "" @@ -5464,11 +5478,11 @@ msgstr "" msgid "Homepage URL:" msgstr "" -#: mod/profiles.php:726 include/identity.php:586 +#: mod/profiles.php:726 include/identity.php:613 msgid "Hometown:" msgstr "" -#: mod/profiles.php:727 include/identity.php:590 +#: mod/profiles.php:727 include/identity.php:617 msgid "Political Views:" msgstr "" @@ -5484,11 +5498,11 @@ msgstr "" msgid "Private Keywords:" msgstr "" -#: mod/profiles.php:731 include/identity.php:598 +#: mod/profiles.php:731 include/identity.php:625 msgid "Likes:" msgstr "" -#: mod/profiles.php:732 include/identity.php:600 +#: mod/profiles.php:732 include/identity.php:627 msgid "Dislikes:" msgstr "" @@ -5550,27 +5564,31 @@ msgid "" "be visible to anybody using the internet." msgstr "" +#: mod/profiles.php:760 +msgid "Age: " +msgstr "" + #: mod/profiles.php:813 msgid "Edit/Manage Profiles" msgstr "" -#: mod/profiles.php:814 include/identity.php:241 include/identity.php:267 +#: mod/profiles.php:814 include/identity.php:257 include/identity.php:283 msgid "Change profile photo" msgstr "" -#: mod/profiles.php:815 include/identity.php:242 +#: mod/profiles.php:815 include/identity.php:258 msgid "Create New Profile" msgstr "" -#: mod/profiles.php:826 include/identity.php:252 +#: mod/profiles.php:826 include/identity.php:268 msgid "Profile Image" msgstr "" -#: mod/profiles.php:828 include/identity.php:255 +#: mod/profiles.php:828 include/identity.php:271 msgid "visible to everybody" msgstr "" -#: mod/profiles.php:829 include/identity.php:256 +#: mod/profiles.php:829 include/identity.php:272 msgid "Edit visibility" msgstr "" @@ -5582,75 +5600,75 @@ msgstr "" msgid "Edit post" msgstr "" -#: mod/editpost.php:110 include/conversation.php:1185 +#: mod/editpost.php:111 include/conversation.php:1185 msgid "upload photo" msgstr "" -#: mod/editpost.php:111 include/conversation.php:1186 +#: mod/editpost.php:112 include/conversation.php:1186 msgid "Attach file" msgstr "" -#: mod/editpost.php:112 include/conversation.php:1187 +#: mod/editpost.php:113 include/conversation.php:1187 msgid "attach file" msgstr "" -#: mod/editpost.php:114 include/conversation.php:1189 +#: mod/editpost.php:115 include/conversation.php:1189 msgid "web link" msgstr "" -#: mod/editpost.php:115 include/conversation.php:1190 +#: mod/editpost.php:116 include/conversation.php:1190 msgid "Insert video link" msgstr "" -#: mod/editpost.php:116 include/conversation.php:1191 +#: mod/editpost.php:117 include/conversation.php:1191 msgid "video link" msgstr "" -#: mod/editpost.php:117 include/conversation.php:1192 +#: mod/editpost.php:118 include/conversation.php:1192 msgid "Insert audio link" msgstr "" -#: mod/editpost.php:118 include/conversation.php:1193 +#: mod/editpost.php:119 include/conversation.php:1193 msgid "audio link" msgstr "" -#: mod/editpost.php:119 include/conversation.php:1194 +#: mod/editpost.php:120 include/conversation.php:1194 msgid "Set your location" msgstr "" -#: mod/editpost.php:120 include/conversation.php:1195 +#: mod/editpost.php:121 include/conversation.php:1195 msgid "set location" msgstr "" -#: mod/editpost.php:121 include/conversation.php:1196 +#: mod/editpost.php:122 include/conversation.php:1196 msgid "Clear browser location" msgstr "" -#: mod/editpost.php:122 include/conversation.php:1197 +#: mod/editpost.php:123 include/conversation.php:1197 msgid "clear location" msgstr "" -#: mod/editpost.php:124 include/conversation.php:1203 +#: mod/editpost.php:125 include/conversation.php:1203 msgid "Permission settings" msgstr "" -#: mod/editpost.php:132 include/acl_selectors.php:344 +#: mod/editpost.php:133 include/acl_selectors.php:344 msgid "CC: email addresses" msgstr "" -#: mod/editpost.php:133 include/conversation.php:1212 +#: mod/editpost.php:134 include/conversation.php:1212 msgid "Public post" msgstr "" -#: mod/editpost.php:136 include/conversation.php:1199 +#: mod/editpost.php:137 include/conversation.php:1199 msgid "Set title" msgstr "" -#: mod/editpost.php:138 include/conversation.php:1201 +#: mod/editpost.php:139 include/conversation.php:1201 msgid "Categories (comma-separated list)" msgstr "" -#: mod/editpost.php:139 include/acl_selectors.php:345 +#: mod/editpost.php:140 include/acl_selectors.php:345 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -5716,7 +5734,7 @@ msgstr "" msgid "Visible to:" msgstr "" -#: mod/notes.php:46 include/identity.php:694 +#: mod/notes.php:46 include/identity.php:721 msgid "Personal Notes" msgstr "" @@ -5873,196 +5891,196 @@ msgid "" "important, please visit http://friendica.com" msgstr "" -#: mod/photos.php:91 include/identity.php:669 +#: mod/photos.php:99 include/identity.php:696 msgid "Photo Albums" msgstr "" -#: mod/photos.php:92 mod/photos.php:1891 +#: mod/photos.php:100 mod/photos.php:1899 msgid "Recent Photos" msgstr "" -#: mod/photos.php:95 mod/photos.php:1312 mod/photos.php:1893 +#: mod/photos.php:103 mod/photos.php:1320 mod/photos.php:1901 msgid "Upload New Photos" msgstr "" -#: mod/photos.php:173 +#: mod/photos.php:181 msgid "Contact information unavailable" msgstr "" -#: mod/photos.php:194 +#: mod/photos.php:202 msgid "Album not found." msgstr "" -#: mod/photos.php:224 mod/photos.php:236 mod/photos.php:1254 +#: mod/photos.php:232 mod/photos.php:244 mod/photos.php:1262 msgid "Delete Album" msgstr "" -#: mod/photos.php:234 +#: mod/photos.php:242 msgid "Do you really want to delete this photo album and all its photos?" msgstr "" -#: mod/photos.php:314 mod/photos.php:325 mod/photos.php:1572 +#: mod/photos.php:322 mod/photos.php:333 mod/photos.php:1580 msgid "Delete Photo" msgstr "" -#: mod/photos.php:323 +#: mod/photos.php:331 msgid "Do you really want to delete this photo?" msgstr "" -#: mod/photos.php:698 +#: mod/photos.php:706 #, php-format msgid "%1$s was tagged in %2$s by %3$s" msgstr "" -#: mod/photos.php:698 +#: mod/photos.php:706 msgid "a photo" msgstr "" -#: mod/photos.php:811 +#: mod/photos.php:819 msgid "Image file is empty." msgstr "" -#: mod/photos.php:978 +#: mod/photos.php:986 msgid "No photos selected" msgstr "" -#: mod/photos.php:1139 +#: mod/photos.php:1147 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: mod/photos.php:1174 +#: mod/photos.php:1182 msgid "Upload Photos" msgstr "" -#: mod/photos.php:1178 mod/photos.php:1249 +#: mod/photos.php:1186 mod/photos.php:1257 msgid "New album name: " msgstr "" -#: mod/photos.php:1179 +#: mod/photos.php:1187 msgid "or existing album name: " msgstr "" -#: mod/photos.php:1180 +#: mod/photos.php:1188 msgid "Do not show a status post for this upload" msgstr "" -#: mod/photos.php:1182 mod/photos.php:1567 include/acl_selectors.php:347 +#: mod/photos.php:1190 mod/photos.php:1575 include/acl_selectors.php:347 msgid "Permissions" msgstr "" -#: mod/photos.php:1193 +#: mod/photos.php:1201 msgid "Private Photo" msgstr "" -#: mod/photos.php:1194 +#: mod/photos.php:1202 msgid "Public Photo" msgstr "" -#: mod/photos.php:1262 +#: mod/photos.php:1270 msgid "Edit Album" msgstr "" -#: mod/photos.php:1268 +#: mod/photos.php:1276 msgid "Show Newest First" msgstr "" -#: mod/photos.php:1270 +#: mod/photos.php:1278 msgid "Show Oldest First" msgstr "" -#: mod/photos.php:1298 mod/photos.php:1876 +#: mod/photos.php:1306 mod/photos.php:1884 msgid "View Photo" msgstr "" -#: mod/photos.php:1345 +#: mod/photos.php:1353 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: mod/photos.php:1347 +#: mod/photos.php:1355 msgid "Photo not available" msgstr "" -#: mod/photos.php:1403 +#: mod/photos.php:1411 msgid "View photo" msgstr "" -#: mod/photos.php:1403 +#: mod/photos.php:1411 msgid "Edit photo" msgstr "" -#: mod/photos.php:1404 +#: mod/photos.php:1412 msgid "Use as profile photo" msgstr "" -#: mod/photos.php:1429 +#: mod/photos.php:1437 msgid "View Full Size" msgstr "" -#: mod/photos.php:1515 +#: mod/photos.php:1523 msgid "Tags: " msgstr "" -#: mod/photos.php:1518 +#: mod/photos.php:1526 msgid "[Remove any tag]" msgstr "" -#: mod/photos.php:1558 +#: mod/photos.php:1566 msgid "New album name" msgstr "" -#: mod/photos.php:1559 +#: mod/photos.php:1567 msgid "Caption" msgstr "" -#: mod/photos.php:1560 +#: mod/photos.php:1568 msgid "Add a Tag" msgstr "" -#: mod/photos.php:1560 +#: mod/photos.php:1568 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: mod/photos.php:1561 +#: mod/photos.php:1569 msgid "Do not rotate" msgstr "" -#: mod/photos.php:1562 +#: mod/photos.php:1570 msgid "Rotate CW (right)" msgstr "" -#: mod/photos.php:1563 +#: mod/photos.php:1571 msgid "Rotate CCW (left)" msgstr "" -#: mod/photos.php:1578 +#: mod/photos.php:1586 msgid "Private photo" msgstr "" -#: mod/photos.php:1579 +#: mod/photos.php:1587 msgid "Public photo" msgstr "" -#: mod/photos.php:1601 include/conversation.php:1183 +#: mod/photos.php:1609 include/conversation.php:1183 msgid "Share" msgstr "" -#: mod/photos.php:1640 include/conversation.php:509 +#: mod/photos.php:1648 include/conversation.php:509 #: include/conversation.php:1414 msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: mod/photos.php:1640 include/conversation.php:509 +#: mod/photos.php:1648 include/conversation.php:509 msgid "Not attending" msgstr "" -#: mod/photos.php:1640 include/conversation.php:509 +#: mod/photos.php:1648 include/conversation.php:509 msgid "Might attend" msgstr "" -#: mod/photos.php:1805 +#: mod/photos.php:1813 msgid "Map" msgstr "" @@ -6122,60 +6140,60 @@ msgstr "" msgid "Item was not found." msgstr "" -#: boot.php:771 +#: boot.php:786 msgid "Delete this item?" msgstr "" -#: boot.php:774 +#: boot.php:789 msgid "show fewer" msgstr "" -#: boot.php:1148 +#: boot.php:1163 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: boot.php:1255 +#: boot.php:1270 msgid "Create a New Account" msgstr "" -#: boot.php:1280 include/nav.php:72 +#: boot.php:1295 include/nav.php:72 msgid "Logout" msgstr "" -#: boot.php:1283 +#: boot.php:1298 msgid "Nickname or Email address: " msgstr "" -#: boot.php:1284 +#: boot.php:1299 msgid "Password: " msgstr "" -#: boot.php:1285 +#: boot.php:1300 msgid "Remember me" msgstr "" -#: boot.php:1288 +#: boot.php:1303 msgid "Or login using OpenID: " msgstr "" -#: boot.php:1294 +#: boot.php:1309 msgid "Forgot your password?" msgstr "" -#: boot.php:1297 +#: boot.php:1312 msgid "Website Terms of Service" msgstr "" -#: boot.php:1298 +#: boot.php:1313 msgid "terms of service" msgstr "" -#: boot.php:1300 +#: boot.php:1315 msgid "Website Privacy Policy" msgstr "" -#: boot.php:1301 +#: boot.php:1316 msgid "privacy policy" msgstr "" @@ -6237,11 +6255,11 @@ msgid "" "[pre]%s[/pre]" msgstr "" -#: include/dbstructure.php:152 +#: include/dbstructure.php:151 msgid "Errors encountered creating database tables." msgstr "" -#: include/dbstructure.php:210 +#: include/dbstructure.php:209 msgid "Errors encountered performing database changes." msgstr "" @@ -6324,6 +6342,13 @@ msgstr "" msgid "Categories" msgstr "" +#: include/contact_widgets.php:237 +#, php-format +msgid "%d contact in common" +msgid_plural "%d contacts in common" +msgstr[0] "" +msgstr[1] "" + #: include/features.php:58 msgid "General Features" msgstr "" @@ -6670,12 +6695,12 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: include/datetime.php:474 include/items.php:2444 +#: include/datetime.php:474 include/items.php:2470 #, php-format msgid "%s's birthday" msgstr "" -#: include/datetime.php:475 include/items.php:2445 +#: include/datetime.php:475 include/items.php:2471 #, php-format msgid "Happy Birthday %s" msgstr "" @@ -6684,148 +6709,132 @@ msgstr "" msgid "Requested account is not available." msgstr "" -#: include/identity.php:126 include/identity.php:265 include/identity.php:625 +#: include/identity.php:96 include/identity.php:281 include/identity.php:652 msgid "Edit profile" msgstr "" -#: include/identity.php:225 +#: include/identity.php:241 msgid "Atom feed" msgstr "" -#: include/identity.php:230 +#: include/identity.php:246 msgid "Message" msgstr "" -#: include/identity.php:236 include/nav.php:185 +#: include/identity.php:252 include/nav.php:185 msgid "Profiles" msgstr "" -#: include/identity.php:236 +#: include/identity.php:252 msgid "Manage/edit profiles" msgstr "" -#: include/identity.php:353 -msgid "Network:" -msgstr "" - -#: include/identity.php:385 include/identity.php:471 +#: include/identity.php:412 include/identity.php:498 msgid "g A l F d" msgstr "" -#: include/identity.php:386 include/identity.php:472 +#: include/identity.php:413 include/identity.php:499 msgid "F d" msgstr "" -#: include/identity.php:431 include/identity.php:518 +#: include/identity.php:458 include/identity.php:545 msgid "[today]" msgstr "" -#: include/identity.php:443 +#: include/identity.php:470 msgid "Birthday Reminders" msgstr "" -#: include/identity.php:444 +#: include/identity.php:471 msgid "Birthdays this week:" msgstr "" -#: include/identity.php:505 +#: include/identity.php:532 msgid "[No description]" msgstr "" -#: include/identity.php:529 +#: include/identity.php:556 msgid "Event Reminders" msgstr "" -#: include/identity.php:530 +#: include/identity.php:557 msgid "Events this week:" msgstr "" -#: include/identity.php:558 +#: include/identity.php:585 msgid "j F, Y" msgstr "" -#: include/identity.php:559 +#: include/identity.php:586 msgid "j F" msgstr "" -#: include/identity.php:566 +#: include/identity.php:593 msgid "Birthday:" msgstr "" -#: include/identity.php:570 +#: include/identity.php:597 msgid "Age:" msgstr "" -#: include/identity.php:579 +#: include/identity.php:606 #, php-format msgid "for %1$d %2$s" msgstr "" -#: include/identity.php:592 +#: include/identity.php:619 msgid "Religion:" msgstr "" -#: include/identity.php:596 +#: include/identity.php:623 msgid "Hobbies/Interests:" msgstr "" -#: include/identity.php:603 +#: include/identity.php:630 msgid "Contact information and Social Networks:" msgstr "" -#: include/identity.php:605 +#: include/identity.php:632 msgid "Musical interests:" msgstr "" -#: include/identity.php:607 +#: include/identity.php:634 msgid "Books, literature:" msgstr "" -#: include/identity.php:609 +#: include/identity.php:636 msgid "Television:" msgstr "" -#: include/identity.php:611 +#: include/identity.php:638 msgid "Film/dance/culture/entertainment:" msgstr "" -#: include/identity.php:613 +#: include/identity.php:640 msgid "Love/Romance:" msgstr "" -#: include/identity.php:615 +#: include/identity.php:642 msgid "Work/employment:" msgstr "" -#: include/identity.php:617 +#: include/identity.php:644 msgid "School/education:" msgstr "" -#: include/identity.php:621 +#: include/identity.php:648 msgid "Forums:" msgstr "" -#: include/identity.php:650 include/nav.php:75 -msgid "Status" -msgstr "" - -#: include/identity.php:653 -msgid "Status Messages and Posts" -msgstr "" - -#: include/identity.php:661 -msgid "Profile Details" -msgstr "" - -#: include/identity.php:674 include/identity.php:677 include/nav.php:78 +#: include/identity.php:701 include/identity.php:704 include/nav.php:78 msgid "Videos" msgstr "" -#: include/identity.php:689 include/nav.php:140 +#: include/identity.php:716 include/nav.php:140 msgid "Events and Calendar" msgstr "" -#: include/identity.php:697 +#: include/identity.php:724 msgid "Only You Can See This" msgstr "" @@ -7155,6 +7164,10 @@ msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" +#: include/text.php:921 +msgid "View Contacts" +msgstr "" + #: include/text.php:1010 include/nav.php:121 msgid "Full Text" msgstr "" @@ -7307,19 +7320,21 @@ msgstr "" msgid "view on separate page" msgstr "" -#: include/text.php:1997 +#: include/text.php:1995 msgid "activity" msgstr "" -#: include/text.php:2000 +#: include/text.php:1998 msgid "post" msgstr "" -#: include/text.php:2168 +#: include/text.php:2166 msgid "Item filed" msgstr "" #: include/bbcode.php:483 include/bbcode.php:1143 include/bbcode.php:1144 +#: addons-extra/bbextra/bbextra.php:33 addons-extra/bbextra/bbextra.php:34 +#: addons-extra/bbextra/bbextra.php:35 addons-extra/bbextra/bbextra.php:36 msgid "Image/photo" msgstr "" @@ -7779,15 +7794,15 @@ msgstr "" msgid "Sharing notification from Diaspora network" msgstr "" -#: include/diaspora.php:2574 +#: include/diaspora.php:2606 msgid "Attachments:" msgstr "" -#: include/items.php:4871 +#: include/items.php:4897 msgid "Do you really want to delete this item?" msgstr "" -#: include/items.php:5146 +#: include/items.php:5172 msgid "Archives" msgstr "" @@ -8347,6 +8362,369 @@ msgstr[1] "" msgid "Done. You can now login with your username and password" msgstr "" +#: addons-extra/pool_master/pool_master.php:19 +msgid "Pool Master" +msgstr "" + +#: addons-extra/apps/apps.php:19 +msgid "Test Addon" +msgstr "" + +#: addons-extra/video_chat/video_chat.php:19 +msgid "Video Chat" +msgstr "" + +#: addons-extra/video_chat/video_chat.php:30 +msgid "" +"You must be authenticated to use this addon! Either login, or visit this " +"site via a magic link. " +msgstr "" + +#: addons-extra/moshimonsters/moshimonsters.php:19 +msgid "Moshi Monsters" +msgstr "" + +#: addons-extra/xkcd/xkcd.php:19 +msgid "XKCD" +msgstr "" + +#: addons-extra/mathletics/mathletics.php:19 +msgid "Mathletics" +msgstr "" + +#: addons-extra/fairy_fashion/fairy_fashion.php:20 +msgid "Fairy Fashion" +msgstr "" + +#: addons-extra/etherpadlite/etherpadlite.php:40 +msgid "Etherpad-Lite" +msgstr "" + +#: addons-extra/etherpadlite/etherpadlite.php:49 +msgid "Only local user can access the Etherpad-Lite app." +msgstr "" + +#: addons-extra/etherpadlite/etherpadlite.php:64 +msgid "Etherpad-Lite Base URL" +msgstr "" + +#: addons-extra/etherpadlite/etherpadlite.php:64 +msgid "Absolute path to your Etherpad-Lite installation. (with trailing slash)" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:181 +msgid "Facebook Group disabled" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:201 +msgid "Facebook API key is missing." +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:208 addons-extra/fbgroup/fbgroup.php:292 +msgid "Facebook Group" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:214 +msgid "Install Facebook Group connector for this account." +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:221 +msgid "Remove Facebook Group connector" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:226 +msgid "" +"Re-authenticate [This is necessary whenever your Facebook password is " +"changed.]" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:233 +msgid "Post to Facebook group by default" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:237 +msgid "Suppress \"View on friendica\"" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:241 +msgid "Mirror wall posts from facebook to friendica." +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:251 +msgid "Post to page/group:" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:293 +msgid "Facebook Group Settings" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:308 +msgid "Facebook API Key" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:315 +msgid "" +"Error: it appears that you have specified the App-ID and -Secret in your ." +"htconfig.php file. As long as they are specified there, they cannot be set " +"using this form.

    " +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:317 +msgid "App-ID / API-Key" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:318 +msgid "Application secret" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:336 +msgid "The new values have been saved." +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:355 +msgid "Post to Facebook Group" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:374 +#, php-format +msgid "%s:" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:483 +msgid "" +"Post to Facebook cancelled because of multi-network access permission " +"conflict." +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:762 +msgid "View on Friendica" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:798 +msgid "Facebook group post failed. Queued for retry." +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:816 +msgid "Administrator" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:838 +msgid "Your Facebook connection became invalid. Please Re-authenticate." +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:839 +msgid "Facebook connection became invalid" +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:840 +#, php-format +msgid "" +"Hi %1$s,\n" +"\n" +"The connection between your accounts on %2$s and Facebook became invalid. " +"This usually happens after you change your Facebook-password. To enable the " +"connection again, you have to %3$sre-authenticate the Facebook-connector%4$s." +msgstr "" + +#: addons-extra/fbgroup/fbgroup.php:1445 +#, php-format +msgid "%1$feed likes %2$feed's %3$feed" +msgstr "" + +#: addons-extra/urban_dead/urban_dead.php:19 +msgid "Urban Dead" +msgstr "" + +#: addons-extra/maya_locations/maya_locations.php:151 +msgid "Maya Location Settings" +msgstr "" + +#: addons-extra/maya_locations/maya_locations.php:153 +msgid "Enable Maya Locations Plugin" +msgstr "" + +#: addons-extra/lasttweets/lasttweets.php:64 +msgid "Twitter Widget Settings" +msgstr "" + +#: addons-extra/lasttweets/lasttweets.php:65 +msgid "" +"You can include the widget in the sidebar of your Network strean (for your " +"eyes only) and on the bottom of your profile page (for everybody). Both " +"locations can be enabled separately with different search items and settings." +msgstr "" + +#: addons-extra/lasttweets/lasttweets.php:67 +msgid "Sidebar Settings" +msgstr "" + +#: addons-extra/lasttweets/lasttweets.php:69 +#: addons-extra/lasttweets/lasttweets.php:86 +msgid "Search Item at Twitter" +msgstr "" + +#: addons-extra/lasttweets/lasttweets.php:73 +#: addons-extra/lasttweets/lasttweets.php:90 +msgid "Inner Color (hexcode)" +msgstr "" + +#: addons-extra/lasttweets/lasttweets.php:77 +#: addons-extra/lasttweets/lasttweets.php:94 +msgid "Outer Color (hexcode)" +msgstr "" + +#: addons-extra/lasttweets/lasttweets.php:81 +msgid "Enable Twitter Widget (Sidebar)" +msgstr "" + +#: addons-extra/lasttweets/lasttweets.php:84 +msgid "Profile Settings" +msgstr "" + +#: addons-extra/lasttweets/lasttweets.php:98 +msgid "Enable Twitter Widget (Below Profile)" +msgstr "" + +#: addons-extra/cthulhu_mythos_locations/cthulhu_mythos_locations.php:150 +msgid "Cthulhu Mythos Location Settings" +msgstr "" + +#: addons-extra/cthulhu_mythos_locations/cthulhu_mythos_locations.php:152 +msgid "Enable Cthulhu Mythos Locations Plugin" +msgstr "" + +#: addons-extra/browser_quest/browser_quest.php:19 +msgid "Browser Quest" +msgstr "" + +#: addons-extra/donate/donate.php:61 +msgid "Image location of your preffered payment method" +msgstr "" + +#: addons-extra/donate/donate.php:61 +msgid "eg http://somewebsite.com/someimage.jpg" +msgstr "" + +#: addons-extra/donate/donate.php:62 +msgid "Method one link" +msgstr "" + +#: addons-extra/donate/donate.php:62 addons-extra/donate/donate.php:64 +#: addons-extra/donate/donate.php:66 addons-extra/donate/donate.php:68 +#: addons-extra/donate/donate.php:70 +msgid "Link to the payment gateway provided by your payment processor." +msgstr "" + +#: addons-extra/donate/donate.php:63 +msgid "Method Two" +msgstr "" + +#: addons-extra/donate/donate.php:63 +msgid "Image location of your second payment method" +msgstr "" + +#: addons-extra/donate/donate.php:64 +msgid "Method two URL" +msgstr "" + +#: addons-extra/donate/donate.php:65 +msgid "Method Three" +msgstr "" + +#: addons-extra/donate/donate.php:65 +msgid "Image location of your third payment method" +msgstr "" + +#: addons-extra/donate/donate.php:66 +msgid "Method three URL" +msgstr "" + +#: addons-extra/donate/donate.php:67 +msgid "Method Four" +msgstr "" + +#: addons-extra/donate/donate.php:67 +msgid "Image location of your fourth payment method" +msgstr "" + +#: addons-extra/donate/donate.php:68 +msgid "Method four URL" +msgstr "" + +#: addons-extra/donate/donate.php:69 +msgid "Method Five" +msgstr "" + +#: addons-extra/donate/donate.php:69 +msgid "Image location of your fifth payment method" +msgstr "" + +#: addons-extra/donate/donate.php:70 +msgid "Method five URL" +msgstr "" + +#: addons-extra/donate/donate.php:77 +msgid "Donate" +msgstr "" + +#: addons-extra/donate/donate.php:78 +msgid "" +"Public servers are not actually \"free\". Someone has to put their time and " +"effort into creating, and maintaining them, handling support requests, " +"fixing bugs, answering support requests, etc, etc. Access to free Friendica " +"servers is a privilege, not a right and can cost admins a significant amount " +"of money. Public servers are not scalable in the long term. The only way " +"we can grow to support new users is with YOUR help." +msgstr "" + +#: addons-extra/donate/donate.php:80 +msgid "" +"It is estimated by public server admins that the cost of hosting an " +"individual is between 1 and 2 cents per contact, per month. This may not " +"sound a lot, but multiply your 500 Facebook contacts by just ten users, and " +"you can see how this is unsustainable. Below are the payment methods your " +"admin can accept to help spread the cost of this service and ensure " +"Friendica public servers are available for everybody who needs one." +msgstr "" + +#: addons-extra/donate/donate.php:82 +msgid "" +"Donations are taken in good faith, and are non-refundable other than in " +"cases of fraud" +msgstr "" + +#: addons-extra/canicheatdeath/canicheatdeath.php:20 +msgid "Can I Cheat Death?" +msgstr "" + +#: addons-extra/flip/flip.php:19 +msgid "Flip the text" +msgstr "" + +#: addons-extra/kids_chat/kids_chat.php:19 +msgid "Kids Chat" +msgstr "" + +#: addons-extra/girlsgogames/girlsgogames.php:19 +msgid "GirlsGoGames" +msgstr "" + +#: addons-extra/weknowwhatyouredoing/weknowwhatyouredoing.php:20 +msgid "We Know What You Are Doing" +msgstr "" + +#: addons-extra/dungeons_and_treasures/dungeons_and_treasures.php:19 +msgid "Dungeons And Treasures" +msgstr "" + +#: addons-extra/binweevils/binweevils.php:19 +msgid "BinWeevils" +msgstr "" + +#: addons-extra/reddit/reddit.php:19 +msgid "Reddit Reader" +msgstr "" + #: index.php:441 msgid "toggle mobile" msgstr "" From 448be5cfbda4744f265bd33b488f6634626f7aae Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 14 Dec 2015 07:51:11 +0100 Subject: [PATCH 311/313] exclude addons-extra directory from the translation as well --- util/run_xgettext.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh index 8ecfec9446..78c1bae5f1 100755 --- a/util/run_xgettext.sh +++ b/util/run_xgettext.sh @@ -48,7 +48,7 @@ case "$MODE" in OUTFILE="$FULLPATH/messages.po" FINDSTARTDIR="." # skip addon folder - FINDOPTS="( -wholename */addon -or -wholename */smarty3 ) -prune -o" + FINDOPTS="( -wholename */addon -or -wholename */addons-extra -or -wholename */smarty3 ) -prune -o" F9KVERSION=$(sed -n "s/.*'FRIENDICA_VERSION'.*'\([0-9.]*\)'.*/\1/p" ./boot.php); echo "Friendica version $F9KVERSION" From c8b6c3bedfd2910d320e1c329d4b6d5a071a7bde Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 14 Dec 2015 07:51:27 +0100 Subject: [PATCH 312/313] regenerated messages.po file, excluding addons-extra stuff --- util/messages.po | 991 +++++++++++++++-------------------------------- 1 file changed, 303 insertions(+), 688 deletions(-) diff --git a/util/messages.po b/util/messages.po index b6e579b1a7..9dd02bbeb1 100644 --- a/util/messages.po +++ b/util/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-13 08:51+0100\n" +"POT-Creation-Date: 2015-12-14 07:48+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -70,8 +70,7 @@ msgstr "" #: mod/api.php:31 mod/notes.php:22 mod/poke.php:149 mod/repair_ostatus.php:9 #: mod/invite.php:15 mod/invite.php:101 mod/photos.php:171 mod/photos.php:1105 #: mod/regmod.php:110 mod/uimport.php:23 mod/attach.php:33 -#: include/items.php:5067 addons-extra/fbgroup/fbgroup.php:168 -#: addons-extra/fbgroup/fbgroup.php:174 index.php:382 +#: include/items.php:5067 index.php:382 msgid "Permission denied." msgstr "" @@ -146,7 +145,7 @@ msgstr "" msgid "Private communications are not available for this contact." msgstr "" -#: mod/contacts.php:543 mod/admin.php:647 +#: mod/contacts.php:543 mod/admin.php:645 msgid "Never" msgstr "" @@ -175,7 +174,7 @@ msgstr "" msgid "Fetch further information for feeds" msgstr "" -#: mod/contacts.php:570 mod/admin.php:656 +#: mod/contacts.php:570 mod/admin.php:654 msgid "Disabled" msgstr "" @@ -194,16 +193,10 @@ msgstr "" #: mod/localtime.php:45 mod/poke.php:198 mod/invite.php:140 mod/photos.php:1137 #: mod/photos.php:1261 mod/photos.php:1579 mod/photos.php:1630 #: mod/photos.php:1678 mod/photos.php:1766 object/Item.php:710 -#: addons-extra/etherpadlite/etherpadlite.php:63 -#: addons-extra/fbgroup/fbgroup.php:278 -#: addons-extra/maya_locations/maya_locations.php:159 -#: addons-extra/lasttweets/lasttweets.php:102 -#: addons-extra/cthulhu_mythos_locations/cthulhu_mythos_locations.php:158 -#: addons-extra/donate/donate.php:60 view/theme/cleanzero/config.php:80 -#: view/theme/dispy/config.php:70 view/theme/quattro/config.php:64 -#: view/theme/diabook/config.php:148 view/theme/diabook/theme.php:633 -#: view/theme/clean/config.php:83 view/theme/vier/config.php:107 -#: view/theme/duepuntozero/config.php:59 +#: view/theme/cleanzero/config.php:80 view/theme/dispy/config.php:70 +#: view/theme/quattro/config.php:64 view/theme/diabook/config.php:148 +#: view/theme/diabook/theme.php:633 view/theme/clean/config.php:83 +#: view/theme/vier/config.php:107 view/theme/duepuntozero/config.php:59 msgid "Submit" msgstr "" @@ -260,7 +253,7 @@ msgstr "" msgid "Update public posts" msgstr "" -#: mod/contacts.php:609 mod/admin.php:1656 +#: mod/contacts.php:609 mod/admin.php:1653 msgid "Update now" msgstr "" @@ -271,12 +264,12 @@ msgid "Connect/Follow" msgstr "" #: mod/contacts.php:614 mod/contacts.php:805 mod/contacts.php:864 -#: mod/admin.php:1120 +#: mod/admin.php:1117 msgid "Unblock" msgstr "" #: mod/contacts.php:614 mod/contacts.php:805 mod/contacts.php:864 -#: mod/admin.php:1119 +#: mod/admin.php:1116 msgid "Block" msgstr "" @@ -434,7 +427,7 @@ msgstr "" msgid "Unarchive" msgstr "" -#: mod/contacts.php:808 mod/group.php:171 mod/admin.php:1118 +#: mod/contacts.php:808 mod/group.php:171 mod/admin.php:1115 #: mod/content.php:440 mod/content.php:743 mod/settings.php:713 #: mod/photos.php:1723 object/Item.php:134 include/conversation.php:635 msgid "Delete" @@ -553,7 +546,7 @@ msgid "All Contacts (with secure profile access)" msgstr "" #: mod/display.php:82 mod/display.php:283 mod/display.php:500 -#: mod/viewsrc.php:15 mod/admin.php:196 mod/admin.php:1163 mod/admin.php:1384 +#: mod/viewsrc.php:15 mod/admin.php:196 mod/admin.php:1160 mod/admin.php:1381 #: mod/notice.php:15 include/items.php:4858 msgid "Item not found." msgstr "" @@ -603,7 +596,7 @@ msgid "" "join." msgstr "" -#: mod/newmember.php:22 mod/admin.php:1215 mod/admin.php:1460 +#: mod/newmember.php:22 mod/admin.php:1212 mod/admin.php:1457 #: mod/settings.php:99 include/nav.php:182 view/theme/diabook/theme.php:544 #: view/theme/diabook/theme.php:648 msgid "Settings" @@ -727,7 +720,7 @@ msgid "" "hours." msgstr "" -#: mod/newmember.php:66 include/group.php:283 addons-extra/groups/groups.php:19 +#: mod/newmember.php:66 include/group.php:283 msgid "Groups" msgstr "" @@ -872,8 +865,8 @@ msgstr "" #: mod/subthread.php:87 mod/tagger.php:62 mod/like.php:168 mod/like.php:346 #: include/conversation.php:125 include/conversation.php:134 #: include/conversation.php:261 include/conversation.php:270 -#: include/diaspora.php:2146 addons-extra/fbgroup/fbgroup.php:1441 -#: view/theme/diabook/theme.php:466 view/theme/diabook/theme.php:475 +#: include/diaspora.php:2146 view/theme/diabook/theme.php:466 +#: view/theme/diabook/theme.php:475 msgid "status" msgstr "" @@ -943,7 +936,6 @@ msgid "- select -" msgstr "" #: mod/filer.php:31 mod/editpost.php:109 mod/notes.php:61 include/text.php:1004 -#: addons-extra/fbgroup/fbgroup.php:320 msgid "Save" msgstr "" @@ -1253,7 +1245,7 @@ msgstr "" #: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86 #: mod/wall_upload.php:122 mod/wall_upload.php:125 mod/wall_attach.php:17 -#: mod/wall_attach.php:25 mod/wall_attach.php:76 include/api.php:1711 +#: mod/wall_attach.php:25 mod/wall_attach.php:76 include/api.php:1733 msgid "Invalid request." msgstr "" @@ -1311,7 +1303,7 @@ msgid "" "Password reset failed." msgstr "" -#: mod/lostpass.php:109 boot.php:1310 +#: mod/lostpass.php:109 boot.php:1307 msgid "Password Reset" msgstr "" @@ -1492,7 +1484,7 @@ msgstr "" msgid "if applicable" msgstr "" -#: mod/notifications.php:176 mod/notifications.php:257 mod/admin.php:1116 +#: mod/notifications.php:176 mod/notifications.php:257 mod/admin.php:1113 msgid "Approve" msgstr "" @@ -1849,8 +1841,8 @@ msgstr "" msgid "Refetch contact data" msgstr "" -#: mod/crepair.php:170 mod/admin.php:1114 mod/admin.php:1126 mod/admin.php:1127 -#: mod/admin.php:1140 mod/settings.php:652 mod/settings.php:678 +#: mod/crepair.php:170 mod/admin.php:1111 mod/admin.php:1123 mod/admin.php:1124 +#: mod/admin.php:1137 mod/settings.php:652 mod/settings.php:678 msgid "Name" msgstr "" @@ -1900,7 +1892,7 @@ msgid "" "entries from this contact." msgstr "" -#: mod/bookmarklet.php:12 boot.php:1296 include/nav.php:91 +#: mod/bookmarklet.php:12 boot.php:1293 include/nav.php:91 msgid "Login" msgstr "" @@ -1956,19 +1948,19 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: mod/admin.php:127 mod/admin.php:713 +#: mod/admin.php:127 mod/admin.php:711 msgid "Site" msgstr "" -#: mod/admin.php:128 mod/admin.php:657 mod/admin.php:1109 mod/admin.php:1124 +#: mod/admin.php:128 mod/admin.php:655 mod/admin.php:1106 mod/admin.php:1121 msgid "Users" msgstr "" -#: mod/admin.php:129 mod/admin.php:1213 mod/admin.php:1273 mod/settings.php:66 +#: mod/admin.php:129 mod/admin.php:1210 mod/admin.php:1270 mod/settings.php:66 msgid "Plugins" msgstr "" -#: mod/admin.php:130 mod/admin.php:1458 mod/admin.php:1509 +#: mod/admin.php:130 mod/admin.php:1455 mod/admin.php:1506 msgid "Themes" msgstr "" @@ -1980,7 +1972,7 @@ msgstr "" msgid "Inspect Queue" msgstr "" -#: mod/admin.php:147 mod/admin.php:156 mod/admin.php:1597 +#: mod/admin.php:147 mod/admin.php:156 mod/admin.php:1594 msgid "Logs" msgstr "" @@ -2008,9 +2000,9 @@ msgstr "" msgid "User registrations waiting for confirmation" msgstr "" -#: mod/admin.php:222 mod/admin.php:272 mod/admin.php:712 mod/admin.php:1108 -#: mod/admin.php:1212 mod/admin.php:1272 mod/admin.php:1457 mod/admin.php:1508 -#: mod/admin.php:1596 +#: mod/admin.php:222 mod/admin.php:272 mod/admin.php:710 mod/admin.php:1105 +#: mod/admin.php:1209 mod/admin.php:1269 mod/admin.php:1454 mod/admin.php:1505 +#: mod/admin.php:1593 msgid "Administration" msgstr "" @@ -2041,19 +2033,19 @@ msgid "" "eventually deleted if the delivery fails permanently." msgstr "" -#: mod/admin.php:243 mod/admin.php:1062 +#: mod/admin.php:243 mod/admin.php:1059 msgid "Normal Account" msgstr "" -#: mod/admin.php:244 mod/admin.php:1063 +#: mod/admin.php:244 mod/admin.php:1060 msgid "Soapbox Account" msgstr "" -#: mod/admin.php:245 mod/admin.php:1064 +#: mod/admin.php:245 mod/admin.php:1061 msgid "Community/Celebrity Account" msgstr "" -#: mod/admin.php:246 mod/admin.php:1065 +#: mod/admin.php:246 mod/admin.php:1062 msgid "Automatic Friend Account" msgstr "" @@ -2093,635 +2085,625 @@ msgstr "" msgid "Can not parse base url. Must have at least ://" msgstr "" -#: mod/admin.php:589 +#: mod/admin.php:587 msgid "RINO2 needs mcrypt php extension to work." msgstr "" -#: mod/admin.php:597 +#: mod/admin.php:595 msgid "Site settings updated." msgstr "" -#: mod/admin.php:621 mod/settings.php:903 +#: mod/admin.php:619 mod/settings.php:903 msgid "No special theme for mobile devices" msgstr "" -#: mod/admin.php:640 +#: mod/admin.php:638 msgid "No community page" msgstr "" -#: mod/admin.php:641 +#: mod/admin.php:639 msgid "Public postings from users of this site" msgstr "" -#: mod/admin.php:642 +#: mod/admin.php:640 msgid "Global community page" msgstr "" -#: mod/admin.php:648 +#: mod/admin.php:646 msgid "At post arrival" msgstr "" -#: mod/admin.php:649 include/contact_selectors.php:56 +#: mod/admin.php:647 include/contact_selectors.php:56 msgid "Frequently" msgstr "" -#: mod/admin.php:650 include/contact_selectors.php:57 +#: mod/admin.php:648 include/contact_selectors.php:57 msgid "Hourly" msgstr "" -#: mod/admin.php:651 include/contact_selectors.php:58 +#: mod/admin.php:649 include/contact_selectors.php:58 msgid "Twice daily" msgstr "" -#: mod/admin.php:652 include/contact_selectors.php:59 +#: mod/admin.php:650 include/contact_selectors.php:59 msgid "Daily" msgstr "" -#: mod/admin.php:658 +#: mod/admin.php:656 msgid "Users, Global Contacts" msgstr "" -#: mod/admin.php:659 +#: mod/admin.php:657 msgid "Users, Global Contacts/fallback" msgstr "" -#: mod/admin.php:663 +#: mod/admin.php:661 msgid "One month" msgstr "" -#: mod/admin.php:664 +#: mod/admin.php:662 msgid "Three months" msgstr "" -#: mod/admin.php:665 +#: mod/admin.php:663 msgid "Half a year" msgstr "" -#: mod/admin.php:666 +#: mod/admin.php:664 msgid "One year" msgstr "" -#: mod/admin.php:671 +#: mod/admin.php:669 msgid "Multi user instance" msgstr "" -#: mod/admin.php:694 +#: mod/admin.php:692 msgid "Closed" msgstr "" -#: mod/admin.php:695 +#: mod/admin.php:693 msgid "Requires approval" msgstr "" -#: mod/admin.php:696 +#: mod/admin.php:694 msgid "Open" msgstr "" -#: mod/admin.php:700 +#: mod/admin.php:698 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: mod/admin.php:701 +#: mod/admin.php:699 msgid "Force all links to use SSL" msgstr "" -#: mod/admin.php:702 +#: mod/admin.php:700 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: mod/admin.php:714 mod/admin.php:1274 mod/admin.php:1510 mod/admin.php:1598 +#: mod/admin.php:712 mod/admin.php:1271 mod/admin.php:1507 mod/admin.php:1595 #: mod/settings.php:650 mod/settings.php:760 mod/settings.php:804 #: mod/settings.php:873 mod/settings.php:960 mod/settings.php:1195 msgid "Save Settings" msgstr "" -#: mod/admin.php:715 mod/register.php:263 +#: mod/admin.php:713 mod/register.php:263 msgid "Registration" msgstr "" -#: mod/admin.php:716 +#: mod/admin.php:714 msgid "File upload" msgstr "" -#: mod/admin.php:717 +#: mod/admin.php:715 msgid "Policies" msgstr "" -#: mod/admin.php:718 +#: mod/admin.php:716 msgid "Advanced" msgstr "" -#: mod/admin.php:719 +#: mod/admin.php:717 msgid "Auto Discovered Contact Directory" msgstr "" -#: mod/admin.php:720 +#: mod/admin.php:718 msgid "Performance" msgstr "" -#: mod/admin.php:721 +#: mod/admin.php:719 msgid "" "Relocate - WARNING: advanced function. Could make this server unreachable." msgstr "" -#: mod/admin.php:724 +#: mod/admin.php:722 msgid "Site name" msgstr "" -#: mod/admin.php:725 +#: mod/admin.php:723 msgid "Host name" msgstr "" -#: mod/admin.php:726 +#: mod/admin.php:724 msgid "Sender Email" msgstr "" -#: mod/admin.php:726 +#: mod/admin.php:724 msgid "" "The email address your server shall use to send notification emails from." msgstr "" -#: mod/admin.php:727 +#: mod/admin.php:725 msgid "Banner/Logo" msgstr "" -#: mod/admin.php:728 +#: mod/admin.php:726 msgid "Shortcut icon" msgstr "" -#: mod/admin.php:728 +#: mod/admin.php:726 msgid "Link to an icon that will be used for browsers." msgstr "" -#: mod/admin.php:729 +#: mod/admin.php:727 msgid "Touch icon" msgstr "" -#: mod/admin.php:729 +#: mod/admin.php:727 msgid "Link to an icon that will be used for tablets and mobiles." msgstr "" -#: mod/admin.php:730 +#: mod/admin.php:728 msgid "Additional Info" msgstr "" -#: mod/admin.php:730 +#: mod/admin.php:728 #, php-format msgid "" "For public servers: you can add additional information here that will be " "listed at %s/siteinfo." msgstr "" -#: mod/admin.php:731 +#: mod/admin.php:729 msgid "System language" msgstr "" -#: mod/admin.php:732 +#: mod/admin.php:730 msgid "System theme" msgstr "" -#: mod/admin.php:732 +#: mod/admin.php:730 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: mod/admin.php:733 +#: mod/admin.php:731 msgid "Mobile system theme" msgstr "" -#: mod/admin.php:733 +#: mod/admin.php:731 msgid "Theme for mobile devices" msgstr "" -#: mod/admin.php:734 +#: mod/admin.php:732 msgid "SSL link policy" msgstr "" -#: mod/admin.php:734 +#: mod/admin.php:732 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: mod/admin.php:735 +#: mod/admin.php:733 msgid "Force SSL" msgstr "" -#: mod/admin.php:735 +#: mod/admin.php:733 msgid "" "Force all Non-SSL requests to SSL - Attention: on some systems it could lead " "to endless loops." msgstr "" -#: mod/admin.php:736 +#: mod/admin.php:734 msgid "Old style 'Share'" msgstr "" -#: mod/admin.php:736 +#: mod/admin.php:734 msgid "Deactivates the bbcode element 'share' for repeating items." msgstr "" -#: mod/admin.php:737 +#: mod/admin.php:735 msgid "Hide help entry from navigation menu" msgstr "" -#: mod/admin.php:737 +#: mod/admin.php:735 msgid "" "Hides the menu entry for the Help pages from the navigation menu. You can " "still access it calling /help directly." msgstr "" -#: mod/admin.php:738 +#: mod/admin.php:736 msgid "Single user instance" msgstr "" -#: mod/admin.php:738 +#: mod/admin.php:736 msgid "Make this instance multi-user or single-user for the named user" msgstr "" -#: mod/admin.php:739 +#: mod/admin.php:737 msgid "Maximum image size" msgstr "" -#: mod/admin.php:739 +#: mod/admin.php:737 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: mod/admin.php:740 +#: mod/admin.php:738 msgid "Maximum image length" msgstr "" -#: mod/admin.php:740 +#: mod/admin.php:738 msgid "" "Maximum length in pixels of the longest side of uploaded images. Default is " "-1, which means no limits." msgstr "" -#: mod/admin.php:741 +#: mod/admin.php:739 msgid "JPEG image quality" msgstr "" -#: mod/admin.php:741 +#: mod/admin.php:739 msgid "" "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " "100, which is full quality." msgstr "" -#: mod/admin.php:743 +#: mod/admin.php:741 msgid "Register policy" msgstr "" -#: mod/admin.php:744 +#: mod/admin.php:742 msgid "Maximum Daily Registrations" msgstr "" -#: mod/admin.php:744 +#: mod/admin.php:742 msgid "" "If registration is permitted above, this sets the maximum number of new user " "registrations to accept per day. If register is set to closed, this setting " "has no effect." msgstr "" -#: mod/admin.php:745 +#: mod/admin.php:743 msgid "Register text" msgstr "" -#: mod/admin.php:745 +#: mod/admin.php:743 msgid "Will be displayed prominently on the registration page." msgstr "" -#: mod/admin.php:746 +#: mod/admin.php:744 msgid "Accounts abandoned after x days" msgstr "" -#: mod/admin.php:746 +#: mod/admin.php:744 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: mod/admin.php:747 +#: mod/admin.php:745 msgid "Allowed friend domains" msgstr "" -#: mod/admin.php:747 +#: mod/admin.php:745 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: mod/admin.php:748 +#: mod/admin.php:746 msgid "Allowed email domains" msgstr "" -#: mod/admin.php:748 +#: mod/admin.php:746 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: mod/admin.php:749 +#: mod/admin.php:747 msgid "Block public" msgstr "" -#: mod/admin.php:749 +#: mod/admin.php:747 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: mod/admin.php:750 +#: mod/admin.php:748 msgid "Force publish" msgstr "" -#: mod/admin.php:750 +#: mod/admin.php:748 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: mod/admin.php:751 +#: mod/admin.php:749 msgid "Global directory URL" msgstr "" -#: mod/admin.php:751 +#: mod/admin.php:749 msgid "" "URL to the global directory. If this is not set, the global directory is " "completely unavailable to the application." msgstr "" -#: mod/admin.php:752 +#: mod/admin.php:750 msgid "Allow threaded items" msgstr "" -#: mod/admin.php:752 +#: mod/admin.php:750 msgid "Allow infinite level threading for items on this site." msgstr "" -#: mod/admin.php:753 +#: mod/admin.php:751 msgid "Private posts by default for new users" msgstr "" -#: mod/admin.php:753 +#: mod/admin.php:751 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." msgstr "" -#: mod/admin.php:754 +#: mod/admin.php:752 msgid "Don't include post content in email notifications" msgstr "" -#: mod/admin.php:754 +#: mod/admin.php:752 msgid "" "Don't include the content of a post/comment/private message/etc. in the " "email notifications that are sent out from this site, as a privacy measure." msgstr "" -#: mod/admin.php:755 +#: mod/admin.php:753 msgid "Disallow public access to addons listed in the apps menu." msgstr "" -#: mod/admin.php:755 +#: mod/admin.php:753 msgid "" "Checking this box will restrict addons listed in the apps menu to members " "only." msgstr "" -#: mod/admin.php:756 +#: mod/admin.php:754 msgid "Don't embed private images in posts" msgstr "" -#: mod/admin.php:756 +#: mod/admin.php:754 msgid "" "Don't replace locally-hosted private photos in posts with an embedded copy " "of the image. This means that contacts who receive posts containing private " "photos will have to authenticate and load each image, which may take a while." msgstr "" -#: mod/admin.php:757 +#: mod/admin.php:755 msgid "Allow Users to set remote_self" msgstr "" -#: mod/admin.php:757 +#: mod/admin.php:755 msgid "" "With checking this, every user is allowed to mark every contact as a " "remote_self in the repair contact dialog. Setting this flag on a contact " "causes mirroring every posting of that contact in the users stream." msgstr "" -#: mod/admin.php:758 +#: mod/admin.php:756 msgid "Block multiple registrations" msgstr "" -#: mod/admin.php:758 +#: mod/admin.php:756 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: mod/admin.php:759 +#: mod/admin.php:757 msgid "OpenID support" msgstr "" -#: mod/admin.php:759 +#: mod/admin.php:757 msgid "OpenID support for registration and logins." msgstr "" -#: mod/admin.php:760 +#: mod/admin.php:758 msgid "Fullname check" msgstr "" -#: mod/admin.php:760 +#: mod/admin.php:758 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: mod/admin.php:761 +#: mod/admin.php:759 msgid "UTF-8 Regular expressions" msgstr "" -#: mod/admin.php:761 +#: mod/admin.php:759 msgid "Use PHP UTF8 regular expressions" msgstr "" -#: mod/admin.php:762 +#: mod/admin.php:760 msgid "Community Page Style" msgstr "" -#: mod/admin.php:762 +#: mod/admin.php:760 msgid "" "Type of community page to show. 'Global community' shows every public " "posting from an open distributed network that arrived on this server." msgstr "" -#: mod/admin.php:763 +#: mod/admin.php:761 msgid "Posts per user on community page" msgstr "" -#: mod/admin.php:763 +#: mod/admin.php:761 msgid "" "The maximum number of posts per user on the community page. (Not valid for " "'Global Community')" msgstr "" -#: mod/admin.php:764 +#: mod/admin.php:762 msgid "Enable OStatus support" msgstr "" -#: mod/admin.php:764 +#: mod/admin.php:762 msgid "" "Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "" -#: mod/admin.php:765 +#: mod/admin.php:763 msgid "OStatus conversation completion interval" msgstr "" -#: mod/admin.php:765 +#: mod/admin.php:763 msgid "" "How often shall the poller check for new entries in OStatus conversations? " "This can be a very ressource task." msgstr "" -#: mod/admin.php:766 +#: mod/admin.php:764 msgid "OStatus support can only be enabled if threading is enabled." msgstr "" -#: mod/admin.php:768 +#: mod/admin.php:766 msgid "" "Diaspora support can't be enabled because Friendica was installed into a sub " "directory." msgstr "" -#: mod/admin.php:769 +#: mod/admin.php:767 msgid "Enable Diaspora support" msgstr "" -#: mod/admin.php:769 +#: mod/admin.php:767 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: mod/admin.php:770 +#: mod/admin.php:768 msgid "Only allow Friendica contacts" msgstr "" -#: mod/admin.php:770 +#: mod/admin.php:768 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: mod/admin.php:771 +#: mod/admin.php:769 msgid "Verify SSL" msgstr "" -#: mod/admin.php:771 +#: mod/admin.php:769 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: mod/admin.php:772 +#: mod/admin.php:770 msgid "Proxy user" msgstr "" -#: mod/admin.php:773 +#: mod/admin.php:771 msgid "Proxy URL" msgstr "" -#: mod/admin.php:774 +#: mod/admin.php:772 msgid "Network timeout" msgstr "" -#: mod/admin.php:774 +#: mod/admin.php:772 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: mod/admin.php:775 +#: mod/admin.php:773 msgid "Delivery interval" msgstr "" -#: mod/admin.php:775 +#: mod/admin.php:773 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: mod/admin.php:776 +#: mod/admin.php:774 msgid "Poll interval" msgstr "" -#: mod/admin.php:776 +#: mod/admin.php:774 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: mod/admin.php:777 +#: mod/admin.php:775 msgid "Maximum Load Average" msgstr "" -#: mod/admin.php:777 +#: mod/admin.php:775 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: mod/admin.php:778 +#: mod/admin.php:776 msgid "Maximum Load Average (Frontend)" msgstr "" -#: mod/admin.php:778 +#: mod/admin.php:776 msgid "Maximum system load before the frontend quits service - default 50." msgstr "" -#: mod/admin.php:779 +#: mod/admin.php:777 msgid "Maximum table size for optimization" msgstr "" -#: mod/admin.php:779 +#: mod/admin.php:777 msgid "" "Maximum table size (in MB) for the automatic optimization - default 100 MB. " "Enter -1 to disable it." msgstr "" -#: mod/admin.php:780 -msgid "Minimum level of fragmentation" -msgstr "" - -#: mod/admin.php:780 -msgid "" -"Minimum fragmenation level to start the automatic optimization - default " -"value is 30%." -msgstr "" - -#: mod/admin.php:782 +#: mod/admin.php:779 msgid "Periodical check of global contacts" msgstr "" -#: mod/admin.php:782 +#: mod/admin.php:779 msgid "" "If enabled, the global contacts are checked periodically for missing or " "outdated data and the vitality of the contacts and servers." msgstr "" -#: mod/admin.php:783 +#: mod/admin.php:780 msgid "Days between requery" msgstr "" -#: mod/admin.php:783 +#: mod/admin.php:780 msgid "Number of days after which a server is requeried for his contacts." msgstr "" -#: mod/admin.php:784 +#: mod/admin.php:781 msgid "Discover contacts from other servers" msgstr "" -#: mod/admin.php:784 +#: mod/admin.php:781 msgid "" "Periodically query other servers for contacts. You can choose between " "'users': the users on the remote system, 'Global Contacts': active contacts " @@ -2731,32 +2713,32 @@ msgid "" "Global Contacts'." msgstr "" -#: mod/admin.php:785 +#: mod/admin.php:782 msgid "Timeframe for fetching global contacts" msgstr "" -#: mod/admin.php:785 +#: mod/admin.php:782 msgid "" "When the discovery is activated, this value defines the timeframe for the " "activity of the global contacts that are fetched from other servers." msgstr "" -#: mod/admin.php:786 +#: mod/admin.php:783 msgid "Search the local directory" msgstr "" -#: mod/admin.php:786 +#: mod/admin.php:783 msgid "" "Search the local directory instead of the global directory. When searching " "locally, every search will be executed on the global directory in the " "background. This improves the search results when the search is repeated." msgstr "" -#: mod/admin.php:788 +#: mod/admin.php:785 msgid "Publish server information" msgstr "" -#: mod/admin.php:788 +#: mod/admin.php:785 msgid "" "If enabled, general server and usage data will be published. The data " "contains the name and version of the server, number of users with public " @@ -2764,204 +2746,204 @@ msgid "" "href='http://the-federation.info/'>the-federation.info for details." msgstr "" -#: mod/admin.php:790 +#: mod/admin.php:787 msgid "Use MySQL full text engine" msgstr "" -#: mod/admin.php:790 +#: mod/admin.php:787 msgid "" "Activates the full text engine. Speeds up search - but can only search for " "four and more characters." msgstr "" -#: mod/admin.php:791 +#: mod/admin.php:788 msgid "Suppress Language" msgstr "" -#: mod/admin.php:791 +#: mod/admin.php:788 msgid "Suppress language information in meta information about a posting." msgstr "" -#: mod/admin.php:792 +#: mod/admin.php:789 msgid "Suppress Tags" msgstr "" -#: mod/admin.php:792 +#: mod/admin.php:789 msgid "Suppress showing a list of hashtags at the end of the posting." msgstr "" -#: mod/admin.php:793 +#: mod/admin.php:790 msgid "Path to item cache" msgstr "" -#: mod/admin.php:793 +#: mod/admin.php:790 msgid "The item caches buffers generated bbcode and external images." msgstr "" -#: mod/admin.php:794 +#: mod/admin.php:791 msgid "Cache duration in seconds" msgstr "" -#: mod/admin.php:794 +#: mod/admin.php:791 msgid "" "How long should the cache files be hold? Default value is 86400 seconds (One " "day). To disable the item cache, set the value to -1." msgstr "" -#: mod/admin.php:795 +#: mod/admin.php:792 msgid "Maximum numbers of comments per post" msgstr "" -#: mod/admin.php:795 +#: mod/admin.php:792 msgid "How much comments should be shown for each post? Default value is 100." msgstr "" -#: mod/admin.php:796 +#: mod/admin.php:793 msgid "Path for lock file" msgstr "" -#: mod/admin.php:796 +#: mod/admin.php:793 msgid "" "The lock file is used to avoid multiple pollers at one time. Only define a " "folder here." msgstr "" -#: mod/admin.php:797 +#: mod/admin.php:794 msgid "Temp path" msgstr "" -#: mod/admin.php:797 +#: mod/admin.php:794 msgid "" "If you have a restricted system where the webserver can't access the system " "temp path, enter another path here." msgstr "" -#: mod/admin.php:798 +#: mod/admin.php:795 msgid "Base path to installation" msgstr "" -#: mod/admin.php:798 +#: mod/admin.php:795 msgid "" "If the system cannot detect the correct path to your installation, enter the " "correct path here. This setting should only be set if you are using a " "restricted system and symbolic links to your webroot." msgstr "" -#: mod/admin.php:799 +#: mod/admin.php:796 msgid "Disable picture proxy" msgstr "" -#: mod/admin.php:799 +#: mod/admin.php:796 msgid "" "The picture proxy increases performance and privacy. It shouldn't be used on " "systems with very low bandwith." msgstr "" -#: mod/admin.php:800 +#: mod/admin.php:797 msgid "Enable old style pager" msgstr "" -#: mod/admin.php:800 +#: mod/admin.php:797 msgid "" "The old style pager has page numbers but slows down massively the page speed." msgstr "" -#: mod/admin.php:801 +#: mod/admin.php:798 msgid "Only search in tags" msgstr "" -#: mod/admin.php:801 +#: mod/admin.php:798 msgid "On large systems the text search can slow down the system extremely." msgstr "" -#: mod/admin.php:803 +#: mod/admin.php:800 msgid "New base url" msgstr "" -#: mod/admin.php:803 +#: mod/admin.php:800 msgid "" "Change base url for this server. Sends relocate message to all DFRN contacts " "of all users." msgstr "" -#: mod/admin.php:805 +#: mod/admin.php:802 msgid "RINO Encryption" msgstr "" -#: mod/admin.php:805 +#: mod/admin.php:802 msgid "Encryption layer between nodes." msgstr "" -#: mod/admin.php:806 +#: mod/admin.php:803 msgid "Embedly API key" msgstr "" -#: mod/admin.php:806 +#: mod/admin.php:803 msgid "" "Embedly is used to fetch additional data for " "web pages. This is an optional parameter." msgstr "" -#: mod/admin.php:824 +#: mod/admin.php:821 msgid "Update has been marked successful" msgstr "" -#: mod/admin.php:832 +#: mod/admin.php:829 #, php-format msgid "Database structure update %s was successfully applied." msgstr "" -#: mod/admin.php:835 +#: mod/admin.php:832 #, php-format msgid "Executing of database structure update %s failed with error: %s" msgstr "" -#: mod/admin.php:847 +#: mod/admin.php:844 #, php-format msgid "Executing %s failed with error: %s" msgstr "" -#: mod/admin.php:850 +#: mod/admin.php:847 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: mod/admin.php:854 +#: mod/admin.php:851 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: mod/admin.php:856 +#: mod/admin.php:853 #, php-format msgid "There was no additional update function %s that needed to be called." msgstr "" -#: mod/admin.php:875 +#: mod/admin.php:872 msgid "No failed updates." msgstr "" -#: mod/admin.php:876 +#: mod/admin.php:873 msgid "Check database structure" msgstr "" -#: mod/admin.php:881 +#: mod/admin.php:878 msgid "Failed Updates" msgstr "" -#: mod/admin.php:882 +#: mod/admin.php:879 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "" -#: mod/admin.php:883 +#: mod/admin.php:880 msgid "Mark success (if update was manually applied)" msgstr "" -#: mod/admin.php:884 +#: mod/admin.php:881 msgid "Attempt to execute this update step automatically" msgstr "" -#: mod/admin.php:916 +#: mod/admin.php:913 #, php-format msgid "" "\n" @@ -2969,7 +2951,7 @@ msgid "" "\t\t\t\tthe administrator of %2$s has set up an account for you." msgstr "" -#: mod/admin.php:919 +#: mod/admin.php:916 #, php-format msgid "" "\n" @@ -3005,231 +2987,231 @@ msgid "" "\t\t\tThank you and welcome to %4$s." msgstr "" -#: mod/admin.php:951 include/user.php:423 +#: mod/admin.php:948 include/user.php:423 #, php-format msgid "Registration details for %s" msgstr "" -#: mod/admin.php:963 +#: mod/admin.php:960 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: mod/admin.php:970 +#: mod/admin.php:967 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: mod/admin.php:1009 +#: mod/admin.php:1006 #, php-format msgid "User '%s' deleted" msgstr "" -#: mod/admin.php:1017 +#: mod/admin.php:1014 #, php-format msgid "User '%s' unblocked" msgstr "" -#: mod/admin.php:1017 +#: mod/admin.php:1014 #, php-format msgid "User '%s' blocked" msgstr "" -#: mod/admin.php:1110 +#: mod/admin.php:1107 msgid "Add User" msgstr "" -#: mod/admin.php:1111 +#: mod/admin.php:1108 msgid "select all" msgstr "" -#: mod/admin.php:1112 +#: mod/admin.php:1109 msgid "User registrations waiting for confirm" msgstr "" -#: mod/admin.php:1113 +#: mod/admin.php:1110 msgid "User waiting for permanent deletion" msgstr "" -#: mod/admin.php:1114 +#: mod/admin.php:1111 msgid "Request date" msgstr "" -#: mod/admin.php:1114 mod/admin.php:1126 mod/admin.php:1127 mod/admin.php:1142 +#: mod/admin.php:1111 mod/admin.php:1123 mod/admin.php:1124 mod/admin.php:1139 #: include/contact_selectors.php:79 include/contact_selectors.php:86 msgid "Email" msgstr "" -#: mod/admin.php:1115 +#: mod/admin.php:1112 msgid "No registrations." msgstr "" -#: mod/admin.php:1117 +#: mod/admin.php:1114 msgid "Deny" msgstr "" -#: mod/admin.php:1121 +#: mod/admin.php:1118 msgid "Site admin" msgstr "" -#: mod/admin.php:1122 +#: mod/admin.php:1119 msgid "Account expired" msgstr "" -#: mod/admin.php:1125 +#: mod/admin.php:1122 msgid "New User" msgstr "" -#: mod/admin.php:1126 mod/admin.php:1127 +#: mod/admin.php:1123 mod/admin.php:1124 msgid "Register date" msgstr "" -#: mod/admin.php:1126 mod/admin.php:1127 +#: mod/admin.php:1123 mod/admin.php:1124 msgid "Last login" msgstr "" -#: mod/admin.php:1126 mod/admin.php:1127 +#: mod/admin.php:1123 mod/admin.php:1124 msgid "Last item" msgstr "" -#: mod/admin.php:1126 +#: mod/admin.php:1123 msgid "Deleted since" msgstr "" -#: mod/admin.php:1127 mod/settings.php:41 +#: mod/admin.php:1124 mod/settings.php:41 msgid "Account" msgstr "" -#: mod/admin.php:1129 +#: mod/admin.php:1126 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: mod/admin.php:1130 +#: mod/admin.php:1127 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: mod/admin.php:1140 +#: mod/admin.php:1137 msgid "Name of the new user." msgstr "" -#: mod/admin.php:1141 +#: mod/admin.php:1138 msgid "Nickname" msgstr "" -#: mod/admin.php:1141 +#: mod/admin.php:1138 msgid "Nickname of the new user." msgstr "" -#: mod/admin.php:1142 +#: mod/admin.php:1139 msgid "Email address of the new user." msgstr "" -#: mod/admin.php:1175 +#: mod/admin.php:1172 #, php-format msgid "Plugin %s disabled." msgstr "" -#: mod/admin.php:1179 +#: mod/admin.php:1176 #, php-format msgid "Plugin %s enabled." msgstr "" -#: mod/admin.php:1189 mod/admin.php:1413 +#: mod/admin.php:1186 mod/admin.php:1410 msgid "Disable" msgstr "" -#: mod/admin.php:1191 mod/admin.php:1415 +#: mod/admin.php:1188 mod/admin.php:1412 msgid "Enable" msgstr "" -#: mod/admin.php:1214 mod/admin.php:1459 +#: mod/admin.php:1211 mod/admin.php:1456 msgid "Toggle" msgstr "" -#: mod/admin.php:1222 mod/admin.php:1469 +#: mod/admin.php:1219 mod/admin.php:1466 msgid "Author: " msgstr "" -#: mod/admin.php:1223 mod/admin.php:1470 +#: mod/admin.php:1220 mod/admin.php:1467 msgid "Maintainer: " msgstr "" -#: mod/admin.php:1275 +#: mod/admin.php:1272 #: view/smarty3/compiled/f835364006028b1061f37be121c9bd9db5fa50a9.file.admin_plugins.tpl.php:42 msgid "Reload active plugins" msgstr "" -#: mod/admin.php:1373 +#: mod/admin.php:1370 msgid "No themes found." msgstr "" -#: mod/admin.php:1451 +#: mod/admin.php:1448 msgid "Screenshot" msgstr "" -#: mod/admin.php:1511 +#: mod/admin.php:1508 msgid "Reload active themes" msgstr "" -#: mod/admin.php:1515 +#: mod/admin.php:1512 msgid "[Experimental]" msgstr "" -#: mod/admin.php:1516 +#: mod/admin.php:1513 msgid "[Unsupported]" msgstr "" -#: mod/admin.php:1543 +#: mod/admin.php:1540 msgid "Log settings updated." msgstr "" -#: mod/admin.php:1599 +#: mod/admin.php:1596 msgid "Clear" msgstr "" -#: mod/admin.php:1605 +#: mod/admin.php:1602 msgid "Enable Debugging" msgstr "" -#: mod/admin.php:1606 +#: mod/admin.php:1603 msgid "Log file" msgstr "" -#: mod/admin.php:1606 +#: mod/admin.php:1603 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: mod/admin.php:1607 +#: mod/admin.php:1604 msgid "Log level" msgstr "" -#: mod/admin.php:1657 include/acl_selectors.php:348 +#: mod/admin.php:1654 include/acl_selectors.php:348 msgid "Close" msgstr "" -#: mod/admin.php:1663 +#: mod/admin.php:1660 msgid "FTP Host" msgstr "" -#: mod/admin.php:1664 +#: mod/admin.php:1661 msgid "FTP Path" msgstr "" -#: mod/admin.php:1665 +#: mod/admin.php:1662 msgid "FTP User" msgstr "" -#: mod/admin.php:1666 +#: mod/admin.php:1663 msgid "FTP Password" msgstr "" @@ -3620,7 +3602,7 @@ msgid_plural "comments" msgstr[0] "" msgstr[1] "" -#: mod/content.php:608 boot.php:788 object/Item.php:422 +#: mod/content.php:608 boot.php:785 object/Item.php:422 #: include/contact_widgets.php:242 include/forums.php:110 #: include/items.php:5178 view/theme/vier/theme.php:264 msgid "show more" @@ -3660,7 +3642,7 @@ msgid "This is you" msgstr "" #: mod/content.php:711 mod/photos.php:1629 mod/photos.php:1677 -#: mod/photos.php:1765 boot.php:787 object/Item.php:393 object/Item.php:709 +#: mod/photos.php:1765 boot.php:784 object/Item.php:393 object/Item.php:709 msgid "Comment" msgstr "" @@ -4263,8 +4245,7 @@ msgstr "" msgid "Private forum has no privacy permissions and no default privacy group." msgstr "" -#: mod/settings.php:573 addons-extra/etherpadlite/etherpadlite.php:70 -#: addons-extra/fbgroup/fbgroup.php:153 addons-extra/donate/donate.php:55 +#: mod/settings.php:573 msgid "Settings updated." msgstr "" @@ -4422,7 +4403,6 @@ msgid "Security:" msgstr "" #: mod/settings.php:866 mod/settings.php:871 -#: addons-extra/fbgroup/fbgroup.php:253 addons-extra/fbgroup/fbgroup.php:255 msgid "None" msgstr "" @@ -5096,7 +5076,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: mod/register.php:280 boot.php:1271 include/nav.php:108 +#: mod/register.php:280 boot.php:1268 include/nav.php:108 msgid "Register" msgstr "" @@ -6140,60 +6120,60 @@ msgstr "" msgid "Item was not found." msgstr "" -#: boot.php:786 +#: boot.php:783 msgid "Delete this item?" msgstr "" -#: boot.php:789 +#: boot.php:786 msgid "show fewer" msgstr "" -#: boot.php:1163 +#: boot.php:1160 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: boot.php:1270 +#: boot.php:1267 msgid "Create a New Account" msgstr "" -#: boot.php:1295 include/nav.php:72 +#: boot.php:1292 include/nav.php:72 msgid "Logout" msgstr "" -#: boot.php:1298 +#: boot.php:1295 msgid "Nickname or Email address: " msgstr "" -#: boot.php:1299 +#: boot.php:1296 msgid "Password: " msgstr "" -#: boot.php:1300 +#: boot.php:1297 msgid "Remember me" msgstr "" -#: boot.php:1303 +#: boot.php:1300 msgid "Or login using OpenID: " msgstr "" -#: boot.php:1309 +#: boot.php:1306 msgid "Forgot your password?" msgstr "" -#: boot.php:1312 +#: boot.php:1309 msgid "Website Terms of Service" msgstr "" -#: boot.php:1313 +#: boot.php:1310 msgid "terms of service" msgstr "" -#: boot.php:1315 +#: boot.php:1312 msgid "Website Privacy Policy" msgstr "" -#: boot.php:1316 +#: boot.php:1313 msgid "privacy policy" msgstr "" @@ -7333,8 +7313,6 @@ msgid "Item filed" msgstr "" #: include/bbcode.php:483 include/bbcode.php:1143 include/bbcode.php:1144 -#: addons-extra/bbextra/bbextra.php:33 addons-extra/bbextra/bbextra.php:34 -#: addons-extra/bbextra/bbextra.php:35 addons-extra/bbextra/bbextra.php:36 msgid "Image/photo" msgstr "" @@ -7631,43 +7609,43 @@ msgstr "" msgid "Site map" msgstr "" -#: include/api.php:321 include/api.php:332 include/api.php:441 -#: include/api.php:1160 include/api.php:1162 +#: include/api.php:343 include/api.php:354 include/api.php:463 +#: include/api.php:1182 include/api.php:1184 msgid "User not found." msgstr "" -#: include/api.php:808 +#: include/api.php:830 #, php-format msgid "Daily posting limit of %d posts reached. The post was rejected." msgstr "" -#: include/api.php:827 +#: include/api.php:849 #, php-format msgid "Weekly posting limit of %d posts reached. The post was rejected." msgstr "" -#: include/api.php:846 +#: include/api.php:868 #, php-format msgid "Monthly posting limit of %d posts reached. The post was rejected." msgstr "" -#: include/api.php:1369 +#: include/api.php:1391 msgid "There is no status with this id." msgstr "" -#: include/api.php:1443 +#: include/api.php:1465 msgid "There is no conversation with this id." msgstr "" -#: include/api.php:1722 +#: include/api.php:1744 msgid "Invalid item." msgstr "" -#: include/api.php:1732 +#: include/api.php:1754 msgid "Invalid action. " msgstr "" -#: include/api.php:1740 +#: include/api.php:1762 msgid "DB error" msgstr "" @@ -8362,369 +8340,6 @@ msgstr[1] "" msgid "Done. You can now login with your username and password" msgstr "" -#: addons-extra/pool_master/pool_master.php:19 -msgid "Pool Master" -msgstr "" - -#: addons-extra/apps/apps.php:19 -msgid "Test Addon" -msgstr "" - -#: addons-extra/video_chat/video_chat.php:19 -msgid "Video Chat" -msgstr "" - -#: addons-extra/video_chat/video_chat.php:30 -msgid "" -"You must be authenticated to use this addon! Either login, or visit this " -"site via a magic link. " -msgstr "" - -#: addons-extra/moshimonsters/moshimonsters.php:19 -msgid "Moshi Monsters" -msgstr "" - -#: addons-extra/xkcd/xkcd.php:19 -msgid "XKCD" -msgstr "" - -#: addons-extra/mathletics/mathletics.php:19 -msgid "Mathletics" -msgstr "" - -#: addons-extra/fairy_fashion/fairy_fashion.php:20 -msgid "Fairy Fashion" -msgstr "" - -#: addons-extra/etherpadlite/etherpadlite.php:40 -msgid "Etherpad-Lite" -msgstr "" - -#: addons-extra/etherpadlite/etherpadlite.php:49 -msgid "Only local user can access the Etherpad-Lite app." -msgstr "" - -#: addons-extra/etherpadlite/etherpadlite.php:64 -msgid "Etherpad-Lite Base URL" -msgstr "" - -#: addons-extra/etherpadlite/etherpadlite.php:64 -msgid "Absolute path to your Etherpad-Lite installation. (with trailing slash)" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:181 -msgid "Facebook Group disabled" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:201 -msgid "Facebook API key is missing." -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:208 addons-extra/fbgroup/fbgroup.php:292 -msgid "Facebook Group" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:214 -msgid "Install Facebook Group connector for this account." -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:221 -msgid "Remove Facebook Group connector" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:226 -msgid "" -"Re-authenticate [This is necessary whenever your Facebook password is " -"changed.]" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:233 -msgid "Post to Facebook group by default" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:237 -msgid "Suppress \"View on friendica\"" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:241 -msgid "Mirror wall posts from facebook to friendica." -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:251 -msgid "Post to page/group:" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:293 -msgid "Facebook Group Settings" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:308 -msgid "Facebook API Key" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:315 -msgid "" -"Error: it appears that you have specified the App-ID and -Secret in your ." -"htconfig.php file. As long as they are specified there, they cannot be set " -"using this form.

    " -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:317 -msgid "App-ID / API-Key" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:318 -msgid "Application secret" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:336 -msgid "The new values have been saved." -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:355 -msgid "Post to Facebook Group" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:374 -#, php-format -msgid "%s:" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:483 -msgid "" -"Post to Facebook cancelled because of multi-network access permission " -"conflict." -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:762 -msgid "View on Friendica" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:798 -msgid "Facebook group post failed. Queued for retry." -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:816 -msgid "Administrator" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:838 -msgid "Your Facebook connection became invalid. Please Re-authenticate." -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:839 -msgid "Facebook connection became invalid" -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:840 -#, php-format -msgid "" -"Hi %1$s,\n" -"\n" -"The connection between your accounts on %2$s and Facebook became invalid. " -"This usually happens after you change your Facebook-password. To enable the " -"connection again, you have to %3$sre-authenticate the Facebook-connector%4$s." -msgstr "" - -#: addons-extra/fbgroup/fbgroup.php:1445 -#, php-format -msgid "%1$feed likes %2$feed's %3$feed" -msgstr "" - -#: addons-extra/urban_dead/urban_dead.php:19 -msgid "Urban Dead" -msgstr "" - -#: addons-extra/maya_locations/maya_locations.php:151 -msgid "Maya Location Settings" -msgstr "" - -#: addons-extra/maya_locations/maya_locations.php:153 -msgid "Enable Maya Locations Plugin" -msgstr "" - -#: addons-extra/lasttweets/lasttweets.php:64 -msgid "Twitter Widget Settings" -msgstr "" - -#: addons-extra/lasttweets/lasttweets.php:65 -msgid "" -"You can include the widget in the sidebar of your Network strean (for your " -"eyes only) and on the bottom of your profile page (for everybody). Both " -"locations can be enabled separately with different search items and settings." -msgstr "" - -#: addons-extra/lasttweets/lasttweets.php:67 -msgid "Sidebar Settings" -msgstr "" - -#: addons-extra/lasttweets/lasttweets.php:69 -#: addons-extra/lasttweets/lasttweets.php:86 -msgid "Search Item at Twitter" -msgstr "" - -#: addons-extra/lasttweets/lasttweets.php:73 -#: addons-extra/lasttweets/lasttweets.php:90 -msgid "Inner Color (hexcode)" -msgstr "" - -#: addons-extra/lasttweets/lasttweets.php:77 -#: addons-extra/lasttweets/lasttweets.php:94 -msgid "Outer Color (hexcode)" -msgstr "" - -#: addons-extra/lasttweets/lasttweets.php:81 -msgid "Enable Twitter Widget (Sidebar)" -msgstr "" - -#: addons-extra/lasttweets/lasttweets.php:84 -msgid "Profile Settings" -msgstr "" - -#: addons-extra/lasttweets/lasttweets.php:98 -msgid "Enable Twitter Widget (Below Profile)" -msgstr "" - -#: addons-extra/cthulhu_mythos_locations/cthulhu_mythos_locations.php:150 -msgid "Cthulhu Mythos Location Settings" -msgstr "" - -#: addons-extra/cthulhu_mythos_locations/cthulhu_mythos_locations.php:152 -msgid "Enable Cthulhu Mythos Locations Plugin" -msgstr "" - -#: addons-extra/browser_quest/browser_quest.php:19 -msgid "Browser Quest" -msgstr "" - -#: addons-extra/donate/donate.php:61 -msgid "Image location of your preffered payment method" -msgstr "" - -#: addons-extra/donate/donate.php:61 -msgid "eg http://somewebsite.com/someimage.jpg" -msgstr "" - -#: addons-extra/donate/donate.php:62 -msgid "Method one link" -msgstr "" - -#: addons-extra/donate/donate.php:62 addons-extra/donate/donate.php:64 -#: addons-extra/donate/donate.php:66 addons-extra/donate/donate.php:68 -#: addons-extra/donate/donate.php:70 -msgid "Link to the payment gateway provided by your payment processor." -msgstr "" - -#: addons-extra/donate/donate.php:63 -msgid "Method Two" -msgstr "" - -#: addons-extra/donate/donate.php:63 -msgid "Image location of your second payment method" -msgstr "" - -#: addons-extra/donate/donate.php:64 -msgid "Method two URL" -msgstr "" - -#: addons-extra/donate/donate.php:65 -msgid "Method Three" -msgstr "" - -#: addons-extra/donate/donate.php:65 -msgid "Image location of your third payment method" -msgstr "" - -#: addons-extra/donate/donate.php:66 -msgid "Method three URL" -msgstr "" - -#: addons-extra/donate/donate.php:67 -msgid "Method Four" -msgstr "" - -#: addons-extra/donate/donate.php:67 -msgid "Image location of your fourth payment method" -msgstr "" - -#: addons-extra/donate/donate.php:68 -msgid "Method four URL" -msgstr "" - -#: addons-extra/donate/donate.php:69 -msgid "Method Five" -msgstr "" - -#: addons-extra/donate/donate.php:69 -msgid "Image location of your fifth payment method" -msgstr "" - -#: addons-extra/donate/donate.php:70 -msgid "Method five URL" -msgstr "" - -#: addons-extra/donate/donate.php:77 -msgid "Donate" -msgstr "" - -#: addons-extra/donate/donate.php:78 -msgid "" -"Public servers are not actually \"free\". Someone has to put their time and " -"effort into creating, and maintaining them, handling support requests, " -"fixing bugs, answering support requests, etc, etc. Access to free Friendica " -"servers is a privilege, not a right and can cost admins a significant amount " -"of money. Public servers are not scalable in the long term. The only way " -"we can grow to support new users is with YOUR help." -msgstr "" - -#: addons-extra/donate/donate.php:80 -msgid "" -"It is estimated by public server admins that the cost of hosting an " -"individual is between 1 and 2 cents per contact, per month. This may not " -"sound a lot, but multiply your 500 Facebook contacts by just ten users, and " -"you can see how this is unsustainable. Below are the payment methods your " -"admin can accept to help spread the cost of this service and ensure " -"Friendica public servers are available for everybody who needs one." -msgstr "" - -#: addons-extra/donate/donate.php:82 -msgid "" -"Donations are taken in good faith, and are non-refundable other than in " -"cases of fraud" -msgstr "" - -#: addons-extra/canicheatdeath/canicheatdeath.php:20 -msgid "Can I Cheat Death?" -msgstr "" - -#: addons-extra/flip/flip.php:19 -msgid "Flip the text" -msgstr "" - -#: addons-extra/kids_chat/kids_chat.php:19 -msgid "Kids Chat" -msgstr "" - -#: addons-extra/girlsgogames/girlsgogames.php:19 -msgid "GirlsGoGames" -msgstr "" - -#: addons-extra/weknowwhatyouredoing/weknowwhatyouredoing.php:20 -msgid "We Know What You Are Doing" -msgstr "" - -#: addons-extra/dungeons_and_treasures/dungeons_and_treasures.php:19 -msgid "Dungeons And Treasures" -msgstr "" - -#: addons-extra/binweevils/binweevils.php:19 -msgid "BinWeevils" -msgstr "" - -#: addons-extra/reddit/reddit.php:19 -msgid "Reddit Reader" -msgstr "" - #: index.php:441 msgid "toggle mobile" msgstr "" From d02bd08bde6d0eea2fcc5e8df0854040b97d4d56 Mon Sep 17 00:00:00 2001 From: gerhard6380 Date: Mon, 14 Dec 2015 22:53:12 +0100 Subject: [PATCH 313/313] Update api.md --- doc/api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api.md b/doc/api.md index aa02aac6f5..391d6c9eb9 100644 --- a/doc/api.md +++ b/doc/api.md @@ -347,7 +347,7 @@ Friendica doesn't allow showing followers of other users. Friendica doesn't allow showing friends of other users. -## Implemented API calls (not compatible with other API’s) +## Implemented API calls (not compatible with other APIs) ### friendica/group_show Return all or a specified group of the user with the containing contacts as array.