'zid' string url - url to accept zid string zid - urlencoded zid string result - the return string we calculated, change it if you want to return something else
Those who require this feature will know what to do with it. Those who don't, won't. Eventually this functionality needs to be provided by a module such that permissions can be enforced. At the moment it's more of a proof of concept; but sufficient for our immediate needs.
Authenticated visitor. Unless pre-verified, check that the contact belongs to this $owner_id and load the groups the visitor belongs to. If pre-verified, the caller is expected to have already done this and passed the groups into this function.
Description: Replaces text emoticons with graphical images
: string $s
Returns string
-
It is expected that this function will be called using HTML text. We will escape text between HTML pre and code blocks from being processed.
+
It is expected that this function will be called using HTML text. We will escape text between HTML pre and code blocks, and HTML attributes (such as urls) from being processed.
At a higher level, the bbcode [nosmile] tag can be used to prevent this function from being executed by the prepare_text() routine when preparing bbcode source for HTML display
';
+
+
+ $x = menu_list(local_user(),'',MENU_SYSTEM|MENU_BOOKMARK);
+
+ if($x) {
+ foreach($x as $xx) {
+ $y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash());
+ $o .= menu_render($y);
+ }
+ }
+
+
+
+ return $o;
+
+}
+
diff --git a/mod/chat.php b/mod/chat.php
index 54fa58092..e79973aef 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -91,7 +91,7 @@ function chat_content(&$a) {
}
if((argc() > 3) && intval(argv(2)) && (argv(3) === 'leave')) {
- chatroom_leave($observer,$room_id,$_SERVER['REMOTE_ADDR']);
+ chatroom_leave($observer,argv(2),$_SERVER['REMOTE_ADDR']);
goaway(z_root() . '/channel/' . argv(1));
}
@@ -101,10 +101,23 @@ function chat_content(&$a) {
$x = chatroom_enter($observer,$room_id,'online',$_SERVER['REMOTE_ADDR']);
if(! $x)
return;
+ $x = q("select * from chatroom where cr_id = %d and cr_uid = %d $sql_extra limit 1",
+ intval($room_id),
+ intval($a->profile['profile_uid'])
+ );
+ if($x) {
+ $room_name = $x[0]['cr_name'];
+ }
$o = replace_macros(get_markup_template('chat.tpl'),array(
- '$room_name' => '', // should we get this from the API?
+ '$room_name' => $room_name,
'$room_id' => $room_id,
- '$submit' => t('Submit')
+ '$baseurl' => z_root(),
+ '$nickname' => argv(1),
+ '$submit' => t('Submit'),
+ '$leave' => t('Leave Room'),
+ '$away' => t('I am away right now'),
+ '$online' => t('I am online')
+
));
return $o;
}
diff --git a/mod/chatsvc.php b/mod/chatsvc.php
index f32ea56ce..e6590f57a 100644
--- a/mod/chatsvc.php
+++ b/mod/chatsvc.php
@@ -29,17 +29,6 @@ function chatsvc_post(&$a) {
$room_id = $a->data['chat']['room_id'];
$text = escape_tags($_REQUEST['chat_text']);
- $status = strip_tags($_REQUEST['status']);
-
- if($status && $room_id) {
- $r = q("update chatpresence set cp_status = '%s', cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s' limit 1",
- dbesc($status),
- dbesc(datetime_convert()),
- intval($room_id),
- dbesc(get_observer_hash()),
- dbesc($_SERVER['REMOTE_ADDR'])
- );
- }
if(! $text)
return;
@@ -65,47 +54,81 @@ function chatsvc_post(&$a) {
function chatsvc_content(&$a) {
- $lastseen = intval($_REQUEST['last']);
+ $status = strip_tags($_REQUEST['status']);
+ $room_id = intval($a->data['chat']['room_id']);
+ $stopped = ((x($_REQUEST,'stopped') && intval($_REQUEST['stopped'])) ? true : false);
- $ret = array('success' => false);
+ if($status && $room_id) {
- $sql_extra = permissions_sql($a->data['chat']['uid']);
+ $x = q("select channel_address from channel where channel_id = %d limit 1",
+ intval($a->data['chat']['uid'])
+ );
- $r = q("select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra",
- intval($a->data['chat']['uid']),
- intval($a->data['chat']['room_id'])
- );
- if(! $r)
- json_return_and_die($ret);
+ $r = q("update chatpresence set cp_status = '%s', cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s' limit 1",
+ dbesc($status),
+ dbesc(datetime_convert()),
+ intval($room_id),
+ dbesc(get_observer_hash()),
+ dbesc($_SERVER['REMOTE_ADDR'])
+ );
- $inroom = array();
-
- $r = q("select * from chatpresence left join xchan on xchan_hash = cp_xchan where cp_room = %d order by xchan_name",
- intval($a->data['chat']['room_id'])
- );
- if($r) {
- foreach($r as $rr) {
- $inroom[] = array('img' => zid($rr['xchan_photo_m']), 'img_type' => $rr['xchan_photo_mimetype'],'name' => $rr['xchan_name']);
- }
+ goaway(z_root() . '/chat/' . $x[0]['channel_address'] . '/' . $room_id);
}
- $chats = array();
+ if(! $stopped) {
- $r = q("select * from chat left join xchan on chat_xchan = xchan_hash where chat_room = %d and chat_id > %d",
- intval($a->data['chat']['room_id']),
- intval($lastseen)
- );
- if($r) {
- foreach($r as $rr) {
- $chats[] = array(
- 'id' => $rr['chat_id'],
- 'img' => zid($rr['xchan_photo_m']),
- 'img_type' => $rr['xchan_photo_mimetype'],
- 'name' => $rr['xchan_name'],
- 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'c'),
- 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'r'),
- 'text' => smilies(bbcode($rr['chat_text']))
- );
+ $lastseen = intval($_REQUEST['last']);
+
+ $ret = array('success' => false);
+
+ $sql_extra = permissions_sql($a->data['chat']['uid']);
+
+ $r = q("select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra",
+ intval($a->data['chat']['uid']),
+ intval($a->data['chat']['room_id'])
+ );
+ if(! $r)
+ json_return_and_die($ret);
+
+ $inroom = array();
+
+ $r = q("select * from chatpresence left join xchan on xchan_hash = cp_xchan where cp_room = %d order by xchan_name",
+ intval($a->data['chat']['room_id'])
+ );
+ if($r) {
+ foreach($r as $rr) {
+ switch($rr['cp_status']) {
+ case 'away':
+ $status = t('Away');
+ break;
+ case 'online':
+ default:
+ $status = t('Online');
+ break;
+ }
+
+ $inroom[] = array('img' => zid($rr['xchan_photo_m']), 'img_type' => $rr['xchan_photo_mimetype'],'name' => $rr['xchan_name'], status => $status);
+ }
+ }
+
+ $chats = array();
+
+ $r = q("select * from chat left join xchan on chat_xchan = xchan_hash where chat_room = %d and chat_id > %d",
+ intval($a->data['chat']['room_id']),
+ intval($lastseen)
+ );
+ if($r) {
+ foreach($r as $rr) {
+ $chats[] = array(
+ 'id' => $rr['chat_id'],
+ 'img' => zid($rr['xchan_photo_m']),
+ 'img_type' => $rr['xchan_photo_mimetype'],
+ 'name' => $rr['xchan_name'],
+ 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'c'),
+ 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'r'),
+ 'text' => smilies(bbcode($rr['chat_text']))
+ );
+ }
}
}
@@ -117,9 +140,10 @@ function chatsvc_content(&$a) {
);
$ret['success'] = true;
- $ret['inroom'] = $inroom;
- $ret['chats'] = $chats;
-
+ if(! $stopped) {
+ $ret['inroom'] = $inroom;
+ $ret['chats'] = $chats;
+ }
json_return_and_die($ret);
}
diff --git a/mod/connections.php b/mod/connections.php
index 2119c69c7..3da9cec74 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -74,6 +74,7 @@ function connections_post(&$a) {
$abook_flags = $orig_record[0]['abook_flags'];
$new_friend = false;
+
if(($_REQUEST['pending']) && ($abook_flags & ABOOK_FLAG_PENDING)) {
$abook_flags = ( $abook_flags ^ ABOOK_FLAG_PENDING );
$new_friend = true;
@@ -88,6 +89,7 @@ function connections_post(&$a) {
intval($contact_id),
intval(local_user())
);
+
if($r)
info( t('Connection updated.') . EOL);
else
diff --git a/mod/connedit.php b/mod/connedit.php
index e2d4b861c..3f507cc3b 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -32,7 +32,7 @@ function connedit_init(&$a) {
}
function connedit_post(&$a) {
-
+
if(! local_user())
return;
@@ -86,6 +86,8 @@ function connedit_post(&$a) {
$abook_flags = $orig_record[0]['abook_flags'];
$new_friend = false;
+
+
if(($_REQUEST['pending']) && ($abook_flags & ABOOK_FLAG_PENDING)) {
$abook_flags = ( $abook_flags ^ ABOOK_FLAG_PENDING );
$new_friend = true;
@@ -100,6 +102,7 @@ function connedit_post(&$a) {
intval($contact_id),
intval(local_user())
);
+
if($r)
info( t('Connection updated.') . EOL);
else
@@ -442,13 +445,13 @@ function connedit_content(&$a) {
'$perms' => $perms,
'$forum' => t('Forum Members'),
'$soapbox' => t('Soapbox'),
- '$full' => t('Full Sharing'),
- '$cautious' => t('Cautious Sharing'),
+ '$full' => t('Full Sharing (typical social network permissions)'),
+ '$cautious' => t('Cautious Sharing '),
'$follow' => t('Follow Only'),
'$permlbl' => t('Individual Permissions'),
- '$permnote' => t('Some permissions may be inherited from your channel privacy settings, which have higher priority. Changing those inherited settings on this page will have no effect.'),
+ '$permnote' => t('Some permissions may be inherited from your channel privacy settings, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect.'),
'$advanced' => t('Advanced Permissions'),
- '$quick' => t('Quick Links'),
+ '$quick' => t('Simple Permissions (select one and submit)'),
'$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'],
'$all_friends' => $all_friends,
'$relation_text' => $relation_text,
diff --git a/mod/item.php b/mod/item.php
index 6d421009b..c8c0e3762 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -887,13 +887,24 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
$replaced = false;
$r = null;
- $termtype = ((strpos($tag,'#') === 0) ? TERM_HASHTAG : TERM_UNKNOWN);
- $termtype = ((strpos($tag,'@') === 0) ? TERM_MENTION : $termtype);
+
+ $termtype = ((strpos($tag,'#') === 0) ? TERM_HASHTAG : TERM_UNKNOWN);
+ $termtype = ((strpos($tag,'@') === 0) ? TERM_MENTION : $termtype);
+ $termtype = ((strpos($tag,'#^[') === 0) ? TERM_BOOKMARK : $termtype);
+
//is it a hash tag?
if(strpos($tag,'#') === 0) {
- // if the tag is replaced...
- if(strpos($tag,'[zrl=')) {
+ if(strpos($tag,'#^[') === 0) {
+ if(preg_match('/#\^\[(url|zrl)(.*?)\](.*?)\[\/(url|zrl)\]/',$tag,$match)) {
+ $basetag = $match[3];
+ $url = ((substr($match[2],0,1) === '=') ? substr($match[2],1) : $match[3]);
+ $replaced = true;
+
+ }
+ }
+ // if the tag is already replaced...
+ elseif(strpos($tag,'[zrl=')) {
//...do nothing
return $replaced;
}
@@ -904,7 +915,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
$body = str_replace($tag,$newtag,$body);
$replaced = true;
}
- else {
+ if(! $replaced) {
//base tag has the tags name only
$basetag = str_replace('_',' ',substr($tag,1));
//create text for link
@@ -961,7 +972,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
$newname = str_replace('_',' ',$name);
//select someone from this user's contacts by name
- $r = q("SELECT * FROM abook left join xchan on abook_xchan - xchan_hash
+ $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash
WHERE xchan_name = '%s' AND abook_channel = %d LIMIT 1",
dbesc($newname),
intval($profile_uid)
@@ -969,7 +980,7 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) {
if(! $r) {
//select someone by attag or nick and the name passed in
- $r = q("SELECT * FROM abook left join xchan on abook_xchan - xchan_hash
+ $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash
WHERE xchan_addr like ('%s') AND abook_channel = %d LIMIT 1",
dbesc($newname . '@%'),
intval($profile_uid)
diff --git a/mod/menu.php b/mod/menu.php
index 47eed6484..a2d0c2385 100644
--- a/mod/menu.php
+++ b/mod/menu.php
@@ -8,6 +8,10 @@ function menu_post(&$a) {
return;
$_REQUEST['menu_channel_id'] = local_user();
+ if($_REQUEST['menu_bookmark'])
+ $_REQUEST['menu_flags'] |= MENU_BOOKMARK;
+ if($_REQUEST['menu_system'])
+ $_REQUEST['menu_flags'] |= MENU_SYSTEM;
$menu_id = ((argc() > 1) ? intval(argv(1)) : 0);
if($menu_id) {
@@ -76,6 +80,7 @@ function menu_content(&$a) {
'$header' => t('New Menu'),
'$menu_name' => array('menu_name', t('Menu name'), '', t('Must be unique, only seen by you'), '*'),
'$menu_desc' => array('menu_desc', t('Menu title'), '', t('Menu title as seen by others'), ''),
+ '$menu_bookmark' => array('menu_bookmark', t('Allow bookmarks'), 0 , t('Menu may be used to store saved bookmarks'), ''),
'$submit' => t('Create')
));
return $o;
@@ -104,6 +109,8 @@ function menu_content(&$a) {
'$editcontents' => t('Edit menu contents'),
'$menu_name' => array('menu_name', t('Menu name'), $m['menu_name'], t('Must be unique, only seen by you'), '*'),
'$menu_desc' => array('menu_desc', t('Menu title'), $m['menu_desc'], t('Menu title as seen by others'), ''),
+ '$menu_bookmark' => array('menu_bookmark', t('Allow bookmarks'), (($m['menu_flags'] & MENU_BOOKMARK) ? 1 : 0), t('Menu may be used to store saved bookmarks'), ''),
+ '$menu_system' => (($m['menu_flags'] & MENU_SYSTEM) ? 1 : 0),
'$submit' => t('Modify')
));
return $o;
diff --git a/mod/page.php b/mod/page.php
index 56592116f..df17dbf52 100644
--- a/mod/page.php
+++ b/mod/page.php
@@ -38,7 +38,7 @@ function page_content(&$a) {
$channel_address = argv(1);
$page_id = argv(2);
-dbg(1);
+
$u = q("select channel_id from channel where channel_address = '%s' limit 1",
dbesc($channel_address)
);
@@ -63,7 +63,7 @@ dbg(1);
dbesc($page_id),
intval(ITEM_WEBPAGE)
);
-dbg(0);
+
if(! $r) {
// Check again with no permissions clause to see if it is a permissions issue
diff --git a/mod/parse_url.php b/mod/parse_url.php
index c206c24ec..340e1a67e 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -252,7 +252,7 @@ function parse_url_content(&$a) {
logger('parse_url: ' . $url);
- $template = $br . '[url=%s]%s[/url]%s' . $br;
+ $template = $br . '#^[url=%s]%s[/url]%s' . $br;
$arr = array('url' => $url, 'text' => '');
diff --git a/mod/photos.php b/mod/photos.php
index c299fe778..6798cb002 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -763,7 +763,7 @@ function photos_content(&$a) {
/* Check again - this time without specifying permissions */
- $ph = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s'
+ $ph = q("SELECT id FROM photo WHERE uid = %d AND resource_id = '%s'
and ( photo_flags = %d or photo_flags = %d )
LIMIT 1",
intval($owner_uid),
@@ -875,6 +875,9 @@ function photos_content(&$a) {
if($linked_items) {
+ xchan_query($linked_items);
+ $linked_items = fetch_post_tags($linked_items,true);
+
$link_item = $linked_items[0];
$r = q("select * from item where parent_mid = '%s'
@@ -890,6 +893,21 @@ function photos_content(&$a) {
$r = conv_sort($r,'commented');
}
+
+
+ $tags = array();
+ if($link_item['term']) {
+ $cnt = 0;
+ foreach($link_item['term'] as $t)
+ $tags[$cnt] = array(0 => format_term_for_display($t));
+ if($can_post && ($ph[0]['uid'] == $owner_uid)) {
+ $tags[$cnt][1] = 'tagrm?f=&item=' . $link_item['id'];
+ $tags[$cnt][2] = t('Remove');
+ }
+ $cnt ++;
+ }
+
+
if((local_user()) && (local_user() == $link_item['uid'])) {
q("UPDATE `item` SET item_flags = (item_flags ^ %d) WHERE parent = %d and uid = %d and (item_flags & %d)",
intval(ITEM_UNSEEN),
@@ -925,7 +943,6 @@ function photos_content(&$a) {
'capt_label' => t('Caption'),
'caption' => $caption_e,
'tag_label' => t('Add a Tag'),
- 'tags' => $link_item['tag'],
'permissions' => t('Permissions'),
'aclselect' => $aclselect_e,
'help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'),
@@ -1067,10 +1084,10 @@ function photos_content(&$a) {
}
$album_e = array($album_link,$ph[0]['album']);
- $tags_e = $tags;
$like_e = $like;
$dislike_e = $dislike;
+
$photo_tpl = get_markup_template('photo_view.tpl');
$o .= replace_macros($photo_tpl, array(
'$id' => $ph[0]['id'],
@@ -1081,7 +1098,8 @@ function photos_content(&$a) {
'$prevlink' => $prevlink,
'$nextlink' => $nextlink,
'$desc' => $ph[0]['description'],
- '$tags' => $tags_e,
+ '$tag_hdr' => t('In This Photo:'),
+ '$tags' => $tags,
'$edit' => $edit,
'$likebuttons' => $likebuttons,
'$like' => $like_e,
diff --git a/mod/settings.php b/mod/settings.php
index 7ff76cd3e..7889538f3 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -306,6 +306,7 @@ function settings_post(&$a) {
$arr['channel_r_pages'] = (($_POST['view_pages']) ? $_POST['view_pages'] : 0);
$arr['channel_w_pages'] = (($_POST['write_pages']) ? $_POST['write_pages'] : 0);
$arr['channel_a_republish'] = (($_POST['republish']) ? $_POST['republish'] : 0);
+ $arr['channel_a_bookmark'] = (($_POST['bookmark']) ? $_POST['bookmark'] : 0);
$defperms = 0;
if(x($_POST['def_view_stream']))
@@ -342,6 +343,8 @@ function settings_post(&$a) {
$defperms += $_POST['def_write_pages'];
if(x($_POST['def_republish']))
$defperms += $_POST['def_republish'];
+ if(x($_POST['def_bookmark']))
+ $defperms += $_POST['def_bookmark'];
$notify = 0;
@@ -399,7 +402,7 @@ function settings_post(&$a) {
set_pconfig(local_user(),'system','hide_online_status',$hide_presence);
- $r = q("update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d, channel_default_group = '%s', channel_r_stream = %d, channel_r_profile = %d, channel_r_photos = %d, channel_r_abook = %d, channel_w_stream = %d, channel_w_wall = %d, channel_w_tagwall = %d, channel_w_comment = %d, channel_w_mail = %d, channel_w_photos = %d, channel_w_chat = %d, channel_a_delegate = %d, channel_r_storage = %d, channel_w_storage = %d, channel_r_pages = %d, channel_w_pages = %d, channel_a_republish = %d, channel_allow_cid = '%s', channel_allow_gid = '%s', channel_deny_cid = '%s', channel_deny_gid = '%s' where channel_id = %d limit 1",
+ $r = q("update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d, channel_default_group = '%s', channel_r_stream = %d, channel_r_profile = %d, channel_r_photos = %d, channel_r_abook = %d, channel_w_stream = %d, channel_w_wall = %d, channel_w_tagwall = %d, channel_w_comment = %d, channel_w_mail = %d, channel_w_photos = %d, channel_w_chat = %d, channel_a_delegate = %d, channel_r_storage = %d, channel_w_storage = %d, channel_r_pages = %d, channel_w_pages = %d, channel_a_republish = %d, channel_a_bookmark = %d, channel_allow_cid = '%s', channel_allow_gid = '%s', channel_deny_cid = '%s', channel_deny_gid = '%s' where channel_id = %d limit 1",
dbesc($username),
intval($pageflags),
dbesc($timezone),
@@ -426,6 +429,7 @@ function settings_post(&$a) {
intval($arr['channel_r_pages']),
intval($arr['channel_w_pages']),
intval($arr['channel_a_republish']),
+ intval($arr['channel_a_bookmark']),
dbesc($str_contact_allow),
dbesc($str_group_allow),
dbesc($str_contact_deny),
@@ -919,19 +923,21 @@ function settings_content(&$a) {
'$defloc' => array('defloc', t('Default Post Location:'), $defloc, ''),
'$allowloc' => array('allow_location', t('Use Browser Location:'), ((get_pconfig(local_user(),'system','use_browser_location')) ? 1 : ''), ''),
- '$adult' => array('adult', t('Adult Content'), $adult_flag, t('This channel publishes adult content.')),
+ '$adult' => array('adult', t('Adult Content'), $adult_flag, t('This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)')),
'$h_prv' => t('Security and Privacy Settings'),
- '$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents showing if you are available for chat')),
+ '$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online')),
- '$lbl_pmacro' => t('Quick Privacy Settings:'),
- '$pmacro3' => t('Very Public - extremely permissive'),
- '$pmacro2' => t('Typical - default public, privacy when desired'),
- '$pmacro1' => t('Private - default private, rarely open or public'),
- '$pmacro0' => t('Blocked - default blocked to/from everybody'),
+ '$lbl_pmacro' => t('Simple Privacy Settings:'),
+ '$pmacro3' => t('Very Public - extremely permissive (should be used with caution)'),
+ '$pmacro2' => t('Typical - default public, privacy when desired (similar to social network permissions but with improved privacy)'),
+ '$pmacro1' => t('Private - default private, never open or public'),
+ '$pmacro0' => t('Blocked - default blocked to/from everybody'),
'$permiss_arr' => $permiss,
+ '$lbl_p2macro' => t('Advanced Privacy Settings'),
+
'$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')),
'$permissions' => t('Default Post Permissions'),
'$permdesc' => t("\x28click to open/close\x29"),
diff --git a/mod/setup.php b/mod/setup.php
index ca5566578..14572699e 100755
--- a/mod/setup.php
+++ b/mod/setup.php
@@ -373,7 +373,10 @@ function check_php(&$phpath, &$checks) {
if (strlen($phpath)){
$passed = file_exists($phpath);
} else {
- $phpath = trim(shell_exec('which php'));
+ if(is_windows())
+ $phpath = trim(shell_exec('where php'));
+ else
+ $phpath = trim(shell_exec('which php'));
$passed = strlen($phpath);
}
$help = "";
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index 37cba02ec..14ef17516 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -90,6 +90,21 @@ function siteinfo_content(&$a) {
$admininfo = bbcode(get_config('system','admininfo'));
+ $donate = <<< EOT
+
The Red Matrix is provided for you by volunteers working in their spare time. Your support will help us to build a better web. Select the following option for a one-time donation of your choosing
+
+
or
+
+
+
+EOT;
+
+
+
$o = replace_macros(get_markup_template('siteinfo.tpl'), array(
'$title' => t('Red'),
'$description' => t('This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites.'),
@@ -100,7 +115,8 @@ function siteinfo_content(&$a) {
'$bug_text' => t('Bug reports and issues: please visit'),
'$bug_link_url' => 'https://github.com/friendica/red/issues',
'$bug_link_text' => 'redmatrix issues',
- '$contact' => t('Suggestions, praise, donations, etc. - please email "redmatrix" at librelist - dot com'),
+ '$contact' => t('Suggestions, praise, etc. - please email "redmatrix" at librelist - dot com'),
+ '$donate' => $donate,
'$adminlabel' => t('Site Administrators'),
'$admininfo' => $admininfo,
'$plugins_text' => $plugins_text,
diff --git a/mod/sources.php b/mod/sources.php
index 87bab60df..f4b36508f 100644
--- a/mod/sources.php
+++ b/mod/sources.php
@@ -12,9 +12,13 @@ function sources_post(&$a) {
$abook = intval($_REQUEST['abook']);
$words = $_REQUEST['words'];
$frequency = $_REQUEST['frequency'];
+ $name = $_REQUEST['name'];
$channel = $a->get_channel();
+ if($name == '*')
+ $xchan = '*';
+
if($abook) {
$r = q("select abook_xchan from abook where abook_id = %d and abook_channel = %d limit 1",
intval($abook),
@@ -74,6 +78,9 @@ function sources_content(&$a) {
);
if($r) {
for($x = 0; $x < count($r); $x ++) {
+ if($r[$x]['src_xchan'] == '*') {
+ $r[$x]['xchan_name'] = t('*');
+ }
$r[$x]['src_patt'] = htmlspecialchars($r[$x]['src_patt'], ENT_COMPAT,'UTF-8');
}
}
diff --git a/util/messages.po b/util/messages.po
index 328875302..67adad228 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2014-01-24.567\n"
+"Project-Id-Version: 2014-01-31.574\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-24 00:03-0800\n"
+"POT-Creation-Date: 2014-01-31 00:02-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -52,10 +52,6 @@ msgstr ""
msgid "%1$s has an updated %2$s, changing %3$s."
msgstr ""
-#: ../../include/api.php:973
-msgid "Public Timeline"
-msgstr ""
-
#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1420
msgid "Logout"
msgstr ""
@@ -72,7 +68,7 @@ msgstr ""
msgid "Your posts and conversations"
msgstr ""
-#: ../../include/nav.php:76 ../../include/conversation.php:932
+#: ../../include/nav.php:76 ../../include/conversation.php:933
#: ../../mod/connedit.php:309 ../../mod/connedit.php:423
msgid "View Profile"
msgstr ""
@@ -89,7 +85,7 @@ msgstr ""
msgid "Manage/Edit Profiles"
msgstr ""
-#: ../../include/nav.php:79 ../../include/conversation.php:1474
+#: ../../include/nav.php:79 ../../include/conversation.php:1475
#: ../../mod/fbrowser.php:25
msgid "Photos"
msgstr ""
@@ -236,7 +232,7 @@ msgstr ""
msgid "New Message"
msgstr ""
-#: ../../include/nav.php:171 ../../include/conversation.php:1492
+#: ../../include/nav.php:171 ../../include/conversation.php:1493
#: ../../mod/events.php:354
msgid "Events"
msgstr ""
@@ -262,7 +258,7 @@ msgid "Manage Your Channels"
msgstr ""
#: ../../include/nav.php:177 ../../include/widgets.php:487
-#: ../../mod/admin.php:787 ../../mod/admin.php:992
+#: ../../mod/admin.php:837 ../../mod/admin.php:1042
msgid "Settings"
msgstr ""
@@ -278,7 +274,7 @@ msgstr ""
msgid "Manage/Edit Friends and Connections"
msgstr ""
-#: ../../include/nav.php:186 ../../mod/admin.php:111
+#: ../../include/nav.php:186 ../../mod/admin.php:112
msgid "Admin"
msgstr ""
@@ -294,10 +290,63 @@ msgstr ""
msgid "Please wait..."
msgstr ""
-#: ../../include/Contact.php:104 ../../include/identity.php:625
+#: ../../include/chat.php:10
+msgid "Missing room name"
+msgstr ""
+
+#: ../../include/chat.php:19
+msgid "Duplicate room name"
+msgstr ""
+
+#: ../../include/chat.php:68 ../../include/chat.php:76
+msgid "Invalid room specifier."
+msgstr ""
+
+#: ../../include/chat.php:102
+msgid "Room not found."
+msgstr ""
+
+#: ../../include/chat.php:113 ../../include/photos.php:15
+#: ../../include/attach.php:97 ../../include/attach.php:128
+#: ../../include/attach.php:184 ../../include/attach.php:199
+#: ../../include/attach.php:232 ../../include/attach.php:246
+#: ../../include/attach.php:267 ../../include/attach.php:462
+#: ../../include/attach.php:540 ../../include/items.php:3454
+#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:241
+#: ../../mod/thing.php:257 ../../mod/thing.php:291 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../mod/connedit.php:179
+#: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/page.php:30 ../../mod/page.php:80 ../../mod/setup.php:200
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/delegate.php:6 ../../mod/sources.php:62 ../../mod/mitem.php:73
+#: ../../mod/group.php:9 ../../mod/photos.php:68 ../../mod/photos.php:522
+#: ../../mod/chat.php:84 ../../mod/chat.php:89 ../../mod/viewsrc.php:12
+#: ../../mod/menu.php:40 ../../mod/connections.php:167
+#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:12
+#: ../../mod/profiles.php:152 ../../mod/profiles.php:453
+#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
+#: ../../mod/achievements.php:27 ../../mod/filestorage.php:10
+#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
+#: ../../mod/filestorage.php:98 ../../mod/manage.php:6
+#: ../../mod/settings.php:486 ../../mod/mail.php:108
+#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
+#: ../../mod/profile_photo.php:200 ../../mod/editpost.php:13
+#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
+#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
+#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
+#: ../../mod/channel.php:88 ../../mod/channel.php:188
+#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
+#: ../../mod/editblock.php:48 ../../mod/suggest.php:26
+#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
+#: ../../mod/authtest.php:13 ../../mod/item.php:182 ../../mod/item.php:190
+#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:347
+msgid "Permission denied."
+msgstr ""
+
+#: ../../include/Contact.php:104 ../../include/identity.php:628
#: ../../include/widgets.php:115 ../../include/widgets.php:155
#: ../../mod/directory.php:183 ../../mod/match.php:62 ../../mod/suggest.php:51
-#: ../../mod/dirprofile.php:166
+#: ../../mod/dirprofile.php:170
msgid "Connect"
msgstr ""
@@ -369,8 +418,8 @@ msgstr ""
msgid "RSS/Atom"
msgstr ""
-#: ../../include/contact_selectors.php:77 ../../mod/admin.php:691
-#: ../../mod/admin.php:700 ../../boot.php:1423
+#: ../../include/contact_selectors.php:77 ../../mod/admin.php:741
+#: ../../mod/admin.php:750 ../../boot.php:1423
msgid "Email"
msgstr ""
@@ -476,6 +525,10 @@ msgstr ""
msgid "Cannot locate DNS info for database server '%s'"
msgstr ""
+#: ../../include/network.php:640
+msgid "view full size"
+msgstr ""
+
#: ../../include/event.php:11 ../../include/bb2diaspora.php:433
msgid "l F d, Y \\@ g:i A"
msgstr ""
@@ -488,342 +541,41 @@ msgstr ""
msgid "Finishes:"
msgstr ""
-#: ../../include/event.php:40 ../../include/identity.php:676
+#: ../../include/event.php:40 ../../include/identity.php:679
#: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
-#: ../../mod/directory.php:156 ../../mod/dirprofile.php:108
+#: ../../mod/directory.php:156 ../../mod/dirprofile.php:111
msgid "Location:"
msgstr ""
-#: ../../include/text.php:315
-msgid "prev"
+#: ../../include/bbcode.php:128 ../../include/bbcode.php:537
+#: ../../include/bbcode.php:540 ../../include/bbcode.php:545
+#: ../../include/bbcode.php:548 ../../include/bbcode.php:551
+#: ../../include/bbcode.php:554 ../../include/bbcode.php:559
+#: ../../include/bbcode.php:562 ../../include/bbcode.php:567
+#: ../../include/bbcode.php:570 ../../include/bbcode.php:573
+#: ../../include/bbcode.php:576
+msgid "Image/photo"
msgstr ""
-#: ../../include/text.php:317
-msgid "first"
+#: ../../include/bbcode.php:163 ../../include/bbcode.php:582
+msgid "Encrypted content"
msgstr ""
-#: ../../include/text.php:346
-msgid "last"
+#: ../../include/bbcode.php:170
+msgid "QR code"
msgstr ""
-#: ../../include/text.php:349
-msgid "next"
-msgstr ""
-
-#: ../../include/text.php:361
-msgid "older"
-msgstr ""
-
-#: ../../include/text.php:363
-msgid "newer"
-msgstr ""
-
-#: ../../include/text.php:654
-msgid "No connections"
-msgstr ""
-
-#: ../../include/text.php:665
+#: ../../include/bbcode.php:213
#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/text.php:677
-msgid "View Connections"
-msgstr ""
-
-#: ../../include/text.php:738 ../../include/text.php:752
-#: ../../include/widgets.php:173 ../../mod/filer.php:36
-msgid "Save"
-msgstr ""
-
-#: ../../include/text.php:818
-msgid "poke"
-msgstr ""
-
-#: ../../include/text.php:818 ../../include/conversation.php:240
-msgid "poked"
-msgstr ""
-
-#: ../../include/text.php:819
-msgid "ping"
-msgstr ""
-
-#: ../../include/text.php:819
-msgid "pinged"
-msgstr ""
-
-#: ../../include/text.php:820
-msgid "prod"
-msgstr ""
-
-#: ../../include/text.php:820
-msgid "prodded"
-msgstr ""
-
-#: ../../include/text.php:821
-msgid "slap"
-msgstr ""
-
-#: ../../include/text.php:821
-msgid "slapped"
-msgstr ""
-
-#: ../../include/text.php:822
-msgid "finger"
-msgstr ""
-
-#: ../../include/text.php:822
-msgid "fingered"
-msgstr ""
-
-#: ../../include/text.php:823
-msgid "rebuff"
-msgstr ""
-
-#: ../../include/text.php:823
-msgid "rebuffed"
-msgstr ""
-
-#: ../../include/text.php:835
-msgid "happy"
-msgstr ""
-
-#: ../../include/text.php:836
-msgid "sad"
-msgstr ""
-
-#: ../../include/text.php:837
-msgid "mellow"
-msgstr ""
-
-#: ../../include/text.php:838
-msgid "tired"
-msgstr ""
-
-#: ../../include/text.php:839
-msgid "perky"
-msgstr ""
-
-#: ../../include/text.php:840
-msgid "angry"
-msgstr ""
-
-#: ../../include/text.php:841
-msgid "stupified"
-msgstr ""
-
-#: ../../include/text.php:842
-msgid "puzzled"
-msgstr ""
-
-#: ../../include/text.php:843
-msgid "interested"
-msgstr ""
-
-#: ../../include/text.php:844
-msgid "bitter"
-msgstr ""
-
-#: ../../include/text.php:845
-msgid "cheerful"
-msgstr ""
-
-#: ../../include/text.php:846
-msgid "alive"
-msgstr ""
-
-#: ../../include/text.php:847
-msgid "annoyed"
-msgstr ""
-
-#: ../../include/text.php:848
-msgid "anxious"
-msgstr ""
-
-#: ../../include/text.php:849
-msgid "cranky"
-msgstr ""
-
-#: ../../include/text.php:850
-msgid "disturbed"
-msgstr ""
-
-#: ../../include/text.php:851
-msgid "frustrated"
-msgstr ""
-
-#: ../../include/text.php:852
-msgid "motivated"
-msgstr ""
-
-#: ../../include/text.php:853
-msgid "relaxed"
-msgstr ""
-
-#: ../../include/text.php:854
-msgid "surprised"
-msgstr ""
-
-#: ../../include/text.php:1016
-msgid "Monday"
-msgstr ""
-
-#: ../../include/text.php:1016
-msgid "Tuesday"
-msgstr ""
-
-#: ../../include/text.php:1016
-msgid "Wednesday"
-msgstr ""
-
-#: ../../include/text.php:1016
-msgid "Thursday"
-msgstr ""
-
-#: ../../include/text.php:1016
-msgid "Friday"
-msgstr ""
-
-#: ../../include/text.php:1016
-msgid "Saturday"
-msgstr ""
-
-#: ../../include/text.php:1016
-msgid "Sunday"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "January"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "February"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "March"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "April"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "May"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "June"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "July"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "August"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "September"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "October"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "November"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "December"
-msgstr ""
-
-#: ../../include/text.php:1098
-msgid "unknown.???"
-msgstr ""
-
-#: ../../include/text.php:1099
-msgid "bytes"
-msgstr ""
-
-#: ../../include/text.php:1134
-msgid "remove category"
-msgstr ""
-
-#: ../../include/text.php:1156
-msgid "remove from file"
-msgstr ""
-
-#: ../../include/text.php:1214 ../../include/text.php:1226
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/text.php:1402 ../../mod/events.php:332
-msgid "link to source"
-msgstr ""
-
-#: ../../include/text.php:1421
-msgid "Select a page layout: "
-msgstr ""
-
-#: ../../include/text.php:1424 ../../include/text.php:1489
-msgid "default"
-msgstr ""
-
-#: ../../include/text.php:1460
-msgid "Page content type: "
-msgstr ""
-
-#: ../../include/text.php:1501
-msgid "Select an alternate language"
-msgstr ""
-
-#: ../../include/text.php:1653 ../../include/conversation.php:117
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
-msgid "photo"
-msgstr ""
-
-#: ../../include/text.php:1656 ../../include/conversation.php:120
-#: ../../mod/tagger.php:49
-msgid "event"
-msgstr ""
-
-#: ../../include/text.php:1659 ../../include/conversation.php:145
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
-msgid "status"
-msgstr ""
-
-#: ../../include/text.php:1661 ../../include/conversation.php:147
-#: ../../mod/tagger.php:55
-msgid "comment"
-msgstr ""
-
-#: ../../include/text.php:1666
-msgid "activity"
-msgstr ""
-
-#: ../../include/text.php:1928
-msgid "Design"
-msgstr ""
-
-#: ../../include/text.php:1930
-msgid "Blocks"
-msgstr ""
-
-#: ../../include/text.php:1931
-msgid "Menus"
+msgid "%1$s wrote the following %2$s %3$s"
msgstr ""
-#: ../../include/text.php:1932
-msgid "Layouts"
+#: ../../include/bbcode.php:215
+msgid "post"
msgstr ""
-#: ../../include/text.php:1933
-msgid "Pages"
+#: ../../include/bbcode.php:505 ../../include/bbcode.php:525
+msgid "$1 wrote:"
msgstr ""
#: ../../include/js_strings.php:5
@@ -831,7 +583,7 @@ msgid "Delete this item?"
msgstr ""
#: ../../include/js_strings.php:6 ../../include/ItemObject.php:536
-#: ../../mod/photos.php:968 ../../mod/photos.php:1055
+#: ../../mod/photos.php:972 ../../mod/photos.php:1059
msgid "Comment"
msgstr ""
@@ -960,10 +712,6 @@ msgstr ""
msgid "Profile Photos"
msgstr ""
-#: ../../include/network.php:640
-msgid "view full size"
-msgstr ""
-
#: ../../include/identity.php:29 ../../mod/item.php:1150
msgid "Unable to obtain identity information from database"
msgstr ""
@@ -1017,186 +765,190 @@ msgstr ""
msgid "Requested profile is not available."
msgstr ""
-#: ../../include/identity.php:639 ../../mod/profiles.php:603
+#: ../../include/identity.php:642 ../../mod/profiles.php:603
msgid "Change profile photo"
msgstr ""
-#: ../../include/identity.php:645
+#: ../../include/identity.php:648
msgid "Profiles"
msgstr ""
-#: ../../include/identity.php:645
+#: ../../include/identity.php:648
msgid "Manage/edit profiles"
msgstr ""
-#: ../../include/identity.php:646 ../../mod/profiles.php:604
+#: ../../include/identity.php:649 ../../mod/profiles.php:604
msgid "Create New Profile"
msgstr ""
-#: ../../include/identity.php:649
+#: ../../include/identity.php:652
msgid "Edit Profile"
msgstr ""
-#: ../../include/identity.php:660 ../../mod/profiles.php:615
+#: ../../include/identity.php:663 ../../mod/profiles.php:615
msgid "Profile Image"
msgstr ""
-#: ../../include/identity.php:663 ../../mod/profiles.php:618
+#: ../../include/identity.php:666 ../../mod/profiles.php:618
msgid "visible to everybody"
msgstr ""
-#: ../../include/identity.php:664 ../../mod/profiles.php:619
+#: ../../include/identity.php:667 ../../mod/profiles.php:619
msgid "Edit visibility"
msgstr ""
-#: ../../include/identity.php:678 ../../include/identity.php:903
+#: ../../include/identity.php:681 ../../include/identity.php:908
#: ../../mod/directory.php:158
msgid "Gender:"
msgstr ""
-#: ../../include/identity.php:679 ../../include/identity.php:923
+#: ../../include/identity.php:682 ../../include/identity.php:928
#: ../../mod/directory.php:160
msgid "Status:"
msgstr ""
-#: ../../include/identity.php:680 ../../include/identity.php:934
+#: ../../include/identity.php:683 ../../include/identity.php:939
#: ../../mod/directory.php:162
msgid "Homepage:"
msgstr ""
-#: ../../include/identity.php:747 ../../include/identity.php:827
-#: ../../mod/ping.php:230
+#: ../../include/identity.php:684 ../../mod/dirprofile.php:157
+msgid "Online Now"
+msgstr ""
+
+#: ../../include/identity.php:752 ../../include/identity.php:832
+#: ../../mod/ping.php:256
msgid "g A l F d"
msgstr ""
-#: ../../include/identity.php:748 ../../include/identity.php:828
+#: ../../include/identity.php:753 ../../include/identity.php:833
msgid "F d"
msgstr ""
-#: ../../include/identity.php:793 ../../include/identity.php:868
-#: ../../mod/ping.php:252
+#: ../../include/identity.php:798 ../../include/identity.php:873
+#: ../../mod/ping.php:278
msgid "[today]"
msgstr ""
-#: ../../include/identity.php:805
+#: ../../include/identity.php:810
msgid "Birthday Reminders"
msgstr ""
-#: ../../include/identity.php:806
+#: ../../include/identity.php:811
msgid "Birthdays this week:"
msgstr ""
-#: ../../include/identity.php:861
+#: ../../include/identity.php:866
msgid "[No description]"
msgstr ""
-#: ../../include/identity.php:879
+#: ../../include/identity.php:884
msgid "Event Reminders"
msgstr ""
-#: ../../include/identity.php:880
+#: ../../include/identity.php:885
msgid "Events this week:"
msgstr ""
-#: ../../include/identity.php:893 ../../include/identity.php:977
+#: ../../include/identity.php:898 ../../include/identity.php:982
#: ../../mod/profperm.php:107
msgid "Profile"
msgstr ""
-#: ../../include/identity.php:901 ../../mod/settings.php:911
+#: ../../include/identity.php:906 ../../mod/settings.php:916
msgid "Full Name:"
msgstr ""
-#: ../../include/identity.php:908
+#: ../../include/identity.php:913
msgid "j F, Y"
msgstr ""
-#: ../../include/identity.php:909
+#: ../../include/identity.php:914
msgid "j F"
msgstr ""
-#: ../../include/identity.php:916
+#: ../../include/identity.php:921
msgid "Birthday:"
msgstr ""
-#: ../../include/identity.php:920
+#: ../../include/identity.php:925
msgid "Age:"
msgstr ""
-#: ../../include/identity.php:929
+#: ../../include/identity.php:934
#, php-format
msgid "for %1$d %2$s"
msgstr ""
-#: ../../include/identity.php:932 ../../mod/profiles.php:526
+#: ../../include/identity.php:937 ../../mod/profiles.php:526
msgid "Sexual Preference:"
msgstr ""
-#: ../../include/identity.php:936 ../../mod/profiles.php:528
+#: ../../include/identity.php:941 ../../mod/profiles.php:528
msgid "Hometown:"
msgstr ""
-#: ../../include/identity.php:938
+#: ../../include/identity.php:943
msgid "Tags:"
msgstr ""
-#: ../../include/identity.php:940 ../../mod/profiles.php:529
+#: ../../include/identity.php:945 ../../mod/profiles.php:529
msgid "Political Views:"
msgstr ""
-#: ../../include/identity.php:942
+#: ../../include/identity.php:947
msgid "Religion:"
msgstr ""
-#: ../../include/identity.php:944 ../../mod/directory.php:164
+#: ../../include/identity.php:949 ../../mod/directory.php:164
msgid "About:"
msgstr ""
-#: ../../include/identity.php:946
+#: ../../include/identity.php:951
msgid "Hobbies/Interests:"
msgstr ""
-#: ../../include/identity.php:948 ../../mod/profiles.php:532
+#: ../../include/identity.php:953 ../../mod/profiles.php:532
msgid "Likes:"
msgstr ""
-#: ../../include/identity.php:950 ../../mod/profiles.php:533
+#: ../../include/identity.php:955 ../../mod/profiles.php:533
msgid "Dislikes:"
msgstr ""
-#: ../../include/identity.php:953
+#: ../../include/identity.php:958
msgid "Contact information and Social Networks:"
msgstr ""
-#: ../../include/identity.php:955
+#: ../../include/identity.php:960
msgid "My other channels:"
msgstr ""
-#: ../../include/identity.php:957
+#: ../../include/identity.php:962
msgid "Musical interests:"
msgstr ""
-#: ../../include/identity.php:959
+#: ../../include/identity.php:964
msgid "Books, literature:"
msgstr ""
-#: ../../include/identity.php:961
+#: ../../include/identity.php:966
msgid "Television:"
msgstr ""
-#: ../../include/identity.php:963
+#: ../../include/identity.php:968
msgid "Film/dance/culture/entertainment:"
msgstr ""
-#: ../../include/identity.php:965
+#: ../../include/identity.php:970
msgid "Love/Romance:"
msgstr ""
-#: ../../include/identity.php:967
+#: ../../include/identity.php:972
msgid "Work/employment:"
msgstr ""
-#: ../../include/identity.php:969
+#: ../../include/identity.php:974
msgid "School/education:"
msgstr ""
@@ -1204,32 +956,6 @@ msgstr ""
msgid "Edit File properties"
msgstr ""
-#: ../../include/bbcode.php:128 ../../include/bbcode.php:553
-#: ../../include/bbcode.php:556
-msgid "Image/photo"
-msgstr ""
-
-#: ../../include/bbcode.php:163 ../../include/bbcode.php:561
-msgid "Encrypted content"
-msgstr ""
-
-#: ../../include/bbcode.php:170
-msgid "QR code"
-msgstr ""
-
-#: ../../include/bbcode.php:213
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr ""
-
-#: ../../include/bbcode.php:215
-msgid "post"
-msgstr ""
-
-#: ../../include/bbcode.php:513 ../../include/bbcode.php:533
-msgid "$1 wrote:"
-msgstr ""
-
#: ../../include/oembed.php:157
msgid "Embedded content"
msgstr ""
@@ -1238,226 +964,226 @@ msgstr ""
msgid "Embedding disabled"
msgstr ""
-#: ../../include/features.php:21
+#: ../../include/features.php:23
msgid "General Features"
msgstr ""
-#: ../../include/features.php:23
+#: ../../include/features.php:25
msgid "Content Expiration"
msgstr ""
-#: ../../include/features.php:23
+#: ../../include/features.php:25
msgid "Remove posts/comments and/or private messages at a future time"
msgstr ""
-#: ../../include/features.php:24
+#: ../../include/features.php:26
msgid "Multiple Profiles"
msgstr ""
-#: ../../include/features.php:24
+#: ../../include/features.php:26
msgid "Ability to create multiple profiles"
msgstr ""
-#: ../../include/features.php:25
+#: ../../include/features.php:27
msgid "Web Pages"
msgstr ""
-#: ../../include/features.php:25
+#: ../../include/features.php:27
msgid "Provide managed web pages on your channel"
msgstr ""
-#: ../../include/features.php:26
+#: ../../include/features.php:28
msgid "Private Notes"
msgstr ""
-#: ../../include/features.php:26
+#: ../../include/features.php:28
msgid "Enables a tool to store notes and reminders"
msgstr ""
-#: ../../include/features.php:31
+#: ../../include/features.php:33
msgid "Extended Identity Sharing"
msgstr ""
-#: ../../include/features.php:31
+#: ../../include/features.php:33
msgid ""
"Share your identity with all websites on the internet. When disabled, "
"identity is only shared with sites in the matrix."
msgstr ""
-#: ../../include/features.php:32
+#: ../../include/features.php:34
msgid "Expert Mode"
msgstr ""
-#: ../../include/features.php:32
+#: ../../include/features.php:34
msgid "Enable Expert Mode to provide advanced configuration options"
msgstr ""
-#: ../../include/features.php:33
+#: ../../include/features.php:35
msgid "Premium Channel"
msgstr ""
-#: ../../include/features.php:33
+#: ../../include/features.php:35
msgid ""
"Allows you to set restrictions and terms on those that connect with your "
"channel"
msgstr ""
-#: ../../include/features.php:38
+#: ../../include/features.php:40
msgid "Post Composition Features"
msgstr ""
-#: ../../include/features.php:39
+#: ../../include/features.php:41
msgid "Richtext Editor"
msgstr ""
-#: ../../include/features.php:39
+#: ../../include/features.php:41
msgid "Enable richtext editor"
msgstr ""
-#: ../../include/features.php:40
+#: ../../include/features.php:42
msgid "Post Preview"
msgstr ""
-#: ../../include/features.php:40
+#: ../../include/features.php:42
msgid "Allow previewing posts and comments before publishing them"
msgstr ""
-#: ../../include/features.php:41 ../../include/widgets.php:476
+#: ../../include/features.php:43 ../../include/widgets.php:476
#: ../../mod/sources.php:81
msgid "Channel Sources"
msgstr ""
-#: ../../include/features.php:41
+#: ../../include/features.php:43
msgid "Automatically import channel content from other channels or feeds"
msgstr ""
-#: ../../include/features.php:42
+#: ../../include/features.php:44
msgid "Even More Encryption"
msgstr ""
-#: ../../include/features.php:42
+#: ../../include/features.php:44
msgid ""
"Allow optional encryption of content end-to-end with a shared secret key"
msgstr ""
-#: ../../include/features.php:47
+#: ../../include/features.php:49
msgid "Network and Stream Filtering"
msgstr ""
-#: ../../include/features.php:48
+#: ../../include/features.php:50
msgid "Search by Date"
msgstr ""
-#: ../../include/features.php:48
+#: ../../include/features.php:50
msgid "Ability to select posts by date ranges"
msgstr ""
-#: ../../include/features.php:49
+#: ../../include/features.php:51
msgid "Collections Filter"
msgstr ""
-#: ../../include/features.php:49
+#: ../../include/features.php:51
msgid "Enable widget to display Network posts only from selected collections"
msgstr ""
-#: ../../include/features.php:50 ../../include/widgets.php:252
+#: ../../include/features.php:52 ../../include/widgets.php:252
msgid "Saved Searches"
msgstr ""
-#: ../../include/features.php:50
+#: ../../include/features.php:52
msgid "Save search terms for re-use"
msgstr ""
-#: ../../include/features.php:51
+#: ../../include/features.php:53
msgid "Network Personal Tab"
msgstr ""
-#: ../../include/features.php:51
+#: ../../include/features.php:53
msgid "Enable tab to display only Network posts that you've interacted on"
msgstr ""
-#: ../../include/features.php:52
+#: ../../include/features.php:54
msgid "Network New Tab"
msgstr ""
-#: ../../include/features.php:52
+#: ../../include/features.php:54
msgid "Enable tab to display all new Network activity"
msgstr ""
-#: ../../include/features.php:53
+#: ../../include/features.php:55
msgid "Affinity Tool"
msgstr ""
-#: ../../include/features.php:53
+#: ../../include/features.php:55
msgid "Filter stream activity by depth of relationships"
msgstr ""
-#: ../../include/features.php:54
+#: ../../include/features.php:56
msgid "Suggest Channels"
msgstr ""
-#: ../../include/features.php:54
+#: ../../include/features.php:56
msgid "Show channel suggestions"
msgstr ""
-#: ../../include/features.php:59
+#: ../../include/features.php:61
msgid "Post/Comment Tools"
msgstr ""
-#: ../../include/features.php:61
+#: ../../include/features.php:63
msgid "Edit Sent Posts"
msgstr ""
-#: ../../include/features.php:61
+#: ../../include/features.php:63
msgid "Edit and correct posts and comments after sending"
msgstr ""
-#: ../../include/features.php:62
+#: ../../include/features.php:64
msgid "Tagging"
msgstr ""
-#: ../../include/features.php:62
+#: ../../include/features.php:64
msgid "Ability to tag existing posts"
msgstr ""
-#: ../../include/features.php:63
+#: ../../include/features.php:65
msgid "Post Categories"
msgstr ""
-#: ../../include/features.php:63
+#: ../../include/features.php:65
msgid "Add categories to your posts"
msgstr ""
-#: ../../include/features.php:64 ../../include/widgets.php:283
+#: ../../include/features.php:66 ../../include/widgets.php:283
#: ../../include/contact_widgets.php:53
msgid "Saved Folders"
msgstr ""
-#: ../../include/features.php:64
+#: ../../include/features.php:66
msgid "Ability to file posts under folders"
msgstr ""
-#: ../../include/features.php:65
+#: ../../include/features.php:67
msgid "Dislike Posts"
msgstr ""
-#: ../../include/features.php:65
+#: ../../include/features.php:67
msgid "Ability to dislike posts/comments"
msgstr ""
-#: ../../include/features.php:66
+#: ../../include/features.php:68
msgid "Star Posts"
msgstr ""
-#: ../../include/features.php:66
+#: ../../include/features.php:68
msgid "Ability to mark special posts with a star indicator"
msgstr ""
-#: ../../include/features.php:67
+#: ../../include/features.php:69
msgid "Tag Cloud"
msgstr ""
-#: ../../include/features.php:67
+#: ../../include/features.php:69
msgid "Provide a personal tag cloud on your channel page"
msgstr ""
@@ -1472,7 +1198,7 @@ msgstr ""
msgid "Default privacy group for new contacts"
msgstr ""
-#: ../../include/group.php:242 ../../mod/admin.php:700
+#: ../../include/group.php:242 ../../mod/admin.php:750
msgid "All Channels"
msgstr ""
@@ -1509,42 +1235,6 @@ msgstr ""
msgid "commented on %s's post"
msgstr ""
-#: ../../include/photos.php:15 ../../include/attach.php:97
-#: ../../include/attach.php:128 ../../include/attach.php:184
-#: ../../include/attach.php:199 ../../include/attach.php:232
-#: ../../include/attach.php:246 ../../include/attach.php:267
-#: ../../include/attach.php:462 ../../include/attach.php:540
-#: ../../include/items.php:3454 ../../mod/common.php:35
-#: ../../mod/events.php:140 ../../mod/thing.php:241 ../../mod/thing.php:257
-#: ../../mod/thing.php:291 ../../mod/invite.php:13 ../../mod/invite.php:104
-#: ../../mod/connedit.php:179 ../../mod/webpages.php:40 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/page.php:30 ../../mod/page.php:80
-#: ../../mod/setup.php:200 ../../mod/viewconnections.php:22
-#: ../../mod/viewconnections.php:27 ../../mod/delegate.php:6
-#: ../../mod/sources.php:62 ../../mod/mitem.php:73 ../../mod/group.php:9
-#: ../../mod/photos.php:68 ../../mod/photos.php:522 ../../mod/viewsrc.php:12
-#: ../../mod/menu.php:40 ../../mod/connections.php:167
-#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:12
-#: ../../mod/profiles.php:152 ../../mod/profiles.php:453
-#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
-#: ../../mod/achievements.php:27 ../../mod/filestorage.php:10
-#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:76
-#: ../../mod/filestorage.php:99 ../../mod/manage.php:6
-#: ../../mod/settings.php:484 ../../mod/mail.php:108
-#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
-#: ../../mod/profile_photo.php:200 ../../mod/editpost.php:13
-#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
-#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
-#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
-#: ../../mod/channel.php:88 ../../mod/channel.php:188
-#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
-#: ../../mod/editblock.php:48 ../../mod/suggest.php:26
-#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
-#: ../../mod/authtest.php:13 ../../mod/item.php:182 ../../mod/item.php:190
-#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:348
-msgid "Permission denied."
-msgstr ""
-
#: ../../include/photos.php:89
#, php-format
msgid "Image exceeds website size limit of %lu bytes"
@@ -1562,12 +1252,12 @@ msgstr ""
msgid "Photo storage failed."
msgstr ""
-#: ../../include/photos.php:302 ../../include/conversation.php:1477
+#: ../../include/photos.php:302 ../../include/conversation.php:1478
msgid "Photo Albums"
msgstr ""
#: ../../include/photos.php:306 ../../mod/photos.php:690
-#: ../../mod/photos.php:1165
+#: ../../mod/photos.php:1169
msgid "Upload New Photos"
msgstr ""
@@ -2220,6 +1910,11 @@ msgstr ""
msgid "Notes"
msgstr ""
+#: ../../include/widgets.php:173 ../../include/text.php:738
+#: ../../include/text.php:752 ../../mod/filer.php:36
+msgid "Save"
+msgstr ""
+
#: ../../include/widgets.php:243
msgid "Remove term"
msgstr ""
@@ -2301,6 +1996,14 @@ msgstr ""
msgid "Check Mail"
msgstr ""
+#: ../../include/widgets.php:585
+msgid "Chat Rooms"
+msgstr ""
+
+#: ../../include/api.php:974
+msgid "Public Timeline"
+msgstr ""
+
#: ../../include/contact_widgets.php:14
#, php-format
msgid "%d invitation available"
@@ -2354,9 +2057,9 @@ msgstr ""
#: ../../include/page_widgets.php:8 ../../include/ItemObject.php:96
#: ../../mod/thing.php:229 ../../mod/webpages.php:118 ../../mod/menu.php:55
-#: ../../mod/layouts.php:102 ../../mod/filestorage.php:171
-#: ../../mod/settings.php:569 ../../mod/editlayout.php:106
-#: ../../mod/editpost.php:98 ../../mod/blocks.php:93
+#: ../../mod/layouts.php:102 ../../mod/filestorage.php:170
+#: ../../mod/settings.php:571 ../../mod/editlayout.php:106
+#: ../../mod/editpost.php:103 ../../mod/blocks.php:93
#: ../../mod/editwebpage.php:144 ../../mod/editblock.php:120
msgid "Edit"
msgstr ""
@@ -2491,46 +2194,379 @@ msgid "Default"
msgstr ""
#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68
-#: ../../mod/profperm.php:23 ../../index.php:347
+#: ../../mod/profperm.php:23 ../../index.php:346
msgid "Permission denied"
msgstr ""
-#: ../../include/items.php:3392 ../../mod/thing.php:74 ../../mod/admin.php:150
-#: ../../mod/admin.php:732 ../../mod/admin.php:935 ../../mod/viewsrc.php:18
+#: ../../include/items.php:3392 ../../mod/thing.php:74 ../../mod/admin.php:151
+#: ../../mod/admin.php:782 ../../mod/admin.php:985 ../../mod/viewsrc.php:18
#: ../../mod/home.php:63 ../../mod/filestorage.php:18 ../../mod/display.php:32
msgid "Item not found."
msgstr ""
-#: ../../include/items.php:3743 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:3748 ../../mod/group.php:38 ../../mod/group.php:140
msgid "Collection not found."
msgstr ""
-#: ../../include/items.php:3758
+#: ../../include/items.php:3763
msgid "Collection is empty."
msgstr ""
-#: ../../include/items.php:3765
+#: ../../include/items.php:3770
#, php-format
msgid "Collection: %s"
msgstr ""
-#: ../../include/items.php:3776
+#: ../../include/items.php:3781
#, php-format
msgid "Connection: %s"
msgstr ""
-#: ../../include/items.php:3779
+#: ../../include/items.php:3784
msgid "Connection not found."
msgstr ""
-#: ../../include/ItemObject.php:89 ../../mod/photos.php:841
+#: ../../include/security.php:280
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr ""
+
+#: ../../include/text.php:315
+msgid "prev"
+msgstr ""
+
+#: ../../include/text.php:317
+msgid "first"
+msgstr ""
+
+#: ../../include/text.php:346
+msgid "last"
+msgstr ""
+
+#: ../../include/text.php:349
+msgid "next"
+msgstr ""
+
+#: ../../include/text.php:361
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:363
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:654
+msgid "No connections"
+msgstr ""
+
+#: ../../include/text.php:665
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:677
+msgid "View Connections"
+msgstr ""
+
+#: ../../include/text.php:818
+msgid "poke"
+msgstr ""
+
+#: ../../include/text.php:818 ../../include/conversation.php:240
+msgid "poked"
+msgstr ""
+
+#: ../../include/text.php:819
+msgid "ping"
+msgstr ""
+
+#: ../../include/text.php:819
+msgid "pinged"
+msgstr ""
+
+#: ../../include/text.php:820
+msgid "prod"
+msgstr ""
+
+#: ../../include/text.php:820
+msgid "prodded"
+msgstr ""
+
+#: ../../include/text.php:821
+msgid "slap"
+msgstr ""
+
+#: ../../include/text.php:821
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:822
+msgid "finger"
+msgstr ""
+
+#: ../../include/text.php:822
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:823
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:823
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:835
+msgid "happy"
+msgstr ""
+
+#: ../../include/text.php:836
+msgid "sad"
+msgstr ""
+
+#: ../../include/text.php:837
+msgid "mellow"
+msgstr ""
+
+#: ../../include/text.php:838
+msgid "tired"
+msgstr ""
+
+#: ../../include/text.php:839
+msgid "perky"
+msgstr ""
+
+#: ../../include/text.php:840
+msgid "angry"
+msgstr ""
+
+#: ../../include/text.php:841
+msgid "stupified"
+msgstr ""
+
+#: ../../include/text.php:842
+msgid "puzzled"
+msgstr ""
+
+#: ../../include/text.php:843
+msgid "interested"
+msgstr ""
+
+#: ../../include/text.php:844
+msgid "bitter"
+msgstr ""
+
+#: ../../include/text.php:845
+msgid "cheerful"
+msgstr ""
+
+#: ../../include/text.php:846
+msgid "alive"
+msgstr ""
+
+#: ../../include/text.php:847
+msgid "annoyed"
+msgstr ""
+
+#: ../../include/text.php:848
+msgid "anxious"
+msgstr ""
+
+#: ../../include/text.php:849
+msgid "cranky"
+msgstr ""
+
+#: ../../include/text.php:850
+msgid "disturbed"
+msgstr ""
+
+#: ../../include/text.php:851
+msgid "frustrated"
+msgstr ""
+
+#: ../../include/text.php:852
+msgid "motivated"
+msgstr ""
+
+#: ../../include/text.php:853
+msgid "relaxed"
+msgstr ""
+
+#: ../../include/text.php:854
+msgid "surprised"
+msgstr ""
+
+#: ../../include/text.php:1017
+msgid "Monday"
+msgstr ""
+
+#: ../../include/text.php:1017
+msgid "Tuesday"
+msgstr ""
+
+#: ../../include/text.php:1017
+msgid "Wednesday"
+msgstr ""
+
+#: ../../include/text.php:1017
+msgid "Thursday"
+msgstr ""
+
+#: ../../include/text.php:1017
+msgid "Friday"
+msgstr ""
+
+#: ../../include/text.php:1017
+msgid "Saturday"
+msgstr ""
+
+#: ../../include/text.php:1017
+msgid "Sunday"
+msgstr ""
+
+#: ../../include/text.php:1021
+msgid "January"
+msgstr ""
+
+#: ../../include/text.php:1021
+msgid "February"
+msgstr ""
+
+#: ../../include/text.php:1021
+msgid "March"
+msgstr ""
+
+#: ../../include/text.php:1021
+msgid "April"
+msgstr ""
+
+#: ../../include/text.php:1021
+msgid "May"
+msgstr ""
+
+#: ../../include/text.php:1021
+msgid "June"
+msgstr ""
+
+#: ../../include/text.php:1021
+msgid "July"
+msgstr ""
+
+#: ../../include/text.php:1021
+msgid "August"
+msgstr ""
+
+#: ../../include/text.php:1021
+msgid "September"
+msgstr ""
+
+#: ../../include/text.php:1021
+msgid "October"
+msgstr ""
+
+#: ../../include/text.php:1021
+msgid "November"
+msgstr ""
+
+#: ../../include/text.php:1021
+msgid "December"
+msgstr ""
+
+#: ../../include/text.php:1099
+msgid "unknown.???"
+msgstr ""
+
+#: ../../include/text.php:1100
+msgid "bytes"
+msgstr ""
+
+#: ../../include/text.php:1135
+msgid "remove category"
+msgstr ""
+
+#: ../../include/text.php:1157
+msgid "remove from file"
+msgstr ""
+
+#: ../../include/text.php:1215 ../../include/text.php:1227
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/text.php:1403 ../../mod/events.php:332
+msgid "link to source"
+msgstr ""
+
+#: ../../include/text.php:1422
+msgid "Select a page layout: "
+msgstr ""
+
+#: ../../include/text.php:1425 ../../include/text.php:1490
+msgid "default"
+msgstr ""
+
+#: ../../include/text.php:1461
+msgid "Page content type: "
+msgstr ""
+
+#: ../../include/text.php:1502
+msgid "Select an alternate language"
+msgstr ""
+
+#: ../../include/text.php:1654 ../../include/conversation.php:117
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
+msgid "photo"
+msgstr ""
+
+#: ../../include/text.php:1657 ../../include/conversation.php:120
+#: ../../mod/tagger.php:49
+msgid "event"
+msgstr ""
+
+#: ../../include/text.php:1660 ../../include/conversation.php:145
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
+msgid "status"
+msgstr ""
+
+#: ../../include/text.php:1662 ../../include/conversation.php:147
+#: ../../mod/tagger.php:55
+msgid "comment"
+msgstr ""
+
+#: ../../include/text.php:1667
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:1929
+msgid "Design"
+msgstr ""
+
+#: ../../include/text.php:1931
+msgid "Blocks"
+msgstr ""
+
+#: ../../include/text.php:1932
+msgid "Menus"
+msgstr ""
+
+#: ../../include/text.php:1933
+msgid "Layouts"
+msgstr ""
+
+#: ../../include/text.php:1934
+msgid "Pages"
+msgstr ""
+
+#: ../../include/ItemObject.php:89 ../../mod/photos.php:843
msgid "Private Message"
msgstr ""
#: ../../include/ItemObject.php:108 ../../include/conversation.php:632
-#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:695
-#: ../../mod/group.php:176 ../../mod/photos.php:1019
-#: ../../mod/filestorage.php:172 ../../mod/settings.php:570
+#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:745
+#: ../../mod/group.php:176 ../../mod/photos.php:1023
+#: ../../mod/filestorage.php:171 ../../mod/settings.php:572
msgid "Delete"
msgstr ""
@@ -2566,11 +2602,11 @@ msgstr ""
msgid "add tag"
msgstr ""
-#: ../../include/ItemObject.php:175 ../../mod/photos.php:947
+#: ../../include/ItemObject.php:175 ../../mod/photos.php:951
msgid "I like this (toggle)"
msgstr ""
-#: ../../include/ItemObject.php:176 ../../mod/photos.php:948
+#: ../../include/ItemObject.php:176 ../../mod/photos.php:952
msgid "I don't like this (toggle)"
msgstr ""
@@ -2613,15 +2649,15 @@ msgstr ""
msgid "last edited: %s"
msgstr ""
-#: ../../include/ItemObject.php:221
+#: ../../include/ItemObject.php:221 ../../include/conversation.php:690
#, php-format
msgid "Expires: %s"
msgstr ""
-#: ../../include/ItemObject.php:248 ../../include/conversation.php:706
-#: ../../include/conversation.php:1119 ../../mod/photos.php:950
+#: ../../include/ItemObject.php:248 ../../include/conversation.php:707
+#: ../../include/conversation.php:1120 ../../mod/photos.php:954
#: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
-#: ../../mod/editpost.php:107 ../../mod/editwebpage.php:153
+#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:153
#: ../../mod/editblock.php:129
msgid "Please wait"
msgstr ""
@@ -2633,8 +2669,8 @@ msgid_plural "%d comments"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/ItemObject.php:534 ../../mod/photos.php:966
-#: ../../mod/photos.php:1053
+#: ../../include/ItemObject.php:534 ../../mod/photos.php:970
+#: ../../mod/photos.php:1057
msgid "This is you"
msgstr ""
@@ -2642,16 +2678,17 @@ msgstr ""
#: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156
#: ../../mod/connedit.php:434 ../../mod/setup.php:304 ../../mod/setup.php:347
#: ../../mod/connect.php:92 ../../mod/sources.php:97 ../../mod/sources.php:131
-#: ../../mod/admin.php:420 ../../mod/admin.php:688 ../../mod/admin.php:828
-#: ../../mod/admin.php:1027 ../../mod/admin.php:1114 ../../mod/group.php:81
-#: ../../mod/photos.php:562 ../../mod/photos.php:667 ../../mod/photos.php:929
-#: ../../mod/photos.php:969 ../../mod/photos.php:1056
-#: ../../mod/profiles.php:506 ../../mod/filestorage.php:132
-#: ../../mod/import.php:387 ../../mod/settings.php:507
-#: ../../mod/settings.php:619 ../../mod/settings.php:647
-#: ../../mod/settings.php:671 ../../mod/settings.php:742
-#: ../../mod/settings.php:903 ../../mod/mail.php:223 ../../mod/mail.php:335
-#: ../../mod/poke.php:166 ../../mod/fsuggest.php:108 ../../mod/mood.php:142
+#: ../../mod/admin.php:431 ../../mod/admin.php:738 ../../mod/admin.php:878
+#: ../../mod/admin.php:1077 ../../mod/admin.php:1164 ../../mod/group.php:81
+#: ../../mod/photos.php:562 ../../mod/photos.php:667 ../../mod/photos.php:933
+#: ../../mod/photos.php:973 ../../mod/photos.php:1060 ../../mod/chat.php:107
+#: ../../mod/chat.php:133 ../../mod/profiles.php:506
+#: ../../mod/filestorage.php:131 ../../mod/import.php:387
+#: ../../mod/settings.php:509 ../../mod/settings.php:621
+#: ../../mod/settings.php:649 ../../mod/settings.php:673
+#: ../../mod/settings.php:744 ../../mod/settings.php:908
+#: ../../mod/mail.php:223 ../../mod/mail.php:335 ../../mod/poke.php:166
+#: ../../mod/fsuggest.php:108 ../../mod/mood.php:142
#: ../../view/theme/redbasic/php/config.php:85
#: ../../view/theme/apw/php/config.php:231
#: ../../view/theme/blogga/view/theme/blog/config.php:67
@@ -2691,36 +2728,18 @@ msgstr ""
msgid "Video"
msgstr ""
-#: ../../include/ItemObject.php:546 ../../include/conversation.php:1082
-#: ../../mod/webpages.php:122 ../../mod/photos.php:970
-#: ../../mod/editlayout.php:136 ../../mod/editpost.php:127
+#: ../../include/ItemObject.php:546 ../../include/conversation.php:1083
+#: ../../mod/webpages.php:122 ../../mod/photos.php:974
+#: ../../mod/editlayout.php:136 ../../mod/editpost.php:132
#: ../../mod/editwebpage.php:177 ../../mod/editblock.php:151
msgid "Preview"
msgstr ""
-#: ../../include/ItemObject.php:549 ../../include/conversation.php:1146
-#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:135
+#: ../../include/ItemObject.php:549 ../../include/conversation.php:1147
+#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:140
msgid "Encrypt text"
msgstr ""
-#: ../../include/security.php:49
-msgid "Welcome "
-msgstr ""
-
-#: ../../include/security.php:50
-msgid "Please upload a profile photo."
-msgstr ""
-
-#: ../../include/security.php:53
-msgid "Welcome back "
-msgstr ""
-
-#: ../../include/security.php:363
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr ""
-
#: ../../include/conversation.php:123
msgid "channel"
msgstr ""
@@ -2763,344 +2782,344 @@ msgstr ""
msgid "Filed under:"
msgstr ""
-#: ../../include/conversation.php:704
+#: ../../include/conversation.php:705
msgid "View in context"
msgstr ""
-#: ../../include/conversation.php:833
+#: ../../include/conversation.php:834
msgid "remove"
msgstr ""
-#: ../../include/conversation.php:837
+#: ../../include/conversation.php:838
msgid "Loading..."
msgstr ""
-#: ../../include/conversation.php:838
+#: ../../include/conversation.php:839
msgid "Delete Selected Items"
msgstr ""
-#: ../../include/conversation.php:929
+#: ../../include/conversation.php:930
msgid "View Source"
msgstr ""
-#: ../../include/conversation.php:930
+#: ../../include/conversation.php:931
msgid "Follow Thread"
msgstr ""
-#: ../../include/conversation.php:931
+#: ../../include/conversation.php:932
msgid "View Status"
msgstr ""
-#: ../../include/conversation.php:933
+#: ../../include/conversation.php:934
msgid "View Photos"
msgstr ""
-#: ../../include/conversation.php:934
+#: ../../include/conversation.php:935
msgid "Matrix Activity"
msgstr ""
-#: ../../include/conversation.php:935
+#: ../../include/conversation.php:936
msgid "Edit Contact"
msgstr ""
-#: ../../include/conversation.php:936
+#: ../../include/conversation.php:937
msgid "Send PM"
msgstr ""
-#: ../../include/conversation.php:937
+#: ../../include/conversation.php:938
msgid "Poke"
msgstr ""
-#: ../../include/conversation.php:999
+#: ../../include/conversation.php:1000
#, php-format
msgid "%s likes this."
msgstr ""
-#: ../../include/conversation.php:999
+#: ../../include/conversation.php:1000
#, php-format
msgid "%s doesn't like this."
msgstr ""
-#: ../../include/conversation.php:1003
+#: ../../include/conversation.php:1004
#, php-format
msgid "%2$d people like this."
msgid_plural "%2$d people like this."
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1005
+#: ../../include/conversation.php:1006
#, php-format
msgid "%2$d people don't like this."
msgid_plural "%2$d people don't like this."
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1011
+#: ../../include/conversation.php:1012
msgid "and"
msgstr ""
-#: ../../include/conversation.php:1014
+#: ../../include/conversation.php:1015
#, php-format
msgid ", and %d other people"
msgid_plural ", and %d other people"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/conversation.php:1015
+#: ../../include/conversation.php:1016
#, php-format
msgid "%s like this."
msgstr ""
-#: ../../include/conversation.php:1015
+#: ../../include/conversation.php:1016
#, php-format
msgid "%s don't like this."
msgstr ""
-#: ../../include/conversation.php:1065
+#: ../../include/conversation.php:1066
msgid "Visible to everybody"
msgstr ""
-#: ../../include/conversation.php:1066 ../../mod/mail.php:171
+#: ../../include/conversation.php:1067 ../../mod/mail.php:171
#: ../../mod/mail.php:269
msgid "Please enter a link URL:"
msgstr ""
-#: ../../include/conversation.php:1067
+#: ../../include/conversation.php:1068
msgid "Please enter a video link/URL:"
msgstr ""
-#: ../../include/conversation.php:1068
+#: ../../include/conversation.php:1069
msgid "Please enter an audio link/URL:"
msgstr ""
-#: ../../include/conversation.php:1069
+#: ../../include/conversation.php:1070
msgid "Tag term:"
msgstr ""
-#: ../../include/conversation.php:1070 ../../mod/filer.php:35
+#: ../../include/conversation.php:1071 ../../mod/filer.php:35
msgid "Save to Folder:"
msgstr ""
-#: ../../include/conversation.php:1071
+#: ../../include/conversation.php:1072
msgid "Where are you right now?"
msgstr ""
-#: ../../include/conversation.php:1072 ../../mod/mail.php:172
+#: ../../include/conversation.php:1073 ../../mod/mail.php:172
#: ../../mod/mail.php:270 ../../mod/editpost.php:52
msgid "Expires YYYY-MM-DD HH:MM"
msgstr ""
-#: ../../include/conversation.php:1096 ../../mod/photos.php:949
+#: ../../include/conversation.php:1097 ../../mod/photos.php:953
msgid "Share"
msgstr ""
-#: ../../include/conversation.php:1098 ../../mod/editwebpage.php:140
+#: ../../include/conversation.php:1099 ../../mod/editwebpage.php:140
msgid "Page link title"
msgstr ""
-#: ../../include/conversation.php:1100 ../../mod/mail.php:219
+#: ../../include/conversation.php:1101 ../../mod/mail.php:219
#: ../../mod/mail.php:332 ../../mod/editlayout.php:107
-#: ../../mod/editpost.php:99 ../../mod/editwebpage.php:145
+#: ../../mod/editpost.php:104 ../../mod/editwebpage.php:145
#: ../../mod/editblock.php:121
msgid "Upload photo"
msgstr ""
-#: ../../include/conversation.php:1101
+#: ../../include/conversation.php:1102
msgid "upload photo"
msgstr ""
-#: ../../include/conversation.php:1102 ../../mod/mail.php:220
+#: ../../include/conversation.php:1103 ../../mod/mail.php:220
#: ../../mod/mail.php:333 ../../mod/editlayout.php:108
-#: ../../mod/editpost.php:100 ../../mod/editwebpage.php:146
+#: ../../mod/editpost.php:105 ../../mod/editwebpage.php:146
#: ../../mod/editblock.php:122
msgid "Attach file"
msgstr ""
-#: ../../include/conversation.php:1103
+#: ../../include/conversation.php:1104
msgid "attach file"
msgstr ""
-#: ../../include/conversation.php:1104 ../../mod/mail.php:221
+#: ../../include/conversation.php:1105 ../../mod/mail.php:221
#: ../../mod/mail.php:334 ../../mod/editlayout.php:109
-#: ../../mod/editpost.php:101 ../../mod/editwebpage.php:147
+#: ../../mod/editpost.php:106 ../../mod/editwebpage.php:147
#: ../../mod/editblock.php:123
msgid "Insert web link"
msgstr ""
-#: ../../include/conversation.php:1105
+#: ../../include/conversation.php:1106
msgid "web link"
msgstr ""
-#: ../../include/conversation.php:1106
+#: ../../include/conversation.php:1107
msgid "Insert video link"
msgstr ""
-#: ../../include/conversation.php:1107
+#: ../../include/conversation.php:1108
msgid "video link"
msgstr ""
-#: ../../include/conversation.php:1108
+#: ../../include/conversation.php:1109
msgid "Insert audio link"
msgstr ""
-#: ../../include/conversation.php:1109
+#: ../../include/conversation.php:1110
msgid "audio link"
msgstr ""
-#: ../../include/conversation.php:1110 ../../mod/editlayout.php:113
-#: ../../mod/editpost.php:105 ../../mod/editwebpage.php:151
+#: ../../include/conversation.php:1111 ../../mod/editlayout.php:113
+#: ../../mod/editpost.php:110 ../../mod/editwebpage.php:151
#: ../../mod/editblock.php:127
msgid "Set your location"
msgstr ""
-#: ../../include/conversation.php:1111
+#: ../../include/conversation.php:1112
msgid "set location"
msgstr ""
-#: ../../include/conversation.php:1112 ../../mod/editlayout.php:114
-#: ../../mod/editpost.php:106 ../../mod/editwebpage.php:152
+#: ../../include/conversation.php:1113 ../../mod/editlayout.php:114
+#: ../../mod/editpost.php:111 ../../mod/editwebpage.php:152
#: ../../mod/editblock.php:128
msgid "Clear browser location"
msgstr ""
-#: ../../include/conversation.php:1113
+#: ../../include/conversation.php:1114
msgid "clear location"
msgstr ""
-#: ../../include/conversation.php:1115 ../../mod/editlayout.php:127
-#: ../../mod/editpost.php:119 ../../mod/editwebpage.php:169
+#: ../../include/conversation.php:1116 ../../mod/editlayout.php:127
+#: ../../mod/editpost.php:124 ../../mod/editwebpage.php:169
#: ../../mod/editblock.php:142
msgid "Set title"
msgstr ""
-#: ../../include/conversation.php:1118 ../../mod/editlayout.php:130
-#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:171
+#: ../../include/conversation.php:1119 ../../mod/editlayout.php:130
+#: ../../mod/editpost.php:126 ../../mod/editwebpage.php:171
#: ../../mod/editblock.php:145
msgid "Categories (comma-separated list)"
msgstr ""
-#: ../../include/conversation.php:1120 ../../mod/editlayout.php:116
-#: ../../mod/editpost.php:108 ../../mod/editwebpage.php:154
+#: ../../include/conversation.php:1121 ../../mod/editlayout.php:116
+#: ../../mod/editpost.php:113 ../../mod/editwebpage.php:154
#: ../../mod/editblock.php:130
msgid "Permission settings"
msgstr ""
-#: ../../include/conversation.php:1121
+#: ../../include/conversation.php:1122
msgid "permissions"
msgstr ""
-#: ../../include/conversation.php:1129 ../../mod/editlayout.php:124
-#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:164
+#: ../../include/conversation.php:1130 ../../mod/editlayout.php:124
+#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:164
#: ../../mod/editblock.php:139
msgid "Public post"
msgstr ""
-#: ../../include/conversation.php:1131 ../../mod/editlayout.php:131
-#: ../../mod/editpost.php:122 ../../mod/editwebpage.php:172
+#: ../../include/conversation.php:1132 ../../mod/editlayout.php:131
+#: ../../mod/editpost.php:127 ../../mod/editwebpage.php:172
#: ../../mod/editblock.php:146
msgid "Example: bob@example.com, mary@example.com"
msgstr ""
-#: ../../include/conversation.php:1144 ../../mod/mail.php:226
+#: ../../include/conversation.php:1145 ../../mod/mail.php:226
#: ../../mod/mail.php:339 ../../mod/editlayout.php:141
-#: ../../mod/editpost.php:133 ../../mod/editwebpage.php:182
+#: ../../mod/editpost.php:138 ../../mod/editwebpage.php:182
#: ../../mod/editblock.php:156
msgid "Set expiration date"
msgstr ""
-#: ../../include/conversation.php:1148 ../../mod/editpost.php:136
+#: ../../include/conversation.php:1149 ../../mod/editpost.php:142
msgid "OK"
msgstr ""
-#: ../../include/conversation.php:1149 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../mod/settings.php:508
-#: ../../mod/settings.php:534 ../../mod/editpost.php:137
+#: ../../include/conversation.php:1150 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:94 ../../mod/settings.php:510
+#: ../../mod/settings.php:536 ../../mod/editpost.php:143
#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117
msgid "Cancel"
msgstr ""
-#: ../../include/conversation.php:1380
+#: ../../include/conversation.php:1381
msgid "Commented Order"
msgstr ""
-#: ../../include/conversation.php:1383
+#: ../../include/conversation.php:1384
msgid "Sort by Comment Date"
msgstr ""
-#: ../../include/conversation.php:1386
+#: ../../include/conversation.php:1387
msgid "Posted Order"
msgstr ""
-#: ../../include/conversation.php:1389
+#: ../../include/conversation.php:1390
msgid "Sort by Post Date"
msgstr ""
-#: ../../include/conversation.php:1393
+#: ../../include/conversation.php:1394
msgid "Personal"
msgstr ""
-#: ../../include/conversation.php:1396
+#: ../../include/conversation.php:1397
msgid "Posts that mention or involve you"
msgstr ""
-#: ../../include/conversation.php:1399 ../../mod/menu.php:57
+#: ../../include/conversation.php:1400 ../../mod/menu.php:57
#: ../../mod/connections.php:209
msgid "New"
msgstr ""
-#: ../../include/conversation.php:1402
+#: ../../include/conversation.php:1403
msgid "Activity Stream - by date"
msgstr ""
-#: ../../include/conversation.php:1409
+#: ../../include/conversation.php:1410
msgid "Starred"
msgstr ""
-#: ../../include/conversation.php:1412
+#: ../../include/conversation.php:1413
msgid "Favourite Posts"
msgstr ""
-#: ../../include/conversation.php:1419
+#: ../../include/conversation.php:1420
msgid "Spam"
msgstr ""
-#: ../../include/conversation.php:1422
+#: ../../include/conversation.php:1423
msgid "Posts flagged as SPAM"
msgstr ""
-#: ../../include/conversation.php:1453
+#: ../../include/conversation.php:1454
msgid "Channel"
msgstr ""
-#: ../../include/conversation.php:1456
+#: ../../include/conversation.php:1457
msgid "Status Messages and Posts"
msgstr ""
-#: ../../include/conversation.php:1465
+#: ../../include/conversation.php:1466
msgid "About"
msgstr ""
-#: ../../include/conversation.php:1468
+#: ../../include/conversation.php:1469
msgid "Profile Details"
msgstr ""
-#: ../../include/conversation.php:1483 ../../mod/fbrowser.php:114
+#: ../../include/conversation.php:1484 ../../mod/fbrowser.php:114
msgid "Files"
msgstr ""
-#: ../../include/conversation.php:1486
+#: ../../include/conversation.php:1487
msgid "Files and Storage"
msgstr ""
-#: ../../include/conversation.php:1495
+#: ../../include/conversation.php:1496
msgid "Events and Calendar"
msgstr ""
-#: ../../include/conversation.php:1502
+#: ../../include/conversation.php:1503
msgid "Webpages"
msgstr ""
-#: ../../include/conversation.php:1505
+#: ../../include/conversation.php:1506
msgid "Manage Webpages"
msgstr ""
@@ -3328,7 +3347,7 @@ msgid ""
"com"
msgstr ""
-#: ../../mod/cloud.php:88
+#: ../../mod/cloud.php:112
msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
msgstr ""
@@ -3428,12 +3447,12 @@ msgid "View recent posts and comments"
msgstr ""
#: ../../mod/connedit.php:330 ../../mod/connedit.php:472
-#: ../../mod/admin.php:697
+#: ../../mod/admin.php:747
msgid "Unblock"
msgstr ""
#: ../../mod/connedit.php:330 ../../mod/connedit.php:472
-#: ../../mod/admin.php:696
+#: ../../mod/admin.php:746
msgid "Block"
msgstr ""
@@ -3679,13 +3698,13 @@ msgid ""
"and/or create new posts for you?"
msgstr ""
-#: ../../mod/api.php:105 ../../mod/profiles.php:483 ../../mod/settings.php:865
-#: ../../mod/settings.php:870
+#: ../../mod/api.php:105 ../../mod/profiles.php:483 ../../mod/settings.php:870
+#: ../../mod/settings.php:875
msgid "Yes"
msgstr ""
-#: ../../mod/api.php:106 ../../mod/profiles.php:484 ../../mod/settings.php:865
-#: ../../mod/settings.php:870
+#: ../../mod/api.php:106 ../../mod/profiles.php:484 ../../mod/settings.php:870
+#: ../../mod/settings.php:875
msgid "No"
msgstr ""
@@ -3707,7 +3726,7 @@ msgid "Channel not found."
msgstr ""
#: ../../mod/page.php:83 ../../mod/help.php:71 ../../mod/display.php:100
-#: ../../index.php:227
+#: ../../index.php:226
msgid "Page not found."
msgstr ""
@@ -4059,7 +4078,7 @@ msgid ""
"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
msgstr ""
-#: ../../mod/rpost.php:84 ../../mod/editpost.php:42
+#: ../../mod/rpost.php:86 ../../mod/editpost.php:42
msgid "Edit post"
msgstr ""
@@ -4259,521 +4278,531 @@ msgstr ""
msgid "Theme settings updated."
msgstr ""
-#: ../../mod/admin.php:87 ../../mod/admin.php:419
+#: ../../mod/admin.php:88 ../../mod/admin.php:430
msgid "Site"
msgstr ""
-#: ../../mod/admin.php:88 ../../mod/admin.php:687 ../../mod/admin.php:699
+#: ../../mod/admin.php:89 ../../mod/admin.php:737 ../../mod/admin.php:749
msgid "Users"
msgstr ""
-#: ../../mod/admin.php:89 ../../mod/admin.php:785 ../../mod/admin.php:827
+#: ../../mod/admin.php:90 ../../mod/admin.php:835 ../../mod/admin.php:877
msgid "Plugins"
msgstr ""
-#: ../../mod/admin.php:90 ../../mod/admin.php:990 ../../mod/admin.php:1026
+#: ../../mod/admin.php:91 ../../mod/admin.php:1040 ../../mod/admin.php:1076
msgid "Themes"
msgstr ""
-#: ../../mod/admin.php:91 ../../mod/admin.php:479
+#: ../../mod/admin.php:92 ../../mod/admin.php:529
msgid "Server"
msgstr ""
-#: ../../mod/admin.php:92
+#: ../../mod/admin.php:93
msgid "DB updates"
msgstr ""
-#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1113
+#: ../../mod/admin.php:107 ../../mod/admin.php:114 ../../mod/admin.php:1163
msgid "Logs"
msgstr ""
-#: ../../mod/admin.php:112
+#: ../../mod/admin.php:113
msgid "Plugin Features"
msgstr ""
-#: ../../mod/admin.php:114
+#: ../../mod/admin.php:115
msgid "User registrations waiting for confirmation"
msgstr ""
-#: ../../mod/admin.php:188
+#: ../../mod/admin.php:189
msgid "Message queues"
msgstr ""
-#: ../../mod/admin.php:193 ../../mod/admin.php:418 ../../mod/admin.php:478
-#: ../../mod/admin.php:686 ../../mod/admin.php:784 ../../mod/admin.php:826
-#: ../../mod/admin.php:989 ../../mod/admin.php:1025 ../../mod/admin.php:1112
+#: ../../mod/admin.php:194 ../../mod/admin.php:429 ../../mod/admin.php:528
+#: ../../mod/admin.php:736 ../../mod/admin.php:834 ../../mod/admin.php:876
+#: ../../mod/admin.php:1039 ../../mod/admin.php:1075 ../../mod/admin.php:1162
msgid "Administration"
msgstr ""
-#: ../../mod/admin.php:194
+#: ../../mod/admin.php:195
msgid "Summary"
msgstr ""
-#: ../../mod/admin.php:196
+#: ../../mod/admin.php:197
msgid "Registered users"
msgstr ""
-#: ../../mod/admin.php:198 ../../mod/admin.php:482
+#: ../../mod/admin.php:199 ../../mod/admin.php:532
msgid "Pending registrations"
msgstr ""
-#: ../../mod/admin.php:199
+#: ../../mod/admin.php:200
msgid "Version"
msgstr ""
-#: ../../mod/admin.php:201 ../../mod/admin.php:483
+#: ../../mod/admin.php:202 ../../mod/admin.php:533
msgid "Active plugins"
msgstr ""
-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:350
msgid "Site settings updated."
msgstr ""
-#: ../../mod/admin.php:371 ../../mod/settings.php:700
+#: ../../mod/admin.php:379 ../../mod/settings.php:702
msgid "No special theme for mobile devices"
msgstr ""
-#: ../../mod/admin.php:373
+#: ../../mod/admin.php:381
msgid "No special theme for accessibility"
msgstr ""
-#: ../../mod/admin.php:398
+#: ../../mod/admin.php:409
msgid "Closed"
msgstr ""
-#: ../../mod/admin.php:399
+#: ../../mod/admin.php:410
msgid "Requires approval"
msgstr ""
-#: ../../mod/admin.php:400
+#: ../../mod/admin.php:411
msgid "Open"
msgstr ""
-#: ../../mod/admin.php:405
+#: ../../mod/admin.php:416
msgid "Private"
msgstr ""
-#: ../../mod/admin.php:406
+#: ../../mod/admin.php:417
msgid "Paid Access"
msgstr ""
-#: ../../mod/admin.php:407
+#: ../../mod/admin.php:418
msgid "Free Access"
msgstr ""
-#: ../../mod/admin.php:408
+#: ../../mod/admin.php:419
msgid "Tiered Access"
msgstr ""
-#: ../../mod/admin.php:421 ../../mod/register.php:189
+#: ../../mod/admin.php:432 ../../mod/register.php:189
msgid "Registration"
msgstr ""
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:433
msgid "File upload"
msgstr ""
-#: ../../mod/admin.php:423
+#: ../../mod/admin.php:434
msgid "Policies"
msgstr ""
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:435
msgid "Advanced"
msgstr ""
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:439
msgid "Site name"
msgstr ""
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:440
msgid "Banner/Logo"
msgstr ""
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:441
+msgid "Administrator Information"
+msgstr ""
+
+#: ../../mod/admin.php:441
+msgid ""
+"Contact information for site administrators. Displayed on siteinfo page. "
+"BBCode can be used here"
+msgstr ""
+
+#: ../../mod/admin.php:442
msgid "System language"
msgstr ""
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:443
msgid "System theme"
msgstr ""
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:443
msgid ""
"Default system theme - may be over-ridden by user profiles - change theme settings"
msgstr ""
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:444
msgid "Mobile system theme"
msgstr ""
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:444
msgid "Theme for mobile devices"
msgstr ""
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:445
msgid "Accessibility system theme"
msgstr ""
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:445
msgid "Accessibility theme"
msgstr ""
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:446
msgid "Channel to use for this website's static pages"
msgstr ""
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:446
msgid "Site Channel"
msgstr ""
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:448
msgid "Maximum image size"
msgstr ""
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:448
msgid ""
"Maximum size in bytes of uploaded images. Default is 0, which means no "
"limits."
msgstr ""
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:449
msgid "Register policy"
msgstr ""
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:450
msgid "Access policy"
msgstr ""
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:451
msgid "Register text"
msgstr ""
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:451
msgid "Will be displayed prominently on the registration page."
msgstr ""
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:452
msgid "Accounts abandoned after x days"
msgstr ""
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:452
msgid ""
"Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit."
msgstr ""
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:453
msgid "Allowed friend domains"
msgstr ""
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:453
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:442
+#: ../../mod/admin.php:454
msgid "Allowed email domains"
msgstr ""
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:454
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:443
+#: ../../mod/admin.php:455
msgid "Block public"
msgstr ""
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:455
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:444
+#: ../../mod/admin.php:456
msgid "Force publish"
msgstr ""
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:456
msgid ""
"Check to force all profiles on this site to be listed in the site directory."
msgstr ""
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
msgid "No login on Homepage"
msgstr ""
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
msgid ""
"Check to hide the login form from your sites homepage when visitors arrive "
"who are not logged in (e.g. when you put the content of the homepage in via "
"the site channel)."
msgstr ""
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:459
msgid "Proxy user"
msgstr ""
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:460
msgid "Proxy URL"
msgstr ""
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:461
msgid "Network timeout"
msgstr ""
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:461
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr ""
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
msgid "Delivery interval"
msgstr ""
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
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:451
+#: ../../mod/admin.php:463
msgid "Poll interval"
msgstr ""
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
msgid ""
"Delay background polling processes by this many seconds to reduce system "
"load. If 0, use delivery interval."
msgstr ""
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:464
msgid "Maximum Load Average"
msgstr ""
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:464
msgid ""
"Maximum system load before delivery and poll processes are deferred - "
"default 50."
msgstr ""
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:520
msgid "No server found"
msgstr ""
-#: ../../mod/admin.php:477 ../../mod/admin.php:700
+#: ../../mod/admin.php:527 ../../mod/admin.php:750
msgid "ID"
msgstr ""
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:527
msgid "for channel"
msgstr ""
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:527
msgid "on server"
msgstr ""
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:527
msgid "Status"
msgstr ""
-#: ../../mod/admin.php:498
+#: ../../mod/admin.php:548
msgid "Update has been marked successful"
msgstr ""
-#: ../../mod/admin.php:508
+#: ../../mod/admin.php:558
#, php-format
msgid "Executing %s failed. Check system logs."
msgstr ""
-#: ../../mod/admin.php:511
+#: ../../mod/admin.php:561
#, php-format
msgid "Update %s was successfully applied."
msgstr ""
-#: ../../mod/admin.php:515
+#: ../../mod/admin.php:565
#, php-format
msgid "Update %s did not return a status. Unknown if it succeeded."
msgstr ""
-#: ../../mod/admin.php:518
+#: ../../mod/admin.php:568
#, php-format
msgid "Update function %s could not be found."
msgstr ""
-#: ../../mod/admin.php:533
+#: ../../mod/admin.php:583
msgid "No failed updates."
msgstr ""
-#: ../../mod/admin.php:537
+#: ../../mod/admin.php:587
msgid "Failed Updates"
msgstr ""
-#: ../../mod/admin.php:539
+#: ../../mod/admin.php:589
msgid "Mark success (if update was manually applied)"
msgstr ""
-#: ../../mod/admin.php:540
+#: ../../mod/admin.php:590
msgid "Attempt to execute this update step automatically"
msgstr ""
-#: ../../mod/admin.php:566
+#: ../../mod/admin.php:616
#, php-format
msgid "%s user blocked/unblocked"
msgid_plural "%s users blocked/unblocked"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/admin.php:573
+#: ../../mod/admin.php:623
#, php-format
msgid "%s user deleted"
msgid_plural "%s users deleted"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/admin.php:604
+#: ../../mod/admin.php:654
msgid "Account not found"
msgstr ""
-#: ../../mod/admin.php:615
+#: ../../mod/admin.php:665
#, php-format
msgid "User '%s' deleted"
msgstr ""
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:674
#, php-format
msgid "User '%s' unblocked"
msgstr ""
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:674
#, php-format
msgid "User '%s' blocked"
msgstr ""
-#: ../../mod/admin.php:689
+#: ../../mod/admin.php:739
msgid "select all"
msgstr ""
-#: ../../mod/admin.php:690
+#: ../../mod/admin.php:740
msgid "User registrations waiting for confirm"
msgstr ""
-#: ../../mod/admin.php:691
+#: ../../mod/admin.php:741
msgid "Request date"
msgstr ""
-#: ../../mod/admin.php:692
+#: ../../mod/admin.php:742
msgid "No registrations."
msgstr ""
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:743
msgid "Approve"
msgstr ""
-#: ../../mod/admin.php:694
+#: ../../mod/admin.php:744
msgid "Deny"
msgstr ""
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:750
msgid "Register date"
msgstr ""
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:750
msgid "Last login"
msgstr ""
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:750
msgid "Expires"
msgstr ""
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:750
msgid "Service Class"
msgstr ""
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:752
msgid ""
"Selected users will be deleted!\\n\\nEverything these users had posted on "
"this site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../mod/admin.php:703
+#: ../../mod/admin.php:753
msgid ""
"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
"site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../mod/admin.php:744
+#: ../../mod/admin.php:794
#, php-format
msgid "Plugin %s disabled."
msgstr ""
-#: ../../mod/admin.php:748
+#: ../../mod/admin.php:798
#, php-format
msgid "Plugin %s enabled."
msgstr ""
-#: ../../mod/admin.php:758 ../../mod/admin.php:960
+#: ../../mod/admin.php:808 ../../mod/admin.php:1010
msgid "Disable"
msgstr ""
-#: ../../mod/admin.php:760 ../../mod/admin.php:962
+#: ../../mod/admin.php:810 ../../mod/admin.php:1012
msgid "Enable"
msgstr ""
-#: ../../mod/admin.php:786 ../../mod/admin.php:991
+#: ../../mod/admin.php:836 ../../mod/admin.php:1041
msgid "Toggle"
msgstr ""
-#: ../../mod/admin.php:794 ../../mod/admin.php:1001
+#: ../../mod/admin.php:844 ../../mod/admin.php:1051
msgid "Author: "
msgstr ""
-#: ../../mod/admin.php:795 ../../mod/admin.php:1002
+#: ../../mod/admin.php:845 ../../mod/admin.php:1052
msgid "Maintainer: "
msgstr ""
-#: ../../mod/admin.php:924
+#: ../../mod/admin.php:974
msgid "No themes found."
msgstr ""
-#: ../../mod/admin.php:983
+#: ../../mod/admin.php:1033
msgid "Screenshot"
msgstr ""
-#: ../../mod/admin.php:1031
+#: ../../mod/admin.php:1081
msgid "[Experimental]"
msgstr ""
-#: ../../mod/admin.php:1032
+#: ../../mod/admin.php:1082
msgid "[Unsupported]"
msgstr ""
-#: ../../mod/admin.php:1059
+#: ../../mod/admin.php:1109
msgid "Log settings updated."
msgstr ""
-#: ../../mod/admin.php:1115
+#: ../../mod/admin.php:1165
msgid "Clear"
msgstr ""
-#: ../../mod/admin.php:1121
+#: ../../mod/admin.php:1171
msgid "Debugging"
msgstr ""
-#: ../../mod/admin.php:1122
+#: ../../mod/admin.php:1172
msgid "Log file"
msgstr ""
-#: ../../mod/admin.php:1122
+#: ../../mod/admin.php:1172
msgid ""
"Must be writable by web server. Relative to your Red top-level directory."
msgstr ""
-#: ../../mod/admin.php:1123
+#: ../../mod/admin.php:1173
msgid "Log level"
msgstr ""
@@ -4798,7 +4827,7 @@ msgid "Unable to add menu element."
msgstr ""
#: ../../mod/mitem.php:78 ../../mod/xchan.php:25 ../../mod/menu.php:113
-#: ../../mod/dirprofile.php:177
+#: ../../mod/dirprofile.php:181
msgid "Not found."
msgstr ""
@@ -4846,7 +4875,7 @@ msgstr ""
msgid "Menu Item Permissions"
msgstr ""
-#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:930
+#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:937
msgid "(click to open/close)"
msgstr ""
@@ -4958,7 +4987,7 @@ msgstr ""
msgid "Delete Album"
msgstr ""
-#: ../../mod/photos.php:159 ../../mod/photos.php:930
+#: ../../mod/photos.php:159 ../../mod/photos.php:934
msgid "Delete Photo"
msgstr ""
@@ -4996,13 +5025,13 @@ msgstr ""
msgid "Do not show a status post for this upload"
msgstr ""
-#: ../../mod/photos.php:603 ../../mod/photos.php:925
-#: ../../mod/filestorage.php:125
+#: ../../mod/photos.php:603 ../../mod/photos.php:929
+#: ../../mod/filestorage.php:124
msgid "Permissions"
msgstr ""
-#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1101
-#: ../../mod/photos.php:1116
+#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1105
+#: ../../mod/photos.php:1120
msgid "Contact Photos"
msgstr ""
@@ -5018,7 +5047,7 @@ msgstr ""
msgid "Show Oldest First"
msgstr ""
-#: ../../mod/photos.php:729 ../../mod/photos.php:1148
+#: ../../mod/photos.php:729 ../../mod/photos.php:1152
msgid "View Photo"
msgstr ""
@@ -5030,50 +5059,62 @@ msgstr ""
msgid "Photo not available"
msgstr ""
-#: ../../mod/photos.php:835
+#: ../../mod/photos.php:837
msgid "Use as profile photo"
msgstr ""
-#: ../../mod/photos.php:859
+#: ../../mod/photos.php:861
msgid "View Full Size"
msgstr ""
-#: ../../mod/photos.php:913
+#: ../../mod/photos.php:917
msgid "Edit photo"
msgstr ""
-#: ../../mod/photos.php:915
+#: ../../mod/photos.php:919
msgid "Rotate CW (right)"
msgstr ""
-#: ../../mod/photos.php:916
+#: ../../mod/photos.php:920
msgid "Rotate CCW (left)"
msgstr ""
-#: ../../mod/photos.php:918
+#: ../../mod/photos.php:922
msgid "New album name"
msgstr ""
-#: ../../mod/photos.php:921
+#: ../../mod/photos.php:925
msgid "Caption"
msgstr ""
-#: ../../mod/photos.php:923
+#: ../../mod/photos.php:927
msgid "Add a Tag"
msgstr ""
-#: ../../mod/photos.php:927
+#: ../../mod/photos.php:931
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr ""
-#: ../../mod/photos.php:1154
+#: ../../mod/photos.php:1158
msgid "View Album"
msgstr ""
-#: ../../mod/photos.php:1163
+#: ../../mod/photos.php:1167
msgid "Recent Photos"
msgstr ""
+#: ../../mod/chat.php:18 ../../mod/channel.php:25
+msgid "You must be logged in to see this page."
+msgstr ""
+
+#: ../../mod/chat.php:130
+msgid "New Chatroom"
+msgstr ""
+
+#: ../../mod/chat.php:131
+msgid "Chatroom Name"
+msgstr ""
+
#: ../../mod/filer.php:35
msgid "- select -"
msgstr ""
@@ -5160,11 +5201,11 @@ msgid "Welcome to %s"
msgstr ""
#: ../../mod/directory.php:143 ../../mod/profiles.php:561
-#: ../../mod/dirprofile.php:95
+#: ../../mod/dirprofile.php:98
msgid "Age: "
msgstr ""
-#: ../../mod/directory.php:146 ../../mod/dirprofile.php:98
+#: ../../mod/directory.php:146 ../../mod/dirprofile.php:101
msgid "Gender: "
msgstr ""
@@ -5277,7 +5318,7 @@ msgstr ""
msgid "Help:"
msgstr ""
-#: ../../mod/help.php:68 ../../index.php:224
+#: ../../mod/help.php:68 ../../index.php:223
msgid "Not Found"
msgstr ""
@@ -5336,6 +5377,53 @@ msgstr ""
msgid "This site is not a directory server"
msgstr ""
+#: ../../mod/siteinfo.php:57
+#, php-format
+msgid "Version %s"
+msgstr ""
+
+#: ../../mod/siteinfo.php:76
+msgid "Installed plugins/addons/apps:"
+msgstr ""
+
+#: ../../mod/siteinfo.php:89
+msgid "No installed plugins/addons/apps"
+msgstr ""
+
+#: ../../mod/siteinfo.php:94
+msgid "Red"
+msgstr ""
+
+#: ../../mod/siteinfo.php:95
+msgid ""
+"This is a hub of the Red Matrix - a global cooperative network of "
+"decentralised privacy enhanced websites."
+msgstr ""
+
+#: ../../mod/siteinfo.php:98
+msgid "Running at web location"
+msgstr ""
+
+#: ../../mod/siteinfo.php:99
+msgid ""
+"Please visit GetZot.com to learn more "
+"about the Red Matrix."
+msgstr ""
+
+#: ../../mod/siteinfo.php:100
+msgid "Bug reports and issues: please visit"
+msgstr ""
+
+#: ../../mod/siteinfo.php:103
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"redmatrix\" at "
+"librelist - dot com"
+msgstr ""
+
+#: ../../mod/siteinfo.php:104
+msgid "Site Administrators"
+msgstr ""
+
#: ../../mod/lockview.php:34
msgid "Remote privacy information not available."
msgstr ""
@@ -5633,43 +5721,43 @@ msgstr ""
msgid "Permission Denied."
msgstr ""
-#: ../../mod/filestorage.php:86
+#: ../../mod/filestorage.php:85
msgid "File not found."
msgstr ""
-#: ../../mod/filestorage.php:120
+#: ../../mod/filestorage.php:119
msgid "Edit file permissions"
msgstr ""
-#: ../../mod/filestorage.php:127
+#: ../../mod/filestorage.php:126
msgid "Include all files and sub folders"
msgstr ""
-#: ../../mod/filestorage.php:128
+#: ../../mod/filestorage.php:127
msgid "Return to file list"
msgstr ""
-#: ../../mod/filestorage.php:130
+#: ../../mod/filestorage.php:129
msgid "Copy/paste this code to attach file to a post"
msgstr ""
-#: ../../mod/filestorage.php:131
+#: ../../mod/filestorage.php:130
msgid "Copy/paste this URL to link file from a web page"
msgstr ""
-#: ../../mod/filestorage.php:168
+#: ../../mod/filestorage.php:167
msgid "Download"
msgstr ""
-#: ../../mod/filestorage.php:174
+#: ../../mod/filestorage.php:173
msgid "Used: "
msgstr ""
-#: ../../mod/filestorage.php:175
+#: ../../mod/filestorage.php:174
msgid "[directory]"
msgstr ""
-#: ../../mod/filestorage.php:177
+#: ../../mod/filestorage.php:176
msgid "Limit: "
msgstr ""
@@ -5888,7 +5976,7 @@ msgstr ""
msgid "Key and Secret are required"
msgstr ""
-#: ../../mod/settings.php:79 ../../mod/settings.php:533
+#: ../../mod/settings.php:79 ../../mod/settings.php:535
msgid "Update"
msgstr ""
@@ -5920,333 +6008,341 @@ msgstr ""
msgid "System failure storing new email. Please try again."
msgstr ""
-#: ../../mod/settings.php:435
+#: ../../mod/settings.php:437
msgid "Settings updated."
msgstr ""
-#: ../../mod/settings.php:506 ../../mod/settings.php:532
-#: ../../mod/settings.php:568
+#: ../../mod/settings.php:508 ../../mod/settings.php:534
+#: ../../mod/settings.php:570
msgid "Add application"
msgstr ""
-#: ../../mod/settings.php:509 ../../mod/settings.php:535
+#: ../../mod/settings.php:511 ../../mod/settings.php:537
msgid "Name"
msgstr ""
-#: ../../mod/settings.php:509
+#: ../../mod/settings.php:511
msgid "Name of application"
msgstr ""
-#: ../../mod/settings.php:510 ../../mod/settings.php:536
+#: ../../mod/settings.php:512 ../../mod/settings.php:538
msgid "Consumer Key"
msgstr ""
-#: ../../mod/settings.php:510 ../../mod/settings.php:511
+#: ../../mod/settings.php:512 ../../mod/settings.php:513
msgid "Automatically generated - change if desired. Max length 20"
msgstr ""
-#: ../../mod/settings.php:511 ../../mod/settings.php:537
+#: ../../mod/settings.php:513 ../../mod/settings.php:539
msgid "Consumer Secret"
msgstr ""
-#: ../../mod/settings.php:512 ../../mod/settings.php:538
+#: ../../mod/settings.php:514 ../../mod/settings.php:540
msgid "Redirect"
msgstr ""
-#: ../../mod/settings.php:512
+#: ../../mod/settings.php:514
msgid ""
"Redirect URI - leave blank unless your application specifically requires this"
msgstr ""
-#: ../../mod/settings.php:513 ../../mod/settings.php:539
+#: ../../mod/settings.php:515 ../../mod/settings.php:541
msgid "Icon url"
msgstr ""
-#: ../../mod/settings.php:513
+#: ../../mod/settings.php:515
msgid "Optional"
msgstr ""
-#: ../../mod/settings.php:524
+#: ../../mod/settings.php:526
msgid "You can't edit this application."
msgstr ""
-#: ../../mod/settings.php:567
+#: ../../mod/settings.php:569
msgid "Connected Apps"
msgstr ""
-#: ../../mod/settings.php:571
+#: ../../mod/settings.php:573
msgid "Client key starts with"
msgstr ""
-#: ../../mod/settings.php:572
+#: ../../mod/settings.php:574
msgid "No name"
msgstr ""
-#: ../../mod/settings.php:573
+#: ../../mod/settings.php:575
msgid "Remove authorization"
msgstr ""
-#: ../../mod/settings.php:584
+#: ../../mod/settings.php:586
msgid "No feature settings configured"
msgstr ""
-#: ../../mod/settings.php:592
+#: ../../mod/settings.php:594
msgid "Feature Settings"
msgstr ""
-#: ../../mod/settings.php:615
+#: ../../mod/settings.php:617
msgid "Account Settings"
msgstr ""
-#: ../../mod/settings.php:616
+#: ../../mod/settings.php:618
msgid "Password Settings"
msgstr ""
-#: ../../mod/settings.php:617
+#: ../../mod/settings.php:619
msgid "New Password:"
msgstr ""
-#: ../../mod/settings.php:618
+#: ../../mod/settings.php:620
msgid "Confirm:"
msgstr ""
-#: ../../mod/settings.php:618
+#: ../../mod/settings.php:620
msgid "Leave password fields blank unless changing"
msgstr ""
-#: ../../mod/settings.php:620 ../../mod/settings.php:912
+#: ../../mod/settings.php:622 ../../mod/settings.php:917
msgid "Email Address:"
msgstr ""
-#: ../../mod/settings.php:621
+#: ../../mod/settings.php:623
msgid "Remove Account"
msgstr ""
-#: ../../mod/settings.php:622
+#: ../../mod/settings.php:624
msgid "Warning: This action is permanent and cannot be reversed."
msgstr ""
-#: ../../mod/settings.php:638
+#: ../../mod/settings.php:640
msgid "Off"
msgstr ""
-#: ../../mod/settings.php:638
+#: ../../mod/settings.php:640
msgid "On"
msgstr ""
-#: ../../mod/settings.php:645
+#: ../../mod/settings.php:647
msgid "Additional Features"
msgstr ""
-#: ../../mod/settings.php:670
+#: ../../mod/settings.php:672
msgid "Connector Settings"
msgstr ""
-#: ../../mod/settings.php:740
+#: ../../mod/settings.php:742
msgid "Display Settings"
msgstr ""
-#: ../../mod/settings.php:746
+#: ../../mod/settings.php:748
msgid "Display Theme:"
msgstr ""
-#: ../../mod/settings.php:747
+#: ../../mod/settings.php:749
msgid "Mobile Theme:"
msgstr ""
-#: ../../mod/settings.php:748
+#: ../../mod/settings.php:750
msgid "Update browser every xx seconds"
msgstr ""
-#: ../../mod/settings.php:748
+#: ../../mod/settings.php:750
msgid "Minimum of 10 seconds, no maximum"
msgstr ""
-#: ../../mod/settings.php:749
+#: ../../mod/settings.php:751
msgid "Maximum number of conversations to load at any time:"
msgstr ""
-#: ../../mod/settings.php:749
+#: ../../mod/settings.php:751
msgid "Maximum of 100 items"
msgstr ""
-#: ../../mod/settings.php:750
+#: ../../mod/settings.php:752
msgid "Don't show emoticons"
msgstr ""
-#: ../../mod/settings.php:786
+#: ../../mod/settings.php:788
msgid "Nobody except yourself"
msgstr ""
-#: ../../mod/settings.php:787
+#: ../../mod/settings.php:789
msgid "Only those you specifically allow"
msgstr ""
-#: ../../mod/settings.php:788
+#: ../../mod/settings.php:790
msgid "Anybody in your address book"
msgstr ""
-#: ../../mod/settings.php:789
+#: ../../mod/settings.php:791
msgid "Anybody on this website"
msgstr ""
-#: ../../mod/settings.php:790
+#: ../../mod/settings.php:792
msgid "Anybody in this network"
msgstr ""
-#: ../../mod/settings.php:791
+#: ../../mod/settings.php:793
msgid "Anybody on the internet"
msgstr ""
-#: ../../mod/settings.php:865
+#: ../../mod/settings.php:870
msgid "Publish your default profile in the network directory"
msgstr ""
-#: ../../mod/settings.php:870
+#: ../../mod/settings.php:875
msgid "Allow us to suggest you as a potential friend to new members?"
msgstr ""
-#: ../../mod/settings.php:874 ../../mod/profile_photo.php:288
+#: ../../mod/settings.php:879 ../../mod/profile_photo.php:288
msgid "or"
msgstr ""
-#: ../../mod/settings.php:879
+#: ../../mod/settings.php:884
msgid "Your channel address is"
msgstr ""
-#: ../../mod/settings.php:901
+#: ../../mod/settings.php:906
msgid "Channel Settings"
msgstr ""
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:915
msgid "Basic Settings"
msgstr ""
-#: ../../mod/settings.php:913
+#: ../../mod/settings.php:918
msgid "Your Timezone:"
msgstr ""
-#: ../../mod/settings.php:914
+#: ../../mod/settings.php:919
msgid "Default Post Location:"
msgstr ""
-#: ../../mod/settings.php:915
+#: ../../mod/settings.php:920
msgid "Use Browser Location:"
msgstr ""
-#: ../../mod/settings.php:917
+#: ../../mod/settings.php:922
msgid "Adult Content"
msgstr ""
-#: ../../mod/settings.php:917
+#: ../../mod/settings.php:922
msgid "This channel publishes adult content."
msgstr ""
-#: ../../mod/settings.php:919
+#: ../../mod/settings.php:924
msgid "Security and Privacy Settings"
msgstr ""
-#: ../../mod/settings.php:921
+#: ../../mod/settings.php:926
+msgid "Hide my online presence"
+msgstr ""
+
+#: ../../mod/settings.php:926
+msgid "Prevents showing if you are available for chat"
+msgstr ""
+
+#: ../../mod/settings.php:928
msgid "Quick Privacy Settings:"
msgstr ""
-#: ../../mod/settings.php:922
+#: ../../mod/settings.php:929
msgid "Very Public - extremely permissive"
msgstr ""
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:930
msgid "Typical - default public, privacy when desired"
msgstr ""
-#: ../../mod/settings.php:924
+#: ../../mod/settings.php:931
msgid "Private - default private, rarely open or public"
msgstr ""
-#: ../../mod/settings.php:925
+#: ../../mod/settings.php:932
msgid "Blocked - default blocked to/from everybody"
msgstr ""
-#: ../../mod/settings.php:928
+#: ../../mod/settings.php:935
msgid "Maximum Friend Requests/Day:"
msgstr ""
-#: ../../mod/settings.php:928
+#: ../../mod/settings.php:935
msgid "May reduce spam activity"
msgstr ""
-#: ../../mod/settings.php:929
+#: ../../mod/settings.php:936
msgid "Default Post Permissions"
msgstr ""
-#: ../../mod/settings.php:941
+#: ../../mod/settings.php:948
msgid "Maximum private messages per day from unknown people:"
msgstr ""
-#: ../../mod/settings.php:941
+#: ../../mod/settings.php:948
msgid "Useful to reduce spamming"
msgstr ""
-#: ../../mod/settings.php:944
+#: ../../mod/settings.php:951
msgid "Notification Settings"
msgstr ""
-#: ../../mod/settings.php:945
+#: ../../mod/settings.php:952
msgid "By default post a status message when:"
msgstr ""
-#: ../../mod/settings.php:946
+#: ../../mod/settings.php:953
msgid "accepting a friend request"
msgstr ""
-#: ../../mod/settings.php:947
+#: ../../mod/settings.php:954
msgid "joining a forum/community"
msgstr ""
-#: ../../mod/settings.php:948
+#: ../../mod/settings.php:955
msgid "making an interesting profile change"
msgstr ""
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:956
msgid "Send a notification email when:"
msgstr ""
-#: ../../mod/settings.php:950
+#: ../../mod/settings.php:957
msgid "You receive an introduction"
msgstr ""
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:958
msgid "Your introductions are confirmed"
msgstr ""
-#: ../../mod/settings.php:952
+#: ../../mod/settings.php:959
msgid "Someone writes on your profile wall"
msgstr ""
-#: ../../mod/settings.php:953
+#: ../../mod/settings.php:960
msgid "Someone writes a followup comment"
msgstr ""
-#: ../../mod/settings.php:954
+#: ../../mod/settings.php:961
msgid "You receive a private message"
msgstr ""
-#: ../../mod/settings.php:955
+#: ../../mod/settings.php:962
msgid "You receive a friend suggestion"
msgstr ""
-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:963
msgid "You are tagged in a post"
msgstr ""
-#: ../../mod/settings.php:957
+#: ../../mod/settings.php:964
msgid "You are poked/prodded/etc. in a post"
msgstr ""
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:967
msgid "Advanced Account/Page Type Settings"
msgstr ""
-#: ../../mod/settings.php:961
+#: ../../mod/settings.php:968
msgid "Change the behaviour of this account for special situations"
msgstr ""
@@ -6337,17 +6433,17 @@ msgstr ""
msgid "Delete layout?"
msgstr ""
-#: ../../mod/editlayout.php:110 ../../mod/editpost.php:102
+#: ../../mod/editlayout.php:110 ../../mod/editpost.php:107
#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
msgid "Insert YouTube video"
msgstr ""
-#: ../../mod/editlayout.php:111 ../../mod/editpost.php:103
+#: ../../mod/editlayout.php:111 ../../mod/editpost.php:108
#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
msgid "Insert Vorbis [.ogg] video"
msgstr ""
-#: ../../mod/editlayout.php:112 ../../mod/editpost.php:104
+#: ../../mod/editlayout.php:112 ../../mod/editpost.php:109
#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
msgid "Insert Vorbis [.ogg] audio"
msgstr ""
@@ -6508,10 +6604,6 @@ msgstr ""
msgid "Wall Photos"
msgstr ""
-#: ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
-msgstr ""
-
#: ../../mod/channel.php:85
msgid "Insufficient permissions. Request redirected to profile page."
msgstr ""
@@ -6573,49 +6665,6 @@ msgstr ""
msgid "Visible To"
msgstr ""
-#: ../../mod/siteinfo.php:57
-#, php-format
-msgid "Version %s"
-msgstr ""
-
-#: ../../mod/siteinfo.php:76
-msgid "Installed plugins/addons/apps:"
-msgstr ""
-
-#: ../../mod/siteinfo.php:89
-msgid "No installed plugins/addons/apps"
-msgstr ""
-
-#: ../../mod/siteinfo.php:92
-msgid "Red"
-msgstr ""
-
-#: ../../mod/siteinfo.php:93
-msgid ""
-"This is a hub of the Red Matrix - a global cooperative network of "
-"decentralised privacy enhanced websites."
-msgstr ""
-
-#: ../../mod/siteinfo.php:96
-msgid "Running at web location"
-msgstr ""
-
-#: ../../mod/siteinfo.php:97
-msgid ""
-"Please visit GetZot.com to learn more "
-"about the Red Matrix."
-msgstr ""
-
-#: ../../mod/siteinfo.php:98
-msgid "Bug reports and issues: please visit"
-msgstr ""
-
-#: ../../mod/siteinfo.php:101
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"redmatrix\" at "
-"librelist - dot com"
-msgstr ""
-
#: ../../mod/suggest.php:35
msgid ""
"No suggestions available. If this is a new site, please try again in 24 "
@@ -6799,39 +6848,39 @@ msgstr ""
msgid "Set your current mood and tell your friends"
msgstr ""
-#: ../../mod/ping.php:160
+#: ../../mod/ping.php:186
msgid "sent you a private message"
msgstr ""
-#: ../../mod/ping.php:218
+#: ../../mod/ping.php:244
msgid "added your channel"
msgstr ""
-#: ../../mod/ping.php:262
+#: ../../mod/ping.php:288
msgid "posted an event"
msgstr ""
-#: ../../mod/dirprofile.php:111
+#: ../../mod/dirprofile.php:114
msgid "Status: "
msgstr ""
-#: ../../mod/dirprofile.php:112
+#: ../../mod/dirprofile.php:115
msgid "Sexual Preference: "
msgstr ""
-#: ../../mod/dirprofile.php:114
+#: ../../mod/dirprofile.php:117
msgid "Homepage: "
msgstr ""
-#: ../../mod/dirprofile.php:115
+#: ../../mod/dirprofile.php:118
msgid "Hometown: "
msgstr ""
-#: ../../mod/dirprofile.php:117
+#: ../../mod/dirprofile.php:120
msgid "About: "
msgstr ""
-#: ../../mod/dirprofile.php:164
+#: ../../mod/dirprofile.php:168
msgid "Keywords: "
msgstr ""
diff --git a/version.inc b/version.inc
index e8ad6394a..c26fe7d69 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-01-30.573
+2014-02-05.579
diff --git a/view/css/mod_chat.css b/view/css/mod_chat.css
new file mode 100644
index 000000000..ce6e59af1
--- /dev/null
+++ b/view/css/mod_chat.css
@@ -0,0 +1,31 @@
+ #chatContainer {
+ height: 100%;
+ width: 100%;
+ }
+
+ #chatTopBar {
+ float: left;
+ height: 400px;
+ width: 650px;
+ overflow-y: auto;
+ }
+
+ #chatUsers {
+ float: right;
+ width: 120px;
+ height: 100%;
+ border: 1px solid #000;
+ }
+
+ #chatBottomBar {
+ position: relative;
+ bottom: 0;
+ height: 150px;
+ margin-top: 20px;
+ }
+
+ section {
+ padding-bottom: 0;
+ }
+
+
\ No newline at end of file
diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css
index c460fec28..f6da96433 100644
--- a/view/css/mod_connedit.css
+++ b/view/css/mod_connedit.css
@@ -135,3 +135,17 @@
.contact-entry-end {
clear: both;
}
+
+#abook-advanced-panel, #abook-advanced {
+ opacity: 0.3;
+ filter:alpha(opacity=30);
+}
+
+#abook-advanced-panel:hover, #abook-advanced:hover {
+ opacity: 1.0;
+ filter:alpha(opacity=100);
+}
+
+#abook-advanced {
+ margin-top: 15px;
+}
\ No newline at end of file
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index 601cb2e0e..2049d9bc6 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -1,3 +1,17 @@
+#settings-permissions-wrapper, #settings-perm-advanced {
+ opacity: 0.3;
+ filter:alpha(opacity=30);
+}
+
+#settings-permissions-wrapper:hover, #settings-perm-advanced:hover {
+ opacity: 1.0;
+ filter:alpha(opacity=100);
+}
+
+#settings-perm-advanced {
+ margin-top: 15px;
+}
+
#settings-permissions-wrapper .field {
margin-bottom: 10px;
}
diff --git a/view/de/messages.po b/view/de/messages.po
index 68f1e0dd5..bcaad338a 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -19,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Red Matrix\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-23 02:30-0800\n"
-"PO-Revision-Date: 2014-01-25 06:22+0000\n"
+"POT-Creation-Date: 2014-01-31 00:02-0800\n"
+"PO-Revision-Date: 2014-02-04 06:40+0000\n"
"Last-Translator: bavatar \n"
"Language-Team: German (http://www.transifex.com/projects/p/red-matrix/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -64,10 +64,6 @@ msgstr "Besuche %1$s's %2$s"
msgid "%1$s has an updated %2$s, changing %3$s."
msgstr "%1$s hat ein aktualisiertes %2$s, %3$s wurde verändert."
-#: ../../include/api.php:973
-msgid "Public Timeline"
-msgstr "Öffentliche Zeitleiste"
-
#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1420
msgid "Logout"
msgstr "Abmelden"
@@ -84,7 +80,7 @@ msgstr "Home"
msgid "Your posts and conversations"
msgstr "Deine Beiträge und Unterhaltungen"
-#: ../../include/nav.php:76 ../../include/conversation.php:932
+#: ../../include/nav.php:76 ../../include/conversation.php:933
#: ../../mod/connedit.php:309 ../../mod/connedit.php:423
msgid "View Profile"
msgstr "Profil ansehen"
@@ -101,7 +97,7 @@ msgstr "Profile bearbeiten"
msgid "Manage/Edit Profiles"
msgstr "Verwalte/Bearbeite Profile"
-#: ../../include/nav.php:79 ../../include/conversation.php:1473
+#: ../../include/nav.php:79 ../../include/conversation.php:1475
#: ../../mod/fbrowser.php:25
msgid "Photos"
msgstr "Fotos"
@@ -248,7 +244,7 @@ msgstr "Ausgang"
msgid "New Message"
msgstr "Neue Nachricht"
-#: ../../include/nav.php:171 ../../include/conversation.php:1491
+#: ../../include/nav.php:171 ../../include/conversation.php:1493
#: ../../mod/events.php:354
msgid "Events"
msgstr "Veranstaltungen"
@@ -274,7 +270,7 @@ msgid "Manage Your Channels"
msgstr "Verwalte Deine Kanäle"
#: ../../include/nav.php:177 ../../include/widgets.php:487
-#: ../../mod/admin.php:787 ../../mod/admin.php:992
+#: ../../mod/admin.php:837 ../../mod/admin.php:1042
msgid "Settings"
msgstr "Einstellungen"
@@ -290,7 +286,7 @@ msgstr "Verbindungen"
msgid "Manage/Edit Friends and Connections"
msgstr "Verwalte/Bearbeite Freunde und Verbindungen"
-#: ../../include/nav.php:186 ../../mod/admin.php:111
+#: ../../include/nav.php:186 ../../mod/admin.php:112
msgid "Admin"
msgstr "Admin"
@@ -306,10 +302,63 @@ msgstr "Nichts Neues hier"
msgid "Please wait..."
msgstr "Bitte warten..."
-#: ../../include/Contact.php:104 ../../include/identity.php:625
+#: ../../include/chat.php:10
+msgid "Missing room name"
+msgstr "Der Chatraum hat keinen Namen"
+
+#: ../../include/chat.php:19
+msgid "Duplicate room name"
+msgstr "Name des Chatraums bereits vergeben"
+
+#: ../../include/chat.php:68 ../../include/chat.php:76
+msgid "Invalid room specifier."
+msgstr "Ungültiger Raumbezeichner."
+
+#: ../../include/chat.php:102
+msgid "Room not found."
+msgstr "Chatraum konnte nicht gefunden werden."
+
+#: ../../include/chat.php:113 ../../include/photos.php:15
+#: ../../include/attach.php:97 ../../include/attach.php:128
+#: ../../include/attach.php:184 ../../include/attach.php:199
+#: ../../include/attach.php:232 ../../include/attach.php:246
+#: ../../include/attach.php:267 ../../include/attach.php:462
+#: ../../include/attach.php:540 ../../include/items.php:3454
+#: ../../mod/common.php:35 ../../mod/events.php:140 ../../mod/thing.php:241
+#: ../../mod/thing.php:257 ../../mod/thing.php:291 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../mod/connedit.php:179
+#: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/page.php:30 ../../mod/page.php:80 ../../mod/setup.php:200
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/delegate.php:6 ../../mod/sources.php:62 ../../mod/mitem.php:73
+#: ../../mod/group.php:9 ../../mod/photos.php:68 ../../mod/photos.php:522
+#: ../../mod/chat.php:84 ../../mod/chat.php:89 ../../mod/viewsrc.php:12
+#: ../../mod/menu.php:40 ../../mod/connections.php:167
+#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:12
+#: ../../mod/profiles.php:152 ../../mod/profiles.php:453
+#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
+#: ../../mod/achievements.php:27 ../../mod/filestorage.php:10
+#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75
+#: ../../mod/filestorage.php:98 ../../mod/manage.php:6
+#: ../../mod/settings.php:486 ../../mod/mail.php:108
+#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
+#: ../../mod/profile_photo.php:200 ../../mod/editpost.php:13
+#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
+#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
+#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
+#: ../../mod/channel.php:88 ../../mod/channel.php:188
+#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
+#: ../../mod/editblock.php:48 ../../mod/suggest.php:26
+#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
+#: ../../mod/authtest.php:13 ../../mod/item.php:182 ../../mod/item.php:190
+#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:347
+msgid "Permission denied."
+msgstr "Zugang verweigert"
+
+#: ../../include/Contact.php:104 ../../include/identity.php:628
#: ../../include/widgets.php:115 ../../include/widgets.php:155
#: ../../mod/directory.php:183 ../../mod/match.php:62 ../../mod/suggest.php:51
-#: ../../mod/dirprofile.php:166
+#: ../../mod/dirprofile.php:170
msgid "Connect"
msgstr "Verbinden"
@@ -381,8 +430,8 @@ msgstr "OStatus"
msgid "RSS/Atom"
msgstr "RSS/Atom"
-#: ../../include/contact_selectors.php:77 ../../mod/admin.php:691
-#: ../../mod/admin.php:700 ../../boot.php:1423
+#: ../../include/contact_selectors.php:77 ../../mod/admin.php:741
+#: ../../mod/admin.php:750 ../../boot.php:1423
msgid "Email"
msgstr "E-Mail"
@@ -488,6 +537,10 @@ msgstr "vor %1$d %2$s"
msgid "Cannot locate DNS info for database server '%s'"
msgstr "Kann die DNS-Info für den Datenbank-Server '%s' nicht finden"
+#: ../../include/network.php:640
+msgid "view full size"
+msgstr "In Vollbildansicht anschauen"
+
#: ../../include/event.php:11 ../../include/bb2diaspora.php:433
msgid "l F d, Y \\@ g:i A"
msgstr "l, d. F Y\\\\, H:i"
@@ -500,350 +553,49 @@ msgstr "Beginnt:"
msgid "Finishes:"
msgstr "Endet:"
-#: ../../include/event.php:40 ../../include/identity.php:676
+#: ../../include/event.php:40 ../../include/identity.php:679
#: ../../include/bb2diaspora.php:455 ../../mod/events.php:462
-#: ../../mod/directory.php:156 ../../mod/dirprofile.php:108
+#: ../../mod/directory.php:156 ../../mod/dirprofile.php:111
msgid "Location:"
msgstr "Ort:"
-#: ../../include/text.php:315
-msgid "prev"
-msgstr "vorherige"
+#: ../../include/bbcode.php:128 ../../include/bbcode.php:537
+#: ../../include/bbcode.php:540 ../../include/bbcode.php:545
+#: ../../include/bbcode.php:548 ../../include/bbcode.php:551
+#: ../../include/bbcode.php:554 ../../include/bbcode.php:559
+#: ../../include/bbcode.php:562 ../../include/bbcode.php:567
+#: ../../include/bbcode.php:570 ../../include/bbcode.php:573
+#: ../../include/bbcode.php:576
+msgid "Image/photo"
+msgstr "Bild/Foto"
-#: ../../include/text.php:317
-msgid "first"
-msgstr "erste"
+#: ../../include/bbcode.php:163 ../../include/bbcode.php:582
+msgid "Encrypted content"
+msgstr "Verschlüsselter Inhalt"
-#: ../../include/text.php:346
-msgid "last"
-msgstr "letzte"
+#: ../../include/bbcode.php:170
+msgid "QR code"
+msgstr "QR Code"
-#: ../../include/text.php:349
-msgid "next"
-msgstr "nächste"
-
-#: ../../include/text.php:361
-msgid "older"
-msgstr "älter"
-
-#: ../../include/text.php:363
-msgid "newer"
-msgstr "neuer"
-
-#: ../../include/text.php:654
-msgid "No connections"
-msgstr "Keine Verbindungen"
-
-#: ../../include/text.php:665
+#: ../../include/bbcode.php:213
#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] "%d Verbindung"
-msgstr[1] "%d Verbindungen"
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s schrieb den folgenden %2$s %3$s"
-#: ../../include/text.php:677
-msgid "View Connections"
-msgstr "Zeige Verbindungen"
+#: ../../include/bbcode.php:215
+msgid "post"
+msgstr "Beitrag"
-#: ../../include/text.php:738 ../../include/text.php:752
-#: ../../include/widgets.php:173 ../../mod/filer.php:36
-msgid "Save"
-msgstr "Speichern"
-
-#: ../../include/text.php:818
-msgid "poke"
-msgstr "anstupsen"
-
-#: ../../include/text.php:818 ../../include/conversation.php:240
-msgid "poked"
-msgstr "stupste"
-
-#: ../../include/text.php:819
-msgid "ping"
-msgstr "anpingen"
-
-#: ../../include/text.php:819
-msgid "pinged"
-msgstr "pingte"
-
-#: ../../include/text.php:820
-msgid "prod"
-msgstr "knuffen"
-
-#: ../../include/text.php:820
-msgid "prodded"
-msgstr "knuffte"
-
-#: ../../include/text.php:821
-msgid "slap"
-msgstr "ohrfeigen"
-
-#: ../../include/text.php:821
-msgid "slapped"
-msgstr "ohrfeigte"
-
-#: ../../include/text.php:822
-msgid "finger"
-msgstr "befummeln"
-
-#: ../../include/text.php:822
-msgid "fingered"
-msgstr "befummelte"
-
-#: ../../include/text.php:823
-msgid "rebuff"
-msgstr "eine Abfuhr erteilen"
-
-#: ../../include/text.php:823
-msgid "rebuffed"
-msgstr "abfuhrerteilte"
-
-#: ../../include/text.php:835
-msgid "happy"
-msgstr "glücklich"
-
-#: ../../include/text.php:836
-msgid "sad"
-msgstr "traurig"
-
-#: ../../include/text.php:837
-msgid "mellow"
-msgstr "sanft"
-
-#: ../../include/text.php:838
-msgid "tired"
-msgstr "müde"
-
-#: ../../include/text.php:839
-msgid "perky"
-msgstr "frech"
-
-#: ../../include/text.php:840
-msgid "angry"
-msgstr "sauer"
-
-#: ../../include/text.php:841
-msgid "stupified"
-msgstr "verblüfft"
-
-#: ../../include/text.php:842
-msgid "puzzled"
-msgstr "verwirrt"
-
-#: ../../include/text.php:843
-msgid "interested"
-msgstr "interessiert"
-
-#: ../../include/text.php:844
-msgid "bitter"
-msgstr "verbittert"
-
-#: ../../include/text.php:845
-msgid "cheerful"
-msgstr "fröhlich"
-
-#: ../../include/text.php:846
-msgid "alive"
-msgstr "lebendig"
-
-#: ../../include/text.php:847
-msgid "annoyed"
-msgstr "verärgert"
-
-#: ../../include/text.php:848
-msgid "anxious"
-msgstr "unruhig"
-
-#: ../../include/text.php:849
-msgid "cranky"
-msgstr "schrullig"
-
-#: ../../include/text.php:850
-msgid "disturbed"
-msgstr "verstört"
-
-#: ../../include/text.php:851
-msgid "frustrated"
-msgstr "frustriert"
-
-#: ../../include/text.php:852
-msgid "motivated"
-msgstr "motiviert"
-
-#: ../../include/text.php:853
-msgid "relaxed"
-msgstr "entspannt"
-
-#: ../../include/text.php:854
-msgid "surprised"
-msgstr "überrascht"
-
-#: ../../include/text.php:1016
-msgid "Monday"
-msgstr "Montag"
-
-#: ../../include/text.php:1016
-msgid "Tuesday"
-msgstr "Dienstag"
-
-#: ../../include/text.php:1016
-msgid "Wednesday"
-msgstr "Mittwoch"
-
-#: ../../include/text.php:1016
-msgid "Thursday"
-msgstr "Donnerstag"
-
-#: ../../include/text.php:1016
-msgid "Friday"
-msgstr "Freitag"
-
-#: ../../include/text.php:1016
-msgid "Saturday"
-msgstr "Samstag"
-
-#: ../../include/text.php:1016
-msgid "Sunday"
-msgstr "Sonntag"
-
-#: ../../include/text.php:1020
-msgid "January"
-msgstr "Januar"
-
-#: ../../include/text.php:1020
-msgid "February"
-msgstr "Februar"
-
-#: ../../include/text.php:1020
-msgid "March"
-msgstr "März"
-
-#: ../../include/text.php:1020
-msgid "April"
-msgstr "April"
-
-#: ../../include/text.php:1020
-msgid "May"
-msgstr "Mai"
-
-#: ../../include/text.php:1020
-msgid "June"
-msgstr "Juni"
-
-#: ../../include/text.php:1020
-msgid "July"
-msgstr "Juli"
-
-#: ../../include/text.php:1020
-msgid "August"
-msgstr "August"
-
-#: ../../include/text.php:1020
-msgid "September"
-msgstr "September"
-
-#: ../../include/text.php:1020
-msgid "October"
-msgstr "Oktober"
-
-#: ../../include/text.php:1020
-msgid "November"
-msgstr "November"
-
-#: ../../include/text.php:1020
-msgid "December"
-msgstr "Dezember"
-
-#: ../../include/text.php:1098
-msgid "unknown.???"
-msgstr "unbekannt.???"
-
-#: ../../include/text.php:1099
-msgid "bytes"
-msgstr "Bytes"
-
-#: ../../include/text.php:1134
-msgid "remove category"
-msgstr "Kategorie entfernen"
-
-#: ../../include/text.php:1156
-msgid "remove from file"
-msgstr "aus der Datei entfernen"
-
-#: ../../include/text.php:1214 ../../include/text.php:1226
-msgid "Click to open/close"
-msgstr "Klicke zum Öffnen/Schließen"
-
-#: ../../include/text.php:1402 ../../mod/events.php:332
-msgid "link to source"
-msgstr "Link zum Originalbeitrag"
-
-#: ../../include/text.php:1421
-msgid "Select a page layout: "
-msgstr "Ein Seiten-Layout auswählen"
-
-#: ../../include/text.php:1424 ../../include/text.php:1489
-msgid "default"
-msgstr "Standard"
-
-#: ../../include/text.php:1460
-msgid "Page content type: "
-msgstr "Content-Typ der Seite"
-
-#: ../../include/text.php:1501
-msgid "Select an alternate language"
-msgstr "Wähle eine alternative Sprache"
-
-#: ../../include/text.php:1653 ../../include/conversation.php:117
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
-msgid "photo"
-msgstr "Foto"
-
-#: ../../include/text.php:1656 ../../include/conversation.php:120
-#: ../../mod/tagger.php:49
-msgid "event"
-msgstr "Ereignis"
-
-#: ../../include/text.php:1659 ../../include/conversation.php:145
-#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
-msgid "status"
-msgstr "Status"
-
-#: ../../include/text.php:1661 ../../include/conversation.php:147
-#: ../../mod/tagger.php:55
-msgid "comment"
-msgstr "Kommentar"
-
-#: ../../include/text.php:1666
-msgid "activity"
-msgstr "Aktivität"
-
-#: ../../include/text.php:1928
-msgid "Design"
-msgstr "Design"
-
-#: ../../include/text.php:1930
-msgid "Blocks"
-msgstr "Blöcke"
-
-#: ../../include/text.php:1931
-msgid "Menus"
-msgstr "Menüs"
-
-#: ../../include/text.php:1932
-msgid "Layouts"
-msgstr "Layouts"
-
-#: ../../include/text.php:1933
-msgid "Pages"
-msgstr "Seiten"
+#: ../../include/bbcode.php:505 ../../include/bbcode.php:525
+msgid "$1 wrote:"
+msgstr "$1 schrieb:"
#: ../../include/js_strings.php:5
msgid "Delete this item?"
msgstr "Dieses Element löschen?"
#: ../../include/js_strings.php:6 ../../include/ItemObject.php:536
-#: ../../mod/photos.php:968 ../../mod/photos.php:1055
+#: ../../mod/photos.php:972 ../../mod/photos.php:1059
msgid "Comment"
msgstr "Kommentar"
@@ -972,10 +724,6 @@ msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
msgid "Profile Photos"
msgstr "Profilfotos"
-#: ../../include/network.php:640
-msgid "view full size"
-msgstr "In Vollbildansicht anschauen"
-
#: ../../include/identity.php:29 ../../mod/item.php:1150
msgid "Unable to obtain identity information from database"
msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
@@ -1029,186 +777,190 @@ msgstr "Entschuldigung, aber du besitzt nicht die nötigen Rechte um dieses Prof
msgid "Requested profile is not available."
msgstr "Erwünschte Profil ist nicht verfügbar."
-#: ../../include/identity.php:639 ../../mod/profiles.php:615
+#: ../../include/identity.php:642 ../../mod/profiles.php:603
msgid "Change profile photo"
msgstr "Ändere das Profilfoto"
-#: ../../include/identity.php:645
+#: ../../include/identity.php:648
msgid "Profiles"
msgstr "Profile"
-#: ../../include/identity.php:645
+#: ../../include/identity.php:648
msgid "Manage/edit profiles"
msgstr "Verwalte/Bearbeite Profile"
-#: ../../include/identity.php:646 ../../mod/profiles.php:616
+#: ../../include/identity.php:649 ../../mod/profiles.php:604
msgid "Create New Profile"
msgstr "Neues Profil erstellen"
-#: ../../include/identity.php:649
+#: ../../include/identity.php:652
msgid "Edit Profile"
msgstr "Profile bearbeiten"
-#: ../../include/identity.php:660 ../../mod/profiles.php:627
+#: ../../include/identity.php:663 ../../mod/profiles.php:615
msgid "Profile Image"
msgstr "Profilfoto:"
-#: ../../include/identity.php:663 ../../mod/profiles.php:630
+#: ../../include/identity.php:666 ../../mod/profiles.php:618
msgid "visible to everybody"
msgstr "sichtbar für jeden"
-#: ../../include/identity.php:664 ../../mod/profiles.php:631
+#: ../../include/identity.php:667 ../../mod/profiles.php:619
msgid "Edit visibility"
msgstr "Sichtbarkeit bearbeiten"
-#: ../../include/identity.php:678 ../../include/identity.php:903
+#: ../../include/identity.php:681 ../../include/identity.php:908
#: ../../mod/directory.php:158
msgid "Gender:"
msgstr "Geschlecht:"
-#: ../../include/identity.php:679 ../../include/identity.php:923
+#: ../../include/identity.php:682 ../../include/identity.php:928
#: ../../mod/directory.php:160
msgid "Status:"
msgstr "Status:"
-#: ../../include/identity.php:680 ../../include/identity.php:934
+#: ../../include/identity.php:683 ../../include/identity.php:939
#: ../../mod/directory.php:162
msgid "Homepage:"
msgstr "Homepage:"
-#: ../../include/identity.php:747 ../../include/identity.php:827
-#: ../../mod/ping.php:230
+#: ../../include/identity.php:684 ../../mod/dirprofile.php:157
+msgid "Online Now"
+msgstr "gerade online"
+
+#: ../../include/identity.php:752 ../../include/identity.php:832
+#: ../../mod/ping.php:256
msgid "g A l F d"
msgstr "l, d. F G \\\\U\\\\h\\\\r"
-#: ../../include/identity.php:748 ../../include/identity.php:828
+#: ../../include/identity.php:753 ../../include/identity.php:833
msgid "F d"
msgstr "d. F"
-#: ../../include/identity.php:793 ../../include/identity.php:868
-#: ../../mod/ping.php:252
+#: ../../include/identity.php:798 ../../include/identity.php:873
+#: ../../mod/ping.php:278
msgid "[today]"
msgstr "[Heute]"
-#: ../../include/identity.php:805
+#: ../../include/identity.php:810
msgid "Birthday Reminders"
msgstr "Geburtstags Erinnerungen"
-#: ../../include/identity.php:806
+#: ../../include/identity.php:811
msgid "Birthdays this week:"
msgstr "Geburtstage in dieser Woche:"
-#: ../../include/identity.php:861
+#: ../../include/identity.php:866
msgid "[No description]"
msgstr "[Keine Beschreibung]"
-#: ../../include/identity.php:879
+#: ../../include/identity.php:884
msgid "Event Reminders"
msgstr "Veranstaltungs- Erinnerungen"
-#: ../../include/identity.php:880
+#: ../../include/identity.php:885
msgid "Events this week:"
msgstr "Veranstaltungen in dieser Woche:"
-#: ../../include/identity.php:893 ../../include/identity.php:977
-#: ../../mod/profperm.php:103
+#: ../../include/identity.php:898 ../../include/identity.php:982
+#: ../../mod/profperm.php:107
msgid "Profile"
msgstr "Profil"
-#: ../../include/identity.php:901 ../../mod/settings.php:911
+#: ../../include/identity.php:906 ../../mod/settings.php:916
msgid "Full Name:"
msgstr "Voller Name:"
-#: ../../include/identity.php:908
+#: ../../include/identity.php:913
msgid "j F, Y"
msgstr "j F, Y"
-#: ../../include/identity.php:909
+#: ../../include/identity.php:914
msgid "j F"
msgstr "j F"
-#: ../../include/identity.php:916
+#: ../../include/identity.php:921
msgid "Birthday:"
msgstr "Geburtstag:"
-#: ../../include/identity.php:920
+#: ../../include/identity.php:925
msgid "Age:"
msgstr "Alter:"
-#: ../../include/identity.php:929
+#: ../../include/identity.php:934
#, php-format
msgid "for %1$d %2$s"
msgstr "für %1$d %2$s"
-#: ../../include/identity.php:932 ../../mod/profiles.php:538
+#: ../../include/identity.php:937 ../../mod/profiles.php:526
msgid "Sexual Preference:"
msgstr "Sexuelle Orientierung:"
-#: ../../include/identity.php:936 ../../mod/profiles.php:540
+#: ../../include/identity.php:941 ../../mod/profiles.php:528
msgid "Hometown:"
msgstr "Heimatstadt:"
-#: ../../include/identity.php:938
+#: ../../include/identity.php:943
msgid "Tags:"
msgstr "Schlagworte:"
-#: ../../include/identity.php:940 ../../mod/profiles.php:541
+#: ../../include/identity.php:945 ../../mod/profiles.php:529
msgid "Political Views:"
msgstr "Politische Ansichten:"
-#: ../../include/identity.php:942
+#: ../../include/identity.php:947
msgid "Religion:"
msgstr "Religion:"
-#: ../../include/identity.php:944 ../../mod/directory.php:164
+#: ../../include/identity.php:949 ../../mod/directory.php:164
msgid "About:"
msgstr "Über:"
-#: ../../include/identity.php:946
+#: ../../include/identity.php:951
msgid "Hobbies/Interests:"
msgstr "Hobbys/Interessen:"
-#: ../../include/identity.php:948 ../../mod/profiles.php:544
+#: ../../include/identity.php:953 ../../mod/profiles.php:532
msgid "Likes:"
msgstr "Gefällt-mir:"
-#: ../../include/identity.php:950 ../../mod/profiles.php:545
+#: ../../include/identity.php:955 ../../mod/profiles.php:533
msgid "Dislikes:"
msgstr "Gefällt-mir-nicht:"
-#: ../../include/identity.php:953
+#: ../../include/identity.php:958
msgid "Contact information and Social Networks:"
msgstr "Kontaktinformation und soziale Netzwerke:"
-#: ../../include/identity.php:955
+#: ../../include/identity.php:960
msgid "My other channels:"
msgstr "Meine anderen Kanäle:"
-#: ../../include/identity.php:957
+#: ../../include/identity.php:962
msgid "Musical interests:"
msgstr "Musikalische Interessen:"
-#: ../../include/identity.php:959
+#: ../../include/identity.php:964
msgid "Books, literature:"
msgstr "Bücher, Literatur:"
-#: ../../include/identity.php:961
+#: ../../include/identity.php:966
msgid "Television:"
msgstr "Fernsehen:"
-#: ../../include/identity.php:963
+#: ../../include/identity.php:968
msgid "Film/dance/culture/entertainment:"
msgstr "Film/Tanz/Kultur/Unterhaltung:"
-#: ../../include/identity.php:965
+#: ../../include/identity.php:970
msgid "Love/Romance:"
msgstr "Liebe/Romantik:"
-#: ../../include/identity.php:967
+#: ../../include/identity.php:972
msgid "Work/employment:"
msgstr "Arbeit/Anstellung:"
-#: ../../include/identity.php:969
+#: ../../include/identity.php:974
msgid "School/education:"
msgstr "Schule/Ausbildung:"
@@ -1216,32 +968,6 @@ msgstr "Schule/Ausbildung:"
msgid "Edit File properties"
msgstr "Dateieigenschaften ändern"
-#: ../../include/bbcode.php:94 ../../include/bbcode.php:509
-#: ../../include/bbcode.php:512
-msgid "Image/photo"
-msgstr "Bild/Foto"
-
-#: ../../include/bbcode.php:129 ../../include/bbcode.php:517
-msgid "Encrypted content"
-msgstr "Verschlüsselter Inhalt"
-
-#: ../../include/bbcode.php:136
-msgid "QR code"
-msgstr "QR Code"
-
-#: ../../include/bbcode.php:179
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s schrieb den folgenden %2$s %3$s"
-
-#: ../../include/bbcode.php:181
-msgid "post"
-msgstr "Beitrag"
-
-#: ../../include/bbcode.php:469 ../../include/bbcode.php:489
-msgid "$1 wrote:"
-msgstr "$1 schrieb:"
-
#: ../../include/oembed.php:157
msgid "Embedded content"
msgstr "Eingebetteter Inhalt"
@@ -1250,226 +976,226 @@ msgstr "Eingebetteter Inhalt"
msgid "Embedding disabled"
msgstr "Einbetten ausgeschaltet"
-#: ../../include/features.php:21
+#: ../../include/features.php:23
msgid "General Features"
msgstr "Allgemeine Funktionen"
-#: ../../include/features.php:23
+#: ../../include/features.php:25
msgid "Content Expiration"
msgstr "Verfall von Inhalten"
-#: ../../include/features.php:23
+#: ../../include/features.php:25
msgid "Remove posts/comments and/or private messages at a future time"
msgstr "Lösche Beiträge, Kommentare und/oder private Nachrichten automatisch zu einem zukünftigen Datum."
-#: ../../include/features.php:24
+#: ../../include/features.php:26
msgid "Multiple Profiles"
msgstr "Mehrfachprofile"
-#: ../../include/features.php:24
+#: ../../include/features.php:26
msgid "Ability to create multiple profiles"
msgstr "Mehrfachprofile anlegen können"
-#: ../../include/features.php:25
+#: ../../include/features.php:27
msgid "Web Pages"
msgstr "Webseiten"
-#: ../../include/features.php:25
+#: ../../include/features.php:27
msgid "Provide managed web pages on your channel"
msgstr "Stelle verwaltete Webseiten in Deinem Kanal zur Verfügung"
-#: ../../include/features.php:26
+#: ../../include/features.php:28
msgid "Private Notes"
msgstr "private Notizen"
-#: ../../include/features.php:26
+#: ../../include/features.php:28
msgid "Enables a tool to store notes and reminders"
msgstr "Werkzeug zum Speichern von Notizen und Erinnerungen aktivieren"
-#: ../../include/features.php:31
+#: ../../include/features.php:33
msgid "Extended Identity Sharing"
msgstr "Erweitertes Teilen von Identitäten"
-#: ../../include/features.php:31
+#: ../../include/features.php:33
msgid ""
"Share your identity with all websites on the internet. When disabled, "
"identity is only shared with sites in the matrix."
msgstr "Teile deine Identität mit allen Webseiten im Internet. Ist dies deaktiviert wird deine Identität nur mit Seiten der Matrix geteilt."
-#: ../../include/features.php:32
+#: ../../include/features.php:34
msgid "Expert Mode"
msgstr "Expertenmodus"
-#: ../../include/features.php:32
+#: ../../include/features.php:34
msgid "Enable Expert Mode to provide advanced configuration options"
msgstr "Aktiviere Expertenmodus, um fortgeschrittene Konfiguration zur Verfügung zu stellen"
-#: ../../include/features.php:33
+#: ../../include/features.php:35
msgid "Premium Channel"
msgstr "Premium-Kanal"
-#: ../../include/features.php:33
+#: ../../include/features.php:35
msgid ""
"Allows you to set restrictions and terms on those that connect with your "
"channel"
msgstr "Erlaubt es dir Einschränkungen für Kontakte und bestimmte Bedingungen an Kontakte zu diesem Kanal zu stellen"
-#: ../../include/features.php:38
+#: ../../include/features.php:40
msgid "Post Composition Features"
msgstr "Nachbearbeitungsfunktionen"
-#: ../../include/features.php:39
+#: ../../include/features.php:41
msgid "Richtext Editor"
msgstr "Formatierungseditor"
-#: ../../include/features.php:39
+#: ../../include/features.php:41
msgid "Enable richtext editor"
msgstr "Aktiviere Formatierungseditor"
-#: ../../include/features.php:40
+#: ../../include/features.php:42
msgid "Post Preview"
msgstr "Voransicht"
-#: ../../include/features.php:40
+#: ../../include/features.php:42
msgid "Allow previewing posts and comments before publishing them"
msgstr "Erlaube Voransicht von Beiträgen und Kommentaren vor Veröffentlichung"
-#: ../../include/features.php:41 ../../include/widgets.php:476
+#: ../../include/features.php:43 ../../include/widgets.php:476
#: ../../mod/sources.php:81
msgid "Channel Sources"
msgstr "Kanal Quellen"
-#: ../../include/features.php:41
+#: ../../include/features.php:43
msgid "Automatically import channel content from other channels or feeds"
msgstr "Importiere automatisch Inhalte für diesen Kanal von anderen Kanälen oder Feeds."
-#: ../../include/features.php:42
+#: ../../include/features.php:44
msgid "Even More Encryption"
msgstr "Noch mehr Verschlüsselung"
-#: ../../include/features.php:42
+#: ../../include/features.php:44
msgid ""
"Allow optional encryption of content end-to-end with a shared secret key"
msgstr "Erlaube optionale Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Sicherheitsschlüssel)"
-#: ../../include/features.php:47
+#: ../../include/features.php:49
msgid "Network and Stream Filtering"
msgstr "Netzwerk- und Stream-Filter"
-#: ../../include/features.php:48
+#: ../../include/features.php:50
msgid "Search by Date"
msgstr "Suche nach Datum"
-#: ../../include/features.php:48
+#: ../../include/features.php:50
msgid "Ability to select posts by date ranges"
msgstr "Möglichkeit, Beiträge nach Zeiträumen auszuwählen"
-#: ../../include/features.php:49
+#: ../../include/features.php:51
msgid "Collections Filter"
msgstr "Filter für Sammlung"
-#: ../../include/features.php:49
+#: ../../include/features.php:51
msgid "Enable widget to display Network posts only from selected collections"
msgstr "Aktiviere nur Netzwerk-Beiträge von ausgewählten Sammlungen"
-#: ../../include/features.php:50 ../../include/widgets.php:252
+#: ../../include/features.php:52 ../../include/widgets.php:252
msgid "Saved Searches"
msgstr "Gesicherte Suchanfragen"
-#: ../../include/features.php:50
+#: ../../include/features.php:52
msgid "Save search terms for re-use"
msgstr "Gesicherte Suchbegriffe zur Wiederverwendung"
-#: ../../include/features.php:51
+#: ../../include/features.php:53
msgid "Network Personal Tab"
msgstr "Persönlicher Netzwerkreiter"
-#: ../../include/features.php:51
+#: ../../include/features.php:53
msgid "Enable tab to display only Network posts that you've interacted on"
msgstr "Aktiviere Reiter nur für die Netzwerk-Beiträge, mit denen Du interagiert hast"
-#: ../../include/features.php:52
+#: ../../include/features.php:54
msgid "Network New Tab"
msgstr "Netzwerkreiter Neu"
-#: ../../include/features.php:52
+#: ../../include/features.php:54
msgid "Enable tab to display all new Network activity"
msgstr "Aktiviere Reiter, um alle neuen Netzwerkaktivitäten zu zeigen"
-#: ../../include/features.php:53
+#: ../../include/features.php:55
msgid "Affinity Tool"
msgstr "Beziehungs-Tool"
-#: ../../include/features.php:53
+#: ../../include/features.php:55
msgid "Filter stream activity by depth of relationships"
msgstr "Filter Aktivitätenstream nach Tiefe der Beziehung"
-#: ../../include/features.php:54
+#: ../../include/features.php:56
msgid "Suggest Channels"
msgstr "Kanäle Vorschlagen"
-#: ../../include/features.php:54
+#: ../../include/features.php:56
msgid "Show channel suggestions"
msgstr "Kanal-Vorschläge anzeigen"
-#: ../../include/features.php:59
+#: ../../include/features.php:61
msgid "Post/Comment Tools"
msgstr "Beitrag-/Kommentar-Tools"
-#: ../../include/features.php:61
+#: ../../include/features.php:63
msgid "Edit Sent Posts"
msgstr "Bearbeite gesendete Beiträge"
-#: ../../include/features.php:61
+#: ../../include/features.php:63
msgid "Edit and correct posts and comments after sending"
msgstr "Bearbeite und korrigiere Beiträge und Kommentare nach dem Senden"
-#: ../../include/features.php:62
+#: ../../include/features.php:64
msgid "Tagging"
msgstr "Verschlagworten"
-#: ../../include/features.php:62
+#: ../../include/features.php:64
msgid "Ability to tag existing posts"
msgstr "Möglichkeit, um existierende Beiträge zu verschlagworten"
-#: ../../include/features.php:63
+#: ../../include/features.php:65
msgid "Post Categories"
msgstr "Beitrags-Kategorien"
-#: ../../include/features.php:63
+#: ../../include/features.php:65
msgid "Add categories to your posts"
msgstr "Kategorien für Beiträge"
-#: ../../include/features.php:64 ../../include/widgets.php:283
+#: ../../include/features.php:66 ../../include/widgets.php:283
#: ../../include/contact_widgets.php:53
msgid "Saved Folders"
msgstr "Gesicherte Ordner"
-#: ../../include/features.php:64
+#: ../../include/features.php:66
msgid "Ability to file posts under folders"
msgstr "Möglichkeit, Beiträge in Verzeichnissen zu sammeln"
-#: ../../include/features.php:65
+#: ../../include/features.php:67
msgid "Dislike Posts"
msgstr "Gefällt-mir-nicht Beiträge"
-#: ../../include/features.php:65
+#: ../../include/features.php:67
msgid "Ability to dislike posts/comments"
msgstr "Möglichkeit für Gefällt-mir-nicht für Beiträge/Kommentare"
-#: ../../include/features.php:66
+#: ../../include/features.php:68
msgid "Star Posts"
msgstr "Beiträge mit Sternchen versehen"
-#: ../../include/features.php:66
+#: ../../include/features.php:68
msgid "Ability to mark special posts with a star indicator"
msgstr "Möglichkeit, spezielle Beiträge mit Sternchen-Symbol zu markieren"
-#: ../../include/features.php:67
+#: ../../include/features.php:69
msgid "Tag Cloud"
msgstr "Tag Wolke"
-#: ../../include/features.php:67
+#: ../../include/features.php:69
msgid "Provide a personal tag cloud on your channel page"
msgstr "Persönliche Schlagwort-Wolke für deine Kanal-Seite anlegen"
@@ -1484,7 +1210,7 @@ msgstr "Ein gelöschte Gruppe mit diesem Namen wurde gefunden. Existierende Zuga
msgid "Default privacy group for new contacts"
msgstr "Standard-Privatsphärengruppe für neue Kontakte"
-#: ../../include/group.php:242 ../../mod/admin.php:700
+#: ../../include/group.php:242 ../../mod/admin.php:750
msgid "All Channels"
msgstr "Alle Kanäle"
@@ -1521,42 +1247,6 @@ msgstr "Neuer Beitrag wurde erzeugt"
msgid "commented on %s's post"
msgstr "hat %s's Beitrag kommentiert"
-#: ../../include/photos.php:15 ../../include/attach.php:97
-#: ../../include/attach.php:128 ../../include/attach.php:184
-#: ../../include/attach.php:199 ../../include/attach.php:232
-#: ../../include/attach.php:246 ../../include/attach.php:267
-#: ../../include/attach.php:462 ../../include/attach.php:540
-#: ../../include/items.php:3454 ../../mod/common.php:35
-#: ../../mod/events.php:140 ../../mod/thing.php:241 ../../mod/thing.php:257
-#: ../../mod/thing.php:291 ../../mod/invite.php:13 ../../mod/invite.php:104
-#: ../../mod/connedit.php:179 ../../mod/webpages.php:40 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/page.php:30 ../../mod/page.php:80
-#: ../../mod/setup.php:200 ../../mod/viewconnections.php:22
-#: ../../mod/viewconnections.php:27 ../../mod/delegate.php:6
-#: ../../mod/sources.php:62 ../../mod/mitem.php:73 ../../mod/group.php:9
-#: ../../mod/photos.php:68 ../../mod/photos.php:522 ../../mod/viewsrc.php:12
-#: ../../mod/menu.php:40 ../../mod/connections.php:167
-#: ../../mod/layouts.php:27 ../../mod/layouts.php:42 ../../mod/network.php:12
-#: ../../mod/profiles.php:152 ../../mod/profiles.php:465
-#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97
-#: ../../mod/achievements.php:27 ../../mod/filestorage.php:10
-#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:76
-#: ../../mod/filestorage.php:99 ../../mod/manage.php:6
-#: ../../mod/settings.php:484 ../../mod/mail.php:108
-#: ../../mod/editlayout.php:48 ../../mod/profile_photo.php:187
-#: ../../mod/profile_photo.php:200 ../../mod/editpost.php:13
-#: ../../mod/notifications.php:66 ../../mod/blocks.php:29
-#: ../../mod/blocks.php:44 ../../mod/editwebpage.php:44
-#: ../../mod/editwebpage.php:83 ../../mod/poke.php:128
-#: ../../mod/channel.php:88 ../../mod/channel.php:188
-#: ../../mod/channel.php:231 ../../mod/fsuggest.php:78
-#: ../../mod/editblock.php:48 ../../mod/suggest.php:26
-#: ../../mod/message.php:16 ../../mod/register.php:68 ../../mod/regmod.php:18
-#: ../../mod/authtest.php:13 ../../mod/item.php:182 ../../mod/item.php:190
-#: ../../mod/mood.php:119 ../../index.php:176 ../../index.php:348
-msgid "Permission denied."
-msgstr "Zugang verweigert"
-
#: ../../include/photos.php:89
#, php-format
msgid "Image exceeds website size limit of %lu bytes"
@@ -1574,12 +1264,12 @@ msgstr "Kann Bild nicht verarbeiten"
msgid "Photo storage failed."
msgstr "Foto speichern schlug fehl"
-#: ../../include/photos.php:302 ../../include/conversation.php:1476
+#: ../../include/photos.php:302 ../../include/conversation.php:1478
msgid "Photo Albums"
msgstr "Fotoalben"
#: ../../include/photos.php:306 ../../mod/photos.php:690
-#: ../../mod/photos.php:1165
+#: ../../mod/photos.php:1169
msgid "Upload New Photos"
msgstr "Lade neue Fotos hoch"
@@ -2233,6 +1923,11 @@ msgstr "Beispiel: bob@beispiel.com, http://beispiel.com/barbara"
msgid "Notes"
msgstr "Notizen"
+#: ../../include/widgets.php:173 ../../include/text.php:738
+#: ../../include/text.php:752 ../../mod/filer.php:36
+msgid "Save"
+msgstr "Speichern"
+
#: ../../include/widgets.php:243
msgid "Remove term"
msgstr "Eintrag löschen"
@@ -2314,6 +2009,14 @@ msgstr "Prämium-Kanal Einstellungen"
msgid "Check Mail"
msgstr "E-Mails abrufen"
+#: ../../include/widgets.php:585
+msgid "Chat Rooms"
+msgstr "Chaträume"
+
+#: ../../include/api.php:974
+msgid "Public Timeline"
+msgstr "Öffentliche Zeitleiste"
+
#: ../../include/contact_widgets.php:14
#, php-format
msgid "%d invitation available"
@@ -2367,9 +2070,9 @@ msgstr "Neue Seite"
#: ../../include/page_widgets.php:8 ../../include/ItemObject.php:96
#: ../../mod/thing.php:229 ../../mod/webpages.php:118 ../../mod/menu.php:55
-#: ../../mod/layouts.php:102 ../../mod/filestorage.php:171
-#: ../../mod/settings.php:569 ../../mod/editlayout.php:106
-#: ../../mod/editpost.php:98 ../../mod/blocks.php:93
+#: ../../mod/layouts.php:102 ../../mod/filestorage.php:170
+#: ../../mod/settings.php:571 ../../mod/editlayout.php:106
+#: ../../mod/editpost.php:103 ../../mod/blocks.php:93
#: ../../mod/editwebpage.php:144 ../../mod/editblock.php:120
msgid "Edit"
msgstr "Bearbeiten"
@@ -2505,46 +2208,379 @@ msgid "Default"
msgstr "Standard"
#: ../../include/items.php:208 ../../mod/like.php:55 ../../mod/group.php:68
-#: ../../mod/profperm.php:19 ../../index.php:347
+#: ../../mod/profperm.php:23 ../../index.php:346
msgid "Permission denied"
msgstr "Keine Berechtigung"
-#: ../../include/items.php:3392 ../../mod/thing.php:74 ../../mod/admin.php:150
-#: ../../mod/admin.php:732 ../../mod/admin.php:935 ../../mod/viewsrc.php:18
+#: ../../include/items.php:3392 ../../mod/thing.php:74 ../../mod/admin.php:151
+#: ../../mod/admin.php:782 ../../mod/admin.php:985 ../../mod/viewsrc.php:18
#: ../../mod/home.php:63 ../../mod/filestorage.php:18 ../../mod/display.php:32
msgid "Item not found."
msgstr "Element nicht gefunden."
-#: ../../include/items.php:3743 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:3748 ../../mod/group.php:38 ../../mod/group.php:140
msgid "Collection not found."
msgstr "Sammlung nicht gefunden"
-#: ../../include/items.php:3758
+#: ../../include/items.php:3763
msgid "Collection is empty."
msgstr "Sammlung ist leer."
-#: ../../include/items.php:3765
+#: ../../include/items.php:3770
#, php-format
msgid "Collection: %s"
msgstr "Sammlung: %s"
-#: ../../include/items.php:3776
+#: ../../include/items.php:3781
#, php-format
msgid "Connection: %s"
msgstr "Verbindung: %s"
-#: ../../include/items.php:3779
+#: ../../include/items.php:3784
msgid "Connection not found."
msgstr "Die Verbindung wurde nicht gefunden."
-#: ../../include/ItemObject.php:89 ../../mod/photos.php:841
+#: ../../include/security.php:280
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
+
+#: ../../include/text.php:315
+msgid "prev"
+msgstr "vorherige"
+
+#: ../../include/text.php:317
+msgid "first"
+msgstr "erste"
+
+#: ../../include/text.php:346
+msgid "last"
+msgstr "letzte"
+
+#: ../../include/text.php:349
+msgid "next"
+msgstr "nächste"
+
+#: ../../include/text.php:361
+msgid "older"
+msgstr "älter"
+
+#: ../../include/text.php:363
+msgid "newer"
+msgstr "neuer"
+
+#: ../../include/text.php:654
+msgid "No connections"
+msgstr "Keine Verbindungen"
+
+#: ../../include/text.php:665
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] "%d Verbindung"
+msgstr[1] "%d Verbindungen"
+
+#: ../../include/text.php:677
+msgid "View Connections"
+msgstr "Zeige Verbindungen"
+
+#: ../../include/text.php:818
+msgid "poke"
+msgstr "anstupsen"
+
+#: ../../include/text.php:818 ../../include/conversation.php:240
+msgid "poked"
+msgstr "stupste"
+
+#: ../../include/text.php:819
+msgid "ping"
+msgstr "anpingen"
+
+#: ../../include/text.php:819
+msgid "pinged"
+msgstr "pingte"
+
+#: ../../include/text.php:820
+msgid "prod"
+msgstr "knuffen"
+
+#: ../../include/text.php:820
+msgid "prodded"
+msgstr "knuffte"
+
+#: ../../include/text.php:821
+msgid "slap"
+msgstr "ohrfeigen"
+
+#: ../../include/text.php:821
+msgid "slapped"
+msgstr "ohrfeigte"
+
+#: ../../include/text.php:822
+msgid "finger"
+msgstr "befummeln"
+
+#: ../../include/text.php:822
+msgid "fingered"
+msgstr "befummelte"
+
+#: ../../include/text.php:823
+msgid "rebuff"
+msgstr "eine Abfuhr erteilen"
+
+#: ../../include/text.php:823
+msgid "rebuffed"
+msgstr "abfuhrerteilte"
+
+#: ../../include/text.php:835
+msgid "happy"
+msgstr "glücklich"
+
+#: ../../include/text.php:836
+msgid "sad"
+msgstr "traurig"
+
+#: ../../include/text.php:837
+msgid "mellow"
+msgstr "sanft"
+
+#: ../../include/text.php:838
+msgid "tired"
+msgstr "müde"
+
+#: ../../include/text.php:839
+msgid "perky"
+msgstr "frech"
+
+#: ../../include/text.php:840
+msgid "angry"
+msgstr "sauer"
+
+#: ../../include/text.php:841
+msgid "stupified"
+msgstr "verblüfft"
+
+#: ../../include/text.php:842
+msgid "puzzled"
+msgstr "verwirrt"
+
+#: ../../include/text.php:843
+msgid "interested"
+msgstr "interessiert"
+
+#: ../../include/text.php:844
+msgid "bitter"
+msgstr "verbittert"
+
+#: ../../include/text.php:845
+msgid "cheerful"
+msgstr "fröhlich"
+
+#: ../../include/text.php:846
+msgid "alive"
+msgstr "lebendig"
+
+#: ../../include/text.php:847
+msgid "annoyed"
+msgstr "verärgert"
+
+#: ../../include/text.php:848
+msgid "anxious"
+msgstr "unruhig"
+
+#: ../../include/text.php:849
+msgid "cranky"
+msgstr "schrullig"
+
+#: ../../include/text.php:850
+msgid "disturbed"
+msgstr "verstört"
+
+#: ../../include/text.php:851
+msgid "frustrated"
+msgstr "frustriert"
+
+#: ../../include/text.php:852
+msgid "motivated"
+msgstr "motiviert"
+
+#: ../../include/text.php:853
+msgid "relaxed"
+msgstr "entspannt"
+
+#: ../../include/text.php:854
+msgid "surprised"
+msgstr "überrascht"
+
+#: ../../include/text.php:1017
+msgid "Monday"
+msgstr "Montag"
+
+#: ../../include/text.php:1017
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: ../../include/text.php:1017
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: ../../include/text.php:1017
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: ../../include/text.php:1017
+msgid "Friday"
+msgstr "Freitag"
+
+#: ../../include/text.php:1017
+msgid "Saturday"
+msgstr "Samstag"
+
+#: ../../include/text.php:1017
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: ../../include/text.php:1021
+msgid "January"
+msgstr "Januar"
+
+#: ../../include/text.php:1021
+msgid "February"
+msgstr "Februar"
+
+#: ../../include/text.php:1021
+msgid "March"
+msgstr "März"
+
+#: ../../include/text.php:1021
+msgid "April"
+msgstr "April"
+
+#: ../../include/text.php:1021
+msgid "May"
+msgstr "Mai"
+
+#: ../../include/text.php:1021
+msgid "June"
+msgstr "Juni"
+
+#: ../../include/text.php:1021
+msgid "July"
+msgstr "Juli"
+
+#: ../../include/text.php:1021
+msgid "August"
+msgstr "August"
+
+#: ../../include/text.php:1021
+msgid "September"
+msgstr "September"
+
+#: ../../include/text.php:1021
+msgid "October"
+msgstr "Oktober"
+
+#: ../../include/text.php:1021
+msgid "November"
+msgstr "November"
+
+#: ../../include/text.php:1021
+msgid "December"
+msgstr "Dezember"
+
+#: ../../include/text.php:1099
+msgid "unknown.???"
+msgstr "unbekannt.???"
+
+#: ../../include/text.php:1100
+msgid "bytes"
+msgstr "Bytes"
+
+#: ../../include/text.php:1135
+msgid "remove category"
+msgstr "Kategorie entfernen"
+
+#: ../../include/text.php:1157
+msgid "remove from file"
+msgstr "aus der Datei entfernen"
+
+#: ../../include/text.php:1215 ../../include/text.php:1227
+msgid "Click to open/close"
+msgstr "Klicke zum Öffnen/Schließen"
+
+#: ../../include/text.php:1403 ../../mod/events.php:332
+msgid "link to source"
+msgstr "Link zum Originalbeitrag"
+
+#: ../../include/text.php:1422
+msgid "Select a page layout: "
+msgstr "Ein Seiten-Layout auswählen"
+
+#: ../../include/text.php:1425 ../../include/text.php:1490
+msgid "default"
+msgstr "Standard"
+
+#: ../../include/text.php:1461
+msgid "Page content type: "
+msgstr "Content-Typ der Seite"
+
+#: ../../include/text.php:1502
+msgid "Select an alternate language"
+msgstr "Wähle eine alternative Sprache"
+
+#: ../../include/text.php:1654 ../../include/conversation.php:117
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45
+msgid "photo"
+msgstr "Foto"
+
+#: ../../include/text.php:1657 ../../include/conversation.php:120
+#: ../../mod/tagger.php:49
+msgid "event"
+msgstr "Ereignis"
+
+#: ../../include/text.php:1660 ../../include/conversation.php:145
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53
+msgid "status"
+msgstr "Status"
+
+#: ../../include/text.php:1662 ../../include/conversation.php:147
+#: ../../mod/tagger.php:55
+msgid "comment"
+msgstr "Kommentar"
+
+#: ../../include/text.php:1667
+msgid "activity"
+msgstr "Aktivität"
+
+#: ../../include/text.php:1929
+msgid "Design"
+msgstr "Design"
+
+#: ../../include/text.php:1931
+msgid "Blocks"
+msgstr "Blöcke"
+
+#: ../../include/text.php:1932
+msgid "Menus"
+msgstr "Menüs"
+
+#: ../../include/text.php:1933
+msgid "Layouts"
+msgstr "Layouts"
+
+#: ../../include/text.php:1934
+msgid "Pages"
+msgstr "Seiten"
+
+#: ../../include/ItemObject.php:89 ../../mod/photos.php:843
msgid "Private Message"
msgstr "Private Nachricht"
#: ../../include/ItemObject.php:108 ../../include/conversation.php:632
-#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:695
-#: ../../mod/group.php:176 ../../mod/photos.php:1019
-#: ../../mod/filestorage.php:172 ../../mod/settings.php:570
+#: ../../mod/thing.php:230 ../../mod/connedit.php:356 ../../mod/admin.php:745
+#: ../../mod/group.php:176 ../../mod/photos.php:1023
+#: ../../mod/filestorage.php:171 ../../mod/settings.php:572
msgid "Delete"
msgstr "Löschen"
@@ -2580,11 +2616,11 @@ msgstr "Nachricht überprüft"
msgid "add tag"
msgstr "Schlagwort hinzufügen"
-#: ../../include/ItemObject.php:175 ../../mod/photos.php:947
+#: ../../include/ItemObject.php:175 ../../mod/photos.php:951
msgid "I like this (toggle)"
msgstr "Ich mag das (Umschalter)"
-#: ../../include/ItemObject.php:176 ../../mod/photos.php:948
+#: ../../include/ItemObject.php:176 ../../mod/photos.php:952
msgid "I don't like this (toggle)"
msgstr "Ich mag das nicht (Umschalter)"
@@ -2627,15 +2663,15 @@ msgstr "von %s"
msgid "last edited: %s"
msgstr "zuletzt bearbeitet: %s"
-#: ../../include/ItemObject.php:221
+#: ../../include/ItemObject.php:221 ../../include/conversation.php:690
#, php-format
msgid "Expires: %s"
msgstr "Verfällt: %s"
-#: ../../include/ItemObject.php:248 ../../include/conversation.php:706
-#: ../../include/conversation.php:1119 ../../mod/photos.php:950
+#: ../../include/ItemObject.php:248 ../../include/conversation.php:707
+#: ../../include/conversation.php:1120 ../../mod/photos.php:954
#: ../../mod/mail.php:222 ../../mod/mail.php:336 ../../mod/editlayout.php:115
-#: ../../mod/editpost.php:107 ../../mod/editwebpage.php:153
+#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:153
#: ../../mod/editblock.php:129
msgid "Please wait"
msgstr "Bitte warten"
@@ -2647,8 +2683,8 @@ msgid_plural "%d comments"
msgstr[0] "%d Kommentar"
msgstr[1] "%d Kommentare"
-#: ../../include/ItemObject.php:534 ../../mod/photos.php:966
-#: ../../mod/photos.php:1053
+#: ../../include/ItemObject.php:534 ../../mod/photos.php:970
+#: ../../mod/photos.php:1057
msgid "This is you"
msgstr "Das bist du"
@@ -2656,16 +2692,17 @@ msgstr "Das bist du"
#: ../../mod/thing.php:276 ../../mod/thing.php:318 ../../mod/invite.php:156
#: ../../mod/connedit.php:434 ../../mod/setup.php:304 ../../mod/setup.php:347
#: ../../mod/connect.php:92 ../../mod/sources.php:97 ../../mod/sources.php:131
-#: ../../mod/admin.php:420 ../../mod/admin.php:688 ../../mod/admin.php:828
-#: ../../mod/admin.php:1027 ../../mod/admin.php:1114 ../../mod/group.php:81
-#: ../../mod/photos.php:562 ../../mod/photos.php:667 ../../mod/photos.php:929
-#: ../../mod/photos.php:969 ../../mod/photos.php:1056
-#: ../../mod/profiles.php:518 ../../mod/filestorage.php:132
-#: ../../mod/import.php:387 ../../mod/settings.php:507
-#: ../../mod/settings.php:619 ../../mod/settings.php:647
-#: ../../mod/settings.php:671 ../../mod/settings.php:742
-#: ../../mod/settings.php:903 ../../mod/mail.php:223 ../../mod/mail.php:335
-#: ../../mod/poke.php:166 ../../mod/fsuggest.php:108 ../../mod/mood.php:142
+#: ../../mod/admin.php:431 ../../mod/admin.php:738 ../../mod/admin.php:878
+#: ../../mod/admin.php:1077 ../../mod/admin.php:1164 ../../mod/group.php:81
+#: ../../mod/photos.php:562 ../../mod/photos.php:667 ../../mod/photos.php:933
+#: ../../mod/photos.php:973 ../../mod/photos.php:1060 ../../mod/chat.php:107
+#: ../../mod/chat.php:133 ../../mod/profiles.php:506
+#: ../../mod/filestorage.php:131 ../../mod/import.php:387
+#: ../../mod/settings.php:509 ../../mod/settings.php:621
+#: ../../mod/settings.php:649 ../../mod/settings.php:673
+#: ../../mod/settings.php:744 ../../mod/settings.php:908
+#: ../../mod/mail.php:223 ../../mod/mail.php:335 ../../mod/poke.php:166
+#: ../../mod/fsuggest.php:108 ../../mod/mood.php:142
#: ../../view/theme/redbasic/php/config.php:85
#: ../../view/theme/apw/php/config.php:231
#: ../../view/theme/blogga/view/theme/blog/config.php:67
@@ -2705,36 +2742,18 @@ msgstr "Link"
msgid "Video"
msgstr "Video"
-#: ../../include/ItemObject.php:546 ../../include/conversation.php:1082
-#: ../../mod/webpages.php:122 ../../mod/photos.php:970
-#: ../../mod/editlayout.php:136 ../../mod/editpost.php:127
+#: ../../include/ItemObject.php:546 ../../include/conversation.php:1083
+#: ../../mod/webpages.php:122 ../../mod/photos.php:974
+#: ../../mod/editlayout.php:136 ../../mod/editpost.php:132
#: ../../mod/editwebpage.php:177 ../../mod/editblock.php:151
msgid "Preview"
msgstr "Vorschau"
-#: ../../include/ItemObject.php:549 ../../include/conversation.php:1146
-#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:135
+#: ../../include/ItemObject.php:549 ../../include/conversation.php:1147
+#: ../../mod/mail.php:228 ../../mod/mail.php:341 ../../mod/editpost.php:140
msgid "Encrypt text"
msgstr "Text verschlüsseln"
-#: ../../include/security.php:49
-msgid "Welcome "
-msgstr "Willkommen"
-
-#: ../../include/security.php:50
-msgid "Please upload a profile photo."
-msgstr "Bitte lade ein Profilfoto hoch."
-
-#: ../../include/security.php:53
-msgid "Welcome back "
-msgstr "Willkommen zurück"
-
-#: ../../include/security.php:363
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde."
-
#: ../../include/conversation.php:123
msgid "channel"
msgstr "Kanal"
@@ -2777,344 +2796,344 @@ msgstr "Kategorien:"
msgid "Filed under:"
msgstr "Gespeichert unter:"
-#: ../../include/conversation.php:704
+#: ../../include/conversation.php:705
msgid "View in context"
msgstr "Im Zusammenhang anschauen"
-#: ../../include/conversation.php:833
+#: ../../include/conversation.php:834
msgid "remove"
msgstr "lösche"
-#: ../../include/conversation.php:837
+#: ../../include/conversation.php:838
msgid "Loading..."
msgstr "Lädt ..."
-#: ../../include/conversation.php:838
+#: ../../include/conversation.php:839
msgid "Delete Selected Items"
msgstr "Lösche die ausgewählten Elemente"
-#: ../../include/conversation.php:929
+#: ../../include/conversation.php:930
msgid "View Source"
msgstr "Quelle anzeigen"
-#: ../../include/conversation.php:930
+#: ../../include/conversation.php:931
msgid "Follow Thread"
msgstr "Unterhaltung folgen"
-#: ../../include/conversation.php:931
+#: ../../include/conversation.php:932
msgid "View Status"
msgstr "Status ansehen"
-#: ../../include/conversation.php:933
+#: ../../include/conversation.php:934
msgid "View Photos"
msgstr "Fotos ansehen"
-#: ../../include/conversation.php:934
+#: ../../include/conversation.php:935
msgid "Matrix Activity"
msgstr "Matrix Aktivität"
-#: ../../include/conversation.php:935
+#: ../../include/conversation.php:936
msgid "Edit Contact"
msgstr "Kontakt bearbeiten"
-#: ../../include/conversation.php:936
+#: ../../include/conversation.php:937
msgid "Send PM"
msgstr "Sende PN"
-#: ../../include/conversation.php:937
+#: ../../include/conversation.php:938
msgid "Poke"
msgstr "Anstupsen"
-#: ../../include/conversation.php:999
+#: ../../include/conversation.php:1000
#, php-format
msgid "%s likes this."
msgstr "%s gefällt das."
-#: ../../include/conversation.php:999
+#: ../../include/conversation.php:1000
#, php-format
msgid "%s doesn't like this."
msgstr "%s gefällt das nicht."
-#: ../../include/conversation.php:1003
+#: ../../include/conversation.php:1004
#, php-format
msgid "%2$d people like this."
msgid_plural "%2$d people like this."
msgstr[0] "%2$d Person gefällt das."
msgstr[1] "%2$d Leuten gefällt das."
-#: ../../include/conversation.php:1005
+#: ../../include/conversation.php:1006
#, php-format
msgid "%2$d people don't like this."
msgid_plural "%2$d people don't like this."
msgstr[0] "%2$d Person gefällt das nicht."
msgstr[1] "%2$d Leuten gefällt das nicht."
-#: ../../include/conversation.php:1011
+#: ../../include/conversation.php:1012
msgid "and"
msgstr "und"
-#: ../../include/conversation.php:1014
+#: ../../include/conversation.php:1015
#, php-format
msgid ", and %d other people"
msgid_plural ", and %d other people"
msgstr[0] ""
msgstr[1] ", und %d andere"
-#: ../../include/conversation.php:1015
+#: ../../include/conversation.php:1016
#, php-format
msgid "%s like this."
msgstr "%s gefällt das."
-#: ../../include/conversation.php:1015
+#: ../../include/conversation.php:1016
#, php-format
msgid "%s don't like this."
msgstr "%s gefällt das nicht."
-#: ../../include/conversation.php:1065
+#: ../../include/conversation.php:1066
msgid "Visible to everybody"
msgstr "Sichtbar für jeden"
-#: ../../include/conversation.php:1066 ../../mod/mail.php:171
+#: ../../include/conversation.php:1067 ../../mod/mail.php:171
#: ../../mod/mail.php:269
msgid "Please enter a link URL:"
msgstr "Gib eine URL ein:"
-#: ../../include/conversation.php:1067
+#: ../../include/conversation.php:1068
msgid "Please enter a video link/URL:"
msgstr "Gib einen Video-Link/URL ein:"
-#: ../../include/conversation.php:1068
+#: ../../include/conversation.php:1069
msgid "Please enter an audio link/URL:"
msgstr "Gib einen Audio-Link/URL ein:"
-#: ../../include/conversation.php:1069
+#: ../../include/conversation.php:1070
msgid "Tag term:"
msgstr "Schlagwort:"
-#: ../../include/conversation.php:1070 ../../mod/filer.php:35
+#: ../../include/conversation.php:1071 ../../mod/filer.php:35
msgid "Save to Folder:"
msgstr "Speichern in Ordner:"
-#: ../../include/conversation.php:1071
+#: ../../include/conversation.php:1072
msgid "Where are you right now?"
msgstr "Wo bist du jetzt grade?"
-#: ../../include/conversation.php:1072 ../../mod/mail.php:172
+#: ../../include/conversation.php:1073 ../../mod/mail.php:172
#: ../../mod/mail.php:270 ../../mod/editpost.php:52
msgid "Expires YYYY-MM-DD HH:MM"
msgstr "Verfällt YYYY-MM-DD HH;MM"
-#: ../../include/conversation.php:1096 ../../mod/photos.php:949
+#: ../../include/conversation.php:1097 ../../mod/photos.php:953
msgid "Share"
msgstr "Teilen"
-#: ../../include/conversation.php:1098 ../../mod/editwebpage.php:140
+#: ../../include/conversation.php:1099 ../../mod/editwebpage.php:140
msgid "Page link title"
msgstr "Seitentitel-Link"
-#: ../../include/conversation.php:1100 ../../mod/mail.php:219
+#: ../../include/conversation.php:1101 ../../mod/mail.php:219
#: ../../mod/mail.php:332 ../../mod/editlayout.php:107
-#: ../../mod/editpost.php:99 ../../mod/editwebpage.php:145
+#: ../../mod/editpost.php:104 ../../mod/editwebpage.php:145
#: ../../mod/editblock.php:121
msgid "Upload photo"
msgstr "Foto hochladen"
-#: ../../include/conversation.php:1101
+#: ../../include/conversation.php:1102
msgid "upload photo"
msgstr "Foto hochladen"
-#: ../../include/conversation.php:1102 ../../mod/mail.php:220
+#: ../../include/conversation.php:1103 ../../mod/mail.php:220
#: ../../mod/mail.php:333 ../../mod/editlayout.php:108
-#: ../../mod/editpost.php:100 ../../mod/editwebpage.php:146
+#: ../../mod/editpost.php:105 ../../mod/editwebpage.php:146
#: ../../mod/editblock.php:122
msgid "Attach file"
msgstr "Datei anhängen"
-#: ../../include/conversation.php:1103
+#: ../../include/conversation.php:1104
msgid "attach file"
msgstr "Datei anfügen"
-#: ../../include/conversation.php:1104 ../../mod/mail.php:221
+#: ../../include/conversation.php:1105 ../../mod/mail.php:221
#: ../../mod/mail.php:334 ../../mod/editlayout.php:109
-#: ../../mod/editpost.php:101 ../../mod/editwebpage.php:147
+#: ../../mod/editpost.php:106 ../../mod/editwebpage.php:147
#: ../../mod/editblock.php:123
msgid "Insert web link"
msgstr "Link einfügen"
-#: ../../include/conversation.php:1105
+#: ../../include/conversation.php:1106
msgid "web link"
msgstr "Web-Link"
-#: ../../include/conversation.php:1106
+#: ../../include/conversation.php:1107
msgid "Insert video link"
msgstr "Video-Link einfügen"
-#: ../../include/conversation.php:1107
+#: ../../include/conversation.php:1108
msgid "video link"
msgstr "Video-Link"
-#: ../../include/conversation.php:1108
+#: ../../include/conversation.php:1109
msgid "Insert audio link"
msgstr "Audio-Link einfügen"
-#: ../../include/conversation.php:1109
+#: ../../include/conversation.php:1110
msgid "audio link"
msgstr "Audio-Link"
-#: ../../include/conversation.php:1110 ../../mod/editlayout.php:113
-#: ../../mod/editpost.php:105 ../../mod/editwebpage.php:151
+#: ../../include/conversation.php:1111 ../../mod/editlayout.php:113
+#: ../../mod/editpost.php:110 ../../mod/editwebpage.php:151
#: ../../mod/editblock.php:127
msgid "Set your location"
msgstr "Standort"
-#: ../../include/conversation.php:1111
+#: ../../include/conversation.php:1112
msgid "set location"
msgstr "Standort"
-#: ../../include/conversation.php:1112 ../../mod/editlayout.php:114
-#: ../../mod/editpost.php:106 ../../mod/editwebpage.php:152
+#: ../../include/conversation.php:1113 ../../mod/editlayout.php:114
+#: ../../mod/editpost.php:111 ../../mod/editwebpage.php:152
#: ../../mod/editblock.php:128
msgid "Clear browser location"
msgstr "Browser-Standort löschen"
-#: ../../include/conversation.php:1113
+#: ../../include/conversation.php:1114
msgid "clear location"
msgstr "Standort löschen"
-#: ../../include/conversation.php:1115 ../../mod/editlayout.php:127
-#: ../../mod/editpost.php:119 ../../mod/editwebpage.php:169
+#: ../../include/conversation.php:1116 ../../mod/editlayout.php:127
+#: ../../mod/editpost.php:124 ../../mod/editwebpage.php:169
#: ../../mod/editblock.php:142
msgid "Set title"
msgstr "Titel"
-#: ../../include/conversation.php:1118 ../../mod/editlayout.php:130
-#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:171
+#: ../../include/conversation.php:1119 ../../mod/editlayout.php:130
+#: ../../mod/editpost.php:126 ../../mod/editwebpage.php:171
#: ../../mod/editblock.php:145
msgid "Categories (comma-separated list)"
msgstr "Kategorien (Kommagetrennte Liste)"
-#: ../../include/conversation.php:1120 ../../mod/editlayout.php:116
-#: ../../mod/editpost.php:108 ../../mod/editwebpage.php:154
+#: ../../include/conversation.php:1121 ../../mod/editlayout.php:116
+#: ../../mod/editpost.php:113 ../../mod/editwebpage.php:154
#: ../../mod/editblock.php:130
msgid "Permission settings"
msgstr "Berechtigungs-Einstellungen"
-#: ../../include/conversation.php:1121
+#: ../../include/conversation.php:1122
msgid "permissions"
msgstr "Berechtigungen"
-#: ../../include/conversation.php:1129 ../../mod/editlayout.php:124
-#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:164
+#: ../../include/conversation.php:1130 ../../mod/editlayout.php:124
+#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:164
#: ../../mod/editblock.php:139
msgid "Public post"
msgstr "Öffentlicher Beitrag"
-#: ../../include/conversation.php:1131 ../../mod/editlayout.php:131
-#: ../../mod/editpost.php:122 ../../mod/editwebpage.php:172
+#: ../../include/conversation.php:1132 ../../mod/editlayout.php:131
+#: ../../mod/editpost.php:127 ../../mod/editwebpage.php:172
#: ../../mod/editblock.php:146
msgid "Example: bob@example.com, mary@example.com"
msgstr "Beispiel: bob@example.com, mary@example.com"
-#: ../../include/conversation.php:1144 ../../mod/mail.php:226
+#: ../../include/conversation.php:1145 ../../mod/mail.php:226
#: ../../mod/mail.php:339 ../../mod/editlayout.php:141
-#: ../../mod/editpost.php:133 ../../mod/editwebpage.php:182
+#: ../../mod/editpost.php:138 ../../mod/editwebpage.php:182
#: ../../mod/editblock.php:156
msgid "Set expiration date"
msgstr "Verfallsdatum"
-#: ../../include/conversation.php:1148 ../../mod/editpost.php:136
+#: ../../include/conversation.php:1149 ../../mod/editpost.php:142
msgid "OK"
msgstr "OK"
-#: ../../include/conversation.php:1149 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../mod/settings.php:508
-#: ../../mod/settings.php:534 ../../mod/editpost.php:137
+#: ../../include/conversation.php:1150 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:94 ../../mod/settings.php:510
+#: ../../mod/settings.php:536 ../../mod/editpost.php:143
#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117
msgid "Cancel"
msgstr "Abbrechen"
-#: ../../include/conversation.php:1379
+#: ../../include/conversation.php:1381
msgid "Commented Order"
msgstr "Neueste Kommentare"
-#: ../../include/conversation.php:1382
+#: ../../include/conversation.php:1384
msgid "Sort by Comment Date"
msgstr "Nach Kommentardatum sortiert"
-#: ../../include/conversation.php:1385
+#: ../../include/conversation.php:1387
msgid "Posted Order"
msgstr "Neueste Beiträge"
-#: ../../include/conversation.php:1388
+#: ../../include/conversation.php:1390
msgid "Sort by Post Date"
msgstr "Nach Beitragsdatum sortiert"
-#: ../../include/conversation.php:1392
+#: ../../include/conversation.php:1394
msgid "Personal"
msgstr "Persönlich"
-#: ../../include/conversation.php:1395
+#: ../../include/conversation.php:1397
msgid "Posts that mention or involve you"
msgstr "Beiträge mit Beteiligung deinerseits"
-#: ../../include/conversation.php:1398 ../../mod/menu.php:57
+#: ../../include/conversation.php:1400 ../../mod/menu.php:57
#: ../../mod/connections.php:209
msgid "New"
msgstr "Neu"
-#: ../../include/conversation.php:1401
+#: ../../include/conversation.php:1403
msgid "Activity Stream - by date"
msgstr "Activity Stream - nach Datum sortiert"
-#: ../../include/conversation.php:1408
+#: ../../include/conversation.php:1410
msgid "Starred"
msgstr "Markiert"
-#: ../../include/conversation.php:1411
+#: ../../include/conversation.php:1413
msgid "Favourite Posts"
msgstr "Beiträge mit Sternchen"
-#: ../../include/conversation.php:1418
+#: ../../include/conversation.php:1420
msgid "Spam"
msgstr "Spam"
-#: ../../include/conversation.php:1421
+#: ../../include/conversation.php:1423
msgid "Posts flagged as SPAM"
msgstr "Nachrichten die als SPAM markiert wurden"
-#: ../../include/conversation.php:1452
+#: ../../include/conversation.php:1454
msgid "Channel"
msgstr "Kanal"
-#: ../../include/conversation.php:1455
+#: ../../include/conversation.php:1457
msgid "Status Messages and Posts"
msgstr "Statusnachrichten und Beiträge"
-#: ../../include/conversation.php:1464
+#: ../../include/conversation.php:1466
msgid "About"
msgstr "Über"
-#: ../../include/conversation.php:1467
+#: ../../include/conversation.php:1469
msgid "Profile Details"
msgstr "Profil-Details"
-#: ../../include/conversation.php:1482 ../../mod/fbrowser.php:114
+#: ../../include/conversation.php:1484 ../../mod/fbrowser.php:114
msgid "Files"
msgstr "Dateien"
-#: ../../include/conversation.php:1485
+#: ../../include/conversation.php:1487
msgid "Files and Storage"
msgstr "Dateien und Speicher"
-#: ../../include/conversation.php:1494
+#: ../../include/conversation.php:1496
msgid "Events and Calendar"
msgstr "Veranstaltungen und Kalender"
-#: ../../include/conversation.php:1501
+#: ../../include/conversation.php:1503
msgid "Webpages"
msgstr "Webseiten"
-#: ../../include/conversation.php:1504
+#: ../../include/conversation.php:1506
msgid "Manage Webpages"
msgstr "Webseiten verwalten"
@@ -3342,7 +3361,7 @@ msgid ""
"http://getzot.com"
msgstr "Für weitere Informationen über das Red Matrix Projekt und warum es das Potential hat das Internet wie wir es kennen grundlegend zu verändern schau dir bitte http://getzot.com an"
-#: ../../mod/cloud.php:88
+#: ../../mod/cloud.php:112
msgid "Red Matrix - Guests: Username: {your email address}, Password: +++"
msgstr "Red Matrix Gäste: Nutzername: {deine Email Adresse}; Passwort: +++"
@@ -3442,12 +3461,12 @@ msgid "View recent posts and comments"
msgstr "Betrachte die neuesten Beiträge und Kommentare"
#: ../../mod/connedit.php:330 ../../mod/connedit.php:472
-#: ../../mod/admin.php:697
+#: ../../mod/admin.php:747
msgid "Unblock"
msgstr "Freigeben"
#: ../../mod/connedit.php:330 ../../mod/connedit.php:472
-#: ../../mod/admin.php:696
+#: ../../mod/admin.php:746
msgid "Block"
msgstr "Blockieren"
@@ -3693,13 +3712,13 @@ msgid ""
" and/or create new posts for you?"
msgstr "Möchtest du der Anwendung erlauben, deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für dich zu erstellen?"
-#: ../../mod/api.php:105 ../../mod/profiles.php:495 ../../mod/settings.php:865
-#: ../../mod/settings.php:870
+#: ../../mod/api.php:105 ../../mod/profiles.php:483 ../../mod/settings.php:870
+#: ../../mod/settings.php:875
msgid "Yes"
msgstr "Ja"
-#: ../../mod/api.php:106 ../../mod/profiles.php:496 ../../mod/settings.php:865
-#: ../../mod/settings.php:870
+#: ../../mod/api.php:106 ../../mod/profiles.php:484 ../../mod/settings.php:870
+#: ../../mod/settings.php:875
msgid "No"
msgstr "Nein"
@@ -3721,7 +3740,7 @@ msgid "Channel not found."
msgstr "Kanal nicht gefunden."
#: ../../mod/page.php:83 ../../mod/help.php:71 ../../mod/display.php:100
-#: ../../index.php:227
+#: ../../index.php:226
msgid "Page not found."
msgstr "Seite nicht gefunden."
@@ -4074,7 +4093,7 @@ msgid ""
"poller."
msgstr "WICHTIG: Du musst die geplanten Aufgaben für den Poller [manuell] einrichten."
-#: ../../mod/rpost.php:84 ../../mod/editpost.php:42
+#: ../../mod/rpost.php:86 ../../mod/editpost.php:42
msgid "Edit post"
msgstr "Bearbeite Beitrag"
@@ -4274,521 +4293,531 @@ msgstr "Konnte die Quelle nicht löschen."
msgid "Theme settings updated."
msgstr "Theme-Einstellungen aktualisiert."
-#: ../../mod/admin.php:87 ../../mod/admin.php:419
+#: ../../mod/admin.php:88 ../../mod/admin.php:430
msgid "Site"
msgstr "Seite"
-#: ../../mod/admin.php:88 ../../mod/admin.php:687 ../../mod/admin.php:699
+#: ../../mod/admin.php:89 ../../mod/admin.php:737 ../../mod/admin.php:749
msgid "Users"
msgstr "Benutzer"
-#: ../../mod/admin.php:89 ../../mod/admin.php:785 ../../mod/admin.php:827
+#: ../../mod/admin.php:90 ../../mod/admin.php:835 ../../mod/admin.php:877
msgid "Plugins"
msgstr "Plug-Ins"
-#: ../../mod/admin.php:90 ../../mod/admin.php:990 ../../mod/admin.php:1026
+#: ../../mod/admin.php:91 ../../mod/admin.php:1040 ../../mod/admin.php:1076
msgid "Themes"
msgstr "Themes"
-#: ../../mod/admin.php:91 ../../mod/admin.php:479
+#: ../../mod/admin.php:92 ../../mod/admin.php:529
msgid "Server"
msgstr "Server"
-#: ../../mod/admin.php:92
+#: ../../mod/admin.php:93
msgid "DB updates"
msgstr "DB-Aktualisierungen"
-#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1113
+#: ../../mod/admin.php:107 ../../mod/admin.php:114 ../../mod/admin.php:1163
msgid "Logs"
msgstr "Protokolle"
-#: ../../mod/admin.php:112
+#: ../../mod/admin.php:113
msgid "Plugin Features"
msgstr "Plug-In Funktionen"
-#: ../../mod/admin.php:114
+#: ../../mod/admin.php:115
msgid "User registrations waiting for confirmation"
msgstr "Nutzer Anmeldungen die auf Bestätigung warten"
-#: ../../mod/admin.php:188
+#: ../../mod/admin.php:189
msgid "Message queues"
msgstr "Nachrichten Warteschlange"
-#: ../../mod/admin.php:193 ../../mod/admin.php:418 ../../mod/admin.php:478
-#: ../../mod/admin.php:686 ../../mod/admin.php:784 ../../mod/admin.php:826
-#: ../../mod/admin.php:989 ../../mod/admin.php:1025 ../../mod/admin.php:1112
+#: ../../mod/admin.php:194 ../../mod/admin.php:429 ../../mod/admin.php:528
+#: ../../mod/admin.php:736 ../../mod/admin.php:834 ../../mod/admin.php:876
+#: ../../mod/admin.php:1039 ../../mod/admin.php:1075 ../../mod/admin.php:1162
msgid "Administration"
msgstr "Administration"
-#: ../../mod/admin.php:194
+#: ../../mod/admin.php:195
msgid "Summary"
msgstr "Zusammenfassung"
-#: ../../mod/admin.php:196
+#: ../../mod/admin.php:197
msgid "Registered users"
msgstr "Registrierte Benutzer"
-#: ../../mod/admin.php:198 ../../mod/admin.php:482
+#: ../../mod/admin.php:199 ../../mod/admin.php:532
msgid "Pending registrations"
msgstr "Ausstehende Registrierungen"
-#: ../../mod/admin.php:199
+#: ../../mod/admin.php:200
msgid "Version"
msgstr "Version"
-#: ../../mod/admin.php:201 ../../mod/admin.php:483
+#: ../../mod/admin.php:202 ../../mod/admin.php:533
msgid "Active plugins"
msgstr "Aktive Plug-Ins"
-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:350
msgid "Site settings updated."
msgstr "Site-Einstellungen aktualisiert."
-#: ../../mod/admin.php:371 ../../mod/settings.php:700
+#: ../../mod/admin.php:379 ../../mod/settings.php:702
msgid "No special theme for mobile devices"
msgstr "Keine spezielle Theme für mobile Geräte"
-#: ../../mod/admin.php:373
+#: ../../mod/admin.php:381
msgid "No special theme for accessibility"
msgstr "Kein spezielles Accessibility Theme vorhanden"
-#: ../../mod/admin.php:398
+#: ../../mod/admin.php:409
msgid "Closed"
msgstr "Geschlossen"
-#: ../../mod/admin.php:399
+#: ../../mod/admin.php:410
msgid "Requires approval"
msgstr "Genehmigung erforderlich"
-#: ../../mod/admin.php:400
+#: ../../mod/admin.php:411
msgid "Open"
msgstr "Offen"
-#: ../../mod/admin.php:405
+#: ../../mod/admin.php:416
msgid "Private"
msgstr "Privat"
-#: ../../mod/admin.php:406
+#: ../../mod/admin.php:417
msgid "Paid Access"
msgstr "Kostenpflichtiger Zugang"
-#: ../../mod/admin.php:407
+#: ../../mod/admin.php:418
msgid "Free Access"
msgstr "Kostenloser Zugang"
-#: ../../mod/admin.php:408
+#: ../../mod/admin.php:419
msgid "Tiered Access"
msgstr "Abgestufter Zugang"
-#: ../../mod/admin.php:421 ../../mod/register.php:189
+#: ../../mod/admin.php:432 ../../mod/register.php:189
msgid "Registration"
msgstr "Registrierung"
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:433
msgid "File upload"
msgstr "Dateiupload"
-#: ../../mod/admin.php:423
+#: ../../mod/admin.php:434
msgid "Policies"
msgstr "Richtlinien"
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:435
msgid "Advanced"
msgstr "Fortgeschritten"
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:439
msgid "Site name"
msgstr "Seitenname"
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:440
msgid "Banner/Logo"
msgstr "Banner/Logo"
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:441
+msgid "Administrator Information"
+msgstr "Administrator Informationen"
+
+#: ../../mod/admin.php:441
+msgid ""
+"Contact information for site administrators. Displayed on siteinfo page. "
+"BBCode can be used here"
+msgstr "Kontaktinformationen für Administratoren der Seite. Wird auf der siteinfo Seite angezeigt. BBCode kann verwendet werden."
+
+#: ../../mod/admin.php:442
msgid "System language"
msgstr "System-Sprache"
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:443
msgid "System theme"
msgstr "System-Theme"
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:443
msgid ""
"Default system theme - may be over-ridden by user profiles - change theme settings"
msgstr "Standard System-Theme - kann durch Nutzerprofile überschieben werden - Theme.Einstellungen ändern"
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:444
msgid "Mobile system theme"
msgstr "Mobile System-Theme:"
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:444
msgid "Theme for mobile devices"
msgstr "Theme für mobile Geräte"
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:445
msgid "Accessibility system theme"
msgstr "Accessibility System-Theme"
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:445
msgid "Accessibility theme"
msgstr "Accessibility Theme"
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:446
msgid "Channel to use for this website's static pages"
msgstr "Kanal für die statischen Seiten dieser Webseite verwenden"
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:446
msgid "Site Channel"
msgstr "Seiten Kanal"
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:448
msgid "Maximum image size"
msgstr "Maximale Bildgröße"
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:448
msgid ""
"Maximum size in bytes of uploaded images. Default is 0, which means no "
"limits."
msgstr "Maximale Größe in Bytes von hochgeladenen Bildern. Standard ist 0, was keine Einschränkung bedeutet."
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:449
msgid "Register policy"
msgstr "Registrierungsmethode"
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:450
msgid "Access policy"
msgstr "Zugangsrichtlinien"
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:451
msgid "Register text"
msgstr "Registrierungstext"
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:451
msgid "Will be displayed prominently on the registration page."
msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt."
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:452
msgid "Accounts abandoned after x days"
msgstr "Accounts gelten nach X Tagen als unbenutzt"
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:452
msgid ""
"Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit."
msgstr "Verschwende keine Systemressourchen auf das Pollen von externen Seiten wenn das Konto nicht mehr benutzt wird. Trage hier 0 für kein zeitliches Limit."
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:453
msgid "Allowed friend domains"
msgstr "Erlaubte Domains für Kontakte"
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:453
msgid ""
"Comma separated list of domains which are allowed to establish friendships "
"with this site. Wildcards are accepted. Empty to allow any domains"
msgstr "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:454
msgid "Allowed email domains"
msgstr "Erlaubte Domains für E-Mails"
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:454
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 "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:455
msgid "Block public"
msgstr "Öffentlichen Zugriff blockieren"
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:455
msgid ""
"Check to block public access to all otherwise public personal pages on this "
"site unless you are currently logged in."
msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist."
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:456
msgid "Force publish"
msgstr "Veröffentlichung erzwingen"
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:456
msgid ""
"Check to force all profiles on this site to be listed in the site directory."
msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen."
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
msgid "No login on Homepage"
msgstr "Kein Login auf der Homepage"
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:457
msgid ""
"Check to hide the login form from your sites homepage when visitors arrive "
"who are not logged in (e.g. when you put the content of the homepage in via "
"the site channel)."
msgstr "Wählen um das Login Formular auf der Startseite der Seite zu verbergen, z.B. weil es das Layout der Homepage des Seiten-Kanals stört."
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:459
msgid "Proxy user"
msgstr "Proxy Benutzer"
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:460
msgid "Proxy URL"
msgstr "Proxy URL"
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:461
msgid "Network timeout"
msgstr "Netzwerk-Timeout"
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:461
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
msgid "Delivery interval"
msgstr "Auslieferung Intervall"
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:462
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 "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
msgid "Poll interval"
msgstr "Abfrageintervall"
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:463
msgid ""
"Delay background polling processes by this many seconds to reduce system "
"load. If 0, use delivery interval."
msgstr "Verzögere Hintergrundprozesse, um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet."
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:464
msgid "Maximum Load Average"
msgstr "Maximum Load Average"
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:464
msgid ""
"Maximum system load before delivery and poll processes are deferred - "
"default 50."
msgstr "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50"
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:520
msgid "No server found"
msgstr "Kein Server gefunden"
-#: ../../mod/admin.php:477 ../../mod/admin.php:700
+#: ../../mod/admin.php:527 ../../mod/admin.php:750
msgid "ID"
msgstr "ID"
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:527
msgid "for channel"
msgstr "für Kanal"
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:527
msgid "on server"
msgstr "auf Server"
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:527
msgid "Status"
msgstr "Status"
-#: ../../mod/admin.php:498
+#: ../../mod/admin.php:548
msgid "Update has been marked successful"
msgstr "Update wurde als erfolgreich markiert"
-#: ../../mod/admin.php:508
+#: ../../mod/admin.php:558
#, php-format
msgid "Executing %s failed. Check system logs."
msgstr "Aufrufen von %s fehlgeschlagen. Überprüfe die Systemlogs."
-#: ../../mod/admin.php:511
+#: ../../mod/admin.php:561
#, php-format
msgid "Update %s was successfully applied."
msgstr "Update %s wurde erfolgreich angewandt."
-#: ../../mod/admin.php:515
+#: ../../mod/admin.php:565
#, php-format
msgid "Update %s did not return a status. Unknown if it succeeded."
msgstr "Update %s liefert keinen Rückgabewert. Unbekannt ob es erfolgreich war."
-#: ../../mod/admin.php:518
+#: ../../mod/admin.php:568
#, php-format
msgid "Update function %s could not be found."
msgstr "Update Funktion %s konnte nicht gefunden werden."
-#: ../../mod/admin.php:533
+#: ../../mod/admin.php:583
msgid "No failed updates."
msgstr "Keine fehlgeschlagenen Aktualisierungen."
-#: ../../mod/admin.php:537
+#: ../../mod/admin.php:587
msgid "Failed Updates"
msgstr "Fehlgeschlagene Aktualisierungen"
-#: ../../mod/admin.php:539
+#: ../../mod/admin.php:589
msgid "Mark success (if update was manually applied)"
msgstr "Als erfolgreich markieren (wenn das Update manuell angewandt wurde)"
-#: ../../mod/admin.php:540
+#: ../../mod/admin.php:590
msgid "Attempt to execute this update step automatically"
msgstr "Versuche diesen Updateschritt automatisch anzuwenden"
-#: ../../mod/admin.php:566
+#: ../../mod/admin.php:616
#, php-format
msgid "%s user blocked/unblocked"
msgid_plural "%s users blocked/unblocked"
msgstr[0] "%s Nutzer blockiert/freigegeben"
msgstr[1] "%s Nutzer blockiert/freigegeben"
-#: ../../mod/admin.php:573
+#: ../../mod/admin.php:623
#, php-format
msgid "%s user deleted"
msgid_plural "%s users deleted"
msgstr[0] "%s Nutzer gelöscht"
msgstr[1] "%s Nutzer gelöscht"
-#: ../../mod/admin.php:604
+#: ../../mod/admin.php:654
msgid "Account not found"
msgstr "Konto nicht gefunden"
-#: ../../mod/admin.php:615
+#: ../../mod/admin.php:665
#, php-format
msgid "User '%s' deleted"
msgstr "Benutzer '%s' gelöscht"
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:674
#, php-format
msgid "User '%s' unblocked"
msgstr "Benutzer '%s' freigegeben"
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:674
#, php-format
msgid "User '%s' blocked"
msgstr "Benutzer '%s' blockiert"
-#: ../../mod/admin.php:689
+#: ../../mod/admin.php:739
msgid "select all"
msgstr "Alle auswählen"
-#: ../../mod/admin.php:690
+#: ../../mod/admin.php:740
msgid "User registrations waiting for confirm"
msgstr "Neuanmeldungen, die auf deine Bestätigung warten"
-#: ../../mod/admin.php:691
+#: ../../mod/admin.php:741
msgid "Request date"
msgstr "Antragsdatum"
-#: ../../mod/admin.php:692
+#: ../../mod/admin.php:742
msgid "No registrations."
msgstr "Keine Registrierungen."
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:743
msgid "Approve"
msgstr "Genehmigen"
-#: ../../mod/admin.php:694
+#: ../../mod/admin.php:744
msgid "Deny"
msgstr "Verweigern"
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:750
msgid "Register date"
msgstr "Registrierungs-Datum"
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:750
msgid "Last login"
msgstr "Letzte Anmeldung"
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:750
msgid "Expires"
msgstr "Verfällt"
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:750
msgid "Service Class"
msgstr "Service-Klasse"
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:752
msgid ""
"Selected users will be deleted!\\n\\nEverything these users had posted on "
"this site will be permanently deleted!\\n\\nAre you sure?"
msgstr "Markierte Nutzer werden gelöscht\\n\\nAlles was diese Nutzer auf dieser Seite veröffentlicht haben wird permanent gelöscht\\n\\nBist du sicher?"
-#: ../../mod/admin.php:703
+#: ../../mod/admin.php:753
msgid ""
"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
"site will be permanently deleted!\\n\\nAre you sure?"
msgstr "Der Nutzer {0} wird gelöscht\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat wird permanent gelöscht werden\\n\\nBist du sicher?"
-#: ../../mod/admin.php:744
+#: ../../mod/admin.php:794
#, php-format
msgid "Plugin %s disabled."
msgstr "Plug-In %s deaktiviert."
-#: ../../mod/admin.php:748
+#: ../../mod/admin.php:798
#, php-format
msgid "Plugin %s enabled."
msgstr "Plug-In %s aktiviert."
-#: ../../mod/admin.php:758 ../../mod/admin.php:960
+#: ../../mod/admin.php:808 ../../mod/admin.php:1010
msgid "Disable"
msgstr "Deaktivieren"
-#: ../../mod/admin.php:760 ../../mod/admin.php:962
+#: ../../mod/admin.php:810 ../../mod/admin.php:1012
msgid "Enable"
msgstr "Aktivieren"
-#: ../../mod/admin.php:786 ../../mod/admin.php:991
+#: ../../mod/admin.php:836 ../../mod/admin.php:1041
msgid "Toggle"
msgstr "Umschalten"
-#: ../../mod/admin.php:794 ../../mod/admin.php:1001
+#: ../../mod/admin.php:844 ../../mod/admin.php:1051
msgid "Author: "
msgstr "Autor: "
-#: ../../mod/admin.php:795 ../../mod/admin.php:1002
+#: ../../mod/admin.php:845 ../../mod/admin.php:1052
msgid "Maintainer: "
msgstr "Betreuer:"
-#: ../../mod/admin.php:924
+#: ../../mod/admin.php:974
msgid "No themes found."
msgstr "Keine Theme gefunden."
-#: ../../mod/admin.php:983
+#: ../../mod/admin.php:1033
msgid "Screenshot"
msgstr "Bildschirmfoto"
-#: ../../mod/admin.php:1031
+#: ../../mod/admin.php:1081
msgid "[Experimental]"
msgstr "[Experimentell]"
-#: ../../mod/admin.php:1032
+#: ../../mod/admin.php:1082
msgid "[Unsupported]"
msgstr "[Nicht unterstützt]"
-#: ../../mod/admin.php:1059
+#: ../../mod/admin.php:1109
msgid "Log settings updated."
msgstr "Protokoll-Einstellungen aktualisiert."
-#: ../../mod/admin.php:1115
+#: ../../mod/admin.php:1165
msgid "Clear"
msgstr "Leeren"
-#: ../../mod/admin.php:1121
+#: ../../mod/admin.php:1171
msgid "Debugging"
msgstr "Debugging"
-#: ../../mod/admin.php:1122
+#: ../../mod/admin.php:1172
msgid "Log file"
msgstr "Protokolldatei"
-#: ../../mod/admin.php:1122
+#: ../../mod/admin.php:1172
msgid ""
"Must be writable by web server. Relative to your Red top-level directory."
msgstr "Muss für den Web-Server schreibbar sein. Relativ zum Red Stammverzeichnis."
-#: ../../mod/admin.php:1123
+#: ../../mod/admin.php:1173
msgid "Log level"
msgstr "Protokollstufe"
@@ -4813,7 +4842,7 @@ msgid "Unable to add menu element."
msgstr "Kann Menü-Bestandteil nicht hinzufügen."
#: ../../mod/mitem.php:78 ../../mod/xchan.php:25 ../../mod/menu.php:113
-#: ../../mod/dirprofile.php:177
+#: ../../mod/dirprofile.php:181
msgid "Not found."
msgstr "Nicht gefunden."
@@ -4861,7 +4890,7 @@ msgstr "Neues Menü-Bestandteil"
msgid "Menu Item Permissions"
msgstr "Menü-Element Zugriffsrechte"
-#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:930
+#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:937
msgid "(click to open/close)"
msgstr "(zum öffnen/schließen anklicken)"
@@ -4973,7 +5002,7 @@ msgstr "Album nicht gefunden."
msgid "Delete Album"
msgstr "Album löschen"
-#: ../../mod/photos.php:159 ../../mod/photos.php:930
+#: ../../mod/photos.php:159 ../../mod/photos.php:934
msgid "Delete Photo"
msgstr "Foto löschen"
@@ -5011,13 +5040,13 @@ msgstr "oder bestehenden Album Namen:"
msgid "Do not show a status post for this upload"
msgstr "Keine Statusnachricht für diesen Upload senden"
-#: ../../mod/photos.php:603 ../../mod/photos.php:925
-#: ../../mod/filestorage.php:125
+#: ../../mod/photos.php:603 ../../mod/photos.php:929
+#: ../../mod/filestorage.php:124
msgid "Permissions"
msgstr "Berechtigungen"
-#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1101
-#: ../../mod/photos.php:1116
+#: ../../mod/photos.php:652 ../../mod/photos.php:674 ../../mod/photos.php:1105
+#: ../../mod/photos.php:1120
msgid "Contact Photos"
msgstr "Kontakt Bilder"
@@ -5033,7 +5062,7 @@ msgstr "Zeige neueste zuerst"
msgid "Show Oldest First"
msgstr "Zeige älteste zuerst"
-#: ../../mod/photos.php:729 ../../mod/photos.php:1148
+#: ../../mod/photos.php:729 ../../mod/photos.php:1152
msgid "View Photo"
msgstr "Foto ansehen"
@@ -5045,51 +5074,63 @@ msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt w
msgid "Photo not available"
msgstr "Foto nicht verfügbar"
-#: ../../mod/photos.php:835
+#: ../../mod/photos.php:837
msgid "Use as profile photo"
msgstr "Als Profilfoto verwenden"
-#: ../../mod/photos.php:859
+#: ../../mod/photos.php:861
msgid "View Full Size"
msgstr "In voller Größe anzeigen"
-#: ../../mod/photos.php:913
+#: ../../mod/photos.php:917
msgid "Edit photo"
msgstr "Foto bearbeiten"
-#: ../../mod/photos.php:915
+#: ../../mod/photos.php:919
msgid "Rotate CW (right)"
msgstr "Drehen US (rechts)"
-#: ../../mod/photos.php:916
+#: ../../mod/photos.php:920
msgid "Rotate CCW (left)"
msgstr "Drehen EUS (links)"
-#: ../../mod/photos.php:918
+#: ../../mod/photos.php:922
msgid "New album name"
msgstr "Name des neuen Albums:"
-#: ../../mod/photos.php:921
+#: ../../mod/photos.php:925
msgid "Caption"
msgstr "Bildunterschrift"
-#: ../../mod/photos.php:923
+#: ../../mod/photos.php:927
msgid "Add a Tag"
msgstr "Schlagwort hinzufügen"
-#: ../../mod/photos.php:927
+#: ../../mod/photos.php:931
msgid ""
"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-#: ../../mod/photos.php:1154
+#: ../../mod/photos.php:1158
msgid "View Album"
msgstr "Album ansehen"
-#: ../../mod/photos.php:1163
+#: ../../mod/photos.php:1167
msgid "Recent Photos"
msgstr "Neueste Fotos"
+#: ../../mod/chat.php:18 ../../mod/channel.php:25
+msgid "You must be logged in to see this page."
+msgstr "Du musst angemeldet sein um diese Seite betrachten zu können."
+
+#: ../../mod/chat.php:130
+msgid "New Chatroom"
+msgstr "Neuen Chatraum"
+
+#: ../../mod/chat.php:131
+msgid "Chatroom Name"
+msgstr "Chatraum Name"
+
#: ../../mod/filer.php:35
msgid "- select -"
msgstr "-auswählen-"
@@ -5175,12 +5216,12 @@ msgstr "Einträge zu diesem Menü hinzufügen oder entfernen"
msgid "Welcome to %s"
msgstr "Willkommen auf %s"
-#: ../../mod/directory.php:143 ../../mod/profiles.php:573
-#: ../../mod/dirprofile.php:95
+#: ../../mod/directory.php:143 ../../mod/profiles.php:561
+#: ../../mod/dirprofile.php:98
msgid "Age: "
msgstr "Alter:"
-#: ../../mod/directory.php:146 ../../mod/dirprofile.php:98
+#: ../../mod/directory.php:146 ../../mod/dirprofile.php:101
msgid "Gender: "
msgstr "Geschlecht:"
@@ -5228,7 +5269,7 @@ msgstr "Neue Verbindungen vorschlagen"
msgid "Show pending (new) connections"
msgstr "Zeige schwebende (neue) Verbindungen"
-#: ../../mod/connections.php:248
+#: ../../mod/connections.php:248 ../../mod/profperm.php:134
msgid "All Connections"
msgstr "Alle Verbindungen"
@@ -5293,7 +5334,7 @@ msgstr "Layout Name"
msgid "Help:"
msgstr "Hilfe:"
-#: ../../mod/help.php:68 ../../index.php:224
+#: ../../mod/help.php:68 ../../index.php:223
msgid "Not Found"
msgstr "Nicht gefunden"
@@ -5352,6 +5393,53 @@ msgstr "Willkommen %s. Entfernte Authentifizierung erfolgreich."
msgid "This site is not a directory server"
msgstr "Diese Website ist kein Verzeichnis-Server"
+#: ../../mod/siteinfo.php:57
+#, php-format
+msgid "Version %s"
+msgstr "Version %s"
+
+#: ../../mod/siteinfo.php:76
+msgid "Installed plugins/addons/apps:"
+msgstr "Installierte Plugins/Addons/Apps"
+
+#: ../../mod/siteinfo.php:89
+msgid "No installed plugins/addons/apps"
+msgstr "Keine installierten Plugins/Addons/Apps"
+
+#: ../../mod/siteinfo.php:94
+msgid "Red"
+msgstr "Red"
+
+#: ../../mod/siteinfo.php:95
+msgid ""
+"This is a hub of the Red Matrix - a global cooperative network of "
+"decentralised privacy enhanced websites."
+msgstr "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre."
+
+#: ../../mod/siteinfo.php:98
+msgid "Running at web location"
+msgstr "Erreichbar unter der Web-Adresse"
+
+#: ../../mod/siteinfo.php:99
+msgid ""
+"Please visit GetZot.com to learn more "
+"about the Red Matrix."
+msgstr "Besuche GetZot.com um mehr über die Red Matrix zu erfahren."
+
+#: ../../mod/siteinfo.php:100
+msgid "Bug reports and issues: please visit"
+msgstr "Probleme oder Fehler gefunden? Bitte besuche"
+
+#: ../../mod/siteinfo.php:103
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"redmatrix\" at "
+"librelist - dot com"
+msgstr "Vorschläge, Lob, Spenden usw.: E-Mail an 'redmatrix' at librelist - dot - com"
+
+#: ../../mod/siteinfo.php:104
+msgid "Site Administrators"
+msgstr "Administratoren"
+
#: ../../mod/lockview.php:34
msgid "Remote privacy information not available."
msgstr "Entfernte Privatsphären Einstellungen sind nicht verfügbar."
@@ -5365,7 +5453,7 @@ msgid "Hub not found."
msgstr "Server nicht gefunden."
#: ../../mod/profiles.php:18 ../../mod/profiles.php:138
-#: ../../mod/profiles.php:168 ../../mod/profiles.php:475
+#: ../../mod/profiles.php:168 ../../mod/profiles.php:463
msgid "Profile not found."
msgstr "Profil nicht gefunden."
@@ -5389,226 +5477,226 @@ msgstr "Profil kann nicht geklont werden."
msgid "Profile Name is required."
msgstr "Profil-Name erforderlich."
-#: ../../mod/profiles.php:306
+#: ../../mod/profiles.php:294
msgid "Marital Status"
msgstr "Familienstand"
-#: ../../mod/profiles.php:310
+#: ../../mod/profiles.php:298
msgid "Romantic Partner"
msgstr "Romantische Partner"
-#: ../../mod/profiles.php:314
+#: ../../mod/profiles.php:302
msgid "Likes"
msgstr "Gefällt-mir"
-#: ../../mod/profiles.php:318
+#: ../../mod/profiles.php:306
msgid "Dislikes"
msgstr "Gefällt-mir-nicht"
-#: ../../mod/profiles.php:322
+#: ../../mod/profiles.php:310
msgid "Work/Employment"
msgstr "Arbeit/Anstellung"
-#: ../../mod/profiles.php:325
+#: ../../mod/profiles.php:313
msgid "Religion"
msgstr "Religion"
-#: ../../mod/profiles.php:329
+#: ../../mod/profiles.php:317
msgid "Political Views"
msgstr "Politische Anscihten"
-#: ../../mod/profiles.php:333
+#: ../../mod/profiles.php:321
msgid "Gender"
msgstr "Geschlecht"
-#: ../../mod/profiles.php:337
+#: ../../mod/profiles.php:325
msgid "Sexual Preference"
msgstr "Sexuelle Orientierung"
-#: ../../mod/profiles.php:341
+#: ../../mod/profiles.php:329
msgid "Homepage"
msgstr "Webseite"
-#: ../../mod/profiles.php:345
+#: ../../mod/profiles.php:333
msgid "Interests"
msgstr "Hobbys/Interessen"
-#: ../../mod/profiles.php:349
+#: ../../mod/profiles.php:337
msgid "Address"
msgstr "Adresse"
-#: ../../mod/profiles.php:356 ../../mod/pubsites.php:31
+#: ../../mod/profiles.php:344 ../../mod/pubsites.php:31
msgid "Location"
msgstr "Ort"
-#: ../../mod/profiles.php:439
+#: ../../mod/profiles.php:427
msgid "Profile updated."
msgstr "Profil aktualisiert."
-#: ../../mod/profiles.php:494
+#: ../../mod/profiles.php:482
msgid "Hide your contact/friend list from viewers of this profile?"
msgstr "Verberge die Liste deiner Kontakte vor Betrachtern dieses Profils"
-#: ../../mod/profiles.php:517
+#: ../../mod/profiles.php:505
msgid "Edit Profile Details"
msgstr "Bearbeite Profil-Details"
-#: ../../mod/profiles.php:519
+#: ../../mod/profiles.php:507
msgid "View this profile"
msgstr "Dieses Profil ansehen"
-#: ../../mod/profiles.php:520
+#: ../../mod/profiles.php:508
msgid "Change Profile Photo"
msgstr "Profilfoto ändern"
-#: ../../mod/profiles.php:521
+#: ../../mod/profiles.php:509
msgid "Create a new profile using these settings"
msgstr "Neues Profil anlegen und diese Einstellungen übernehmen"
-#: ../../mod/profiles.php:522
+#: ../../mod/profiles.php:510
msgid "Clone this profile"
msgstr "Dieses Profil klonen"
-#: ../../mod/profiles.php:523
+#: ../../mod/profiles.php:511
msgid "Delete this profile"
msgstr "Dieses Profil löschen"
-#: ../../mod/profiles.php:524
+#: ../../mod/profiles.php:512
msgid "Profile Name:"
msgstr "Profilname:"
-#: ../../mod/profiles.php:525
+#: ../../mod/profiles.php:513
msgid "Your Full Name:"
msgstr "Dein voller Name:"
-#: ../../mod/profiles.php:526
+#: ../../mod/profiles.php:514
msgid "Title/Description:"
msgstr "Titel/Beschreibung:"
-#: ../../mod/profiles.php:527
+#: ../../mod/profiles.php:515
msgid "Your Gender:"
msgstr "Dein Geschlecht:"
-#: ../../mod/profiles.php:528
+#: ../../mod/profiles.php:516
#, php-format
msgid "Birthday (%s):"
msgstr "Geburtstag (%s):"
-#: ../../mod/profiles.php:529
+#: ../../mod/profiles.php:517
msgid "Street Address:"
msgstr "Straße und Hausnummer:"
-#: ../../mod/profiles.php:530
+#: ../../mod/profiles.php:518
msgid "Locality/City:"
msgstr "Wohnort:"
-#: ../../mod/profiles.php:531
+#: ../../mod/profiles.php:519
msgid "Postal/Zip Code:"
msgstr "Postleitzahl:"
-#: ../../mod/profiles.php:532
+#: ../../mod/profiles.php:520
msgid "Country:"
msgstr "Land:"
-#: ../../mod/profiles.php:533
+#: ../../mod/profiles.php:521
msgid "Region/State:"
msgstr "Region/Bundesstaat"
-#: ../../mod/profiles.php:534
+#: ../../mod/profiles.php:522
msgid "♥ Marital Status:"
msgstr "♥ Beziehungsstatus:"
-#: ../../mod/profiles.php:535
+#: ../../mod/profiles.php:523
msgid "Who: (if applicable)"
msgstr "Wer: (falls anwendbar)"
-#: ../../mod/profiles.php:536
+#: ../../mod/profiles.php:524
msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com"
-#: ../../mod/profiles.php:537
+#: ../../mod/profiles.php:525
msgid "Since [date]:"
msgstr "Seit [Datum]:"
-#: ../../mod/profiles.php:539
+#: ../../mod/profiles.php:527
msgid "Homepage URL:"
msgstr "Homepage URL:"
-#: ../../mod/profiles.php:542
+#: ../../mod/profiles.php:530
msgid "Religious Views:"
msgstr "Religiöse Ansichten:"
-#: ../../mod/profiles.php:543
+#: ../../mod/profiles.php:531
msgid "Keywords:"
msgstr "Schlüsselwörter:"
-#: ../../mod/profiles.php:546
+#: ../../mod/profiles.php:534
msgid "Example: fishing photography software"
msgstr "Beispiel: fischen Fotografie Software"
-#: ../../mod/profiles.php:547
+#: ../../mod/profiles.php:535
msgid "Used in directory listings"
msgstr "Wird in Verzeichnis Auflistungen verwendet"
-#: ../../mod/profiles.php:548
+#: ../../mod/profiles.php:536
msgid "Tell us about yourself..."
msgstr "Erzähl uns ein wenig von Dir..."
-#: ../../mod/profiles.php:549
+#: ../../mod/profiles.php:537
msgid "Hobbies/Interests"
msgstr "Hobbys/Interessen"
-#: ../../mod/profiles.php:550
+#: ../../mod/profiles.php:538
msgid "Contact information and Social Networks"
msgstr "Kontaktinformation und soziale Netzwerke"
-#: ../../mod/profiles.php:551
+#: ../../mod/profiles.php:539
msgid "My other channels"
msgstr "Meine anderen Kanäle"
-#: ../../mod/profiles.php:552
+#: ../../mod/profiles.php:540
msgid "Musical interests"
msgstr "Musikalische Interessen"
-#: ../../mod/profiles.php:553
+#: ../../mod/profiles.php:541
msgid "Books, literature"
msgstr "Bücher, Literatur"
-#: ../../mod/profiles.php:554
+#: ../../mod/profiles.php:542
msgid "Television"
msgstr "Fernsehen"
-#: ../../mod/profiles.php:555
+#: ../../mod/profiles.php:543
msgid "Film/dance/culture/entertainment"
msgstr "Film/Tanz/Kultur/Unterhaltung"
-#: ../../mod/profiles.php:556
+#: ../../mod/profiles.php:544
msgid "Love/romance"
msgstr "Liebe/Romantik"
-#: ../../mod/profiles.php:557
+#: ../../mod/profiles.php:545
msgid "Work/employment"
msgstr "Arbeit/Anstellung"
-#: ../../mod/profiles.php:558
+#: ../../mod/profiles.php:546
msgid "School/education"
msgstr "Schule/Ausbildung"
-#: ../../mod/profiles.php:563
+#: ../../mod/profiles.php:551
msgid ""
"This is your public profile. It may "
"be visible to anybody using the internet."
msgstr "Dies ist Dein öffentliches Profil. Es könnte für jeden im Internet sichtbar sein."
-#: ../../mod/profiles.php:612
+#: ../../mod/profiles.php:600
msgid "Edit/Manage Profiles"
msgstr "Bearbeite/Verwalte Profile"
-#: ../../mod/profiles.php:613
+#: ../../mod/profiles.php:601
msgid "Add profile things"
msgstr "Profil-Dinge hinzufügen"
-#: ../../mod/profiles.php:614
+#: ../../mod/profiles.php:602
msgid "Include desirable objects in your profile"
msgstr "binde begehrenswerte Dinge in dein Profil ein"
@@ -5646,43 +5734,43 @@ msgstr "Oder importiere einen bestehenden Kanal von einem
msgid "Permission Denied."
msgstr "Zugriff verweigert."
-#: ../../mod/filestorage.php:86
+#: ../../mod/filestorage.php:85
msgid "File not found."
msgstr "Datei nicht gefunden"
-#: ../../mod/filestorage.php:120
+#: ../../mod/filestorage.php:119
msgid "Edit file permissions"
msgstr "Dateiberechtigungen bearbeiten"
-#: ../../mod/filestorage.php:127
+#: ../../mod/filestorage.php:126
msgid "Include all files and sub folders"
msgstr "Alle Dateien und Unterverzeichnisse einbinden"
-#: ../../mod/filestorage.php:128
+#: ../../mod/filestorage.php:127
msgid "Return to file list"
msgstr "Zurück zur Dateiliste"
-#: ../../mod/filestorage.php:130
+#: ../../mod/filestorage.php:129
msgid "Copy/paste this code to attach file to a post"
msgstr "Diesen Code kopieren/einfügen um die Datei an einen Beitrag anzuhängen"
-#: ../../mod/filestorage.php:131
+#: ../../mod/filestorage.php:130
msgid "Copy/paste this URL to link file from a web page"
msgstr "Diese URL verwenden um auf die Datei von einer Webseite aus zu verweisen"
-#: ../../mod/filestorage.php:168
+#: ../../mod/filestorage.php:167
msgid "Download"
msgstr "Download"
-#: ../../mod/filestorage.php:174
+#: ../../mod/filestorage.php:173
msgid "Used: "
msgstr "Verwendet:"
-#: ../../mod/filestorage.php:175
+#: ../../mod/filestorage.php:174
msgid "[directory]"
msgstr "[Verzeichnis]"
-#: ../../mod/filestorage.php:177
+#: ../../mod/filestorage.php:176
msgid "Limit: "
msgstr "Limit:"
@@ -5901,7 +5989,7 @@ msgstr "Name wird benötigt"
msgid "Key and Secret are required"
msgstr "Schlüssel und Geheimnis werden benötigt"
-#: ../../mod/settings.php:79 ../../mod/settings.php:533
+#: ../../mod/settings.php:79 ../../mod/settings.php:535
msgid "Update"
msgstr "Update"
@@ -5933,334 +6021,342 @@ msgstr "Geschützte E-Mail Adresse. Diese kann nicht verändert werden."
msgid "System failure storing new email. Please try again."
msgstr "Systemfehler während des Speicherns der neuen Mail. Bitte versuche es noch einmal."
-#: ../../mod/settings.php:435
+#: ../../mod/settings.php:437
msgid "Settings updated."
msgstr "Einstellungen aktualisiert."
-#: ../../mod/settings.php:506 ../../mod/settings.php:532
-#: ../../mod/settings.php:568
+#: ../../mod/settings.php:508 ../../mod/settings.php:534
+#: ../../mod/settings.php:570
msgid "Add application"
msgstr "Anwendung hinzufügen"
-#: ../../mod/settings.php:509 ../../mod/settings.php:535
+#: ../../mod/settings.php:511 ../../mod/settings.php:537
msgid "Name"
msgstr "Name"
-#: ../../mod/settings.php:509
+#: ../../mod/settings.php:511
msgid "Name of application"
msgstr "Name der Anwendung"
-#: ../../mod/settings.php:510 ../../mod/settings.php:536
+#: ../../mod/settings.php:512 ../../mod/settings.php:538
msgid "Consumer Key"
msgstr "Consumer Key"
-#: ../../mod/settings.php:510 ../../mod/settings.php:511
+#: ../../mod/settings.php:512 ../../mod/settings.php:513
msgid "Automatically generated - change if desired. Max length 20"
msgstr "Automatisch erzeugt - ändern falls erwünscht. Maximale Länge 20"
-#: ../../mod/settings.php:511 ../../mod/settings.php:537
+#: ../../mod/settings.php:513 ../../mod/settings.php:539
msgid "Consumer Secret"
msgstr "Consumer Secret"
-#: ../../mod/settings.php:512 ../../mod/settings.php:538
+#: ../../mod/settings.php:514 ../../mod/settings.php:540
msgid "Redirect"
msgstr "Umleitung"
-#: ../../mod/settings.php:512
+#: ../../mod/settings.php:514
msgid ""
"Redirect URI - leave blank unless your application specifically requires "
"this"
msgstr "Umleitungs-URl - lasse dies frei außer deine Anwendung erfordert dies explizit"
-#: ../../mod/settings.php:513 ../../mod/settings.php:539
+#: ../../mod/settings.php:515 ../../mod/settings.php:541
msgid "Icon url"
msgstr "Symbol-URL"
-#: ../../mod/settings.php:513
+#: ../../mod/settings.php:515
msgid "Optional"
msgstr "Optional"
-#: ../../mod/settings.php:524
+#: ../../mod/settings.php:526
msgid "You can't edit this application."
msgstr "Diese Anwendung kann nicht bearbeitet werden."
-#: ../../mod/settings.php:567
+#: ../../mod/settings.php:569
msgid "Connected Apps"
msgstr "Verbundene Apps"
-#: ../../mod/settings.php:571
+#: ../../mod/settings.php:573
msgid "Client key starts with"
msgstr "Client key beginnt mit"
-#: ../../mod/settings.php:572
+#: ../../mod/settings.php:574
msgid "No name"
msgstr "Kein Name"
-#: ../../mod/settings.php:573
+#: ../../mod/settings.php:575
msgid "Remove authorization"
msgstr "Authorisierung aufheben"
-#: ../../mod/settings.php:584
+#: ../../mod/settings.php:586
msgid "No feature settings configured"
msgstr "Keine Funktions-Einstellungen konfiguriert"
-#: ../../mod/settings.php:592
+#: ../../mod/settings.php:594
msgid "Feature Settings"
msgstr "Funktions-Einstellungen"
-#: ../../mod/settings.php:615
+#: ../../mod/settings.php:617
msgid "Account Settings"
msgstr "Konto-Einstellungen"
-#: ../../mod/settings.php:616
+#: ../../mod/settings.php:618
msgid "Password Settings"
msgstr "Kennwort-Einstellungen"
-#: ../../mod/settings.php:617
+#: ../../mod/settings.php:619
msgid "New Password:"
msgstr "Neues Passwort:"
-#: ../../mod/settings.php:618
+#: ../../mod/settings.php:620
msgid "Confirm:"
msgstr "Bestätigen:"
-#: ../../mod/settings.php:618
+#: ../../mod/settings.php:620
msgid "Leave password fields blank unless changing"
msgstr "Lasse die Passwort -Felder leer außer du möchtest das Passwort ändern"
-#: ../../mod/settings.php:620 ../../mod/settings.php:912
+#: ../../mod/settings.php:622 ../../mod/settings.php:917
msgid "Email Address:"
msgstr "Email Adresse:"
-#: ../../mod/settings.php:621
+#: ../../mod/settings.php:623
msgid "Remove Account"
msgstr "Konto entfernen"
-#: ../../mod/settings.php:622
+#: ../../mod/settings.php:624
msgid "Warning: This action is permanent and cannot be reversed."
msgstr "Achtung: Diese Aktion ist permanent und kann nicht rückgänging gemacht werden."
-#: ../../mod/settings.php:638
+#: ../../mod/settings.php:640
msgid "Off"
msgstr "Aus"
-#: ../../mod/settings.php:638
+#: ../../mod/settings.php:640
msgid "On"
msgstr "An"
-#: ../../mod/settings.php:645
+#: ../../mod/settings.php:647
msgid "Additional Features"
msgstr "Zusätzliche Funktionen"
-#: ../../mod/settings.php:670
+#: ../../mod/settings.php:672
msgid "Connector Settings"
msgstr "Connector-Einstellungen"
-#: ../../mod/settings.php:740
+#: ../../mod/settings.php:742
msgid "Display Settings"
msgstr "Anzeige-Einstellungen"
-#: ../../mod/settings.php:746
+#: ../../mod/settings.php:748
msgid "Display Theme:"
msgstr "Anzeige Theme:"
-#: ../../mod/settings.php:747
+#: ../../mod/settings.php:749
msgid "Mobile Theme:"
msgstr "Mobile Theme:"
-#: ../../mod/settings.php:748
+#: ../../mod/settings.php:750
msgid "Update browser every xx seconds"
msgstr "Browser alle xx Sekunden aktualisieren"
-#: ../../mod/settings.php:748
+#: ../../mod/settings.php:750
msgid "Minimum of 10 seconds, no maximum"
msgstr "Minimum von 10 Sekunden, kein Maximum"
-#: ../../mod/settings.php:749
+#: ../../mod/settings.php:751
msgid "Maximum number of conversations to load at any time:"
msgstr "Maximale Anzahl von Unterhaltungen die gleichzeitig geladen werden sollen:"
-#: ../../mod/settings.php:749
+#: ../../mod/settings.php:751
msgid "Maximum of 100 items"
msgstr "Maximum von 100 Beiträgen"
-#: ../../mod/settings.php:750
+#: ../../mod/settings.php:752
msgid "Don't show emoticons"
msgstr "Emoticons nicht zeigen"
-#: ../../mod/settings.php:786
+#: ../../mod/settings.php:788
msgid "Nobody except yourself"
msgstr "Niemand außer du selbst"
-#: ../../mod/settings.php:787
+#: ../../mod/settings.php:789
msgid "Only those you specifically allow"
msgstr "Nur die, denen du es explizit erlaubst"
-#: ../../mod/settings.php:788
+#: ../../mod/settings.php:790
msgid "Anybody in your address book"
msgstr "Jeder aus Ihrem Adressbuch"
-#: ../../mod/settings.php:789
+#: ../../mod/settings.php:791
msgid "Anybody on this website"
msgstr "Jeder auf dieser Website"
-#: ../../mod/settings.php:790
+#: ../../mod/settings.php:792
msgid "Anybody in this network"
msgstr "Jeder in diesem Netzwerk"
-#: ../../mod/settings.php:791
+#: ../../mod/settings.php:793
msgid "Anybody on the internet"
msgstr "Jeder im Internet"
-#: ../../mod/settings.php:865
+#: ../../mod/settings.php:870
msgid "Publish your default profile in the network directory"
msgstr "Veröffentliche dein Standard-Profil im Netzwerk-Verzeichnis"
-#: ../../mod/settings.php:870
+#: ../../mod/settings.php:875
msgid "Allow us to suggest you as a potential friend to new members?"
msgstr "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
-#: ../../mod/settings.php:874 ../../mod/profile_photo.php:288
+#: ../../mod/settings.php:879 ../../mod/profile_photo.php:288
msgid "or"
msgstr "oder"
-#: ../../mod/settings.php:879
+#: ../../mod/settings.php:884
msgid "Your channel address is"
msgstr "Deine Kanal-Adresse lautet"
-#: ../../mod/settings.php:901
+#: ../../mod/settings.php:906
msgid "Channel Settings"
msgstr "Kanal-Einstellungen"
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:915
msgid "Basic Settings"
msgstr "Grundeinstellungen"
-#: ../../mod/settings.php:913
+#: ../../mod/settings.php:918
msgid "Your Timezone:"
msgstr "Ihre Zeitzone:"
-#: ../../mod/settings.php:914
+#: ../../mod/settings.php:919
msgid "Default Post Location:"
msgstr "Standardstandort:"
-#: ../../mod/settings.php:915
+#: ../../mod/settings.php:920
msgid "Use Browser Location:"
msgstr "Standort des Browsers verwenden:"
-#: ../../mod/settings.php:917
+#: ../../mod/settings.php:922
msgid "Adult Content"
msgstr "Nicht Jugendfreie-Inhalte"
-#: ../../mod/settings.php:917
+#: ../../mod/settings.php:922
msgid "This channel publishes adult content."
msgstr "Dieser Kanal veröffentlicht nicht Jugendfreie-Inhalte"
-#: ../../mod/settings.php:919
+#: ../../mod/settings.php:924
msgid "Security and Privacy Settings"
msgstr "Sicherheits- und Datenschutz-Einstellungen"
-#: ../../mod/settings.php:921
+#: ../../mod/settings.php:926
+msgid "Hide my online presence"
+msgstr "Meine Online-Präsenz verbergen"
+
+#: ../../mod/settings.php:926
+msgid "Prevents showing if you are available for chat"
+msgstr "Verhindert es als für Chats verfügbar angezeigt zu werden"
+
+#: ../../mod/settings.php:928
msgid "Quick Privacy Settings:"
msgstr "Schnelle Datenschutz-Einstellungen:"
-#: ../../mod/settings.php:922
+#: ../../mod/settings.php:929
msgid "Very Public - extremely permissive"
msgstr "Sehr offen - extrem freizügig"
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:930
msgid "Typical - default public, privacy when desired"
msgstr "Typisch - Standard öffentlich, Privatheit wenn gewünscht"
-#: ../../mod/settings.php:924
+#: ../../mod/settings.php:931
msgid "Private - default private, rarely open or public"
msgstr "Privat - Standard privat, selten offen oder öffentlich"
-#: ../../mod/settings.php:925
+#: ../../mod/settings.php:932
msgid "Blocked - default blocked to/from everybody"
msgstr "Geschlossen - Standard zu und von jedem geblockt"
-#: ../../mod/settings.php:928
+#: ../../mod/settings.php:935
msgid "Maximum Friend Requests/Day:"
msgstr "Maximale Kontaktanfragen pro Tag:"
-#: ../../mod/settings.php:928
+#: ../../mod/settings.php:935
msgid "May reduce spam activity"
msgstr "Kann die Spam-Aktivität verringern"
-#: ../../mod/settings.php:929
+#: ../../mod/settings.php:936
msgid "Default Post Permissions"
msgstr "Beitragszugriffrechte Standardeinstellungen"
-#: ../../mod/settings.php:941
+#: ../../mod/settings.php:948
msgid "Maximum private messages per day from unknown people:"
msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
-#: ../../mod/settings.php:941
+#: ../../mod/settings.php:948
msgid "Useful to reduce spamming"
msgstr "Nützlich um Spam zu verringern"
-#: ../../mod/settings.php:944
+#: ../../mod/settings.php:951
msgid "Notification Settings"
msgstr "Benachrichtigungs-Einstellungen"
-#: ../../mod/settings.php:945
+#: ../../mod/settings.php:952
msgid "By default post a status message when:"
msgstr "Sende standardmäßig Status-Nachrichten wenn:"
-#: ../../mod/settings.php:946
+#: ../../mod/settings.php:953
msgid "accepting a friend request"
msgstr "einer Kontaktanfrage stattgegeben wurde"
-#: ../../mod/settings.php:947
+#: ../../mod/settings.php:954
msgid "joining a forum/community"
msgstr "ein Forum beigetreten wurde"
-#: ../../mod/settings.php:948
+#: ../../mod/settings.php:955
msgid "making an interesting profile change"
msgstr "eine interessante Änderung am Profil vorgenommen wurde"
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:956
msgid "Send a notification email when:"
msgstr "Eine Email Benachrichtigung senden wenn:"
-#: ../../mod/settings.php:950
+#: ../../mod/settings.php:957
msgid "You receive an introduction"
msgstr "Du eine Vorstellung erhältst"
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:958
msgid "Your introductions are confirmed"
msgstr "Deine Vorstellung bestätigt wurde."
-#: ../../mod/settings.php:952
+#: ../../mod/settings.php:959
msgid "Someone writes on your profile wall"
msgstr "Jemand auf deine Pinnwand schreibt"
-#: ../../mod/settings.php:953
+#: ../../mod/settings.php:960
msgid "Someone writes a followup comment"
msgstr "Jemand einen Beitrag kommentiert"
-#: ../../mod/settings.php:954
+#: ../../mod/settings.php:961
msgid "You receive a private message"
msgstr "Du eine private Nachricht erhältst"
-#: ../../mod/settings.php:955
+#: ../../mod/settings.php:962
msgid "You receive a friend suggestion"
msgstr "Du einen Kontaktvorschlag erhältst"
-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:963
msgid "You are tagged in a post"
msgstr "Du wurdest in einem Beitrag getaggt"
-#: ../../mod/settings.php:957
+#: ../../mod/settings.php:964
msgid "You are poked/prodded/etc. in a post"
msgstr "Du in einer Nachricht angestupst/geknufft/o.ä. wirst"
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:967
msgid "Advanced Account/Page Type Settings"
msgstr "Erweiterte Account / Seiten Arten Einstellungen"
-#: ../../mod/settings.php:961
+#: ../../mod/settings.php:968
msgid "Change the behaviour of this account for special situations"
msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
@@ -6351,17 +6447,17 @@ msgstr "Layout bearbeiten"
msgid "Delete layout?"
msgstr "Layout löschen?"
-#: ../../mod/editlayout.php:110 ../../mod/editpost.php:102
+#: ../../mod/editlayout.php:110 ../../mod/editpost.php:107
#: ../../mod/editwebpage.php:148 ../../mod/editblock.php:124
msgid "Insert YouTube video"
msgstr "YouTube-Video einfügen"
-#: ../../mod/editlayout.php:111 ../../mod/editpost.php:103
+#: ../../mod/editlayout.php:111 ../../mod/editpost.php:108
#: ../../mod/editwebpage.php:149 ../../mod/editblock.php:125
msgid "Insert Vorbis [.ogg] video"
msgstr "Vorbis [.ogg]-Video einfügen"
-#: ../../mod/editlayout.php:112 ../../mod/editpost.php:104
+#: ../../mod/editlayout.php:112 ../../mod/editpost.php:109
#: ../../mod/editwebpage.php:150 ../../mod/editblock.php:126
msgid "Insert Vorbis [.ogg] audio"
msgstr "Vorbis [.ogg]-Audio einfügen"
@@ -6522,10 +6618,6 @@ msgstr "Diesen Beitrag privat machen"
msgid "Wall Photos"
msgstr "Wall Fotos"
-#: ../../mod/channel.php:25
-msgid "You must be logged in to see this page."
-msgstr "Du musst angemeldet sein um diese Seite betrachten zu können."
-
#: ../../mod/channel.php:85
msgid "Insufficient permissions. Request redirected to profile page."
msgstr "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet."
@@ -6571,69 +6663,22 @@ msgstr "Block löschen?"
msgid "Delete Block"
msgstr "Block löschen"
-#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
msgid "Invalid profile identifier."
msgstr "Ungültiger Profil Identifikator"
-#: ../../mod/profperm.php:101
+#: ../../mod/profperm.php:105
msgid "Profile Visibility Editor"
msgstr "Profil-Sichtbarkeits Editor"
-#: ../../mod/profperm.php:105
+#: ../../mod/profperm.php:109
msgid "Click on a contact to add or remove."
msgstr "Wähle einen Kontakt zum Hinzufügen oder Löschen aus."
-#: ../../mod/profperm.php:114
+#: ../../mod/profperm.php:118
msgid "Visible To"
msgstr "Sichtbar für"
-#: ../../mod/profperm.php:130
-msgid "All Contacts (with secure profile access)"
-msgstr "Alle Kontakte (mit sicherem Zuging zum Profil)"
-
-#: ../../mod/siteinfo.php:57
-#, php-format
-msgid "Version %s"
-msgstr "Version %s"
-
-#: ../../mod/siteinfo.php:76
-msgid "Installed plugins/addons/apps:"
-msgstr "Installierte Plugins/Addons/Apps"
-
-#: ../../mod/siteinfo.php:89
-msgid "No installed plugins/addons/apps"
-msgstr "Keine installierten Plugins/Addons/Apps"
-
-#: ../../mod/siteinfo.php:92
-msgid "Red"
-msgstr "Red"
-
-#: ../../mod/siteinfo.php:93
-msgid ""
-"This is a hub of the Red Matrix - a global cooperative network of "
-"decentralised privacy enhanced websites."
-msgstr "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre."
-
-#: ../../mod/siteinfo.php:96
-msgid "Running at web location"
-msgstr "Erreichbar unter der Web-Adresse"
-
-#: ../../mod/siteinfo.php:97
-msgid ""
-"Please visit GetZot.com to learn more "
-"about the Red Matrix."
-msgstr "Besuche GetZot.com um mehr über die Red Matrix zu erfahren."
-
-#: ../../mod/siteinfo.php:98
-msgid "Bug reports and issues: please visit"
-msgstr "Probleme oder Fehler gefunden? Bitte besuche"
-
-#: ../../mod/siteinfo.php:101
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"redmatrix\" at "
-"librelist - dot com"
-msgstr "Vorschläge, Lob, Spenden usw.: E-Mail an 'redmatrix' at librelist - dot - com"
-
#: ../../mod/suggest.php:35
msgid ""
"No suggestions available. If this is a new site, please try again in 24 "
@@ -6818,39 +6863,39 @@ msgstr "Laune"
msgid "Set your current mood and tell your friends"
msgstr "Wähle deine aktuelle Stimmung und erzähle sie deinen Freunden"
-#: ../../mod/ping.php:160
+#: ../../mod/ping.php:186
msgid "sent you a private message"
msgstr "eine private Nachricht schicken"
-#: ../../mod/ping.php:218
+#: ../../mod/ping.php:244
msgid "added your channel"
msgstr "hat deinen Kanal hinzugefügt"
-#: ../../mod/ping.php:262
+#: ../../mod/ping.php:288
msgid "posted an event"
msgstr "hat eine Veranstaltung veröffentlicht"
-#: ../../mod/dirprofile.php:111
+#: ../../mod/dirprofile.php:114
msgid "Status: "
msgstr "Status:"
-#: ../../mod/dirprofile.php:112
+#: ../../mod/dirprofile.php:115
msgid "Sexual Preference: "
msgstr "Sexuelle Vorlieben:"
-#: ../../mod/dirprofile.php:114
+#: ../../mod/dirprofile.php:117
msgid "Homepage: "
msgstr "Webseite:"
-#: ../../mod/dirprofile.php:115
+#: ../../mod/dirprofile.php:118
msgid "Hometown: "
msgstr "Wohnort:"
-#: ../../mod/dirprofile.php:117
+#: ../../mod/dirprofile.php:120
msgid "About: "
msgstr "Über:"
-#: ../../mod/dirprofile.php:164
+#: ../../mod/dirprofile.php:168
msgid "Keywords: "
msgstr "Schlüsselbegriffe:"
diff --git a/view/de/strings.php b/view/de/strings.php
index 0beec543e..3637c4bf5 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -12,7 +12,6 @@ $a->strings["public profile"] = "öffentliches Profil";
$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s auf “%3\$s” geändert";
$a->strings["Visit %1\$s's %2\$s"] = "Besuche %1\$s's %2\$s";
$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat ein aktualisiertes %2\$s, %3\$s wurde verändert.";
-$a->strings["Public Timeline"] = "Öffentliche Zeitleiste";
$a->strings["Logout"] = "Abmelden";
$a->strings["End this session"] = "Beende diese Sitzung";
$a->strings["Home"] = "Home";
@@ -71,6 +70,11 @@ $a->strings["Admin"] = "Admin";
$a->strings["Site Setup and Configuration"] = "Seiten-Einrichtung und -Konfiguration";
$a->strings["Nothing new here"] = "Nichts Neues hier";
$a->strings["Please wait..."] = "Bitte warten...";
+$a->strings["Missing room name"] = "Der Chatraum hat keinen Namen";
+$a->strings["Duplicate room name"] = "Name des Chatraums bereits vergeben";
+$a->strings["Invalid room specifier."] = "Ungültiger Raumbezeichner.";
+$a->strings["Room not found."] = "Chatraum konnte nicht gefunden werden.";
+$a->strings["Permission denied."] = "Zugang verweigert";
$a->strings["Connect"] = "Verbinden";
$a->strings["New window"] = "Neues Fenster";
$a->strings["Open the selected location in a different window or browser tab"] = "Öffne die markierte Adresse in einem neuen Browser Fenster oder Tab";
@@ -115,94 +119,17 @@ $a->strings["second"] = "Sekunde";
$a->strings["seconds"] = "Sekunden";
$a->strings["%1\$d %2\$s ago"] = "vor %1\$d %2\$s";
$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Info für den Datenbank-Server '%s' nicht finden";
+$a->strings["view full size"] = "In Vollbildansicht anschauen";
$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\\\, H:i";
$a->strings["Starts:"] = "Beginnt:";
$a->strings["Finishes:"] = "Endet:";
$a->strings["Location:"] = "Ort:";
-$a->strings["prev"] = "vorherige";
-$a->strings["first"] = "erste";
-$a->strings["last"] = "letzte";
-$a->strings["next"] = "nächste";
-$a->strings["older"] = "älter";
-$a->strings["newer"] = "neuer";
-$a->strings["No connections"] = "Keine Verbindungen";
-$a->strings["%d Connection"] = array(
- 0 => "%d Verbindung",
- 1 => "%d Verbindungen",
-);
-$a->strings["View Connections"] = "Zeige Verbindungen";
-$a->strings["Save"] = "Speichern";
-$a->strings["poke"] = "anstupsen";
-$a->strings["poked"] = "stupste";
-$a->strings["ping"] = "anpingen";
-$a->strings["pinged"] = "pingte";
-$a->strings["prod"] = "knuffen";
-$a->strings["prodded"] = "knuffte";
-$a->strings["slap"] = "ohrfeigen";
-$a->strings["slapped"] = "ohrfeigte";
-$a->strings["finger"] = "befummeln";
-$a->strings["fingered"] = "befummelte";
-$a->strings["rebuff"] = "eine Abfuhr erteilen";
-$a->strings["rebuffed"] = "abfuhrerteilte";
-$a->strings["happy"] = "glücklich";
-$a->strings["sad"] = "traurig";
-$a->strings["mellow"] = "sanft";
-$a->strings["tired"] = "müde";
-$a->strings["perky"] = "frech";
-$a->strings["angry"] = "sauer";
-$a->strings["stupified"] = "verblüfft";
-$a->strings["puzzled"] = "verwirrt";
-$a->strings["interested"] = "interessiert";
-$a->strings["bitter"] = "verbittert";
-$a->strings["cheerful"] = "fröhlich";
-$a->strings["alive"] = "lebendig";
-$a->strings["annoyed"] = "verärgert";
-$a->strings["anxious"] = "unruhig";
-$a->strings["cranky"] = "schrullig";
-$a->strings["disturbed"] = "verstört";
-$a->strings["frustrated"] = "frustriert";
-$a->strings["motivated"] = "motiviert";
-$a->strings["relaxed"] = "entspannt";
-$a->strings["surprised"] = "überrascht";
-$a->strings["Monday"] = "Montag";
-$a->strings["Tuesday"] = "Dienstag";
-$a->strings["Wednesday"] = "Mittwoch";
-$a->strings["Thursday"] = "Donnerstag";
-$a->strings["Friday"] = "Freitag";
-$a->strings["Saturday"] = "Samstag";
-$a->strings["Sunday"] = "Sonntag";
-$a->strings["January"] = "Januar";
-$a->strings["February"] = "Februar";
-$a->strings["March"] = "März";
-$a->strings["April"] = "April";
-$a->strings["May"] = "Mai";
-$a->strings["June"] = "Juni";
-$a->strings["July"] = "Juli";
-$a->strings["August"] = "August";
-$a->strings["September"] = "September";
-$a->strings["October"] = "Oktober";
-$a->strings["November"] = "November";
-$a->strings["December"] = "Dezember";
-$a->strings["unknown.???"] = "unbekannt.???";
-$a->strings["bytes"] = "Bytes";
-$a->strings["remove category"] = "Kategorie entfernen";
-$a->strings["remove from file"] = "aus der Datei entfernen";
-$a->strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
-$a->strings["link to source"] = "Link zum Originalbeitrag";
-$a->strings["Select a page layout: "] = "Ein Seiten-Layout auswählen";
-$a->strings["default"] = "Standard";
-$a->strings["Page content type: "] = "Content-Typ der Seite";
-$a->strings["Select an alternate language"] = "Wähle eine alternative Sprache";
-$a->strings["photo"] = "Foto";
-$a->strings["event"] = "Ereignis";
-$a->strings["status"] = "Status";
-$a->strings["comment"] = "Kommentar";
-$a->strings["activity"] = "Aktivität";
-$a->strings["Design"] = "Design";
-$a->strings["Blocks"] = "Blöcke";
-$a->strings["Menus"] = "Menüs";
-$a->strings["Layouts"] = "Layouts";
-$a->strings["Pages"] = "Seiten";
+$a->strings["Image/photo"] = "Bild/Foto";
+$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
+$a->strings["QR code"] = "QR Code";
+$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
+$a->strings["post"] = "Beitrag";
+$a->strings["$1 wrote:"] = "$1 schrieb:";
$a->strings["Delete this item?"] = "Dieses Element löschen?";
$a->strings["Comment"] = "Kommentar";
$a->strings["show more"] = "mehr zeigen";
@@ -234,7 +161,6 @@ $a->strings["[no subject]"] = "[no subject]";
$a->strings["Unable to determine sender."] = "Kann Absender nicht bestimmen.";
$a->strings["Stored post could not be verified."] = "Gespeicherter Beitrag konnten nicht überprüft werden.";
$a->strings["Profile Photos"] = "Profilfotos";
-$a->strings["view full size"] = "In Vollbildansicht anschauen";
$a->strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
$a->strings["Empty name"] = "Namensfeld leer";
$a->strings["Name too long"] = "Name ist zu lang";
@@ -258,6 +184,7 @@ $a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
$a->strings["Gender:"] = "Geschlecht:";
$a->strings["Status:"] = "Status:";
$a->strings["Homepage:"] = "Homepage:";
+$a->strings["Online Now"] = "gerade online";
$a->strings["g A l F d"] = "l, d. F G \\\\U\\\\h\\\\r";
$a->strings["F d"] = "d. F";
$a->strings["[today]"] = "[Heute]";
@@ -292,12 +219,6 @@ $a->strings["Love/Romance:"] = "Liebe/Romantik:";
$a->strings["Work/employment:"] = "Arbeit/Anstellung:";
$a->strings["School/education:"] = "Schule/Ausbildung:";
$a->strings["Edit File properties"] = "Dateieigenschaften ändern";
-$a->strings["Image/photo"] = "Bild/Foto";
-$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
-$a->strings["QR code"] = "QR Code";
-$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schrieb den folgenden %2\$s %3\$s";
-$a->strings["post"] = "Beitrag";
-$a->strings["$1 wrote:"] = "$1 schrieb:";
$a->strings["Embedded content"] = "Eingebetteter Inhalt";
$a->strings["Embedding disabled"] = "Einbetten ausgeschaltet";
$a->strings["General Features"] = "Allgemeine Funktionen";
@@ -365,7 +286,6 @@ $a->strings["Channels not in any collection"] = "Kanäle, die nicht in einer Sam
$a->strings["add"] = "hinzufügen";
$a->strings["created a new post"] = "Neuer Beitrag wurde erzeugt";
$a->strings["commented on %s's post"] = "hat %s's Beitrag kommentiert";
-$a->strings["Permission denied."] = "Zugang verweigert";
$a->strings["Image exceeds website size limit of %lu bytes"] = "Bild überschreitet das Limit der Webseite von %lu bytes";
$a->strings["Image file is empty."] = "Bilddatei ist leer.";
$a->strings["Unable to process image"] = "Kann Bild nicht verarbeiten";
@@ -524,6 +444,7 @@ $a->strings["Add New Connection"] = "Neue Verbindung hinzufügen";
$a->strings["Enter the channel address"] = "Adresse des Kanals eingeben";
$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@beispiel.com, http://beispiel.com/barbara";
$a->strings["Notes"] = "Notizen";
+$a->strings["Save"] = "Speichern";
$a->strings["Remove term"] = "Eintrag löschen";
$a->strings["Everything"] = "Alles";
$a->strings["Archives"] = "Archive";
@@ -544,6 +465,8 @@ $a->strings["Export channel"] = "Kanal exportieren";
$a->strings["Automatic Permissions (Advanced)"] = "Automatische Berechtigungen (Erweitert)";
$a->strings["Premium Channel Settings"] = "Prämium-Kanal Einstellungen";
$a->strings["Check Mail"] = "E-Mails abrufen";
+$a->strings["Chat Rooms"] = "Chaträume";
+$a->strings["Public Timeline"] = "Öffentliche Zeitleiste";
$a->strings["%d invitation available"] = array(
0 => "%d Einladung verfügbar",
1 => "%d Einladungen verfügbar",
@@ -601,6 +524,90 @@ $a->strings["Collection is empty."] = "Sammlung ist leer.";
$a->strings["Collection: %s"] = "Sammlung: %s";
$a->strings["Connection: %s"] = "Verbindung: %s";
$a->strings["Connection not found."] = "Die Verbindung wurde nicht gefunden.";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
+$a->strings["prev"] = "vorherige";
+$a->strings["first"] = "erste";
+$a->strings["last"] = "letzte";
+$a->strings["next"] = "nächste";
+$a->strings["older"] = "älter";
+$a->strings["newer"] = "neuer";
+$a->strings["No connections"] = "Keine Verbindungen";
+$a->strings["%d Connection"] = array(
+ 0 => "%d Verbindung",
+ 1 => "%d Verbindungen",
+);
+$a->strings["View Connections"] = "Zeige Verbindungen";
+$a->strings["poke"] = "anstupsen";
+$a->strings["poked"] = "stupste";
+$a->strings["ping"] = "anpingen";
+$a->strings["pinged"] = "pingte";
+$a->strings["prod"] = "knuffen";
+$a->strings["prodded"] = "knuffte";
+$a->strings["slap"] = "ohrfeigen";
+$a->strings["slapped"] = "ohrfeigte";
+$a->strings["finger"] = "befummeln";
+$a->strings["fingered"] = "befummelte";
+$a->strings["rebuff"] = "eine Abfuhr erteilen";
+$a->strings["rebuffed"] = "abfuhrerteilte";
+$a->strings["happy"] = "glücklich";
+$a->strings["sad"] = "traurig";
+$a->strings["mellow"] = "sanft";
+$a->strings["tired"] = "müde";
+$a->strings["perky"] = "frech";
+$a->strings["angry"] = "sauer";
+$a->strings["stupified"] = "verblüfft";
+$a->strings["puzzled"] = "verwirrt";
+$a->strings["interested"] = "interessiert";
+$a->strings["bitter"] = "verbittert";
+$a->strings["cheerful"] = "fröhlich";
+$a->strings["alive"] = "lebendig";
+$a->strings["annoyed"] = "verärgert";
+$a->strings["anxious"] = "unruhig";
+$a->strings["cranky"] = "schrullig";
+$a->strings["disturbed"] = "verstört";
+$a->strings["frustrated"] = "frustriert";
+$a->strings["motivated"] = "motiviert";
+$a->strings["relaxed"] = "entspannt";
+$a->strings["surprised"] = "überrascht";
+$a->strings["Monday"] = "Montag";
+$a->strings["Tuesday"] = "Dienstag";
+$a->strings["Wednesday"] = "Mittwoch";
+$a->strings["Thursday"] = "Donnerstag";
+$a->strings["Friday"] = "Freitag";
+$a->strings["Saturday"] = "Samstag";
+$a->strings["Sunday"] = "Sonntag";
+$a->strings["January"] = "Januar";
+$a->strings["February"] = "Februar";
+$a->strings["March"] = "März";
+$a->strings["April"] = "April";
+$a->strings["May"] = "Mai";
+$a->strings["June"] = "Juni";
+$a->strings["July"] = "Juli";
+$a->strings["August"] = "August";
+$a->strings["September"] = "September";
+$a->strings["October"] = "Oktober";
+$a->strings["November"] = "November";
+$a->strings["December"] = "Dezember";
+$a->strings["unknown.???"] = "unbekannt.???";
+$a->strings["bytes"] = "Bytes";
+$a->strings["remove category"] = "Kategorie entfernen";
+$a->strings["remove from file"] = "aus der Datei entfernen";
+$a->strings["Click to open/close"] = "Klicke zum Öffnen/Schließen";
+$a->strings["link to source"] = "Link zum Originalbeitrag";
+$a->strings["Select a page layout: "] = "Ein Seiten-Layout auswählen";
+$a->strings["default"] = "Standard";
+$a->strings["Page content type: "] = "Content-Typ der Seite";
+$a->strings["Select an alternate language"] = "Wähle eine alternative Sprache";
+$a->strings["photo"] = "Foto";
+$a->strings["event"] = "Ereignis";
+$a->strings["status"] = "Status";
+$a->strings["comment"] = "Kommentar";
+$a->strings["activity"] = "Aktivität";
+$a->strings["Design"] = "Design";
+$a->strings["Blocks"] = "Blöcke";
+$a->strings["Menus"] = "Menüs";
+$a->strings["Layouts"] = "Layouts";
+$a->strings["Pages"] = "Seiten";
$a->strings["Private Message"] = "Private Nachricht";
$a->strings["Delete"] = "Löschen";
$a->strings["Select"] = "Auswählen";
@@ -640,10 +647,6 @@ $a->strings["Link"] = "Link";
$a->strings["Video"] = "Video";
$a->strings["Preview"] = "Vorschau";
$a->strings["Encrypt text"] = "Text verschlüsseln";
-$a->strings["Welcome "] = "Willkommen";
-$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilfoto hoch.";
-$a->strings["Welcome back "] = "Willkommen zurück";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Security-Token des Formulars war nicht korrekt. Das ist wahrscheinlich passiert, weil das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
$a->strings["channel"] = "Kanal";
$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s";
$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s nicht";
@@ -1031,6 +1034,8 @@ $a->strings["Policies"] = "Richtlinien";
$a->strings["Advanced"] = "Fortgeschritten";
$a->strings["Site name"] = "Seitenname";
$a->strings["Banner/Logo"] = "Banner/Logo";
+$a->strings["Administrator Information"] = "Administrator Informationen";
+$a->strings["Contact information for site administrators. Displayed on siteinfo page. BBCode can be used here"] = "Kontaktinformationen für Administratoren der Seite. Wird auf der siteinfo Seite angezeigt. BBCode kann verwendet werden.";
$a->strings["System language"] = "System-Sprache";
$a->strings["System theme"] = "System-Theme";
$a->strings["Default system theme - may be over-ridden by user profiles - change theme settings"] = "Standard System-Theme - kann durch Nutzerprofile überschieben werden - Theme.Einstellungen ändern";
@@ -1196,6 +1201,9 @@ $a->strings["Add a Tag"] = "Schlagwort hinzufügen";
$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
$a->strings["View Album"] = "Album ansehen";
$a->strings["Recent Photos"] = "Neueste Fotos";
+$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein um diese Seite betrachten zu können.";
+$a->strings["New Chatroom"] = "Neuen Chatraum";
+$a->strings["Chatroom Name"] = "Chatraum Name";
$a->strings["- select -"] = "-auswählen-";
$a->strings["Menu updated."] = "Menü aktualisiert.";
$a->strings["Unable to update menu."] = "Kann Menü nicht aktualisieren.";
@@ -1260,6 +1268,16 @@ $a->strings["Channel added."] = "Kanal hinzugefügt.";
$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Entfernte Authentifizierung blockiert. Du bist lokal auf dieser Seite angemeldet. Bitte melde dich ab und versuche es erneut.";
$a->strings["Welcome %s. Remote authentication successful."] = "Willkommen %s. Entfernte Authentifizierung erfolgreich.";
$a->strings["This site is not a directory server"] = "Diese Website ist kein Verzeichnis-Server";
+$a->strings["Version %s"] = "Version %s";
+$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
+$a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
+$a->strings["Red"] = "Red";
+$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."] = "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre.";
+$a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
+$a->strings["Please visit GetZot.com to learn more about the Red Matrix."] = "Besuche GetZot.com um mehr über die Red Matrix zu erfahren.";
+$a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
+$a->strings["Suggestions, praise, donations, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an 'redmatrix' at librelist - dot - com";
+$a->strings["Site Administrators"] = "Administratoren";
$a->strings["Remote privacy information not available."] = "Entfernte Privatsphären Einstellungen sind nicht verfügbar.";
$a->strings["Visible to:"] = "Sichtbar für:";
$a->strings["Hub not found."] = "Server nicht gefunden.";
@@ -1454,6 +1472,8 @@ $a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
$a->strings["Adult Content"] = "Nicht Jugendfreie-Inhalte";
$a->strings["This channel publishes adult content."] = "Dieser Kanal veröffentlicht nicht Jugendfreie-Inhalte";
$a->strings["Security and Privacy Settings"] = "Sicherheits- und Datenschutz-Einstellungen";
+$a->strings["Hide my online presence"] = "Meine Online-Präsenz verbergen";
+$a->strings["Prevents showing if you are available for chat"] = "Verhindert es als für Chats verfügbar angezeigt zu werden";
$a->strings["Quick Privacy Settings:"] = "Schnelle Datenschutz-Einstellungen:";
$a->strings["Very Public - extremely permissive"] = "Sehr offen - extrem freizügig";
$a->strings["Typical - default public, privacy when desired"] = "Typisch - Standard öffentlich, Privatheit wenn gewünscht";
@@ -1542,7 +1562,6 @@ $a->strings["Recipient"] = "Empfänger";
$a->strings["Choose what you wish to do to recipient"] = "Wähle was du mit dem/r Empfänger/in tun willst";
$a->strings["Make this post private"] = "Diesen Beitrag privat machen";
$a->strings["Wall Photos"] = "Wall Fotos";
-$a->strings["You must be logged in to see this page."] = "Du musst angemeldet sein um diese Seite betrachten zu können.";
$a->strings["Insufficient permissions. Request redirected to profile page."] = "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet.";
$a->strings["Not available."] = "Nicht verfügbar.";
$a->strings["Community"] = "Gemeinschaft";
@@ -1558,16 +1577,6 @@ $a->strings["Invalid profile identifier."] = "Ungültiger Profil Identifikator";
$a->strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits Editor";
$a->strings["Click on a contact to add or remove."] = "Wähle einen Kontakt zum Hinzufügen oder Löschen aus.";
$a->strings["Visible To"] = "Sichtbar für";
-$a->strings["All Contacts (with secure profile access)"] = "Alle Kontakte (mit sicherem Zuging zum Profil)";
-$a->strings["Version %s"] = "Version %s";
-$a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
-$a->strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
-$a->strings["Red"] = "Red";
-$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralised privacy enhanced websites."] = "Dieser Server ist Teil der Red-Matrix – einem global vernetzten Verbund aus dezentralen Websites mit Rücksicht auf die Privatsphäre.";
-$a->strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
-$a->strings["Please visit GetZot.com to learn more about the Red Matrix."] = "Besuche GetZot.com um mehr über die Red Matrix zu erfahren.";
-$a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
-$a->strings["Suggestions, praise, donations, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an 'redmatrix' at librelist - dot - com";
$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge vorhanden. Wenn dies eine neue Seite ist versuche es bitte in 24 Stunden erneut.";
$a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
$a->strings["No messages."] = "Keine Nachrichten.";
diff --git a/view/js/icon_translate.js b/view/js/icon_translate.js
index 838ff899f..737164cb8 100644
--- a/view/js/icon_translate.js
+++ b/view/js/icon_translate.js
@@ -51,4 +51,5 @@ $(document).ready(function() {
$('.icon-globe').addClass('');
$('.icon-circle-blank').addClass('');
$('.icon-circle').addClass('');
+ $('.icon-bookmark').addClass('');
});
\ No newline at end of file
diff --git a/view/js/main.js b/view/js/main.js
index c8e9fc9a2..44cb79949 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -55,6 +55,8 @@
if(typeof(insertFormatting) != 'undefined')
return(insertFormatting(comment,BBcode,id));
+ var urlprefix = ((BBcode == 'url') ? '#^' : '');
+
var tmpStr = $("#comment-edit-text-" + id).val();
if(tmpStr == comment) {
tmpStr = "";
@@ -68,11 +70,11 @@
if (document.selection) {
textarea.focus();
selected = document.selection.createRange();
- selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+ selected.text = urlprefix+"["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
- textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+ textarea.value = textarea.value.substring(0, start) + urlprefix+"["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
return true;
}
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index 51dbcf4bf..7a33952dc 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -17,6 +17,7 @@ function connectFullShare() {
$('#me_id_perms_chat').attr('checked','checked');
$('#me_id_perms_view_storage').attr('checked','checked');
$('#me_id_perms_republish').attr('checked','checked');
+
}
function connectCautiousShare() {
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 1c411113e..16101db57 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -43,6 +43,7 @@ function channel_privacy_macro(n) {
$('#id_write_pages option').eq(0).attr('selected','selected');
$('#id_delegate option').eq(0).attr('selected','selected');
$('#id_republish option').eq(0).attr('selected','selected');
+ $('#id_bookmark option').eq(0).attr('selected','selected');
$('#id_profile_in_directory_onoff .off').removeClass('hidden');
$('#id_profile_in_directory_onoff .on').addClass('hidden');
$('#id_profile_in_directory').val(0);
@@ -65,6 +66,7 @@ function channel_privacy_macro(n) {
$('#id_write_pages option').eq(1).attr('selected','selected');
$('#id_delegate option').eq(0).attr('selected','selected');
$('#id_republish option').eq(0).attr('selected','selected');
+ $('#id_bookmark option').eq(1).attr('selected','selected');
$('#id_profile_in_directory_onoff .off').removeClass('hidden');
$('#id_profile_in_directory_onoff .on').addClass('hidden');
$('#id_profile_in_directory').val(0);
@@ -87,6 +89,7 @@ function channel_privacy_macro(n) {
$('#id_write_pages option').eq(0).attr('selected','selected');
$('#id_delegate option').eq(0).attr('selected','selected');
$('#id_republish option').eq(1).attr('selected','selected');
+ $('#id_bookmark option').eq(1).attr('selected','selected');
$('#id_profile_in_directory_onoff .on').removeClass('hidden');
$('#id_profile_in_directory_onoff .off').addClass('hidden');
$('#id_profile_in_directory').val(1);
@@ -109,6 +112,7 @@ function channel_privacy_macro(n) {
$('#id_write_pages option').eq(2).attr('selected','selected');
$('#id_delegate option').eq(0).attr('selected','selected');
$('#id_republish option').eq(4).attr('selected','selected');
+ $('#id_bookmark option').eq(4).attr('selected','selected');
$('#id_profile_in_directory_onoff .on').removeClass('hidden');
$('#id_profile_in_directory_onoff .off').addClass('hidden');
$('#id_profile_in_directory').val(1);
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 02832b5f0..776b4c31a 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -40,11 +40,11 @@ abbr {
a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
font-weight: bold;
- color: #0080FF;
+ color: $link_colour;
text-decoration: none;
}
-a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; }
+a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; }
.fakelink {
cursor: pointer;
@@ -2449,4 +2449,4 @@ img.mail-list-sender-photo {
.online-now {
color: red;
cursor: pointer;
-}
\ No newline at end of file
+}
diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php
index 20355197f..68a72fffd 100644
--- a/view/theme/redbasic/php/config.php
+++ b/view/theme/redbasic/php/config.php
@@ -7,6 +7,7 @@ function theme_content(&$a) {
$arr['schema'] = get_pconfig(local_user(),'redbasic', 'schema' );
$arr['nav_colour'] = get_pconfig(local_user(),'redbasic', 'nav_colour' );
+ $arr['link_colour'] = get_pconfig(local_user(),'redbasic', 'link_colour' );
$arr['banner_colour'] = get_pconfig(local_user(),'redbasic', 'banner_colour' );
$arr['bgcolour'] = get_pconfig(local_user(),'redbasic', 'background_colour' );
$arr['background_image'] = get_pconfig(local_user(),'redbasic', 'background_image' );
@@ -33,6 +34,7 @@ function theme_post(&$a) {
if (isset($_POST['redbasic-settings-submit'])) {
set_pconfig(local_user(), 'redbasic', 'schema', $_POST['redbasic_schema']);
set_pconfig(local_user(), 'redbasic', 'nav_colour', $_POST['redbasic_nav_colour']);
+ set_pconfig(local_user(), 'redbasic', 'link_colour', $_POST['redbasic_link_colour']);
set_pconfig(local_user(), 'redbasic', 'background_colour', $_POST['redbasic_background_colour']);
set_pconfig(local_user(), 'redbasic', 'banner_colour', $_POST['redbasic_banner_colour']);
set_pconfig(local_user(), 'redbasic', 'background_image', $_POST['redbasic_background_image']);
@@ -72,9 +74,17 @@ function redbasic_form(&$a, $arr) {
$nav_colours = array (
'' => t('Scheme Default'),
- 'red' => t('red'),
- 'black' => t('black'),
- 'silver' => t('silver'),
+ 'red' => 'red',
+ 'pink' => 'pink',
+ 'green' => 'green',
+ 'blue' => 'blue',
+ 'purple' => 'purple',
+ 'black' => 'black',
+ 'orange' => 'orange',
+ 'brown' => 'brown',
+ 'grey' => 'grey',
+ 'gold' => 'gold',
+ 'silver' => t('silver'),
);
if(feature_enabled(local_user(),'expert'))
@@ -88,6 +98,7 @@ if(feature_enabled(local_user(),'expert'))
'$title' => t("Theme settings"),
'$schema' => array('redbasic_schema', t('Set scheme'), $arr['schema'], '', $scheme_choices),
'$nav_colour' => array('redbasic_nav_colour', t('Navigation bar colour'), $arr['nav_colour'], '', $nav_colours),
+ '$link_colour' => array('redbasic_link_colour', t('link colour'), $arr['link_colour'], '', $link_colours),
'$banner_colour' => array('redbasic_banner_colour', t('Set font-colour for banner'), $arr['banner_colour']),
'$bgcolour' => array('redbasic_background_colour', t('Set the background colour'), $arr['bgcolour']),
'$background_image' => array('redbasic_background_image', t('Set the background image'), $arr['background_image']),
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 9956ccd31..8d5c23a03 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -1,5 +1,7 @@
install) {
+ // Get the UID of the channel owner
$uid = get_theme_uid();
if($uid)
@@ -13,6 +15,7 @@
// Load the owners pconfig
$banner_colour = get_pconfig($uid,'redbasic','banner_colour');
+ $link_colour = get_pconfig($uid, "redbasic", "link_colour");
$schema = get_pconfig($uid,'redbasic','schema');
$bgcolour = get_pconfig($uid, "redbasic", "background_colour");
$background_image = get_pconfig($uid, "redbasic", "background_image");
@@ -31,6 +34,8 @@
$top_photo=get_pconfig($uid,'redbasic','top_photo');
$reply_photo=get_pconfig($uid,'redbasic','reply_photo');
+}
+
// Now load the scheme. If a value is changed above, we'll keep the settings
// If not, we'll keep those defined by the schema
// Setting $scheme to '' wasn't working for some reason, so we'll check it's
@@ -63,6 +68,8 @@
$nav_bg_3 = "#f00";
$nav_bg_4 = "#b00";
}
+ if (! $link_colour)
+ $link_colour = "#0080FF";
if (! $banner_colour)
$banner_colour = "fff";
if (! $bgcolour)
@@ -130,6 +137,38 @@
$nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver";
$search_background = '#EEEEEE';
}
+ if($nav_colour === "pink") {
+ $nav_bg_1 = $nav_bg_3 = "#FFC1CA";
+ $nav_bg_2 = $nav_bg_4 = "#FFC1CA";
+ }
+ if($nav_colour === "green") {
+ $nav_bg_1 = $nav_bg_3 = "#5CD65C";
+ $nav_bg_2 = $nav_bg_4 = "#5CD65C";
+ }
+ if($nav_colour === "blue") {
+ $nav_bg_1 = $nav_bg_3 = "#1872a2";
+ $nav_bg_2 = $nav_bg_4 = "#1872a2";
+ }
+ if($nav_colour === "purple") {
+ $nav_bg_1 = $nav_bg_3 = "#551A8B";
+ $nav_bg_2 = $nav_bg_4 = "#551A8B";
+ }
+ if($nav_colour === "orange") {
+ $nav_bg_1 = $nav_bg_3 = "#FF3D0D";
+ $nav_bg_2 = $nav_bg_4 = "#FF3D0D";
+ }
+ if($nav_colour === "brown") {
+ $nav_bg_1 = $nav_bg_3 = "#330000";
+ $nav_bg_2 = $nav_bg_4 = "#330000";
+ }
+ if($nav_colour === "grey") {
+ $nav_bg_1 = $nav_bg_3 = "#2e2f2e";
+ $nav_bg_2 = $nav_bg_4 = "#2e2f2e";
+ }
+ if($nav_colour === "gold") {
+ $nav_bg_1 = $nav_bg_3 = "#FFAA00";
+ $nav_bg_2 = $nav_bg_4 = "#FFAA00";
+ }
// Apply the settings
@@ -141,6 +180,7 @@ $options = array (
'$nav_bg_2' => $nav_bg_2,
'$nav_bg_3' => $nav_bg_3,
'$nav_bg_4' => $nav_bg_4,
+'$link_colour' => $link_colour,
'$banner_colour' => $banner_colour,
'$search_background' => $search_background,
'$bgcolour' => $bgcolour,
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index e0f546896..ca05986a2 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -6,6 +6,7 @@
{{if $expert}}
{{include file="field_select.tpl" field=$nav_colour}}
{{include file="field_input.tpl" field=$banner_colour}}
+{{include file="field_input.tpl" field=$link_colour}}
{{include file="field_input.tpl" field=$bgcolour}}
{{include file="field_input.tpl" field=$background_image}}
{{include file="field_input.tpl" field=$item_colour}}
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 590213fd3..274d0d5de 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -30,19 +30,10 @@
{{/if}}
-
-
+
+
+ 
+
+ 
mod
boot.php
