diff options
-rwxr-xr-x | boot.php | 1 | ||||
-rw-r--r-- | include/conversation.php | 2 | ||||
-rwxr-xr-x | include/items.php | 21 | ||||
-rw-r--r-- | include/taxonomy.php | 21 | ||||
-rw-r--r-- | include/text.php | 2 | ||||
-rw-r--r-- | include/zot.php | 3 | ||||
-rw-r--r-- | mod/channel.php | 2 | ||||
-rw-r--r-- | mod/item.php | 23 | ||||
-rw-r--r-- | mod/network.php | 4 | ||||
-rw-r--r-- | mod/search.php | 3 | ||||
-rw-r--r-- | mod/search_ac.php | 5 | ||||
-rw-r--r-- | mod/tagger.php | 2 | ||||
-rw-r--r-- | util/hmessages.po | 2743 | ||||
-rw-r--r-- | version.inc | 2 |
14 files changed, 1454 insertions, 1380 deletions
@@ -423,6 +423,7 @@ define ( 'TERM_SAVEDSEARCH', 6 ); define ( 'TERM_THING', 7 ); define ( 'TERM_BOOKMARK', 8 ); define ( 'TERM_HIERARCHY', 9 ); +define ( 'TERM_COMMUNITYTAG', 10 ); define ( 'TERM_OBJ_POST', 1 ); define ( 'TERM_OBJ_PHOTO', 2 ); diff --git a/include/conversation.php b/include/conversation.php index 6cdbb878f..2c447acbc 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -674,7 +674,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ $unverified = ''; // $tags=array(); -// $terms = get_terms_oftype($item['term'],array(TERM_HASHTAG,TERM_MENTION,TERM_UNKNOWN)); +// $terms = get_terms_oftype($item['term'],array(TERM_HASHTAG,TERM_MENTION,TERM_UNKNOWN,TERM_COMMUNITYTAG)); // if(count($terms)) // foreach($terms as $tag) // $tags[] = format_term_for_display($tag); diff --git a/include/items.php b/include/items.php index 43bbdda28..7d349c631 100755 --- a/include/items.php +++ b/include/items.php @@ -1408,7 +1408,7 @@ function encode_item_xchan($xchan) { function encode_item_terms($terms,$mirror = false) { $ret = array(); - $allowed_export_terms = array( TERM_UNKNOWN, TERM_HASHTAG, TERM_MENTION, TERM_CATEGORY, TERM_BOOKMARK ); + $allowed_export_terms = array( TERM_UNKNOWN, TERM_HASHTAG, TERM_MENTION, TERM_CATEGORY, TERM_BOOKMARK, TERM_COMMUNITYTAG ); if($mirror) { $allowed_export_terms[] = TERM_PCATEGORY; @@ -1432,7 +1432,7 @@ function encode_item_terms($terms,$mirror = false) { * @return string */ function termtype($t) { - $types = array('unknown','hashtag','mention','category','private_category','file','search','thing','bookmark'); + $types = array('unknown','hashtag','mention','category','private_category','file','search','thing','bookmark', 'hierarchy', 'communitytag'); return(($types[$t]) ? $types[$t] : 'unknown'); } @@ -1478,6 +1478,9 @@ function decode_tags($t) { case 'bookmark': $tag['type'] = TERM_BOOKMARK; break; + case 'communitytag': + $tag['type'] = TERM_COMMUNITYTAG; + break; default: case 'unknown': $tag['type'] = TERM_UNKNOWN; @@ -3032,7 +3035,7 @@ function tag_deliver($uid, $item_id) { if(is_array($j_obj['link'])) $taglink = get_rel_link($j_obj['link'],'alternate'); - store_item_tag($u[0]['channel_id'],$p[0]['id'],TERM_OBJ_POST,TERM_HASHTAG,$j_obj['title'],$j_obj['id']); + store_item_tag($u[0]['channel_id'],$p[0]['id'],TERM_OBJ_POST,TERM_COMMUNITYTAG,$j_obj['title'],$j_obj['id']); $x = q("update item set edited = '%s', received = '%s', changed = '%s' where mid = '%s' and uid = %d", dbesc(datetime_convert()), dbesc(datetime_convert()), @@ -3437,7 +3440,7 @@ function check_item_source($uid, $item) { foreach($words as $word) { if(substr($word,0,1) === '#' && $tags) { foreach($tags as $t) - if(($t['type'] == TERM_HASHTAG) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*'))) + if((($t['type'] == TERM_HASHTAG) || ($t['type'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*'))) return true; } elseif((strpos($word,'/') === 0) && preg_match($word,$text)) @@ -3490,7 +3493,7 @@ function post_is_importable($item,$abook) { continue; if(substr($word,0,1) === '#' && $tags) { foreach($tags as $t) - if(($t['type'] == TERM_HASHTAG) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*'))) + if((($t['type'] == TERM_HASHTAG) || ($t['type'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*'))) return false; } elseif((strpos($word,'/') === 0) && preg_match($word,$text)) @@ -3511,7 +3514,7 @@ function post_is_importable($item,$abook) { continue; if(substr($word,0,1) === '#' && $tags) { foreach($tags as $t) - if(($t['type'] == TERM_HASHTAG) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*'))) + if((($t['type'] == TERM_HASHTAG) || ($t['type'] == TERM_COMMUNITYTAG)) && (($t['term'] === substr($word,1)) || (substr($word,1) === '*'))) return true; } elseif((strpos($word,'/') === 0) && preg_match($word,$text)) @@ -4162,12 +4165,12 @@ function enumerate_permissions($obj) { function item_getfeedtags($item) { - $terms = get_terms_oftype($item['term'],array(TERM_HASHTAG,TERM_MENTION)); + $terms = get_terms_oftype($item['term'],array(TERM_HASHTAG,TERM_MENTION,TERM_COMMUNITYTAG)); $ret = array(); if(count($terms)) { foreach($terms as $term) { - if($term['type'] == TERM_HASHTAG) + if(($term['type'] == TERM_HASHTAG) || ($term['type'] == TERM_COMMUNITYTAG)) $ret[] = array('#',$term['url'],$term['term']); else $ret[] = array('@',$term['url'],$term['term']); @@ -4875,7 +4878,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C if($arr['search']) { if(strpos($arr['search'],'#') === 0) - $sql_extra .= term_query('item',substr($arr['search'],1),TERM_HASHTAG); + $sql_extra .= term_query('item',substr($arr['search'],1),TERM_HASHTAG,TERM_COMMUNITYTAG); else $sql_extra .= sprintf(" AND item.body like '%s' ", dbesc(protect_sprintf('%' . $arr['search'] . '%')) diff --git a/include/taxonomy.php b/include/taxonomy.php index e68b9659f..b396d53f1 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -26,12 +26,21 @@ function file_tag_file_query($table,$s,$type = 'file') { ); } -function term_query($table,$s,$type = TERM_UNKNOWN) { +function term_query($table,$s,$type = TERM_UNKNOWN, $type2 = '') { - return sprintf(" AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.type = %d and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ", - intval($type), - protect_sprintf(dbesc($s)) - ); + if($type2) { + return sprintf(" AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.type in (%d, %d) and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ", + intval($type), + intval($type2), + protect_sprintf(dbesc($s)) + ); + } + else { + return sprintf(" AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.type = %d and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ", + intval($type), + protect_sprintf(dbesc($s)) + ); + } } @@ -84,7 +93,7 @@ function get_terms_oftype($arr,$type) { function format_term_for_display($term) { $s = ''; - if($term['type'] == TERM_HASHTAG) + if(($term['type'] == TERM_HASHTAG) || ($term['type'] == TERM_COMMUNITYTAG)) $s .= '#'; elseif($term['type'] == TERM_MENTION) $s .= '@'; diff --git a/include/text.php b/include/text.php index 4053c15b2..7c8834fc8 100644 --- a/include/text.php +++ b/include/text.php @@ -1298,7 +1298,7 @@ function format_categories(&$item,$writeable) { function format_hashtags(&$item) { $s = ''; - $terms = get_terms_oftype($item['term'], TERM_HASHTAG); + $terms = get_terms_oftype($item['term'], array(TERM_HASHTAG,TERM_COMMUNITYTAG)); if($terms) { foreach($terms as $t) { $term = htmlspecialchars($t['term'], ENT_COMPAT, 'UTF-8', false) ; diff --git a/include/zot.php b/include/zot.php index 0a1a8ee51..23fb9c4ad 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1933,11 +1933,12 @@ function remove_community_tag($sender, $arr, $uid) { return; } - q("delete from term where uid = %d and oid = %d and otype = %d and type = %d and term = '%s' and url = '%s'", + q("delete from term where uid = %d and oid = %d and otype = %d and type in ( %d, %d ) and term = '%s' and url = '%s'", intval($uid), intval($r[0]['id']), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), + intval(TERM_COMMUNITYTAG), dbesc($i['object']['title']), dbesc(get_rel_link($i['object']['link'],'alternate')) ); diff --git a/mod/channel.php b/mod/channel.php index 0af2666cc..2b9d0ed89 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -189,7 +189,7 @@ function channel_content(&$a, $update = 0, $load = false) { $sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY)); } if(x($hashtags)) { - $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG)); + $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG)); } if($datequery) { diff --git a/mod/item.php b/mod/item.php index 1e39ca9c9..34484eff7 100644 --- a/mod/item.php +++ b/mod/item.php @@ -651,6 +651,29 @@ function item_post(&$a) { } } + if($orig_post) { + // preserve original tags + $t = q("select * from term where oid = %d and otype = %d and uid = %d and type in ( %d, %d, %d )", + intval($orig_post['id']), + intval(TERM_OBJ_POST), + intval($profile_uid), + intval(TERM_UNKNOWN), + intval(TERM_FILE), + intval(TERM_COMMUNITYTAG) + ); + if($t) { + foreach($t as $t1) { + $post_tags[] = array( + 'uid' => $profile_uid, + 'type' => $t1['type'], + 'otype' => TERM_OBJ_POST, + 'term' => $t1['term'], + 'url' => $t1['url'], + ); + } + } + } + $item_unseen = ((local_channel() != $profile_uid) ? 1 : 0); $item_wall = (($post_type === 'wall' || $post_type === 'wall-comment') ? 1 : 0); diff --git a/mod/network.php b/mod/network.php index 53de975a4..9f0604296 100644 --- a/mod/network.php +++ b/mod/network.php @@ -248,7 +248,7 @@ function network_content(&$a, $update = 0, $load = false) { $sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY)); } if(x($hashtags)) { - $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG)); + $sql_extra .= protect_sprintf(term_query('item', $hashtags, TERM_HASHTAG, TERM_COMMUNITYTAG)); } if(! $update) { @@ -313,7 +313,7 @@ function network_content(&$a, $update = 0, $load = false) { if(x($_GET,'search')) { $search = escape_tags($_GET['search']); if(strpos($search,'#') === 0) { - $sql_extra .= term_query('item',substr($search,1),TERM_HASHTAG); + $sql_extra .= term_query('item',substr($search,1),TERM_HASHTAG,TERM_COMMUNITYTAG); } else { $sql_extra .= sprintf(" AND item.body like '%s' ", diff --git a/mod/search.php b/mod/search.php index a0085fca9..555d46f6a 100644 --- a/mod/search.php +++ b/mod/search.php @@ -75,9 +75,10 @@ function search_content(&$a,$update = 0, $load = false) { return $o; if($tag) { - $sql_extra = sprintf(" AND `item`.`id` IN (select `oid` from term where otype = %d and type = %d and term = '%s') ", + $sql_extra = sprintf(" AND `item`.`id` IN (select `oid` from term where otype = %d and type in ( %d , %d) and term = '%s') ", intval(TERM_OBJ_POST), intval(TERM_HASHTAG), + intval(TERM_COMMUNITYTAG), dbesc(protect_sprintf($search)) ); } diff --git a/mod/search_ac.php b/mod/search_ac.php index e42945d43..19c1dc940 100644 --- a/mod/search_ac.php +++ b/mod/search_ac.php @@ -42,8 +42,9 @@ function search_ac_init(&$a){ } } - $r = q("select distinct term, tid, url from term where type = %d $tag_sql_extra group by term order by term asc", - intval(TERM_HASHTAG) + $r = q("select distinct term, tid, url from term where type in ( %d, %d ) $tag_sql_extra group by term order by term asc", + intval(TERM_HASHTAG), + intval(TERM_COMMUNITYTAG) ); if(count($r)) { diff --git a/mod/tagger.php b/mod/tagger.php index 9f9855ed8..27a8a15ea 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -123,7 +123,7 @@ function tagger_content(&$a) { $arr['object'] = $obj; $arr['parent_mid'] = $item['mid']; - store_item_tag($item['uid'],$item['id'],TERM_OBJ_POST,TERM_HASHTAG,$term,$tagid); + store_item_tag($item['uid'],$item['id'],TERM_OBJ_POST,TERM_COMMUNITYTAG,$term,$tagid); $ret = post_activity_item($arr); if($ret['success']) diff --git a/util/hmessages.po b/util/hmessages.po index 7bcb498f9..00610c180 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-11-13.1215\n" +"Project-Id-Version: 2015-11-20.1222\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-13 00:03-0800\n" +"POT-Creation-Date: 2015-11-20 00:03-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,673 +17,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../../include/conversation.php:120 ../../include/text.php:1873 -#: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:77 -msgid "photo" -msgstr "" - -#: ../../include/conversation.php:123 ../../include/event.php:896 -#: ../../include/text.php:1876 ../../mod/like.php:363 ../../mod/tagger.php:47 -#: ../../mod/events.php:245 -msgid "event" -msgstr "" - -#: ../../include/conversation.php:126 ../../mod/like.php:113 -msgid "channel" -msgstr "" - -#: ../../include/conversation.php:148 ../../include/text.php:1879 -#: ../../mod/like.php:361 ../../mod/subthread.php:77 -msgid "status" -msgstr "" - -#: ../../include/conversation.php:150 ../../include/text.php:1881 -#: ../../mod/tagger.php:53 -msgid "comment" -msgstr "" - -#: ../../include/conversation.php:164 ../../mod/like.php:410 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "" - -#: ../../include/conversation.php:167 ../../mod/like.php:412 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "" - -#: ../../include/conversation.php:204 -#, php-format -msgid "%1$s is now connected with %2$s" -msgstr "" - -#: ../../include/conversation.php:239 -#, php-format -msgid "%1$s poked %2$s" -msgstr "" - -#: ../../include/conversation.php:243 ../../include/text.php:946 -msgid "poked" -msgstr "" - -#: ../../include/conversation.php:260 ../../mod/mood.php:63 -#, php-format -msgctxt "mood" -msgid "%1$s is %2$s" -msgstr "" - -#: ../../include/conversation.php:574 ../../mod/photos.php:1063 -msgctxt "title" -msgid "Likes" -msgstr "" - -#: ../../include/conversation.php:574 ../../mod/photos.php:1063 -msgctxt "title" -msgid "Dislikes" -msgstr "" - -#: ../../include/conversation.php:575 ../../mod/photos.php:1064 -msgctxt "title" -msgid "Agree" -msgstr "" - -#: ../../include/conversation.php:575 ../../mod/photos.php:1064 -msgctxt "title" -msgid "Disagree" -msgstr "" - -#: ../../include/conversation.php:575 ../../mod/photos.php:1064 -msgctxt "title" -msgid "Abstain" -msgstr "" - -#: ../../include/conversation.php:576 ../../mod/photos.php:1065 -msgctxt "title" -msgid "Attending" -msgstr "" - -#: ../../include/conversation.php:576 ../../mod/photos.php:1065 -msgctxt "title" -msgid "Not attending" -msgstr "" - -#: ../../include/conversation.php:576 ../../mod/photos.php:1065 -msgctxt "title" -msgid "Might attend" -msgstr "" - -#: ../../include/conversation.php:656 ../../include/ItemObject.php:126 -msgid "Select" -msgstr "" - -#: ../../include/conversation.php:657 ../../include/RedDAV/RedBrowser.php:241 -#: ../../include/apps.php:260 ../../include/ItemObject.php:120 -#: ../../mod/connedit.php:551 ../../mod/photos.php:1129 -#: ../../mod/editblock.php:181 ../../mod/admin.php:808 ../../mod/admin.php:967 -#: ../../mod/webpages.php:183 ../../mod/blocks.php:155 ../../mod/thing.php:258 -#: ../../mod/settings.php:647 ../../mod/editlayout.php:179 -#: ../../mod/editwebpage.php:223 ../../mod/group.php:173 -msgid "Delete" -msgstr "" - -#: ../../include/conversation.php:664 ../../include/ItemObject.php:89 -msgid "Private Message" -msgstr "" - -#: ../../include/conversation.php:671 ../../include/ItemObject.php:227 -msgid "Message signature validated" -msgstr "" - -#: ../../include/conversation.php:672 ../../include/ItemObject.php:228 -msgid "Message signature incorrect" -msgstr "" - -#: ../../include/conversation.php:691 -#, php-format -msgid "View %s's profile @ %s" -msgstr "" - -#: ../../include/conversation.php:709 -msgid "Categories:" -msgstr "" - -#: ../../include/conversation.php:710 -msgid "Filed under:" -msgstr "" - -#: ../../include/conversation.php:718 ../../include/ItemObject.php:321 -#, php-format -msgid "from %s" -msgstr "" - -#: ../../include/conversation.php:721 ../../include/ItemObject.php:324 -#, php-format -msgid "last edited: %s" -msgstr "" - -#: ../../include/conversation.php:722 ../../include/ItemObject.php:325 -#, php-format -msgid "Expires: %s" -msgstr "" - -#: ../../include/conversation.php:737 -msgid "View in context" -msgstr "" - -#: ../../include/conversation.php:739 ../../include/conversation.php:1226 -#: ../../include/ItemObject.php:375 ../../mod/photos.php:1029 -#: ../../mod/editblock.php:150 ../../mod/editpost.php:129 -#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:190 -msgid "Please wait" -msgstr "" - -#: ../../include/conversation.php:849 -msgid "remove" -msgstr "" - -#: ../../include/conversation.php:853 ../../include/nav.php:241 -msgid "Loading..." -msgstr "" - -#: ../../include/conversation.php:854 -msgid "Delete Selected Items" -msgstr "" - -#: ../../include/conversation.php:945 -msgid "View Source" -msgstr "" - -#: ../../include/conversation.php:946 -msgid "Follow Thread" -msgstr "" - -#: ../../include/conversation.php:947 -msgid "Stop Following" -msgstr "" - -#: ../../include/conversation.php:948 -msgid "View Status" -msgstr "" - -#: ../../include/conversation.php:949 ../../include/nav.php:86 -#: ../../mod/connedit.php:498 -msgid "View Profile" -msgstr "" - -#: ../../include/conversation.php:950 -msgid "View Photos" -msgstr "" - -#: ../../include/conversation.php:951 -msgid "Activity/Posts" -msgstr "" - -#: ../../include/conversation.php:952 ../../include/Contact.php:101 -#: ../../include/identity.php:952 ../../include/widgets.php:136 -#: ../../include/widgets.php:174 ../../mod/directory.php:318 -#: ../../mod/match.php:64 ../../mod/suggest.php:52 -msgid "Connect" -msgstr "" - -#: ../../include/conversation.php:953 -msgid "Edit Connection" -msgstr "" - -#: ../../include/conversation.php:954 -msgid "Send PM" -msgstr "" - -#: ../../include/conversation.php:955 ../../include/apps.php:145 -msgid "Poke" -msgstr "" - -#: ../../include/conversation.php:1026 ../../include/RedDAV/RedBrowser.php:164 -#: ../../include/apps.php:360 ../../include/apps.php:415 -#: ../../include/widgets.php:1281 ../../mod/photos.php:759 -#: ../../mod/photos.php:1198 -msgid "Unknown" -msgstr "" - -#: ../../include/conversation.php:1069 -#, php-format -msgid "%s likes this." -msgstr "" - -#: ../../include/conversation.php:1069 -#, php-format -msgid "%s doesn't like this." -msgstr "" - -#: ../../include/conversation.php:1073 -#, php-format -msgid "<span %1$s>%2$d people</span> like this." -msgid_plural "<span %1$s>%2$d people</span> like this." -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1075 -#, php-format -msgid "<span %1$s>%2$d people</span> don't like this." -msgid_plural "<span %1$s>%2$d people</span> don't like this." -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1081 -msgid "and" -msgstr "" - -#: ../../include/conversation.php:1084 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1085 -#, php-format -msgid "%s like this." -msgstr "" - -#: ../../include/conversation.php:1085 -#, php-format -msgid "%s don't like this." -msgstr "" - -#: ../../include/conversation.php:1153 -msgid "Visible to <strong>everybody</strong>" -msgstr "" - -#: ../../include/conversation.php:1154 ../../mod/mail.php:194 -#: ../../mod/mail.php:308 -msgid "Please enter a link URL:" -msgstr "" - -#: ../../include/conversation.php:1155 -msgid "Please enter a video link/URL:" -msgstr "" - -#: ../../include/conversation.php:1156 -msgid "Please enter an audio link/URL:" -msgstr "" - -#: ../../include/conversation.php:1157 -msgid "Tag term:" -msgstr "" - -#: ../../include/conversation.php:1158 ../../mod/filer.php:48 -msgid "Save to Folder:" -msgstr "" - -#: ../../include/conversation.php:1159 -msgid "Where are you right now?" -msgstr "" - -#: ../../include/conversation.php:1160 ../../mod/editpost.php:54 -#: ../../mod/mail.php:195 ../../mod/mail.php:309 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "" - -#: ../../include/conversation.php:1168 ../../include/page_widgets.php:40 -#: ../../include/ItemObject.php:692 ../../mod/photos.php:1049 -#: ../../mod/editblock.php:171 ../../mod/editpost.php:149 -#: ../../mod/events.php:707 ../../mod/webpages.php:188 -#: ../../mod/editwebpage.php:212 -msgid "Preview" -msgstr "" - -#: ../../include/conversation.php:1191 ../../mod/layouts.php:184 -#: ../../mod/photos.php:1028 ../../mod/webpages.php:182 -#: ../../mod/blocks.php:154 -msgid "Share" -msgstr "" - -#: ../../include/conversation.php:1193 -msgid "Page link name" -msgstr "" - -#: ../../include/conversation.php:1196 -msgid "Post as" -msgstr "" - -#: ../../include/conversation.php:1198 ../../include/ItemObject.php:684 -#: ../../mod/editblock.php:136 ../../mod/editpost.php:113 -#: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177 -msgid "Bold" -msgstr "" - -#: ../../include/conversation.php:1199 ../../include/ItemObject.php:685 -#: ../../mod/editblock.php:137 ../../mod/editpost.php:114 -#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178 -msgid "Italic" -msgstr "" - -#: ../../include/conversation.php:1200 ../../include/ItemObject.php:686 -#: ../../mod/editblock.php:138 ../../mod/editpost.php:115 -#: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179 -msgid "Underline" -msgstr "" - -#: ../../include/conversation.php:1201 ../../include/ItemObject.php:687 -#: ../../mod/editblock.php:139 ../../mod/editpost.php:116 -#: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180 -msgid "Quote" -msgstr "" - -#: ../../include/conversation.php:1202 ../../include/ItemObject.php:688 -#: ../../mod/editblock.php:140 ../../mod/editpost.php:117 -#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181 -msgid "Code" -msgstr "" - -#: ../../include/conversation.php:1203 ../../mod/editblock.php:142 -#: ../../mod/editpost.php:118 ../../mod/editlayout.php:140 -#: ../../mod/editwebpage.php:182 -msgid "Upload photo" -msgstr "" - -#: ../../include/conversation.php:1204 -msgid "upload photo" -msgstr "" - -#: ../../include/conversation.php:1205 ../../mod/editblock.php:143 -#: ../../mod/editpost.php:119 ../../mod/mail.php:240 ../../mod/mail.php:369 -#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:183 -msgid "Attach file" -msgstr "" - -#: ../../include/conversation.php:1206 -msgid "attach file" -msgstr "" - -#: ../../include/conversation.php:1207 ../../mod/editblock.php:144 -#: ../../mod/editpost.php:120 ../../mod/mail.php:241 ../../mod/mail.php:370 -#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:184 -msgid "Insert web link" -msgstr "" - -#: ../../include/conversation.php:1208 -msgid "web link" -msgstr "" - -#: ../../include/conversation.php:1209 -msgid "Insert video link" -msgstr "" - -#: ../../include/conversation.php:1210 -msgid "video link" -msgstr "" - -#: ../../include/conversation.php:1211 -msgid "Insert audio link" -msgstr "" - -#: ../../include/conversation.php:1212 -msgid "audio link" -msgstr "" - -#: ../../include/conversation.php:1213 ../../mod/editblock.php:148 -#: ../../mod/editpost.php:124 ../../mod/editlayout.php:146 -#: ../../mod/editwebpage.php:188 -msgid "Set your location" -msgstr "" - -#: ../../include/conversation.php:1214 -msgid "set location" -msgstr "" - -#: ../../include/conversation.php:1215 ../../mod/editpost.php:126 -msgid "Toggle voting" -msgstr "" - -#: ../../include/conversation.php:1218 ../../mod/editblock.php:149 -#: ../../mod/editpost.php:125 ../../mod/editlayout.php:147 -#: ../../mod/editwebpage.php:189 -msgid "Clear browser location" -msgstr "" - -#: ../../include/conversation.php:1219 -msgid "clear location" -msgstr "" - -#: ../../include/conversation.php:1221 ../../mod/editblock.php:162 -#: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205 -msgid "Title (optional)" -msgstr "" - -#: ../../include/conversation.php:1225 ../../mod/editblock.php:165 -#: ../../mod/editpost.php:143 ../../mod/editlayout.php:163 -#: ../../mod/editwebpage.php:207 -msgid "Categories (optional, comma-separated list)" -msgstr "" - -#: ../../include/conversation.php:1227 ../../mod/editblock.php:151 -#: ../../mod/editpost.php:130 ../../mod/editlayout.php:149 -#: ../../mod/editwebpage.php:191 -msgid "Permission settings" -msgstr "" - -#: ../../include/conversation.php:1228 -msgid "permissions" -msgstr "" - -#: ../../include/conversation.php:1236 ../../mod/editblock.php:159 -#: ../../mod/editpost.php:138 ../../mod/editlayout.php:156 -#: ../../mod/editwebpage.php:200 -msgid "Public post" -msgstr "" - -#: ../../include/conversation.php:1238 ../../mod/editblock.php:166 -#: ../../mod/editpost.php:144 ../../mod/editlayout.php:164 -#: ../../mod/editwebpage.php:208 -msgid "Example: bob@example.com, mary@example.com" -msgstr "" - -#: ../../include/conversation.php:1251 ../../mod/editblock.php:176 -#: ../../mod/editpost.php:155 ../../mod/mail.php:245 ../../mod/mail.php:374 -#: ../../mod/editlayout.php:173 ../../mod/editwebpage.php:217 -msgid "Set expiration date" -msgstr "" - -#: ../../include/conversation.php:1254 -msgid "Set publish date" -msgstr "" - -#: ../../include/conversation.php:1256 ../../include/ItemObject.php:695 -#: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:376 -msgid "Encrypt text" -msgstr "" - -#: ../../include/conversation.php:1258 ../../mod/editpost.php:159 -#: ../../mod/events.php:691 -msgid "OK" -msgstr "" - -#: ../../include/conversation.php:1259 ../../mod/fbrowser.php:82 -#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160 -#: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134 -#: ../../mod/settings.php:585 ../../mod/settings.php:611 -msgid "Cancel" -msgstr "" - -#: ../../include/conversation.php:1502 -msgid "Discover" -msgstr "" - -#: ../../include/conversation.php:1505 -msgid "Imported public streams" -msgstr "" - -#: ../../include/conversation.php:1510 -msgid "Commented Order" -msgstr "" - -#: ../../include/conversation.php:1513 -msgid "Sort by Comment Date" -msgstr "" - -#: ../../include/conversation.php:1517 -msgid "Posted Order" -msgstr "" - -#: ../../include/conversation.php:1520 -msgid "Sort by Post Date" -msgstr "" - -#: ../../include/conversation.php:1525 ../../include/widgets.php:94 -msgid "Personal" -msgstr "" - -#: ../../include/conversation.php:1528 -msgid "Posts that mention or involve you" -msgstr "" - -#: ../../include/conversation.php:1534 ../../mod/menu.php:112 -#: ../../mod/connections.php:72 ../../mod/connections.php:82 -msgid "New" -msgstr "" - -#: ../../include/conversation.php:1537 -msgid "Activity Stream - by date" -msgstr "" - -#: ../../include/conversation.php:1543 -msgid "Starred" -msgstr "" - -#: ../../include/conversation.php:1546 -msgid "Favourite Posts" -msgstr "" - -#: ../../include/conversation.php:1553 -msgid "Spam" -msgstr "" - -#: ../../include/conversation.php:1556 -msgid "Posts flagged as SPAM" -msgstr "" - -#: ../../include/conversation.php:1600 ../../mod/admin.php:972 -msgid "Channel" -msgstr "" - -#: ../../include/conversation.php:1603 -msgid "Status Messages and Posts" -msgstr "" - -#: ../../include/conversation.php:1612 -msgid "About" -msgstr "" - -#: ../../include/conversation.php:1615 -msgid "Profile Details" -msgstr "" - -#: ../../include/conversation.php:1621 ../../include/apps.php:139 -#: ../../include/nav.php:92 ../../mod/fbrowser.php:25 -msgid "Photos" -msgstr "" - -#: ../../include/conversation.php:1624 ../../include/photos.php:483 -msgid "Photo Albums" -msgstr "" - -#: ../../include/conversation.php:1628 ../../include/RedDAV/RedBrowser.php:226 -#: ../../include/apps.php:135 ../../include/nav.php:93 -#: ../../mod/fbrowser.php:114 -msgid "Files" -msgstr "" - -#: ../../include/conversation.php:1631 -msgid "Files and Storage" -msgstr "" - -#: ../../include/conversation.php:1641 ../../include/conversation.php:1644 -msgid "Chatrooms" -msgstr "" - -#: ../../include/conversation.php:1654 ../../include/apps.php:129 -#: ../../include/nav.php:103 -msgid "Bookmarks" -msgstr "" - -#: ../../include/conversation.php:1657 -msgid "Saved Bookmarks" -msgstr "" - -#: ../../include/conversation.php:1664 ../../include/apps.php:136 -#: ../../include/nav.php:107 ../../mod/webpages.php:178 -msgid "Webpages" -msgstr "" - -#: ../../include/conversation.php:1667 -msgid "Manage Webpages" -msgstr "" - -#: ../../include/conversation.php:1696 ../../include/ItemObject.php:175 -#: ../../include/ItemObject.php:187 ../../mod/photos.php:1082 -#: ../../mod/photos.php:1094 -msgid "View all" -msgstr "" - -#: ../../include/conversation.php:1720 ../../include/ItemObject.php:179 -#: ../../include/identity.php:1263 ../../include/taxonomy.php:403 -#: ../../mod/photos.php:1086 -msgctxt "noun" -msgid "Like" -msgid_plural "Likes" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1723 ../../include/ItemObject.php:184 -#: ../../mod/photos.php:1091 -msgctxt "noun" -msgid "Dislike" -msgid_plural "Dislikes" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1726 -msgctxt "noun" -msgid "Attending" -msgid_plural "Attending" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1729 -msgctxt "noun" -msgid "Not Attending" -msgid_plural "Not Attending" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1732 -msgctxt "noun" -msgid "Undecided" -msgid_plural "Undecided" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1735 -msgctxt "noun" -msgid "Agree" -msgid_plural "Agrees" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1738 -msgctxt "noun" -msgid "Disagree" -msgid_plural "Disagrees" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1741 -msgctxt "noun" -msgid "Abstain" -msgid_plural "Abstains" -msgstr[0] "" -msgstr[1] "" - #: ../../include/Import/import_diaspora.php:17 msgid "No username found in import file." msgstr "" @@ -701,7 +34,7 @@ msgstr "" msgid "parent" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2539 +#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2546 msgid "Collection" msgstr "" @@ -725,6 +58,19 @@ msgstr "" msgid "Schedule Outbox" msgstr "" +#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1026 +#: ../../include/apps.php:360 ../../include/apps.php:415 +#: ../../include/widgets.php:1317 ../../mod/photos.php:759 +#: ../../mod/photos.php:1198 +msgid "Unknown" +msgstr "" + +#: ../../include/RedDAV/RedBrowser.php:226 ../../include/conversation.php:1628 +#: ../../include/apps.php:135 ../../include/nav.php:93 +#: ../../mod/fbrowser.php:114 +msgid "Files" +msgstr "" + #: ../../include/RedDAV/RedBrowser.php:227 msgid "Total" msgstr "" @@ -741,13 +87,13 @@ msgid "Create" msgstr "" #: ../../include/RedDAV/RedBrowser.php:231 -#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1293 +#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1329 #: ../../mod/photos.php:784 ../../mod/photos.php:1317 #: ../../mod/profile_photo.php:450 msgid "Upload" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:973 +#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:974 #: ../../mod/settings.php:586 ../../mod/settings.php:612 #: ../../mod/sharedwithme.php:95 msgid "Name" @@ -757,7 +103,7 @@ msgstr "" msgid "Type" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:237 ../../include/text.php:1240 +#: ../../include/RedDAV/RedBrowser.php:237 ../../include/text.php:1247 #: ../../mod/sharedwithme.php:97 msgid "Size" msgstr "" @@ -778,6 +124,16 @@ msgstr "" msgid "Edit" msgstr "" +#: ../../include/RedDAV/RedBrowser.php:241 ../../include/conversation.php:657 +#: ../../include/apps.php:260 ../../include/ItemObject.php:120 +#: ../../mod/connedit.php:551 ../../mod/photos.php:1129 +#: ../../mod/editblock.php:181 ../../mod/admin.php:809 ../../mod/admin.php:968 +#: ../../mod/webpages.php:183 ../../mod/blocks.php:155 ../../mod/thing.php:258 +#: ../../mod/settings.php:647 ../../mod/editlayout.php:179 +#: ../../mod/editwebpage.php:223 ../../mod/group.php:173 +msgid "Delete" +msgstr "" + #: ../../include/RedDAV/RedBrowser.php:282 #, php-format msgid "You are using %1$s of your available file storage." @@ -945,7 +301,7 @@ msgstr "" msgid "Room not found." msgstr "" -#: ../../include/chat.php:133 ../../include/items.php:4390 +#: ../../include/chat.php:133 ../../include/items.php:4396 #: ../../include/photos.php:29 ../../include/attach.php:140 #: ../../include/attach.php:188 ../../include/attach.php:251 #: ../../include/attach.php:265 ../../include/attach.php:272 @@ -969,7 +325,7 @@ msgstr "" #: ../../mod/notifications.php:66 ../../mod/pdledit.php:21 #: ../../mod/events.php:256 ../../mod/profile_photo.php:338 #: ../../mod/profile_photo.php:351 ../../mod/item.php:205 -#: ../../mod/item.php:213 ../../mod/item.php:1006 ../../mod/message.php:16 +#: ../../mod/item.php:213 ../../mod/item.php:1049 ../../mod/message.php:16 #: ../../mod/webpages.php:69 ../../mod/register.php:72 ../../mod/blocks.php:69 #: ../../mod/blocks.php:76 ../../mod/service_limits.php:7 #: ../../mod/sources.php:66 ../../mod/regmod.php:17 ../../mod/channel.php:100 @@ -1006,7 +362,7 @@ msgstr "" msgid "Required" msgstr "" -#: ../../include/datetime.php:262 ../../boot.php:2287 +#: ../../include/datetime.php:262 ../../boot.php:2289 msgid "never" msgstr "" @@ -1194,7 +550,7 @@ msgid "" "(640px) photo thumbnails" msgstr "" -#: ../../include/features.php:59 ../../include/widgets.php:545 +#: ../../include/features.php:59 ../../include/widgets.php:546 #: ../../mod/sources.php:88 msgid "Channel Sources" msgstr "" @@ -1228,124 +584,134 @@ msgstr "" msgid "Allow posts to be published at a later date" msgstr "" -#: ../../include/features.php:68 -msgid "Network and Stream Filtering" +#: ../../include/features.php:63 +msgid "Suppress Duplicate Posts/Comments" +msgstr "" + +#: ../../include/features.php:63 +msgid "" +"Prevent posts with identical content to be published with less than two " +"minutes in between submissions." msgstr "" #: ../../include/features.php:69 +msgid "Network and Stream Filtering" +msgstr "" + +#: ../../include/features.php:70 msgid "Search by Date" msgstr "" -#: ../../include/features.php:69 +#: ../../include/features.php:70 msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/features.php:70 +#: ../../include/features.php:71 msgid "Collections Filter" msgstr "" -#: ../../include/features.php:70 +#: ../../include/features.php:71 msgid "Enable widget to display Network posts only from selected collections" msgstr "" -#: ../../include/features.php:71 ../../include/widgets.php:273 +#: ../../include/features.php:72 ../../include/widgets.php:274 msgid "Saved Searches" msgstr "" -#: ../../include/features.php:71 +#: ../../include/features.php:72 msgid "Save search terms for re-use" msgstr "" -#: ../../include/features.php:72 +#: ../../include/features.php:73 msgid "Network Personal Tab" msgstr "" -#: ../../include/features.php:72 +#: ../../include/features.php:73 msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../include/features.php:73 +#: ../../include/features.php:74 msgid "Network New Tab" msgstr "" -#: ../../include/features.php:73 +#: ../../include/features.php:74 msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../include/features.php:74 +#: ../../include/features.php:75 msgid "Affinity Tool" msgstr "" -#: ../../include/features.php:74 +#: ../../include/features.php:75 msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/features.php:75 +#: ../../include/features.php:76 msgid "Connection Filtering" msgstr "" -#: ../../include/features.php:75 +#: ../../include/features.php:76 msgid "Filter incoming posts from connections based on keywords/content" msgstr "" -#: ../../include/features.php:76 +#: ../../include/features.php:77 msgid "Suggest Channels" msgstr "" -#: ../../include/features.php:76 +#: ../../include/features.php:77 msgid "Show channel suggestions" msgstr "" -#: ../../include/features.php:81 +#: ../../include/features.php:82 msgid "Post/Comment Tools" msgstr "" -#: ../../include/features.php:82 +#: ../../include/features.php:83 msgid "Tagging" msgstr "" -#: ../../include/features.php:82 +#: ../../include/features.php:83 msgid "Ability to tag existing posts" msgstr "" -#: ../../include/features.php:83 +#: ../../include/features.php:84 msgid "Post Categories" msgstr "" -#: ../../include/features.php:83 +#: ../../include/features.php:84 msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:84 ../../include/contact_widgets.php:57 -#: ../../include/widgets.php:303 +#: ../../include/features.php:85 ../../include/contact_widgets.php:57 +#: ../../include/widgets.php:304 msgid "Saved Folders" msgstr "" -#: ../../include/features.php:84 +#: ../../include/features.php:85 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:85 +#: ../../include/features.php:86 msgid "Dislike Posts" msgstr "" -#: ../../include/features.php:85 +#: ../../include/features.php:86 msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/features.php:86 +#: ../../include/features.php:87 msgid "Star Posts" msgstr "" -#: ../../include/features.php:86 +#: ../../include/features.php:87 msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/features.php:87 +#: ../../include/features.php:88 msgid "Tag Cloud" msgstr "" -#: ../../include/features.php:87 +#: ../../include/features.php:88 msgid "Provide a personal tag cloud on your channel page" msgstr "" @@ -1424,24 +790,24 @@ msgid "Describe (optional)" msgstr "" #: ../../include/js_strings.php:22 ../../include/ItemObject.php:683 -#: ../../mod/fsuggest.php:108 ../../mod/mitem.php:231 -#: ../../mod/connedit.php:715 ../../mod/mood.php:135 ../../mod/pconfig.php:108 -#: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:184 -#: ../../mod/chat.php:213 ../../mod/rate.php:168 ../../mod/photos.php:637 -#: ../../mod/photos.php:1008 ../../mod/photos.php:1048 -#: ../../mod/photos.php:1166 ../../mod/admin.php:434 ../../mod/admin.php:801 -#: ../../mod/admin.php:965 ../../mod/admin.php:1097 ../../mod/admin.php:1291 -#: ../../mod/admin.php:1376 ../../mod/appman.php:99 ../../mod/pdledit.php:58 -#: ../../mod/events.php:534 ../../mod/events.php:710 ../../mod/sources.php:104 -#: ../../mod/sources.php:138 ../../mod/import.php:527 ../../mod/thing.php:313 -#: ../../mod/thing.php:359 ../../mod/invite.php:142 ../../mod/mail.php:371 -#: ../../mod/settings.php:584 ../../mod/settings.php:696 -#: ../../mod/settings.php:724 ../../mod/settings.php:747 -#: ../../mod/settings.php:832 ../../mod/settings.php:1021 -#: ../../mod/xchan.php:11 ../../mod/group.php:81 ../../mod/connect.php:93 -#: ../../mod/locs.php:116 ../../mod/setup.php:331 ../../mod/setup.php:371 -#: ../../mod/profiles.php:667 ../../mod/import_items.php:122 -#: ../../view/theme/redbasic/php/config.php:99 +#: ../../include/widgets.php:676 ../../mod/fsuggest.php:108 +#: ../../mod/mitem.php:231 ../../mod/connedit.php:715 ../../mod/mood.php:135 +#: ../../mod/pconfig.php:108 ../../mod/filestorage.php:156 +#: ../../mod/poke.php:171 ../../mod/chat.php:184 ../../mod/chat.php:213 +#: ../../mod/rate.php:168 ../../mod/photos.php:637 ../../mod/photos.php:1008 +#: ../../mod/photos.php:1048 ../../mod/photos.php:1166 ../../mod/admin.php:435 +#: ../../mod/admin.php:802 ../../mod/admin.php:966 ../../mod/admin.php:1103 +#: ../../mod/admin.php:1297 ../../mod/admin.php:1382 ../../mod/appman.php:99 +#: ../../mod/pdledit.php:58 ../../mod/events.php:531 ../../mod/events.php:710 +#: ../../mod/sources.php:104 ../../mod/sources.php:138 +#: ../../mod/import.php:527 ../../mod/thing.php:313 ../../mod/thing.php:359 +#: ../../mod/invite.php:142 ../../mod/mail.php:371 ../../mod/settings.php:584 +#: ../../mod/settings.php:696 ../../mod/settings.php:724 +#: ../../mod/settings.php:747 ../../mod/settings.php:832 +#: ../../mod/settings.php:1021 ../../mod/xchan.php:11 ../../mod/group.php:81 +#: ../../mod/connect.php:93 ../../mod/locs.php:116 ../../mod/setup.php:331 +#: ../../mod/setup.php:371 ../../mod/profiles.php:667 +#: ../../mod/import_items.php:122 ../../view/theme/redbasic/php/config.php:99 msgid "Submit" msgstr "" @@ -1526,19 +892,19 @@ msgstr "" msgid "timeago.numbers" msgstr "" -#: ../../include/js_strings.php:44 ../../include/text.php:1157 +#: ../../include/js_strings.php:44 ../../include/text.php:1164 msgid "January" msgstr "" -#: ../../include/js_strings.php:45 ../../include/text.php:1157 +#: ../../include/js_strings.php:45 ../../include/text.php:1164 msgid "February" msgstr "" -#: ../../include/js_strings.php:46 ../../include/text.php:1157 +#: ../../include/js_strings.php:46 ../../include/text.php:1164 msgid "March" msgstr "" -#: ../../include/js_strings.php:47 ../../include/text.php:1157 +#: ../../include/js_strings.php:47 ../../include/text.php:1164 msgid "April" msgstr "" @@ -1547,31 +913,31 @@ msgctxt "long" msgid "May" msgstr "" -#: ../../include/js_strings.php:49 ../../include/text.php:1157 +#: ../../include/js_strings.php:49 ../../include/text.php:1164 msgid "June" msgstr "" -#: ../../include/js_strings.php:50 ../../include/text.php:1157 +#: ../../include/js_strings.php:50 ../../include/text.php:1164 msgid "July" msgstr "" -#: ../../include/js_strings.php:51 ../../include/text.php:1157 +#: ../../include/js_strings.php:51 ../../include/text.php:1164 msgid "August" msgstr "" -#: ../../include/js_strings.php:52 ../../include/text.php:1157 +#: ../../include/js_strings.php:52 ../../include/text.php:1164 msgid "September" msgstr "" -#: ../../include/js_strings.php:53 ../../include/text.php:1157 +#: ../../include/js_strings.php:53 ../../include/text.php:1164 msgid "October" msgstr "" -#: ../../include/js_strings.php:54 ../../include/text.php:1157 +#: ../../include/js_strings.php:54 ../../include/text.php:1164 msgid "November" msgstr "" -#: ../../include/js_strings.php:55 ../../include/text.php:1157 +#: ../../include/js_strings.php:55 ../../include/text.php:1164 msgid "December" msgstr "" @@ -1624,31 +990,31 @@ msgstr "" msgid "Dec" msgstr "" -#: ../../include/js_strings.php:68 ../../include/text.php:1153 +#: ../../include/js_strings.php:68 ../../include/text.php:1160 msgid "Sunday" msgstr "" -#: ../../include/js_strings.php:69 ../../include/text.php:1153 +#: ../../include/js_strings.php:69 ../../include/text.php:1160 msgid "Monday" msgstr "" -#: ../../include/js_strings.php:70 ../../include/text.php:1153 +#: ../../include/js_strings.php:70 ../../include/text.php:1160 msgid "Tuesday" msgstr "" -#: ../../include/js_strings.php:71 ../../include/text.php:1153 +#: ../../include/js_strings.php:71 ../../include/text.php:1160 msgid "Wednesday" msgstr "" -#: ../../include/js_strings.php:72 ../../include/text.php:1153 +#: ../../include/js_strings.php:72 ../../include/text.php:1160 msgid "Thursday" msgstr "" -#: ../../include/js_strings.php:73 ../../include/text.php:1153 +#: ../../include/js_strings.php:73 ../../include/text.php:1160 msgid "Friday" msgstr "" -#: ../../include/js_strings.php:74 ../../include/text.php:1153 +#: ../../include/js_strings.php:74 ../../include/text.php:1160 msgid "Saturday" msgstr "" @@ -1742,8 +1108,8 @@ msgid "RSS/Atom" msgstr "" #: ../../include/contact_selectors.php:79 ../../mod/id.php:15 -#: ../../mod/id.php:16 ../../mod/admin.php:804 ../../mod/admin.php:813 -#: ../../boot.php:1486 +#: ../../mod/id.php:16 ../../mod/admin.php:805 ../../mod/admin.php:814 +#: ../../boot.php:1488 msgid "Email" msgstr "" @@ -1794,6 +1160,13 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" +#: ../../include/Contact.php:101 ../../include/conversation.php:952 +#: ../../include/widgets.php:137 ../../include/widgets.php:175 +#: ../../include/identity.php:952 ../../mod/directory.php:318 +#: ../../mod/match.php:64 ../../mod/suggest.php:52 +msgid "Connect" +msgstr "" + #: ../../include/Contact.php:118 msgid "New window" msgstr "" @@ -1813,7 +1186,7 @@ msgid "Cannot locate DNS info for database server '%s'" msgstr "" #: ../../include/items.php:423 ../../mod/like.php:280 -#: ../../mod/subthread.php:52 ../../mod/dreport.php:6 ../../mod/dreport.php:45 +#: ../../mod/subthread.php:58 ../../mod/dreport.php:6 ../../mod/dreport.php:45 #: ../../mod/group.php:68 ../../mod/profperm.php:23 #: ../../mod/import_items.php:114 ../../index.php:360 msgid "Permission denied" @@ -1856,35 +1229,672 @@ msgstr "" msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4311 ../../mod/display.php:36 +#: ../../include/items.php:4317 ../../mod/display.php:36 #: ../../mod/filestorage.php:27 ../../mod/admin.php:127 -#: ../../mod/admin.php:1004 ../../mod/admin.php:1204 ../../mod/thing.php:86 +#: ../../mod/admin.php:1005 ../../mod/admin.php:1210 ../../mod/thing.php:86 #: ../../mod/viewsrc.php:20 msgid "Item not found." msgstr "" -#: ../../include/items.php:4820 ../../mod/group.php:38 ../../mod/group.php:137 +#: ../../include/items.php:4826 ../../mod/group.php:38 ../../mod/group.php:137 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4836 +#: ../../include/items.php:4842 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4843 +#: ../../include/items.php:4849 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4853 ../../mod/connedit.php:683 +#: ../../include/items.php:4859 ../../mod/connedit.php:683 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4855 +#: ../../include/items.php:4861 msgid "Connection not found." msgstr "" +#: ../../include/conversation.php:120 ../../include/text.php:1880 +#: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:83 +msgid "photo" +msgstr "" + +#: ../../include/conversation.php:123 ../../include/event.php:896 +#: ../../include/text.php:1883 ../../mod/like.php:363 ../../mod/tagger.php:47 +#: ../../mod/events.php:245 +msgid "event" +msgstr "" + +#: ../../include/conversation.php:126 ../../mod/like.php:113 +msgid "channel" +msgstr "" + +#: ../../include/conversation.php:148 ../../include/text.php:1886 +#: ../../mod/like.php:361 ../../mod/subthread.php:83 +msgid "status" +msgstr "" + +#: ../../include/conversation.php:150 ../../include/text.php:1888 +#: ../../mod/tagger.php:53 +msgid "comment" +msgstr "" + +#: ../../include/conversation.php:164 ../../mod/like.php:410 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + +#: ../../include/conversation.php:167 ../../mod/like.php:412 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "" + +#: ../../include/conversation.php:204 +#, php-format +msgid "%1$s is now connected with %2$s" +msgstr "" + +#: ../../include/conversation.php:239 +#, php-format +msgid "%1$s poked %2$s" +msgstr "" + +#: ../../include/conversation.php:243 ../../include/text.php:953 +msgid "poked" +msgstr "" + +#: ../../include/conversation.php:260 ../../mod/mood.php:63 +#, php-format +msgctxt "mood" +msgid "%1$s is %2$s" +msgstr "" + +#: ../../include/conversation.php:574 ../../mod/photos.php:1063 +msgctxt "title" +msgid "Likes" +msgstr "" + +#: ../../include/conversation.php:574 ../../mod/photos.php:1063 +msgctxt "title" +msgid "Dislikes" +msgstr "" + +#: ../../include/conversation.php:575 ../../mod/photos.php:1064 +msgctxt "title" +msgid "Agree" +msgstr "" + +#: ../../include/conversation.php:575 ../../mod/photos.php:1064 +msgctxt "title" +msgid "Disagree" +msgstr "" + +#: ../../include/conversation.php:575 ../../mod/photos.php:1064 +msgctxt "title" +msgid "Abstain" +msgstr "" + +#: ../../include/conversation.php:576 ../../mod/photos.php:1065 +msgctxt "title" +msgid "Attending" +msgstr "" + +#: ../../include/conversation.php:576 ../../mod/photos.php:1065 +msgctxt "title" +msgid "Not attending" +msgstr "" + +#: ../../include/conversation.php:576 ../../mod/photos.php:1065 +msgctxt "title" +msgid "Might attend" +msgstr "" + +#: ../../include/conversation.php:656 ../../include/ItemObject.php:126 +msgid "Select" +msgstr "" + +#: ../../include/conversation.php:664 ../../include/ItemObject.php:89 +msgid "Private Message" +msgstr "" + +#: ../../include/conversation.php:671 ../../include/ItemObject.php:227 +msgid "Message signature validated" +msgstr "" + +#: ../../include/conversation.php:672 ../../include/ItemObject.php:228 +msgid "Message signature incorrect" +msgstr "" + +#: ../../include/conversation.php:691 +#, php-format +msgid "View %s's profile @ %s" +msgstr "" + +#: ../../include/conversation.php:709 +msgid "Categories:" +msgstr "" + +#: ../../include/conversation.php:710 +msgid "Filed under:" +msgstr "" + +#: ../../include/conversation.php:718 ../../include/ItemObject.php:321 +#, php-format +msgid "from %s" +msgstr "" + +#: ../../include/conversation.php:721 ../../include/ItemObject.php:324 +#, php-format +msgid "last edited: %s" +msgstr "" + +#: ../../include/conversation.php:722 ../../include/ItemObject.php:325 +#, php-format +msgid "Expires: %s" +msgstr "" + +#: ../../include/conversation.php:737 +msgid "View in context" +msgstr "" + +#: ../../include/conversation.php:739 ../../include/conversation.php:1226 +#: ../../include/ItemObject.php:375 ../../mod/photos.php:1029 +#: ../../mod/editblock.php:150 ../../mod/editpost.php:129 +#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:190 +msgid "Please wait" +msgstr "" + +#: ../../include/conversation.php:849 +msgid "remove" +msgstr "" + +#: ../../include/conversation.php:853 ../../include/nav.php:241 +msgid "Loading..." +msgstr "" + +#: ../../include/conversation.php:854 +msgid "Delete Selected Items" +msgstr "" + +#: ../../include/conversation.php:945 +msgid "View Source" +msgstr "" + +#: ../../include/conversation.php:946 +msgid "Follow Thread" +msgstr "" + +#: ../../include/conversation.php:947 +msgid "Unfollow Thread" +msgstr "" + +#: ../../include/conversation.php:948 +msgid "View Status" +msgstr "" + +#: ../../include/conversation.php:949 ../../include/nav.php:86 +#: ../../mod/connedit.php:498 +msgid "View Profile" +msgstr "" + +#: ../../include/conversation.php:950 +msgid "View Photos" +msgstr "" + +#: ../../include/conversation.php:951 +msgid "Activity/Posts" +msgstr "" + +#: ../../include/conversation.php:953 +msgid "Edit Connection" +msgstr "" + +#: ../../include/conversation.php:954 +msgid "Send PM" +msgstr "" + +#: ../../include/conversation.php:955 ../../include/apps.php:145 +msgid "Poke" +msgstr "" + +#: ../../include/conversation.php:1069 +#, php-format +msgid "%s likes this." +msgstr "" + +#: ../../include/conversation.php:1069 +#, php-format +msgid "%s doesn't like this." +msgstr "" + +#: ../../include/conversation.php:1073 +#, php-format +msgid "<span %1$s>%2$d people</span> like this." +msgid_plural "<span %1$s>%2$d people</span> like this." +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1075 +#, php-format +msgid "<span %1$s>%2$d people</span> don't like this." +msgid_plural "<span %1$s>%2$d people</span> don't like this." +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1081 +msgid "and" +msgstr "" + +#: ../../include/conversation.php:1084 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1085 +#, php-format +msgid "%s like this." +msgstr "" + +#: ../../include/conversation.php:1085 +#, php-format +msgid "%s don't like this." +msgstr "" + +#: ../../include/conversation.php:1153 +msgid "Visible to <strong>everybody</strong>" +msgstr "" + +#: ../../include/conversation.php:1154 ../../mod/mail.php:194 +#: ../../mod/mail.php:308 +msgid "Please enter a link URL:" +msgstr "" + +#: ../../include/conversation.php:1155 +msgid "Please enter a video link/URL:" +msgstr "" + +#: ../../include/conversation.php:1156 +msgid "Please enter an audio link/URL:" +msgstr "" + +#: ../../include/conversation.php:1157 +msgid "Tag term:" +msgstr "" + +#: ../../include/conversation.php:1158 ../../mod/filer.php:48 +msgid "Save to Folder:" +msgstr "" + +#: ../../include/conversation.php:1159 +msgid "Where are you right now?" +msgstr "" + +#: ../../include/conversation.php:1160 ../../mod/editpost.php:56 +#: ../../mod/mail.php:195 ../../mod/mail.php:309 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "" + +#: ../../include/conversation.php:1168 ../../include/page_widgets.php:40 +#: ../../include/ItemObject.php:692 ../../mod/photos.php:1049 +#: ../../mod/editblock.php:171 ../../mod/editpost.php:149 +#: ../../mod/events.php:707 ../../mod/webpages.php:188 +#: ../../mod/editwebpage.php:212 +msgid "Preview" +msgstr "" + +#: ../../include/conversation.php:1191 ../../mod/layouts.php:184 +#: ../../mod/photos.php:1028 ../../mod/webpages.php:182 +#: ../../mod/blocks.php:154 +msgid "Share" +msgstr "" + +#: ../../include/conversation.php:1193 +msgid "Page link name" +msgstr "" + +#: ../../include/conversation.php:1196 +msgid "Post as" +msgstr "" + +#: ../../include/conversation.php:1198 ../../include/ItemObject.php:684 +#: ../../mod/editblock.php:136 ../../mod/editpost.php:113 +#: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177 +msgid "Bold" +msgstr "" + +#: ../../include/conversation.php:1199 ../../include/ItemObject.php:685 +#: ../../mod/editblock.php:137 ../../mod/editpost.php:114 +#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178 +msgid "Italic" +msgstr "" + +#: ../../include/conversation.php:1200 ../../include/ItemObject.php:686 +#: ../../mod/editblock.php:138 ../../mod/editpost.php:115 +#: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179 +msgid "Underline" +msgstr "" + +#: ../../include/conversation.php:1201 ../../include/ItemObject.php:687 +#: ../../mod/editblock.php:139 ../../mod/editpost.php:116 +#: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180 +msgid "Quote" +msgstr "" + +#: ../../include/conversation.php:1202 ../../include/ItemObject.php:688 +#: ../../mod/editblock.php:140 ../../mod/editpost.php:117 +#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181 +msgid "Code" +msgstr "" + +#: ../../include/conversation.php:1203 ../../mod/editblock.php:142 +#: ../../mod/editpost.php:118 ../../mod/editlayout.php:140 +#: ../../mod/editwebpage.php:182 +msgid "Upload photo" +msgstr "" + +#: ../../include/conversation.php:1204 +msgid "upload photo" +msgstr "" + +#: ../../include/conversation.php:1205 ../../mod/editblock.php:143 +#: ../../mod/editpost.php:119 ../../mod/mail.php:240 ../../mod/mail.php:369 +#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:183 +msgid "Attach file" +msgstr "" + +#: ../../include/conversation.php:1206 +msgid "attach file" +msgstr "" + +#: ../../include/conversation.php:1207 ../../mod/editblock.php:144 +#: ../../mod/editpost.php:120 ../../mod/mail.php:241 ../../mod/mail.php:370 +#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:184 +msgid "Insert web link" +msgstr "" + +#: ../../include/conversation.php:1208 +msgid "web link" +msgstr "" + +#: ../../include/conversation.php:1209 +msgid "Insert video link" +msgstr "" + +#: ../../include/conversation.php:1210 +msgid "video link" +msgstr "" + +#: ../../include/conversation.php:1211 +msgid "Insert audio link" +msgstr "" + +#: ../../include/conversation.php:1212 +msgid "audio link" +msgstr "" + +#: ../../include/conversation.php:1213 ../../mod/editblock.php:148 +#: ../../mod/editpost.php:124 ../../mod/editlayout.php:146 +#: ../../mod/editwebpage.php:188 +msgid "Set your location" +msgstr "" + +#: ../../include/conversation.php:1214 +msgid "set location" +msgstr "" + +#: ../../include/conversation.php:1215 ../../mod/editpost.php:126 +msgid "Toggle voting" +msgstr "" + +#: ../../include/conversation.php:1218 ../../mod/editblock.php:149 +#: ../../mod/editpost.php:125 ../../mod/editlayout.php:147 +#: ../../mod/editwebpage.php:189 +msgid "Clear browser location" +msgstr "" + +#: ../../include/conversation.php:1219 +msgid "clear location" +msgstr "" + +#: ../../include/conversation.php:1221 ../../mod/editblock.php:162 +#: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205 +msgid "Title (optional)" +msgstr "" + +#: ../../include/conversation.php:1225 ../../mod/editblock.php:165 +#: ../../mod/editpost.php:143 ../../mod/editlayout.php:163 +#: ../../mod/editwebpage.php:207 +msgid "Categories (optional, comma-separated list)" +msgstr "" + +#: ../../include/conversation.php:1227 ../../mod/editblock.php:151 +#: ../../mod/editpost.php:130 ../../mod/editlayout.php:149 +#: ../../mod/editwebpage.php:191 +msgid "Permission settings" +msgstr "" + +#: ../../include/conversation.php:1228 +msgid "permissions" +msgstr "" + +#: ../../include/conversation.php:1236 ../../mod/editblock.php:159 +#: ../../mod/editpost.php:138 ../../mod/editlayout.php:156 +#: ../../mod/editwebpage.php:200 +msgid "Public post" +msgstr "" + +#: ../../include/conversation.php:1238 ../../mod/editblock.php:166 +#: ../../mod/editpost.php:144 ../../mod/editlayout.php:164 +#: ../../mod/editwebpage.php:208 +msgid "Example: bob@example.com, mary@example.com" +msgstr "" + +#: ../../include/conversation.php:1251 ../../mod/editblock.php:176 +#: ../../mod/editpost.php:155 ../../mod/mail.php:245 ../../mod/mail.php:374 +#: ../../mod/editlayout.php:173 ../../mod/editwebpage.php:217 +msgid "Set expiration date" +msgstr "" + +#: ../../include/conversation.php:1254 +msgid "Set publish date" +msgstr "" + +#: ../../include/conversation.php:1256 ../../include/ItemObject.php:695 +#: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:376 +msgid "Encrypt text" +msgstr "" + +#: ../../include/conversation.php:1258 ../../mod/editpost.php:159 +#: ../../mod/events.php:691 +msgid "OK" +msgstr "" + +#: ../../include/conversation.php:1259 ../../mod/fbrowser.php:82 +#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160 +#: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134 +#: ../../mod/settings.php:585 ../../mod/settings.php:611 +msgid "Cancel" +msgstr "" + +#: ../../include/conversation.php:1502 +msgid "Discover" +msgstr "" + +#: ../../include/conversation.php:1505 +msgid "Imported public streams" +msgstr "" + +#: ../../include/conversation.php:1510 +msgid "Commented Order" +msgstr "" + +#: ../../include/conversation.php:1513 +msgid "Sort by Comment Date" +msgstr "" + +#: ../../include/conversation.php:1517 +msgid "Posted Order" +msgstr "" + +#: ../../include/conversation.php:1520 +msgid "Sort by Post Date" +msgstr "" + +#: ../../include/conversation.php:1525 ../../include/widgets.php:95 +msgid "Personal" +msgstr "" + +#: ../../include/conversation.php:1528 +msgid "Posts that mention or involve you" +msgstr "" + +#: ../../include/conversation.php:1534 ../../mod/menu.php:112 +#: ../../mod/connections.php:72 ../../mod/connections.php:82 +msgid "New" +msgstr "" + +#: ../../include/conversation.php:1537 +msgid "Activity Stream - by date" +msgstr "" + +#: ../../include/conversation.php:1543 +msgid "Starred" +msgstr "" + +#: ../../include/conversation.php:1546 +msgid "Favourite Posts" +msgstr "" + +#: ../../include/conversation.php:1553 +msgid "Spam" +msgstr "" + +#: ../../include/conversation.php:1556 +msgid "Posts flagged as SPAM" +msgstr "" + +#: ../../include/conversation.php:1600 ../../mod/admin.php:973 +msgid "Channel" +msgstr "" + +#: ../../include/conversation.php:1603 +msgid "Status Messages and Posts" +msgstr "" + +#: ../../include/conversation.php:1612 +msgid "About" +msgstr "" + +#: ../../include/conversation.php:1615 +msgid "Profile Details" +msgstr "" + +#: ../../include/conversation.php:1621 ../../include/apps.php:139 +#: ../../include/nav.php:92 ../../mod/fbrowser.php:25 +msgid "Photos" +msgstr "" + +#: ../../include/conversation.php:1624 ../../include/photos.php:483 +msgid "Photo Albums" +msgstr "" + +#: ../../include/conversation.php:1631 +msgid "Files and Storage" +msgstr "" + +#: ../../include/conversation.php:1641 ../../include/conversation.php:1644 +msgid "Chatrooms" +msgstr "" + +#: ../../include/conversation.php:1654 ../../include/apps.php:129 +#: ../../include/nav.php:103 +msgid "Bookmarks" +msgstr "" + +#: ../../include/conversation.php:1657 +msgid "Saved Bookmarks" +msgstr "" + +#: ../../include/conversation.php:1664 ../../include/apps.php:136 +#: ../../include/nav.php:107 ../../mod/webpages.php:178 +msgid "Webpages" +msgstr "" + +#: ../../include/conversation.php:1667 +msgid "Manage Webpages" +msgstr "" + +#: ../../include/conversation.php:1696 ../../include/ItemObject.php:175 +#: ../../include/ItemObject.php:187 ../../mod/photos.php:1082 +#: ../../mod/photos.php:1094 +msgid "View all" +msgstr "" + +#: ../../include/conversation.php:1720 ../../include/ItemObject.php:179 +#: ../../include/identity.php:1263 ../../include/taxonomy.php:412 +#: ../../mod/photos.php:1086 +msgctxt "noun" +msgid "Like" +msgid_plural "Likes" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1723 ../../include/ItemObject.php:184 +#: ../../mod/photos.php:1091 +msgctxt "noun" +msgid "Dislike" +msgid_plural "Dislikes" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1726 +msgctxt "noun" +msgid "Attending" +msgid_plural "Attending" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1729 +msgctxt "noun" +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1732 +msgctxt "noun" +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1735 +msgctxt "noun" +msgid "Agree" +msgid_plural "Agrees" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1738 +msgctxt "noun" +msgid "Disagree" +msgid_plural "Disagrees" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1741 +msgctxt "noun" +msgid "Abstain" +msgid_plural "Abstains" +msgstr[0] "" +msgstr[1] "" + #: ../../include/network.php:613 msgid "view full size" msgstr "" @@ -1947,19 +1957,6 @@ msgstr "" msgid "Close" msgstr "" -#: ../../include/import.php:23 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." -msgstr "" - -#: ../../include/import.php:70 -msgid "Channel clone failed. Import failed." -msgstr "" - -#: ../../include/import.php:80 ../../mod/import.php:139 -msgid "Cloned channel not found. Import failed." -msgstr "" - #: ../../include/photos.php:112 #, php-format msgid "Image exceeds website size limit of %lu bytes" @@ -2173,9 +2170,9 @@ msgstr "" msgid "Sex Addict" msgstr "" -#: ../../include/profile_selectors.php:80 ../../include/identity.php:390 -#: ../../include/identity.php:391 ../../include/identity.php:398 -#: ../../include/widgets.php:429 ../../mod/connedit.php:573 +#: ../../include/profile_selectors.php:80 ../../include/widgets.php:430 +#: ../../include/identity.php:390 ../../include/identity.php:391 +#: ../../include/identity.php:398 ../../mod/connedit.php:573 #: ../../mod/settings.php:338 ../../mod/settings.php:342 #: ../../mod/settings.php:343 ../../mod/settings.php:346 #: ../../mod/settings.php:357 @@ -2330,7 +2327,7 @@ msgstr "" msgid "Address Book" msgstr "" -#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1484 +#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1486 msgid "Login" msgstr "" @@ -2343,8 +2340,8 @@ msgstr "" msgid "Grid" msgstr "" -#: ../../include/apps.php:134 ../../include/widgets.php:553 -#: ../../include/nav.php:202 ../../mod/admin.php:1058 ../../mod/admin.php:1258 +#: ../../include/apps.php:134 ../../include/widgets.php:554 +#: ../../include/nav.php:202 ../../mod/admin.php:1064 ../../mod/admin.php:1264 msgid "Settings" msgstr "" @@ -2358,7 +2355,7 @@ msgid "Profile" msgstr "" #: ../../include/apps.php:140 ../../include/nav.php:196 -#: ../../mod/events.php:526 +#: ../../mod/events.php:523 msgid "Events" msgstr "" @@ -2383,8 +2380,8 @@ msgstr "" msgid "Chat" msgstr "" -#: ../../include/apps.php:147 ../../include/text.php:859 -#: ../../include/text.php:871 ../../include/nav.php:159 +#: ../../include/apps.php:147 ../../include/text.php:866 +#: ../../include/text.php:878 ../../include/nav.php:159 #: ../../mod/search.php:40 msgid "Search" msgstr "" @@ -2435,10 +2432,23 @@ msgstr "" msgid "Purchase" msgstr "" -#: ../../include/api.php:1300 +#: ../../include/api.php:1302 msgid "Public Timeline" msgstr "" +#: ../../include/import.php:23 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." +msgstr "" + +#: ../../include/import.php:70 +msgid "Channel clone failed. Import failed." +msgstr "" + +#: ../../include/import.php:80 ../../mod/import.php:139 +msgid "Cloned channel not found. Import failed." +msgstr "" + #: ../../include/enotify.php:96 #, php-format msgid "%s <!item_type!>" @@ -2468,152 +2478,152 @@ msgstr "" msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: ../../include/enotify.php:158 +#: ../../include/enotify.php:160 #, php-format msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" msgstr "" -#: ../../include/enotify.php:166 +#: ../../include/enotify.php:168 #, php-format msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "" -#: ../../include/enotify.php:175 +#: ../../include/enotify.php:177 #, php-format msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" msgstr "" -#: ../../include/enotify.php:186 +#: ../../include/enotify.php:188 #, php-format msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../include/enotify.php:187 +#: ../../include/enotify.php:189 #, php-format msgid "%1$s, %2$s commented on an item/conversation you have been following." msgstr "" -#: ../../include/enotify.php:190 ../../include/enotify.php:205 -#: ../../include/enotify.php:231 ../../include/enotify.php:249 -#: ../../include/enotify.php:263 +#: ../../include/enotify.php:192 ../../include/enotify.php:207 +#: ../../include/enotify.php:233 ../../include/enotify.php:251 +#: ../../include/enotify.php:265 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: ../../include/enotify.php:196 +#: ../../include/enotify.php:198 #, php-format msgid "[Hubzilla:Notify] %s posted to your profile wall" msgstr "" -#: ../../include/enotify.php:198 +#: ../../include/enotify.php:200 #, php-format msgid "%1$s, %2$s posted to your profile wall at %3$s" msgstr "" -#: ../../include/enotify.php:200 +#: ../../include/enotify.php:202 #, php-format msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" msgstr "" -#: ../../include/enotify.php:224 +#: ../../include/enotify.php:226 #, php-format msgid "[Hubzilla:Notify] %s tagged you" msgstr "" -#: ../../include/enotify.php:225 +#: ../../include/enotify.php:227 #, php-format msgid "%1$s, %2$s tagged you at %3$s" msgstr "" -#: ../../include/enotify.php:226 +#: ../../include/enotify.php:228 #, php-format msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." msgstr "" -#: ../../include/enotify.php:238 +#: ../../include/enotify.php:240 #, php-format msgid "[Hubzilla:Notify] %1$s poked you" msgstr "" -#: ../../include/enotify.php:239 +#: ../../include/enotify.php:241 #, php-format msgid "%1$s, %2$s poked you at %3$s" msgstr "" -#: ../../include/enotify.php:240 +#: ../../include/enotify.php:242 #, php-format msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." msgstr "" -#: ../../include/enotify.php:256 +#: ../../include/enotify.php:258 #, php-format msgid "[Hubzilla:Notify] %s tagged your post" msgstr "" -#: ../../include/enotify.php:257 +#: ../../include/enotify.php:259 #, php-format msgid "%1$s, %2$s tagged your post at %3$s" msgstr "" -#: ../../include/enotify.php:258 +#: ../../include/enotify.php:260 #, php-format msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" msgstr "" -#: ../../include/enotify.php:270 +#: ../../include/enotify.php:272 msgid "[Hubzilla:Notify] Introduction received" msgstr "" -#: ../../include/enotify.php:271 +#: ../../include/enotify.php:273 #, php-format msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" msgstr "" -#: ../../include/enotify.php:272 +#: ../../include/enotify.php:274 #, php-format msgid "" "%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." msgstr "" -#: ../../include/enotify.php:276 ../../include/enotify.php:295 +#: ../../include/enotify.php:278 ../../include/enotify.php:297 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: ../../include/enotify.php:278 +#: ../../include/enotify.php:280 #, php-format msgid "Please visit %s to approve or reject the connection request." msgstr "" -#: ../../include/enotify.php:285 +#: ../../include/enotify.php:287 msgid "[Hubzilla:Notify] Friend suggestion received" msgstr "" -#: ../../include/enotify.php:286 +#: ../../include/enotify.php:288 #, php-format msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" msgstr "" -#: ../../include/enotify.php:287 +#: ../../include/enotify.php:289 #, php-format msgid "" "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s." msgstr "" -#: ../../include/enotify.php:293 +#: ../../include/enotify.php:295 msgid "Name:" msgstr "" -#: ../../include/enotify.php:294 +#: ../../include/enotify.php:296 msgid "Photo:" msgstr "" -#: ../../include/enotify.php:297 +#: ../../include/enotify.php:299 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../include/enotify.php:511 +#: ../../include/enotify.php:514 msgid "[Hubzilla:Notify]" msgstr "" @@ -2669,7 +2679,7 @@ msgstr "" msgid "I like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:317 +#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:326 msgid "like" msgstr "" @@ -2677,7 +2687,7 @@ msgstr "" msgid "I don't like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:318 +#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:327 msgid "dislike" msgstr "" @@ -2768,12 +2778,12 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2264 +#: ../../include/zot.php:2265 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/zot.php:3591 +#: ../../include/zot.php:3592 msgid "invalid target signature" msgstr "" @@ -2969,7 +2979,7 @@ msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: ../../include/contact_widgets.php:19 ../../mod/admin.php:438 +#: ../../include/contact_widgets.php:19 ../../mod/admin.php:439 msgid "Advanced" msgstr "" @@ -3012,12 +3022,12 @@ msgid "Advanced example: name=fred and country=iceland" msgstr "" #: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:98 -#: ../../include/widgets.php:306 +#: ../../include/widgets.php:307 msgid "Everything" msgstr "" -#: ../../include/contact_widgets.php:95 ../../include/taxonomy.php:271 -#: ../../include/widgets.php:35 +#: ../../include/contact_widgets.php:95 ../../include/widgets.php:36 +#: ../../include/taxonomy.php:280 msgid "Categories" msgstr "" @@ -3043,7 +3053,7 @@ msgstr "" msgid "Add new connections to this collection (privacy group)" msgstr "" -#: ../../include/group.php:251 ../../mod/admin.php:813 +#: ../../include/group.php:251 ../../mod/admin.php:814 msgid "All Channels" msgstr "" @@ -3067,10 +3077,311 @@ msgstr "" msgid "Channels not in any collection" msgstr "" -#: ../../include/group.php:300 ../../include/widgets.php:274 +#: ../../include/group.php:300 ../../include/widgets.php:275 msgid "add" msgstr "" +#: ../../include/widgets.php:92 ../../include/nav.php:157 +#: ../../mod/apps.php:36 +msgid "Apps" +msgstr "" + +#: ../../include/widgets.php:93 +msgid "System" +msgstr "" + +#: ../../include/widgets.php:96 +msgid "Create Personal App" +msgstr "" + +#: ../../include/widgets.php:97 +msgid "Edit Personal App" +msgstr "" + +#: ../../include/widgets.php:139 ../../mod/suggest.php:54 +msgid "Ignore/Hide" +msgstr "" + +#: ../../include/widgets.php:144 ../../mod/connections.php:125 +msgid "Suggestions" +msgstr "" + +#: ../../include/widgets.php:145 +msgid "See more..." +msgstr "" + +#: ../../include/widgets.php:166 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "" + +#: ../../include/widgets.php:172 +msgid "Add New Connection" +msgstr "" + +#: ../../include/widgets.php:173 +msgid "Enter the channel address" +msgstr "" + +#: ../../include/widgets.php:174 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "" + +#: ../../include/widgets.php:190 +msgid "Notes" +msgstr "" + +#: ../../include/widgets.php:192 ../../include/text.php:867 +#: ../../include/text.php:879 ../../mod/filer.php:49 ../../mod/admin.php:1442 +#: ../../mod/admin.php:1462 ../../mod/rbmark.php:28 ../../mod/rbmark.php:100 +msgid "Save" +msgstr "" + +#: ../../include/widgets.php:266 +msgid "Remove term" +msgstr "" + +#: ../../include/widgets.php:349 +msgid "Archives" +msgstr "" + +#: ../../include/widgets.php:428 ../../mod/connedit.php:571 +msgid "Me" +msgstr "" + +#: ../../include/widgets.php:429 ../../mod/connedit.php:572 +msgid "Family" +msgstr "" + +#: ../../include/widgets.php:431 ../../mod/connedit.php:574 +msgid "Acquaintances" +msgstr "" + +#: ../../include/widgets.php:432 ../../mod/connedit.php:575 +#: ../../mod/connections.php:88 ../../mod/connections.php:103 +msgid "All" +msgstr "" + +#: ../../include/widgets.php:451 +msgid "Refresh" +msgstr "" + +#: ../../include/widgets.php:485 +msgid "Account settings" +msgstr "" + +#: ../../include/widgets.php:491 +msgid "Channel settings" +msgstr "" + +#: ../../include/widgets.php:497 +msgid "Additional features" +msgstr "" + +#: ../../include/widgets.php:503 +msgid "Feature/Addon settings" +msgstr "" + +#: ../../include/widgets.php:509 +msgid "Display settings" +msgstr "" + +#: ../../include/widgets.php:515 +msgid "Connected apps" +msgstr "" + +#: ../../include/widgets.php:521 +msgid "Export channel" +msgstr "" + +#: ../../include/widgets.php:530 ../../mod/connedit.php:683 +msgid "Connection Default Permissions" +msgstr "" + +#: ../../include/widgets.php:538 +msgid "Premium Channel Settings" +msgstr "" + +#: ../../include/widgets.php:568 +msgid "Private Mail Menu" +msgstr "" + +#: ../../include/widgets.php:570 +msgid "Combined View" +msgstr "" + +#: ../../include/widgets.php:575 ../../include/nav.php:191 +msgid "Inbox" +msgstr "" + +#: ../../include/widgets.php:580 ../../include/nav.php:192 +msgid "Outbox" +msgstr "" + +#: ../../include/widgets.php:585 ../../include/nav.php:193 +msgid "New Message" +msgstr "" + +#: ../../include/widgets.php:604 ../../include/widgets.php:616 +msgid "Conversations" +msgstr "" + +#: ../../include/widgets.php:608 +msgid "Received Messages" +msgstr "" + +#: ../../include/widgets.php:612 +msgid "Sent Messages" +msgstr "" + +#: ../../include/widgets.php:626 +msgid "No messages." +msgstr "" + +#: ../../include/widgets.php:644 +msgid "Delete conversation" +msgstr "" + +#: ../../include/widgets.php:670 +msgid "Events Menu" +msgstr "" + +#: ../../include/widgets.php:671 +msgid "Day View" +msgstr "" + +#: ../../include/widgets.php:672 +msgid "Week View" +msgstr "" + +#: ../../include/widgets.php:673 +msgid "Month View" +msgstr "" + +#: ../../include/widgets.php:674 ../../mod/events.php:527 +msgid "Export" +msgstr "" + +#: ../../include/widgets.php:675 ../../mod/events.php:530 +msgid "Import" +msgstr "" + +#: ../../include/widgets.php:749 +msgid "Chat Rooms" +msgstr "" + +#: ../../include/widgets.php:769 +msgid "Bookmarked Chatrooms" +msgstr "" + +#: ../../include/widgets.php:789 +msgid "Suggested Chatrooms" +msgstr "" + +#: ../../include/widgets.php:916 ../../include/widgets.php:974 +msgid "photo/image" +msgstr "" + +#: ../../include/widgets.php:1069 ../../include/widgets.php:1071 +msgid "Rate Me" +msgstr "" + +#: ../../include/widgets.php:1075 +msgid "View Ratings" +msgstr "" + +#: ../../include/widgets.php:1086 +msgid "Public Hubs" +msgstr "" + +#: ../../include/widgets.php:1134 +msgid "Forums" +msgstr "" + +#: ../../include/widgets.php:1161 +msgid "Tasks" +msgstr "" + +#: ../../include/widgets.php:1170 +msgid "Documentation" +msgstr "" + +#: ../../include/widgets.php:1172 +msgid "Project/Site Information" +msgstr "" + +#: ../../include/widgets.php:1173 +msgid "For Members" +msgstr "" + +#: ../../include/widgets.php:1174 +msgid "For Administrators" +msgstr "" + +#: ../../include/widgets.php:1175 +msgid "For Developers" +msgstr "" + +#: ../../include/widgets.php:1200 ../../mod/admin.php:434 +msgid "Site" +msgstr "" + +#: ../../include/widgets.php:1201 +msgid "Accounts" +msgstr "" + +#: ../../include/widgets.php:1202 ../../mod/admin.php:965 +msgid "Channels" +msgstr "" + +#: ../../include/widgets.php:1203 ../../mod/admin.php:1062 +#: ../../mod/admin.php:1102 +msgid "Plugins" +msgstr "" + +#: ../../include/widgets.php:1204 ../../mod/admin.php:1262 +#: ../../mod/admin.php:1296 +msgid "Themes" +msgstr "" + +#: ../../include/widgets.php:1205 +msgid "Inspect queue" +msgstr "" + +#: ../../include/widgets.php:1206 +msgid "Profile Config" +msgstr "" + +#: ../../include/widgets.php:1207 +msgid "DB updates" +msgstr "" + +#: ../../include/widgets.php:1225 ../../include/widgets.php:1231 +#: ../../mod/admin.php:1381 +msgid "Logs" +msgstr "" + +#: ../../include/widgets.php:1229 ../../include/nav.php:210 +msgid "Admin" +msgstr "" + +#: ../../include/widgets.php:1230 +msgid "Plugin Features" +msgstr "" + +#: ../../include/widgets.php:1232 +msgid "User registrations waiting for confirmation" +msgstr "" + +#: ../../include/widgets.php:1311 ../../mod/photos.php:753 +#: ../../mod/photos.php:1286 +msgid "View Photo" +msgstr "" + +#: ../../include/widgets.php:1327 ../../mod/photos.php:782 +msgid "Edit Album" +msgstr "" + #: ../../include/message.php:18 msgid "No recipient provided." msgstr "" @@ -3326,35 +3637,35 @@ msgstr "" msgid "Like this thing" msgstr "" -#: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250 +#: ../../include/taxonomy.php:238 ../../include/taxonomy.php:259 msgid "Tags" msgstr "" -#: ../../include/taxonomy.php:294 +#: ../../include/taxonomy.php:303 msgid "Keywords" msgstr "" -#: ../../include/taxonomy.php:315 +#: ../../include/taxonomy.php:324 msgid "have" msgstr "" -#: ../../include/taxonomy.php:315 +#: ../../include/taxonomy.php:324 msgid "has" msgstr "" -#: ../../include/taxonomy.php:316 +#: ../../include/taxonomy.php:325 msgid "want" msgstr "" -#: ../../include/taxonomy.php:316 +#: ../../include/taxonomy.php:325 msgid "wants" msgstr "" -#: ../../include/taxonomy.php:317 +#: ../../include/taxonomy.php:326 msgid "likes" msgstr "" -#: ../../include/taxonomy.php:318 +#: ../../include/taxonomy.php:327 msgid "dislikes" msgstr "" @@ -3428,283 +3739,6 @@ msgstr "" msgid "$Projectname event notification:" msgstr "" -#: ../../include/widgets.php:91 ../../include/nav.php:157 -#: ../../mod/apps.php:36 -msgid "Apps" -msgstr "" - -#: ../../include/widgets.php:92 -msgid "System" -msgstr "" - -#: ../../include/widgets.php:95 -msgid "Create Personal App" -msgstr "" - -#: ../../include/widgets.php:96 -msgid "Edit Personal App" -msgstr "" - -#: ../../include/widgets.php:138 ../../mod/suggest.php:54 -msgid "Ignore/Hide" -msgstr "" - -#: ../../include/widgets.php:143 ../../mod/connections.php:125 -msgid "Suggestions" -msgstr "" - -#: ../../include/widgets.php:144 -msgid "See more..." -msgstr "" - -#: ../../include/widgets.php:165 -#, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." -msgstr "" - -#: ../../include/widgets.php:171 -msgid "Add New Connection" -msgstr "" - -#: ../../include/widgets.php:172 -msgid "Enter the channel address" -msgstr "" - -#: ../../include/widgets.php:173 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "" - -#: ../../include/widgets.php:189 -msgid "Notes" -msgstr "" - -#: ../../include/widgets.php:191 ../../include/text.php:860 -#: ../../include/text.php:872 ../../mod/filer.php:49 ../../mod/admin.php:1436 -#: ../../mod/admin.php:1456 ../../mod/rbmark.php:28 ../../mod/rbmark.php:100 -msgid "Save" -msgstr "" - -#: ../../include/widgets.php:265 -msgid "Remove term" -msgstr "" - -#: ../../include/widgets.php:348 -msgid "Archives" -msgstr "" - -#: ../../include/widgets.php:427 ../../mod/connedit.php:571 -msgid "Me" -msgstr "" - -#: ../../include/widgets.php:428 ../../mod/connedit.php:572 -msgid "Family" -msgstr "" - -#: ../../include/widgets.php:430 ../../mod/connedit.php:574 -msgid "Acquaintances" -msgstr "" - -#: ../../include/widgets.php:431 ../../mod/connedit.php:575 -#: ../../mod/connections.php:88 ../../mod/connections.php:103 -msgid "All" -msgstr "" - -#: ../../include/widgets.php:450 -msgid "Refresh" -msgstr "" - -#: ../../include/widgets.php:484 -msgid "Account settings" -msgstr "" - -#: ../../include/widgets.php:490 -msgid "Channel settings" -msgstr "" - -#: ../../include/widgets.php:496 -msgid "Additional features" -msgstr "" - -#: ../../include/widgets.php:502 -msgid "Feature/Addon settings" -msgstr "" - -#: ../../include/widgets.php:508 -msgid "Display settings" -msgstr "" - -#: ../../include/widgets.php:514 -msgid "Connected apps" -msgstr "" - -#: ../../include/widgets.php:520 -msgid "Export channel" -msgstr "" - -#: ../../include/widgets.php:529 ../../mod/connedit.php:683 -msgid "Connection Default Permissions" -msgstr "" - -#: ../../include/widgets.php:537 -msgid "Premium Channel Settings" -msgstr "" - -#: ../../include/widgets.php:567 -msgid "Private Mail Menu" -msgstr "" - -#: ../../include/widgets.php:569 -msgid "Combined View" -msgstr "" - -#: ../../include/widgets.php:574 ../../include/nav.php:191 -msgid "Inbox" -msgstr "" - -#: ../../include/widgets.php:579 ../../include/nav.php:192 -msgid "Outbox" -msgstr "" - -#: ../../include/widgets.php:584 ../../include/nav.php:193 -msgid "New Message" -msgstr "" - -#: ../../include/widgets.php:603 ../../include/widgets.php:615 -msgid "Conversations" -msgstr "" - -#: ../../include/widgets.php:607 -msgid "Received Messages" -msgstr "" - -#: ../../include/widgets.php:611 -msgid "Sent Messages" -msgstr "" - -#: ../../include/widgets.php:625 -msgid "No messages." -msgstr "" - -#: ../../include/widgets.php:643 -msgid "Delete conversation" -msgstr "" - -#: ../../include/widgets.php:734 -msgid "Chat Rooms" -msgstr "" - -#: ../../include/widgets.php:754 -msgid "Bookmarked Chatrooms" -msgstr "" - -#: ../../include/widgets.php:774 -msgid "Suggested Chatrooms" -msgstr "" - -#: ../../include/widgets.php:901 ../../include/widgets.php:959 -msgid "photo/image" -msgstr "" - -#: ../../include/widgets.php:1054 ../../include/widgets.php:1056 -msgid "Rate Me" -msgstr "" - -#: ../../include/widgets.php:1060 -msgid "View Ratings" -msgstr "" - -#: ../../include/widgets.php:1071 -msgid "Public Hubs" -msgstr "" - -#: ../../include/widgets.php:1119 -msgid "Forums" -msgstr "" - -#: ../../include/widgets.php:1146 -msgid "Tasks" -msgstr "" - -#: ../../include/widgets.php:1155 -msgid "Documentation" -msgstr "" - -#: ../../include/widgets.php:1157 -msgid "Project/Site Information" -msgstr "" - -#: ../../include/widgets.php:1158 -msgid "For Members" -msgstr "" - -#: ../../include/widgets.php:1159 -msgid "For Administrators" -msgstr "" - -#: ../../include/widgets.php:1160 -msgid "For Developers" -msgstr "" - -#: ../../include/widgets.php:1185 ../../mod/admin.php:433 -msgid "Site" -msgstr "" - -#: ../../include/widgets.php:1186 -msgid "Accounts" -msgstr "" - -#: ../../include/widgets.php:1187 ../../mod/admin.php:964 -msgid "Channels" -msgstr "" - -#: ../../include/widgets.php:1188 ../../mod/admin.php:1056 -#: ../../mod/admin.php:1096 -msgid "Plugins" -msgstr "" - -#: ../../include/widgets.php:1189 ../../mod/admin.php:1256 -#: ../../mod/admin.php:1290 -msgid "Themes" -msgstr "" - -#: ../../include/widgets.php:1190 -msgid "Inspect queue" -msgstr "" - -#: ../../include/widgets.php:1191 -msgid "Profile Config" -msgstr "" - -#: ../../include/widgets.php:1192 -msgid "DB updates" -msgstr "" - -#: ../../include/widgets.php:1210 ../../include/widgets.php:1216 -#: ../../mod/admin.php:1375 -msgid "Logs" -msgstr "" - -#: ../../include/widgets.php:1214 ../../include/nav.php:210 -msgid "Admin" -msgstr "" - -#: ../../include/widgets.php:1215 -msgid "Plugin Features" -msgstr "" - -#: ../../include/widgets.php:1217 -msgid "User registrations waiting for confirmation" -msgstr "" - -#: ../../include/widgets.php:1275 ../../mod/photos.php:753 -#: ../../mod/photos.php:1286 -msgid "View Photo" -msgstr "" - -#: ../../include/widgets.php:1291 ../../mod/photos.php:782 -msgid "Edit Album" -msgstr "" - #: ../../include/text.php:393 msgid "prev" msgstr "" @@ -3729,222 +3763,222 @@ msgstr "" msgid "newer" msgstr "" -#: ../../include/text.php:777 +#: ../../include/text.php:784 msgid "No connections" msgstr "" -#: ../../include/text.php:789 +#: ../../include/text.php:796 #, php-format msgid "%d Connection" msgid_plural "%d Connections" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:802 ../../mod/viewconnections.php:101 +#: ../../include/text.php:809 ../../mod/viewconnections.php:101 msgid "View Connections" msgstr "" -#: ../../include/text.php:946 +#: ../../include/text.php:953 msgid "poke" msgstr "" -#: ../../include/text.php:947 +#: ../../include/text.php:954 msgid "ping" msgstr "" -#: ../../include/text.php:947 +#: ../../include/text.php:954 msgid "pinged" msgstr "" -#: ../../include/text.php:948 +#: ../../include/text.php:955 msgid "prod" msgstr "" -#: ../../include/text.php:948 +#: ../../include/text.php:955 msgid "prodded" msgstr "" -#: ../../include/text.php:949 +#: ../../include/text.php:956 msgid "slap" msgstr "" -#: ../../include/text.php:949 +#: ../../include/text.php:956 msgid "slapped" msgstr "" -#: ../../include/text.php:950 +#: ../../include/text.php:957 msgid "finger" msgstr "" -#: ../../include/text.php:950 +#: ../../include/text.php:957 msgid "fingered" msgstr "" -#: ../../include/text.php:951 +#: ../../include/text.php:958 msgid "rebuff" msgstr "" -#: ../../include/text.php:951 +#: ../../include/text.php:958 msgid "rebuffed" msgstr "" -#: ../../include/text.php:961 +#: ../../include/text.php:968 msgid "happy" msgstr "" -#: ../../include/text.php:962 +#: ../../include/text.php:969 msgid "sad" msgstr "" -#: ../../include/text.php:963 +#: ../../include/text.php:970 msgid "mellow" msgstr "" -#: ../../include/text.php:964 +#: ../../include/text.php:971 msgid "tired" msgstr "" -#: ../../include/text.php:965 +#: ../../include/text.php:972 msgid "perky" msgstr "" -#: ../../include/text.php:966 +#: ../../include/text.php:973 msgid "angry" msgstr "" -#: ../../include/text.php:967 +#: ../../include/text.php:974 msgid "stupified" msgstr "" -#: ../../include/text.php:968 +#: ../../include/text.php:975 msgid "puzzled" msgstr "" -#: ../../include/text.php:969 +#: ../../include/text.php:976 msgid "interested" msgstr "" -#: ../../include/text.php:970 +#: ../../include/text.php:977 msgid "bitter" msgstr "" -#: ../../include/text.php:971 +#: ../../include/text.php:978 msgid "cheerful" msgstr "" -#: ../../include/text.php:972 +#: ../../include/text.php:979 msgid "alive" msgstr "" -#: ../../include/text.php:973 +#: ../../include/text.php:980 msgid "annoyed" msgstr "" -#: ../../include/text.php:974 +#: ../../include/text.php:981 msgid "anxious" msgstr "" -#: ../../include/text.php:975 +#: ../../include/text.php:982 msgid "cranky" msgstr "" -#: ../../include/text.php:976 +#: ../../include/text.php:983 msgid "disturbed" msgstr "" -#: ../../include/text.php:977 +#: ../../include/text.php:984 msgid "frustrated" msgstr "" -#: ../../include/text.php:978 +#: ../../include/text.php:985 msgid "depressed" msgstr "" -#: ../../include/text.php:979 +#: ../../include/text.php:986 msgid "motivated" msgstr "" -#: ../../include/text.php:980 +#: ../../include/text.php:987 msgid "relaxed" msgstr "" -#: ../../include/text.php:981 +#: ../../include/text.php:988 msgid "surprised" msgstr "" -#: ../../include/text.php:1157 +#: ../../include/text.php:1164 msgid "May" msgstr "" -#: ../../include/text.php:1234 ../../include/text.php:1238 +#: ../../include/text.php:1241 ../../include/text.php:1245 msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1240 +#: ../../include/text.php:1247 msgid "unknown" msgstr "" -#: ../../include/text.php:1276 +#: ../../include/text.php:1283 msgid "remove category" msgstr "" -#: ../../include/text.php:1353 +#: ../../include/text.php:1360 msgid "remove from file" msgstr "" -#: ../../include/text.php:1465 ../../include/text.php:1476 +#: ../../include/text.php:1472 ../../include/text.php:1483 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1649 ../../mod/events.php:497 +#: ../../include/text.php:1656 ../../mod/events.php:495 msgid "Link to Source" msgstr "" -#: ../../include/text.php:1670 ../../include/text.php:1742 +#: ../../include/text.php:1677 ../../include/text.php:1749 msgid "default" msgstr "" -#: ../../include/text.php:1678 +#: ../../include/text.php:1685 msgid "Page layout" msgstr "" -#: ../../include/text.php:1678 +#: ../../include/text.php:1685 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:1720 +#: ../../include/text.php:1727 msgid "Page content type" msgstr "" -#: ../../include/text.php:1754 +#: ../../include/text.php:1761 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1886 +#: ../../include/text.php:1893 msgid "activity" msgstr "" -#: ../../include/text.php:2181 +#: ../../include/text.php:2188 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2184 ../../mod/blocks.php:147 +#: ../../include/text.php:2191 ../../mod/blocks.php:147 msgid "Blocks" msgstr "" -#: ../../include/text.php:2185 ../../mod/menu.php:103 +#: ../../include/text.php:2192 ../../mod/menu.php:103 msgid "Menus" msgstr "" -#: ../../include/text.php:2186 ../../mod/layouts.php:174 +#: ../../include/text.php:2193 ../../mod/layouts.php:174 msgid "Layouts" msgstr "" -#: ../../include/text.php:2187 +#: ../../include/text.php:2194 msgid "Pages" msgstr "" -#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1483 +#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1485 msgid "Logout" msgstr "" @@ -4017,7 +4051,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1460 +#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1462 msgid "Register" msgstr "" @@ -4135,10 +4169,10 @@ msgstr "" #: ../../mod/mitem.php:229 ../../mod/connedit.php:635 #: ../../mod/connedit.php:684 ../../mod/filestorage.php:151 #: ../../mod/filestorage.php:159 ../../mod/photos.php:626 -#: ../../mod/admin.php:409 ../../mod/menu.php:96 ../../mod/menu.php:153 +#: ../../mod/admin.php:410 ../../mod/menu.php:96 ../../mod/menu.php:153 #: ../../mod/settings.php:575 ../../mod/api.php:106 #: ../../view/theme/redbasic/php/config.php:104 -#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1488 +#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1490 msgid "No" msgstr "" @@ -4147,10 +4181,10 @@ msgstr "" #: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228 #: ../../mod/mitem.php:229 ../../mod/filestorage.php:151 #: ../../mod/filestorage.php:159 ../../mod/photos.php:626 -#: ../../mod/admin.php:411 ../../mod/menu.php:96 ../../mod/menu.php:153 +#: ../../mod/admin.php:412 ../../mod/menu.php:96 ../../mod/menu.php:153 #: ../../mod/settings.php:575 ../../mod/api.php:105 #: ../../view/theme/redbasic/php/config.php:104 -#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1488 +#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1490 msgid "Yes" msgstr "" @@ -4780,11 +4814,11 @@ msgstr "" msgid "View recent posts and comments" msgstr "" -#: ../../mod/connedit.php:519 ../../mod/admin.php:810 +#: ../../mod/connedit.php:519 ../../mod/admin.php:811 msgid "Unblock" msgstr "" -#: ../../mod/connedit.php:519 ../../mod/admin.php:809 +#: ../../mod/connedit.php:519 ../../mod/admin.php:810 msgid "Block" msgstr "" @@ -4940,7 +4974,7 @@ msgid "" "communication." msgstr "" -#: ../../mod/connedit.php:710 ../../mod/admin.php:806 +#: ../../mod/connedit.php:710 ../../mod/admin.php:807 msgid "Approve" msgstr "" @@ -5175,12 +5209,12 @@ msgstr "" msgid "%1$s's Chatrooms" msgstr "" -#: ../../mod/search.php:211 +#: ../../mod/search.php:212 #, php-format msgid "Items tagged with: %s" msgstr "" -#: ../../mod/search.php:213 +#: ../../mod/search.php:214 #, php-format msgid "Search results for: %s" msgstr "" @@ -5293,7 +5327,7 @@ msgstr "" msgid "Private Photo" msgstr "" -#: ../../mod/photos.php:905 ../../mod/events.php:528 +#: ../../mod/photos.php:905 ../../mod/events.php:525 ../../mod/events.php:532 msgid "Previous" msgstr "" @@ -5301,7 +5335,8 @@ msgstr "" msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:914 ../../mod/events.php:529 ../../mod/setup.php:285 +#: ../../mod/photos.php:914 ../../mod/events.php:526 ../../mod/events.php:533 +#: ../../mod/setup.php:285 msgid "Next" msgstr "" @@ -5398,7 +5433,7 @@ msgstr "" msgid "Item is not editable" msgstr "" -#: ../../mod/editpost.php:55 +#: ../../mod/editpost.php:57 msgid "Delete item?" msgstr "" @@ -5450,10 +5485,10 @@ msgstr "" msgid "Message queues" msgstr "" -#: ../../mod/admin.php:198 ../../mod/admin.php:432 ../../mod/admin.php:531 -#: ../../mod/admin.php:799 ../../mod/admin.php:963 ../../mod/admin.php:1055 -#: ../../mod/admin.php:1095 ../../mod/admin.php:1255 ../../mod/admin.php:1289 -#: ../../mod/admin.php:1374 +#: ../../mod/admin.php:198 ../../mod/admin.php:433 ../../mod/admin.php:532 +#: ../../mod/admin.php:800 ../../mod/admin.php:964 ../../mod/admin.php:1061 +#: ../../mod/admin.php:1101 ../../mod/admin.php:1261 ../../mod/admin.php:1295 +#: ../../mod/admin.php:1380 msgid "Administration" msgstr "" @@ -5465,7 +5500,7 @@ msgstr "" msgid "Registered accounts" msgstr "" -#: ../../mod/admin.php:203 ../../mod/admin.php:535 +#: ../../mod/admin.php:203 ../../mod/admin.php:536 msgid "Pending registrations" msgstr "" @@ -5473,7 +5508,7 @@ msgstr "" msgid "Registered channels" msgstr "" -#: ../../mod/admin.php:205 ../../mod/admin.php:536 +#: ../../mod/admin.php:205 ../../mod/admin.php:537 msgid "Active plugins" msgstr "" @@ -5497,666 +5532,666 @@ msgstr "" msgid "unsupported" msgstr "" -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:411 msgid "Yes - with approval" msgstr "" -#: ../../mod/admin.php:416 +#: ../../mod/admin.php:417 msgid "My site is not a public server" msgstr "" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:418 msgid "My site has paid access only" msgstr "" -#: ../../mod/admin.php:418 +#: ../../mod/admin.php:419 msgid "My site has free access only" msgstr "" -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:420 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../mod/admin.php:435 ../../mod/register.php:207 +#: ../../mod/admin.php:436 ../../mod/register.php:207 msgid "Registration" msgstr "" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:437 msgid "File upload" msgstr "" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:438 msgid "Policies" msgstr "" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:443 msgid "Site name" msgstr "" -#: ../../mod/admin.php:443 +#: ../../mod/admin.php:444 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:445 msgid "Administrator Information" msgstr "" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:445 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../mod/admin.php:445 +#: ../../mod/admin.php:446 msgid "System language" msgstr "" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:447 msgid "System theme" msgstr "" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:447 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "" -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:448 msgid "Mobile system theme" msgstr "" -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:448 msgid "Theme for mobile devices" msgstr "" -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:450 msgid "Allow Feeds as Connections" msgstr "" -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:450 msgid "(Heavy system resource usage)" msgstr "" -#: ../../mod/admin.php:450 +#: ../../mod/admin.php:451 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:450 +#: ../../mod/admin.php:451 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:451 +#: ../../mod/admin.php:452 msgid "Does this site allow new member registration?" msgstr "" -#: ../../mod/admin.php:452 +#: ../../mod/admin.php:453 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:454 msgid "Register text" msgstr "" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:454 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:455 msgid "Site homepage to show visitors (default: login box)" msgstr "" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:455 msgid "" "example: 'public' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." msgstr "" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:456 msgid "Preserve site homepage URL" msgstr "" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:456 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:457 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:457 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:458 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:458 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:458 +#: ../../mod/admin.php:459 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:459 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:459 +#: ../../mod/admin.php:460 msgid "Not allowed email domains" msgstr "" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:460 msgid "" "Comma separated list of domains which are not allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains, unless allowed domains have been defined." msgstr "" -#: ../../mod/admin.php:460 +#: ../../mod/admin.php:461 msgid "Block public" msgstr "" -#: ../../mod/admin.php:460 +#: ../../mod/admin.php:461 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:461 +#: ../../mod/admin.php:462 msgid "Verify Email Addresses" msgstr "" -#: ../../mod/admin.php:461 +#: ../../mod/admin.php:462 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "" -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:463 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:463 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:464 msgid "Disable discovery tab" msgstr "" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:464 msgid "" "Remove the tab in the network view with public content pulled from sources " "chosen for this site." msgstr "" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:465 msgid "login on Homepage" msgstr "" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:465 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:467 msgid "Directory Server URL" msgstr "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:467 msgid "Default directory server" msgstr "" -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:469 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:470 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:471 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:471 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:471 +#: ../../mod/admin.php:472 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:471 +#: ../../mod/admin.php:472 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:472 +#: ../../mod/admin.php:473 msgid "Deliveries per process" msgstr "" -#: ../../mod/admin.php:472 +#: ../../mod/admin.php:473 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust " "if necessary to tune system performance. Recommend: 1-5." msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:474 msgid "Poll interval" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:474 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../mod/admin.php:474 +#: ../../mod/admin.php:475 msgid "Maximum Load Average" msgstr "" -#: ../../mod/admin.php:474 +#: ../../mod/admin.php:475 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../mod/admin.php:475 +#: ../../mod/admin.php:476 msgid "Expiration period in days for imported (matrix/network) content" msgstr "" -#: ../../mod/admin.php:475 +#: ../../mod/admin.php:476 msgid "0 for no expiration of imported content" msgstr "" -#: ../../mod/admin.php:523 +#: ../../mod/admin.php:524 msgid "No server found" msgstr "" -#: ../../mod/admin.php:530 ../../mod/admin.php:813 +#: ../../mod/admin.php:531 ../../mod/admin.php:814 msgid "ID" msgstr "" -#: ../../mod/admin.php:530 +#: ../../mod/admin.php:531 msgid "for channel" msgstr "" -#: ../../mod/admin.php:530 +#: ../../mod/admin.php:531 msgid "on server" msgstr "" -#: ../../mod/admin.php:530 +#: ../../mod/admin.php:531 msgid "Status" msgstr "" -#: ../../mod/admin.php:532 +#: ../../mod/admin.php:533 msgid "Server" msgstr "" -#: ../../mod/admin.php:549 +#: ../../mod/admin.php:550 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:559 +#: ../../mod/admin.php:560 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:562 +#: ../../mod/admin.php:563 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../mod/admin.php:566 +#: ../../mod/admin.php:567 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../mod/admin.php:569 +#: ../../mod/admin.php:570 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:585 +#: ../../mod/admin.php:586 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:589 +#: ../../mod/admin.php:590 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:591 +#: ../../mod/admin.php:592 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:592 +#: ../../mod/admin.php:593 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:624 +#: ../../mod/admin.php:625 msgid "Queue Statistics" msgstr "" -#: ../../mod/admin.php:625 +#: ../../mod/admin.php:626 msgid "Total Entries" msgstr "" -#: ../../mod/admin.php:626 +#: ../../mod/admin.php:627 msgid "Priority" msgstr "" -#: ../../mod/admin.php:627 +#: ../../mod/admin.php:628 msgid "Destination URL" msgstr "" -#: ../../mod/admin.php:628 +#: ../../mod/admin.php:629 msgid "Mark hub permanently offline" msgstr "" -#: ../../mod/admin.php:629 +#: ../../mod/admin.php:630 msgid "Empty queue for this hub" msgstr "" -#: ../../mod/admin.php:630 +#: ../../mod/admin.php:631 msgid "Last known contact" msgstr "" -#: ../../mod/admin.php:666 +#: ../../mod/admin.php:667 #, php-format msgid "%s account blocked/unblocked" msgid_plural "%s account blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:674 +#: ../../mod/admin.php:675 #, php-format msgid "%s account deleted" msgid_plural "%s accounts deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:710 +#: ../../mod/admin.php:711 msgid "Account not found" msgstr "" -#: ../../mod/admin.php:722 +#: ../../mod/admin.php:723 #, php-format msgid "Account '%s' deleted" msgstr "" -#: ../../mod/admin.php:730 +#: ../../mod/admin.php:731 #, php-format msgid "Account '%s' blocked" msgstr "" -#: ../../mod/admin.php:738 +#: ../../mod/admin.php:739 #, php-format msgid "Account '%s' unblocked" msgstr "" -#: ../../mod/admin.php:800 ../../mod/admin.php:812 +#: ../../mod/admin.php:801 ../../mod/admin.php:813 msgid "Users" msgstr "" -#: ../../mod/admin.php:802 ../../mod/admin.php:966 +#: ../../mod/admin.php:803 ../../mod/admin.php:967 msgid "select all" msgstr "" -#: ../../mod/admin.php:803 +#: ../../mod/admin.php:804 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:804 +#: ../../mod/admin.php:805 msgid "Request date" msgstr "" -#: ../../mod/admin.php:805 +#: ../../mod/admin.php:806 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:807 +#: ../../mod/admin.php:808 msgid "Deny" msgstr "" -#: ../../mod/admin.php:813 +#: ../../mod/admin.php:814 msgid "Register date" msgstr "" -#: ../../mod/admin.php:813 +#: ../../mod/admin.php:814 msgid "Last login" msgstr "" -#: ../../mod/admin.php:813 +#: ../../mod/admin.php:814 msgid "Expires" msgstr "" -#: ../../mod/admin.php:813 +#: ../../mod/admin.php:814 msgid "Service Class" msgstr "" -#: ../../mod/admin.php:815 +#: ../../mod/admin.php:816 msgid "" "Selected accounts will be deleted!\\n\\nEverything these accounts had posted " "on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:816 +#: ../../mod/admin.php:817 msgid "" "The account {0} will be deleted!\\n\\nEverything this account has posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:852 +#: ../../mod/admin.php:853 #, php-format msgid "%s channel censored/uncensored" msgid_plural "%s channels censored/uncensored" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:861 +#: ../../mod/admin.php:862 #, php-format msgid "%s channel code allowed/disallowed" msgid_plural "%s channels code allowed/disallowed" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:868 +#: ../../mod/admin.php:869 #, php-format msgid "%s channel deleted" msgid_plural "%s channels deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:888 +#: ../../mod/admin.php:889 msgid "Channel not found" msgstr "" -#: ../../mod/admin.php:899 +#: ../../mod/admin.php:900 #, php-format msgid "Channel '%s' deleted" msgstr "" -#: ../../mod/admin.php:911 +#: ../../mod/admin.php:912 #, php-format msgid "Channel '%s' censored" msgstr "" -#: ../../mod/admin.php:911 +#: ../../mod/admin.php:912 #, php-format msgid "Channel '%s' uncensored" msgstr "" -#: ../../mod/admin.php:922 +#: ../../mod/admin.php:923 #, php-format msgid "Channel '%s' code allowed" msgstr "" -#: ../../mod/admin.php:922 +#: ../../mod/admin.php:923 #, php-format msgid "Channel '%s' code disallowed" msgstr "" -#: ../../mod/admin.php:968 +#: ../../mod/admin.php:969 msgid "Censor" msgstr "" -#: ../../mod/admin.php:969 +#: ../../mod/admin.php:970 msgid "Uncensor" msgstr "" -#: ../../mod/admin.php:970 +#: ../../mod/admin.php:971 msgid "Allow Code" msgstr "" -#: ../../mod/admin.php:971 +#: ../../mod/admin.php:972 msgid "Disallow Code" msgstr "" -#: ../../mod/admin.php:973 +#: ../../mod/admin.php:974 msgid "UID" msgstr "" -#: ../../mod/admin.php:973 ../../mod/profiles.php:447 +#: ../../mod/admin.php:974 ../../mod/profiles.php:447 msgid "Address" msgstr "" -#: ../../mod/admin.php:975 +#: ../../mod/admin.php:976 msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " "channels on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:976 +#: ../../mod/admin.php:977 msgid "" "The channel {0} will be deleted!\\n\\nEverything that was posted in this " "channel on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:1016 +#: ../../mod/admin.php:1017 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:1020 +#: ../../mod/admin.php:1021 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:1030 ../../mod/admin.php:1228 +#: ../../mod/admin.php:1031 ../../mod/admin.php:1234 msgid "Disable" msgstr "" -#: ../../mod/admin.php:1033 ../../mod/admin.php:1230 +#: ../../mod/admin.php:1034 ../../mod/admin.php:1236 msgid "Enable" msgstr "" -#: ../../mod/admin.php:1057 ../../mod/admin.php:1257 +#: ../../mod/admin.php:1063 ../../mod/admin.php:1263 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:1065 ../../mod/admin.php:1267 +#: ../../mod/admin.php:1071 ../../mod/admin.php:1273 msgid "Author: " msgstr "" -#: ../../mod/admin.php:1066 ../../mod/admin.php:1268 +#: ../../mod/admin.php:1072 ../../mod/admin.php:1274 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:1193 +#: ../../mod/admin.php:1199 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:1249 +#: ../../mod/admin.php:1255 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1295 +#: ../../mod/admin.php:1301 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1296 +#: ../../mod/admin.php:1302 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1320 +#: ../../mod/admin.php:1326 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1377 +#: ../../mod/admin.php:1383 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1383 +#: ../../mod/admin.php:1389 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1384 +#: ../../mod/admin.php:1390 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1384 +#: ../../mod/admin.php:1390 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "" -#: ../../mod/admin.php:1385 +#: ../../mod/admin.php:1391 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1431 +#: ../../mod/admin.php:1437 msgid "New Profile Field" msgstr "" -#: ../../mod/admin.php:1432 ../../mod/admin.php:1452 +#: ../../mod/admin.php:1438 ../../mod/admin.php:1458 msgid "Field nickname" msgstr "" -#: ../../mod/admin.php:1432 ../../mod/admin.php:1452 +#: ../../mod/admin.php:1438 ../../mod/admin.php:1458 msgid "System name of field" msgstr "" -#: ../../mod/admin.php:1433 ../../mod/admin.php:1453 +#: ../../mod/admin.php:1439 ../../mod/admin.php:1459 msgid "Input type" msgstr "" -#: ../../mod/admin.php:1434 ../../mod/admin.php:1454 +#: ../../mod/admin.php:1440 ../../mod/admin.php:1460 msgid "Field Name" msgstr "" -#: ../../mod/admin.php:1434 ../../mod/admin.php:1454 +#: ../../mod/admin.php:1440 ../../mod/admin.php:1460 msgid "Label on profile pages" msgstr "" -#: ../../mod/admin.php:1435 ../../mod/admin.php:1455 +#: ../../mod/admin.php:1441 ../../mod/admin.php:1461 msgid "Help text" msgstr "" -#: ../../mod/admin.php:1435 ../../mod/admin.php:1455 +#: ../../mod/admin.php:1441 ../../mod/admin.php:1461 msgid "Additional info (optional)" msgstr "" -#: ../../mod/admin.php:1445 +#: ../../mod/admin.php:1451 msgid "Field definition not found" msgstr "" -#: ../../mod/admin.php:1451 +#: ../../mod/admin.php:1457 msgid "Edit Profile Field" msgstr "" @@ -6398,12 +6433,12 @@ msgstr "" msgid "Layout Help" msgstr "" -#: ../../mod/subthread.php:108 +#: ../../mod/subthread.php:114 #, php-format msgid "%1$s is following %2$s's %3$s" msgstr "" -#: ../../mod/subthread.php:110 +#: ../../mod/subthread.php:116 #, php-format msgid "%1$s stopped following %2$s's %3$s" msgstr "" @@ -6432,7 +6467,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:86 ../../boot.php:1492 +#: ../../mod/lostpass.php:86 ../../boot.php:1494 msgid "Password Reset" msgstr "" @@ -6518,32 +6553,28 @@ msgstr "" msgid "Event not found." msgstr "" -#: ../../mod/events.php:448 +#: ../../mod/events.php:446 msgid "l, F j" msgstr "" -#: ../../mod/events.php:470 +#: ../../mod/events.php:468 msgid "Edit event" msgstr "" -#: ../../mod/events.php:472 +#: ../../mod/events.php:470 msgid "Delete event" msgstr "" -#: ../../mod/events.php:506 +#: ../../mod/events.php:504 msgid "calendar" msgstr "" -#: ../../mod/events.php:527 -msgid "Create New Event" +#: ../../mod/events.php:524 +msgid "New Event" msgstr "" -#: ../../mod/events.php:530 -msgid "Export" -msgstr "" - -#: ../../mod/events.php:533 -msgid "Import" +#: ../../mod/events.php:534 +msgid "Today" msgstr "" #: ../../mod/events.php:564 @@ -6764,20 +6795,24 @@ msgstr "" msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/item.php:910 +#: ../../mod/item.php:822 +msgid "Duplicate post suppressed." +msgstr "" + +#: ../../mod/item.php:953 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:1177 +#: ../../mod/item.php:1220 msgid "Unable to obtain post information from database." msgstr "" -#: ../../mod/item.php:1184 +#: ../../mod/item.php:1227 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/item.php:1191 +#: ../../mod/item.php:1234 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -9241,51 +9276,51 @@ msgstr "" msgid "Set size of followup author photos" msgstr "" -#: ../../boot.php:1289 +#: ../../boot.php:1291 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1292 +#: ../../boot.php:1294 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1459 +#: ../../boot.php:1461 msgid "" "Create an account to access services and applications within the Hubzilla" msgstr "" -#: ../../boot.php:1487 +#: ../../boot.php:1489 msgid "Password" msgstr "" -#: ../../boot.php:1488 +#: ../../boot.php:1490 msgid "Remember me" msgstr "" -#: ../../boot.php:1491 +#: ../../boot.php:1493 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2111 +#: ../../boot.php:2113 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2246 +#: ../../boot.php:2248 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2249 +#: ../../boot.php:2251 #, php-format msgid "[hubzilla] Website SSL error for %s" msgstr "" -#: ../../boot.php:2286 +#: ../../boot.php:2288 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2290 +#: ../../boot.php:2292 #, php-format msgid "[hubzilla] Cron tasks not running on %s" msgstr "" diff --git a/version.inc b/version.inc index d6100d73a..05ca8c657 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-11-19.1221 +2015-11-20.1222 |